@based/server 4.0.3 → 4.0.5

package/dist/incoming/ws/index.js

@@ -7,6 +7,8 @@ const observable_1 = require("./observable");
 const auth_1 = require("./auth");
 const get_1 = require("./get");
 const error_1 = require("../../error");
+const channelSubscribe_1 = require("./channelSubscribe");
+const channelPublish_1 = require("./channelPublish");
 const reader = (server, ctx, arr, start) => {
     const { len, isDeflate, type } = (0, protocol_1.decodeHeader)((0, protocol_1.readUint8)(arr, start, 4));
     const next = len + start;
@@ -31,6 +33,21 @@ const reader = (server, ctx, arr, start) => {
     if (type === 4 && (0, auth_1.authMessage)(arr, start, len, isDeflate, ctx, server)) {
         return next;
     }
+    // type 5 = channelSubscribe
+    if (type === 5 &&
+        (0, channelSubscribe_1.channelSubscribeMessage)(arr, start, len, isDeflate, ctx, server)) {
+        return next;
+    }
+    // type 6 = channelPublish
+    if (type === 6 &&
+        (0, channelPublish_1.channelPublishMessage)(arr, start, len, isDeflate, ctx, server)) {
+        return next;
+    }
+    // type 7 = channelUnsubscribe
+    if (type === 7 &&
+        (0, channelSubscribe_1.unsubscribeChannelMessage)(arr, start, len, isDeflate, ctx, server)) {
+        return next;
+    }
     return next;
 };
 const message = (server, ctx, msg, isBinary) => {
@@ -41,7 +58,7 @@ const message = (server, ctx, msg, isBinary) => {
         (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.NoBinaryProtocol, {
             buffer: msg,
         });
-        ctx.session.close();
+        ctx.session.ws.close();
         return;
     }
     // If msg if empty (0) then it is an idle timeout
@@ -49,10 +66,13 @@ const message = (server, ctx, msg, isBinary) => {
     const len = uint8View.length;
     let next = 0;
     while (next < len) {
+        if (!ctx.session) {
+            return;
+        }
         const n = reader(server, ctx, uint8View, next);
         if (n === undefined) {
             // Malformed message close client - maybe a bit too extreme...
-            ctx.session.close();
+            ctx.session.ws.close();
             return;
         }
         next = n;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/ws/index.ts"],"names":[],"mappings":";;;AACA,6CAAwD;AACxD,yCAA4C;AAC5C,6CAAmE;AACnE,iCAAoC;AACpC,+BAAkC;AAElC,uCAAyD;AAEzD,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,6BAAgB,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,+BAAkB,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,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,KAAK,EAAE,CAAA;QACnB,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,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,KAAK,EAAE,CAAA;YACnB,OAAM;SACP;QACD,IAAI,GAAG,CAAC,CAAA;KACT;AACH,CAAC,CAAA;AA9BY,QAAA,OAAO,WA8BnB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/ws/index.ts"],"names":[],"mappings":"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"}

package/dist/incoming/ws/observable.js

@@ -7,28 +7,28 @@ const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
 const security_1 = require("../../security");
 const verifyRoute_1 = require("../../verifyRoute");
-const installFn_1 = require("../../installFn");
 const authorize_1 = require("../../authorize");
-const enableSubscribe = (route, server, ctx, payload, id, checksum) => {
+const enableSubscribe = (route, psec, server, ctx, payload, id, checksum) => {
     if ((0, observable_1.hasObs)(server, id)) {
         (0, observable_1.subscribeWs)(server, id, checksum, ctx);
         return;
     }
-    // TODO: big perf optmization possible here (only return a promise if its not there)
-    (0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
-        if (spec === null || !ctx.session.obs.has(id)) {
-            return;
-        }
-        if (!(0, observable_1.hasObs)(server, id)) {
-            (0, observable_1.createObs)(server, route.name, id, payload);
-        }
-        ctx.session.subscribe(String(id));
-        (0, observable_1.subscribeWs)(server, id, checksum, ctx);
-    });
+    const session = ctx.session;
+    if (!session.obs.has(id)) {
+        return;
+    }
+    if (!(0, observable_1.hasObs)(server, id)) {
+        (0, observable_1.createObs)(server, route.name, id, payload);
+    }
+    (0, observable_1.subscribeWs)(server, id, checksum, ctx);
 };
 exports.enableSubscribe = enableSubscribe;
 const isNotAuthorized = (route, server, ctx, payload, id, checksum) => {
-    ctx.session.unauthorizedObs.add({
+    const session = ctx.session;
+    if (!session.unauthorizedObs) {
+        session.unauthorizedObs = new Set();
+    }
+    session.unauthorizedObs.add({
         id,
         checksum,
         name: route.name,
@@ -50,7 +50,7 @@ const subscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
         return true;
     }
     if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
-        ctx.session.close();
+        ctx.session.ws.close();
         return false;
     }
     if (route.maxPayloadSize !== -1 && len > route.maxPayloadSize) {
@@ -60,13 +60,16 @@ const subscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
         });
         return true;
     }
-    if (ctx.session?.obs.has(id)) {
-        // allready subscribed to this id
+    const session = ctx.session;
+    if (session.obs.has(id)) {
+        // Allready subscribed to this id
         return true;
     }
-    const payload = (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate));
-    ctx.session.obs.add(id);
-    (0, authorize_1.authorize)(route, server, ctx, payload, exports.enableSubscribe, id, checksum, isNotAuthorized);
+    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;
@@ -80,7 +83,7 @@ const unsubscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
         return false;
     }
     if ((0, observable_1.unsubscribeWs)(server, id, ctx)) {
-        ctx.session.unsubscribe(String(id));
+        ctx.session.ws.unsubscribe(String(id));
     }
     return true;
 };

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/types.d.ts

@@ -1,3 +1,3 @@
 import { BasedServer } from '../../server';
 import { WebSocketSession, Context } from '@based/functions';
-export declare type BinaryMessageHandler = (arr: Uint8Array, start: number, len: number, isDeflate: boolean, ctx: Context<WebSocketSession>, server: BasedServer) => boolean;
+export type BinaryMessageHandler = (arr: Uint8Array, start: number, len: number, isDeflate: boolean, ctx: Context<WebSocketSession>, server: BasedServer) => boolean;

package/dist/index.d.ts

@@ -5,7 +5,8 @@ export default createServer;
 export { compress } from './compress';
 export { sendHttpResponse } from './sendHttpResponse';
 export { sendError } from './sendError';
-export { createSimpleServer } from './createSimpleServer';
+export * from './createSimpleServer';
+export * from './server';
 export * from './functions/types';
 export * from './error';
 export * from './functionApi';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSimpleServer = exports.sendError = exports.sendHttpResponse = exports.compress = exports.BasedServer = void 0;
+exports.sendError = exports.sendHttpResponse = exports.compress = exports.BasedServer = void 0;
 const server_1 = require("./server");
 Object.defineProperty(exports, "BasedServer", { enumerable: true, get: function () { return server_1.BasedServer; } });
 const createServer = async (props, sharedSocket) => {
@@ -29,8 +29,8 @@ var sendHttpResponse_1 = require("./sendHttpResponse");
 Object.defineProperty(exports, "sendHttpResponse", { enumerable: true, get: function () { return sendHttpResponse_1.sendHttpResponse; } });
 var sendError_1 = require("./sendError");
 Object.defineProperty(exports, "sendError", { enumerable: true, get: function () { return sendError_1.sendError; } });
-var createSimpleServer_1 = require("./createSimpleServer");
-Object.defineProperty(exports, "createSimpleServer", { enumerable: true, get: function () { return createSimpleServer_1.createSimpleServer; } });
+__exportStar(require("./createSimpleServer"), exports);
+__exportStar(require("./server"), exports);
 __exportStar(require("./functions/types"), exports);
 __exportStar(require("./error"), exports);
 __exportStar(require("./functionApi"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAAqD;AAU5C,4FAVA,oBAAW,OAUA;AARpB,MAAM,YAAY,GAAG,KAAK,EACxB,KAAoB,EACpB,YAAsB,EACA,EAAE;IACxB,MAAM,WAAW,GAAG,IAAI,oBAAW,CAAC,KAAK,CAAC,CAAA;IAC1C,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;AAC/E,CAAC,CAAA;AAID,kBAAe,YAAY,CAAA;AAE3B,uBAAuB;AACvB,uCAAqC;AAA5B,oGAAA,QAAQ,OAAA;AACjB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,2DAAyD;AAAhD,wHAAA,kBAAkB,OAAA;AAE3B,oDAAiC;AACjC,0CAAuB;AACvB,gDAA6B;AAC7B,qDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAAqD;AAU5C,4FAVA,oBAAW,OAUA;AARpB,MAAM,YAAY,GAAG,KAAK,EACxB,KAAoB,EACpB,YAAsB,EACA,EAAE;IACxB,MAAM,WAAW,GAAG,IAAI,oBAAW,CAAC,KAAK,CAAC,CAAA;IAC1C,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;AAC/E,CAAC,CAAA;AAID,kBAAe,YAAY,CAAA;AAE3B,uBAAuB;AACvB,uCAAqC;AAA5B,oGAAA,QAAQ,OAAA;AACjB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,uDAAoC;AACpC,2CAAwB;AACxB,oDAAiC;AACjC,0CAAuB;AACvB,gDAA6B;AAC7B,qDAAkC"}

package/dist/installFn.js

@@ -5,14 +5,21 @@ const functions_1 = require("./functions");
 const functions_2 = require("@based/functions");
 const sendError_1 = require("./sendError");
 const error_1 = require("./error");
-const functionNotFound = (server, ctx, route, isQuery, id) => {
+const functionNotFound = (server, ctx, route, isQuery, isChannel, id) => {
     if (!(0, functions_2.isClientContext)(ctx)) {
         return;
     }
     if (isQuery) {
         (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
             route,
-            requestId: id,
+            observableId: id,
+        });
+        return;
+    }
+    if (isChannel) {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
+            route,
+            channelId: id,
         });
         return;
     }
@@ -24,20 +31,30 @@ const functionNotFound = (server, ctx, route, isQuery, 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);
     try {
         const spec = await server.functions.install(route.name);
         if (!ctx.session) {
             return null;
         }
         if (spec === null) {
-            functionNotFound(server, ctx, route, isQuery, id);
+            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.FunctionIsNotObservable, {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
                 route,
                 observableId: id,
             });
@@ -47,46 +64,27 @@ const installFn = async (server, ctx, route, id) => {
             if (!(0, functions_2.isClientContext)(ctx)) {
                 return null;
             }
-            if ((0, functions_1.isQueryFunctionSpec)(spec)) {
-                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.CannotStreamToObservableFunction, {
-                    route,
-                    requestId: id,
-                });
-                return null;
-            }
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotStream, {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
                 route,
-                requestId: id,
+                observableId: id,
             });
             return null;
         }
-        if (!isStream && !isQuery) {
-            if ((0, functions_1.isQueryFunctionSpec)(spec)) {
-                if (!(0, functions_2.isClientContext)(ctx)) {
-                    return null;
-                }
-                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsObservable, {
-                    route,
-                    requestId: id,
-                });
-                return null;
-            }
-            if ((0, functions_1.isStreamFunctionSpec)(spec)) {
-                if (!(0, functions_2.isClientContext)(ctx)) {
-                    return null;
-                }
-                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsStream, {
-                    route,
-                    requestId: id,
-                });
+        if (!isStream && !isQuery && !isChannel && !(0, functions_1.isFunctionSpec)(spec)) {
+            if (!(0, functions_2.isClientContext)(ctx)) {
                 return null;
             }
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
+                route,
+                observableId: id,
+            });
+            return null;
         }
-        // @ts-ignore fixed by chekcing the specs
+        // @ts-ignore Fixed by chekcing the specs
         return spec;
     }
     catch (err) {
-        functionNotFound(server, ctx, route, isQuery, id);
+        functionNotFound(server, ctx, route, isQuery, isChannel, 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":"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"}

package/dist/observable/cleanup.d.ts

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

package/dist/observable/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/observable/cleanup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/observable/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/observable/create.js

@@ -18,6 +18,7 @@ const createObs = (server, name, id, payload, noStart) => {
         name,
         isDestroyed: false,
         startId: 0,
+        timeTillDestroy: null,
     };
     if (!server.activeObservables[name]) {
         server.activeObservables[name] = new Map();

package/dist/observable/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/observable/create.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAC/B,+BAA8B;AAEvB,MAAM,SAAS,GAAG,CACvB,MAAmB,EACnB,IAAY,EACZ,EAAU,EACV,OAAY,EACZ,OAAiB,EACC,EAAE;IACpB,IAAI,IAAA,YAAM,EAAC,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;KACX,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,IAAA,aAAK,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACjB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AArCY,QAAA,SAAS,aAqCrB"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/observable/create.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAC/B,+BAA8B;AAEvB,MAAM,SAAS,GAAG,CACvB,MAAmB,EACnB,IAAY,EACZ,EAAU,EACV,OAAY,EACZ,OAAiB,EACC,EAAE;IACpB,IAAI,IAAA,YAAM,EAAC,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,IAAA,aAAK,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACjB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAtCY,QAAA,SAAS,aAsCrB"}

package/dist/observable/destroy.d.ts

@@ -1,2 +1,4 @@
 import { BasedServer } from '../server';
+import { ActiveObservable } from './types';
+export declare const updateDestroyTimer: (server: BasedServer, channel: ActiveObservable) => void;
 export declare const destroyObs: (server: BasedServer, id: number) => void;

package/dist/observable/destroy.js

@@ -1,50 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.destroyObs = void 0;
+exports.destroyObs = exports.updateDestroyTimer = void 0;
 const functions_1 = require("../functions");
+const cleanup_1 = require("./cleanup");
+const updateDestroyTimer = (server, channel) => {
+    const spec = server.functions.specs[channel.name];
+    if (!spec || !(0, functions_1.isQueryFunctionSpec)(spec)) {
+        console.warn('destroyObs - Cannot find obs function spec -', channel.name);
+        return;
+    }
+    const closeAfterIdleTime = spec.closeAfterIdleTime ?? server.functions.config.closeAfterIdleTime.query;
+    channel.timeTillDestroy = closeAfterIdleTime;
+    channel.closeAfterIdleTime = closeAfterIdleTime;
+    const closeTime = Math.round(closeAfterIdleTime / 2);
+    if (closeTime < server.obsCleanupCycle) {
+        server.obsCleanupCycle = closeTime;
+    }
+};
+exports.updateDestroyTimer = updateDestroyTimer;
+// dont use timer just use counter to remove it over time
 const destroyObs = (server, id) => {
     const obs = server.activeObservablesById.get(id);
     if (!obs) {
-        console.error('Observable', id, 'does not exists');
+        console.error('destroyObs', id, 'does not exist!');
         return;
     }
     if (obs.isDestroyed) {
-        console.error('Obs allready destroyed', obs.name);
+        console.error('obs allready destroyed', obs.name);
         return;
     }
     if (obs.clients.size ||
         obs.functionObserveClients.size ||
         obs.onNextData?.size) {
-        if (obs.beingDestroyed) {
-            console.warn(`Obs being destroyed while clients/workers/getListeners are present ${obs.name} ${obs.id}`, obs.payload);
+        if (obs.timeTillDestroy) {
+            obs.timeTillDestroy = null;
+            console.warn(`Obs being destroyed while listeners are present ${obs.name} ${obs.id}`, obs.payload);
         }
         return;
     }
-    const spec = server.functions.specs[obs.name];
-    if (!spec || !(0, functions_1.isQueryFunctionSpec)(spec)) {
-        console.warn('Cannot find observable function spec!', obs.name);
-        return;
-    }
-    if (!obs.beingDestroyed) {
-        const memCacheTimeout = spec.memCacheTimeout ?? server.functions.config.memCacheTimeout;
-        obs.beingDestroyed = setTimeout(() => {
-            // console.info(`   Destroy observable ${obs.name} ${obs.id}`, obs.payload)
-            obs.beingDestroyed = null;
-            if (!server.activeObservables[obs.name]) {
-                console.info('Trying to destroy a removed observable 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();
-            }
-        }, memCacheTimeout);
+    if (obs.timeTillDestroy === null) {
+        (0, exports.updateDestroyTimer)(server, obs);
+        (0, cleanup_1.cleanUpObs)(server);
     }
 };
 exports.destroyObs = destroyObs;

package/dist/observable/destroy.js.map

@@ -1 +1 @@
-{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/observable/destroy.ts"],"names":[],"mappings":";;;AAAA,4CAAkD;AAG3C,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,cAAc,EAAE;YACtB,OAAO,CAAC,IAAI,CACV,sEAAsE,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,EAAE,EAC1F,GAAG,CAAC,OAAO,CACZ,CAAA;SACF;QACD,OAAM;KACP;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,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE;QACvB,MAAM,eAAe,GACnB,IAAI,CAAC,eAAe,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAA;QAEjE,GAAG,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;YACnC,2EAA2E;YAC3E,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA;YACzB,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACvC,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAA;gBAC/D,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACvC,OAAM;aACP;YACD,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC7C,IAAI,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE;gBACjD,OAAO,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;aAC1C;YACD,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACvC,GAAG,CAAC,WAAW,GAAG,IAAI,CAAA;YACtB,IAAI,GAAG,CAAC,aAAa,EAAE;gBACrB,GAAG,CAAC,aAAa,EAAE,CAAA;aACpB;QACH,CAAC,EAAE,eAAe,CAAC,CAAA;KACpB;AACH,CAAC,CAAA;AAzDY,QAAA,UAAU,cAyDtB"}
+{"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"}

package/dist/observable/extendCache.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendCache = void 0;
 const extendCache = (obs) => {
-    if (obs.beingDestroyed) {
-        clearTimeout(obs.beingDestroyed);
-        obs.beingDestroyed = null;
+    if (obs.timeTillDestroy) {
+        obs.timeTillDestroy = null;
     }
 };
 exports.extendCache = extendCache;

package/dist/observable/extendCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"extendCache.js","sourceRoot":"","sources":["../../src/observable/extendCache.ts"],"names":[],"mappings":";;;AAEO,MAAM,WAAW,GAAG,CAAC,GAAqB,EAAE,EAAE;IACnD,IAAI,GAAG,CAAC,cAAc,EAAE;QACtB,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAChC,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA;KAC1B;AACH,CAAC,CAAA;AALY,QAAA,WAAW,eAKvB"}
+{"version":3,"file":"extendCache.js","sourceRoot":"","sources":["../../src/observable/extendCache.ts"],"names":[],"mappings":";;;AAEO,MAAM,WAAW,GAAG,CAAC,GAAqB,EAAE,EAAE;IACnD,IAAI,GAAG,CAAC,eAAe,EAAE;QACvB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAA;KAC3B;AACH,CAAC,CAAA;AAJY,QAAA,WAAW,eAIvB"}

package/dist/observable/genObservableId.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.genObservableId = void 0;
 const hash_1 = require("@saulx/hash");
 const genObservableId = (name, payload) => {
+    if (payload === undefined) {
+        return (0, hash_1.hash)(name);
+    }
     return (0, hash_1.hashObjectIgnoreKeyOrder)([name, payload]);
 };
 exports.genObservableId = genObservableId;

package/dist/observable/genObservableId.js.map

@@ -1 +1 @@
-{"version":3,"file":"genObservableId.js","sourceRoot":"","sources":["../../src/observable/genObservableId.ts"],"names":[],"mappings":";;;AAAA,sCAAsD;AAE/C,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,OAAY,EAAU,EAAE;IACpE,OAAO,IAAA,+BAAwB,EAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;AAClD,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B"}
+{"version":3,"file":"genObservableId.js","sourceRoot":"","sources":["../../src/observable/genObservableId.ts"],"names":[],"mappings":";;;AAAA,sCAA4D;AAErD,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,OAAY,EAAU,EAAE;IACpE,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,CAAA;KAClB;IACD,OAAO,IAAA,+BAAwB,EAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;AAClD,CAAC,CAAA;AALY,QAAA,eAAe,mBAK3B"}

package/dist/observable/get.d.ts

@@ -1,4 +1,4 @@
 import { ActiveObservable } from './types';
 import { BasedServer } from '../server';
-export declare const getObs: (server: BasedServer, id: number) => ActiveObservable;
+export declare const getObsAndStopRemove: (server: BasedServer, id: number) => ActiveObservable;
 export declare const hasObs: (server: BasedServer, id: number) => Boolean;

package/dist/observable/get.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasObs = exports.getObs = void 0;
+exports.hasObs = exports.getObsAndStopRemove = void 0;
 const extendCache_1 = require("./extendCache");
-const getObs = (server, id) => {
+const getObsAndStopRemove = (server, id) => {
     const obs = server.activeObservablesById.get(id);
     (0, extendCache_1.extendCache)(obs);
     return obs;
 };
-exports.getObs = getObs;
+exports.getObsAndStopRemove = getObsAndStopRemove;
 const hasObs = (server, id) => {
     return server.activeObservablesById.has(id);
 };

package/dist/observable/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/observable/get.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAEpC,MAAM,MAAM,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAoB,EAAE;IAC1E,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAA;IAChB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAJY,QAAA,MAAM,UAIlB;AAEM,MAAM,MAAM,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAW,EAAE;IACjE,OAAO,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AAC7C,CAAC,CAAA;AAFY,QAAA,MAAM,UAElB"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/observable/get.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAEpC,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACQ,EAAE;IACpB,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAA;IAChB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAPY,QAAA,mBAAmB,uBAO/B;AAEM,MAAM,MAAM,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAW,EAAE;IACjE,OAAO,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AAC7C,CAAC,CAAA;AAFY,QAAA,MAAM,UAElB"}

package/dist/observable/send.d.ts

@@ -3,4 +3,4 @@ import { BasedServer } from '../server';
 import { BasedErrorCode, BasedErrorData } from '../error';
 import { ActiveObservable } from './types';
 export declare const sendObsWs: (ctx: Context<WebSocketSession>, buffer: Uint8Array, obs: ActiveObservable) => void;
-export declare const sendObsGetError: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, id: number, err: BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void;
+export declare const sendObsGetError: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, id: number, err: BasedErrorData<BasedErrorCode.FunctionError>) => void;