@based/server 4.0.2 → 4.0.4

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;

package/dist/observable/send.js

@@ -10,11 +10,11 @@ const sendObsWs = (ctx, buffer, obs) => {
     }
     if (obs.reusedCache) {
         const prevId = (0, protocol_1.updateId)(buffer, obs.id);
-        ctx.session.send(buffer, true, false);
+        ctx.session.ws.send(buffer, true, false);
         buffer.set(prevId, 4);
     }
     else {
-        ctx.session.send(buffer, true, false);
+        ctx.session.ws.send(buffer, true, false);
     }
 };
 exports.sendObsWs = sendObsWs;

package/dist/observable/send.js.map

@@ -1 +1 @@
-{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/observable/send.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,uCAAsC;AAEtC,4CAA4C;AAGrC,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,IAAA,mBAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;QACvC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACrC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;KACtB;SAAM;QACL,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACtC;AACH,CAAC,CAAA;AAfY,QAAA,SAAS,aAerB;AAEM,MAAM,eAAe,GAAG,CAC7B,MAAmB,EACnB,GAA4C,EAC5C,EAAU,EACV,GAA2D,EAC3D,EAAE;IACF,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACvB,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AARY,QAAA,eAAe,mBAQ3B"}
+{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/observable/send.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,uCAAsC;AAEtC,4CAA4C;AAGrC,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,IAAA,mBAAQ,EAAC,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;AAfY,QAAA,SAAS,aAerB;AAEM,MAAM,eAAe,GAAG,CAC7B,MAAmB,EACnB,GAA4C,EAC5C,EAAU,EACV,GAAiD,EACjD,EAAE;IACF,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACvB,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AARY,QAAA,eAAe,mBAQ3B"}

package/dist/observable/start/error.d.ts

@@ -1,4 +1,4 @@
 import { ActiveObservable } from '../types';
 import { BasedServer } from '../../server';
 import { BasedErrorCode, BasedErrorData } from '../../error';
-export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: Error | BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void;
+export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: Error | BasedErrorData<BasedErrorCode.FunctionError>) => void;

package/dist/observable/start/error.js

@@ -12,17 +12,20 @@ const errorListener = (server, obs, err) => {
     obs.reusedCache = false;
     obs.error =
         err instanceof Error
-            ? (0, error_1.createError)(server, { session: { type: 'query', id: obs.id, name: obs.name } }, error_1.BasedErrorCode.ObservableFunctionError, {
+            ? (0, error_1.createError)(server, { session: { type: 'query', id: obs.id, name: obs.name } }, error_1.BasedErrorCode.FunctionError, {
                 err,
                 observableId: obs.id,
                 route: {
                     name: obs.name,
                 },
             })
-            : err;
+            : err.observableId !== obs.id
+                ? { ...err, observableId: obs.id }
+                : err;
     if (obs.clients.size) {
         server.uwsApp.publish(String(obs.id), (0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(obs.error)), true, false);
     }
+    // TODO: Change this make it one error handler
     if (obs.functionObserveClients.size) {
         obs.functionObserveClients.forEach((fnUpdate) => {
             fnUpdate(obs.cache, obs.checksum, obs.diffCache, obs.previousChecksum, obs.isDeflate, obs.rawData, obs.error);

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

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyE;AACzE,6CAAmE;AAE5D,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAAmE,EACnE,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,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,EAC1D,sBAAc,CAAC,uBAAuB,EACtC;gBACE,GAAG;gBACH,YAAY,EAAE,GAAG,CAAC,EAAE;gBACpB,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf;aACF,CACF;YACH,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,IAAI,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;QACnC,GAAG,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,QAAQ,CACN,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,KAAK,CACV,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;AAzDY,QAAA,aAAa,iBAyDzB"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyE;AACzE,6CAAmE;AAE5D,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAAyD,EACzD,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,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,EAC1D,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,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,KAAK,CACV,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;AA5DY,QAAA,aAAa,iBA4DzB"}

package/dist/observable/start/index.js

@@ -26,7 +26,9 @@ const start = (server, id) => {
     update.__internalObs__ = true;
     const startId = ++obs.startId;
     try {
-        const r = spec.function(server.client, payload, update);
+        const r = spec.function(server.client, payload, update, (err) => {
+            (0, error_1.errorListener)(server, obs, err);
+        });
         if (r instanceof Promise) {
             r.then((close) => {
                 if (obs.isDestroyed || startId !== obs.startId) {

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;AAGhC,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,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,GAAG,EACH,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,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,CACR,CAAA;IACH,CAAC,CAAA;IAED,MAAM,CAAC,eAAe,GAAG,IAAI,CAAA;IAC7B,MAAM,OAAO,GAAG,EAAE,GAAG,CAAC,OAAO,CAAA;IAE7B,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QACvD,IAAI,CAAC,YAAY,OAAO,EAAE;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE;oBAC9C,KAAK,EAAE,CAAA;iBACR;qBAAM;oBACL,GAAG,CAAC,aAAa,GAAG,KAAK,CAAA;iBAC1B;YACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;oBACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;iBAChC;YACH,CAAC,CAAC,CAAA;SACH;aAAM;YACL,GAAG,CAAC,aAAa,GAAG,CAAC,CAAA;SACtB;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;YACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;SAChC;KACF;AACH,CAAC,CAAA;AAnEY,QAAA,KAAK,SAmEjB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/observable/start/index.ts"],"names":[],"mappings":";;;AACA,+CAAqD;AACrD,qCAAyC;AACzC,mCAAuC;AAGhC,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,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,GAAG,EACH,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,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,CACR,CAAA;IACH,CAAC,CAAA;IAED,MAAM,CAAC,eAAe,GAAG,IAAI,CAAA;IAC7B,MAAM,OAAO,GAAG,EAAE,GAAG,CAAC,OAAO,CAAA;IAE7B,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9D,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,YAAY,OAAO,EAAE;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE;oBAC9C,KAAK,EAAE,CAAA;iBACR;qBAAM;oBACL,GAAG,CAAC,aAAa,GAAG,KAAK,CAAA;iBAC1B;YACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;oBACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;iBAChC;YACH,CAAC,CAAC,CAAA;SACH;aAAM;YACL,GAAG,CAAC,aAAa,GAAG,CAAC,CAAA;SACtB;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;YACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;SAChC;KACF;AACH,CAAC,CAAA;AArEY,QAAA,KAAK,SAqEjB"}

package/dist/observable/start/update.d.ts

@@ -1,6 +1,3 @@
 import { ActiveObservable } from '../types';
 import { BasedServer } from '../../server';
-export declare const updateListener: {
-    (server: BasedServer, obs: ActiveObservable, data: any, checksum?: number, diff?: any, previousChecksum?: number, isDeflate?: boolean, rawData?: any): void;
-    __isEdge__: boolean;
-};
+export declare const updateListener: (server: BasedServer, obs: ActiveObservable, data: any, checksum?: number, diff?: any, previousChecksum?: number, isDeflate?: boolean, rawData?: any) => void;

package/dist/observable/start/update.js

@@ -100,5 +100,4 @@ const updateListener = (server, obs, data, checksum, diff, previousChecksum, isD
     }
 };
 exports.updateListener = updateListener;
-exports.updateListener.__isEdge__ = true;
 //# sourceMappingURL=update.js.map

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

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

package/dist/observable/subscribe.d.ts

@@ -4,4 +4,4 @@ import { BasedErrorCode, BasedErrorData } from '../error';
 import { WebSocketSession, Context } from '@based/functions';
 export declare const subscribeWs: (server: BasedServer, id: number, checksum: number, ctx: Context<WebSocketSession>) => void;
 export declare const subscribeFunction: (server: BasedServer, id: number, update: ObservableUpdateFunction) => void;
-export declare const subscribeNext: (obs: ActiveObservable, onNext: (err?: BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void) => void;
+export declare const subscribeNext: (obs: ActiveObservable, onNext: (err?: BasedErrorData<BasedErrorCode.FunctionError>) => void) => void;

package/dist/observable/subscribe.js

@@ -6,13 +6,14 @@ const send_1 = require("./send");
 const get_1 = require("./get");
 const sendError_1 = require("../sendError");
 const subscribeWs = (server, id, checksum, ctx) => {
-    if (!ctx.session) {
+    const session = ctx.session;
+    if (!session) {
         return;
     }
-    ctx.session.subscribe(String(id));
-    const obs = (0, get_1.getObs)(server, id);
-    ctx.session.obs.add(id);
-    obs.clients.add(ctx.session.id);
+    ctx.session.ws.subscribe(String(id));
+    const obs = (0, get_1.getObsAndStopRemove)(server, id);
+    session.obs.add(id);
+    obs.clients.add(session.id);
     if (obs.error) {
         (0, sendError_1.sendErrorData)(ctx, obs.error);
         return;
@@ -28,11 +29,9 @@ const subscribeWs = (server, id, checksum, ctx) => {
 };
 exports.subscribeWs = subscribeWs;
 const subscribeFunction = (server, id, update) => {
-    // TODO: FIX THIS
-    const obs = (0, get_1.getObs)(server, id);
+    const obs = (0, get_1.getObsAndStopRemove)(server, id);
     if (obs.functionObserveClients.add(update))
         if (obs.cache) {
-            // will make this better!
             update(obs.cache, obs.checksum, obs.diffCache, obs.previousChecksum, obs.isDeflate);
         }
 };

package/dist/observable/subscribe.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/observable/subscribe.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAE3C,iCAAkC;AAClC,+BAA8B;AAC9B,4CAA4C;AAGrC,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,EAAU,EACV,QAAgB,EAChB,GAA8B,EAC9B,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACjC,MAAM,GAAG,GAAG,IAAA,YAAM,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE9B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAE/B,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAM;KACP;IAED,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAC1C,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,gBAAgB,KAAK,QAAQ,EAAE;YACtD,IAAA,gBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;SACnC;aAAM;YACL,IAAA,gBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;SAC/B;KACF;AACH,CAAC,CAAA;AA5BY,QAAA,WAAW,eA4BvB;AAEM,MAAM,iBAAiB,GAAG,CAC/B,MAAmB,EACnB,EAAU,EACV,MAAgC,EAChC,EAAE;IACF,iBAAiB;IACjB,MAAM,GAAG,GAAG,IAAA,YAAM,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC9B,IAAI,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC;QACxC,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,yBAAyB;YACzB,MAAM,CACJ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;SACF;AACL,CAAC,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B;AAEM,MAAM,aAAa,GAAG,CAC3B,GAAqB,EACrB,MAA8E,EAC9E,EAAE;IACF,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAA;IAChB,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAA;KAC3B;IACD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC5B,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB"}
+{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/observable/subscribe.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAE3C,iCAAkC;AAClC,+BAA2C;AAC3C,4CAA4C;AAGrC,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,EAAU,EACV,QAAgB,EAChB,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,MAAM,GAAG,GAAG,IAAA,yBAAmB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE3C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACnB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAE3B,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAM;KACP;IAED,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAC1C,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,gBAAgB,KAAK,QAAQ,EAAE;YACtD,IAAA,gBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;SACnC;aAAM;YACL,IAAA,gBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;SAC/B;KACF;AACH,CAAC,CAAA;AA9BY,QAAA,WAAW,eA8BvB;AAEM,MAAM,iBAAiB,GAAG,CAC/B,MAAmB,EACnB,EAAU,EACV,MAAgC,EAChC,EAAE;IACF,MAAM,GAAG,GAAG,IAAA,yBAAmB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC3C,IAAI,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC;QACxC,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,CACJ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;SACF;AACL,CAAC,CAAA;AAhBY,QAAA,iBAAiB,qBAgB7B;AAEM,MAAM,aAAa,GAAG,CAC3B,GAAqB,EACrB,MAAoE,EACpE,EAAE;IACF,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAA;IAChB,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAA;KAC3B;IACD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC5B,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB"}

package/dist/observable/types.d.ts

@@ -1,19 +1,17 @@
-/// <reference types="node" />
 import { BasedErrorCode, BasedErrorData } from '../error';
-export declare type ObservableUpdateFunction = {
-    (data: any, checksum?: number, diff?: any, fromChecksum?: number, isDeflate?: boolean, rawData?: any, err?: Error | BasedErrorData<BasedErrorCode.ObservableFunctionError>): void;
+export type ObservableUpdateFunction = {
+    (data: any, checksum?: number, diff?: any, fromChecksum?: number, isDeflate?: boolean, rawData?: any, err?: Error | BasedErrorData<BasedErrorCode.FunctionError>): void;
     __internalObs__?: true;
 };
-export declare type ObserveErrorListener = (err: BasedErrorData<BasedErrorCode.ObservableFunctionError> | BasedErrorData<BasedErrorCode.FunctionIsNotObservable> | BasedErrorData<BasedErrorCode.FunctionNotFound>) => void;
-export declare type ActiveObservable = {
+export type ObserveErrorListener = (err: BasedErrorData<BasedErrorCode.FunctionError> | BasedErrorData<BasedErrorCode.FunctionIsWrongType> | BasedErrorData<BasedErrorCode.FunctionNotFound>) => void;
+export type ActiveObservable = {
     startId: number;
     name: string;
     id: number;
     reusedCache: boolean;
     functionObserveClients: Set<ObservableUpdateFunction>;
     clients: Set<number>;
-    onNextData?: Set<(err?: BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void>;
-    isDestroyed: boolean;
+    onNextData?: Set<(err?: BasedErrorData<BasedErrorCode.FunctionError>) => void>;
     payload: any;
     diffCache?: Uint8Array;
     cache?: Uint8Array;
@@ -22,6 +20,8 @@ export declare type ActiveObservable = {
     isDeflate?: boolean;
     checksum?: number;
     closeFunction?: () => void;
-    beingDestroyed?: NodeJS.Timeout;
-    error?: BasedErrorData<BasedErrorCode.ObservableFunctionError> | null;
+    error?: BasedErrorData<BasedErrorCode.FunctionError> | null;
+    closeAfterIdleTime?: number;
+    timeTillDestroy: number | null;
+    isDestroyed: boolean;
 };

package/dist/observable/unsub.d.ts

@@ -3,4 +3,4 @@ import { WebSocketSession, Context } from '@based/functions';
 import { ObservableUpdateFunction } from './types';
 export declare const unsubscribeFunction: (server: BasedServer, id: number, update: ObservableUpdateFunction) => true | void;
 export declare const unsubscribeWs: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => true | void;
-export declare const unsubscribeWsIgnoreClient: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => void;
+export declare const unsubscribeWsIgnoreClient: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => true | void;

package/dist/observable/unsub.js

@@ -14,29 +14,32 @@ const unsubscribeFunction = (server, id, update) => {
 };
 exports.unsubscribeFunction = unsubscribeFunction;
 const unsubscribeWs = (server, id, ctx) => {
-    if (!ctx.session?.obs.has(id)) {
+    const session = ctx.session;
+    if (!session || !session.obs.has(id)) {
         return;
     }
+    ctx.session.ws.unsubscribe(String(id));
     const obs = server.activeObservablesById.get(id);
-    ctx.session.obs.delete(id);
+    session.obs.delete(id);
     if (!obs) {
         return;
     }
-    if (obs.clients.delete(ctx.session.id)) {
+    if (obs.clients.delete(session.id)) {
         (0, destroy_1.destroyObs)(server, id);
         return true;
     }
 };
 exports.unsubscribeWs = unsubscribeWs;
 const unsubscribeWsIgnoreClient = (server, id, ctx) => {
-    if (!ctx.session) {
+    const session = ctx.session;
+    if (!session) {
         return;
     }
     const obs = server.activeObservablesById.get(id);
     if (!obs) {
-        return;
+        return true;
     }
-    obs.clients.delete(ctx.session.id);
+    obs.clients.delete(session.id);
     (0, destroy_1.destroyObs)(server, id);
 };
 exports.unsubscribeWsIgnoreClient = unsubscribeWsIgnoreClient;

package/dist/observable/unsub.js.map

@@ -1 +1 @@
-{"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/observable/unsub.ts"],"names":[],"mappings":";;;AAEA,uCAAsC;AAG/B,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAAgC,EACnB,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IAED,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAdY,QAAA,mBAAmB,uBAc/B;AAEM,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QAC7B,OAAM;KACP;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC1B,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACtC,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAjBY,QAAA,aAAa,iBAiBzB;AAEM,MAAM,yBAAyB,GAAG,CACvC,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAElC,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAlBY,QAAA,yBAAyB,6BAkBrC"}
+{"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/observable/unsub.ts"],"names":[],"mappings":";;;AAEA,uCAAsC;AAG/B,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAAgC,EACnB,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAbY,QAAA,mBAAmB,uBAa/B;AAEM,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACpC,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAClC,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAnBY,QAAA,aAAa,iBAmBzB;AAEM,MAAM,yBAAyB,GAAG,CACvC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,IAAI,CAAA;KACZ;IACD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC9B,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAfY,QAAA,yBAAyB,6BAerC"}

package/dist/protocol.d.ts

@@ -19,4 +19,5 @@ export declare const encodeObservableResponse: (id: number, checksum: number, bu
 export declare const encodeObservableDiffResponse: (id: number, checksum: number, previousChecksum: number, buffer: Buffer) => Uint8Array;
 export declare const encodeAuthResponse: (buffer: Buffer) => Uint8Array;
 export declare const encodeErrorResponse: (buffer: Buffer) => Uint8Array;
+export declare const encodeChannelMessage: (id: number, buffer: Buffer) => Uint8Array;
 export declare const decode: (buffer: Uint8Array) => any;