@push-rpc/next 2.0.24 → 2.0.26

package/tests/calls.ts

@@ -50,6 +50,27 @@ describe("calls", () => {
     }
   })
 
+  it("error with non ascii message", async () => {
+    const message = "юяї"
+
+    const services = await startTestServer({
+      test: {
+        async getSomething() {
+          throw new Error(message)
+        },
+      },
+    })
+
+    const client = await createTestClient<typeof services>()
+
+    try {
+      await client.test.getSomething()
+      assert.fail()
+    } catch (e: any) {
+      assert.equal(e.message, message)
+    }
+  })
+
   it("error with extra fields and status", async () => {
     const services = await startTestServer({
       test: {

package/tests/events.ts

@@ -0,0 +1,82 @@
+import {createTestClient, startTestServer, testClient} from "./testUtils.js"
+import {assert} from "chai"
+import {adelay} from "../src/utils/promises.js"
+
+describe("Events", () => {
+  it("subscribe event", async () => {
+    const services = await startTestServer({
+      test: {
+        item: async (a: string) => {},
+      },
+    })
+
+    let event
+    services.test.item.addEventListener("subscribe", (e) => {
+      event = e
+    })
+
+    const client = await createTestClient<typeof services>()
+
+    await client.test.item.subscribe(() => {}, "a")
+
+    assert.deepEqual(event, {
+      itemName: "test/item",
+      filter: "a",
+      clientId: testClient!.clientId,
+      context: {
+        clientId: testClient!.clientId,
+      },
+    })
+  })
+  it("unsubscribe event", async () => {
+    const services = await startTestServer({
+      test: {
+        item: async (a: string) => {},
+      },
+    })
+
+    let event
+    services.test.item.addEventListener("unsubscribe", (e) => {
+      event = e
+    })
+
+    const client = await createTestClient<typeof services>()
+
+    const listener = () => {}
+    await client.test.item.subscribe(listener, "a")
+    await client.test.item.unsubscribe(listener, "a")
+
+    assert.deepEqual(event, {
+      itemName: "test/item",
+      filter: "a",
+      clientId: testClient!.clientId,
+    })
+  })
+  it("unsubscribe on disconnect WS", async () => {
+    const services = await startTestServer({
+      test: {
+        item: async (a: string) => {},
+      },
+    })
+
+    let event
+    services.test.item.addEventListener("unsubscribe", (e) => {
+      event = e
+    })
+
+    const client = await createTestClient<typeof services>()
+
+    const listener = () => {}
+    await client.test.item.subscribe(listener, "a")
+
+    await testClient!.close()
+
+    await adelay(100)
+
+    assert.deepEqual(event, {
+      itemName: "test/item",
+      filter: "a",
+      clientId: testClient!.clientId,
+    })
+  })
+})

package/tests/testUtils.ts

@@ -7,8 +7,8 @@ import {
   RpcContext,
   RpcServer,
   Services,
-  ServicesWithSubscriptions,
-  ServicesWithTriggers,
+  ServicesClient,
+  ServicesImplementation,
 } from "../src/index.js"
 import WebSocket from "ws"
 
@@ -21,7 +21,7 @@ export let testServer: RpcServer | null = null
 export async function startTestServer<S extends Services<S>, C extends RpcContext>(
   local: S,
   options: Partial<PublishServicesOptions<C>> = {},
-): Promise<ServicesWithTriggers<S>> {
+): Promise<ServicesImplementation<S>> {
   const r = await publishServices<S, C>(local, {
     port: TEST_PORT,
     path: "/rpc",
@@ -35,7 +35,7 @@ export let testClient: RpcClient | null = null
 
 export async function createTestClient<S extends Services<S>>(
   options?: Partial<ConsumeServicesOptions>,
-): Promise<ServicesWithSubscriptions<S>> {
+): Promise<ServicesClient<S>> {
   if (!options) options = {}
   if (!options.middleware) options.middleware = []
   options.middleware = [logMiddleware, ...options.middleware]

package/dist/server/LocalSubscriptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LocalSubscriptions.js","sourceRoot":"","sources":["../../src/server/LocalSubscriptions.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,sDAA+D;AAG/D,MAAa,kBAAkB;IAA/B;QA2FU,yBAAoB,GAA2C,IAAI,GAAG,EAAE,CAAA;QAExE,WAAM,GAAkC,IAAI,GAAG,EAAE,CAAA;IAgB3D,CAAC;IA5GC,SAAS,CACP,QAAgB,EAChB,QAAgB,EAChB,UAAqB,EACrB,MAAwC;QAExC,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAC,CAAA;QAC5E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;QAE5C,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,CAAC,CAAA;QAE1C,MAAM,aAAa,GAAuB,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI;YACrF,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;YACvB,iBAAiB,EAAE,EAAE;SACtB,CAAA;QACD,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QAExD,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE,CAAC;YACzE,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAA;QAC1D,CAAC;IACH,CAAC;IAED,WAAW,CAAC,QAAgB,EAAE,QAAgB,EAAE,UAAqB;QACnE,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACnD,IAAI,CAAC,iBAAiB;YAAE,OAAM;QAE9B,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,CAAC,CAAA;QAE1C,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAC/D,IAAI,CAAC,aAAa;YAAE,OAAM;QAE1B,aAAa,CAAC,iBAAiB,GAAG,aAAa,CAAC,iBAAiB,CAAC,MAAM,CACtE,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,IAAI,QAAQ,CACpD,CAAA;QAED,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;YAC5C,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAE5C,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED,cAAc,CAAC,QAAgB;QAC7B,KAAK,MAAM,CAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YAClE,KAAK,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC9E,aAAa,CAAC,iBAAiB,GAAG,aAAa,CAAC,iBAAiB,CAAC,MAAM,CACtE,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,IAAI,QAAQ,CACpD,CAAA;gBAED,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;oBAC5C,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;gBAC9C,CAAC;YACH,CAAC;YAED,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,CAAC,QAAgB,EAAE,gBAAyC,EAAE,EAAE,YAAsB;QAC3F,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACzC,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,KAAK,MAAM,EAAC,MAAM,EAAE,kBAAkB,EAAE,iBAAiB,EAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YACxF,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,kBAAkB,CAAC;gBAAE,SAAQ;YAEhE,iBAAiB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;gBAC7C,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YACvC,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,SAAS,CAAC,QAAgB,EAAE,CAAuB;QACjD,MAAM,QAAQ,GAA8B,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI;YACrF,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,8BAAgB;SAC1B,CAAA;QAED,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,OAAO,CAAC,CAAA;QAE/B,OAAO,IAAA,sBAAQ,EAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,8BAAgB,CAAC,CAAA;IAC5E,CAAC;IAED,YAAY,CAAC,QAAgB,EAAE,QAAmC;QAChE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACnD,CAAC;IAMD,YAAY;IACZ,iBAAiB;QACf,MAAM,MAAM,GAAwE,EAAE,CAAA;QAEtF,KAAK,MAAM,CAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACxD,KAAK,MAAM,CAAC,EAAE,sBAAsB,CAAC,IAAI,iBAAiB,CAAC,QAAQ,EAAE,CAAC;gBACpE,KAAK,MAAM,MAAM,IAAI,sBAAsB,CAAC,iBAAiB,EAAE,CAAC;oBAC9D,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;gBAC3E,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AA7GD,gDA6GC;AAgBD,SAAS,cAAc,CACrB,aAAsC,EACtC,kBAA2C;IAE3C,IAAI,kBAAkB,IAAI,IAAI;QAAE,OAAO,IAAI,CAAA,CAAC,wBAAwB;IACpE,IAAI,aAAa,IAAI,IAAI;QAAE,OAAO,IAAI,CAAA,CAAC,oBAAoB;IAE3D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAClD,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,SAAS;YAAE,SAAQ;QAC7C,IAAI,kBAAkB,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC;YAAE,SAAQ;QAE3D,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAChF,IAAI,IAAA,uBAAa,EAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,IAAA,uBAAa,EAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAChF,SAAQ;YACV,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,YAAY,CAAC,UAAqB;IACzC,OAAO,IAAA,uBAAa,EAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAA;AAC/C,CAAC"}

package/dist/server/local.d.ts

@@ -1,15 +0,0 @@
-import { RemoteFunction, Services } from "../rpc.js";
-import { LocalSubscriptions } from "./LocalSubscriptions.js";
-import { ExtractPromiseResult } from "../utils/types.js";
-import { ThrottleArgsReducer } from "../utils/throttle.js";
-export type ThrottleSettings<D> = {
-    timeout: number;
-    reducer?: ThrottleArgsReducer<D>;
-};
-export declare function withTriggers<T extends Services<T>>(localSubscriptions: LocalSubscriptions, services: T, name?: string): ServicesWithTriggers<T>;
-export type ServicesWithTriggers<T extends Services<T>> = {
-    [K in keyof T]: T[K] extends RemoteFunction ? T[K] & {
-        trigger(filter?: Partial<Parameters<T[K]>[0]>, suppliedData?: ExtractPromiseResult<ReturnType<T[K]>>): void;
-        throttle(settings: ThrottleSettings<ExtractPromiseResult<ReturnType<T[K]>>>): void;
-    } : T[K] extends object ? ServicesWithTriggers<T[K]> : never;
-};

package/dist/server/local.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/server/local.ts"],"names":[],"mappings":";;;AAUA,SAAgB,YAAY,CAC1B,kBAAsC,EACtC,QAAW,EACX,IAAI,GAAG,EAAE;IAET,MAAM,WAAW,GAAQ,EAAE,CAAA;IAC3B,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IAE3E,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE;QACzB,GAAG,CAAC,MAAW,EAAE,QAAgB;YAC/B,sBAAsB;YACtB,IAAI,OAAO,QAAQ,IAAI,QAAQ;gBAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;YAExD,0BAA0B;YAC1B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;YAE5F,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;YAExD,IAAI,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC;gBAC1C,MAAM,QAAQ,GAAG,CAAC,GAAG,MAAiB,EAAE,EAAE;oBACxC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,CAAA;gBACpC,CAAC,CAAA;gBAED,QAAQ,CAAC,OAAO,GAAG,CAAC,SAAkC,EAAE,EAAE,YAAsB,EAAE,EAAE;oBAClF,qFAAqF;oBACrF,UAAU,CAAC,GAAG,EAAE;wBACd,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;oBAC5D,CAAC,EAAE,CAAC,CAAC,CAAA;gBACP,CAAC,CAAA;gBAED,QAAQ,CAAC,QAAQ,GAAG,CAAC,QAAmC,EAAE,EAAE;oBAC1D,kBAAkB,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;gBACrD,CAAC,CAAA;gBAED,OAAO,QAAQ,CAAA;YACjB,CAAC;iBAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAClC,WAAW,CAAC,QAAQ,CAAC,GAAG,YAAY,CAClC,kBAAkB,EAClB,QAAQ,CAAC,QAAmB,CAAQ,EACpC,QAAQ,CACT,CAAA;YACH,CAAC;YAED,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAA;QAC9B,CAAC;QAED,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK;YACzB,WAAW,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;YAC7B,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO;YACL,OAAO,CAAC,GAAG,YAAY,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAA;QACvD,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAvDD,oCAuDC"}

package/src/server/local.ts

@@ -1,80 +0,0 @@
-import {RemoteFunction, Services} from "../rpc.js"
-import {LocalSubscriptions} from "./LocalSubscriptions.js"
-import {ExtractPromiseResult} from "../utils/types.js"
-import {ThrottleArgsReducer} from "../utils/throttle.js"
-
-export type ThrottleSettings<D> = {
-  timeout: number
-  reducer?: ThrottleArgsReducer<D>
-}
-
-export function withTriggers<T extends Services<T>>(
-  localSubscriptions: LocalSubscriptions,
-  services: T,
-  name = ""
-): ServicesWithTriggers<T> {
-  const cachedItems: any = {}
-  const skippedProps = ["length", "name", "prototype", "arguments", "caller"]
-
-  return new Proxy(services, {
-    get(target: any, propName: string) {
-      // skip internal props
-      if (typeof propName != "string") return target[propName]
-
-      // skip other system props
-      if (["then", "catch", "toJSON", ...skippedProps].includes(propName)) return target[propName]
-
-      const itemName = name ? name + "/" + propName : propName
-
-      if (typeof target[propName] == "function") {
-        const delegate = (...params: unknown[]) => {
-          return target[propName](...params)
-        }
-
-        delegate.trigger = (filter: Record<string, unknown> = {}, suppliedData?: unknown) => {
-          // triggers are delayed for consumers to receive updates after the current call ends.
-          setTimeout(() => {
-            localSubscriptions.trigger(itemName, filter, suppliedData)
-          }, 0)
-        }
-
-        delegate.throttle = (settings: ThrottleSettings<unknown>) => {
-          localSubscriptions.throttleItem(itemName, settings)
-        }
-
-        return delegate
-      } else if (!cachedItems[propName]) {
-        cachedItems[propName] = withTriggers(
-          localSubscriptions,
-          services[propName as keyof T] as any,
-          itemName
-        )
-      }
-
-      return cachedItems[propName]
-    },
-
-    set(target, propName, value) {
-      cachedItems[propName] = value
-      return true
-    },
-
-    ownKeys() {
-      return [...skippedProps, ...Object.keys(cachedItems)]
-    },
-  })
-}
-
-export type ServicesWithTriggers<T extends Services<T>> = {
-  [K in keyof T]: T[K] extends RemoteFunction
-    ? T[K] & {
-        trigger(
-          filter?: Partial<Parameters<T[K]>[0]>,
-          suppliedData?: ExtractPromiseResult<ReturnType<T[K]>>
-        ): void
-        throttle(settings: ThrottleSettings<ExtractPromiseResult<ReturnType<T[K]>>>): void
-      }
-    : T[K] extends object
-      ? ServicesWithTriggers<T[K]>
-      : never
-}