@msaki/jsonrpc 0.0.4 → 0.1.2

package/README.md

@@ -1,5 +1,13 @@
 # jsonrpc
 
+## `@msaki/jsonrpc`
+
+A minimal jsonrpc server and client library.
+
+```sh
+bun add @msaki/jsonrpc
+```
+
 ## Usage
 
 ### RPC Server
@@ -30,24 +38,15 @@ Bun.serve({
 console.log("JSON-RPC sever on http://localhost:4444")
 ```
 
-### PRC Client
+### RPC Client
 
 ```ts
-import { JsonRpcClient } from "@msaki/jsonrpc";
-import type {
-  JsonRpcRequest,
-  JsonRpcResponse
-} from "@msaki/jsonrpc";
-
+import { initializeRpcClient } from "@msaki/jsonrpc";
 const url = "http://localhost:4444";
-
-const client = new JsonRpcClient(async (req: JsonRpcRequest) => {
-  const res = await fetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(req)
-  });
-
-  return (await res.json()) as JsonRpcResponse
-});
+const client = initializeRpcClient(url);
+const result = await client.call(
+  "ping",
+  []
+);
+console.log(result)
 ```

package/dist/client.d.ts

@@ -2,8 +2,9 @@ import type { JsonRpcRequest, JsonRpcResponse } from "./types";
 export declare class JsonRpcClient {
     private send;
     private id;
-    constructor(send: (req: JsonRpcRequest) => Promise<JsonRpcResponse>);
-    call<T = unknown>(method: string, params?: unknown): Promise<T>;
-    notify(method: string, params?: unknown): Promise<JsonRpcResponse>;
+    constructor(send: (req: JsonRpcRequest<unknown>) => Promise<JsonRpcResponse<unknown, number>>);
+    call<Method = string, Result = unknown, E = unknown>(method: Method, params?: unknown[]): Promise<Result | E>;
+    notify<Method = string>(method: Method, params?: unknown[]): Promise<JsonRpcResponse<unknown, number>>;
 }
+export declare function initializeRpcClient(url: string): JsonRpcClient;
 //# 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,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/D,qBAAa,aAAa;IAItB,OAAO,CAAC,IAAI;IAHd,OAAO,CAAC,EAAE,CAAI;gBAGJ,IAAI,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,eAAe,CAAC;IAG3D,IAAI,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAerE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;CAQxC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/D,qBAAa,aAAa;IAItB,OAAO,CAAC,IAAI;IAHd,OAAO,CAAC,EAAE,CAAI;gBAGJ,IAAI,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAGrF,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAcnH,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE;CAQ3D;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAW9D"}

package/dist/client.js

@@ -13,8 +13,7 @@ export class JsonRpcClient {
         };
         const response = await this.send(request);
         if ("error" in response) {
-            const e = response.error;
-            throw new Error(`RPC error ${e.code} ${e.message}`);
+            return response.error;
         }
         return response.result;
     }
@@ -27,4 +26,15 @@ export class JsonRpcClient {
         return this.send(request);
     }
 }
+export function initializeRpcClient(url) {
+    const client = new JsonRpcClient(async (req) => {
+        const res = await fetch(url, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(req)
+        });
+        return (await res.json());
+    });
+    return client;
+}
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAa;IAId;IAHF,EAAE,GAAG,CAAC,CAAA;IAEd,YACU,IAAuD;QAAvD,SAAI,GAAJ,IAAI,CAAmD;IAC9D,CAAC;IAEJ,KAAK,CAAC,IAAI,CAAc,MAAc,EAAE,MAAgB;QACtD,MAAM,OAAO,GAAmB;YAC9B,OAAO,EAAE,KAAK;YACd,MAAM;YACN,MAAM;YACN,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAA;YACxB,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QACrD,CAAC;QACD,OAAO,QAAQ,CAAC,MAAW,CAAA;IAC7B,CAAC;IAED,MAAM,CAAC,MAAc,EAAE,MAAgB;QACrC,MAAM,OAAO,GAAmB;YAC9B,OAAO,EAAE,KAAK;YACd,MAAM;YACN,MAAM;SACP,CAAA;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;CACF"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAa;IAId;IAHF,EAAE,GAAG,CAAC,CAAA;IAEd,YACU,IAAiF;QAAjF,SAAI,GAAJ,IAAI,CAA6E;IACxF,CAAC;IAEJ,KAAK,CAAC,IAAI,CAAiD,MAAc,EAAE,MAAkB;QAC3F,MAAM,OAAO,GAA2B;YACtC,OAAO,EAAE,KAAK;YACd,MAAM;YACN,MAAM;YACN,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;YACxB,OAAO,QAAQ,CAAC,KAAU,CAAA;QAC5B,CAAC;QACD,OAAO,QAAQ,CAAC,MAAgB,CAAA;IAClC,CAAC;IAED,MAAM,CAAkB,MAAc,EAAE,MAAkB;QACxD,MAAM,OAAO,GAA2B;YACtC,OAAO,EAAE,KAAK;YACd,MAAM;YACN,MAAM;SACP,CAAA;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;CACF;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE,GAA4B,EAAE,EAAE;QACtE,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAC3B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;SAC1B,CAAC,CAAC;QAEH,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAqC,CAAA;IAC/D,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/server.d.ts

@@ -1,15 +1,17 @@
 import type { JsonRpcResponse } from "./types";
-export declare const INVALID_REQUEST = -32600;
-export declare const METHOD_NOT_FOUND = -32601;
-export declare const INVALID_PARAMS = -32602;
-export declare const INTERNAL_ERROR = -32603;
-export declare const PARSE_ERROR = -32700;
-export declare const REQUEST_ABORTED = -32800;
-export type Handler = (params: any) => any | Promise<any>;
+export declare enum JsonRpcErrorCodes {
+    INVALID_REQUEST = -32600,
+    METHOD_NOT_FOUND = -32601,
+    INVALID_PARAMS = -32602,
+    INTERNAL_ERROR = -32603,
+    PARSE_ERROR = -32700,
+    REQUEST_ABORTED = -32800
+}
+export type Handler<Result> = (params: any) => any | Promise<Result>;
 export declare class JsonRpcServer {
     private methods;
-    register(method: string, handler: Handler): void;
-    handle(raw: unknown): Promise<JsonRpcResponse | JsonRpcResponse[] | null>;
+    register(method: string, handler: Handler<any>): void;
+    handle<Result, Method = string>(raw: unknown): Promise<JsonRpcResponse<Result, JsonRpcErrorCodes | number> | JsonRpcResponse<Result, JsonRpcErrorCodes | 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,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,SAAS,CAAC;AAEhE,eAAO,MAAM,eAAe,SAAU,CAAC;AACvC,eAAO,MAAM,gBAAgB,SAAS,CAAC;AACvC,eAAO,MAAM,cAAc,SAAW,CAAC;AACvC,eAAO,MAAM,cAAc,SAAW,CAAC;AACvC,eAAO,MAAM,WAAW,SAAc,CAAC;AACvC,eAAO,MAAM,eAAe,SAAU,CAAC;AAEvC,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;AAEzD,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAA6B;IAE5C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAInC,MAAM,CACV,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,eAAe,GAAG,eAAe,EAAE,GAAG,IAAI,CAAC;IAuDtD,OAAO,CAAC,KAAK;CAYd"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,SAAS,CAAC;AAE/D,oBAAY,iBAAiB;IAC3B,eAAe,SAAS;IACxB,gBAAgB,SAAS;IACzB,cAAc,SAAS;IACvB,cAAc,SAAS;IACvB,WAAW,SAAS;IACpB,eAAe,SAAS;CACzB;AACD,MAAM,MAAM,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEpE,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAkC;IAEjD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;IAIxC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAClC,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;IAuD9H,OAAO,CAAC,KAAK;CAYd"}

package/dist/server.js

@@ -1,9 +1,12 @@
-export const INVALID_REQUEST = -32600;
-export const METHOD_NOT_FOUND = -32601;
-export const INVALID_PARAMS = -32602; // unused
-export const INTERNAL_ERROR = -32603;
-export const PARSE_ERROR = -32700; // unused
-export const REQUEST_ABORTED = -32800; // unused
+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 = {}));
 export class JsonRpcServer {
     methods = new Map();
     register(method, handler) {
@@ -13,7 +16,7 @@ export class JsonRpcServer {
         // handle batch
         if (Array.isArray(raw)) {
             if (raw.length === 0) {
-                return this.error(null, INVALID_REQUEST, "Invalid request");
+                return this.error(null, JsonRpcErrorCodes.INVALID_REQUEST, "Invalid request");
             }
             const responses = await Promise.all(raw.map(item => this.handle(item)));
             const filtered = responses.filter((r) => r !== null);
@@ -25,14 +28,14 @@ export class JsonRpcServer {
             req === null ||
             req.jsonrpc !== "2.0" ||
             typeof req.method !== "string") {
-            return this.error(null, INVALID_REQUEST, "Invalid request");
+            return this.error(null, JsonRpcErrorCodes.INVALID_REQUEST, "Invalid request");
         }
         const id = typeof req?.id === "string" ||
             typeof req?.id === "number" ||
             req?.id === null ? req.id : null;
         const handler = this.methods.get(req.method);
         if (!handler) {
-            return id === null ? null : this.error(req.id, METHOD_NOT_FOUND, "Method not found");
+            return id === null ? null : this.error(req.id, JsonRpcErrorCodes.METHOD_NOT_FOUND, "Method not found");
         }
         try {
             const result = await handler(req.params);
@@ -45,7 +48,7 @@ export class JsonRpcServer {
             };
         }
         catch (err) {
-            return this.error(req.id ?? null, INTERNAL_ERROR, "Internal error", err instanceof Error ? err.message : err);
+            return this.error(req.id ?? null, JsonRpcErrorCodes.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":"AAEA,MAAM,CAAC,MAAM,eAAe,GAAI,CAAC,KAAK,CAAC;AACvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAK,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAK,CAAC,KAAK,CAAC,CAAC,SAAS;AACjD,MAAM,CAAC,MAAM,cAAc,GAAK,CAAC,KAAK,CAAC;AACvC,MAAM,CAAC,MAAM,WAAW,GAAQ,CAAC,KAAK,CAAC,CAAC,SAAS;AACjD,MAAM,CAAC,MAAM,eAAe,GAAI,CAAC,KAAK,CAAC,CAAC,SAAS;AAIjD,MAAM,OAAO,aAAa;IAChB,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAA;IAE5C,QAAQ,CAAC,MAAc,EAAE,OAAgB;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,MAAM,CACV,GAAY;QAEZ,eAAe;QACf,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAA;YAC7D,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CACnC,CAAA;YACC,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CACjC,CAAC,CAAC,EAAwB,EAAE,CAAC,CAAC,KAAK,IAAI,CACxC,CAAA;YACD,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAA;QAC9C,CAAC;QAED,yBAAyB;QACzB,IAAI,GAAG,GAAG,GAA8B,CAAA;QAExC,IACE,OAAO,GAAG,KAAK,QAAQ;YACrB,GAAG,KAAK,IAAI;YACZ,GAAG,CAAC,OAAO,KAAK,KAAK;YACrB,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,EAChC,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAA;QAC7D,CAAC;QAED,MAAM,EAAE,GACN,OAAQ,GAAW,EAAE,EAAE,KAAK,QAAQ;YACpC,OAAQ,GAAW,EAAE,EAAE,KAAK,QAAQ;YACnC,GAAW,EAAE,EAAE,KAAK,IAAI,CAAC,CAAC,CAAE,GAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;QAEpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;QACtF,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACxC,IAAI,GAAG,CAAC,EAAE,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAA,CAAC,eAAe;YACrD,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM;gBACN,EAAE,EAAE,GAAG,CAAC,EAAE;aACX,CAAA;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,KAAK,CACf,GAAG,CAAC,EAAE,IAAI,IAAI,EACd,cAAc,EACd,gBAAgB,EAChB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACzC,CAAA;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CACX,EAAwB,EACxB,IAAY,EACZ,OAAe,EACf,IAAc;QAEd,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;YAC9B,EAAE,EAAE,EAAE,IAAI,IAAI;SACf,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -1,24 +1,24 @@
 export type JsonRpcId = string | number | null;
-export interface JsonRpcRequest {
+export interface JsonRpcRequest<Method> {
     jsonrpc: "2.0";
-    method: string;
-    params?: unknown;
+    method: Method;
+    params?: unknown[];
     id?: JsonRpcId;
 }
-export interface JsonRpcSuccess {
+export interface JsonRpcSuccess<Result> {
     jsonrpc: "2.0";
-    result: unknown;
+    result: Result;
     id: JsonRpcId;
 }
-export interface JsonRpcErrorObject {
-    code: number;
+export interface JsonRpcErrorObject<ErrorCode> {
+    code: ErrorCode;
     message: string;
     data?: unknown;
 }
-export interface JsonRpcError {
+export interface JsonRpcError<ErrorCode> {
     jsonrpc: "2.0";
-    error: JsonRpcErrorObject;
+    error: JsonRpcErrorObject<ErrorCode>;
     id: JsonRpcId;
 }
-export type JsonRpcResponse = JsonRpcSuccess | JsonRpcError;
+export type JsonRpcResponse<Result, ErrorCode> = JsonRpcSuccess<Result> | JsonRpcError<ErrorCode>;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAE9C,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,KAAK,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,EAAE,CAAC,EAAE,SAAS,CAAA;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,KAAK,CAAA;IACd,MAAM,EAAE,OAAO,CAAA;IACf,EAAE,EAAE,SAAS,CAAA;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,KAAK,CAAA;IACd,KAAK,EAAE,kBAAkB,CAAA;IACzB,EAAE,EAAE,SAAS,CAAA;CACd;AAED,MAAM,MAAM,eAAe,GAAG,cAAc,GAAG,YAAY,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAE9C,MAAM,WAAW,cAAc,CAAC,MAAM;IACpC,OAAO,EAAE,KAAK,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,EAAE,CAAA;IAClB,EAAE,CAAC,EAAE,SAAS,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,MAAM;IACpC,OAAO,EAAE,KAAK,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,SAAS,CAAA;CACd;AAED,MAAM,WAAW,kBAAkB,CAAC,SAAS;IAC3C,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,YAAY,CAAC,SAAS;IACrC,OAAO,EAAE,KAAK,CAAA;IACd,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAA;IACpC,EAAE,EAAE,SAAS,CAAA;CACd;AAED,MAAM,MAAM,eAAe,CAAC,MAAM,EAAE,SAAS,IAAI,cAAc,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,SAAS,CAAC,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@msaki/jsonrpc",
   "author": "Meek Msaki",
-  "version": "0.0.4",
+  "version": "0.1.2",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -21,7 +21,7 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "publish": "bun run build && bun run npm login && bun run npm publish --access public",
+    "publish": "bun run build && bun publish --access public",
     "lint": "tsc"
   },
   "devDependencies": {

package/src/client.ts

@@ -4,11 +4,11 @@ export class JsonRpcClient {
   private id = 0
 
   constructor(
-    private send: (req: JsonRpcRequest) => Promise<JsonRpcResponse>
+    private send: (req: JsonRpcRequest<unknown>) => Promise<JsonRpcResponse<unknown, number>>
   ) {}
 
-  async call<T = unknown>(method: string, params?: unknown): Promise<T> {
-    const request: JsonRpcRequest = {
+  async call<Method = string, Result = unknown, E = unknown>(method: Method, params?: unknown[]): Promise<Result | E> {
+    const request: JsonRpcRequest<Method> = {
       jsonrpc: "2.0",
       method,
       params,
@@ -16,14 +16,13 @@ export class JsonRpcClient {
     }
     const response = await this.send(request);
     if ("error" in response) {
-      const e = response.error
-      throw new Error(`RPC error ${e.code} ${e.message}`)
+      return response.error as E
     }
-    return response.result as T
+    return response.result as Result
   }
 
-  notify(method: string, params?: unknown) {
-    const request: JsonRpcRequest = {
+  notify<Method = string>(method: Method, params?: unknown[]) {
+    const request: JsonRpcRequest<Method> = {
       jsonrpc: "2.0",
       method,
       params
@@ -31,3 +30,16 @@ export class JsonRpcClient {
     return this.send(request)
   }
 }
+
+export function initializeRpcClient(url: string): JsonRpcClient {
+  const client = new JsonRpcClient(async (req: JsonRpcRequest<unknown>) => {
+    const res = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(req)
+    });
+
+    return (await res.json()) as JsonRpcResponse<unknown, number>
+  });
+  return client;
+}

package/src/server.ts

@@ -1,58 +1,59 @@
-import type { JsonRpcResponse,  JsonRpcRequest } from "./types";
+import type { JsonRpcResponse, JsonRpcRequest } from "./types";
 
-export const INVALID_REQUEST  = -32600;
-export const METHOD_NOT_FOUND = -32601;
-export const INVALID_PARAMS   = -32602; // unused
-export const INTERNAL_ERROR   = -32603;
-export const PARSE_ERROR      = -32700; // unused
-export const REQUEST_ABORTED  = -32800; // unused
-
-export type Handler = (params: any) => any | Promise<any>
+export enum JsonRpcErrorCodes {
+  INVALID_REQUEST = -32600,
+  METHOD_NOT_FOUND = -32601,
+  INVALID_PARAMS = -32602,
+  INTERNAL_ERROR = -32603,
+  PARSE_ERROR = -32700,
+  REQUEST_ABORTED = -32800,
+}
+export type Handler<Result> = (params: any) => any | Promise<Result>
 
 export class JsonRpcServer {
-  private methods = new Map<string, Handler>()
+  private methods = new Map<string, Handler<any>>()
 
-  register(method: string, handler: Handler) {
+  register(method: string, handler: Handler<any>) {
     this.methods.set(method, handler)
   }
 
-  async handle(
-    raw: unknown, 
-  ): Promise<JsonRpcResponse | JsonRpcResponse[] | null> {
+  async handle<Result, Method = string>(
+    raw: unknown,
+  ): Promise<JsonRpcResponse<Result, JsonRpcErrorCodes | number> | JsonRpcResponse<Result, JsonRpcErrorCodes | number>[] | null> {
     // handle batch
     if (Array.isArray(raw)) {
       if (raw.length === 0) {
-        return this.error(null, INVALID_REQUEST, "Invalid request")
+        return this.error(null, JsonRpcErrorCodes.INVALID_REQUEST, "Invalid request")
       }
       const responses = await Promise.all(
         raw.map(item => this.handle(item))
       )
-        const filtered = responses.filter(
-        (r): r is JsonRpcResponse => r !== null
+      const filtered = responses.filter(
+        (r): r is JsonRpcResponse<Result, JsonRpcErrorCodes | number> => r !== null
       )
       return filtered.length > 0 ? filtered : null
     }
 
     // handle single response
-    let req = raw as Partial<JsonRpcRequest>
+    let req = raw as Partial<JsonRpcRequest<Method>>
 
     if (
       typeof req !== "object" ||
-        req === null ||
-        req.jsonrpc !== "2.0" ||
-        typeof req.method !== "string"
+      req === null ||
+      req.jsonrpc !== "2.0" ||
+      typeof req.method !== "string"
     ) {
-      return this.error(null, INVALID_REQUEST, "Invalid request")
+      return this.error(null, JsonRpcErrorCodes.INVALID_REQUEST, "Invalid request")
     }
-    
-    const id = 
+
+    const id =
       typeof (req as any)?.id === "string" ||
-      typeof (req as any)?.id === "number" ||
-      (req as any)?.id === null ? (req as any).id : null
+        typeof (req as any)?.id === "number" ||
+        (req as any)?.id === null ? (req as any).id : null
 
     const handler = this.methods.get(req.method)
     if (!handler) {
-      return id === null ? null : this.error(req.id, METHOD_NOT_FOUND, "Method not found")
+      return id === null ? null : this.error(req.id, JsonRpcErrorCodes.METHOD_NOT_FOUND, "Method not found")
     }
 
     try {
@@ -66,19 +67,19 @@ export class JsonRpcServer {
     } catch (err) {
       return this.error(
         req.id ?? null,
-        INTERNAL_ERROR,
+        JsonRpcErrorCodes.INTERNAL_ERROR,
         "Internal error",
         err instanceof Error ? err.message : err
       )
     }
   }
 
-  private error(
-    id: JsonRpcRequest["id"],
-    code: number,
+  private error<Result, Method = string>(
+    id: JsonRpcRequest<Method>["id"],
+    code: JsonRpcErrorCodes | number,
     message: string,
     data?: unknown
-  ): JsonRpcResponse {
+  ): JsonRpcResponse<Result, JsonRpcErrorCodes | number> {
     return {
       jsonrpc: "2.0",
       error: { code, message, data },

package/src/types.ts

@@ -1,28 +1,28 @@
 export type JsonRpcId = string | number | null
 
-export interface JsonRpcRequest {
+export interface JsonRpcRequest<Method> {
   jsonrpc: "2.0"
-  method: string
-  params?: unknown
+  method: Method
+  params?: unknown[]
   id?: JsonRpcId
 }
 
-export interface JsonRpcSuccess {
+export interface JsonRpcSuccess<Result> {
   jsonrpc: "2.0"
-  result: unknown
+  result: Result
   id: JsonRpcId
 }
 
-export interface JsonRpcErrorObject {
-  code: number
+export interface JsonRpcErrorObject<ErrorCode> {
+  code: ErrorCode
   message: string
   data?: unknown
 }
 
-export interface JsonRpcError {
+export interface JsonRpcError<ErrorCode> {
   jsonrpc: "2.0"
-  error: JsonRpcErrorObject
+  error: JsonRpcErrorObject<ErrorCode>
   id: JsonRpcId
 }
 
-export type JsonRpcResponse = JsonRpcSuccess | JsonRpcError
+export type JsonRpcResponse<Result, ErrorCode> = JsonRpcSuccess<Result> | JsonRpcError<ErrorCode>