@push-rpc/next 2.0.24 → 2.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/HttpClient.js +3 -1
- package/dist/client/HttpClient.js.map +1 -1
- package/dist/client/RpcClientImpl.d.ts +2 -2
- package/dist/client/RpcClientImpl.js.map +1 -1
- package/dist/client/index.d.ts +2 -2
- package/dist/client/index.js +2 -4
- package/dist/client/index.js.map +1 -1
- package/dist/client/remote.d.ts +8 -6
- package/dist/client/remote.js.map +1 -1
- package/dist/index.d.ts +10 -3
- package/dist/index.js.map +1 -1
- package/dist/server/RpcServerImpl.d.ts +3 -3
- package/dist/server/RpcServerImpl.js +48 -10
- package/dist/server/RpcServerImpl.js.map +1 -1
- package/dist/server/{LocalSubscriptions.d.ts → ServerSubscriptions.d.ts} +11 -5
- package/dist/server/{LocalSubscriptions.js → ServerSubscriptions.js} +24 -7
- package/dist/server/ServerSubscriptions.js.map +1 -0
- package/dist/server/http.js +3 -3
- package/dist/server/http.js.map +1 -1
- package/dist/server/implementation.d.ts +32 -0
- package/dist/server/{local.js → implementation.js} +21 -7
- package/dist/server/implementation.js.map +1 -0
- package/dist/server/index.d.ts +2 -2
- package/dist/server/index.js +1 -1
- package/dist/server/index.js.map +1 -1
- package/package.json +1 -1
- package/src/client/HttpClient.ts +5 -1
- package/src/client/RpcClientImpl.ts +2 -2
- package/src/client/index.ts +4 -6
- package/src/client/remote.ts +10 -13
- package/src/index.ts +20 -3
- package/src/server/RpcServerImpl.ts +76 -13
- package/src/server/{LocalSubscriptions.ts → ServerSubscriptions.ts} +40 -10
- package/src/server/http.ts +3 -3
- package/src/server/implementation.ts +116 -0
- package/src/server/index.ts +12 -9
- package/tests/calls.ts +21 -0
- package/tests/events.ts +82 -0
- package/tests/testUtils.ts +4 -4
- package/dist/server/LocalSubscriptions.js.map +0 -1
- package/dist/server/local.d.ts +0 -15
- package/dist/server/local.js.map +0 -1
- package/src/server/local.ts +0 -80
|
@@ -44,7 +44,9 @@ class HttpClient {
|
|
|
44
44
|
const text = await response.text();
|
|
45
45
|
const res = contentType && contentType.includes("application/json") ? (0, json_js_1.safeParseJson)(text) : text;
|
|
46
46
|
if (hasError || response.status < 200 || response.status >= 300) {
|
|
47
|
-
const error = new Error(response.headers.get("x-error")
|
|
47
|
+
const error = new Error(!!response.headers.get("x-error")
|
|
48
|
+
? decodeURIComponent(response.headers.get("x-error"))
|
|
49
|
+
: undefined);
|
|
48
50
|
Object.assign(error, { code: response.status });
|
|
49
51
|
if (typeof res == "object") {
|
|
50
52
|
Object.assign(error, res);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/client/HttpClient.ts"],"names":[],"mappings":";;;AAAA,sCAAqD;AACrD,8CAA6D;AAE7D,MAAa,UAAU;IACrB,YACU,GAAW,EACX,QAAgB,EAChB,UAAiD;QAFjD,QAAG,GAAH,GAAG,CAAQ;QACX,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAuC;IACxD,CAAC;IAEJ,KAAK,CAAC,IAAI,CAAC,QAAgB,EAAE,MAAiB,EAAE,WAAmB;QACjE,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IACzF,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,MAAiB,EAAE,WAAmB;QACtE,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IACxF,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAgB,EAAE,MAAiB,EAAE,WAAmB;QACxE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IACzF,CAAC;IAEO,UAAU,CAAC,QAAgB;QACjC,OAAO,GAAG,IAAI,CAAC,GAAG,IAAI,QAAQ,EAAE,CAAA;IAClC,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,MAAgC,EAChC,QAAgB,EAChB,MAAiB,EACjB,WAAmB,EACnB,OAA+B;QAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAEzC,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAC,GAAG,aAAa,CAAC,WAAW,CAAC,CAAA;YAErD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE;gBACpC,MAAM;gBACN,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,CAAC,yBAAgB,CAAC,EAAE,IAAI,CAAC,QAAQ;oBACjC,GAAG,OAAO;iBACX;gBACD,IAAI,EAAE,IAAA,uBAAa,EAAC,MAAM,CAAC;gBAC3B,MAAM;aACP,CAAC,CAAA;YAEF,QAAQ,EAAE,CAAA;YAEV,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YAEhD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;gBACxC,OAAM;YACR,CAAC;YAED,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;YAExD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YAElC,MAAM,GAAG,GACP,WAAW,IAAI,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAEtF,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;gBAChE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/client/HttpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Services } from "../rpc.js";
|
|
2
|
-
import {
|
|
2
|
+
import { ServicesClient } from "./remote.js";
|
|
3
3
|
import { ConsumeServicesOptions, RpcClient } from "./index.js";
|
|
4
4
|
export declare class RpcClientImpl<S extends Services<S>> implements RpcClient {
|
|
5
5
|
private readonly options;
|
|
@@ -12,7 +12,7 @@ export declare class RpcClientImpl<S extends Services<S>> implements RpcClient {
|
|
|
12
12
|
close(): Promise<void>;
|
|
13
13
|
_allSubscriptions(): [itemName: string, parameters: unknown[], consumers: (d: unknown) => void][];
|
|
14
14
|
_webSocket(): WebSocket | null;
|
|
15
|
-
createRemote():
|
|
15
|
+
createRemote(): ServicesClient<S>;
|
|
16
16
|
connect(): Promise<void>;
|
|
17
17
|
private call;
|
|
18
18
|
private subscribe;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RpcClientImpl.js","sourceRoot":"","sources":["../../src/client/RpcClientImpl.ts"],"names":[],"mappings":";;;AAAA,sCAA2E;AAC3E,mDAA0C;AAC1C,qEAA4D;AAC5D,qEAA4D;AAC5D,mCAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"RpcClientImpl.js","sourceRoot":"","sources":["../../src/client/RpcClientImpl.ts"],"names":[],"mappings":"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"}
|
package/dist/client/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RpcContext, Services } from "../rpc.js";
|
|
2
|
-
import {
|
|
2
|
+
import { ServicesClient } from "./remote.js";
|
|
3
3
|
import { Middleware } from "../utils/middleware.js";
|
|
4
4
|
export type RpcClient = {
|
|
5
5
|
readonly clientId: string;
|
|
@@ -30,5 +30,5 @@ export type ConsumeServicesOptions = {
|
|
|
30
30
|
};
|
|
31
31
|
export declare function consumeServices<S extends Services<S>>(url: string, overrideOptions?: Partial<ConsumeServicesOptions>): Promise<{
|
|
32
32
|
client: RpcClient;
|
|
33
|
-
remote:
|
|
33
|
+
remote: ServicesClient<S>;
|
|
34
34
|
}>;
|
package/dist/client/index.js
CHANGED
|
@@ -29,10 +29,8 @@ const defaultOptions = {
|
|
|
29
29
|
middleware: [],
|
|
30
30
|
notificationsMiddleware: [],
|
|
31
31
|
connectOnCreate: false,
|
|
32
|
-
onConnected: () => {
|
|
33
|
-
},
|
|
34
|
-
onDisconnected: () => {
|
|
35
|
-
},
|
|
32
|
+
onConnected: () => { },
|
|
33
|
+
onDisconnected: () => { },
|
|
36
34
|
getHeaders: async () => ({}),
|
|
37
35
|
getSubscriptionsUrl(url) {
|
|
38
36
|
return url.replace(/^https(.*)/, "wss$1").replace(/^http(.*)/, "ws$1");
|
package/dist/client/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":";;;AAEA,yDAAgD;AAoCzC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,kBAAmD,EAAE;IAKrD,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,OAAO,GAAG;QACd,GAAG,cAAc;QACjB,GAAG,eAAe;KACnB,CAAA;IAED,MAAM,MAAM,GAAG,IAAI,gCAAa,CAAI,GAAG,EAAE,OAAO,CAAC,CAAA;IAEjD,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC5B,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;IACxB,CAAC;IAED,OAAO;QACL,MAAM;QACN,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE;KAC9B,CAAA;AACH,CAAC;AA1BD,0CA0BC;AAED,MAAM,cAAc,GAA2B;IAC7C,WAAW,EAAE,CAAC,GAAG,IAAI;IACrB,cAAc,EAAE,CAAC;IACjB,qBAAqB,EAAE,EAAE,GAAG,IAAI;IAChC,YAAY,EAAE,IAAI,EAAE,sDAAsD;IAC1E,aAAa,EAAE,IAAI;IACnB,UAAU,EAAE,EAAE;IACd,uBAAuB,EAAE,EAAE;IAC3B,eAAe,EAAE,KAAK;IACtB,WAAW,EAAE,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":";;;AAEA,yDAAgD;AAoCzC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,kBAAmD,EAAE;IAKrD,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,OAAO,GAAG;QACd,GAAG,cAAc;QACjB,GAAG,eAAe;KACnB,CAAA;IAED,MAAM,MAAM,GAAG,IAAI,gCAAa,CAAI,GAAG,EAAE,OAAO,CAAC,CAAA;IAEjD,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC5B,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;IACxB,CAAC;IAED,OAAO;QACL,MAAM;QACN,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE;KAC9B,CAAA;AACH,CAAC;AA1BD,0CA0BC;AAED,MAAM,cAAc,GAA2B;IAC7C,WAAW,EAAE,CAAC,GAAG,IAAI;IACrB,cAAc,EAAE,CAAC;IACjB,qBAAqB,EAAE,EAAE,GAAG,IAAI;IAChC,YAAY,EAAE,IAAI,EAAE,sDAAsD;IAC1E,aAAa,EAAE,IAAI;IACnB,UAAU,EAAE,EAAE;IACd,uBAAuB,EAAE,EAAE;IAC3B,eAAe,EAAE,KAAK;IACtB,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC;IACrB,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;IAE5B,mBAAmB,CAAC,GAAW;QAC7B,OAAO,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IACxE,CAAC;IACD,KAAK,EAAE,IAAI;CACZ,CAAA"}
|
package/dist/client/remote.d.ts
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { CallOptions, Consumer, RemoteFunction, Services } from "../rpc.js";
|
|
2
|
-
export declare function createRemote<S extends Services<S>>(hooks: RemoteHooks, name?: string):
|
|
2
|
+
export declare function createRemote<S extends Services<S>>(hooks: RemoteHooks, name?: string): ServicesClient<S>;
|
|
3
3
|
export type RemoteHooks = {
|
|
4
4
|
call(itemName: string, parameters: unknown[], callOptions?: CallOptions): Promise<unknown>;
|
|
5
5
|
subscribe(itemName: string, parameters: unknown[], consumer: (d: unknown) => void, callOptions?: CallOptions): Promise<void>;
|
|
6
6
|
unsubscribe(itemName: string, parameters: unknown[], consumer: (d: unknown) => void, callOptions?: CallOptions): Promise<void>;
|
|
7
7
|
};
|
|
8
8
|
export type AddParameters<TFunction extends (...args: any) => any, TParameters extends [...args: any]> = (...args: [...Parameters<TFunction>, ...TParameters]) => ReturnType<TFunction>;
|
|
9
|
-
export type
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
export type FunctionClient<F extends RemoteFunction> = {
|
|
10
|
+
subscribe(consumer: Consumer<F>, ...parameters: [...Parameters<F>, CallOptions?]): Promise<void>;
|
|
11
|
+
unsubscribe(consumer: Consumer<F>, ...parameters: [...Parameters<F>, CallOptions?]): Promise<void>;
|
|
12
|
+
itemName: string;
|
|
13
|
+
};
|
|
14
|
+
export type ServicesClient<T extends Services<T>> = {
|
|
15
|
+
[K in keyof T]: T[K] extends RemoteFunction ? AddParameters<T[K], [CallOptions?]> & FunctionClient<T[K]> : T[K] extends object ? ServicesClient<T[K]> : never;
|
|
14
16
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/client/remote.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/client/remote.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,13 +1,20 @@
|
|
|
1
|
-
|
|
1
|
+
import { ServicesClient } from "./client/remote";
|
|
2
|
+
import type { Services } from "./rpc.js";
|
|
3
|
+
import type { ServicesImplementation } from "./server/implementation.js";
|
|
4
|
+
export { Services };
|
|
5
|
+
export type { RemoteFunction, Consumer, RpcContext, RpcConnectionContext } from "./rpc.js";
|
|
2
6
|
export { RpcError, RpcErrors, CallOptions } from "./rpc.js";
|
|
3
7
|
export type { Middleware } from "./utils/middleware.js";
|
|
4
8
|
export { withMiddlewares } from "./utils/middleware.js";
|
|
5
9
|
export type { RpcServer, PublishServicesOptions } from "./server/index.js";
|
|
6
10
|
export type { HttpServerHooks } from "./server/http.js";
|
|
7
11
|
export { publishServices } from "./server/index.js";
|
|
8
|
-
export type {
|
|
12
|
+
export type { FunctionImplementation, ThrottleSettings, SubscribeEvent, UnsubscribeEvent, } from "./server/implementation.js";
|
|
13
|
+
export { ServicesImplementation };
|
|
9
14
|
export type { RpcClient, ConsumeServicesOptions, ClientCache } from "./client/index.js";
|
|
10
15
|
export { consumeServices } from "./client/index.js";
|
|
11
|
-
export type {
|
|
16
|
+
export type { ServicesClient, FunctionClient, AddParameters } from "./client/remote.js";
|
|
12
17
|
export { log, setLogger } from "./logger.js";
|
|
13
18
|
export { safeStringify, safeParseJson } from "./utils/json.js";
|
|
19
|
+
export type { ExtractPromiseResult } from "./utils/types.js";
|
|
20
|
+
export type UnifiedServices<T extends Services<T>> = ServicesImplementation<T> & ServicesClient<T>;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAQA,mCAAyD;AAAjD,kGAAA,QAAQ,OAAA;AAAE,mGAAA,SAAS,OAAA;AAAE,qGAAA,WAAW,OAAA;AAGxC,uDAAqD;AAA7C,gHAAA,eAAe,OAAA;AAIvB,8CAAiD;AAAzC,2GAAA,eAAe,OAAA;AAYvB,8CAAiD;AAAzC,2GAAA,eAAe,OAAA;AAIvB,yCAA0C;AAAlC,gGAAA,GAAG,OAAA;AAAE,sGAAA,SAAS,OAAA;AACtB,2CAA4D;AAApD,wGAAA,aAAa,OAAA;AAAE,wGAAA,aAAa,OAAA"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { PublishServicesOptions, RpcServer } from "./index.js";
|
|
3
3
|
import http from "http";
|
|
4
4
|
import { RpcContext, Services } from "../rpc.js";
|
|
5
|
-
import {
|
|
5
|
+
import { ServicesImplementation } from "./implementation.js";
|
|
6
6
|
export declare class RpcServerImpl<S extends Services<S>, C extends RpcContext> implements RpcServer {
|
|
7
7
|
private readonly services;
|
|
8
8
|
private readonly options;
|
|
@@ -10,11 +10,11 @@ export declare class RpcServerImpl<S extends Services<S>, C extends RpcContext>
|
|
|
10
10
|
private createConnectionsServer;
|
|
11
11
|
start(): Promise<void>;
|
|
12
12
|
close(): Promise<void>;
|
|
13
|
-
createServicesWithTriggers(): ServicesWithTriggers<S>;
|
|
14
13
|
_allSubscriptions(): [itemName: string, parameters: unknown[], consumer: unknown][];
|
|
15
14
|
private readonly localSubscriptions;
|
|
16
15
|
private connectionsServer;
|
|
17
|
-
readonly httpServer: http.Server
|
|
16
|
+
readonly httpServer: http.Server;
|
|
17
|
+
readonly implementation: ServicesImplementation<S>;
|
|
18
18
|
private call;
|
|
19
19
|
private subscribe;
|
|
20
20
|
private unsubscribe;
|
|
@@ -27,19 +27,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.RpcServerImpl = void 0;
|
|
30
|
-
const
|
|
30
|
+
const ServerSubscriptions_js_1 = require("./ServerSubscriptions.js");
|
|
31
31
|
const http_1 = __importDefault(require("http"));
|
|
32
32
|
const http_js_1 = require("./http.js");
|
|
33
33
|
const rpc_js_1 = require("../rpc.js");
|
|
34
34
|
const logger_js_1 = require("../logger.js");
|
|
35
35
|
const middleware_js_1 = require("../utils/middleware.js");
|
|
36
|
-
const
|
|
36
|
+
const implementation_js_1 = require("./implementation.js");
|
|
37
37
|
const json_js_1 = require("../utils/json.js");
|
|
38
|
+
const node_events_1 = __importDefault(require("node:events"));
|
|
38
39
|
class RpcServerImpl {
|
|
39
40
|
constructor(services, options) {
|
|
40
41
|
this.services = services;
|
|
41
42
|
this.options = options;
|
|
42
|
-
this.localSubscriptions = new
|
|
43
|
+
this.localSubscriptions = new ServerSubscriptions_js_1.ServerSubscriptions();
|
|
43
44
|
this.connectionsServer = null;
|
|
44
45
|
this.call = async (connectionContext, itemName, parameters) => {
|
|
45
46
|
const item = this.getRemoteFunction(itemName);
|
|
@@ -79,27 +80,53 @@ class RpcServerImpl {
|
|
|
79
80
|
}
|
|
80
81
|
});
|
|
81
82
|
if (this.connectionsServer?.isClientSubscribed(connectionContext.clientId)) {
|
|
82
|
-
this.localSubscriptions.subscribe(connectionContext.clientId, itemName, parameters, update);
|
|
83
|
+
const subscriptionAdded = this.localSubscriptions.subscribe(connectionContext.clientId, itemName, parameters, update);
|
|
84
|
+
if (subscriptionAdded) {
|
|
85
|
+
item.eventEmitter.emit("subscribe", {
|
|
86
|
+
itemName,
|
|
87
|
+
filter: parameters[0],
|
|
88
|
+
clientId: connectionContext.clientId,
|
|
89
|
+
context: connectionContext,
|
|
90
|
+
});
|
|
91
|
+
}
|
|
83
92
|
}
|
|
84
93
|
const lastData = await this.invokeLocalFunction(connectionContext, itemName, item, parameters, rpc_js_1.InvocationType.Subscribe);
|
|
85
94
|
lastDataJson = (0, json_js_1.safeStringify)(lastData);
|
|
86
95
|
return lastData;
|
|
87
96
|
}
|
|
88
97
|
catch (e) {
|
|
89
|
-
this.localSubscriptions.unsubscribe(connectionContext.clientId, itemName, parameters);
|
|
98
|
+
const unsubscribed = this.localSubscriptions.unsubscribe(connectionContext.clientId, itemName, parameters);
|
|
99
|
+
if (unsubscribed) {
|
|
100
|
+
item.eventEmitter.emit("subscribe", {
|
|
101
|
+
itemName,
|
|
102
|
+
filter: parameters[0],
|
|
103
|
+
clientId: connectionContext.clientId,
|
|
104
|
+
});
|
|
105
|
+
}
|
|
90
106
|
logger_js_1.log.error(`Failed to subscribe ${itemName}`, e);
|
|
91
107
|
throw e;
|
|
92
108
|
}
|
|
93
109
|
};
|
|
94
110
|
this.unsubscribe = async (connectionContext, itemName, parameters) => {
|
|
95
111
|
try {
|
|
96
|
-
this.localSubscriptions.unsubscribe(connectionContext.clientId, itemName, parameters);
|
|
112
|
+
const unsubscribed = this.localSubscriptions.unsubscribe(connectionContext.clientId, itemName, parameters);
|
|
113
|
+
if (unsubscribed) {
|
|
114
|
+
const item = this.getRemoteFunction(itemName);
|
|
115
|
+
if (item) {
|
|
116
|
+
item.eventEmitter.emit("unsubscribe", {
|
|
117
|
+
itemName,
|
|
118
|
+
filter: parameters[0],
|
|
119
|
+
clientId: connectionContext.clientId,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
}
|
|
97
123
|
}
|
|
98
124
|
catch (e) {
|
|
99
125
|
logger_js_1.log.error(`Failed to unsubscribe ${itemName}`, e);
|
|
100
126
|
throw e;
|
|
101
127
|
}
|
|
102
128
|
};
|
|
129
|
+
this.implementation = (0, implementation_js_1.prepareImplementation)(this.localSubscriptions, services);
|
|
103
130
|
if ("server" in this.options) {
|
|
104
131
|
this.httpServer = this.options.server;
|
|
105
132
|
}
|
|
@@ -128,7 +155,17 @@ class RpcServerImpl {
|
|
|
128
155
|
async createConnectionsServer() {
|
|
129
156
|
const { ConnectionsServer } = await Promise.resolve().then(() => __importStar(require("./ConnectionsServer.js")));
|
|
130
157
|
return new ConnectionsServer(this.httpServer, { pingInterval: this.options.pingInterval, path: this.options.path }, (clientId) => {
|
|
131
|
-
this.localSubscriptions.unsubscribeAll(clientId);
|
|
158
|
+
const unsubscribed = this.localSubscriptions.unsubscribeAll(clientId);
|
|
159
|
+
for (const { itemName, parameters, clientId } of unsubscribed) {
|
|
160
|
+
const item = this.getRemoteFunction(itemName);
|
|
161
|
+
if (item) {
|
|
162
|
+
item.eventEmitter.emit("unsubscribe", {
|
|
163
|
+
itemName,
|
|
164
|
+
filter: parameters[0],
|
|
165
|
+
clientId,
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
}
|
|
132
169
|
}, !("server" in this.options));
|
|
133
170
|
}
|
|
134
171
|
async start() {
|
|
@@ -162,12 +199,11 @@ class RpcServerImpl {
|
|
|
162
199
|
});
|
|
163
200
|
});
|
|
164
201
|
}
|
|
165
|
-
createServicesWithTriggers() {
|
|
166
|
-
return (0, local_js_1.withTriggers)(this.localSubscriptions, this.services);
|
|
167
|
-
}
|
|
168
202
|
_allSubscriptions() {
|
|
169
203
|
return this.localSubscriptions._allSubscriptions();
|
|
170
204
|
}
|
|
205
|
+
// getRemoteFunction should only take functions from services, and not from implementation in
|
|
206
|
+
// order to not take .trigger and other implementation-specific details
|
|
171
207
|
getRemoteFunction(itemName, root = this.services) {
|
|
172
208
|
const parts = itemName.split("/");
|
|
173
209
|
let item = root;
|
|
@@ -180,8 +216,10 @@ class RpcServerImpl {
|
|
|
180
216
|
}
|
|
181
217
|
if (!item)
|
|
182
218
|
return undefined;
|
|
219
|
+
item[implementation_js_1.eventEmitterSymbol] = item[implementation_js_1.eventEmitterSymbol] ?? new node_events_1.default();
|
|
183
220
|
return {
|
|
184
221
|
function: item,
|
|
222
|
+
eventEmitter: item[implementation_js_1.eventEmitterSymbol],
|
|
185
223
|
container: parent,
|
|
186
224
|
};
|
|
187
225
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RpcServerImpl.js","sourceRoot":"","sources":["../../src/server/RpcServerImpl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"RpcServerImpl.js","sourceRoot":"","sources":["../../src/server/RpcServerImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { ThrottleSettings } from "./
|
|
2
|
-
export declare class
|
|
3
|
-
subscribe(clientId: string, itemName: string, parameters: unknown[], update: (suppliedData?: unknown) => void):
|
|
4
|
-
unsubscribe(clientId: string, itemName: string, parameters: unknown[]):
|
|
5
|
-
unsubscribeAll(clientId: string):
|
|
1
|
+
import { ThrottleSettings } from "./implementation.js";
|
|
2
|
+
export declare class ServerSubscriptions {
|
|
3
|
+
subscribe(clientId: string, itemName: string, parameters: unknown[], update: (suppliedData?: unknown) => void): boolean;
|
|
4
|
+
unsubscribe(clientId: string, itemName: string, parameters: unknown[]): boolean;
|
|
5
|
+
unsubscribeAll(clientId: string): Subscribed[];
|
|
6
6
|
trigger(itemName: string, triggerFilter?: Record<string, unknown>, suppliedData?: unknown): void;
|
|
7
7
|
throttled(itemName: string, f: (d: unknown) => void): (d: unknown) => void;
|
|
8
8
|
throttleItem(itemName: string, settings: ThrottleSettings<unknown>): void;
|
|
@@ -10,3 +10,9 @@ export declare class LocalSubscriptions {
|
|
|
10
10
|
private byItem;
|
|
11
11
|
_allSubscriptions(): [itemName: string, parameters: unknown[], consumer: unknown][];
|
|
12
12
|
}
|
|
13
|
+
type Subscribed = {
|
|
14
|
+
itemName: string;
|
|
15
|
+
parameters: unknown[];
|
|
16
|
+
clientId: string;
|
|
17
|
+
};
|
|
18
|
+
export {};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.ServerSubscriptions = void 0;
|
|
4
4
|
const json_js_1 = require("../utils/json.js");
|
|
5
5
|
const throttle_js_1 = require("../utils/throttle.js");
|
|
6
|
-
class
|
|
6
|
+
class ServerSubscriptions {
|
|
7
7
|
constructor() {
|
|
8
8
|
this.itemThrottleSettings = new Map();
|
|
9
9
|
this.byItem = new Map();
|
|
@@ -19,28 +19,44 @@ class LocalSubscriptions {
|
|
|
19
19
|
itemSubscriptions.byFilter.set(filterKey, subscriptions);
|
|
20
20
|
if (!subscriptions.subscribedClients.some((c) => c.clientId == clientId)) {
|
|
21
21
|
subscriptions.subscribedClients.push({ clientId, update });
|
|
22
|
+
return true;
|
|
22
23
|
}
|
|
24
|
+
return false;
|
|
23
25
|
}
|
|
24
26
|
unsubscribe(clientId, itemName, parameters) {
|
|
25
27
|
const itemSubscriptions = this.byItem.get(itemName);
|
|
26
28
|
if (!itemSubscriptions)
|
|
27
|
-
return;
|
|
29
|
+
return false;
|
|
28
30
|
const filterKey = getFilterKey(parameters);
|
|
29
31
|
const subscriptions = itemSubscriptions.byFilter.get(filterKey);
|
|
30
32
|
if (!subscriptions)
|
|
31
|
-
return;
|
|
33
|
+
return false;
|
|
34
|
+
const oldLength = subscriptions.subscribedClients.length;
|
|
32
35
|
subscriptions.subscribedClients = subscriptions.subscribedClients.filter((subscription) => subscription.clientId != clientId);
|
|
36
|
+
const unsubscribed = oldLength != subscriptions.subscribedClients.length;
|
|
33
37
|
if (!subscriptions.subscribedClients.length) {
|
|
34
38
|
itemSubscriptions.byFilter.delete(filterKey);
|
|
35
39
|
if (itemSubscriptions.byFilter.size == 0) {
|
|
36
40
|
this.byItem.delete(itemName);
|
|
37
41
|
}
|
|
38
42
|
}
|
|
43
|
+
return unsubscribed;
|
|
39
44
|
}
|
|
40
45
|
unsubscribeAll(clientId) {
|
|
46
|
+
const r = [];
|
|
41
47
|
for (const [itemName, itemSubscriptions] of this.byItem.entries()) {
|
|
42
48
|
for (const [filterKey, subscriptions] of itemSubscriptions.byFilter.entries()) {
|
|
43
|
-
subscriptions.subscribedClients = subscriptions.subscribedClients.filter((subscription) =>
|
|
49
|
+
subscriptions.subscribedClients = subscriptions.subscribedClients.filter((subscription) => {
|
|
50
|
+
const evict = subscription.clientId == clientId;
|
|
51
|
+
if (evict) {
|
|
52
|
+
r.push({
|
|
53
|
+
itemName,
|
|
54
|
+
parameters: [subscriptions.filter],
|
|
55
|
+
clientId: clientId,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
return !evict;
|
|
59
|
+
});
|
|
44
60
|
if (!subscriptions.subscribedClients.length) {
|
|
45
61
|
itemSubscriptions.byFilter.delete(filterKey);
|
|
46
62
|
}
|
|
@@ -49,6 +65,7 @@ class LocalSubscriptions {
|
|
|
49
65
|
this.byItem.delete(itemName);
|
|
50
66
|
}
|
|
51
67
|
}
|
|
68
|
+
return r;
|
|
52
69
|
}
|
|
53
70
|
trigger(itemName, triggerFilter = {}, suppliedData) {
|
|
54
71
|
const itemSub = this.byItem.get(itemName);
|
|
@@ -87,7 +104,7 @@ class LocalSubscriptions {
|
|
|
87
104
|
return result;
|
|
88
105
|
}
|
|
89
106
|
}
|
|
90
|
-
exports.
|
|
107
|
+
exports.ServerSubscriptions = ServerSubscriptions;
|
|
91
108
|
function filterContains(triggerFilter, subscriptionFilter) {
|
|
92
109
|
if (subscriptionFilter == null)
|
|
93
110
|
return true; // subscribe to all data
|
|
@@ -110,4 +127,4 @@ function filterContains(triggerFilter, subscriptionFilter) {
|
|
|
110
127
|
function getFilterKey(parameters) {
|
|
111
128
|
return (0, json_js_1.safeStringify)(parameters?.[0] ?? null);
|
|
112
129
|
}
|
|
113
|
-
//# sourceMappingURL=
|
|
130
|
+
//# sourceMappingURL=ServerSubscriptions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ServerSubscriptions.js","sourceRoot":"","sources":["../../src/server/ServerSubscriptions.ts"],"names":[],"mappings":"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"}
|
package/dist/server/http.js
CHANGED
|
@@ -6,7 +6,7 @@ const logger_js_1 = require("../logger.js");
|
|
|
6
6
|
const server_js_1 = require("../utils/server.js");
|
|
7
7
|
async function serveHttpRequest(req, res, path, hooks, createConnectionContext) {
|
|
8
8
|
// if port is in options - response 404 on other URLs
|
|
9
|
-
//
|
|
9
|
+
// otherwise simply handle request
|
|
10
10
|
if (req.url?.startsWith(path)) {
|
|
11
11
|
try {
|
|
12
12
|
const ctx = await createConnectionContext(req, res);
|
|
@@ -52,7 +52,7 @@ async function serveHttpRequest(req, res, path, hooks, createConnectionContext)
|
|
|
52
52
|
catch (e) {
|
|
53
53
|
if (e.code && typeof e.code == "number" && e.code >= 100 && e.code < 600) {
|
|
54
54
|
res.statusCode = e.code;
|
|
55
|
-
res.setHeader("X-Error", e["message"] ?? "");
|
|
55
|
+
res.setHeader("X-Error", encodeURIComponent(e["message"] ?? ""));
|
|
56
56
|
const { code, message, stack, ...rest } = e;
|
|
57
57
|
if (Object.keys(rest).length > 0) {
|
|
58
58
|
res.setHeader("Content-Type", "application/json");
|
|
@@ -65,7 +65,7 @@ async function serveHttpRequest(req, res, path, hooks, createConnectionContext)
|
|
|
65
65
|
logger_js_1.log.warn(`Error in ${req.url}.`, e);
|
|
66
66
|
res.statusCode = 500;
|
|
67
67
|
if (e["message"]) {
|
|
68
|
-
res.setHeader("X-Error", e["message"]);
|
|
68
|
+
res.setHeader("X-Error", encodeURIComponent(e["message"]));
|
|
69
69
|
}
|
|
70
70
|
res.end();
|
|
71
71
|
return;
|
package/dist/server/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/server/http.ts"],"names":[],"mappings":";;;AAGA,8CAA6D;AAC7D,4CAAgC;AAChC,kDAAoD;AAE7C,KAAK,UAAU,gBAAgB,CACpC,GAAoB,EACpB,GAAmB,EACnB,IAAY,EACZ,KAAsB,EACtB,uBAGkC;IAElC,qDAAqD;IACrD
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/server/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { RemoteFunction, RpcConnectionContext, Services } from "../rpc.js";
|
|
2
|
+
import { ServerSubscriptions } from "./ServerSubscriptions";
|
|
3
|
+
import { ExtractPromiseResult } from "../utils/types.js";
|
|
4
|
+
import { ThrottleArgsReducer } from "../utils/throttle.js";
|
|
5
|
+
export declare const eventEmitterSymbol: unique symbol;
|
|
6
|
+
export type ThrottleSettings<D> = {
|
|
7
|
+
timeout: number;
|
|
8
|
+
reducer?: ThrottleArgsReducer<D>;
|
|
9
|
+
};
|
|
10
|
+
export declare function prepareImplementation<T extends Services<T>>(serverSubscriptions: ServerSubscriptions, services: T, name?: string): ServicesImplementation<T>;
|
|
11
|
+
export type SubscribeEvent<F extends RemoteFunction> = {
|
|
12
|
+
itemName: string;
|
|
13
|
+
filter: Parameters<F>[0];
|
|
14
|
+
clientId: string;
|
|
15
|
+
context: RpcConnectionContext;
|
|
16
|
+
};
|
|
17
|
+
export type UnsubscribeEvent<F extends RemoteFunction> = {
|
|
18
|
+
itemName: string;
|
|
19
|
+
filter: Parameters<F>[0];
|
|
20
|
+
clientId: string;
|
|
21
|
+
};
|
|
22
|
+
export type FunctionImplementation<F extends RemoteFunction> = {
|
|
23
|
+
trigger(filter?: Partial<Parameters<F>[0]>, suppliedData?: ExtractPromiseResult<ReturnType<F>>): void;
|
|
24
|
+
throttle(settings: ThrottleSettings<ExtractPromiseResult<ReturnType<F>>>): void;
|
|
25
|
+
addEventListener(event: "subscribe", listener: (event: SubscribeEvent<F>) => void): void;
|
|
26
|
+
addEventListener(event: "unsubscribe", listener: (event: UnsubscribeEvent<F>) => void): void;
|
|
27
|
+
removeEventListener(event: "subscribe", listener: (event: SubscribeEvent<F>) => void): void;
|
|
28
|
+
removeEventListener(event: "unsubscribe", listener: (event: UnsubscribeEvent<F>) => void): void;
|
|
29
|
+
};
|
|
30
|
+
export type ServicesImplementation<T extends Services<T>> = {
|
|
31
|
+
[K in keyof T]: T[K] extends RemoteFunction ? T[K] & FunctionImplementation<T[K]> : T[K] extends object ? ServicesImplementation<T[K]> : never;
|
|
32
|
+
};
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
6
|
+
exports.prepareImplementation = exports.eventEmitterSymbol = void 0;
|
|
7
|
+
const node_events_1 = __importDefault(require("node:events"));
|
|
8
|
+
exports.eventEmitterSymbol = Symbol("eventEmitter");
|
|
9
|
+
function prepareImplementation(serverSubscriptions, services, name = "") {
|
|
5
10
|
const cachedItems = {};
|
|
6
11
|
const skippedProps = ["length", "name", "prototype", "arguments", "caller"];
|
|
7
12
|
return new Proxy(services, {
|
|
@@ -17,19 +22,28 @@ function withTriggers(localSubscriptions, services, name = "") {
|
|
|
17
22
|
const delegate = (...params) => {
|
|
18
23
|
return target[propName](...params);
|
|
19
24
|
};
|
|
25
|
+
// bind eventEmitter to source services, so it can be looked up from getRemoteFunction
|
|
26
|
+
target[propName][exports.eventEmitterSymbol] =
|
|
27
|
+
target[propName][exports.eventEmitterSymbol] ?? new node_events_1.default();
|
|
20
28
|
delegate.trigger = (filter = {}, suppliedData) => {
|
|
21
29
|
// triggers are delayed for consumers to receive updates after the current call ends.
|
|
22
30
|
setTimeout(() => {
|
|
23
|
-
|
|
31
|
+
serverSubscriptions.trigger(itemName, filter, suppliedData);
|
|
24
32
|
}, 0);
|
|
25
33
|
};
|
|
26
34
|
delegate.throttle = (settings) => {
|
|
27
|
-
|
|
35
|
+
serverSubscriptions.throttleItem(itemName, settings);
|
|
36
|
+
};
|
|
37
|
+
delegate.addEventListener = (eventName, listener) => {
|
|
38
|
+
target[propName][exports.eventEmitterSymbol].addListener(eventName, listener);
|
|
39
|
+
};
|
|
40
|
+
delegate.removeEventListener = (eventName, listener) => {
|
|
41
|
+
target[propName][exports.eventEmitterSymbol].removeListener(eventName, listener);
|
|
28
42
|
};
|
|
29
43
|
return delegate;
|
|
30
44
|
}
|
|
31
45
|
else if (!cachedItems[propName]) {
|
|
32
|
-
cachedItems[propName] =
|
|
46
|
+
cachedItems[propName] = prepareImplementation(serverSubscriptions, services[propName], itemName);
|
|
33
47
|
}
|
|
34
48
|
return cachedItems[propName];
|
|
35
49
|
},
|
|
@@ -42,5 +56,5 @@ function withTriggers(localSubscriptions, services, name = "") {
|
|
|
42
56
|
},
|
|
43
57
|
});
|
|
44
58
|
}
|
|
45
|
-
exports.
|
|
46
|
-
//# sourceMappingURL=
|
|
59
|
+
exports.prepareImplementation = prepareImplementation;
|
|
60
|
+
//# sourceMappingURL=implementation.js.map
|