allserver 2.5.0 → 2.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allserver",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Multi-protocol simple RPC server and [optional] client. Boilerplate-less. Opinionated. Minimalistic. DX-first.",
   "main": "src/index.js",
   "scripts": {
@@ -34,12 +34,12 @@
   "author": "Vasyl Boroviak",
   "license": "MIT",
   "peerDependencies": {
-    "@grpc/grpc-js": "^1.1.7",
-    "@grpc/proto-loader": "^0.7.5",
-    "bullmq": "^3.10.1",
-    "express": "^4.18.2",
-    "micro": "^10.0.1",
-    "node-fetch": "^2.6.9"
+    "@grpc/grpc-js": "1",
+    "@grpc/proto-loader": "0",
+    "bullmq": "3 - 5",
+    "express": "4",
+    "micro": "10",
+    "node-fetch": "2"
   },
   "peerDependenciesMeta": {
     "@grpc/grpc-js": {
@@ -62,17 +62,17 @@
     }
   },
   "devDependencies": {
-    "@grpc/grpc-js": "^1.1.7",
-    "@grpc/proto-loader": "^0.7.5",
-    "bullmq": "^3.10.1",
+    "@grpc/grpc-js": "^1.13.4",
+    "@grpc/proto-loader": "^0.8.0",
+    "bullmq": "^5.56.9",
     "cls-hooked": "^4.2.2",
-    "eslint": "^8.55.0",
-    "express": "^4.18.2",
+    "eslint": "^8.57.1",
+    "express": "^4.21.2",
     "lambda-local": "^1.7.3",
     "micro": "^10.0.1",
-    "mocha": "^10.2.0",
+    "mocha": "^11.7.1",
     "node-fetch": "^2.6.9",
-    "nyc": "^15.1.0",
+    "nyc": "^17.1.0",
     "prettier": "^2.1.1"
   },
   "dependencies": {

package/src/client/AllserverClient.js

@@ -141,6 +141,8 @@ module.exports = require("stampit")({
         [p]: {
             // The protocol implementation strategy.
             transport: null,
+            // The maximum time to wait until returning the ALLSERVER_CLIENT_TIMEOUT error. 0 means - no timeout.
+            timeout: 0,
             // Disable any exception throwing when calling any methods. Otherwise, throws network and server errors.
             neverThrow: true,
             // Automatically find (introspect) and call corresponding remote procedures. Use only the methods defined in client side.
@@ -173,6 +175,7 @@ module.exports = require("stampit")({
         {
             uri,
             transport,
+            timeout,
             neverThrow,
             dynamicMethods,
             autoIntrospect,
@@ -183,6 +186,7 @@ module.exports = require("stampit")({
         },
         { stamp }
     ) {
+        this[p].timeout = timeout != null ? timeout : this[p].timeout;
         this[p].neverThrow = neverThrow != null ? neverThrow : this[p].neverThrow;
         this[p].dynamicMethods = dynamicMethods != null ? dynamicMethods : this[p].dynamicMethods;
         this[p].autoIntrospect = autoIntrospect != null ? autoIntrospect : this[p].autoIntrospect;
@@ -218,10 +222,10 @@ module.exports = require("stampit")({
                     try {
                         // This is supposed to be executed only once (per uri) unless it throws.
                         // There are only 3 situations when this throws:
-                        // * the "introspect" method not found on server,
-                        // * the network request is malformed,
+                        // * the "introspect" method not found on server, (GRPC)
+                        // * the network request is malformed, (HTTP-like)
                         // * couldn't connect to the remote host.
-                        ctx.result = await transport.introspect(ctx);
+                        ctx.result = await this._callTransport(ctx);
                     } catch (err) {
                         ctx.result = {
                             success: false,
@@ -281,19 +285,41 @@ module.exports = require("stampit")({
             return await runMiddlewares(middlewares);
         },
 
+        _callTransport(ctx) {
+            const transportMethod = ctx.isIntrospection ? "introspect" : "call";
+            // In JavaScript if the `timeout` is null or undefined or some other object this condition will return `false`
+            if (this[p].timeout > 0) {
+                return Promise.race([
+                    this[p].transport[transportMethod](ctx),
+                    new Promise((resolve) =>
+                        setTimeout(
+                            () =>
+                                resolve({
+                                    success: false,
+                                    code: "ALLSERVER_CLIENT_TIMEOUT",
+                                    message: `The remote procedure ${ctx.procedureName} timed out in ${this[p].timeout} ms`,
+                                }),
+                            this[p].timeout
+                        )
+                    ),
+                ]);
+            }
+
+            return this[p].transport[transportMethod](ctx);
+        },
+
         async call(procedureName, arg) {
             if (!arg) arg = {};
             if (!arg._) arg._ = {};
             arg._.procedureName = procedureName;
 
-            const transport = this[p].transport;
             const defaultCtx = { procedureName, arg, client: this };
-            const ctx = transport.createCallContext(defaultCtx);
+            const ctx = this[p].transport.createCallContext(defaultCtx);
 
             await this._callMiddlewares(ctx, "before", async () => {
                 if (!ctx.result) {
                     try {
-                        ctx.result = await transport.call(ctx);
+                        ctx.result = await this._callTransport(ctx);
                     } catch (err) {
                         if (!this[p].neverThrow) throw err;
 

package/src/server/GrpcTransport.js

@@ -81,8 +81,6 @@ module.exports = require("./Transport").compose({
                     err ? reject(err) : resolve(result)
                 );
             });
-
-            return this.server.start();
         },
         stopServer() {
             return new Promise((r) => this.server.tryShutdown(r));

package/src/server/HttpTransport.js

@@ -60,6 +60,7 @@ module.exports = require("./Transport").compose({
             return new Promise((r) => {
                 if (this.server.closeIdleConnections) this.server.closeIdleConnections();
                 this.server.close(r);
+                if (this.server.closeAllConnections) this.server.closeAllConnections();
             });
         },