GitHub action v4

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
     continue-on-error: ${{ matrix.branch == 'devel' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install build dependencies (Linux i386)
         if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
@@ -96,7 +96,7 @@ jobs:
       - name: Restore Nim DLLs dependencies (Windows) from cache
         if: runner.os == 'Windows'
         id: windows-dlls-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: external/dlls-${{ matrix.target.cpu }}
           key: 'dlls-${{ matrix.target.cpu }}'

README.md

@@ -3,7 +3,7 @@
 [![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 ![Stability: experimental](https://img.shields.io/badge/stability-experimental-orange.svg)
-![Github action](https://github.com/status-im/nim-json-rpc/workflows/CI/badge.svg)
+![Github action](https://github.com/status-im/nim-json-rpc/actions/workflows/ci.yml/badge.svg)
 
 Json-Rpc is a library designed to provide an easier interface for working with remote procedure calls.
 

json_rpc/router.nim

@@ -151,7 +151,7 @@ proc route*(router: RpcRouter, data: string):
   ## converted to Json.
   ## Returns string of Json from RPC result/error node
   when defined(nimHasWarnBareExcept):
-    {.warning[BareExcept]:off.}
+    {.push warning[BareExcept]:off.}
 
   let request =
     try:
@@ -172,7 +172,7 @@ proc route*(router: RpcRouter, data: string):
       return wrapError(JSON_ENCODE_ERROR, err.msg)
 
   when defined(nimHasWarnBareExcept):
-    {.warning[BareExcept]:on.}
+    {.pop warning[BareExcept]:on.}
 
   return reply
 
@@ -181,8 +181,8 @@ proc tryRoute*(router: RpcRouter, data: JsonString,
   ## Route to RPC, returns false if the method or params cannot be found.
   ## Expects json input and returns json output.
   when defined(nimHasWarnBareExcept):
-    {.warning[BareExcept]:off.}
-    {.warning[UnreachableCode]:off.}
+    {.push warning[BareExcept]:off.}
+    {.push warning[UnreachableCode]:off.}
 
   try:
     let req = JrpcSys.decode(data.string, RequestRx)
@@ -206,8 +206,8 @@ proc tryRoute*(router: RpcRouter, data: JsonString,
     return err(ex.msg)
 
   when defined(nimHasWarnBareExcept):
-    {.warning[BareExcept]:on.}
-    {.warning[UnreachableCode]:on.}
+    {.pop warning[BareExcept]:on.}
+    {.pop warning[UnreachableCode]:on.}
 
 macro rpc*(server: RpcRouter, path: static[string], body: untyped): untyped =
   ## Define a remote procedure call.

json_rpc/servers/httpserver.nim

@@ -80,13 +80,7 @@ proc serveHTTP*(rpcServer: RpcHttpHandler, request: HttpRequestRef):
     raise exc
   except CatchableError as exc:
     debug "Internal error while processing JSON-RPC call"
-    try:
-      return await request.respond(
-        Http503,
-        "Internal error while processing JSON-RPC call: " & exc.msg)
-    except HttpWriteError as exc:
-      error "Something error", msg=exc.msg
-      return defaultResponse()
+    return defaultResponse(exc)
 
 proc processClientRpc(rpcServer: RpcHttpServer): HttpProcessCallback2 =
   return proc (req: RequestFence): Future[HttpResponseRef]
@@ -104,13 +98,7 @@ proc processClientRpc(rpcServer: RpcHttpServer): HttpProcessCallback2 =
           return res
     except CatchableError as exc:
       error "Internal error while processing JSON-RPC hook", msg=exc.msg
-      try:
-        return await request.respond(
-          Http503,
-          "Internal error while processing JSON-RPC hook: " & exc.msg)
-      except HttpWriteError as exc:
-        error "Something error", msg=exc.msg
-        return defaultResponse()
+      return defaultResponse(exc)
 
     return await rpcServer.serveHTTP(request)