allserver 1.3.0 → 2.0.0

package/README.md

@@ -145,7 +145,7 @@ Please note, that Allserver depends only on a single tiny npm module [`stampit`]
 The default `HttpTransport` is using the [`micro`](http://npmjs.com/package/micro) npm module as an optional dependency.
 
 ```shell
-npm i allserver micro
+npm i allserver micro@10
 ```
 
 Alternatively, you can embed Allserver into your existing Express.js application:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allserver",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "Multi-protocol simple RPC server and [optional] client. Boilerplate-less. Opinionated. Minimalistic. DX-first.",
   "main": "src/index.js",
   "scripts": {
@@ -31,16 +31,44 @@
   "homepage": "https://github.com/flash-oss/allserver",
   "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"
+  },
+  "peerDependenciesMeta": {
+    "@grpc/grpc-js": {
+      "optional": true
+    },
+    "@grpc/proto-loader": {
+      "optional": true
+    },
+    "bullmq": {
+      "optional": true
+    },
+    "express": {
+      "optional": true
+    },
+    "micro": {
+      "optional": true
+    },
+    "node-fetch": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@grpc/grpc-js": "^1.1.7",
-    "@grpc/proto-loader": "^0.5.5",
-    "bullmq": "^3.5.7",
+    "@grpc/proto-loader": "^0.7.5",
+    "bullmq": "^3.10.1",
     "eslint": "^7.9.0",
     "express": "^4.18.2",
     "lambda-local": "^1.7.3",
-    "micro": "^9.3.4",
+    "micro": "^10.0.1",
     "mocha": "^10.2.0",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.9",
     "nyc": "^15.1.0",
     "prettier": "^2.1.1"
   },

package/src/client/HttpClientTransport.js

@@ -5,7 +5,7 @@ module.exports = require("./ClientTransport").compose({
 
     props: {
         // eslint-disable-next-line no-undef
-        fetch: (typeof self !== "undefined" && self.fetch) || require("node-fetch"),
+        fetch: (typeof globalThis !== "undefined" && globalThis.fetch) || require("node-fetch"),
         headers: {
             "Content-Type": "application/json; charset=utf-8",
         },
@@ -31,7 +31,8 @@ module.exports = require("./ClientTransport").compose({
                 response = await this.fetch(this.uri + procedureName, http);
                 http.response = response;
             } catch (err) {
-                if (err.code === "ECONNREFUSED") err.noNetToServer = true;
+                if (err.code === "ECONNREFUSED" || (err.cause && err.cause.code === "ECONNREFUSED"))
+                    err.noNetToServer = true;
                 throw err;
             }
 

package/src/server/HttpTransport.js

@@ -1,3 +1,4 @@
+const http = require("http");
 const { parse: parseUrl, URLSearchParams } = require("url");
 
 module.exports = require("./Transport").compose({
@@ -39,22 +40,27 @@ module.exports = require("./Transport").compose({
         },
 
         startServer(defaultCtx) {
-            this.server = this.micro(async (req, res) => {
-                const ctx = { ...defaultCtx, http: { req, res, url: parseUrl(req.url) } };
+            this.server = new http.Server(
+                this.micro.serve(async (req, res) => {
+                    const ctx = { ...defaultCtx, http: { req, res, url: parseUrl(req.url) } };
 
-                ctx.http.query = {};
-                if (ctx.http.url.query) {
-                    for (const [key, value] of new URLSearchParams(ctx.http.url.query).entries()) {
-                        ctx.http.query[key] = value;
+                    ctx.http.query = {};
+                    if (ctx.http.url.query) {
+                        for (const [key, value] of new URLSearchParams(ctx.http.url.query).entries()) {
+                            ctx.http.query[key] = value;
+                        }
                     }
-                }
 
-                await this._handleRequest(ctx);
-            });
+                    await this._handleRequest(ctx);
+                })
+            );
             return new Promise((r) => this.server.listen(this.port, r));
         },
         stopServer() {
-            return new Promise((r) => this.server.close(r));
+            return new Promise((r) => {
+                if (this.server.closeIdleConnections) this.server.closeIdleConnections();
+                this.server.close(r);
+            });
         },
 
         getProcedureName(ctx) {