@push-rpc/next 2.0.11 → 2.0.12

package/package.json

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

package/src/client/RpcClientImpl.ts

@@ -5,7 +5,7 @@ import {WebSocketConnection} from "./WebSocketConnection.js"
 import {nanoid} from "nanoid"
 import {createRemote, ServicesWithSubscriptions} from "./remote.js"
 import {ConsumeServicesOptions, RpcClient} from "./index.js"
-import {withMiddlewares} from "../utils/middleware.js"
+import {Middleware, withMiddlewares} from "../utils/middleware.js"
 
 export class RpcClientImpl<S extends Services<S>> implements RpcClient {
   constructor(
@@ -31,8 +31,16 @@ export class RpcClientImpl<S extends Services<S>> implements RpcClient {
           invocationType: InvocationType.Update,
         }
 
-        const next = async (p = data) => this.remoteSubscriptions.consume(itemName, parameters, p)
-        return withMiddlewares(ctx, this.options.updatesMiddleware, next, data)
+        const next = async (nextData = data, nextParameters = parameters) =>
+          this.remoteSubscriptions.consume(itemName, nextParameters, nextData)
+
+        return withMiddlewares(
+          ctx,
+          this.options.notificationsMiddleware,
+          next as any,
+          data,
+          parameters
+        )
       },
       () => {
         this.resubscribe()

package/src/client/WebSocketConnection.ts

@@ -12,7 +12,11 @@ export class WebSocketConnection {
       errorDelayMaxDuration: number
       pingInterval: number | null
     },
-    private readonly consume: (itemName: string, parameters: unknown[], data: unknown) => void,
+    private readonly consume: (
+      itemName: string,
+      parameters: unknown[],
+      data: unknown
+    ) => Promise<unknown>,
     private readonly onConnected: () => void,
     private readonly onDisconnected: () => void
   ) {
@@ -194,9 +198,9 @@ export class WebSocketConnection {
 
       const [itemName, data, ...parameters] = safeParseJson(msg)
 
-      this.consume(itemName, parameters, data)
+      await this.consume(itemName, parameters, data)
     } catch (e) {
-      log.warn("Invalid message received", e)
+      log.error("Can't handle notification", e)
     }
   }
 

package/src/client/index.ts

@@ -22,7 +22,7 @@ export type ConsumeServicesOptions = {
   pingInterval: number | null
   subscriptions: boolean
   middleware: Middleware<RpcContext>[]
-  updatesMiddleware: Middleware<RpcContext>[]
+  notificationsMiddleware: Middleware<RpcContext>[]
   connectOnCreate: boolean
   onConnected: () => void
   onDisconnected: () => void
@@ -65,7 +65,7 @@ const defaultOptions: ConsumeServicesOptions = {
   pingInterval: null, // if set, should be in-sync with server, ie 30 * 1000
   subscriptions: true,
   middleware: [],
-  updatesMiddleware: [],
+  notificationsMiddleware: [],
   connectOnCreate: false,
   onConnected: () => {},
   onDisconnected: () => {},

package/src/utils/middleware.ts

@@ -25,11 +25,16 @@ export function withMiddlewares<Context>(
       index = i
 
       try {
+        let result
+
         if (i === middlewares.length) {
-          return Promise.resolve(next(...p))
+          result = next(...p)
         } else {
-          return Promise.resolve(middlewares[i](ctx, dispatch.bind(null, i + 1), ...p))
+          const dispatchNextMiddleware = dispatch.bind(null, i + 1)
+          result = middlewares[i](ctx, dispatchNextMiddleware, ...p)
         }
+
+        return Promise.resolve(result)
       } catch (err) {
         return Promise.reject(err)
       }

package/tests/middleware.ts

@@ -1,5 +1,5 @@
 import {assert} from "chai"
-import {Middleware, withMiddlewares} from "../src/index.js"
+import {Middleware, setLogger, withMiddlewares} from "../src/index.js"
 import {createTestClient, startTestServer} from "./testUtils.js"
 import {adelay} from "../src/utils/promises.js"
 
@@ -110,19 +110,20 @@ describe("middleware", () => {
     }
   })
 
-  it("updates middlewares", async () => {
+  it("notifications middlewares", async () => {
     let count = 1
 
     const services = await startTestServer({
-      async remote() {
+      async remote(filter: {param: number}) {
         return count++
       },
     })
 
     const client = await createTestClient<typeof services>({
-      updatesMiddleware: [
-        (ctx, next, r) => {
+      notificationsMiddleware: [
+        (ctx, next, r, params) => {
           assert.ok(ctx.itemName)
+          assert.deepEqual(params, [{param: 1}])
 
           return next((r as number) + 1)
         },
@@ -130,14 +131,110 @@ describe("middleware", () => {
     })
 
     let response
+    await client.remote.subscribe(
+      (r) => {
+        response = r
+      },
+      {param: 1}
+    )
+
+    services.remote.trigger({param: 1})
+
+    await adelay(20)
+
+    assert.equal(response, 3)
+  })
+
+  it("error in notificationsMiddleware logged", async () => {
+    let log = ""
+
+    setLogger({
+      error(s: unknown, ...params) {
+        log += s + "\n" + params
+      },
+      warn: console.warn,
+      debug: console.debug,
+      info: console.info,
+    })
+
+    let count = 1
+    let result = 0
+
+    const services = await startTestServer({
+      async remote() {
+        return count++
+      },
+    })
+
+    const client = await createTestClient<typeof services>({
+      notificationsMiddleware: [
+        () => {
+          throw new Error("Test error")
+        },
+      ],
+    })
+
     await client.remote.subscribe((r) => {
-      response = r
+      result = r
     })
 
     services.remote.trigger()
 
     await adelay(20)
 
-    assert.equal(response, 3)
+    assert.equal(result, 1)
+
+    assert.include(log, "Test error")
+
+    setLogger(console)
+  })
+
+  it("error in client request middleware propagated", async () => {
+    let count = 1
+
+    const services = await startTestServer({
+      async remote() {
+        return count++
+      },
+    })
+
+    const client = await createTestClient<typeof services>({
+      middleware: [
+        () => {
+          throw new Error("Error")
+        },
+      ],
+    })
+
+    try {
+      await client.remote()
+      assert.fail("Expected to fail")
+    } catch (e) {}
+  })
+
+  it("error in server request middleware propagated", async () => {
+    let count = 1
+
+    const services = await startTestServer(
+      {
+        async remote() {
+          return count++
+        },
+      },
+      {
+        middleware: [
+          () => {
+            throw new Error("Error")
+          },
+        ],
+      }
+    )
+
+    const client = await createTestClient<typeof services>({})
+
+    try {
+      await client.remote()
+      assert.fail("Expected to fail")
+    } catch (e) {}
   })
 })

package/tests/testUtils.ts

@@ -39,8 +39,8 @@ export async function createTestClient<S extends Services<S>>(
   if (!options) options = {}
   if (!options.middleware) options.middleware = []
   options.middleware = [logMiddleware, ...options.middleware]
-  if (!options.updatesMiddleware) options.updatesMiddleware = []
-  options.updatesMiddleware = [logUpdatesMiddleware, ...options.updatesMiddleware]
+  if (!options.notificationsMiddleware) options.notificationsMiddleware = []
+  options.notificationsMiddleware = [logUpdatesMiddleware, ...options.notificationsMiddleware]
 
   const r = await consumeServices<S>(`http://127.0.0.1:${TEST_PORT}/rpc`, options)
   testClient = r.client

package/dist/client/HttpClient.d.ts

@@ -1,11 +0,0 @@
-export declare class HttpClient {
-    private url;
-    private clientId;
-    private getHeaders;
-    constructor(url: string, clientId: string, getHeaders: () => Promise<Record<string, string>>);
-    call(itemName: string, params: unknown[], callTimeout: number): Promise<unknown>;
-    subscribe(itemName: string, params: unknown[], callTimeout: number): Promise<unknown>;
-    unsubscribe(itemName: string, params: unknown[], callTimeout: number): Promise<void>;
-    private getItemUrl;
-    private httpRequest;
-}

package/dist/client/HttpClient.js

@@ -1,84 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpClient = void 0;
-const rpc_js_1 = require("../rpc.js");
-const json_js_1 = require("../utils/json.js");
-class HttpClient {
-    constructor(url, clientId, getHeaders) {
-        this.url = url;
-        this.clientId = clientId;
-        this.getHeaders = getHeaders;
-    }
-    async call(itemName, params, callTimeout) {
-        return this.httpRequest("POST", itemName, params, callTimeout, await this.getHeaders());
-    }
-    async subscribe(itemName, params, callTimeout) {
-        return this.httpRequest("PUT", itemName, params, callTimeout, await this.getHeaders());
-    }
-    async unsubscribe(itemName, params, callTimeout) {
-        await this.httpRequest("PATCH", itemName, params, callTimeout, await this.getHeaders());
-    }
-    getItemUrl(itemName) {
-        return `${this.url}/${itemName}`;
-    }
-    async httpRequest(method, itemName, params, callTimeout, headers) {
-        const itemUrl = this.getItemUrl(itemName);
-        try {
-            const { signal, finished } = timeoutSignal(callTimeout);
-            const response = await fetch(itemUrl, {
-                method,
-                headers: {
-                    "Content-Type": "application/json",
-                    [rpc_js_1.CLIENT_ID_HEADER]: this.clientId,
-                    ...headers,
-                },
-                body: (0, json_js_1.safeStringify)(params),
-                signal,
-            });
-            finished();
-            if (response.status == 204) {
-                return;
-            }
-            const contentType = response.headers.get("content-type");
-            const text = await response.text();
-            const res = contentType && contentType.includes("application/json") ? (0, json_js_1.safeParseJson)(text) : text;
-            if (response.status < 200 || response.status >= 300) {
-                const error = new Error(response.statusText);
-                Object.assign(error, { code: response.status });
-                if (typeof res == "object") {
-                    Object.assign(error, res);
-                }
-                throw error;
-            }
-            else {
-                return res;
-            }
-        }
-        catch (e) {
-            if (e.message == "Error" || !e.message) {
-                e.message = `Error ${e.code} while ${itemUrl}`;
-            }
-            if (e.message == "fetch failed" && e.cause) {
-                e = e.cause;
-            }
-            if (e.message?.toLowerCase()?.includes("timeout")) {
-                // NodeJS undici http client timeout
-                const error = new Error("Timeout");
-                Object.assign(error, { code: rpc_js_1.RpcErrors.Timeout });
-                throw error;
-            }
-            throw e;
-        }
-    }
-}
-exports.HttpClient = HttpClient;
-// AbortSignal.timeout polyfill for RN
-function timeoutSignal(time) {
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(new Error("TimeoutError")), time);
-    return {
-        signal: controller.signal,
-        finished: () => clearTimeout(timeout),
-    };
-}
-//# sourceMappingURL=HttpClient.js.map

package/dist/client/HttpClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/client/HttpClient.ts"],"names":[],"mappings":"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"}

package/dist/client/RemoteSubscriptions.d.ts

@@ -1,18 +0,0 @@
-export declare class RemoteSubscriptions {
-    unsubscribe(itemName: string, parameters: unknown[], consumer: (d: unknown) => void): boolean;
-    addSubscription(itemName: string, parameters: unknown[], consumer: (d: unknown) => void): void;
-    pause(itemName: string, parameters: unknown[]): void;
-    unpause(itemName: string, parameters: unknown[]): void;
-    flushQueue(itemName: string, parameters: unknown[]): void;
-    emptyQueue(itemName: string, parameters: unknown[]): void;
-    private removeSubscription;
-    getCached(itemName: string, parameters: unknown[]): unknown | undefined;
-    consume(itemName: string, parameters: unknown[], data: unknown): void;
-    getAllSubscriptions(): Array<[
-        itemName: string,
-        parameters: unknown[],
-        consumers: Array<(d: unknown) => void>
-    ]>;
-    private getFilterSubscriptions;
-    private byItem;
-}

package/dist/client/RemoteSubscriptions.js

@@ -1,120 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteSubscriptions = void 0;
-const json_js_1 = require("../utils/json.js");
-class RemoteSubscriptions {
-    constructor() {
-        this.byItem = new Map();
-    }
-    unsubscribe(itemName, parameters, consumer) {
-        const parametersKey = getParametersKey(parameters);
-        return this.removeSubscription(itemName, parametersKey, consumer);
-    }
-    addSubscription(itemName, parameters, consumer) {
-        const itemSubscriptions = this.byItem.get(itemName) || { byParameters: new Map() };
-        this.byItem.set(itemName, itemSubscriptions);
-        const parametersKey = getParametersKey(parameters);
-        const parameterSubscriptions = itemSubscriptions.byParameters.get(parametersKey) || {
-            parameters,
-            cached: null,
-            consumers: [],
-            queue: [],
-        };
-        itemSubscriptions.byParameters.set(parametersKey, parameterSubscriptions);
-        parameterSubscriptions.consumers.push(consumer);
-    }
-    pause(itemName, parameters) {
-        const filterSubscriptions = this.getFilterSubscriptions(itemName, parameters);
-        if (!filterSubscriptions)
-            return;
-        filterSubscriptions.paused = true;
-    }
-    unpause(itemName, parameters) {
-        const filterSubscriptions = this.getFilterSubscriptions(itemName, parameters);
-        if (!filterSubscriptions)
-            return;
-        filterSubscriptions.paused = false;
-    }
-    flushQueue(itemName, parameters) {
-        const filterSubscriptions = this.getFilterSubscriptions(itemName, parameters);
-        if (!filterSubscriptions)
-            return;
-        filterSubscriptions.queue.forEach((data) => {
-            filterSubscriptions.cached = data;
-            filterSubscriptions.consumers.forEach((consumer) => {
-                consumer(data);
-            });
-        });
-        filterSubscriptions.queue = [];
-    }
-    emptyQueue(itemName, parameters) {
-        const filterSubscriptions = this.getFilterSubscriptions(itemName, parameters);
-        if (!filterSubscriptions)
-            return;
-        filterSubscriptions.queue = [];
-    }
-    removeSubscription(itemName, parametersKey, consumer) {
-        const itemSubscriptions = this.byItem.get(itemName);
-        if (!itemSubscriptions)
-            return false;
-        const filterSubscriptions = itemSubscriptions.byParameters.get(parametersKey);
-        if (!filterSubscriptions)
-            return false;
-        const index = filterSubscriptions.consumers.indexOf(consumer);
-        if (index == -1)
-            return false;
-        filterSubscriptions.consumers.splice(index, 1);
-        if (!filterSubscriptions.consumers.length) {
-            itemSubscriptions.byParameters.delete(parametersKey);
-            if (itemSubscriptions.byParameters.size == 0) {
-                this.byItem.delete(itemName);
-            }
-            return true;
-        }
-        return false;
-    }
-    getCached(itemName, parameters) {
-        const filterSubscriptions = this.getFilterSubscriptions(itemName, parameters);
-        if (!filterSubscriptions)
-            return;
-        return filterSubscriptions.cached;
-    }
-    consume(itemName, parameters, data) {
-        const filterSubscriptions = this.getFilterSubscriptions(itemName, parameters);
-        if (!filterSubscriptions)
-            return;
-        if (filterSubscriptions.paused) {
-            filterSubscriptions.queue.push(data);
-        }
-        else {
-            filterSubscriptions.cached = data;
-            filterSubscriptions.consumers.forEach((consumer) => {
-                consumer(data);
-            });
-        }
-    }
-    getAllSubscriptions() {
-        const result = [];
-        for (const [itemName, itemSubscriptions] of this.byItem) {
-            for (const [, parameterSubscriptions] of itemSubscriptions.byParameters) {
-                result.push([itemName, parameterSubscriptions.parameters, parameterSubscriptions.consumers]);
-            }
-        }
-        return result;
-    }
-    getFilterSubscriptions(itemName, parameters) {
-        const parametersKey = getParametersKey(parameters);
-        const itemSubscriptions = this.byItem.get(itemName);
-        if (!itemSubscriptions)
-            return;
-        const filterSubscriptions = itemSubscriptions.byParameters.get(parametersKey);
-        if (!filterSubscriptions)
-            return;
-        return filterSubscriptions;
-    }
-}
-exports.RemoteSubscriptions = RemoteSubscriptions;
-function getParametersKey(parameters) {
-    return (0, json_js_1.safeStringify)(parameters);
-}
-//# sourceMappingURL=RemoteSubscriptions.js.map

package/dist/client/RemoteSubscriptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RemoteSubscriptions.js","sourceRoot":"","sources":["../../src/client/RemoteSubscriptions.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAE9C,MAAa,mBAAmB;IAAhC;QA2IU,WAAM,GAAkC,IAAI,GAAG,EAAE,CAAA;IAC3D,CAAC;IA3IC,WAAW,CAAC,QAAgB,EAAE,UAAqB,EAAE,QAA8B;QACjF,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;QAElD,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAA;IACnE,CAAC;IAED,eAAe,CAAC,QAAgB,EAAE,UAAqB,EAAE,QAA8B;QACrF,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAC,YAAY,EAAE,IAAI,GAAG,EAAE,EAAC,CAAA;QAChF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;QAE5C,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;QAClD,MAAM,sBAAsB,GAA2B,iBAAiB,CAAC,YAAY,CAAC,GAAG,CACvF,aAAa,CACd,IAAI;YACH,UAAU;YACV,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,EAAE;YACb,KAAK,EAAE,EAAE;SACV,CAAA;QAED,iBAAiB,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAA;QACzE,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACjD,CAAC;IAED,KAAK,CAAC,QAAgB,EAAE,UAAqB;QAC3C,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAC7E,IAAI,CAAC,mBAAmB;YAAE,OAAM;QAEhC,mBAAmB,CAAC,MAAM,GAAG,IAAI,CAAA;IACnC,CAAC;IAED,OAAO,CAAC,QAAgB,EAAE,UAAqB;QAC7C,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAC7E,IAAI,CAAC,mBAAmB;YAAE,OAAM;QAEhC,mBAAmB,CAAC,MAAM,GAAG,KAAK,CAAA;IACpC,CAAC;IAED,UAAU,CAAC,QAAgB,EAAE,UAAqB;QAChD,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAC7E,IAAI,CAAC,mBAAmB;YAAE,OAAM;QAEhC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzC,mBAAmB,CAAC,MAAM,GAAG,IAAI,CAAA;YACjC,mBAAmB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACjD,QAAQ,CAAC,IAAI,CAAC,CAAA;YAChB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,mBAAmB,CAAC,KAAK,GAAG,EAAE,CAAA;IAChC,CAAC;IAED,UAAU,CAAC,QAAgB,EAAE,UAAqB;QAChD,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAC7E,IAAI,CAAC,mBAAmB;YAAE,OAAM;QAEhC,mBAAmB,CAAC,KAAK,GAAG,EAAE,CAAA;IAChC,CAAC;IAEO,kBAAkB,CACxB,QAAgB,EAChB,aAAqB,EACrB,QAA8B;QAE9B,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACnD,IAAI,CAAC,iBAAiB;YAAE,OAAO,KAAK,CAAA;QAEpC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QAC7E,IAAI,CAAC,mBAAmB;YAAE,OAAO,KAAK,CAAA;QAEtC,MAAM,KAAK,GAAG,mBAAmB,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC7D,IAAI,KAAK,IAAI,CAAC,CAAC;YAAE,OAAO,KAAK,CAAA;QAE7B,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAE9C,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAC1C,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;YAEpD,IAAI,iBAAiB,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;gBAC7C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YAC9B,CAAC;YAED,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED,SAAS,CAAC,QAAgB,EAAE,UAAqB;QAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAC7E,IAAI,CAAC,mBAAmB;YAAE,OAAM;QAEhC,OAAO,mBAAmB,CAAC,MAAM,CAAA;IACnC,CAAC;IAED,OAAO,CAAC,QAAgB,EAAE,UAAqB,EAAE,IAAa;QAC5D,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAC7E,IAAI,CAAC,mBAAmB;YAAE,OAAM;QAEhC,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC;YAC/B,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtC,CAAC;aAAM,CAAC;YACN,mBAAmB,CAAC,MAAM,GAAG,IAAI,CAAA;YACjC,mBAAmB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACjD,QAAQ,CAAC,IAAI,CAAC,CAAA;YAChB,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,mBAAmB;QAGjB,MAAM,MAAM,GAA4D,EAAE,CAAA;QAE1E,KAAK,MAAM,CAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACxD,KAAK,MAAM,CAAC,EAAE,sBAAsB,CAAC,IAAI,iBAAiB,CAAC,YAAY,EAAE,CAAC;gBACxE,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,sBAAsB,CAAC,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAA;YAC9F,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,sBAAsB,CAC5B,QAAgB,EAChB,UAAqB;QAErB,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;QAElD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACnD,IAAI,CAAC,iBAAiB;YAAE,OAAM;QAE9B,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QAC7E,IAAI,CAAC,mBAAmB;YAAE,OAAM;QAEhC,OAAO,mBAAmB,CAAA;IAC5B,CAAC;CAGF;AA5ID,kDA4IC;AAeD,SAAS,gBAAgB,CAAC,UAAqB;IAC7C,OAAO,IAAA,uBAAa,EAAC,UAAU,CAAC,CAAA;AAClC,CAAC"}

package/dist/client/RpcClientImpl.d.ts

@@ -1,22 +0,0 @@
-import { Services } from "../rpc.js";
-import { ServicesWithSubscriptions } from "./remote.js";
-import { ConsumeServicesOptions, RpcClient } from "./index.js";
-export declare class RpcClientImpl<S extends Services<S>> implements RpcClient {
-    private readonly options;
-    constructor(url: string, options: ConsumeServicesOptions);
-    readonly clientId: string;
-    private readonly httpClient;
-    private readonly remoteSubscriptions;
-    private readonly connection;
-    isConnected(): boolean;
-    close(): Promise<void>;
-    _allSubscriptions(): [itemName: string, parameters: unknown[], consumers: (d: unknown) => void][];
-    _webSocket(): WebSocket | null;
-    createRemote(): ServicesWithSubscriptions<S>;
-    connect(): Promise<void>;
-    private call;
-    private subscribe;
-    private unsubscribe;
-    private resubscribe;
-    private invoke;
-}

package/dist/client/RpcClientImpl.js

@@ -1,121 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcClientImpl = void 0;
-const rpc_js_1 = require("../rpc.js");
-const HttpClient_js_1 = require("./HttpClient.js");
-const RemoteSubscriptions_js_1 = require("./RemoteSubscriptions.js");
-const WebSocketConnection_js_1 = require("./WebSocketConnection.js");
-const nanoid_1 = require("nanoid");
-const remote_js_1 = require("./remote.js");
-const middleware_js_1 = require("../utils/middleware.js");
-class RpcClientImpl {
-    constructor(url, options) {
-        this.options = options;
-        this.clientId = (0, nanoid_1.nanoid)();
-        this.call = (itemName, parameters, callOptions) => {
-            return this.invoke(itemName, rpc_js_1.InvocationType.Call, (...parameters) => this.httpClient.call(itemName, parameters, callOptions?.timeout ?? this.options.callTimeout), parameters);
-        };
-        this.subscribe = async (itemName, parameters, consumer, callOptions) => {
-            const cached = this.remoteSubscriptions.getCached(itemName, parameters);
-            if (cached !== undefined) {
-                consumer(cached);
-            }
-            // Needs to be awaited b/c resubscribe will make a 2nd request then.
-            // Also, server needs the connection to be established before making a subscription
-            await this.connection.connect();
-            try {
-                this.remoteSubscriptions.addSubscription(itemName, parameters, consumer);
-                this.remoteSubscriptions.pause(itemName, parameters);
-                const data = await this.invoke(itemName, rpc_js_1.InvocationType.Subscribe, (...parameters) => this.httpClient.subscribe(itemName, parameters, callOptions?.timeout ?? this.options.callTimeout), parameters);
-                this.remoteSubscriptions.unpause(itemName, parameters);
-                this.remoteSubscriptions.consume(itemName, parameters, data);
-                this.remoteSubscriptions.flushQueue(itemName, parameters);
-            }
-            catch (e) {
-                this.remoteSubscriptions.unpause(itemName, parameters);
-                this.remoteSubscriptions.emptyQueue(itemName, parameters);
-                await this.unsubscribe(itemName, parameters, consumer);
-                throw e;
-            }
-        };
-        this.unsubscribe = async (itemName, parameters, consumer, callOptions) => {
-            const noSubscriptionsLeft = this.remoteSubscriptions.unsubscribe(itemName, parameters, consumer);
-            if (noSubscriptionsLeft) {
-                await this.invoke(itemName, rpc_js_1.InvocationType.Unsubscribe, (...parameters) => this.httpClient.unsubscribe(itemName, parameters, callOptions?.timeout ?? this.options.callTimeout), parameters);
-            }
-        };
-        this.resubscribe = () => {
-            for (const [itemName, params, consumers] of this.remoteSubscriptions.getAllSubscriptions()) {
-                this.httpClient
-                    .subscribe(itemName, params, this.options.callTimeout)
-                    .then((data) => {
-                    this.remoteSubscriptions.consume(itemName, params, data);
-                })
-                    .catch((e) => {
-                    for (const consumer of consumers) {
-                        this.remoteSubscriptions.unsubscribe(itemName, params, consumer);
-                    }
-                });
-            }
-        };
-        this.httpClient = new HttpClient_js_1.HttpClient(url, this.clientId, options.getHeaders);
-        this.remoteSubscriptions = new RemoteSubscriptions_js_1.RemoteSubscriptions();
-        this.connection = new WebSocketConnection_js_1.WebSocketConnection(options.getSubscriptionsUrl(url), this.clientId, {
-            subscriptions: options.subscriptions,
-            errorDelayMaxDuration: options.errorDelayMaxDuration,
-            reconnectDelay: options.reconnectDelay,
-            pingInterval: options.pingInterval,
-        }, (itemName, parameters, data) => {
-            const ctx = {
-                clientId: this.clientId,
-                itemName,
-                invocationType: rpc_js_1.InvocationType.Update,
-            };
-            const next = async (p = data) => this.remoteSubscriptions.consume(itemName, parameters, p);
-            return (0, middleware_js_1.withMiddlewares)(ctx, this.options.updatesMiddleware, next, data);
-        }, () => {
-            this.resubscribe();
-            options.onConnected();
-        }, () => {
-            options.onDisconnected();
-        });
-    }
-    isConnected() {
-        return this.connection.isConnected();
-    }
-    close() {
-        return this.connection.close();
-    }
-    _allSubscriptions() {
-        const result = [];
-        for (const [itemName, parameters, consumers,] of this.remoteSubscriptions.getAllSubscriptions()) {
-            for (const consumer of consumers) {
-                result.push([itemName, parameters, consumer]);
-            }
-        }
-        return result;
-    }
-    _webSocket() {
-        return this.connection._webSocket();
-    }
-    createRemote() {
-        return (0, remote_js_1.createRemote)({
-            call: this.call,
-            subscribe: this.subscribe,
-            unsubscribe: this.unsubscribe,
-        });
-    }
-    async connect() {
-        await this.connection.connect();
-    }
-    invoke(itemName, invocationType, next, parameters) {
-        const ctx = {
-            clientId: this.clientId,
-            itemName,
-            invocationType: invocationType,
-        };
-        return (0, middleware_js_1.withMiddlewares)(ctx, this.options.middleware, next, ...parameters);
-    }
-}
-exports.RpcClientImpl = RpcClientImpl;
-//# sourceMappingURL=RpcClientImpl.js.map

package/dist/client/RpcClientImpl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RpcClientImpl.js","sourceRoot":"","sources":["../../src/client/RpcClientImpl.ts"],"names":[],"mappings":"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"}