@based/server 4.0.3 → 4.0.5

package/dist/functions/index.js

@@ -19,6 +19,7 @@ const types_1 = require("./types");
 const utils_1 = require("@saulx/utils");
 const timeout_1 = require("./timeout");
 const observable_1 = require("../observable");
+const channel_1 = require("../channel");
 __exportStar(require("./types"), exports);
 class BasedFunctions {
     constructor(server, config) {
@@ -28,6 +29,7 @@ class BasedFunctions {
             stream: 5e6,
             query: 2500,
             function: 20e3,
+            channel: 500,
         };
         this.paths = {};
         this.specs = {};
@@ -45,6 +47,10 @@ class BasedFunctions {
                 if ((0, types_1.isQueryFunctionSpec)(spec) && this.server.activeObservables[name]) {
                     (0, timeout_1.updateTimeoutCounter)(spec);
                 }
+                else if ((0, types_1.isChannelFunctionSpec)(spec) &&
+                    this.server.activeChannels[name]) {
+                    (0, timeout_1.updateTimeoutCounter)(spec);
+                }
                 else if ((0, timeout_1.fnIsTimedOut)(spec)) {
                     q.push(this.uninstall(name, spec));
                 }
@@ -60,44 +66,36 @@ class BasedFunctions {
         else {
             this.config = config;
         }
-        if (this.config.idleTimeout === undefined) {
-            this.config.idleTimeout = 60e3; // 1 min
-        }
-        if (this.config.memCacheTimeout === undefined) {
-            this.config.memCacheTimeout = 3e3;
+        if (this.config.uninstallAfterIdleTime === undefined) {
+            this.config.uninstallAfterIdleTime = 60e3; // 1 min
         }
-        if (this.config.maxWorkers === undefined) {
-            this.config.maxWorkers = 1;
+        if (this.config.closeAfterIdleTime === undefined) {
+            this.config.closeAfterIdleTime = {
+                query: 3e3,
+                channel: 60e3, // 3 1 Min
+            };
         }
         if (this.unregisterTimeout) {
             clearTimeout(this.unregisterTimeout);
         }
         this.uninstallLoop();
     }
-    async updateFunction(spec) {
-        const { name } = spec;
+    async update(name, checksum) {
         const prevSpec = this.specs[name];
-        if (prevSpec) {
-            if (prevSpec.function !== spec.function) {
-                if (this.beingUninstalled[name]) {
-                    delete this.beingUninstalled[name];
-                }
-                (0, timeout_1.updateTimeoutCounter)(spec);
-                await this.installGaurdedFromConfig(name);
-                await this.config.uninstall({
-                    server: this.server,
-                    function: prevSpec,
-                    name,
-                });
-                this.update(spec);
+        if (prevSpec && prevSpec.checksum !== checksum) {
+            if (this.beingUninstalled[name]) {
+                delete this.beingUninstalled[name];
             }
-            else {
-                this.update(spec);
+            const spec = await this.installGaurdedFromConfig(name);
+            await this.config.uninstall({
+                server: this.server,
+                function: prevSpec,
+                name,
+            });
+            if (spec) {
+                this.updateInternal(spec);
             }
         }
-        else {
-            this.update(spec);
-        }
     }
     async installGaurdedFromConfig(name) {
         if (this.installsInProgress[name]) {
@@ -118,7 +116,7 @@ class BasedFunctions {
         }
         spec = await this.installGaurdedFromConfig(name);
         if (spec) {
-            this.update(spec);
+            this.updateInternal(spec);
             return this.getFromStore(name);
         }
         return null;
@@ -140,7 +138,7 @@ class BasedFunctions {
         }
         return null;
     }
-    update(spec) {
+    updateInternal(spec) {
         if (!spec) {
             return false;
         }
@@ -148,18 +146,23 @@ class BasedFunctions {
         if ((0, utils_1.deepEqual)(spec, this.specs[spec.name])) {
             return false;
         }
-        if (!spec.idleTimeout) {
-            spec.idleTimeout = this.config.idleTimeout;
+        if (!spec.uninstallAfterIdleTime) {
+            spec.uninstallAfterIdleTime = this.config.uninstallAfterIdleTime;
         }
         if (spec.timeoutCounter === undefined) {
             spec.timeoutCounter =
-                spec.idleTimeout === 0 ? -1 : Math.ceil(spec.idleTimeout / 1e3);
+                spec.uninstallAfterIdleTime === 0
+                    ? -1
+                    : Math.ceil(spec.uninstallAfterIdleTime / 1e3);
         }
         if (spec.path) {
             this.paths[spec.path] = spec.name;
         }
         if (!spec.maxPayloadSize) {
-            if ((0, types_1.isQueryFunctionSpec)(spec)) {
+            if ((0, types_1.isChannelFunctionSpec)(spec)) {
+                spec.maxPayloadSize = this.maxPayLoadSizeDefaults.channel;
+            }
+            else if ((0, types_1.isQueryFunctionSpec)(spec)) {
                 spec.maxPayloadSize = this.maxPayLoadSizeDefaults.query;
             }
             else if ((0, types_1.isStreamFunctionSpec)(spec)) {
@@ -175,7 +178,22 @@ class BasedFunctions {
         const previousChecksum = this.specs[spec.name]?.checksum ?? -1;
         // @ts-ignore maxpayload and rlimit tokens added on line 184...
         this.specs[spec.name] = spec;
-        if (this.specs[spec.name] && this.server.activeObservables[spec.name]) {
+        if (this.specs[spec.name] && this.server.activeChannels[spec.name]) {
+            if (!(0, types_1.isChannelFunctionSpec)(spec)) {
+                for (const [id] of this.server.activeChannels[spec.name]) {
+                    (0, channel_1.destroyChannel)(this.server, id);
+                }
+            }
+            else {
+                if (previousChecksum !== spec.checksum) {
+                    for (const [id] of this.server.activeChannels[spec.name]) {
+                        (0, channel_1.startChannel)(this.server, id, true);
+                    }
+                }
+            }
+        }
+        else if (this.specs[spec.name] &&
+            this.server.activeObservables[spec.name]) {
             if (!(0, types_1.isQueryFunctionSpec)(spec)) {
                 for (const [id] of this.server.activeObservables[spec.name]) {
                     (0, observable_1.destroyObs)(this.server, id);
@@ -219,6 +237,9 @@ class BasedFunctions {
             return false;
         }
         this.beingUninstalled[name] = true;
+        if (spec.uninstall) {
+            await spec.uninstall();
+        }
         if (await this.config.uninstall({
             server: this.server,
             function: spec,

package/dist/functions/index.js.map

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

package/dist/functions/timeout.js

@@ -6,7 +6,7 @@ const fnIsTimedOut = (spec) => {
         if (spec.timeoutCounter === 0) {
             return true;
         }
-        if (spec.idleTimeout > 0 && spec.timeoutCounter > 0) {
+        if (spec.uninstallAfterIdleTime > 0 && spec.timeoutCounter > 0) {
             spec.timeoutCounter--;
         }
     }
@@ -16,7 +16,9 @@ exports.fnIsTimedOut = fnIsTimedOut;
 const updateTimeoutCounter = (spec) => {
     if (spec.timeoutCounter !== -1) {
         spec.timeoutCounter =
-            spec.idleTimeout === -1 ? -1 : Math.ceil(spec.idleTimeout / 1e3 / 3);
+            spec.uninstallAfterIdleTime === -1
+                ? -1
+                : Math.ceil(spec.uninstallAfterIdleTime / 1e3 / 3);
     }
 };
 exports.updateTimeoutCounter = updateTimeoutCounter;

package/dist/functions/timeout.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/functions/timeout.ts"],"names":[],"mappings":";;;AAEO,MAAM,YAAY,GAAG,CAAC,IAAe,EAAW,EAAE;IACvD,IAAI,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC,EAAE;QAC9B,IAAI,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE;YACnD,IAAI,CAAC,cAAc,EAAE,CAAA;SACtB;KACF;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAVY,QAAA,YAAY,gBAUxB;AAEM,MAAM,oBAAoB,GAAG,CAAC,IAAe,EAAE,EAAE;IACtD,IAAI,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC,EAAE;QAC9B,IAAI,CAAC,cAAc;YACjB,IAAI,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,GAAG,GAAG,CAAC,CAAC,CAAA;KACvE;AACH,CAAC,CAAA;AALY,QAAA,oBAAoB,wBAKhC"}
+{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/functions/timeout.ts"],"names":[],"mappings":";;;AAEO,MAAM,YAAY,GAAG,CAAC,IAAe,EAAW,EAAE;IACvD,IAAI,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC,EAAE;QAC9B,IAAI,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,IAAI,CAAC,sBAAsB,GAAG,CAAC,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE;YAC9D,IAAI,CAAC,cAAc,EAAE,CAAA;SACtB;KACF;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAVY,QAAA,YAAY,gBAUxB;AAEM,MAAM,oBAAoB,GAAG,CAAC,IAAe,EAAE,EAAE;IACtD,IAAI,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC,EAAE;QAC9B,IAAI,CAAC,cAAc;YACjB,IAAI,CAAC,sBAAsB,KAAK,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,GAAG,GAAG,GAAG,CAAC,CAAC,CAAA;KACvD;AACH,CAAC,CAAA;AAPY,QAAA,oBAAoB,wBAOhC"}

package/dist/functions/types.d.ts

@@ -1,55 +1,19 @@
-import { BasedQueryFunction, BasedFunction, HttpResponse, BasedStreamFunction } from '@based/functions';
+import { BasedQueryFunction, BasedFunction, BasedChannelFunction, HttpResponse, UninstallFunction, BasedStreamFunction, BasedChannelPublishFunction, Authorize } from '@based/functions';
 import { BasedServer } from '../server';
-declare type Route = {
-    name: string;
-    path?: string;
-    maxPayloadSize?: number;
-    rateLimitTokens?: number;
-    public?: boolean;
-    headers?: string[];
-    internalOnly?: boolean;
-};
-export declare type BasedFunctionRoute = Route;
-export declare type BasedQueryFunctionRoute = Route & {
-    query: true;
-};
-export declare type BasedStreamFunctionRoute = Route & {
-    stream: true;
-};
-export declare type BasedQueryFunctionSpec = {
-    checksum: number;
-    function: BasedQueryFunction;
-    memCacheTimeout?: number;
-    idleTimeout?: number;
-    timeoutCounter?: number;
-    httpResponse?: HttpResponse;
-} & BasedQueryFunctionRoute;
-export declare type BasedStreamFunctionSpec = {
-    checksum: number;
-    function: BasedStreamFunction;
-    maxExecTime?: number;
-    idleTimeout?: number;
-    timeoutCounter?: number;
-} & BasedStreamFunctionRoute;
-export declare type BasedFunctionSpec = {
-    checksum: number;
-    function: BasedFunction;
-    httpResponse?: HttpResponse;
-    maxExecTime?: number;
-    idleTimeout?: number;
-    timeoutCounter?: number;
-} & BasedFunctionRoute;
-export declare type BasedRoute = BasedFunctionRoute | BasedQueryFunctionRoute | BasedStreamFunctionRoute;
-export declare type BasedSpec<R extends BasedRoute = BasedRoute> = R extends BasedQueryFunctionRoute ? BasedQueryFunctionSpec : R extends BasedStreamFunctionRoute ? BasedStreamFunctionSpec : BasedFunctionSpec;
-export declare type FunctionConfig = {
-    memCacheTimeout?: number;
-    idleTimeout?: number;
-    maxWorkers?: number;
-    importWrapperPath?: string;
+export type FunctionConfig = {
+    /** Default number to close channels & queries when no subscribers are active in ms */
+    closeAfterIdleTime?: {
+        query: number;
+        channel: number;
+    };
+    /** Default time to uinstall function after it has been idle in ms */
+    uninstallAfterIdleTime?: number;
+    /** Default max payload sizes in bytes */
     maxPayLoadSizeDefaults?: {
         stream: number;
         query: number;
         function: number;
+        channel: number;
     };
     route: (opts: {
         server: BasedServer;
@@ -62,20 +26,100 @@ export declare type FunctionConfig = {
     install: (opts: {
         server: BasedServer;
         name: string;
-        function?: BasedFunctionSpec | BasedQueryFunctionSpec;
-    }) => Promise<null | BasedQueryFunctionSpec | BasedStreamFunctionSpec | BasedFunctionSpec>;
+        function?: BasedSpec;
+    }) => Promise<null | BasedSpec>;
     uninstall: (opts: {
         server: BasedServer;
         name: string;
-        function: BasedQueryFunctionSpec | BasedStreamFunctionSpec | BasedFunctionSpec;
+        function: BasedSpec;
     }) => Promise<boolean>;
 };
-export declare function isQueryFunctionSpec(fn: BasedQueryFunctionSpec | BasedStreamFunctionSpec | BasedFunctionSpec): fn is BasedQueryFunctionSpec;
-export declare function isStreamFunctionSpec(fn: BasedQueryFunctionSpec | BasedFunctionSpec | BasedStreamFunctionSpec): fn is BasedQueryFunctionSpec;
-export declare function isFunctionSpec(fn: BasedQueryFunctionSpec | BasedFunctionSpec | BasedStreamFunctionSpec): fn is BasedSpec;
+type Route = {
+    /** Function name */
+    name: string;
+    /** In addition to the name, a function can have a custom path for HTTP requests.
+     * For example: `path: 'my/custom/path'` will result in the function being
+     * available with a request to `edgeurl.based.io/my/custom/path`
+     */
+    path?: string;
+    /** In bytes. `-1` indicates no size limit */
+    maxPayloadSize?: number;
+    /** Cost in tokens for this function call.  */
+    rateLimitTokens?: number;
+    /** A function marked as `public` will skip the call to authorize. */
+    public?: boolean;
+    /** Array of headers that this function expects to receive. */
+    headers?: string[];
+    /** A function marked as `internalOnly` will only be accessible from other server side functions,
+     * and not through the public internet.
+     */
+    internalOnly?: boolean;
+    /** Can hold extra information about a spec */
+    data?: any;
+};
+export type BasedFunctionRoute = Route;
+export type BasedQueryFunctionRoute = Route & {
+    query: true;
+};
+export type BasedStreamFunctionRoute = Route & {
+    stream: true;
+};
+export type BasedChannelFunctionRoute = Route & {
+    channel: true;
+    publisher?: {
+        public?: true;
+    };
+};
+export type BasedInstallableFunctionSpec = {
+    /** Version hash of the BasedFunction */
+    checksum: number;
+    /** Uinstall function after it has been idle, in ms */
+    uninstallAfterIdleTime?: number;
+    /** In ms */
+    timeoutCounter?: number;
+    /** Hook that fires on uninstall of the function e.g. to clean up database connections */
+    uninstall?: UninstallFunction;
+    /** Specific authorize for this function */
+    authorize?: Authorize;
+};
+export type BasedQueryFunctionSpec = {
+    function: BasedQueryFunction;
+    /** How long should the query function remain active after all subscribers are gone, in ms */
+    closeAfterIdleTime?: number;
+    /** When in an HTTP context, this function is called to wrap the return value of the BasedFunction, and inject headers and a status code */
+    httpResponse?: HttpResponse;
+} & BasedQueryFunctionRoute & BasedInstallableFunctionSpec;
+export type BasedStreamFunctionSpec = {
+    function: BasedStreamFunction;
+    /** Maximum allowed execution time, in ms */
+    maxExecTime?: number;
+} & BasedStreamFunctionRoute & BasedInstallableFunctionSpec;
+export type BasedFunctionSpec = {
+    function: BasedFunction;
+    /** When in an HTTP context, this function is called to wrap the return value of the BasedFunction, and inject headers and a status code */
+    httpResponse?: HttpResponse;
+    /** Maximum allowed execution time, in ms */
+    maxExecTime?: number;
+} & BasedFunctionRoute & BasedInstallableFunctionSpec;
+export type BasedChannelFunctionSpec = {
+    function: BasedChannelFunction;
+    /** Publish allows publishing to channels */
+    publish: BasedChannelPublishFunction;
+    /** How long should the channel remain active after all subscribers ae gone, in ms */
+    closeAfterIdleTime?: number;
+    /** When in an HTTP context, this function is called to wrap the return value of the publish endpoint, and inject headers and a status code */
+    httpResponse?: HttpResponse;
+} & BasedChannelFunctionRoute & BasedInstallableFunctionSpec;
+export type BasedRoute = BasedFunctionRoute | BasedQueryFunctionRoute | BasedStreamFunctionRoute | BasedChannelFunctionRoute;
+export type BasedSpec<R extends BasedRoute = BasedRoute> = R extends BasedChannelFunctionRoute ? BasedChannelFunctionSpec : R extends BasedQueryFunctionRoute ? BasedQueryFunctionSpec : R extends BasedStreamFunctionRoute ? BasedStreamFunctionSpec : BasedFunctionSpec;
+export declare function isChannelFunctionSpec(fn: BasedSpec): fn is BasedChannelFunctionSpec;
+export declare function isQueryFunctionSpec(fn: BasedSpec): fn is BasedQueryFunctionSpec;
+export declare function isStreamFunctionSpec(fn: BasedSpec): fn is BasedQueryFunctionSpec;
+export declare function isFunctionSpec(fn: BasedSpec): fn is BasedSpec;
 export declare function isSpec(fn: any): fn is BasedSpec;
-export declare function isQueryFunctionRoute(fn: BasedFunctionRoute | BasedQueryFunctionRoute | BasedStreamFunctionRoute): fn is BasedQueryFunctionRoute;
-export declare function isStreamFunctionRoute(fn: BasedFunctionRoute | BasedQueryFunctionRoute | BasedStreamFunctionRoute): fn is BasedStreamFunctionRoute;
-export declare function isFunctionRoute(fn: BasedFunctionRoute | BasedQueryFunctionRoute | BasedStreamFunctionRoute): fn is BasedFunctionRoute;
+export declare function isQueryFunctionRoute(fn: BasedRoute): fn is BasedQueryFunctionRoute;
+export declare function isStreamFunctionRoute(fn: BasedRoute): fn is BasedStreamFunctionRoute;
+export declare function isChannelFunctionRoute(fn: BasedRoute): fn is BasedChannelFunctionRoute;
+export declare function isFunctionRoute(fn: BasedRoute): fn is BasedFunctionRoute;
 export declare function isRoute(route: any): route is BasedRoute;
 export {};

package/dist/functions/types.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRoute = exports.isFunctionRoute = exports.isStreamFunctionRoute = exports.isQueryFunctionRoute = exports.isSpec = exports.isFunctionSpec = exports.isStreamFunctionSpec = exports.isQueryFunctionSpec = void 0;
-// specs
+exports.isRoute = exports.isFunctionRoute = exports.isChannelFunctionRoute = exports.isStreamFunctionRoute = exports.isQueryFunctionRoute = exports.isSpec = exports.isFunctionSpec = exports.isStreamFunctionSpec = exports.isQueryFunctionSpec = exports.isChannelFunctionSpec = void 0;
+// ---------- specs -------------
+function isChannelFunctionSpec(fn) {
+    return fn.channel === true;
+}
+exports.isChannelFunctionSpec = isChannelFunctionSpec;
 function isQueryFunctionSpec(fn) {
     return fn.query === true;
 }
@@ -17,10 +21,13 @@ exports.isFunctionSpec = isFunctionSpec;
 function isSpec(fn) {
     return (fn &&
         typeof fn === 'object' &&
-        (isFunctionSpec(fn) || isStreamFunctionSpec(fn) || isQueryFunctionSpec(fn)));
+        (isFunctionSpec(fn) ||
+            isStreamFunctionSpec(fn) ||
+            isQueryFunctionSpec(fn) ||
+            isChannelFunctionSpec(fn)));
 }
 exports.isSpec = isSpec;
-// routes
+// ---------- routes -------------
 function isQueryFunctionRoute(fn) {
     return fn.query === true;
 }
@@ -29,8 +36,12 @@ function isStreamFunctionRoute(fn) {
     return fn.stream === true;
 }
 exports.isStreamFunctionRoute = isStreamFunctionRoute;
+function isChannelFunctionRoute(fn) {
+    return fn.channel === true;
+}
+exports.isChannelFunctionRoute = isChannelFunctionRoute;
 function isFunctionRoute(fn) {
-    return !('stream' in fn) && !('query' in fn);
+    return !('stream' in fn) && !('query' in fn) && !('channel' in fn);
 }
 exports.isFunctionRoute = isFunctionRoute;
 function isRoute(route) {

package/dist/functions/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/functions/types.ts"],"names":[],"mappings":";;;AAoGA,QAAQ;AAER,SAAgB,mBAAmB,CACjC,EAAwE;IAExE,OAAQ,EAA6B,CAAC,KAAK,KAAK,IAAI,CAAA;AACtD,CAAC;AAJD,kDAIC;AAED,SAAgB,oBAAoB,CAClC,EAAwE;IAExE,OAAQ,EAA8B,CAAC,MAAM,KAAK,IAAI,CAAA;AACxD,CAAC;AAJD,oDAIC;AAED,SAAgB,cAAc,CAC5B,EAAwE;IAExE,OAAO,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;AAC9C,CAAC;AAJD,wCAIC;AAED,SAAgB,MAAM,CAAC,EAAO;IAC5B,OAAO,CACL,EAAE;QACF,OAAO,EAAE,KAAK,QAAQ;QACtB,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,oBAAoB,CAAC,EAAE,CAAC,IAAI,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAC5E,CAAA;AACH,CAAC;AAND,wBAMC;AAED,SAAS;AAET,SAAgB,oBAAoB,CAClC,EAA2E;IAE3E,OAAQ,EAA8B,CAAC,KAAK,KAAK,IAAI,CAAA;AACvD,CAAC;AAJD,oDAIC;AAED,SAAgB,qBAAqB,CACnC,EAA2E;IAE3E,OAAQ,EAA+B,CAAC,MAAM,KAAK,IAAI,CAAA;AACzD,CAAC;AAJD,sDAIC;AAED,SAAgB,eAAe,CAC7B,EAA2E;IAE3E,OAAO,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;AAC9C,CAAC;AAJD,0CAIC;AAED,SAAgB,OAAO,CAAC,KAAU;IAChC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,EAAE;QACzD,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AALD,0BAKC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/functions/types.ts"],"names":[],"mappings":";;;AAwJA,iCAAiC;AACjC,SAAgB,qBAAqB,CACnC,EAAa;IAEb,OAAQ,EAA+B,CAAC,OAAO,KAAK,IAAI,CAAA;AAC1D,CAAC;AAJD,sDAIC;AAED,SAAgB,mBAAmB,CACjC,EAAa;IAEb,OAAQ,EAA6B,CAAC,KAAK,KAAK,IAAI,CAAA;AACtD,CAAC;AAJD,kDAIC;AAED,SAAgB,oBAAoB,CAClC,EAAa;IAEb,OAAQ,EAA8B,CAAC,MAAM,KAAK,IAAI,CAAA;AACxD,CAAC;AAJD,oDAIC;AAED,SAAgB,cAAc,CAAC,EAAa;IAC1C,OAAO,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;AAC9C,CAAC;AAFD,wCAEC;AAED,SAAgB,MAAM,CAAC,EAAO;IAC5B,OAAO,CACL,EAAE;QACF,OAAO,EAAE,KAAK,QAAQ;QACtB,CAAC,cAAc,CAAC,EAAE,CAAC;YACjB,oBAAoB,CAAC,EAAE,CAAC;YACxB,mBAAmB,CAAC,EAAE,CAAC;YACvB,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAC7B,CAAA;AACH,CAAC;AATD,wBASC;AAED,kCAAkC;AAClC,SAAgB,oBAAoB,CAClC,EAAc;IAEd,OAAQ,EAA8B,CAAC,KAAK,KAAK,IAAI,CAAA;AACvD,CAAC;AAJD,oDAIC;AAED,SAAgB,qBAAqB,CACnC,EAAc;IAEd,OAAQ,EAA+B,CAAC,MAAM,KAAK,IAAI,CAAA;AACzD,CAAC;AAJD,sDAIC;AAED,SAAgB,sBAAsB,CACpC,EAAc;IAEd,OAAQ,EAAgC,CAAC,OAAO,KAAK,IAAI,CAAA;AAC3D,CAAC;AAJD,wDAIC;AAED,SAAgB,eAAe,CAAC,EAAc;IAC5C,OAAO,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;AACpE,CAAC;AAFD,0CAEC;AAED,SAAgB,OAAO,CAAC,KAAU;IAChC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,EAAE;QACzD,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AALD,0BAKC"}

package/dist/incoming/http/function.js

@@ -4,36 +4,34 @@ exports.httpFunction = void 0;
 const sendHttpResponse_1 = require("../../sendHttpResponse");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
-const installFn_1 = require("../../installFn");
-const httpFunction = async (route, server, ctx, payload) => {
-    (0, installFn_1.installFn)(server, ctx, route).then((spec) => {
-        if (spec === null) {
+const httpFunction = async (route, spec, server, ctx, payload) => {
+    spec
+        .function(server.client, payload, ctx)
+        .then(async (result) => {
+        if (!ctx.session) {
             return;
         }
-        spec
-            .function(server.client, payload, ctx)
-            .then(async (result) => {
-            if (!ctx.session) {
-                return;
-            }
-            if (spec.httpResponse) {
-                const send = (responseData, headers, status) => {
-                    (0, sendHttpResponse_1.sendHttpResponse)(ctx, responseData, headers, status !== undefined
-                        ? typeof status === 'string'
-                            ? status
-                            : String(status)
-                        : undefined);
-                };
-                await spec.httpResponse(server.client, payload, result, send, ctx);
-                return;
-            }
-            (0, sendHttpResponse_1.sendHttpResponse)(ctx, result);
-        })
-            .catch((err) => {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
-                err,
-                route,
-            });
+        if (spec.httpResponse) {
+            const send = (responseData, headers, status) => {
+                if (!ctx.session) {
+                    return;
+                }
+                if (!status) {
+                    (0, sendHttpResponse_1.sendHttpResponse)(ctx, responseData, headers);
+                }
+                else {
+                    (0, sendHttpResponse_1.sendHttpResponse)(ctx, responseData, headers, typeof status === 'string' ? status : String(status));
+                }
+            };
+            await spec.httpResponse(server.client, payload, result, send, ctx);
+            return;
+        }
+        (0, sendHttpResponse_1.sendHttpResponse)(ctx, result);
+    })
+        .catch((err) => {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
+            err,
+            route,
         });
     });
 };

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

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/http/function.ts"],"names":[],"mappings":";;;AAEA,6DAAyD;AACzD,uCAA4C;AAC5C,+CAA2C;AAC3C,+CAA2C;AAGpC,MAAM,YAAY,GAAqC,KAAK,EACjE,KAAyB,EACzB,MAAM,EACN,GAAG,EACH,OAAO,EACP,EAAE;IACF,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1C,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,OAAM;SACP;QACD,IAAI;aACD,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;aACrC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACrB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;gBAChB,OAAM;aACP;YAED,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,MAAM,IAAI,GAAqB,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC/D,IAAA,mCAAgB,EACd,GAAG,EACH,YAAY,EACZ,OAAO,EACP,MAAM,KAAK,SAAS;wBAClB,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ;4BAC1B,CAAC,CAAC,MAAM;4BACR,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;wBAClB,CAAC,CAAC,SAAS,CACd,CAAA;gBACH,CAAC,CAAA;gBACD,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;gBAClE,OAAM;aACP;YAED,IAAA,mCAAgB,EAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAC/B,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,aAAa,EAAE;gBACnD,GAAG;gBACH,KAAK;aACN,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AA3CY,QAAA,YAAY,gBA2CxB"}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/http/function.ts"],"names":[],"mappings":";;;AAEA,6DAAyD;AACzD,uCAA4C;AAC5C,+CAA2C;AAGpC,MAAM,YAAY,GAAqC,KAAK,EACjE,KAAyB,EACzB,IAAuB,EACvB,MAAM,EACN,GAAG,EACH,OAAO,EACP,EAAE;IACF,IAAI;SACD,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;SACrC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QACrB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QACD,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,MAAM,IAAI,GAAqB,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/D,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;oBAChB,OAAM;iBACP;gBACD,IAAI,CAAC,MAAM,EAAE;oBACX,IAAA,mCAAgB,EAAC,GAAG,EAAE,YAAY,EAAE,OAAO,CAAC,CAAA;iBAC7C;qBAAM;oBACL,IAAA,mCAAgB,EACd,GAAG,EACH,YAAY,EACZ,OAAO,EACP,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CACrD,CAAA;iBACF;YACH,CAAC,CAAA;YACD,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;YAClE,OAAM;SACP;QAED,IAAA,mCAAgB,EAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC/B,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,aAAa,EAAE;YACnD,GAAG;YACH,KAAK;SACN,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAzCY,QAAA,YAAY,gBAyCxB"}

package/dist/incoming/http/index.js

@@ -17,6 +17,7 @@ const ip_1 = require("../../ip");
 const auth_1 = require("../../auth");
 const authorize_1 = require("../../authorize");
 const sendHttpResponse_1 = require("../../sendHttpResponse");
+const publish_1 = require("./publish");
 let clientId = 0;
 const handleRequest = (server, method, ctx, route, ready) => {
     if (method === 'post') {
@@ -57,7 +58,20 @@ const httpHandler = (server, req, res) => {
             : { route: { name: '', path: url } });
         return;
     }
-    const authorization = req.getHeader('authorization');
+    let authState = {};
+    if (route.public !== true) {
+        const authorization = req.getHeader('authorization');
+        if (authorization) {
+            authState = (0, auth_1.parseAuthState)(authorization);
+        }
+        else {
+            // TODO: remove this when c++ client can encode
+            const authorization = req.getHeader('json-authorization');
+            if (authorization) {
+                authState = (0, auth_1.parseJSONAuthState)(authorization);
+            }
+        }
+    }
     const ctx = {
         session: {
             res,
@@ -66,7 +80,7 @@ const httpHandler = (server, req, res) => {
             ua: req.getHeader('user-agent'),
             ip,
             id: ++clientId,
-            authState: authorization ? (0, auth_1.parseAuthState)(authorization) : {},
+            authState,
             headers: {
                 'content-type': req.getHeader('content-type'),
                 'content-encoding': req.getHeader('content-encoding'),
@@ -78,12 +92,15 @@ const httpHandler = (server, req, res) => {
         for (const header of route.headers) {
             ctx.session.headers[header] = req.getHeader(header);
         }
+        ctx.session.res.writeHeader('Access-Control-Allow-Headers', route.headers.join(','));
+        ctx.session.res.writeHeader('Access-Control-Expose-Headers', '*');
+        ctx.session.res.writeHeader('Access-Control-Allow-Origin', '*');
+        ctx.session.corsSend = true;
     }
     if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.http)) {
         (0, security_1.endRateLimitHttp)(res);
         return;
     }
-    // double check impact
     const query = req.getQuery();
     if (query) {
         ctx.session.query = query;
@@ -95,7 +112,7 @@ const httpHandler = (server, req, res) => {
     }
     if (method === 'post' &&
         ctx.session.headers['content-length'] === undefined) {
-        // zero allowed, but not for streams
+        // Zero allowed, but not for streams
         (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.LengthRequired, route);
         return;
     }
@@ -108,7 +125,7 @@ const httpHandler = (server, req, res) => {
         }
     }
     if ((0, functions_1.isQueryFunctionRoute)(route)) {
-        // handle HEAD
+        // Handle HEAD
         if (method !== 'post' && method !== 'get') {
             (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
             return;
@@ -131,15 +148,24 @@ const httpHandler = (server, req, res) => {
             return;
         }
         if (ctx.session.headers['content-length'] === 0) {
-            // zero is also not allowed for streams
+            // Zero is also not allowed for streams
             (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.LengthRequired, route);
             return;
         }
         (0, streamFunction_1.httpStreamFunction)(server, ctx, route);
         return;
     }
+    if ((0, functions_1.isChannelFunctionRoute)(route)) {
+        if (method !== 'post' && method !== 'get') {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
+            return;
+        }
+        handleRequest(server, method, ctx, route, (payload) => {
+            (0, authorize_1.authorize)(route, server, ctx, payload, publish_1.httpPublish, undefined, undefined, route.publisher?.public || route.public);
+        });
+        return;
+    }
     if ((0, functions_1.isFunctionRoute)(route)) {
-        // handle HEAD
         if (method !== 'post' && method !== 'get') {
             (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
             return;