add Server.prototype.callp method that returns a promise which closes #…

…182
tedeh · Aug 12, 2022 · bbed54b · bbed54b
1 parent 1d2308e
commit bbed54b
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 0 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -248,6 +248,7 @@ export interface Server extends events.EventEmitter {
   error(code?: number, message?: string, data?: object): JSONRPCError;
   call(request: JSONRPCRequestLike | Array<JSONRPCRequestLike>, originalCallback?: ServerCallCallbackType): void;
   call(request: JSONRPCRequestLike | Array<JSONRPCRequestLike>, context: object, originalCallback?: ServerCallCallbackType): void;
+  callp(request: JSONRPCRequestLike | Array<JSONRPCRequestLike>, context?: object): Promise<JSONRPCResultLike>;
 }
 
 export declare const Server: ServerConstructor;

diff --git a/lib/server/index.js b/lib/server/index.js
@@ -333,6 +333,25 @@ Server.prototype.call = function(request, context, originalCallback) {
   });
 };
 
+/**
+ *  Calls a method on the server returning a promise
+ *  @param {Object|Array|String} request A JSON-RPC request object. Object for single request, Array for batches and String for automatic parsing (using the reviver option)
+ *  @param {Object} [context] Optional context object passed to methods
+ *  @return {Promise<Object>}
+ */
+Server.prototype.callp = function (...args) {
+  const self = this;
+  return new Promise(function (resolve, reject) {
+    return self.call(...args, function (err, response) {
+      if (err) {
+        reject(err);
+        return;
+      }
+      resolve(response);
+    });
+  });
+};
+
 /**
  * Invoke the router
  * @param {String} method Method to resolve

diff --git a/promise/index.d.ts b/promise/index.d.ts
@@ -245,6 +245,7 @@ export interface Server extends events.EventEmitter {
   error(code?: number, message?: string, data?: object): JSONRPCError;
   call(request: JSONRPCRequestLike | Array<JSONRPCRequestLike>, originalCallback?: ServerCallCallbackType): void;
   call(request: JSONRPCRequestLike | Array<JSONRPCRequestLike>, context: object, originalCallback?: ServerCallCallbackType): void;
+  callp(request: JSONRPCRequestLike | Array<JSONRPCRequestLike>, context?: object): Promise<JSONRPCResultLike>;
 }
 
 export declare const Server: ServerConstructor;

diff --git a/test/server.test.js b/test/server.test.js
@@ -551,6 +551,24 @@ describe('jayson.server', function() {
 
     });
 
+    describe('callp', function () {
+
+      it('should return a promise that resolves', async function () {
+        const context = {};
+        const request = utils.request('add', [10, 20]);
+        const response = await server.callp(request, context);
+        await should(response).have.property('result', 30);
+      });
+
+      it('should return a promise that rejects', async function () {
+        const context = {};
+        const request = 'invalid request'
+        const promise = server.callp(request, context);
+        await should(promise).be.rejected();
+      });
+
+    });
+
   });
 
 });
diff --git a/typescript/test.ts b/typescript/test.ts
@@ -806,6 +806,28 @@ export function test_server_and_method_call () {
   });
 }
 
+export async function test_server_and_method_callp () {
+  const server = new jayson.Server();
+  const request = jayson.Utils.request('add', [1, 2], undefined, {generator: () => Math.random()});
+  await server.callp(request, {});
+  await server.callp(request);
+  const response = await server.callp(request).catch(err => {
+    console.error(err);
+  })
+  console.log(response.result);
+}
+
+export async function test_server_and_method_callp_promise () {
+  const server = new jaysonPromise.Server();
+  const request = jayson.Utils.request('add', [1, 2], undefined, {generator: () => Math.random()});
+  await server.callp(request, {});
+  await server.callp(request);
+  const response = await server.callp(request).catch(err => {
+    console.error(err);
+  })
+  console.log(response.result);
+}
+
 export function test_websocket () {
   const wss = new WebSocket.Server({port: 12345});
   const server = new jayson.Server();