@push-rpc/next 2.0.12 → 2.0.14

package/dist/utils/promises.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adelay = exports.PromiseCache = void 0;
+class PromiseCache {
+    constructor() {
+        this.cache = {};
+    }
+    invoke(cacheKey, supplier) {
+        const key = JSON.stringify(cacheKey);
+        if (!this.cache[key]) {
+            this.cache[key] = supplier()
+                .then((r) => {
+                delete this.cache[key];
+                return r;
+            })
+                .catch((e) => {
+                delete this.cache[key];
+                throw e;
+            });
+        }
+        return this.cache[key];
+    }
+}
+exports.PromiseCache = PromiseCache;
+async function adelay(ms) {
+    return new Promise((r) => setTimeout(r, ms));
+}
+exports.adelay = adelay;
+//# sourceMappingURL=promises.js.map

package/dist/utils/promises.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"promises.js","sourceRoot":"","sources":["../../src/utils/promises.ts"],"names":[],"mappings":";;;AAAA,MAAa,YAAY;IAAzB;QAmBU,UAAK,GAAkC,EAAE,CAAA;IACnD,CAAC;IAnBC,MAAM,CAAI,QAAiB,EAAE,QAA0B;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAEpC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,QAAQ,EAAE;iBACzB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACV,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACtB,OAAO,CAAC,CAAA;YACV,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACtB,MAAM,CAAC,CAAA;YACT,CAAC,CAAC,CAAA;QACN,CAAC;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;CAGF;AApBD,oCAoBC;AAEM,KAAK,UAAU,MAAM,CAAC,EAAU;IACrC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;AAC9C,CAAC;AAFD,wBAEC"}

package/dist/utils/server.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import * as http from "http";
+import * as Stream from "stream";
+export declare function decompressRequest(request: http.IncomingMessage): Stream;

package/dist/utils/server.js

@@ -0,0 +1,48 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decompressRequest = void 0;
+const zlib = __importStar(require("zlib"));
+const stream_1 = require("stream");
+function decompressRequest(request) {
+    const contentEncoding = (request.headers["content-encoding"] || "").toLowerCase();
+    if (!["gzip", "deflate", "br"].includes(contentEncoding)) {
+        return request;
+    }
+    const isBrotli = contentEncoding === "br";
+    const decompress = isBrotli ? zlib.createBrotliDecompress() : zlib.createUnzip();
+    const stream = new stream_1.PassThrough();
+    decompress.on("error", (error) => {
+        // Ignore empty request
+        if (error.code === "Z_BUF_ERROR") {
+            stream.end();
+            return;
+        }
+        stream.emit("error", error);
+    });
+    return (0, stream_1.pipeline)(request, decompress, stream, () => { });
+}
+exports.decompressRequest = decompressRequest;
+//# sourceMappingURL=server.js.map

package/dist/utils/server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/utils/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA4B;AAC5B,mCAAmF;AAGnF,SAAgB,iBAAiB,CAAC,OAA6B;IAC7D,MAAM,eAAe,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IAEjF,IAAI,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;QACzD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,KAAK,IAAI,CAAA;IAEzC,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAA;IAChF,MAAM,MAAM,GAAG,IAAI,oBAAiB,EAAE,CAAA;IAEtC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE;QACpC,uBAAuB;QACvB,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,EAAE,CAAA;YACZ,OAAM;QACR,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEF,OAAO,IAAA,iBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;AAC9D,CAAC;AAvBD,8CAuBC"}

package/dist/utils/throttle.d.ts

@@ -0,0 +1,4 @@
+export type ThrottleArgsReducer<D> = (prevValue: D, newValue: D) => D;
+export declare function lastValueReducer<D>(prevValue: D, newValue: D): D;
+export declare function groupReducer<D>(prevValue: D[], newValue: D[]): D[];
+export declare function throttle<D>(callback: (d: D) => void, delay: number, reducer: ThrottleArgsReducer<D>): (d: D) => void;

package/dist/utils/throttle.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.throttle = exports.groupReducer = exports.lastValueReducer = void 0;
+function lastValueReducer(prevValue, newValue) {
+    return newValue;
+}
+exports.lastValueReducer = lastValueReducer;
+function groupReducer(prevValue, newValue) {
+    if (!Array.isArray(newValue))
+        throw new Error("groupReducer should only be used with topics that return arrays");
+    return prevValue ? [...prevValue, ...newValue] : newValue;
+}
+exports.groupReducer = groupReducer;
+function throttle(callback, delay, reducer) {
+    let timer;
+    let lastExec = 0;
+    let reducedArg;
+    function wrapper(d) {
+        let self = this;
+        let elapsed = Date.now() - lastExec;
+        function exec() {
+            lastExec = Date.now();
+            callback.call(self, reducedArg);
+            reducedArg = undefined;
+        }
+        if (timer) {
+            clearTimeout(timer);
+        }
+        reducedArg = reducer(reducedArg, d);
+        if (elapsed > delay) {
+            exec();
+        }
+        else {
+            timer = setTimeout(exec, delay - elapsed);
+        }
+    }
+    return wrapper;
+}
+exports.throttle = throttle;
+//# sourceMappingURL=throttle.js.map

package/dist/utils/throttle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/utils/throttle.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAAI,SAAY,EAAE,QAAW;IAC3D,OAAO,QAAQ,CAAA;AACjB,CAAC;AAFD,4CAEC;AAED,SAAgB,YAAY,CAAI,SAAc,EAAE,QAAa;IAC3D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAA;IAEpF,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;AAC3D,CAAC;AALD,oCAKC;AAED,SAAgB,QAAQ,CACtB,QAAwB,EACxB,KAAa,EACb,OAA+B;IAE/B,IAAI,KAAqB,CAAA;IACzB,IAAI,QAAQ,GAAG,CAAC,CAAA;IAEhB,IAAI,UAAe,CAAA;IAEnB,SAAS,OAAO,CAAY,CAAI;QAC9B,IAAI,IAAI,GAAG,IAAI,CAAA;QACf,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAA;QAEnC,SAAS,IAAI;YACX,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACrB,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;YAC/B,UAAU,GAAG,SAAS,CAAA;QACxB,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,YAAY,CAAC,KAAK,CAAC,CAAA;QACrB,CAAC;QAED,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;QAEnC,IAAI,OAAO,GAAG,KAAK,EAAE,CAAC;YACpB,IAAI,EAAE,CAAA;QACR,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAlCD,4BAkCC"}

package/dist/utils/types.d.ts

@@ -0,0 +1 @@
+export type ExtractPromiseResult<Type> = Type extends Promise<infer X> ? X : never;

package/dist/utils/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/utils/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push-rpc/next",
-  "version": "2.0.12",
+  "version": "2.0.14",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/client/HttpClient.ts

@@ -5,8 +5,9 @@ export class HttpClient {
   constructor(
     private url: string,
     private clientId: string,
-    private getHeaders: () => Promise<Record<string, string>>
-  ) {}
+    private getHeaders: () => Promise<Record<string, string>>,
+  ) {
+  }
 
   async call(itemName: string, params: unknown[], callTimeout: number): Promise<unknown> {
     return this.httpRequest("POST", itemName, params, callTimeout, await this.getHeaders())
@@ -29,7 +30,7 @@ export class HttpClient {
     itemName: string,
     params: unknown[],
     callTimeout: number,
-    headers: Record<string, string>
+    headers: Record<string, string>,
   ): Promise<unknown> {
     const itemUrl = this.getItemUrl(itemName)
 
@@ -61,7 +62,7 @@ export class HttpClient {
         contentType && contentType.includes("application/json") ? safeParseJson(text) : text
 
       if (response.status < 200 || response.status >= 300) {
-        const error = new Error(response.statusText)
+        const error = new Error(response.headers.get("x-error") ?? undefined)
 
         Object.assign(error, {code: response.status})
 

package/src/server/http.ts

@@ -10,7 +10,7 @@ export async function serveHttpRequest(
   res: ServerResponse,
   path: string,
   hooks: HttpServerHooks,
-  createConnectionContext: (req: IncomingMessage) => Promise<RpcConnectionContext>
+  createConnectionContext: (req: IncomingMessage) => Promise<RpcConnectionContext>,
 ) {
   // if port is in options - response 404 on other URLs
   // oherwise just handle request
@@ -65,7 +65,10 @@ export async function serveHttpRequest(
     } catch (e: any) {
       if (e.code) {
         res.statusCode = e.code
-        res.statusMessage = e.message
+
+        if (e.message) {
+          res.setHeader("X-Error", e["message"])
+        }
         const {code, message, stack, ...rest} = e
         if (Object.keys(rest).length > 0) {
           res.setHeader("Content-Type", "application/json")
@@ -77,7 +80,9 @@ export async function serveHttpRequest(
         log.warn(`Error in ${req.url}.`, e)
 
         res.statusCode = 500
-        res.statusMessage = e["message"] || "Internal Server Error"
+        if (e["message"]) {
+          res.setHeader("X-Error", e["message"])
+        }
         res.end()
         return
       }
@@ -107,11 +112,11 @@ export type HttpServerHooks = {
   subscribe(
     clientId: RpcConnectionContext,
     itemName: string,
-    parameters: unknown[]
+    parameters: unknown[],
   ): Promise<unknown>
   unsubscribe(
     clientId: RpcConnectionContext,
     itemName: string,
-    parameters: unknown[]
+    parameters: unknown[],
   ): Promise<unknown>
 }