@based/server 5.0.3 → 6.0.0

package/dist/incoming/ws/get.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMessage = void 0;
 const protocol_1 = require("../../protocol");
-const observable_1 = require("../../observable");
+const query_1 = require("../../query");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
 const security_1 = require("../../security");
@@ -10,36 +10,36 @@ const verifyRoute_1 = require("../../verifyRoute");
 const authorize_1 = require("../../authorize");
 const sendGetData = (server, id, obs, checksum, ctx) => {
     if (!ctx.session) {
-        (0, observable_1.destroyObs)(server, id);
+        (0, query_1.destroyObs)(server, id);
         return;
     }
     if (checksum === 0) {
-        (0, observable_1.sendObsWs)(ctx, obs.cache, obs);
+        (0, query_1.sendObsWs)(ctx, obs.cache, obs);
     }
     else if (checksum === obs.checksum) {
         ctx.session.ws.send((0, protocol_1.encodeGetResponse)(id), true, false);
     }
     else if (obs.diffCache && obs.previousChecksum === checksum) {
-        (0, observable_1.sendObsWs)(ctx, obs.diffCache, obs);
+        (0, query_1.sendObsWs)(ctx, obs.diffCache, obs);
     }
     else {
-        (0, observable_1.sendObsWs)(ctx, obs.cache, obs);
+        (0, query_1.sendObsWs)(ctx, obs.cache, obs);
     }
-    (0, observable_1.destroyObs)(server, id);
+    (0, query_1.destroyObs)(server, id);
 };
 const getFromExisting = (server, id, ctx, checksum) => {
-    const obs = (0, observable_1.getObsAndStopRemove)(server, id);
+    const obs = (0, query_1.getObsAndStopRemove)(server, id);
     if (obs.error) {
-        (0, observable_1.sendObsGetError)(server, ctx, id, obs.error);
+        (0, query_1.sendObsGetError)(server, ctx, id, obs.error);
         return;
     }
     if (obs.cache) {
         sendGetData(server, id, obs, checksum, ctx);
         return;
     }
-    (0, observable_1.subscribeNext)(obs, (err) => {
+    (0, query_1.subscribeNext)(obs, (err) => {
         if (err) {
-            (0, observable_1.sendObsGetError)(server, ctx, id, err);
+            (0, query_1.sendObsGetError)(server, ctx, id, err);
         }
         else {
             sendGetData(server, id, obs, checksum, ctx);
@@ -47,7 +47,7 @@ const getFromExisting = (server, id, ctx, checksum) => {
     });
 };
 const isAuthorized = (route, spec, server, ctx, payload, id, checksum) => {
-    if ((0, observable_1.hasObs)(server, id)) {
+    if ((0, query_1.hasObs)(server, id)) {
         getFromExisting(server, id, ctx, checksum);
         return;
     }
@@ -55,22 +55,22 @@ const isAuthorized = (route, spec, server, ctx, payload, id, checksum) => {
     if (!session) {
         return;
     }
-    if ((0, observable_1.hasObs)(server, id)) {
+    if ((0, query_1.hasObs)(server, id)) {
         getFromExisting(server, id, ctx, checksum);
         return;
     }
-    const obs = (0, observable_1.createObs)(server, route.name, id, payload, true);
+    const obs = (0, query_1.createObs)(server, route.name, id, payload, true);
     if (!session.obs.has(id)) {
-        (0, observable_1.subscribeNext)(obs, (err) => {
+        (0, query_1.subscribeNext)(obs, (err) => {
             if (err) {
-                (0, observable_1.sendObsGetError)(server, ctx, id, err);
+                (0, query_1.sendObsGetError)(server, ctx, id, err);
             }
             else {
                 sendGetData(server, id, obs, checksum, ctx);
             }
         });
     }
-    (0, observable_1.start)(server, id);
+    (0, query_1.start)(server, id);
 };
 const isNotAuthorized = (route, server, ctx, payload, id, checksum) => {
     const session = ctx.session;

package/dist/incoming/ws/get.js.map

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

package/dist/incoming/ws/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.message = void 0;
 const protocol_1 = require("../../protocol");
 const function_1 = require("./function");
-const observable_1 = require("./observable");
+const query_1 = require("./query");
 const auth_1 = require("./auth");
 const get_1 = require("./get");
 const error_1 = require("../../error");
@@ -17,12 +17,12 @@ const reader = (server, ctx, arr, start) => {
         return next;
     }
     // type 1 = subscribe
-    if (type === 1 && (0, observable_1.subscribeMessage)(arr, start, len, isDeflate, ctx, server)) {
+    if (type === 1 && (0, query_1.subscribeMessage)(arr, start, len, isDeflate, ctx, server)) {
         return next;
     }
     // type 2 = unsubscribe
     if (type === 2 &&
-        (0, observable_1.unsubscribeMessage)(arr, start, len, isDeflate, ctx, server)) {
+        (0, query_1.unsubscribeMessage)(arr, start, len, isDeflate, ctx, server)) {
         return next;
     }
     // type 3 = get

package/dist/incoming/ws/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/ws/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/ws/index.ts"],"names":[],"mappings":";;;AACA,6CAAwD;AACxD,yCAA4C;AAC5C,mCAA8D;AAC9D,iCAAoC;AACpC,+BAAkC;AAElC,uCAAyD;AACzD,yDAG2B;AAC3B,qDAAwD;AAExD,MAAM,MAAM,GAAG,CACb,MAAmB,EACnB,GAA8B,EAC9B,GAAe,EACf,KAAa,EACL,EAAE;IACV,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAA,uBAAY,EAAC,IAAA,oBAAS,EAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvE,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAA;IAExB,oBAAoB;IACpB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,0BAAe,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QAC1E,OAAO,IAAI,CAAA;KACZ;IAED,qBAAqB;IACrB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,wBAAgB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QAC3E,OAAO,IAAI,CAAA;KACZ;IAED,uBAAuB;IACvB,IACE,IAAI,KAAK,CAAC;QACV,IAAA,0BAAkB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAC3D;QACA,OAAO,IAAI,CAAA;KACZ;IAED,eAAe;IACf,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,gBAAU,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QACrE,OAAO,IAAI,CAAA;KACZ;IAED,gBAAgB;IAChB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,kBAAW,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QACtE,OAAO,IAAI,CAAA;KACZ;IAED,4BAA4B;IAC5B,IACE,IAAI,KAAK,CAAC;QACV,IAAA,0CAAuB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAChE;QACA,OAAO,IAAI,CAAA;KACZ;IAED,0BAA0B;IAC1B,IACE,IAAI,KAAK,CAAC;QACV,IAAA,sCAAqB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAC9D;QACA,OAAO,IAAI,CAAA;KACZ;IAED,8BAA8B;IAC9B,IACE,IAAI,KAAK,CAAC;QACV,IAAA,4CAAyB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAClE;QACA,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CACrB,MAAmB,EACnB,GAA8B,EAC9B,GAAgB,EAChB,QAAiB,EACjB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE;YACxD,MAAM,EAAE,GAAG;SACZ,CAAC,CAAA;QACF,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;QACtB,OAAM;KACP;IAED,iDAAiD;IACjD,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;IACrC,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAA;IAC5B,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,OAAO,IAAI,GAAG,GAAG,EAAE;QACjB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;QAC9C,IAAI,CAAC,KAAK,SAAS,EAAE;YACnB,8DAA8D;YAC9D,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;YACtB,OAAM;SACP;QACD,IAAI,GAAG,CAAC,CAAA;KACT;AACH,CAAC,CAAA;AAjCY,QAAA,OAAO,WAiCnB"}

package/dist/incoming/ws/observable.js.map

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

package/dist/incoming/ws/query.d.ts

@@ -0,0 +1,6 @@
+import { WebSocketSession, BasedRoute } from '@based/functions';
+import { IsAuthorizedHandler } from '../../authorize';
+import { BinaryMessageHandler } from './types';
+export declare const enableSubscribe: IsAuthorizedHandler<WebSocketSession, BasedRoute<'query'>>;
+export declare const subscribeMessage: BinaryMessageHandler;
+export declare const unsubscribeMessage: BinaryMessageHandler;

package/dist/incoming/ws/query.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unsubscribeMessage = exports.subscribeMessage = exports.enableSubscribe = void 0;
+const protocol_1 = require("../../protocol");
+const query_1 = require("../../query");
+const error_1 = require("../../error");
+const sendError_1 = require("../../sendError");
+const security_1 = require("../../security");
+const verifyRoute_1 = require("../../verifyRoute");
+const authorize_1 = require("../../authorize");
+const enableSubscribe = (route, psec, server, ctx, payload, id, checksum) => {
+    if ((0, query_1.hasObs)(server, id)) {
+        (0, query_1.subscribeWs)(server, id, checksum, ctx);
+        return;
+    }
+    const session = ctx.session;
+    if (!session.obs.has(id)) {
+        return;
+    }
+    if (!(0, query_1.hasObs)(server, id)) {
+        (0, query_1.createObs)(server, route.name, id, payload);
+    }
+    (0, query_1.subscribeWs)(server, id, checksum, ctx);
+};
+exports.enableSubscribe = enableSubscribe;
+const isNotAuthorized = (route, server, ctx, payload, id, checksum) => {
+    const session = ctx.session;
+    if (!session.unauthorizedObs) {
+        session.unauthorizedObs = new Set();
+    }
+    session.unauthorizedObs.add({
+        id,
+        checksum,
+        name: route.name,
+        payload,
+    });
+};
+const subscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
+    // | 4 header | 8 id | 8 checksum | 1 name length | * name | * payload |
+    const nameLen = arr[start + 20];
+    const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
+    const checksum = (0, protocol_1.readUint8)(arr, start + 12, 8);
+    const name = (0, protocol_1.decodeName)(arr, start + 21, start + 21 + nameLen);
+    if (!name || !id) {
+        return false;
+    }
+    const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'query', server.functions.route(name), name, id);
+    // TODO: add strictness setting - if strict return false here
+    if (route === null) {
+        return true;
+    }
+    if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
+        ctx.session.ws.close();
+        return false;
+    }
+    if (route.maxPayloadSize !== -1 && len > route.maxPayloadSize) {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, {
+            route,
+            observableId: id,
+        });
+        return true;
+    }
+    const session = ctx.session;
+    if (session.obs.has(id)) {
+        // Allready subscribed to this id
+        return true;
+    }
+    const payload = len === nameLen + 21
+        ? undefined
+        : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate));
+    session.obs.add(id);
+    (0, authorize_1.authorize)(route, server, ctx, payload, exports.enableSubscribe, id, checksum, false, isNotAuthorized);
+    return true;
+};
+exports.subscribeMessage = subscribeMessage;
+const unsubscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
+    // | 4 header | 8 id |
+    if (!ctx.session) {
+        return false;
+    }
+    const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
+    if (!id) {
+        return false;
+    }
+    if ((0, query_1.unsubscribeWs)(server, id, ctx)) {
+        ctx.session.ws.unsubscribe(String(id));
+    }
+    return true;
+};
+exports.unsubscribeMessage = unsubscribeMessage;
+//# sourceMappingURL=query.js.map

package/dist/incoming/ws/query.js.map

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

package/dist/index.d.ts

@@ -5,5 +5,5 @@ export * from './server';
 export * from './functions/types';
 export * from './error';
 export * from './functionApi';
-export * from './observable/types';
+export * from './query/types';
 export * from './protocol';

package/dist/index.js

@@ -25,6 +25,6 @@ __exportStar(require("./server"), exports);
 __exportStar(require("./functions/types"), exports);
 __exportStar(require("./error"), exports);
 __exportStar(require("./functionApi"), exports);
-__exportStar(require("./observable/types"), exports);
+__exportStar(require("./query/types"), exports);
 __exportStar(require("./protocol"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAAqC;AAA5B,oGAAA,QAAQ,OAAA;AACjB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,2CAAwB;AACxB,oDAAiC;AACjC,0CAAuB;AACvB,gDAA6B;AAC7B,qDAAkC;AAClC,6CAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAAqC;AAA5B,oGAAA,QAAQ,OAAA;AACjB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,2CAAwB;AACxB,oDAAiC;AACjC,0CAAuB;AACvB,gDAA6B;AAC7B,gDAA6B;AAC7B,6CAA0B"}

package/dist/installFn.d.ts

@@ -1,4 +1,3 @@
-import { BasedRoute, BasedSpec } from './functions';
 import { BasedServer } from './server';
-import { Context } from '@based/functions';
-export declare const installFn: <R extends BasedRoute>(server: BasedServer, ctx: Context, route: R, id?: number) => Promise<BasedSpec<R>>;
+import { Context, BasedRoute, BasedFunctionConfig, BasedFunctionTypes } from '@based/functions';
+export declare const installFn: <R extends BasedRoute<BasedFunctionTypes, "type" | "name">>(server: BasedServer, ctx: Context, route: R, id?: number) => Promise<BasedFunctionConfig<R["type"]>>;

package/dist/installFn.js

@@ -1,90 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installFn = void 0;
-const functions_1 = require("./functions");
-const functions_2 = require("@based/functions");
+const functions_1 = require("@based/functions");
 const sendError_1 = require("./sendError");
 const error_1 = require("./error");
-const functionNotFound = (server, ctx, route, isQuery, isChannel, id) => {
-    if (!(0, functions_2.isClientContext)(ctx)) {
+const functionNotFound = (server, ctx, route, type, id) => {
+    if (!(0, functions_1.isClientContext)(ctx)) {
         return;
     }
-    if (isQuery) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
-            route,
-            observableId: id,
-        });
-        return;
-    }
-    if (isChannel) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
-            route,
-            channelId: id,
-        });
-        return;
-    }
-    (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
-        route,
-        requestId: id,
-    });
+    (0, sendError_1.sendSimpleError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, { type: route.type, name: route.name }, id);
 };
 const installFn = async (server, ctx, route, id) => {
-    const isQuery = (0, functions_1.isQueryFunctionRoute)(route);
-    const isStream = !isQuery && (0, functions_1.isStreamFunctionRoute)(route);
-    const isChannel = !isStream && !isQuery && (0, functions_1.isChannelFunctionRoute)(route);
+    if (!route) {
+        return null;
+    }
+    const { type, name } = route;
     try {
-        const spec = await server.functions.install(route.name);
+        const spec = await server.functions.install(name);
         if (!ctx.session) {
             return null;
         }
         if (spec === null) {
-            functionNotFound(server, ctx, route, isQuery, isChannel, id);
-            return null;
-        }
-        if (isChannel && !(0, functions_1.isChannelFunctionSpec)(spec)) {
-            if (!(0, functions_2.isClientContext)(ctx)) {
-                return null;
-            }
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                route,
-                observableId: id,
-            });
-        }
-        if (isQuery && !(0, functions_1.isQueryFunctionSpec)(spec)) {
-            if (!(0, functions_2.isClientContext)(ctx)) {
-                return null;
-            }
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                route,
-                observableId: id,
-            });
-            return null;
-        }
-        if (isStream && !(0, functions_1.isStreamFunctionSpec)(spec)) {
-            if (!(0, functions_2.isClientContext)(ctx)) {
-                return null;
-            }
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                route,
-                observableId: id,
-            });
+            functionNotFound(server, ctx, route, type, id);
             return null;
         }
-        if (!isStream && !isQuery && !isChannel && !(0, functions_1.isFunctionSpec)(spec)) {
-            if (!(0, functions_2.isClientContext)(ctx)) {
+        if (!(0, functions_1.isBasedFunctionConfig)(type, route)) {
+            if (!(0, functions_1.isClientContext)(ctx)) {
                 return null;
             }
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                route,
-                observableId: id,
-            });
+            (0, sendError_1.sendSimpleError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, { name, type }, id);
             return null;
         }
         // @ts-ignore Fixed by chekcing the specs
         return spec;
     }
     catch (err) {
-        functionNotFound(server, ctx, route, isQuery, isChannel, id);
+        functionNotFound(server, ctx, route, type, id);
     }
     return null;
 };

package/dist/installFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"installFn.js","sourceRoot":"","sources":["../src/installFn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"installFn.js","sourceRoot":"","sources":["../src/installFn.ts"],"names":[],"mappings":";;;AACA,gDAOyB;AACzB,2CAA6C;AAC7C,mCAAwC;AAExC,MAAM,gBAAgB,GAAG,CACvB,MAAmB,EACnB,GAAY,EACZ,KAAiB,EACjB,IAAyB,EACzB,EAAW,EACX,EAAE;IACF,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;QACzB,OAAM;KACP;IACD,IAAA,2BAAe,EACb,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,gBAAgB,EAC/B,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,EACtC,EAAE,CACH,CAAA;AACH,CAAC,CAAA;AAEM,MAAM,SAAS,GAAG,KAAK,EAC5B,MAAmB,EACnB,GAAY,EACZ,KAAQ,EACR,EAAW,EACqC,EAAE;IAClD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IACD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAC5B,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACjD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YAC9C,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,CAAC,IAAA,iCAAqB,EAAC,IAAI,EAAE,KAAK,CAAC,EAAE;YACvC,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;gBACzB,OAAO,IAAI,CAAA;aACZ;YACD,IAAA,2BAAe,EACb,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,mBAAmB,EAClC,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;YACD,OAAO,IAAI,CAAA;SACZ;QAED,yCAAyC;QACzC,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,GAAG,EAAE;QACZ,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;KAC/C;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAzCY,QAAA,SAAS,aAyCrB"}

package/dist/observable/destroy.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroyObs = exports.updateDestroyTimer = void 0;
-const functions_1 = require("../functions");
 const cleanup_1 = require("./cleanup");
+const functions_1 = require("@based/functions");
 const updateDestroyTimer = (server, channel) => {
     const spec = server.functions.specs[channel.name];
-    if (!spec || !(0, functions_1.isQueryFunctionSpec)(spec)) {
+    if (!spec || !(0, functions_1.isBasedFunctionConfig)('query', spec)) {
         console.warn('destroyObs - Cannot find obs function spec -', channel.name);
         return;
     }

package/dist/observable/destroy.js.map

@@ -1 +1 @@
-{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/observable/destroy.ts"],"names":[],"mappings":";;;AAAA,4CAAkD;AAElD,uCAAsC;AAG/B,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,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;QACvC,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;AAlBY,QAAA,kBAAkB,sBAkB9B;AAED,yDAAyD;AAClD,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,IAAA,0BAAkB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC/B,IAAA,oBAAU,EAAC,MAAM,CAAC,CAAA;KACnB;AACH,CAAC,CAAA;AAhCY,QAAA,UAAU,cAgCtB"}
+{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/observable/destroy.ts"],"names":[],"mappings":";;;AACA,uCAAsC;AAEtC,gDAAwD;AAEjD,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,IAAA,iCAAqB,EAAC,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;AAlBY,QAAA,kBAAkB,sBAkB9B;AAED,yDAAyD;AAClD,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,IAAA,0BAAkB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC/B,IAAA,oBAAU,EAAC,MAAM,CAAC,CAAA;KACnB;AACH,CAAC,CAAA;AAhCY,QAAA,UAAU,cAgCtB"}

package/dist/observable/start/error.js

@@ -19,6 +19,7 @@ const errorListener = (server, obs, err) => {
                 observableId: obs.id,
                 route: {
                     name: obs.name,
+                    type: 'query',
                 },
             })
             : err.observableId !== obs.id

package/dist/observable/start/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyD;AACzD,6CAAmE;AAE5D,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,IAAA,mBAAW,EACT,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,sBAAc,CAAC,aAAa,EAC5B;gBACE,GAAG;gBACH,YAAY,EAAE,GAAG,CAAC,EAAE;gBACpB,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf;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,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,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;AA9DY,QAAA,aAAa,iBA8DzB"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyD;AACzD,6CAAmE;AAE5D,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,IAAA,mBAAW,EACT,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,sBAAc,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,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,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;AA/DY,QAAA,aAAa,iBA+DzB"}

package/dist/observable/start/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
-const functions_1 = require("../../functions");
 const update_1 = require("./update");
 const error_1 = require("./error");
 const relay_1 = require("./relay");
+const functions_1 = require("@based/functions");
 const start = (server, id) => {
     const obs = server.activeObservablesById.get(id);
     if (obs.closeFunction) {
@@ -12,7 +12,7 @@ const start = (server, id) => {
         delete obs.closeFunction;
     }
     const spec = server.functions.specs[obs.name];
-    if (!spec || !(0, functions_1.isQueryFunctionSpec)(spec)) {
+    if (!spec || !(0, functions_1.isBasedFunctionConfig)('query', spec)) {
         console.warn('Cannot find observable function spec!', obs.name);
         return;
     }
@@ -26,7 +26,7 @@ const start = (server, id) => {
     };
     const startId = ++obs.startId;
     if (spec.relay) {
-        const client = server.clients[spec.relay];
+        const client = server.clients[spec.relay.client];
         if (!client) {
             (0, error_1.errorListener)(server, obs, new Error(`Relay client ${spec.relay} does not exist`));
             return;
@@ -35,7 +35,7 @@ const start = (server, id) => {
     }
     else {
         try {
-            const r = spec.function(server.client, payload, update, (err) => {
+            const r = spec.fn(server.client, payload, update, (err) => {
                 (0, error_1.errorListener)(server, obs, err);
             });
             if (r instanceof Promise) {

package/dist/observable/start/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/observable/start/index.ts"],"names":[],"mappings":";;;AACA,+CAAqD;AACrD,qCAAyC;AACzC,mCAAuC;AAEvC,mCAA+B;AAExB,MAAM,KAAK,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,GAAG,CAAC,aAAa,EAAE;QACrB,GAAG,CAAC,aAAa,EAAE,CAAA;QACnB,OAAO,GAAG,CAAC,aAAa,CAAA;KACzB;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAE7C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/D,OAAM;KACP;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,MAAM,MAAM,GAA6B,CACvC,IAAI,EACJ,QAAQ,EACR,GAAG,EACH,KAAK,EACL,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,EAAE;QACF,IAAI,GAAG,EAAE;YACP,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YAC/B,OAAM;SACP;QACD,IAAA,uBAAc,EACZ,MAAM,EACN,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,IAAI,EACJ,YAAY,EACZ,SAAS,CACV,CAAA;IACH,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,EAAE,GAAG,CAAC,OAAO,CAAA;IAE7B,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACzC,IAAI,CAAC,MAAM,EAAE;YACX,IAAA,qBAAa,EACX,MAAM,EACN,GAAG,EACH,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,KAAK,iBAAiB,CAAC,CACvD,CAAA;YACD,OAAM;SACP;QACD,IAAA,aAAK,EAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;KACnC;SAAM;QACL,IAAI;YACF,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC9D,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,YAAY,OAAO,EAAE;gBACxB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,IAAI,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE;wBAC9C,KAAK,EAAE,CAAA;qBACR;yBAAM;wBACL,GAAG,CAAC,aAAa,GAAG,KAAK,CAAA;qBAC1B;gBACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACf,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;wBACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;qBAChC;gBACH,CAAC,CAAC,CAAA;aACH;iBAAM;gBACL,GAAG,CAAC,aAAa,GAAG,CAAC,CAAA;aACtB;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;gBACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;aAChC;SACF;KACF;AACH,CAAC,CAAA;AAjFY,QAAA,KAAK,SAiFjB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/observable/start/index.ts"],"names":[],"mappings":"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"}

package/dist/query/cleanup.d.ts

@@ -0,0 +1,2 @@
+import { BasedServer } from '../server';
+export declare const cleanUpObs: (server: BasedServer) => void;

package/dist/query/cleanup.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanUpObs = void 0;
+// TODO: maybe share between obs and channel
+const destroyObs = (server, obs) => {
+    const id = obs.id;
+    obs.timeTillDestroy = null;
+    if (!server.activeObservables[obs.name]) {
+        console.info('Trying to destroy a removed query function');
+        server.activeObservablesById.delete(id);
+        return;
+    }
+    server.activeObservables[obs.name].delete(id);
+    if (server.activeObservables[obs.name].size === 0) {
+        delete server.activeObservables[obs.name];
+    }
+    server.activeObservablesById.delete(id);
+    obs.isDestroyed = true;
+    if (obs.closeFunction) {
+        obs.closeFunction();
+    }
+};
+const cleanUpObs = (server) => {
+    if (!server.obsCleanTimeout) {
+        const cycleTime = Math.max(server.obsCleanupCycle, 500);
+        server.obsCleanTimeout = setTimeout(() => {
+            // const d = Date.now()
+            // let cnt = 0
+            server.obsCleanTimeout = null;
+            let keepRunning = false;
+            let shortestCycleTime;
+            server.activeObservablesById.forEach((obs) => {
+                if (obs.timeTillDestroy !== null) {
+                    obs.timeTillDestroy -= cycleTime;
+                    if (obs.timeTillDestroy < 1) {
+                        // cnt++
+                        destroyObs(server, obs);
+                    }
+                    else {
+                        if (shortestCycleTime === undefined ||
+                            obs.timeTillDestroy < shortestCycleTime) {
+                            shortestCycleTime = obs.timeTillDestroy;
+                        }
+                        keepRunning = true;
+                    }
+                }
+            });
+            if (keepRunning) {
+                server.obsCleanupCycle = shortestCycleTime;
+                (0, exports.cleanUpObs)(server);
+            }
+            // console.info(
+            //   'Cleanup time',
+            //   cycleTime,
+            //   'new',
+            //   server.obsCleanupCycle,
+            //   Date.now() - d,
+            //   'ms',
+            //   cnt,
+            //   'obs cleaned up'
+            // )
+        }, cycleTime);
+    }
+};
+exports.cleanUpObs = cleanUpObs;
+//# sourceMappingURL=cleanup.js.map

package/dist/query/cleanup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/query/cleanup.ts"],"names":[],"mappings":";;;AAGA,4CAA4C;AAC5C,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;AAEM,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,uBAAuB;YACvB,cAAc;YACd,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,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;aACnB;YACD,gBAAgB;YAChB,oBAAoB;YACpB,eAAe;YACf,WAAW;YACX,4BAA4B;YAC5B,oBAAoB;YACpB,UAAU;YACV,SAAS;YACT,qBAAqB;YACrB,IAAI;QACN,CAAC,EAAE,SAAS,CAAC,CAAA;KACd;AACH,CAAC,CAAA;AA1CY,QAAA,UAAU,cA0CtB"}

package/dist/query/create.d.ts

@@ -0,0 +1,3 @@
+import { BasedServer } from '../server';
+import { ActiveObservable } from './types';
+export declare const createObs: (server: BasedServer, name: string, id: number, payload: any, noStart?: boolean) => ActiveObservable;