@based/server 4.0.2 → 4.0.4

package/dist/incoming/ws/channelSubscribe.js

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unsubscribeChannelMessage = exports.channelSubscribeMessage = exports.enableChannelSubscribe = void 0;
+const protocol_1 = require("../../protocol");
+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 channel_1 = require("../../channel");
+const enableChannelSubscribe = (route, server, ctx, payload, id) => {
+    if ((0, channel_1.hasChannel)(server, id)) {
+        (0, channel_1.subscribeChannel)(server, id, ctx);
+        return;
+    }
+    (0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
+        const session = ctx.session;
+        if (spec === null || !session || !session.obs.has(id)) {
+            return;
+        }
+        if (!(0, channel_1.hasChannel)(server, id)) {
+            (0, channel_1.createChannel)(server, route.name, id, payload, true);
+        }
+        (0, channel_1.subscribeChannel)(server, id, ctx);
+    });
+};
+exports.enableChannelSubscribe = enableChannelSubscribe;
+const isNotAuthorized = (route, server, ctx, payload, id) => {
+    const session = ctx.session;
+    if (!session.unauthorizedChannels) {
+        session.unauthorizedChannels = new Set();
+    }
+    session.unauthorizedChannels.add({
+        id,
+        name: route.name,
+        payload,
+    });
+};
+const channelSubscribeMessage = (arr, start, len, 
+// isDeflate is used differently here
+isChannelIdRequester, ctx, server) => {
+    // | 4 header | 8 id | 1 name length | * name | * payload |
+    const nameLen = arr[start + 12];
+    const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
+    const name = (0, protocol_1.decodeName)(arr, start + 13, start + 13 + nameLen);
+    if (!name || !id) {
+        return false;
+    }
+    const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'channel', server.functions.route(name), name);
+    // // TODO: add strictness setting - if strict return false here
+    if (route === null) {
+        return true;
+    }
+    if ((0, security_1.rateLimitRequest)(server, ctx, 
+    // Requesting the id multiple times is something that should not happen - so probably a bad actor
+    isChannelIdRequester ? route.rateLimitTokens * 5 : route.rateLimitTokens, server.rateLimit.ws)) {
+        ctx.session.ws.close();
+        return false;
+    }
+    if (len > route.maxPayloadSize) {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, {
+            route,
+            channelId: id,
+        });
+        return true;
+    }
+    if (isChannelIdRequester) {
+        // TODO: Add authorization here....
+        if (!(0, channel_1.hasChannel)(server, id)) {
+            const payload = len === nameLen + 13
+                ? undefined
+                : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 13 + nameLen, start + len)), false));
+            // This has to be done instantly so publish can be received immediatly
+            (0, channel_1.createChannel)(server, name, id, payload, true);
+            (0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
+                if (spec === null) {
+                    server.activeChannels[name].delete(id);
+                    delete server.activeChannels[name];
+                    server.activeChannelsById.delete(id);
+                    return;
+                }
+                (0, channel_1.destroyChannel)(server, id);
+            });
+            return true;
+        }
+        (0, channel_1.extendChannel)(server, server.activeChannelsById.get(id));
+        return true;
+    }
+    const session = ctx.session;
+    if (session.obs.has(id)) {
+        // Allready subscribed to this id
+        return true;
+    }
+    const payload = len === nameLen + 13
+        ? undefined
+        : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 13 + nameLen, start + len)), false));
+    session.obs.add(id);
+    (0, authorize_1.authorize)(route, server, ctx, payload, exports.enableChannelSubscribe, id, 0, isNotAuthorized);
+    return true;
+};
+exports.channelSubscribeMessage = channelSubscribeMessage;
+const unsubscribeChannelMessage = (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, channel_1.unsubscribeChannel)(server, id, ctx)) {
+        ctx.session.ws.unsubscribe(String(id));
+    }
+    return true;
+};
+exports.unsubscribeChannelMessage = unsubscribeChannelMessage;
+//# sourceMappingURL=channelSubscribe.js.map

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

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

package/dist/incoming/ws/function.js

@@ -8,12 +8,18 @@ const security_1 = require("../../security");
 const verifyRoute_1 = require("../../verifyRoute");
 const installFn_1 = require("../../installFn");
 const authorize_1 = require("../../authorize");
+const stream_1 = require("stream");
+const utils_1 = require("@saulx/utils");
 const sendFunction = async (route, server, ctx, payload, requestId) => {
     const spec = await (0, installFn_1.installFn)(server, ctx, route, requestId);
     spec
         ?.function(server.client, payload, ctx)
         .then(async (v) => {
-        ctx.session?.send((0, protocol_1.encodeFunctionResponse)(requestId, (0, protocol_1.valueToBuffer)(v)), true, false);
+        // TODO: allow chunked reply!
+        if (v && (v instanceof stream_1.Duplex || v instanceof stream_1.Readable)) {
+            v = await (0, utils_1.readStream)(v);
+        }
+        ctx.session?.ws.send((0, protocol_1.encodeFunctionResponse)(requestId, (0, protocol_1.valueToBuffer)(v)), true, false);
     })
         .catch((err) => {
         (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
@@ -37,7 +43,7 @@ const functionMessage = (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 (len > route.maxPayloadSize) {
@@ -47,7 +53,9 @@ const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
         });
         return true;
     }
-    const payload = (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 8 + nameLen, start + len)), isDeflate));
+    const payload = len === nameLen + 8
+        ? undefined
+        : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 8 + nameLen, start + len)), isDeflate));
     (0, authorize_1.authorize)(route, server, ctx, payload, sendFunction, requestId);
     return true;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":";;;AAAA,6CAOuB;AACvB,uCAA4C;AAC5C,+CAA2C;AAG3C,6CAAiD;AACjD,mDAA+C;AAC/C,+CAA2C;AAC3C,+CAAgE;AAGhE,MAAM,YAAY,GAGd,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;IACnD,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;IAC3D,IAAI;QACF,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;SACtC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAChB,GAAG,CAAC,OAAO,EAAE,IAAI,CACf,IAAA,iCAAsB,EAAC,SAAS,EAAE,IAAA,wBAAa,EAAC,CAAC,CAAC,CAAC,EACnD,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,aAAa,EAAE;YACnD,KAAK;YACL,SAAS;YACT,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAEM,MAAM,eAAe,GAAyB,CACnD,GAAG,EACH,KAAK,EACL,GAAG,EACH,SAAS,EACT,GAAG,EACH,MAAM,EACN,EAAE;IACF,2DAA2D;IAC3D,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC9B,MAAM,IAAI,GAAG,IAAA,qBAAU,EAAC,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,CAAA;IAE5D,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;QACvB,OAAO,KAAK,CAAA;KACb;IAED,MAAM,KAAK,GAAG,IAAA,yBAAW,EACvB,MAAM,EACN,GAAG,EACH,IAAI,EACJ,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,EACJ,SAAS,CACV,CAAA;IAED,6DAA6D;IAC7D,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,OAAO,IAAI,CAAA;KACZ;IAED,IACE,IAAA,2BAAgB,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EACzE;QACA,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACnB,OAAO,KAAK,CAAA;KACb;IAED,IAAI,GAAG,GAAG,KAAK,CAAC,cAAc,EAAE;QAC9B,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,eAAe,EAAE;YACrD,KAAK;YACL,SAAS;SACV,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,OAAO,GAAG,IAAA,uBAAY,EAC1B,IAAA,wBAAa,EACX,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,OAAO,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,EAC3D,SAAS,CACV,CACF,CAAA;IAED,IAAA,qBAAS,EAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;IAE/D,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAxDY,QAAA,eAAe,mBAwD3B"}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":"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"}

package/dist/incoming/ws/get.js

@@ -18,7 +18,7 @@ const sendGetData = (server, id, obs, checksum, ctx) => {
         (0, observable_1.sendObsWs)(ctx, obs.cache, obs);
     }
     else if (checksum === obs.checksum) {
-        ctx.session.send((0, protocol_1.encodeGetResponse)(id), true, false);
+        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);
@@ -29,7 +29,7 @@ const sendGetData = (server, id, obs, checksum, ctx) => {
     (0, observable_1.destroyObs)(server, id);
 };
 const getFromExisting = (server, id, ctx, checksum) => {
-    const obs = (0, observable_1.getObs)(server, id);
+    const obs = (0, observable_1.getObsAndStopRemove)(server, id);
     if (obs.error) {
         (0, observable_1.sendObsGetError)(server, ctx, id, obs.error);
         return;
@@ -56,12 +56,16 @@ const isAuthorized = (route, server, ctx, payload, id, checksum) => {
         if (spec === null) {
             return;
         }
+        const session = ctx.session;
+        if (!session) {
+            return;
+        }
         if ((0, observable_1.hasObs)(server, id)) {
             getFromExisting(server, id, ctx, checksum);
             return;
         }
         const obs = (0, observable_1.createObs)(server, route.name, id, payload, true);
-        if (!ctx.session?.obs.has(id)) {
+        if (!session.obs.has(id)) {
             (0, observable_1.subscribeNext)(obs, (err) => {
                 if (err) {
                     (0, observable_1.sendObsGetError)(server, ctx, id, err);
@@ -75,7 +79,11 @@ const isAuthorized = (route, server, ctx, payload, id, checksum) => {
     });
 };
 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,
@@ -97,7 +105,7 @@ const getMessage = (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) {
@@ -107,7 +115,9 @@ const getMessage = (arr, start, len, isDeflate, ctx, server) => {
         });
         return true;
     }
-    const payload = (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate));
+    const payload = len === nameLen + 21
+        ? undefined
+        : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate));
     (0, authorize_1.authorize)(route, server, ctx, payload, isAuthorized, id, checksum, isNotAuthorized);
     return true;
 };

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

@@ -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

@@ -14,21 +14,24 @@ const enableSubscribe = (route, server, ctx, payload, id, checksum) => {
         (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)) {
+        const session = ctx.session;
+        if (spec === null || !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);
     });
 };
 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 +53,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,12 +63,15 @@ 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);
+    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, isNotAuthorized);
     return true;
 };
@@ -80,7 +86,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/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"}