@asyncswap/jsonrpc 0.4.2 → 0.4.4

package/CHANGELOG.md

@@ -1,21 +1,33 @@
 # @asyncswap/jsonrpc
 
+## 0.4.4
+
+### Patch Changes
+
+- f7d28d9: (fix): error code now generated in build
+
+## 0.4.3
+
+### Patch Changes
+
+- 40a79dc: add support for batcing and streamlined error methods
+
 ## 0.4.2
 
 ### Patch Changes
 
 - 9512db5: update documentation
 
-## 0.5.0
+## 0.4.0
 
 ### Minor Changes
 
-- 7e8300c: changes api for jsonrpc contruction
+- 7e8300c: changes api for jsonrpc construction
 
 ### Patch Changes
 
 - 43de065: update docs
-- 7126afa: add `otherHeaders` to inializedClient calls
+- 7126afa: add `otherHeaders` to initializedClient calls
 
 ## 0.3.1
 

package/dist/client.d.ts

@@ -2,14 +2,9 @@ export declare class JsonRpcClient {
     private url;
     private id;
     constructor(url: string);
-    call<Method = string, Result = unknown, E = unknown>(method: Method, params?: unknown[], headers?: Record<string, string>): Promise<Result | E>;
-    buildRequest<Method>(method: Method, params?: unknown[]): {
-        jsonrpc: "2.0";
-        method: Method;
-        params: unknown[];
-        id: number;
-    };
+    call<Method = string, Result = unknown, E = unknown>(request: JsonRpcRequest<Method> | JsonRpcRequest<Method>[], headers?: Record<string, string>): Promise<Result | Result[] | E>;
+    buildRequest<Method>(method: Method, params?: unknown[]): JsonRpcRequest<Method>;
     private request;
-    notify<Method = string>(method: Method, params?: unknown[]): Promise<JsonRpcResponse<unknown, number>>;
+    notify<Method = string>(method: Method, params?: unknown[]): Promise<void>;
 }
 //# sourceMappingURL=client.d.ts.map

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,qBAAa,aAAa;IAGb,OAAO,CAAC,GAAG;IAFvB,OAAO,CAAC,EAAE,CAAK;gBAEK,GAAG,EAAE,MAAM;IAEzB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EACxD,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,OAAO,EAAO,EACtB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAatB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO;;;;;;YAS7C,OAAO;IA4BrB,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE;CAQ1D"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,qBAAa,aAAa;IAGb,OAAO,CAAC,GAAG;IAFvB,OAAO,CAAC,EAAE,CAAK;gBAEK,GAAG,EAAE,MAAM;IAEzB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EACxD,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,EAC1D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;IAgBjC,YAAY,CAAC,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,OAAO,EAAO,GACpB,cAAc,CAAC,MAAM,CAAC;YASX,OAAO;IAkCf,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE;CAYhE"}

package/dist/client.js

@@ -1,29 +1,36 @@
+import { JsonRpcErrorCode } from "./error";
 export class JsonRpcClient {
     url;
     id = 0;
     constructor(url) {
         this.url = url;
     }
-    async call(method, params = [], headers) {
-        const request = this.buildRequest(method, params);
+    async call(request, headers) {
         const response = await this.request(request, headers);
-        ++this.id;
         if ("error" in response) {
             return response.error;
         }
-        return response.result;
+        if ("result" in response) {
+            return response.result;
+        }
+        if (Array.isArray(response)) {
+            return response;
+        }
+        else {
+            // what else can result be? maybe indefined
+            return response;
+        }
     }
     buildRequest(method, params = []) {
         return {
             jsonrpc: "2.0",
             method,
             params,
-            id: this.id,
+            id: ++this.id,
         };
     }
-    async request(req, customHeaders, timeout = 5000) {
+    async request(req, customHeaders) {
         const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
         try {
             const headers = {
                 "Content-Type": "application/json",
@@ -33,24 +40,32 @@ export class JsonRpcClient {
                 method: "POST",
                 headers,
                 body: JSON.stringify(req),
+                signal: controller.signal,
             });
             return (await res.json());
         }
         catch (err) {
-            clearTimeout(timeoutId);
-            if (err instanceof Error && err.name === "AbortError") {
-                throw new Error(`Req timeout after ${timeout}ms`);
-            }
-            throw err;
+            return {
+                jsonrpc: "2.0",
+                error: {
+                    code: JsonRpcErrorCode.REQUEST_FAILED,
+                    message: `Request failed: ${err}`,
+                },
+                id: null,
+            };
         }
     }
-    notify(method, params) {
+    async notify(method, params) {
         const request = {
             jsonrpc: "2.0",
             method,
             params,
         };
-        return this.request(request);
+        await fetch(this.url, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(request),
+        });
     }
 }
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,aAAa;IAGL;IAFZ,EAAE,GAAG,CAAC,CAAC;IAEf,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAI,CAAC;IAEpC,KAAK,CAAC,IAAI,CACT,MAAc,EACd,SAAoB,EAAE,EACtB,OAAgC;QAEhC,MAAM,OAAO,GAA2B,IAAI,CAAC,YAAY,CACxD,MAAM,EACN,MAAM,CACN,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,EAAE,IAAI,CAAC,EAAE,CAAC;QACV,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC,KAAU,CAAC;QAC5B,CAAC;QACD,OAAO,QAAQ,CAAC,MAAgB,CAAC;IAClC,CAAC;IAED,YAAY,CAAS,MAAc,EAAE,SAAoB,EAAE;QAC1D,OAAO;YACN,OAAO,EAAE,KAAc;YACvB,MAAM;YACN,MAAM;YACN,EAAE,EAAE,IAAI,CAAC,EAAE;SACX,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,OAAO,CACpB,GAA4B,EAC5B,aAAsC,EACtC,UAAkB,IAAI;QAEtB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC;YACJ,MAAM,OAAO,GAA2B;gBACvC,cAAc,EAAE,kBAAkB;gBAClC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;aACxB,CAAC;YACF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACjC,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;aACzB,CAAC,CAAC;YAEH,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAqC,CAAC;QAC/D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,YAAY,CAAC,SAAS,CAAC,CAAC;YACxB,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACvD,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,IAAI,CAAC,CAAC;YACnD,CAAC;YACD,MAAM,GAAG,CAAC;QACX,CAAC;IACF,CAAC;IAED,MAAM,CAAkB,MAAc,EAAE,MAAkB;QACzD,MAAM,OAAO,GAA2B;YACvC,OAAO,EAAE,KAAK;YACd,MAAM;YACN,MAAM;SACN,CAAC;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;CACD"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,MAAM,OAAO,aAAa;IAGL;IAFZ,EAAE,GAAG,CAAC,CAAC;IAEf,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAI,CAAC;IAEpC,KAAK,CAAC,IAAI,CACT,OAA0D,EAC1D,OAAgC;QAEhC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC,KAAU,CAAC;QAC5B,CAAC;QACD,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;YAC1B,OAAO,QAAQ,CAAC,MAAgB,CAAC;QAClC,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,QAAoB,CAAC;QAC7B,CAAC;aAAM,CAAC;YACP,2CAA2C;YAC3C,OAAO,QAAQ,CAAC;QACjB,CAAC;IACF,CAAC;IAED,YAAY,CACX,MAAc,EACd,SAAoB,EAAE;QAEtB,OAAO;YACN,OAAO,EAAE,KAAc;YACvB,MAAM;YACN,MAAM;YACN,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;SACb,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,OAAO,CACpB,GAAwD,EACxD,aAAsC;QAItC,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,IAAI,CAAC;YACJ,MAAM,OAAO,GAA2B;gBACvC,cAAc,EAAE,kBAAkB;gBAClC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;aACxB,CAAC;YACF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACjC,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;gBACzB,MAAM,EAAE,UAAU,CAAC,MAAM;aACzB,CAAC,CAAC;YAEH,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAEa,CAAC;QACvC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,OAAO;gBACN,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACN,IAAI,EAAE,gBAAgB,CAAC,cAAc;oBACrC,OAAO,EAAE,mBAAmB,GAAG,EAAE;iBACjC;gBACD,EAAE,EAAE,IAAI;aACR,CAAC;QACH,CAAC;IACF,CAAC;IAED,KAAK,CAAC,MAAM,CAAkB,MAAc,EAAE,MAAkB;QAC/D,MAAM,OAAO,GAA2B;YACvC,OAAO,EAAE,KAAK;YACd,MAAM;YACN,MAAM;SACN,CAAC;QACF,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAC7B,CAAC,CAAC;IACJ,CAAC;CACD"}

package/dist/error.d.ts

@@ -0,0 +1,10 @@
+export declare enum JsonRpcErrorCode {
+    INVALID_REQUEST = -32600,
+    METHOD_NOT_FOUND = -32601,
+    INVALID_PARAMS = -32602,
+    INTERNAL_ERROR = -32603,
+    PARSE_ERROR = -32700,
+    REQUEST_ABORTED = -32800,
+    REQUEST_FAILED = -32801
+}
+//# sourceMappingURL=error.d.ts.map

package/dist/error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,oBAAY,gBAAgB;IAC3B,eAAe,SAAS;IACxB,gBAAgB,SAAS;IACzB,cAAc,SAAS;IACvB,cAAc,SAAS;IACvB,WAAW,SAAS;IACpB,eAAe,SAAS;IACxB,cAAc,SAAS;CACvB"}

package/dist/error.js

@@ -0,0 +1,11 @@
+export var JsonRpcErrorCode;
+(function (JsonRpcErrorCode) {
+    JsonRpcErrorCode[JsonRpcErrorCode["INVALID_REQUEST"] = -32600] = "INVALID_REQUEST";
+    JsonRpcErrorCode[JsonRpcErrorCode["METHOD_NOT_FOUND"] = -32601] = "METHOD_NOT_FOUND";
+    JsonRpcErrorCode[JsonRpcErrorCode["INVALID_PARAMS"] = -32602] = "INVALID_PARAMS";
+    JsonRpcErrorCode[JsonRpcErrorCode["INTERNAL_ERROR"] = -32603] = "INTERNAL_ERROR";
+    JsonRpcErrorCode[JsonRpcErrorCode["PARSE_ERROR"] = -32700] = "PARSE_ERROR";
+    JsonRpcErrorCode[JsonRpcErrorCode["REQUEST_ABORTED"] = -32800] = "REQUEST_ABORTED";
+    JsonRpcErrorCode[JsonRpcErrorCode["REQUEST_FAILED"] = -32801] = "REQUEST_FAILED";
+})(JsonRpcErrorCode || (JsonRpcErrorCode = {}));
+//# sourceMappingURL=error.js.map

package/dist/error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,gBAQX;AARD,WAAY,gBAAgB;IAC3B,kFAAwB,CAAA;IACxB,oFAAyB,CAAA;IACzB,gFAAuB,CAAA;IACvB,gFAAuB,CAAA;IACvB,0EAAoB,CAAA;IACpB,kFAAwB,CAAA;IACxB,gFAAuB,CAAA;AACxB,CAAC,EARW,gBAAgB,KAAhB,gBAAgB,QAQ3B"}

package/dist/server.d.ts

@@ -1,16 +1,9 @@
-export declare enum JsonRpcErrorCodes {
-    INVALID_REQUEST = -32600,
-    METHOD_NOT_FOUND = -32601,
-    INVALID_PARAMS = -32602,
-    INTERNAL_ERROR = -32603,
-    PARSE_ERROR = -32700,
-    REQUEST_ABORTED = -32800
-}
+import { JsonRpcErrorCode } from "./error";
 export type Handler<Result> = (params: any) => any | Promise<Result>;
 export declare class JsonRpcServer {
     private methods;
     register(method: string, handler: Handler<any>): void;
-    handle<Result, Method = string>(raw: unknown): Promise<JsonRpcResponse<Result, JsonRpcErrorCodes | number> | JsonRpcResponse<Result, JsonRpcErrorCodes | number>[] | null>;
+    handle<Result, Method = string>(raw: unknown): Promise<JsonRpcResponse<Result, JsonRpcErrorCode | number> | JsonRpcResponse<Result, JsonRpcErrorCode | number>[] | null>;
     private error;
 }
 //# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,oBAAY,iBAAiB;IAC5B,eAAe,SAAS;IACxB,gBAAgB,SAAS;IACzB,cAAc,SAAS;IACvB,cAAc,SAAS;IACvB,WAAW,SAAS;IACpB,eAAe,SAAS;CACxB;AACD,MAAM,MAAM,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAErE,qBAAa,aAAa;IACzB,OAAO,CAAC,OAAO,CAAmC;IAElD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;IAIxC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EACnC,GAAG,EAAE,OAAO,GACV,OAAO,CACP,eAAe,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAAC,GACnD,eAAe,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAAC,EAAE,GACrD,IAAI,CACN;IAsED,OAAO,CAAC,KAAK;CAYb"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,MAAM,MAAM,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAErE,qBAAa,aAAa;IACzB,OAAO,CAAC,OAAO,CAAmC;IAElD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;IAIxC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EACnC,GAAG,EAAE,OAAO,GACV,OAAO,CACP,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAC,GAClD,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAC,EAAE,GACpD,IAAI,CACN;IAsED,OAAO,CAAC,KAAK;CAYb"}

package/dist/server.js

@@ -1,12 +1,4 @@
-export var JsonRpcErrorCodes;
-(function (JsonRpcErrorCodes) {
-    JsonRpcErrorCodes[JsonRpcErrorCodes["INVALID_REQUEST"] = -32600] = "INVALID_REQUEST";
-    JsonRpcErrorCodes[JsonRpcErrorCodes["METHOD_NOT_FOUND"] = -32601] = "METHOD_NOT_FOUND";
-    JsonRpcErrorCodes[JsonRpcErrorCodes["INVALID_PARAMS"] = -32602] = "INVALID_PARAMS";
-    JsonRpcErrorCodes[JsonRpcErrorCodes["INTERNAL_ERROR"] = -32603] = "INTERNAL_ERROR";
-    JsonRpcErrorCodes[JsonRpcErrorCodes["PARSE_ERROR"] = -32700] = "PARSE_ERROR";
-    JsonRpcErrorCodes[JsonRpcErrorCodes["REQUEST_ABORTED"] = -32800] = "REQUEST_ABORTED";
-})(JsonRpcErrorCodes || (JsonRpcErrorCodes = {}));
+import { JsonRpcErrorCode } from "./error";
 export class JsonRpcServer {
     methods = new Map();
     register(method, handler) {
@@ -16,7 +8,7 @@ export class JsonRpcServer {
         // handle batch
         if (Array.isArray(raw)) {
             if (raw.length === 0) {
-                return this.error(null, JsonRpcErrorCodes.INVALID_REQUEST, "Invalid request");
+                return this.error(null, JsonRpcErrorCode.INVALID_REQUEST, "Invalid request");
             }
             const responses = await Promise.all(raw.map((item) => this.handle(item)));
             const filtered = responses.filter((r) => r !== null);
@@ -28,7 +20,7 @@ export class JsonRpcServer {
             req === null ||
             req.jsonrpc !== "2.0" ||
             typeof req.method !== "string") {
-            return this.error(null, JsonRpcErrorCodes.INVALID_REQUEST, "Invalid request");
+            return this.error(null, JsonRpcErrorCode.INVALID_REQUEST, "Invalid request");
         }
         const id = typeof req?.id === "string" ||
             typeof req?.id === "number" ||
@@ -39,7 +31,7 @@ export class JsonRpcServer {
         if (!handler) {
             return id === null
                 ? null
-                : this.error(req.id, JsonRpcErrorCodes.METHOD_NOT_FOUND, "Method not found");
+                : this.error(req.id, JsonRpcErrorCode.METHOD_NOT_FOUND, "Method not found");
         }
         try {
             const result = await handler(req.params);
@@ -52,7 +44,7 @@ export class JsonRpcServer {
             };
         }
         catch (err) {
-            return this.error(req.id ?? null, JsonRpcErrorCodes.INTERNAL_ERROR, "Internal error", err instanceof Error ? err.message : err);
+            return this.error(req.id ?? null, JsonRpcErrorCode.INTERNAL_ERROR, "Internal error", err instanceof Error ? err.message : err);
         }
     }
     error(id, code, message, data) {

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/example.ts

@@ -26,5 +26,5 @@ import { JsonRpcClient } from "./src";
 
 const url = "http://localhost:4444";
 const client = new JsonRpcClient(url);
-const result = await client.call("ping", []);
+const result = await client.call(client.buildRequest("ping", []));
 console.log(result);

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@asyncswap/jsonrpc",
 	"description": "A minimal jsonrpc spec implementation.",
 	"author": "Meek Msaki",
-	"version": "0.4.2",
+	"version": "0.4.4",
 	"license": "MIT",
 	"main": "dist/index.js",
 	"module": "dist/index.mjs",

package/src/client.ts

@@ -1,41 +1,47 @@
+import { JsonRpcErrorCode } from "./error";
 export class JsonRpcClient {
 	private id = 0;
 
 	constructor(private url: string) { }
 
 	async call<Method = string, Result = unknown, E = unknown>(
-		method: Method,
-		params: unknown[] = [],
+		request: JsonRpcRequest<Method> | JsonRpcRequest<Method>[],
 		headers?: Record<string, string>,
-	): Promise<Result | E> {
-		const request: JsonRpcRequest<Method> = this.buildRequest<Method>(
-			method,
-			params,
-		);
+	): Promise<Result | Result[] | E> {
 		const response = await this.request(request, headers);
-		++this.id;
 		if ("error" in response) {
 			return response.error as E;
 		}
-		return response.result as Result;
+		if ("result" in response) {
+			return response.result as Result;
+		}
+		if (Array.isArray(response)) {
+			return response as Result[];
+		} else {
+			// what else can result be? maybe indefined
+			return response;
+		}
 	}
 
-	buildRequest<Method>(method: Method, params: unknown[] = []) {
+	buildRequest<Method>(
+		method: Method,
+		params: unknown[] = [],
+	): JsonRpcRequest<Method> {
 		return {
 			jsonrpc: "2.0" as const,
 			method,
 			params,
-			id: this.id,
+			id: ++this.id,
 		};
 	}
 
 	private async request(
-		req: JsonRpcRequest<unknown>,
+		req: JsonRpcRequest<unknown> | JsonRpcRequest<unknown>[],
 		customHeaders?: Record<string, string>,
-		timeout: number = 5000,
-	) {
+	): Promise<
+		JsonRpcResponse<unknown, number> | JsonRpcResponse<unknown, number>[]
+	> {
 		const controller = new AbortController();
-		const timeoutId = setTimeout(() => controller.abort(), timeout);
 		try {
 			const headers: Record<string, string> = {
 				"Content-Type": "application/json",
@@ -45,24 +51,34 @@ export class JsonRpcClient {
 				method: "POST",
 				headers,
 				body: JSON.stringify(req),
+				signal: controller.signal,
 			});
 
-			return (await res.json()) as JsonRpcResponse<unknown, number>;
+			return (await res.json()) as
+				| JsonRpcResponse<unknown, number>
+				| JsonRpcResponse<unknown, number>[];
 		} catch (err) {
-			clearTimeout(timeoutId);
-			if (err instanceof Error && err.name === "AbortError") {
-				throw new Error(`Req timeout after ${timeout}ms`);
-			}
-			throw err;
+			return {
+				jsonrpc: "2.0",
+				error: {
+					code: JsonRpcErrorCode.REQUEST_FAILED,
+					message: `Request failed: ${err}`,
+				},
+				id: null,
+			};
 		}
 	}
 
-	notify<Method = string>(method: Method, params?: unknown[]) {
+	async notify<Method = string>(method: Method, params?: unknown[]) {
 		const request: JsonRpcRequest<Method> = {
 			jsonrpc: "2.0",
 			method,
 			params,
 		};
-		return this.request(request);
+		await fetch(this.url, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify(request),
+		});
 	}
 }

package/src/error.ts

@@ -0,0 +1,9 @@
+export enum JsonRpcErrorCode {
+	INVALID_REQUEST = -32600,
+	METHOD_NOT_FOUND = -32601,
+	INVALID_PARAMS = -32602,
+	INTERNAL_ERROR = -32603,
+	PARSE_ERROR = -32700,
+	REQUEST_ABORTED = -32800,
+	REQUEST_FAILED = -32801,
+}

package/src/server.ts

@@ -1,11 +1,4 @@
-export enum JsonRpcErrorCodes {
-	INVALID_REQUEST = -32600,
-	METHOD_NOT_FOUND = -32601,
-	INVALID_PARAMS = -32602,
-	INTERNAL_ERROR = -32603,
-	PARSE_ERROR = -32700,
-	REQUEST_ABORTED = -32800,
-}
+import { JsonRpcErrorCode } from "./error";
 export type Handler<Result> = (params: any) => any | Promise<Result>;
 
 export class JsonRpcServer {
@@ -18,8 +11,8 @@ export class JsonRpcServer {
 	async handle<Result, Method = string>(
 		raw: unknown,
 	): Promise<
-		| JsonRpcResponse<Result, JsonRpcErrorCodes | number>
-		| JsonRpcResponse<Result, JsonRpcErrorCodes | number>[]
+		| JsonRpcResponse<Result, JsonRpcErrorCode | number>
+		| JsonRpcResponse<Result, JsonRpcErrorCode | number>[]
 		| null
 	> {
 		// handle batch
@@ -27,13 +20,13 @@ export class JsonRpcServer {
 			if (raw.length === 0) {
 				return this.error(
 					null,
-					JsonRpcErrorCodes.INVALID_REQUEST,
+					JsonRpcErrorCode.INVALID_REQUEST,
 					"Invalid request",
 				);
 			}
 			const responses = await Promise.all(raw.map((item) => this.handle(item)));
 			const filtered = responses.filter(
-				(r): r is JsonRpcResponse<Result, JsonRpcErrorCodes | number> =>
+				(r): r is JsonRpcResponse<Result, JsonRpcErrorCode | number> =>
 					r !== null,
 			);
 			return filtered.length > 0 ? filtered : null;
@@ -50,7 +43,7 @@ export class JsonRpcServer {
 		) {
 			return this.error(
 				null,
-				JsonRpcErrorCodes.INVALID_REQUEST,
+				JsonRpcErrorCode.INVALID_REQUEST,
 				"Invalid request",
 			);
 		}
@@ -68,7 +61,7 @@ export class JsonRpcServer {
 				? null
 				: this.error(
 					req.id,
-					JsonRpcErrorCodes.METHOD_NOT_FOUND,
+					JsonRpcErrorCode.METHOD_NOT_FOUND,
 					"Method not found",
 				);
 		}
@@ -84,7 +77,7 @@ export class JsonRpcServer {
 		} catch (err) {
 			return this.error(
 				req.id ?? null,
-				JsonRpcErrorCodes.INTERNAL_ERROR,
+				JsonRpcErrorCode.INTERNAL_ERROR,
 				"Internal error",
 				err instanceof Error ? err.message : err,
 			);
@@ -93,10 +86,10 @@ export class JsonRpcServer {
 
 	private error<Result, Method = string>(
 		id: JsonRpcRequest<Method>["id"],
-		code: JsonRpcErrorCodes | number,
+		code: JsonRpcErrorCode | number,
 		message: string,
 		data?: unknown,
-	): JsonRpcResponse<Result, JsonRpcErrorCodes | number> {
+	): JsonRpcResponse<Result, JsonRpcErrorCode | number> {
 		return {
 			jsonrpc: "2.0",
 			error: { code, message, data },