@based/server 6.8.0 → 7.0.1
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/auth/defaultConfig.js +4 -9
- package/dist/auth/defaultConfig.js.map +1 -1
- package/dist/auth/index.d.ts +3 -3
- package/dist/auth/index.js +21 -24
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/parseAuthState.js +3 -5
- package/dist/auth/parseAuthState.js.map +1 -1
- package/dist/auth/parseJSONAuthState.js +1 -3
- package/dist/auth/parseJSONAuthState.js.map +1 -1
- package/dist/authorize.d.ts +2 -2
- package/dist/authorize.js +17 -22
- package/dist/authorize.js.map +1 -1
- package/dist/channel/cleanup.d.ts +1 -1
- package/dist/channel/cleanup.js +2 -6
- package/dist/channel/cleanup.js.map +1 -1
- package/dist/channel/create.d.ts +2 -2
- package/dist/channel/create.js +5 -9
- package/dist/channel/create.js.map +1 -1
- package/dist/channel/destroy.d.ts +2 -2
- package/dist/channel/destroy.js +7 -12
- package/dist/channel/destroy.js.map +1 -1
- package/dist/channel/extend.d.ts +3 -3
- package/dist/channel/extend.js +2 -7
- package/dist/channel/extend.js.map +1 -1
- package/dist/channel/get.d.ts +2 -2
- package/dist/channel/get.js +4 -9
- package/dist/channel/get.js.map +1 -1
- package/dist/channel/index.d.ts +8 -8
- package/dist/channel/index.js +8 -24
- package/dist/channel/index.js.map +1 -1
- package/dist/channel/start.d.ts +1 -1
- package/dist/channel/start.js +10 -15
- package/dist/channel/start.js.map +1 -1
- package/dist/channel/subscribe.d.ts +1 -1
- package/dist/channel/subscribe.js +8 -13
- package/dist/channel/subscribe.js.map +1 -1
- package/dist/channel/types.js +1 -2
- package/dist/channel/types.js.map +1 -1
- package/dist/channel/unsub.d.ts +1 -1
- package/dist/channel/unsub.js +7 -13
- package/dist/channel/unsub.js.map +1 -1
- package/dist/compress.d.ts +1 -1
- package/dist/compress.js +9 -16
- package/dist/compress.js.map +1 -1
- package/dist/error/errorTypeHandlers.d.ts +1 -1
- package/dist/error/errorTypeHandlers.js +20 -23
- package/dist/error/errorTypeHandlers.js.map +1 -1
- package/dist/error/index.d.ts +4 -4
- package/dist/error/index.js +10 -29
- package/dist/error/index.js.map +1 -1
- package/dist/error/types.js +3 -6
- package/dist/error/types.js.map +1 -1
- package/dist/functionApi/callFunction.d.ts +1 -1
- package/dist/functionApi/callFunction.js +10 -14
- package/dist/functionApi/callFunction.js.map +1 -1
- package/dist/functionApi/channelSubscribe.d.ts +1 -1
- package/dist/functionApi/channelSubscribe.js +14 -18
- package/dist/functionApi/channelSubscribe.js.map +1 -1
- package/dist/functionApi/client/channel.js +12 -12
- package/dist/functionApi/client/channel.js.map +1 -1
- package/dist/functionApi/client/index.d.ts +4 -4
- package/dist/functionApi/client/index.js +15 -21
- package/dist/functionApi/client/index.js.map +1 -1
- package/dist/functionApi/client/query.d.ts +1 -1
- package/dist/functionApi/client/query.js +9 -10
- package/dist/functionApi/client/query.js.map +1 -1
- package/dist/functionApi/get.d.ts +1 -1
- package/dist/functionApi/get.js +17 -21
- package/dist/functionApi/get.js.map +1 -1
- package/dist/functionApi/index.d.ts +7 -8
- package/dist/functionApi/index.js +7 -26
- package/dist/functionApi/index.js.map +1 -1
- package/dist/functionApi/observe.d.ts +2 -2
- package/dist/functionApi/observe.js +15 -19
- package/dist/functionApi/observe.js.map +1 -1
- package/dist/functionApi/publish.d.ts +1 -1
- package/dist/functionApi/publish.js +7 -11
- package/dist/functionApi/publish.js.map +1 -1
- package/dist/functionApi/stream.d.ts +1 -1
- package/dist/functionApi/stream.js +13 -17
- package/dist/functionApi/stream.js.map +1 -1
- package/dist/functions/genVersion.js +8 -12
- package/dist/functions/genVersion.js.map +1 -1
- package/dist/functions/index.d.ts +5 -4
- package/dist/functions/index.js +54 -59
- package/dist/functions/index.js.map +1 -1
- package/dist/functions/timeout.js +2 -7
- package/dist/functions/timeout.js.map +1 -1
- package/dist/functions/types.d.ts +1 -1
- package/dist/functions/types.js +1 -2
- package/dist/incoming/http/function.d.ts +1 -1
- package/dist/incoming/http/function.js +13 -17
- package/dist/incoming/http/function.js.map +1 -1
- package/dist/incoming/http/handleRequest.d.ts +3 -0
- package/dist/incoming/http/handleRequest.js +11 -0
- package/dist/incoming/http/handleRequest.js.map +1 -0
- package/dist/incoming/http/index.d.ts +1 -1
- package/dist/incoming/http/index.js +54 -90
- package/dist/incoming/http/index.js.map +1 -1
- package/dist/incoming/http/parseQuery.d.ts +2 -2
- package/dist/incoming/http/parseQuery.js +9 -8
- package/dist/incoming/http/parseQuery.js.map +1 -1
- package/dist/incoming/http/publish.d.ts +1 -1
- package/dist/incoming/http/publish.js +16 -20
- package/dist/incoming/http/publish.js.map +1 -1
- package/dist/incoming/http/query.d.ts +1 -1
- package/dist/incoming/http/query.js +32 -46
- package/dist/incoming/http/query.js.map +1 -1
- package/dist/incoming/http/readBody.d.ts +1 -1
- package/dist/incoming/http/readBody.js +17 -25
- package/dist/incoming/http/readBody.js.map +1 -1
- package/dist/incoming/http/streamFunction/getExtension.js +3 -8
- package/dist/incoming/http/streamFunction/getExtension.js.map +1 -1
- package/dist/incoming/http/streamFunction/index.d.ts +1 -1
- package/dist/incoming/http/streamFunction/index.js +8 -12
- package/dist/incoming/http/streamFunction/index.js.map +1 -1
- package/dist/incoming/http/streamFunction/multiPart/index.d.ts +1 -1
- package/dist/incoming/http/streamFunction/multiPart/index.js +12 -19
- package/dist/incoming/http/streamFunction/multiPart/index.js.map +1 -1
- package/dist/incoming/http/streamFunction/multiPart/readFormData.d.ts +1 -1
- package/dist/incoming/http/streamFunction/multiPart/readFormData.js +11 -16
- package/dist/incoming/http/streamFunction/multiPart/readFormData.js.map +1 -1
- package/dist/incoming/http/streamFunction/stream/createStream.d.ts +1 -1
- package/dist/incoming/http/streamFunction/stream/createStream.js +13 -18
- package/dist/incoming/http/streamFunction/stream/createStream.js.map +1 -1
- package/dist/incoming/http/streamFunction/stream/index.d.ts +1 -1
- package/dist/incoming/http/streamFunction/stream/index.js +19 -26
- package/dist/incoming/http/streamFunction/stream/index.js.map +1 -1
- package/dist/incoming/index.d.ts +1 -1
- package/dist/incoming/index.js +19 -24
- package/dist/incoming/index.js.map +1 -1
- package/dist/incoming/upgrade.d.ts +1 -1
- package/dist/incoming/upgrade.js +8 -13
- package/dist/incoming/upgrade.js.map +1 -1
- package/dist/incoming/ws/auth.d.ts +2 -2
- package/dist/incoming/ws/auth.js +19 -25
- package/dist/incoming/ws/auth.js.map +1 -1
- package/dist/incoming/ws/channelPublish.d.ts +1 -1
- package/dist/incoming/ws/channelPublish.js +17 -21
- package/dist/incoming/ws/channelPublish.js.map +1 -1
- package/dist/incoming/ws/channelSubscribe.d.ts +2 -2
- package/dist/incoming/ws/channelSubscribe.js +32 -38
- package/dist/incoming/ws/channelSubscribe.js.map +1 -1
- package/dist/incoming/ws/function.d.ts +1 -1
- package/dist/incoming/ws/function.js +23 -27
- package/dist/incoming/ws/function.js.map +1 -1
- package/dist/incoming/ws/get.d.ts +1 -1
- package/dist/incoming/ws/get.js +34 -38
- package/dist/incoming/ws/get.js.map +1 -1
- package/dist/incoming/ws/index.d.ts +1 -1
- package/dist/incoming/ws/index.js +19 -23
- package/dist/incoming/ws/index.js.map +1 -1
- package/dist/incoming/ws/query.d.ts +2 -2
- package/dist/incoming/ws/query.js +26 -32
- package/dist/incoming/ws/query.js.map +1 -1
- package/dist/incoming/ws/types.d.ts +1 -1
- package/dist/incoming/ws/types.js +1 -2
- package/dist/index.d.ts +9 -9
- package/dist/index.js +9 -29
- package/dist/index.js.map +1 -1
- package/dist/installFn.d.ts +3 -3
- package/dist/installFn.js +10 -14
- package/dist/installFn.js.map +1 -1
- package/dist/protocol.d.ts +1 -1
- package/dist/protocol.js +55 -78
- package/dist/protocol.js.map +1 -1
- package/dist/query/cleanup.d.ts +1 -1
- package/dist/query/cleanup.js +2 -6
- package/dist/query/cleanup.js.map +1 -1
- package/dist/query/create.d.ts +2 -2
- package/dist/query/create.js +5 -9
- package/dist/query/create.js.map +1 -1
- package/dist/query/destroy.d.ts +2 -2
- package/dist/query/destroy.js +7 -12
- package/dist/query/destroy.js.map +1 -1
- package/dist/query/extendCache.d.ts +1 -1
- package/dist/query/extendCache.js +1 -5
- package/dist/query/extendCache.js.map +1 -1
- package/dist/query/genObservableId.js +4 -8
- package/dist/query/genObservableId.js.map +1 -1
- package/dist/query/get.d.ts +2 -2
- package/dist/query/get.js +4 -9
- package/dist/query/get.js.map +1 -1
- package/dist/query/index.d.ts +10 -10
- package/dist/query/index.js +10 -26
- package/dist/query/index.js.map +1 -1
- package/dist/query/send.d.ts +2 -2
- package/dist/query/send.js +8 -13
- package/dist/query/send.js.map +1 -1
- package/dist/query/start/error.d.ts +2 -2
- package/dist/query/start/error.js +6 -10
- package/dist/query/start/error.js.map +1 -1
- package/dist/query/start/index.d.ts +1 -1
- package/dist/query/start/index.js +14 -19
- package/dist/query/start/index.js.map +1 -1
- package/dist/query/start/relay.d.ts +2 -2
- package/dist/query/start/relay.js +3 -7
- package/dist/query/start/relay.js.map +1 -1
- package/dist/query/start/update.d.ts +2 -2
- package/dist/query/start/update.js +18 -19
- package/dist/query/start/update.js.map +1 -1
- package/dist/query/subscribe.d.ts +3 -3
- package/dist/query/subscribe.js +13 -19
- package/dist/query/subscribe.js.map +1 -1
- package/dist/query/types.d.ts +1 -1
- package/dist/query/types.js +1 -2
- package/dist/query/unsub.d.ts +2 -2
- package/dist/query/unsub.js +7 -13
- package/dist/query/unsub.js.map +1 -1
- package/dist/security.d.ts +1 -1
- package/dist/security.js +8 -14
- package/dist/security.js.map +1 -1
- package/dist/sendError.d.ts +2 -2
- package/dist/sendError.js +21 -28
- package/dist/sendError.js.map +1 -1
- package/dist/sendHttpResponse.d.ts +1 -1
- package/dist/sendHttpResponse.js +11 -17
- package/dist/sendHttpResponse.js.map +1 -1
- package/dist/server.d.ts +8 -8
- package/dist/server.js +73 -64
- package/dist/server.js.map +1 -1
- package/dist/verifyRoute.d.ts +2 -2
- package/dist/verifyRoute.js +13 -17
- package/dist/verifyRoute.js.map +1 -1
- package/package.json +10 -14
package/dist/query/cleanup.js
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.cleanUpObs = void 0;
|
|
4
1
|
const destroyObs = (server, obs) => {
|
|
5
2
|
const id = obs.id;
|
|
6
3
|
obs.timeTillDestroy = null;
|
|
@@ -19,7 +16,7 @@ const destroyObs = (server, obs) => {
|
|
|
19
16
|
obs.closeFunction();
|
|
20
17
|
}
|
|
21
18
|
};
|
|
22
|
-
const cleanUpObs = (server) => {
|
|
19
|
+
export const cleanUpObs = (server) => {
|
|
23
20
|
if (!server.obsCleanTimeout) {
|
|
24
21
|
const cycleTime = Math.max(server.obsCleanupCycle, 500);
|
|
25
22
|
server.obsCleanTimeout = setTimeout(() => {
|
|
@@ -44,10 +41,9 @@ const cleanUpObs = (server) => {
|
|
|
44
41
|
});
|
|
45
42
|
if (keepRunning) {
|
|
46
43
|
server.obsCleanupCycle = shortestCycleTime;
|
|
47
|
-
|
|
44
|
+
cleanUpObs(server);
|
|
48
45
|
}
|
|
49
46
|
}, cycleTime);
|
|
50
47
|
}
|
|
51
48
|
};
|
|
52
|
-
exports.cleanUpObs = cleanUpObs;
|
|
53
49
|
//# sourceMappingURL=cleanup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/query/cleanup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/query/cleanup.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,GAAG,CAAC,MAAmB,EAAE,GAAqB,EAAE,EAAE;IAChE,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAA;IACjB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAA;IAC1B,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAA;QAC1D,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACvC,OAAM;KACP;IACD,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC7C,IAAI,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE;QACjD,OAAO,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;KAC1C;IACD,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvC,GAAG,CAAC,WAAW,GAAG,IAAI,CAAA;IACtB,IAAI,GAAG,CAAC,aAAa,EAAE;QACrB,GAAG,CAAC,aAAa,EAAE,CAAA;KACpB;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAmB,EAAE,EAAE;IAChD,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,CAAA;QACvD,MAAM,CAAC,eAAe,GAAG,UAAU,CAAC,GAAG,EAAE;YACvC,MAAM,CAAC,eAAe,GAAG,IAAI,CAAA;YAC7B,IAAI,WAAW,GAAG,KAAK,CAAA;YACvB,IAAI,iBAAyB,CAAA;YAC7B,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3C,IAAI,GAAG,CAAC,eAAe,KAAK,IAAI,EAAE;oBAChC,GAAG,CAAC,eAAe,IAAI,SAAS,CAAA;oBAChC,IAAI,GAAG,CAAC,eAAe,GAAG,CAAC,EAAE;wBAC3B,QAAQ;wBACR,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;qBACxB;yBAAM;wBACL,IACE,iBAAiB,KAAK,SAAS;4BAC/B,GAAG,CAAC,eAAe,GAAG,iBAAiB,EACvC;4BACA,iBAAiB,GAAG,GAAG,CAAC,eAAe,CAAA;yBACxC;wBACD,WAAW,GAAG,IAAI,CAAA;qBACnB;iBACF;YACH,CAAC,CAAC,CAAA;YACF,IAAI,WAAW,EAAE;gBACf,MAAM,CAAC,eAAe,GAAG,iBAAiB,CAAA;gBAC1C,UAAU,CAAC,MAAM,CAAC,CAAA;aACnB;QACH,CAAC,EAAE,SAAS,CAAC,CAAA;KACd;AACH,CAAC,CAAA"}
|
package/dist/query/create.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { BasedServer } from '../server';
|
|
2
|
-
import { ActiveObservable } from './types';
|
|
1
|
+
import { BasedServer } from '../server.js';
|
|
2
|
+
import { ActiveObservable } from './types.js';
|
|
3
3
|
export declare const createObs: (server: BasedServer, name: string, id: number, payload: any, noStart?: boolean) => ActiveObservable;
|
package/dist/query/create.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const get_1 = require("./get");
|
|
6
|
-
const createObs = (server, name, id, payload, noStart) => {
|
|
7
|
-
if ((0, get_1.hasObs)(server, id)) {
|
|
1
|
+
import { start } from './start/index.js';
|
|
2
|
+
import { hasObs } from './get.js';
|
|
3
|
+
export const createObs = (server, name, id, payload, noStart) => {
|
|
4
|
+
if (hasObs(server, id)) {
|
|
8
5
|
const msg = `Allready has observable ${name} ${id}`;
|
|
9
6
|
console.error(msg);
|
|
10
7
|
throw new Error(msg);
|
|
@@ -28,8 +25,7 @@ const createObs = (server, name, id, payload, noStart) => {
|
|
|
28
25
|
if (noStart) {
|
|
29
26
|
return obs;
|
|
30
27
|
}
|
|
31
|
-
|
|
28
|
+
start(server, id);
|
|
32
29
|
return obs;
|
|
33
30
|
};
|
|
34
|
-
exports.createObs = createObs;
|
|
35
31
|
//# sourceMappingURL=create.js.map
|
package/dist/query/create.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/query/create.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/query/create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,MAAmB,EACnB,IAAY,EACZ,EAAU,EACV,OAAY,EACZ,OAAiB,EACC,EAAE;IACpB,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACtB,MAAM,GAAG,GAAG,2BAA2B,IAAI,IAAI,EAAE,EAAE,CAAA;QACnD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;KACrB;IAED,MAAM,GAAG,GAAqB;QAC5B,OAAO;QACP,WAAW,EAAE,KAAK;QAClB,OAAO,EAAE,IAAI,GAAG,EAAE;QAClB,sBAAsB,EAAE,IAAI,GAAG,EAAE;QACjC,EAAE;QACF,IAAI;QACJ,WAAW,EAAE,KAAK;QAClB,OAAO,EAAE,CAAC;QACV,eAAe,EAAE,IAAI;KACtB,CAAA;IAED,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;QACnC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,EAAE,CAAA;KAC3C;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAC3C,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAEzC,IAAI,OAAO,EAAE;QACX,OAAO,GAAG,CAAA;KACX;IAED,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACjB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
|
package/dist/query/destroy.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BasedServer } from '../server';
|
|
2
|
-
import { ActiveObservable } from './types';
|
|
1
|
+
import { BasedServer } from '../server.js';
|
|
2
|
+
import { ActiveObservable } from './types.js';
|
|
3
3
|
export declare const updateDestroyTimer: (server: BasedServer, channel: ActiveObservable) => void;
|
|
4
4
|
export declare const destroyObs: (server: BasedServer, id: number) => void;
|
package/dist/query/destroy.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const cleanup_1 = require("./cleanup");
|
|
5
|
-
const functions_1 = require("@based/functions");
|
|
6
|
-
const updateDestroyTimer = (server, channel) => {
|
|
1
|
+
import { cleanUpObs } from './cleanup.js';
|
|
2
|
+
import { isBasedFunctionConfig } from '@based/functions';
|
|
3
|
+
export const updateDestroyTimer = (server, channel) => {
|
|
7
4
|
const spec = server.functions.specs[channel.name];
|
|
8
|
-
if (!spec || !
|
|
5
|
+
if (!spec || !isBasedFunctionConfig('query', spec)) {
|
|
9
6
|
console.warn('destroyObs - Cannot find obs function spec -', channel.name);
|
|
10
7
|
return;
|
|
11
8
|
}
|
|
@@ -17,9 +14,8 @@ const updateDestroyTimer = (server, channel) => {
|
|
|
17
14
|
server.obsCleanupCycle = closeTime;
|
|
18
15
|
}
|
|
19
16
|
};
|
|
20
|
-
exports.updateDestroyTimer = updateDestroyTimer;
|
|
21
17
|
// dont use timer just use counter to remove it over time
|
|
22
|
-
const destroyObs = (server, id) => {
|
|
18
|
+
export const destroyObs = (server, id) => {
|
|
23
19
|
const obs = server.activeObservablesById.get(id);
|
|
24
20
|
if (!obs) {
|
|
25
21
|
console.error('destroyObs', id, 'does not exist!');
|
|
@@ -39,9 +35,8 @@ const destroyObs = (server, id) => {
|
|
|
39
35
|
return;
|
|
40
36
|
}
|
|
41
37
|
if (obs.timeTillDestroy === null) {
|
|
42
|
-
|
|
43
|
-
|
|
38
|
+
updateDestroyTimer(server, obs);
|
|
39
|
+
cleanUpObs(server);
|
|
44
40
|
}
|
|
45
41
|
};
|
|
46
|
-
exports.destroyObs = destroyObs;
|
|
47
42
|
//# sourceMappingURL=destroy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/query/destroy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/query/destroy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAExD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAmB,EACnB,OAAyB,EACzB,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACjD,IAAI,CAAC,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;QAClD,OAAO,CAAC,IAAI,CAAC,8CAA8C,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QAC1E,OAAM;KACP;IACD,MAAM,kBAAkB,GACtB,IAAI,CAAC,kBAAkB,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAA;IAC7E,OAAO,CAAC,eAAe,GAAG,kBAAkB,CAAA;IAC5C,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;IAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAA;IAEpD,IAAI,SAAS,GAAG,MAAM,CAAC,eAAe,EAAE;QACtC,MAAM,CAAC,eAAe,GAAG,SAAS,CAAA;KACnC;AACH,CAAC,CAAA;AAED,yDAAyD;AACzD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IAC5D,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAA;QAClD,OAAM;KACP;IAED,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QACjD,OAAM;KACP;IAED,IACE,GAAG,CAAC,OAAO,CAAC,IAAI;QAChB,GAAG,CAAC,sBAAsB,CAAC,IAAI;QAC/B,GAAG,CAAC,UAAU,EAAE,IAAI,EACpB;QACA,IAAI,GAAG,CAAC,eAAe,EAAE;YACvB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAA;YAC1B,OAAO,CAAC,IAAI,CACV,mDAAmD,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,EAAE,EACvE,GAAG,CAAC,OAAO,CACZ,CAAA;SACF;QACD,OAAM;KACP;IAED,IAAI,GAAG,CAAC,eAAe,KAAK,IAAI,EAAE;QAChC,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC/B,UAAU,CAAC,MAAM,CAAC,CAAA;KACnB;AACH,CAAC,CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { ActiveObservable } from './types';
|
|
1
|
+
import { ActiveObservable } from './types.js';
|
|
2
2
|
export declare const extendCache: (obs: ActiveObservable) => void;
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.extendCache = void 0;
|
|
4
|
-
const extendCache = (obs) => {
|
|
1
|
+
export const extendCache = (obs) => {
|
|
5
2
|
if (obs.timeTillDestroy) {
|
|
6
3
|
obs.timeTillDestroy = null;
|
|
7
4
|
}
|
|
8
5
|
};
|
|
9
|
-
exports.extendCache = extendCache;
|
|
10
6
|
//# sourceMappingURL=extendCache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendCache.js","sourceRoot":"","sources":["../../src/query/extendCache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"extendCache.js","sourceRoot":"","sources":["../../src/query/extendCache.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAqB,EAAE,EAAE;IACnD,IAAI,GAAG,CAAC,eAAe,EAAE;QACvB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAA;KAC3B;AACH,CAAC,CAAA"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.genObservableId = void 0;
|
|
4
|
-
const hash_1 = require("@saulx/hash");
|
|
5
|
-
const genObservableId = (name, payload) => {
|
|
1
|
+
import { hashObjectIgnoreKeyOrder, hash } from '@saulx/hash';
|
|
2
|
+
export const genObservableId = (name, payload) => {
|
|
6
3
|
if (payload === undefined) {
|
|
7
|
-
return
|
|
4
|
+
return hash(name);
|
|
8
5
|
}
|
|
9
|
-
return
|
|
6
|
+
return hashObjectIgnoreKeyOrder([name, payload]);
|
|
10
7
|
};
|
|
11
|
-
exports.genObservableId = genObservableId;
|
|
12
8
|
//# sourceMappingURL=genObservableId.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genObservableId.js","sourceRoot":"","sources":["../../src/query/genObservableId.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"genObservableId.js","sourceRoot":"","sources":["../../src/query/genObservableId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAE5D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,OAAY,EAAU,EAAE;IACpE,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAA;KAClB;IACD,OAAO,wBAAwB,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;AAClD,CAAC,CAAA"}
|
package/dist/query/get.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ActiveObservable } from './types';
|
|
2
|
-
import { BasedServer } from '../server';
|
|
1
|
+
import { ActiveObservable } from './types.js';
|
|
2
|
+
import { BasedServer } from '../server.js';
|
|
3
3
|
export declare const getObsAndStopRemove: (server: BasedServer, id: number) => ActiveObservable;
|
|
4
4
|
export declare const hasObs: (server: BasedServer, id: number) => Boolean;
|
package/dist/query/get.js
CHANGED
|
@@ -1,15 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.hasObs = exports.getObsAndStopRemove = void 0;
|
|
4
|
-
const extendCache_1 = require("./extendCache");
|
|
5
|
-
const getObsAndStopRemove = (server, id) => {
|
|
1
|
+
import { extendCache } from './extendCache.js';
|
|
2
|
+
export const getObsAndStopRemove = (server, id) => {
|
|
6
3
|
const obs = server.activeObservablesById.get(id);
|
|
7
|
-
|
|
4
|
+
extendCache(obs);
|
|
8
5
|
return obs;
|
|
9
6
|
};
|
|
10
|
-
|
|
11
|
-
const hasObs = (server, id) => {
|
|
7
|
+
export const hasObs = (server, id) => {
|
|
12
8
|
return server.activeObservablesById.has(id);
|
|
13
9
|
};
|
|
14
|
-
exports.hasObs = hasObs;
|
|
15
10
|
//# sourceMappingURL=get.js.map
|
package/dist/query/get.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/query/get.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/query/get.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACQ,EAAE;IACpB,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,WAAW,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAW,EAAE;IACjE,OAAO,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AAC7C,CAAC,CAAA"}
|
package/dist/query/index.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export * from './subscribe';
|
|
2
|
-
export * from './unsub';
|
|
3
|
-
export * from './destroy';
|
|
4
|
-
export * from './create';
|
|
5
|
-
export * from './extendCache';
|
|
6
|
-
export * from './start';
|
|
7
|
-
export * from './send';
|
|
8
|
-
export * from './get';
|
|
9
|
-
export * from './types';
|
|
10
|
-
export * from './genObservableId';
|
|
1
|
+
export * from './subscribe.js';
|
|
2
|
+
export * from './unsub.js';
|
|
3
|
+
export * from './destroy.js';
|
|
4
|
+
export * from './create.js';
|
|
5
|
+
export * from './extendCache.js';
|
|
6
|
+
export * from './start/index.js';
|
|
7
|
+
export * from './send.js';
|
|
8
|
+
export * from './get.js';
|
|
9
|
+
export * from './types.js';
|
|
10
|
+
export * from './genObservableId.js';
|
package/dist/query/index.js
CHANGED
|
@@ -1,27 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./subscribe"), exports);
|
|
18
|
-
__exportStar(require("./unsub"), exports);
|
|
19
|
-
__exportStar(require("./destroy"), exports);
|
|
20
|
-
__exportStar(require("./create"), exports);
|
|
21
|
-
__exportStar(require("./extendCache"), exports);
|
|
22
|
-
__exportStar(require("./start"), exports);
|
|
23
|
-
__exportStar(require("./send"), exports);
|
|
24
|
-
__exportStar(require("./get"), exports);
|
|
25
|
-
__exportStar(require("./types"), exports);
|
|
26
|
-
__exportStar(require("./genObservableId"), exports);
|
|
1
|
+
export * from './subscribe.js';
|
|
2
|
+
export * from './unsub.js';
|
|
3
|
+
export * from './destroy.js';
|
|
4
|
+
export * from './create.js';
|
|
5
|
+
export * from './extendCache.js';
|
|
6
|
+
export * from './start/index.js';
|
|
7
|
+
export * from './send.js';
|
|
8
|
+
export * from './get.js';
|
|
9
|
+
export * from './types.js';
|
|
10
|
+
export * from './genObservableId.js';
|
|
27
11
|
//# sourceMappingURL=index.js.map
|
package/dist/query/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,sBAAsB,CAAA"}
|
package/dist/query/send.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Context, WebSocketSession, HttpSession } from '@based/functions';
|
|
2
|
-
import { BasedServer } from '../server';
|
|
3
|
-
import { ActiveObservable, ObservableError } from './types';
|
|
2
|
+
import { BasedServer } from '../server.js';
|
|
3
|
+
import { ActiveObservable, ObservableError } from './types.js';
|
|
4
4
|
export declare const sendObsWs: (ctx: Context<WebSocketSession>, buffer: Uint8Array, obs: ActiveObservable) => void;
|
|
5
5
|
export declare const sendObsGetError: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, id: number, err: ObservableError) => void;
|
package/dist/query/send.js
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const destroy_1 = require("./destroy");
|
|
6
|
-
const sendError_1 = require("../sendError");
|
|
7
|
-
const sendObsWs = (ctx, buffer, obs) => {
|
|
1
|
+
import { updateId } from '../protocol.js';
|
|
2
|
+
import { destroyObs } from './destroy.js';
|
|
3
|
+
import { sendErrorData } from '../sendError.js';
|
|
4
|
+
export const sendObsWs = (ctx, buffer, obs) => {
|
|
8
5
|
if (!ctx.session) {
|
|
9
6
|
return;
|
|
10
7
|
}
|
|
11
8
|
if (obs.reusedCache) {
|
|
12
|
-
const prevId =
|
|
9
|
+
const prevId = updateId(buffer, obs.id);
|
|
13
10
|
ctx.session.ws.send(buffer, true, false);
|
|
14
11
|
buffer.set(prevId, 4);
|
|
15
12
|
}
|
|
@@ -17,10 +14,8 @@ const sendObsWs = (ctx, buffer, obs) => {
|
|
|
17
14
|
ctx.session.ws.send(buffer, true, false);
|
|
18
15
|
}
|
|
19
16
|
};
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
(
|
|
23
|
-
(0, destroy_1.destroyObs)(server, id);
|
|
17
|
+
export const sendObsGetError = (server, ctx, id, err) => {
|
|
18
|
+
sendErrorData(ctx, err);
|
|
19
|
+
destroyObs(server, id);
|
|
24
20
|
};
|
|
25
|
-
exports.sendObsGetError = sendObsGetError;
|
|
26
21
|
//# sourceMappingURL=send.js.map
|
package/dist/query/send.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/query/send.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/query/send.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,GAA8B,EAC9B,MAAkB,EAClB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;QACvC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACxC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;KACtB;SAAM;QACL,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACzC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAmB,EACnB,GAA4C,EAC5C,EAAU,EACV,GAAoB,EACpB,EAAE;IACF,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACvB,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { ActiveObservable, ObservableError } from '../types';
|
|
2
|
-
import { BasedServer } from '../../server';
|
|
1
|
+
import { ActiveObservable, ObservableError } from '../types.js';
|
|
2
|
+
import { BasedServer } from '../../server.js';
|
|
3
3
|
export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: Error | ObservableError) => void;
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const error_1 = require("../../error");
|
|
5
|
-
const protocol_1 = require("../../protocol");
|
|
6
|
-
const errorListener = (server, obs, err) => {
|
|
1
|
+
import { createError, BasedErrorCode } from '../../error/index.js';
|
|
2
|
+
import { encodeErrorResponse, valueToBuffer } from '../../protocol.js';
|
|
3
|
+
export const errorListener = (server, obs, err) => {
|
|
7
4
|
delete obs.cache;
|
|
8
5
|
delete obs.diffCache;
|
|
9
6
|
delete obs.checksum;
|
|
@@ -12,9 +9,9 @@ const errorListener = (server, obs, err) => {
|
|
|
12
9
|
obs.reusedCache = false;
|
|
13
10
|
obs.error =
|
|
14
11
|
err instanceof Error
|
|
15
|
-
?
|
|
12
|
+
? createError(server, {
|
|
16
13
|
session: { type: 'query', id: obs.id, name: obs.name, headers: {} },
|
|
17
|
-
},
|
|
14
|
+
}, BasedErrorCode.FunctionError, {
|
|
18
15
|
err,
|
|
19
16
|
observableId: obs.id,
|
|
20
17
|
route: {
|
|
@@ -26,7 +23,7 @@ const errorListener = (server, obs, err) => {
|
|
|
26
23
|
? { ...err, observableId: obs.id }
|
|
27
24
|
: err;
|
|
28
25
|
if (obs.clients.size) {
|
|
29
|
-
server.uwsApp.publish(String(obs.id),
|
|
26
|
+
server.uwsApp.publish(String(obs.id), encodeErrorResponse(valueToBuffer(obs.error)), true, false);
|
|
30
27
|
}
|
|
31
28
|
// TODO: Change this make it one error handler
|
|
32
29
|
if (obs.functionObserveClients.size) {
|
|
@@ -40,5 +37,4 @@ const errorListener = (server, obs, err) => {
|
|
|
40
37
|
onNextData.forEach((fn) => fn(obs.error));
|
|
41
38
|
}
|
|
42
39
|
};
|
|
43
|
-
exports.errorListener = errorListener;
|
|
44
40
|
//# sourceMappingURL=error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/query/start/error.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/query/start/error.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEtE,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAA4B,EAC5B,EAAE;IACF,OAAO,GAAG,CAAC,KAAK,CAAA;IAChB,OAAO,GAAG,CAAC,SAAS,CAAA;IACpB,OAAO,GAAG,CAAC,QAAQ,CAAA;IACnB,OAAO,GAAG,CAAC,gBAAgB,CAAA;IAE3B,GAAG,CAAC,SAAS,GAAG,KAAK,CAAA;IACrB,GAAG,CAAC,WAAW,GAAG,KAAK,CAAA;IAEvB,GAAG,CAAC,KAAK;QACP,GAAG,YAAY,KAAK;YAClB,CAAC,CAAC,WAAW,CACT,MAAM,EACN;gBACE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;aACpE,EACD,cAAc,CAAC,aAAa,EAC5B;gBACE,GAAG;gBACH,YAAY,EAAE,GAAG,CAAC,EAAE;gBACpB,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;aACF,CACF;YACH,CAAC,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG,CAAC,EAAE;gBAC7B,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE;gBAClC,CAAC,CAAC,GAAG,CAAA;IAET,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QACpB,MAAM,CAAC,MAAM,CAAC,OAAO,CACnB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EACd,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;IAED,8CAA8C;IAC9C,IAAI,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;QACnC,GAAG,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,QAAQ,CACN,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;QACH,CAAC,CAAC,CAAA;KACH;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QAClB,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;QACjC,OAAO,GAAG,CAAC,UAAU,CAAA;QACrB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { BasedServer } from '../../server';
|
|
1
|
+
import { BasedServer } from '../../server.js';
|
|
2
2
|
export declare const start: (server: BasedServer, id: number) => void;
|
|
@@ -1,33 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const relay_1 = require("./relay");
|
|
7
|
-
const functions_1 = require("@based/functions");
|
|
8
|
-
const start = (server, id) => {
|
|
1
|
+
import { updateListener } from './update.js';
|
|
2
|
+
import { errorListener } from './error.js';
|
|
3
|
+
import { relay } from './relay.js';
|
|
4
|
+
import { isBasedFunctionConfig } from '@based/functions';
|
|
5
|
+
export const start = (server, id) => {
|
|
9
6
|
const obs = server.activeObservablesById.get(id);
|
|
10
7
|
if (obs.closeFunction) {
|
|
11
8
|
obs.closeFunction();
|
|
12
9
|
delete obs.closeFunction;
|
|
13
10
|
}
|
|
14
11
|
const spec = server.functions.specs[obs.name];
|
|
15
|
-
if (!spec || !
|
|
12
|
+
if (!spec || !isBasedFunctionConfig('query', spec)) {
|
|
16
13
|
console.warn('Cannot find observable function spec!', obs.name);
|
|
17
14
|
return;
|
|
18
15
|
}
|
|
19
16
|
const payload = obs.payload;
|
|
20
17
|
const updateRaw = (data, checksum, err, cache, diff, fromChecksum, isDeflate) => {
|
|
21
18
|
if (err) {
|
|
22
|
-
|
|
19
|
+
errorListener(server, obs, err);
|
|
23
20
|
return;
|
|
24
21
|
}
|
|
25
|
-
|
|
22
|
+
updateListener(server, obs, data, checksum, cache, diff, fromChecksum, isDeflate);
|
|
26
23
|
};
|
|
27
24
|
let isThrottled;
|
|
28
25
|
let throttledArgs;
|
|
29
26
|
let throtDebounced = false;
|
|
30
|
-
let timer;
|
|
31
27
|
const update = spec.throttle
|
|
32
28
|
? (...args) => {
|
|
33
29
|
if (isThrottled) {
|
|
@@ -36,7 +32,7 @@ const start = (server, id) => {
|
|
|
36
32
|
}
|
|
37
33
|
else {
|
|
38
34
|
isThrottled = true;
|
|
39
|
-
|
|
35
|
+
setTimeout(() => {
|
|
40
36
|
if (throtDebounced && !obs.isDestroyed) {
|
|
41
37
|
// @ts-ignore
|
|
42
38
|
updateRaw(...throttledArgs);
|
|
@@ -55,15 +51,15 @@ const start = (server, id) => {
|
|
|
55
51
|
if (spec.relay) {
|
|
56
52
|
const client = server.clients[spec.relay.client];
|
|
57
53
|
if (!client) {
|
|
58
|
-
|
|
54
|
+
errorListener(server, obs, new Error(`Relay client ${spec.relay} does not exist`));
|
|
59
55
|
return;
|
|
60
56
|
}
|
|
61
|
-
|
|
57
|
+
relay(server, spec.relay, obs, client, update);
|
|
62
58
|
}
|
|
63
59
|
else {
|
|
64
60
|
try {
|
|
65
61
|
const r = spec.fn(server.client, payload, update, (err) => {
|
|
66
|
-
|
|
62
|
+
errorListener(server, obs, err);
|
|
67
63
|
});
|
|
68
64
|
if (r instanceof Promise) {
|
|
69
65
|
r.then((close) => {
|
|
@@ -75,7 +71,7 @@ const start = (server, id) => {
|
|
|
75
71
|
}
|
|
76
72
|
}).catch((err) => {
|
|
77
73
|
if (!(obs.isDestroyed || startId !== obs.startId)) {
|
|
78
|
-
|
|
74
|
+
errorListener(server, obs, err);
|
|
79
75
|
}
|
|
80
76
|
});
|
|
81
77
|
}
|
|
@@ -85,10 +81,9 @@ const start = (server, id) => {
|
|
|
85
81
|
}
|
|
86
82
|
catch (err) {
|
|
87
83
|
if (!(obs.isDestroyed || startId !== obs.startId)) {
|
|
88
|
-
|
|
84
|
+
errorListener(server, obs, err);
|
|
89
85
|
}
|
|
90
86
|
}
|
|
91
87
|
}
|
|
92
88
|
};
|
|
93
|
-
exports.start = start;
|
|
94
89
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query/start/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query/start/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ObservableUpdateFunction } from '@based/functions';
|
|
2
|
-
import { BasedServer } from '../../server';
|
|
3
|
-
import { ActiveObservable } from '../types';
|
|
2
|
+
import { BasedServer } from '../../server.js';
|
|
3
|
+
import { ActiveObservable } from '../types.js';
|
|
4
4
|
export declare const relay: (server: BasedServer, relay: {
|
|
5
5
|
target?: string;
|
|
6
6
|
client: string;
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.relay = void 0;
|
|
4
|
-
const error_1 = require("./error");
|
|
1
|
+
import { errorListener } from './error.js';
|
|
5
2
|
// this has to be super optmized!
|
|
6
|
-
const relay = (server, relay, obs, client, update) => {
|
|
3
|
+
export const relay = (server, relay, obs, client, update) => {
|
|
7
4
|
obs.closeFunction = client
|
|
8
5
|
.query(relay.target ?? obs.name, obs.payload)
|
|
9
6
|
.subscribe(update, (err) => {
|
|
10
|
-
|
|
7
|
+
errorListener(server, obs, err);
|
|
11
8
|
});
|
|
12
9
|
};
|
|
13
|
-
exports.relay = relay;
|
|
14
10
|
//# sourceMappingURL=relay.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay.js","sourceRoot":"","sources":["../../../src/query/start/relay.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"relay.js","sourceRoot":"","sources":["../../../src/query/start/relay.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,iCAAiC;AACjC,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,MAAmB,EACnB,KAA0C,EAC1C,GAAqB,EACrB,MAAW,EACX,MAAgC,EAChC,EAAE;IACF,GAAG,CAAC,aAAa,GAAG,MAAM;SACvB,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC;SAC5C,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;QACzB,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;AACN,CAAC,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { ActiveObservable } from '../types';
|
|
2
|
-
import { BasedServer } from '../../server';
|
|
1
|
+
import { ActiveObservable } from '../types.js';
|
|
2
|
+
import { BasedServer } from '../../server.js';
|
|
3
3
|
export declare const updateListener: (server: BasedServer, obs: ActiveObservable, data: any, checksum?: number, reusedData?: Uint8Array, diff?: any, previousChecksum?: number, isDeflate?: boolean) => void;
|