@based/server 4.0.3 → 4.0.4

package/dist/channel/unsub.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unsubscribeChannelIgnoreClient = exports.unsubscribeChannel = exports.unsubscribeFunction = void 0;
+const destroy_1 = require("./destroy");
+const unsubscribeFunction = (server, id, update) => {
+    const obs = server.activeChannelsById.get(id);
+    if (!obs) {
+        return;
+    }
+    if (obs.functionChannelClients.delete(update)) {
+        (0, destroy_1.destroyChannel)(server, id);
+        return true;
+    }
+};
+exports.unsubscribeFunction = unsubscribeFunction;
+const unsubscribeChannel = (server, id, ctx) => {
+    const session = ctx.session;
+    if (!session) {
+        return;
+    }
+    if (!session.obs.has(id)) {
+        return;
+    }
+    ctx.session.ws.unsubscribe(String(id));
+    const channel = server.activeChannelsById.get(id);
+    session.obs.delete(id);
+    if (!channel) {
+        return;
+    }
+    if (channel.clients.delete(session.id)) {
+        (0, destroy_1.destroyChannel)(server, id);
+        return true;
+    }
+};
+exports.unsubscribeChannel = unsubscribeChannel;
+const unsubscribeChannelIgnoreClient = (server, id, ctx) => {
+    const session = ctx.session;
+    if (!session) {
+        return;
+    }
+    const channel = server.activeChannelsById.get(id);
+    if (!channel) {
+        return;
+    }
+    channel.clients.delete(session.id);
+    (0, destroy_1.destroyChannel)(server, id);
+};
+exports.unsubscribeChannelIgnoreClient = unsubscribeChannelIgnoreClient;
+//# sourceMappingURL=unsub.js.map

package/dist/channel/unsub.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/channel/unsub.ts"],"names":[],"mappings":";;;AAMA,uCAA0C;AAEnC,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAA8B,EACjB,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC7C,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAbY,QAAA,mBAAmB,uBAa/B;AAEM,MAAM,kBAAkB,GAAG,CAChC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACxB,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACtC,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAtBY,QAAA,kBAAkB,sBAsB9B;AAEM,MAAM,8BAA8B,GAAG,CAC5C,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAClC,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC5B,CAAC,CAAA;AAfY,QAAA,8BAA8B,kCAe1C"}

package/dist/createSimpleServer.d.ts

@@ -1,17 +1,7 @@
-import { AuthConfig } from './auth';
-import { BasedFunctionSpec, BasedQueryFunctionSpec, BasedStreamFunctionSpec, BasedSpec } from './functions';
-import { BasedQueryFunction, BasedFunction, Context, Session } from '@based/functions';
-import { BasedServer } from './server';
-export declare type SimpleServerOptions = {
-    port?: number;
-    key?: string;
-    disableRest?: boolean;
-    cert?: string;
-    auth?: AuthConfig;
-    ws?: {
-        open: (client: Context<Session>) => void;
-        close: (client: Context<Session>) => void;
-    };
+import { BasedFunctionSpec, BasedQueryFunctionSpec, BasedStreamFunctionSpec, BasedSpec, BasedChannelFunctionSpec } from './functions';
+import { BasedQueryFunction, BasedFunction, BasedChannelFunction } from '@based/functions';
+import { BasedServer, ServerOptions } from './server';
+export type SimpleServerOptions = {
     install?: (opts: {
         server: BasedServer;
         name: string;
@@ -28,5 +18,14 @@ export declare type SimpleServerOptions = {
     queryFunctions?: {
         [key: string]: BasedQueryFunction | Partial<BasedQueryFunctionSpec>;
     };
-};
+    channels?: {
+        [key: string]: BasedChannelFunction | Partial<BasedChannelFunctionSpec>;
+    };
+    silent?: boolean;
+    closeAfterIdleTime?: {
+        channel: number;
+        query: number;
+    };
+    uninstallAfterIdleTime?: number;
+} & Omit<ServerOptions, 'functions'>;
 export declare function createSimpleServer(props: SimpleServerOptions, sharedSocket?: boolean): Promise<BasedServer>;

package/dist/createSimpleServer.js

@@ -9,7 +9,7 @@ const picocolors_1 = __importDefault(require("picocolors"));
 const server_1 = require("./server");
 const utils_1 = require("@saulx/utils");
 async function createSimpleServer(props, sharedSocket) {
-    const { functions, queryFunctions } = props;
+    const { functions, queryFunctions, channels } = props;
     const functionStore = {};
     for (const name in functions) {
         if (functions[name]) {
@@ -67,16 +67,47 @@ async function createSimpleServer(props, sharedSocket) {
             }
         }
     }
+    for (const name in channels) {
+        if (channels[name]) {
+            const fn = channels[name];
+            if ((0, functions_1.isSpec)(fn)) {
+                functionStore[name] = {
+                    checksum: 1,
+                    channel: true,
+                    function: fn.function,
+                    publish: fn.publish ||
+                        ((based, payload, msg, id) => {
+                            console.warn('     ↓ Publish to channel (no handler defined)', name, payload, msg, id);
+                        }),
+                    name,
+                    maxPayloadSize: 500,
+                    rateLimitTokens: 1,
+                    ...fn,
+                };
+            }
+            else if (typeof fn === 'function') {
+                functionStore[name] = {
+                    checksum: 1,
+                    channel: true,
+                    publish: (based, payload, msg, id) => {
+                        console.warn('     ↓ Publish to channel (no handler defined)', name, payload, msg, id);
+                    },
+                    function: fn,
+                    name,
+                    maxPayloadSize: 500,
+                    rateLimitTokens: 1,
+                };
+            }
+            else {
+                console.error(name, fn, 'Is not a channel function!');
+            }
+        }
+    }
     const properProps = {
-        port: props.port,
-        auth: props.auth,
-        cert: props.cert,
-        ws: props.ws,
-        disableRest: props.disableRest,
-        key: props.key,
+        ...props,
         functions: {
-            memCacheTimeout: 3e3,
-            idleTimeout: 1e3,
+            closeAfterIdleTime: props.closeAfterIdleTime,
+            uninstallAfterIdleTime: props.uninstallAfterIdleTime || -1,
             uninstall: props.uninstall ||
                 (async () => {
                     return true;
@@ -91,24 +122,25 @@ async function createSimpleServer(props, sharedSocket) {
                     }
                 }),
             route: ({ path, name }) => {
+                let rootFn;
                 if (path) {
                     for (const name in functionStore) {
-                        if (functionStore[name].path === path) {
+                        const fnPath = functionStore[name].path;
+                        if (fnPath === path) {
                             return functionStore[name];
                         }
-                    }
-                    if (!name && functionStore[path]) {
-                        return functionStore[path];
+                        if (!rootFn && fnPath === '/') {
+                            rootFn = functionStore[name];
+                        }
                     }
                 }
-                if (functionStore[name]) {
-                    return functionStore[name];
-                }
-                return null;
+                return functionStore[name] || rootFn || null;
             },
         },
     };
-    console.info('   ', picocolors_1.default.white('Based-server'), `starting with functions`);
+    if (!props.silent) {
+        console.info('   ', picocolors_1.default.white('Based-server'), `starting with functions`);
+    }
     let longestName = 0;
     for (const name in functionStore) {
         if (name.length > longestName) {
@@ -116,16 +148,22 @@ async function createSimpleServer(props, sharedSocket) {
         }
     }
     for (const name in functionStore) {
-        const obs = (0, functions_1.isQueryFunctionSpec)(functionStore[name])
-            ? '[query]'
-            : (0, functions_1.isStreamFunctionSpec)(functionStore[name])
-                ? '[stream]'
-                : '';
+        const obs = (0, functions_1.isChannelFunctionSpec)(functionStore[name])
+            ? '[channel]'
+            : (0, functions_1.isQueryFunctionSpec)(functionStore[name])
+                ? '[query]'
+                : (0, functions_1.isStreamFunctionSpec)(functionStore[name])
+                    ? '[stream]'
+                    : '';
         const pub = functionStore[name].public ? 'public' : 'private';
-        console.info('      ', picocolors_1.default.white(name), (0, utils_1.padLeft)('', longestName + 2 - name.length, ' '), picocolors_1.default.gray(pub), (0, utils_1.padLeft)('', 8 - pub.length, ' '), picocolors_1.default.green(obs), (0, utils_1.padLeft)('', 14 - obs.length, ' '), functionStore[name].path || '');
+        if (!props.silent) {
+            console.info('      ', picocolors_1.default.white(name), (0, utils_1.padLeft)('', longestName + 2 - name.length, ' '), picocolors_1.default.gray(pub), (0, utils_1.padLeft)('', 8 - pub.length, ' '), picocolors_1.default.green(obs), (0, utils_1.padLeft)('', 14 - obs.length, ' '), functionStore[name].path || '');
+        }
     }
     const basedServer = new server_1.BasedServer(properProps);
-    return props.port ? basedServer.start(props.port, sharedSocket) : basedServer;
+    return props.port
+        ? basedServer.start(props.port, sharedSocket, props.silent)
+        : basedServer;
 }
 exports.createSimpleServer = createSimpleServer;
 //# sourceMappingURL=createSimpleServer.js.map

package/dist/createSimpleServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSimpleServer.js","sourceRoot":"","sources":["../src/createSimpleServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createSimpleServer.js","sourceRoot":"","sources":["../src/createSimpleServer.ts"],"names":[],"mappings":";;;;;;AAAA,2CAUoB;AAMpB,4DAAmC;AACnC,qCAAqD;AACrD,wCAAsC;AAmC/B,KAAK,UAAU,kBAAkB,CACtC,KAA0B,EAC1B,YAAsB;IAEtB,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IACrD,MAAM,aAAa,GAKf,EAAE,CAAA;IAEN,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC5B,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE;YACnB,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,IAAA,kBAAM,EAAC,EAAE,CAAC,EAAE;gBACd,aAAa,CAAC,IAAI,CAAC,GAAG;oBACpB,QAAQ,EAAE,EAAE,CAAC,QAAQ;oBACrB,IAAI;oBACJ,QAAQ,EAAE,CAAC;oBACX,cAAc,EAAE,IAAA,gCAAoB,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG;oBACtD,eAAe,EAAE,EAAE;oBACnB,GAAG,EAAE;iBACN,CAAA;aACF;iBAAM,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;gBACnC,aAAa,CAAC,IAAI,CAAC,GAAG;oBACpB,QAAQ,EAAE,EAAE;oBACZ,IAAI;oBACJ,QAAQ,EAAE,CAAC;oBACX,cAAc,EAAE,GAAG;oBACnB,eAAe,EAAE,CAAC;iBACnB,CAAA;aACF;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,oBAAoB,CAAC,CAAA;aAC9C;SACF;KACF;IAED,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;QACjC,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;YACxB,MAAM,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,CAAA;YAC/B,IAAI,IAAA,kBAAM,EAAC,EAAE,CAAC,EAAE;gBACd,aAAa,CAAC,IAAI,CAAC,GAAG;oBACpB,QAAQ,EAAE,CAAC;oBACX,KAAK,EAAE,IAAI;oBACX,QAAQ,EAAE,EAAE,CAAC,QAAQ;oBACrB,IAAI;oBACJ,cAAc,EAAE,IAAI;oBACpB,eAAe,EAAE,CAAC;oBAClB,GAAG,EAAE;iBACN,CAAA;aACF;iBAAM,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;gBACnC,aAAa,CAAC,IAAI,CAAC,GAAG;oBACpB,QAAQ,EAAE,CAAC;oBACX,KAAK,EAAE,IAAI;oBACX,QAAQ,EAAE,EAAE;oBACZ,IAAI;oBACJ,cAAc,EAAE,IAAI;oBACpB,eAAe,EAAE,CAAC;iBACnB,CAAA;aACF;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,0BAA0B,CAAC,CAAA;aACpD;SACF;KACF;IAED,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;QAC3B,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClB,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;YACzB,IAAI,IAAA,kBAAM,EAAC,EAAE,CAAC,EAAE;gBACd,aAAa,CAAC,IAAI,CAAC,GAAG;oBACpB,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,IAAI;oBACb,QAAQ,EAAE,EAAE,CAAC,QAAQ;oBACrB,OAAO,EACL,EAAE,CAAC,OAAO;wBACV,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE;4BAC3B,OAAO,CAAC,IAAI,CACV,gDAAgD,EAChD,IAAI,EACJ,OAAO,EACP,GAAG,EACH,EAAE,CACH,CAAA;wBACH,CAAC,CAAC;oBACJ,IAAI;oBACJ,cAAc,EAAE,GAAG;oBACnB,eAAe,EAAE,CAAC;oBAClB,GAAG,EAAE;iBACN,CAAA;aACF;iBAAM,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;gBACnC,aAAa,CAAC,IAAI,CAAC,GAAG;oBACpB,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE;wBACnC,OAAO,CAAC,IAAI,CACV,gDAAgD,EAChD,IAAI,EACJ,OAAO,EACP,GAAG,EACH,EAAE,CACH,CAAA;oBACH,CAAC;oBACD,QAAQ,EAAE,EAAE;oBACZ,IAAI;oBACJ,cAAc,EAAE,GAAG;oBACnB,eAAe,EAAE,CAAC;iBACnB,CAAA;aACF;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,4BAA4B,CAAC,CAAA;aACtD;SACF;KACF;IAED,MAAM,WAAW,GAAkB;QACjC,GAAG,KAAK;QACR,SAAS,EAAE;YACT,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,sBAAsB,EAAE,KAAK,CAAC,sBAAsB,IAAI,CAAC,CAAC;YAC1D,SAAS,EACP,KAAK,CAAC,SAAS;gBACf,CAAC,KAAK,IAAI,EAAE;oBACV,OAAO,IAAI,CAAA;gBACb,CAAC,CAAC;YACJ,OAAO,EACL,KAAK,CAAC,OAAO;gBACb,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;oBAClB,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;wBACvB,OAAO,aAAa,CAAC,IAAI,CAAC,CAAA;qBAC3B;yBAAM;wBACL,OAAO,IAAI,CAAA;qBACZ;gBACH,CAAC,CAAC;YACJ,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;gBACxB,IAAI,MAAM,CAAA;gBACV,IAAI,IAAI,EAAE;oBACR,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;wBAChC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAA;wBACvC,IAAI,MAAM,KAAK,IAAI,EAAE;4BACnB,OAAO,aAAa,CAAC,IAAI,CAAC,CAAA;yBAC3B;wBACD,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,GAAG,EAAE;4BAC7B,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBACD,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,MAAM,IAAI,IAAI,CAAA;YAC9C,CAAC;SACF;KACF,CAAA;IAED,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,OAAO,CAAC,IAAI,CACV,KAAK,EACL,oBAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EAChC,yBAAyB,CAC1B,CAAA;KACF;IAED,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;QAChC,IAAI,IAAI,CAAC,MAAM,GAAG,WAAW,EAAE;YAC7B,WAAW,GAAG,IAAI,CAAC,MAAM,CAAA;SAC1B;KACF;IAED,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;QAChC,MAAM,GAAG,GAAG,IAAA,iCAAqB,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACpD,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAA,+BAAmB,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC1C,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,IAAA,gCAAoB,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBAC3C,CAAC,CAAC,UAAU;oBACZ,CAAC,CAAC,EAAE,CAAA;QACN,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;QAC7D,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACjB,OAAO,CAAC,IAAI,CACV,QAAQ,EACR,oBAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EACtB,IAAA,eAAO,EAAC,EAAE,EAAE,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAC/C,oBAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EACpB,IAAA,eAAO,EAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,oBAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EACrB,IAAA,eAAO,EAAC,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAC/B,CAAA;SACF;KACF;IAED,MAAM,WAAW,GAAG,IAAI,oBAAW,CAAC,WAAW,CAAC,CAAA;IAChD,OAAO,KAAK,CAAC,IAAI;QACf,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;QAC3D,CAAC,CAAC,WAAW,CAAA;AACjB,CAAC;AAlMD,gDAkMC"}

package/dist/error/errorTypeHandlers.d.ts

@@ -1,5 +1,5 @@
 import { BasedErrorCode, ErrorHandler } from './types';
-declare type ErrorType = {
+type ErrorType = {
     [K in BasedErrorCode]: ErrorHandler<K>;
 };
 export declare const errorTypeHandlers: ErrorType;

package/dist/error/errorTypeHandlers.js

@@ -36,24 +36,6 @@ exports.errorTypeHandlers = {
             return 'Error in server side observer';
         },
     },
-    [types_1.BasedErrorCode.ObservableFunctionError]: {
-        statusCode: 500,
-        statusMessage: 'Internal Server Error',
-        message: (payload) => {
-            if (payload.err &&
-                (typeof payload.err === 'string' ||
-                    (!payload.err.message && !payload.err.name))) {
-                return `[${payload.route.name}] ${JSON.stringify(payload.err)}`;
-            }
-            return `[${payload.route.name}] ${typeof payload.err !== 'string' &&
-                payload.err.name &&
-                payload.err.name !== 'Error'
-                ? `[${payload.err.name}] `
-                : ''}${typeof payload.err === 'string'
-                ? payload.err
-                : payload.err.message || ''}`;
-        },
-    },
     [types_1.BasedErrorCode.FunctionNotFound]: {
         statusCode: 404,
         statusMessage: 'Not Found',
@@ -62,42 +44,25 @@ exports.errorTypeHandlers = {
                 `Function not found${payload.route.path ? ` path '${payload.route.path}'` : ''}`);
         },
     },
-    [types_1.BasedErrorCode.FunctionIsStream]: {
+    [types_1.BasedErrorCode.FunctionIsWrongType]: {
         statusCode: 400,
         statusMessage: 'Incorrect Protocol',
         message: (payload) => {
-            return (addName(payload.route) + 'Cannot use stream functions over websockets');
-        },
-    },
-    [types_1.BasedErrorCode.FunctionIsNotStream]: {
-        statusCode: 400,
-        statusMessage: 'Function is Not Stream',
-        message: (payload) => {
-            return addName(payload.route) + 'Cannot stream to a normal function';
-        },
-    },
-    [types_1.BasedErrorCode.FunctionIsNotObservable]: {
-        statusCode: 400,
-        statusMessage: 'Function Is Not Observable',
-        message: (payload) => addName(payload.route) + 'Cannot observe non observable functions',
-    },
-    [types_1.BasedErrorCode.FunctionIsObservable]: {
-        statusCode: 400,
-        statusMessage: 'Function Is Observable',
-        message: (payload) => addName(payload.route) +
-            'Cannot call observable functions as a standard one',
-    },
-    [types_1.BasedErrorCode.CannotStreamToObservableFunction]: {
-        statusCode: 404,
-        statusMessage: 'Not Found',
-        message: (payload) => {
-            return addName(payload.route) + 'Cannot stream to observable function';
+            return addName(payload.route) + 'Target function is of wrong type';
         },
     },
     [types_1.BasedErrorCode.AuthorizeFunctionError]: {
         statusCode: 403,
         statusMessage: 'Forbidden',
-        message: (payload) => addName(payload.route) + 'Error in authorize function',
+        message: (payload) => {
+            if (typeof payload.err === 'string' || !payload.err.message) {
+                return `[${payload.route.name}] ${JSON.stringify(payload.err)}`;
+            }
+            return (addName(payload.route) +
+                `${payload.err.name && payload.err.name !== 'Error'
+                    ? `[${payload.err.name}] `
+                    : ''}${payload.err.message || ''}`);
+        },
     },
     [types_1.BasedErrorCode.AuthorizeRejectedError]: {
         statusCode: 403,

package/dist/error/errorTypeHandlers.js.map

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

package/dist/error/index.js

@@ -48,6 +48,9 @@ function createError(server, context, code, payload) {
     if ('observableId' in payload) {
         errorData.observableId = payload.observableId;
     }
+    if ('channelId' in payload) {
+        errorData.channelId = payload.channelId;
+    }
     if ('err' in payload) {
         server.emit('error', context, errorData, payload.err);
     }

package/dist/error/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/error/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,4CAAsC;AAEtC,mCAKgB;AAEhB,2DAAuD;AACvD,0CAAuB;AAEvB,SAAgB,eAAe,CAC7B,IAAO,EACP,OAAwB;IAExB,MAAM,IAAI,GAAG,qCAAiB,CAAC,IAAI,CAAC,CAAA;IACpC,MAAM,KAAK,GAAG,CAAC,OAAO;QACpB,CAAC,CAAC,mBAAW;QACb,CAAC,CAAC,IAAA,mBAAO,EAAC,OAAO,CAAC;YAClB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,IAAI,OAAO;gBACpB,CAAC,CAAC,OAAO,CAAC,KAAK;gBACf,CAAC,CAAC,mBAAW,CAAA;IAEf,OAAO;QACL,IAAI;QACJ,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAC9B,KAAK,EAAE;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB;KACF,CAAA;AACH,CAAC;AAvBD,0CAuBC;AAED,SAAgB,WAAW,CACzB,MAAmB,EACnB,OAAgB,EAChB,IAAO,EACP,OAAwB;IAExB,MAAM,SAAS,GAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACnE,IAAI,WAAW,IAAI,OAAO,EAAE;QAC1B,SAAS,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;KACxC;IACD,IAAI,cAAc,IAAI,OAAO,EAAE;QAC7B,SAAS,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAA;KAC9C;IACD,IAAI,KAAK,IAAI,OAAO,EAAE;QACpB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;KACtD;SAAM;QACL,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;KACzC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAnBD,kCAmBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/error/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,4CAAsC;AAEtC,mCAKgB;AAEhB,2DAAuD;AACvD,0CAAuB;AAEvB,SAAgB,eAAe,CAC7B,IAAO,EACP,OAAwB;IAExB,MAAM,IAAI,GAAG,qCAAiB,CAAC,IAAI,CAAC,CAAA;IACpC,MAAM,KAAK,GAAG,CAAC,OAAO;QACpB,CAAC,CAAC,mBAAW;QACb,CAAC,CAAC,IAAA,mBAAO,EAAC,OAAO,CAAC;YAClB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,IAAI,OAAO;gBACpB,CAAC,CAAC,OAAO,CAAC,KAAK;gBACf,CAAC,CAAC,mBAAW,CAAA;IAEf,OAAO;QACL,IAAI;QACJ,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAC9B,KAAK,EAAE;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB;KACF,CAAA;AACH,CAAC;AAvBD,0CAuBC;AAED,SAAgB,WAAW,CACzB,MAAmB,EACnB,OAAgB,EAChB,IAAO,EACP,OAAwB;IAExB,MAAM,SAAS,GAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACnE,IAAI,WAAW,IAAI,OAAO,EAAE;QAC1B,SAAS,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;KACxC;IACD,IAAI,cAAc,IAAI,OAAO,EAAE;QAC7B,SAAS,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAA;KAC9C;IACD,IAAI,WAAW,IAAI,OAAO,EAAE;QAC1B,SAAS,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;KACxC;IACD,IAAI,KAAK,IAAI,OAAO,EAAE;QACpB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;KACtD;SAAM;QACL,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;KACzC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAtBD,kCAsBC"}

package/dist/error/types.d.ts

@@ -7,14 +7,9 @@ export declare enum BasedErrorCode {
     FunctionError = 50001,
     AuthorizeFunctionError = 50002,
     NoOservableCacheAvailable = 50003,
-    ObservableFunctionError = 50004,
     ObserveCallbackError = 50005,
     FunctionNotFound = 40401,
-    FunctionIsNotObservable = 40402,
-    FunctionIsObservable = 40403,
-    FunctionIsStream = 40404,
-    CannotStreamToObservableFunction = 40405,
-    FunctionIsNotStream = 40406,
+    FunctionIsWrongType = 40402,
     AuthorizeRejectedError = 40301,
     InvalidPayload = 40001,
     PayloadTooLarge = 40002,
@@ -26,38 +21,43 @@ export declare enum BasedErrorCode {
     RateLimit = 40029,
     MissingAuthStateProtocolHeader = 40030
 }
-declare type FunctionErrorProps = {
+type FunctionErrorProps = {
     err: Error | string;
     requestId?: number;
     route: BasedRoute;
 };
-declare type ObservableFunctionErrorProps = {
+type ObservableFunctionErrorProps = {
     observableId: number;
     err: Error | string;
     route: BasedRoute;
 };
-declare type FunctionBasicPayload = {
+type ChannelFunctionErrorProps = {
+    channelId: number;
+    err: Error | string;
     route: BasedRoute;
-    requestId?: number;
 };
-declare type BasedErrorPayload = {
+type BasedErrorPayload = {
     observableId: number;
     route: BasedRoute;
 } | {
     requestId: number;
     route: BasedRoute;
+} | {
+    channelId: number;
+    route: BasedRoute;
 } | {
     route: BasedRoute;
 };
-export declare type ErrorPayload = {
+type BasedFunctionError = FunctionErrorProps | ObservableFunctionErrorProps | ChannelFunctionErrorProps;
+export type ErrorPayload = {
+    [BasedErrorCode.FunctionNotFound]: BasedErrorPayload;
     [BasedErrorCode.RateLimit]: {};
     [BasedErrorCode.MissingAuthStateProtocolHeader]: {};
     [BasedErrorCode.NoBinaryProtocol]: {
         buffer: ArrayBuffer;
     };
-    [BasedErrorCode.FunctionError]: FunctionErrorProps;
-    [BasedErrorCode.ObservableFunctionError]: ObservableFunctionErrorProps;
-    [BasedErrorCode.AuthorizeFunctionError]: FunctionErrorProps | ObservableFunctionErrorProps;
+    [BasedErrorCode.FunctionError]: BasedFunctionError;
+    [BasedErrorCode.AuthorizeFunctionError]: BasedFunctionError;
     [BasedErrorCode.AuthorizeRejectedError]: BasedErrorPayload;
     [BasedErrorCode.ObserveCallbackError]: {
         err: Error;
@@ -68,15 +68,7 @@ export declare type ErrorPayload = {
         observableId: number;
         route: BasedRoute;
     };
-    [BasedErrorCode.FunctionIsNotStream]: FunctionBasicPayload;
-    [BasedErrorCode.FunctionIsStream]: BasedErrorPayload;
-    [BasedErrorCode.FunctionNotFound]: BasedErrorPayload;
-    [BasedErrorCode.FunctionIsNotObservable]: {
-        route: BasedRoute;
-        observableId?: number;
-    };
-    [BasedErrorCode.FunctionIsObservable]: FunctionBasicPayload;
-    [BasedErrorCode.CannotStreamToObservableFunction]: FunctionBasicPayload;
+    [BasedErrorCode.FunctionIsWrongType]: BasedErrorPayload;
     [BasedErrorCode.InvalidPayload]: BasedErrorPayload;
     [BasedErrorCode.PayloadTooLarge]: BasedErrorPayload;
     [BasedErrorCode.ChunkTooLarge]: BasedRoute;
@@ -84,12 +76,12 @@ export declare type ErrorPayload = {
     [BasedErrorCode.LengthRequired]: BasedRoute;
     [BasedErrorCode.MethodNotAllowed]: BasedRoute;
 };
-export declare type ErrorHandler<T extends BasedErrorCode> = {
+export type ErrorHandler<T extends BasedErrorCode> = {
     statusCode: number;
     statusMessage: string;
     message: (payload: ErrorPayload[T]) => string;
 };
-export declare type BasedErrorData<T extends BasedErrorCode = BasedErrorCode> = {
+export type BasedErrorData<T extends BasedErrorCode = BasedErrorCode> = {
     route: BasedRoute;
     message: string;
     code: T;
@@ -97,5 +89,6 @@ export declare type BasedErrorData<T extends BasedErrorCode = BasedErrorCode> =
     statusMessage: string;
     requestId?: number;
     observableId?: number;
+    channelId?: number;
 };
 export {};

package/dist/error/types.js

@@ -10,14 +10,9 @@ var BasedErrorCode;
     BasedErrorCode[BasedErrorCode["FunctionError"] = 50001] = "FunctionError";
     BasedErrorCode[BasedErrorCode["AuthorizeFunctionError"] = 50002] = "AuthorizeFunctionError";
     BasedErrorCode[BasedErrorCode["NoOservableCacheAvailable"] = 50003] = "NoOservableCacheAvailable";
-    BasedErrorCode[BasedErrorCode["ObservableFunctionError"] = 50004] = "ObservableFunctionError";
     BasedErrorCode[BasedErrorCode["ObserveCallbackError"] = 50005] = "ObserveCallbackError";
     BasedErrorCode[BasedErrorCode["FunctionNotFound"] = 40401] = "FunctionNotFound";
-    BasedErrorCode[BasedErrorCode["FunctionIsNotObservable"] = 40402] = "FunctionIsNotObservable";
-    BasedErrorCode[BasedErrorCode["FunctionIsObservable"] = 40403] = "FunctionIsObservable";
-    BasedErrorCode[BasedErrorCode["FunctionIsStream"] = 40404] = "FunctionIsStream";
-    BasedErrorCode[BasedErrorCode["CannotStreamToObservableFunction"] = 40405] = "CannotStreamToObservableFunction";
-    BasedErrorCode[BasedErrorCode["FunctionIsNotStream"] = 40406] = "FunctionIsNotStream";
+    BasedErrorCode[BasedErrorCode["FunctionIsWrongType"] = 40402] = "FunctionIsWrongType";
     BasedErrorCode[BasedErrorCode["AuthorizeRejectedError"] = 40301] = "AuthorizeRejectedError";
     BasedErrorCode[BasedErrorCode["InvalidPayload"] = 40001] = "InvalidPayload";
     BasedErrorCode[BasedErrorCode["PayloadTooLarge"] = 40002] = "PayloadTooLarge";

package/dist/error/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/error/types.ts"],"names":[],"mappings":";;;AAEa,QAAA,WAAW,GAAG;IACzB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,EAAE;CACT,CAAA;AAED,IAAY,cAsBX;AAtBD,WAAY,cAAc;IACxB,yEAAqB,CAAA;IACrB,2FAA8B,CAAA;IAC9B,iGAAiC,CAAA;IACjC,6FAA+B,CAAA;IAC/B,uFAA4B,CAAA;IAC5B,+EAAwB,CAAA;IACxB,6FAA+B,CAAA;IAC/B,uFAA4B,CAAA;IAC5B,+EAAwB,CAAA;IACxB,+GAAwC,CAAA;IACxC,qFAA2B,CAAA;IAC3B,2FAA8B,CAAA;IAC9B,2EAAsB,CAAA;IACtB,6EAAuB,CAAA;IACvB,yEAAqB,CAAA;IACrB,mGAAkC,CAAA;IAClC,+EAAwB,CAAA;IACxB,2EAAsB,CAAA;IACtB,+EAAwB,CAAA;IACxB,iEAAiB,CAAA;IACjB,2GAAsC,CAAA;AACxC,CAAC,EAtBW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAsBzB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/error/types.ts"],"names":[],"mappings":";;;AAEa,QAAA,WAAW,GAAG;IACzB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,EAAE;CACT,CAAA;AAED,IAAY,cAiBX;AAjBD,WAAY,cAAc;IACxB,yEAAqB,CAAA;IACrB,2FAA8B,CAAA;IAC9B,iGAAiC,CAAA;IACjC,uFAA4B,CAAA;IAC5B,+EAAwB,CAAA;IACxB,qFAA2B,CAAA;IAC3B,2FAA8B,CAAA;IAC9B,2EAAsB,CAAA;IACtB,6EAAuB,CAAA;IACvB,yEAAqB,CAAA;IACrB,mGAAkC,CAAA;IAClC,+EAAwB,CAAA;IACxB,2EAAsB,CAAA;IACtB,+EAAwB,CAAA;IACxB,iEAAiB,CAAA;IACjB,2GAAsC,CAAA;AACxC,CAAC,EAjBW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAiBzB"}

package/dist/functionApi/channelSubscribe.d.ts

@@ -0,0 +1,3 @@
+import { BasedServer } from '../server';
+import { ChannelMessageFunctionInternal } from '@based/functions';
+export declare const subscribeChannel: (server: BasedServer, name: string, id: number, payload: any, update: ChannelMessageFunctionInternal) => (() => void);

package/dist/functionApi/channelSubscribe.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.subscribeChannel = void 0;
+const verifyRoute_1 = require("../verifyRoute");
+const channel_1 = require("../channel");
+const installFn_1 = require("../installFn");
+const error_1 = require("../error");
+const subscribeChannel = (server, name, id, payload, update) => {
+    const route = (0, verifyRoute_1.verifyRoute)(server, server.client.ctx, 'channel', server.functions.route(name), name, id);
+    if (route === null) {
+        throw new Error(`[${name}] No session in ctx`);
+    }
+    let isClosed = false;
+    const close = () => {
+        if (isClosed) {
+            return;
+        }
+        isClosed = true;
+        (0, channel_1.unsubscribeFunction)(server, id, update);
+    };
+    if ((0, channel_1.hasChannel)(server, id)) {
+        (0, channel_1.subscribeChannelFunction)(server, id, update);
+        return close;
+    }
+    (0, installFn_1.installFn)(server, server.client.ctx, route).then((spec) => {
+        if (isClosed) {
+            return;
+        }
+        if (spec === null) {
+            update(null, (0, error_1.createError)(server, server.client.ctx, error_1.BasedErrorCode.FunctionNotFound, {
+                route,
+            }));
+            return;
+        }
+        if (!(0, channel_1.hasChannel)(server, id)) {
+            (0, channel_1.createChannel)(server, name, id, payload, true);
+        }
+        (0, channel_1.subscribeChannelFunction)(server, id, update);
+    });
+    return close;
+};
+exports.subscribeChannel = subscribeChannel;
+//# sourceMappingURL=channelSubscribe.js.map

package/dist/functionApi/channelSubscribe.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"channelSubscribe.js","sourceRoot":"","sources":["../../src/functionApi/channelSubscribe.ts"],"names":[],"mappings":";;;AAEA,gDAA4C;AAC5C,wCAKmB;AACnB,4CAAwC;AACxC,oCAAsD;AAE/C,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,IAAY,EACZ,EAAU,EACV,OAAY,EACZ,MAAsC,EACxB,EAAE;IAChB,MAAM,KAAK,GAAG,IAAA,yBAAW,EACvB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,SAAS,EACT,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,EACJ,EAAE,CACH,CAAA;IAED,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,qBAAqB,CAAC,CAAA;KAC/C;IAED,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,QAAQ,EAAE;YACZ,OAAM;SACP;QACD,QAAQ,GAAG,IAAI,CAAA;QACf,IAAA,6BAAmB,EAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,IAAI,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QAC1B,IAAA,kCAAwB,EAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;QAC5C,OAAO,KAAK,CAAA;KACb;IAED,IAAA,qBAAS,EAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACxD,IAAI,QAAQ,EAAE;YACZ,OAAM;SACP;QACD,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,MAAM,CACJ,IAAI,EACJ,IAAA,mBAAW,EACT,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,sBAAc,CAAC,gBAAgB,EAC/B;gBACE,KAAK;aACN,CACF,CACF,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YAC3B,IAAA,uBAAa,EAAC,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;SAC/C;QACD,IAAA,kCAAwB,EAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AA5DY,QAAA,gBAAgB,oBA4D5B"}

package/dist/functionApi/client/channel.d.ts

@@ -0,0 +1,10 @@
+import { BasedChannel as BasedChannelAbstract, ChannelMessageFunction, Context, InternalSessionClient } from '@based/functions';
+export declare class BasedChannel extends BasedChannelAbstract {
+    payload: any;
+    name: string;
+    id: number;
+    ctx: Context<InternalSessionClient>;
+    constructor(ctx: Context<InternalSessionClient>, name: string, payload: any);
+    subscribe(onMessage: ChannelMessageFunction, onError?: (err: any) => void): () => void;
+    publish(message: any, ctx?: Context): void;
+}

package/dist/functionApi/client/channel.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasedChannel = void 0;
+const functions_1 = require("@based/functions");
+const observable_1 = require("../../observable");
+const publish_1 = require("../publish");
+const channelSubscribe_1 = require("../channelSubscribe");
+// add generics...
+class BasedChannel extends functions_1.BasedChannel {
+    constructor(ctx, name, payload) {
+        super();
+        this.ctx = ctx;
+        this.payload = payload;
+        this.id = (0, observable_1.genObservableId)(name, payload);
+        this.name = name;
+    }
+    subscribe(onMessage, onError) {
+        return (0, channelSubscribe_1.subscribeChannel)(this.ctx.session.client.server, this.name, this.id, this.payload, (msg, err) => {
+            if (err) {
+                if (onError) {
+                    onError(err);
+                }
+                return;
+            }
+            onMessage(msg);
+        });
+    }
+    publish(message, ctx = this.ctx) {
+        (0, publish_1.publish)(this.ctx.session.client.server, this.name, ctx, this.id, this.payload, message);
+    }
+}
+exports.BasedChannel = BasedChannel;
+//# sourceMappingURL=channel.js.map

package/dist/functionApi/client/channel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/functionApi/client/channel.ts"],"names":[],"mappings":";;;AAAA,gDAKyB;AACzB,iDAAkD;AAClD,wCAAoC;AACpC,0DAAsD;AAEtD,kBAAkB;AAClB,MAAa,YAAa,SAAQ,wBAAoB;IAMpD,YAAY,GAAmC,EAAE,IAAY,EAAE,OAAY;QACzE,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,EAAE,GAAG,IAAA,4BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,SAAS,CACP,SAAiC,EACjC,OAA4B;QAE5B,OAAO,IAAA,mCAAgB,EACrB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAC9B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACX,IAAI,GAAG,EAAE;gBACP,IAAI,OAAO,EAAE;oBACX,OAAO,CAAC,GAAG,CAAC,CAAA;iBACb;gBACD,OAAM;aACP;YACD,SAAS,CAAC,GAAG,CAAC,CAAA;QAChB,CAAC,CACF,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAY,EAAE,MAAe,IAAI,CAAC,GAAG;QAC3C,IAAA,iBAAO,EACL,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAC9B,IAAI,CAAC,IAAI,EACT,GAAG,EACH,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,OAAO,CACR,CAAA;IACH,CAAC;CACF;AA7CD,oCA6CC"}

package/dist/functionApi/client/index.d.ts

@@ -1,16 +1,18 @@
 /// <reference types="node" />
 import { BasedServer } from '../../server';
 import { BasedQuery } from './query';
+import { BasedChannel } from './channel';
 import util from 'node:util';
-import { AuthState, BasedFunctionClient as BasedfunctionClientAbstract, Context, InternalSessionClient, Session } from '@based/functions';
+import { AuthState, BasedFunctionClient as BasedfunctionClientAbstract, Context, InternalSessionClient, StreamFunctionOpts, Session } from '@based/functions';
 export declare class BasedFunctionClient extends BasedfunctionClientAbstract {
     server: BasedServer;
     ctx: Context<InternalSessionClient>;
     constructor(server: BasedServer);
     call(name: string, payload?: any, ctx?: Context): Promise<any>;
     query(name: string, payload?: any): BasedQuery;
-    stream(name: string, stream?: any): Promise<any>;
-    renewAuthState(ctx: Context<Session>): void;
+    channel(name: string, payload?: any): BasedChannel;
+    stream(name: string, streamOpts: StreamFunctionOpts, ctx?: Context): Promise<any>;
+    renewAuthState(ctx: Context<Session>, authState?: AuthState): Promise<AuthState>;
     setAuthState(ctx: Context<Session>, authState: AuthState): void;
     sendAuthState(ctx: Context<Session>, authState: AuthState): void;
     [util.inspect.custom](): string;