@based/server 5.0.3 → 6.0.0

package/dist/functions/index.js

@@ -15,11 +15,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasedFunctions = void 0;
-const types_1 = require("./types");
+const functions_1 = require("@based/functions");
 const utils_1 = require("@saulx/utils");
 const timeout_1 = require("./timeout");
-const observable_1 = require("../observable");
+const query_1 = require("../query");
 const channel_1 = require("../channel");
+const genVersion_1 = require("./genVersion");
 __exportStar(require("./types"), exports);
 class BasedFunctions {
     constructor(server, config) {
@@ -41,7 +42,7 @@ class BasedFunctions {
         }
     }
     updateConfig(fullConfig) {
-        const { routes, specs, ...config } = fullConfig;
+        const { routes, configs, ...config } = fullConfig;
         if (this.config) {
             (0, utils_1.deepMerge)(this.config, config);
         }
@@ -87,8 +88,8 @@ class BasedFunctions {
         if (routes) {
             this.addRoutes(routes);
         }
-        if (specs) {
-            this.addSpecs(specs);
+        if (configs) {
+            this.add(configs);
         }
         if (this.unregisterTimeout) {
             clearTimeout(this.unregisterTimeout);
@@ -110,7 +111,7 @@ class BasedFunctions {
         }
         return null;
     }
-    addSpecs(specs) {
+    add(specs) {
         for (const key in specs) {
             const s = this.completeSpec(specs[key], key);
             if (s === null) {
@@ -135,36 +136,28 @@ class BasedFunctions {
             console.error('cannot completeSpec', name, spec);
             return null;
         }
-        // if (!spec.function) {
-        // if channel
-        // channel publish
-        // }
-        // spec.function
+        if (!spec.version) {
+            // @ts-ignore added name allready
+            spec.version = (0, genVersion_1.genVersion)(spec);
+        }
         const nSpec = spec;
         return nSpec;
     }
     completeRoute(route, name) {
         const nRoute = route;
+        if (!nRoute.type) {
+            console.error('Type is required for based-routes', name);
+            return null;
+        }
         if (!nRoute.name) {
             if (!name) {
-                console.error('No route name!', route);
+                console.error('No based-route name', route);
                 return null;
             }
             nRoute.name = name;
         }
         if (!route.maxPayloadSize) {
-            if ((0, types_1.isChannelFunctionRoute)(nRoute)) {
-                route.maxPayloadSize = this.maxPayLoadSizeDefaults.channel;
-            }
-            else if ((0, types_1.isQueryFunctionRoute)(nRoute)) {
-                route.maxPayloadSize = this.maxPayLoadSizeDefaults.query;
-            }
-            else if ((0, types_1.isStreamFunctionRoute)(nRoute)) {
-                route.maxPayloadSize = this.maxPayLoadSizeDefaults.stream;
-            }
-            else {
-                route.maxPayloadSize = this.maxPayLoadSizeDefaults.function;
-            }
+            route.maxPayloadSize = this.maxPayLoadSizeDefaults[route.type];
         }
         if (nRoute.rateLimitTokens === undefined) {
             nRoute.rateLimitTokens = 1;
@@ -204,17 +197,17 @@ class BasedFunctions {
         if (spec.path) {
             this.paths[spec.path] = spec.name;
         }
-        const previousChecksum = this.specs[spec.name]?.checksum ?? -1;
+        const previousChecksum = this.specs[spec.name]?.version ?? -1;
         // @ts-ignore maxpayload and rlimit tokens added....
         this.specs[spec.name] = spec;
         if (this.specs[spec.name] && this.server.activeChannels[spec.name]) {
-            if (!(0, types_1.isChannelFunctionSpec)(spec)) {
+            if (!(0, functions_1.isBasedFunctionConfig)('channel', spec)) {
                 for (const [id] of this.server.activeChannels[spec.name]) {
                     (0, channel_1.destroyChannel)(this.server, id);
                 }
             }
             else {
-                if (previousChecksum !== spec.checksum) {
+                if (previousChecksum !== spec.version) {
                     for (const [id] of this.server.activeChannels[spec.name]) {
                         (0, channel_1.startChannel)(this.server, id, true);
                     }
@@ -223,15 +216,15 @@ class BasedFunctions {
         }
         else if (this.specs[spec.name] &&
             this.server.activeObservables[spec.name]) {
-            if (!(0, types_1.isQueryFunctionSpec)(spec)) {
+            if (!(0, functions_1.isBasedFunctionConfig)('query', spec)) {
                 for (const [id] of this.server.activeObservables[spec.name]) {
-                    (0, observable_1.destroyObs)(this.server, id);
+                    (0, query_1.destroyObs)(this.server, id);
                 }
             }
             else {
-                if (previousChecksum !== spec.checksum) {
+                if (previousChecksum !== spec.version) {
                     for (const [id] of this.server.activeObservables[spec.name]) {
-                        (0, observable_1.start)(this.server, id);
+                        (0, query_1.start)(this.server, id);
                     }
                 }
             }
@@ -243,10 +236,11 @@ class BasedFunctions {
             const q = [];
             for (const name in this.specs) {
                 const spec = this.specs[name];
-                if ((0, types_1.isQueryFunctionSpec)(spec) && this.server.activeObservables[name]) {
+                if ((0, functions_1.isBasedFunctionConfig)('query', spec) &&
+                    this.server.activeObservables[name]) {
                     (0, timeout_1.updateTimeoutCounter)(spec);
                 }
-                else if ((0, types_1.isChannelFunctionSpec)(spec) &&
+                else if ((0, functions_1.isBasedFunctionConfig)('channel', spec) &&
                     this.server.activeChannels[name]) {
                     (0, timeout_1.updateTimeoutCounter)(spec);
                 }
@@ -260,14 +254,14 @@ class BasedFunctions {
     }
     async update(name, checksum) {
         const prevSpec = this.specs[name];
-        if (prevSpec && prevSpec.checksum !== checksum) {
+        if (prevSpec && prevSpec.version !== checksum) {
             if (this.beingUninstalled[name]) {
                 delete this.beingUninstalled[name];
             }
             const spec = await this.installGaurdedFromConfig(name);
             await this.config.uninstall({
                 server: this.server,
-                function: prevSpec,
+                config: prevSpec,
                 name,
             });
             if (spec) {
@@ -279,7 +273,7 @@ class BasedFunctions {
         if (this.beingUninstalled[name]) {
             console.error('Allready being unregistered...', name);
         }
-        if (!spec && spec !== false) {
+        if (!spec && spec !== null) {
             spec = this.specs[name];
         }
         if (!spec) {
@@ -291,7 +285,7 @@ class BasedFunctions {
         }
         if (await this.config.uninstall({
             server: this.server,
-            function: spec,
+            config: spec,
             name,
         })) {
             if (this.beingUninstalled[name]) {
@@ -335,16 +329,16 @@ class BasedFunctions {
         if (!spec) {
             return false;
         }
-        if ((0, types_1.isQueryFunctionRoute)(spec)) {
+        if ((0, functions_1.isBasedFunctionConfig)('query', spec)) {
             const activeObs = this.server.activeObservables[name];
             if (activeObs) {
                 for (const [id] of activeObs) {
-                    (0, observable_1.destroyObs)(this.server, id);
+                    (0, query_1.destroyObs)(this.server, id);
                 }
                 delete this.server.activeObservables[name];
             }
         }
-        if ((0, types_1.isChannelFunctionSpec)(spec)) {
+        if ((0, functions_1.isBasedFunctionConfig)('channel', spec)) {
             const activeChannel = this.server.activeChannels[name];
             if (activeChannel) {
                 for (const [id] of activeChannel) {

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

@@ -1,3 +1,3 @@
-import type { BasedSpec } from './types';
-export declare const fnIsTimedOut: (spec: BasedSpec) => boolean;
-export declare const updateTimeoutCounter: (spec: BasedSpec) => void;
+import type { BasedFunctionConfigComplete } from '@based/functions';
+export declare const fnIsTimedOut: (spec: BasedFunctionConfigComplete) => boolean;
+export declare const updateTimeoutCounter: (spec: BasedFunctionConfigComplete) => void;

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,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"}
+{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/functions/timeout.ts"],"names":[],"mappings":";;;AAEO,MAAM,YAAY,GAAG,CAAC,IAAiC,EAAW,EAAE;IACzE,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,IAAiC,EAAE,EAAE;IACxE,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,4 +1,4 @@
-import { BasedQueryFunction, BasedFunction, BasedChannelFunction, HttpResponse, UninstallFunction, BasedStreamFunction, BasedChannelPublishFunction, Authorize } from '@based/functions';
+import { BasedFunctionConfig, BasedRoutes, BasedRouteComplete, BasedFunctionConfigs, BasedFunctionConfigComplete } from '@based/functions';
 import { BasedServer } from '../server';
 export type FunctionConfig = {
     /** Default number to close channels & queries when no subscribers are active in ms */
@@ -19,145 +19,17 @@ export type FunctionConfig = {
         server: BasedServer;
         name?: string;
         path?: string;
-    }) => null | (BasedFunctionRoute & {
-        maxPayloadSize: number;
-        rateLimitTokens: number;
-    });
+    }) => null | BasedRouteComplete;
     install?: (opts: {
         server: BasedServer;
         name: string;
-        function?: BasedSpec;
-    }) => Promise<null | BasedSpec>;
+        config?: BasedFunctionConfig | BasedFunctionConfigComplete;
+    }) => Promise<null | BasedFunctionConfigComplete>;
     uninstall?: (opts: {
         server: BasedServer;
         name: string;
-        function: BasedSpec;
+        config: BasedFunctionConfig | BasedFunctionConfigComplete;
     }) => Promise<boolean>;
-    specs?: BasedSpecs;
+    configs?: BasedFunctionConfigs;
     routes?: BasedRoutes;
 };
-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 = ({
-    relay?: false;
-    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;
-} | {
-    relay: string;
-    function?: BasedQueryFunction;
-    closeAfterIdleTime?: number;
-    httpResponse?: HttpResponse;
-}) & BasedQueryFunctionRoute & BasedInstallableFunctionSpec;
-export type BasedStreamFunctionSpec = {
-    function: BasedStreamFunction;
-    /** Maximum allowed execution time, in ms */
-    maxExecTime?: number;
-} & BasedStreamFunctionRoute & BasedInstallableFunctionSpec;
-export type BasedFunctionSpec = ({
-    relay: string;
-    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;
-} | {
-    relay?: false;
-    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 = ({
-    relay?: false;
-    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;
-} | {
-    relay: string;
-    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: 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 type BasedRoutes = {
-    [name: string]: Partial<BasedRoute & {
-        maxPayloadSize?: number;
-        rateLimitTokens?: number;
-    }>;
-};
-export type BasedSpecs = {
-    [name: string]: Partial<BasedSpec & {
-        maxPayloadSize?: number;
-        rateLimitTokens?: number;
-    }>;
-};
-export {};

package/dist/functions/types.js

@@ -1,54 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
-}
-exports.isQueryFunctionSpec = isQueryFunctionSpec;
-function isStreamFunctionSpec(fn) {
-    return fn.stream === true;
-}
-exports.isStreamFunctionSpec = isStreamFunctionSpec;
-function isFunctionSpec(fn) {
-    return !('stream' in fn) && !('query' in fn);
-}
-exports.isFunctionSpec = isFunctionSpec;
-function isSpec(fn) {
-    return (fn &&
-        typeof fn === 'object' &&
-        (isFunctionSpec(fn) ||
-            isStreamFunctionSpec(fn) ||
-            isQueryFunctionSpec(fn) ||
-            isChannelFunctionSpec(fn)));
-}
-exports.isSpec = isSpec;
-// ---------- routes -------------
-function isQueryFunctionRoute(fn) {
-    return fn.query === true;
-}
-exports.isQueryFunctionRoute = isQueryFunctionRoute;
-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) && !('channel' in fn);
-}
-exports.isFunctionRoute = isFunctionRoute;
-function isRoute(route) {
-    if (route && typeof route === 'object' && 'name' in route) {
-        return true;
-    }
-    return false;
-}
-exports.isRoute = isRoute;
 //# sourceMappingURL=types.js.map

package/dist/functions/types.js.map

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

package/dist/incoming/http/function.js

@@ -6,7 +6,7 @@ const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
 const httpFunction = async (route, spec, server, ctx, payload) => {
     spec
-        .function(server.client, payload, ctx)
+        .fn(server.client, payload, ctx)
         .then(async (result) => {
         if (!ctx.session) {
             return;

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;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"}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/http/function.ts"],"names":[],"mappings":";;;AAMA,6DAAyD;AACzD,uCAA4C;AAC5C,+CAA2C;AAGpC,MAAM,YAAY,GAAqC,KAAK,EACjE,KAA6B,EAC7B,IAAqC,EACrC,MAAM,EACN,GAAG,EACH,OAAO,EACP,EAAE;IACF,IAAI;SACD,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;SAC/B,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

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpHandler = void 0;
+const functions_1 = require("@based/functions");
 const function_1 = require("./function");
 const streamFunction_1 = require("./streamFunction");
-const functions_1 = require("../../functions");
 const query_1 = require("./query");
 const readBody_1 = require("./readBody");
 const error_1 = require("../../error");
@@ -54,8 +54,8 @@ const httpHandler = (server, req, res) => {
                 req,
             },
         }, error_1.BasedErrorCode.FunctionNotFound, path[1]
-            ? { route: { name: path[1] } }
-            : { route: { name: '', path: url } });
+            ? { route: { name: path[1], type: 'function' } }
+            : { route: { name: '', path: url, type: 'function' } });
         return;
     }
     let authState = {};
@@ -124,7 +124,7 @@ const httpHandler = (server, req, res) => {
             }
         }
     }
-    if ((0, functions_1.isQueryFunctionRoute)(route)) {
+    if ((0, functions_1.isBasedRoute)('query', route)) {
         // Handle HEAD
         if (method !== 'post' && method !== 'get') {
             (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
@@ -138,7 +138,7 @@ const httpHandler = (server, req, res) => {
         });
         return;
     }
-    if ((0, functions_1.isStreamFunctionRoute)(route)) {
+    if ((0, functions_1.isBasedRoute)('stream', route)) {
         if (method === 'options') {
             (0, sendHttpResponse_1.end)(ctx);
             return;
@@ -155,17 +155,17 @@ const httpHandler = (server, req, res) => {
         (0, streamFunction_1.httpStreamFunction)(server, ctx, route);
         return;
     }
-    if ((0, functions_1.isChannelFunctionRoute)(route)) {
+    if ((0, functions_1.isBasedRoute)('channel', 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);
+            (0, authorize_1.authorize)(route, server, ctx, payload, publish_1.httpPublish, undefined, undefined, route.publicPublisher || route.public);
         });
         return;
     }
-    if ((0, functions_1.isFunctionRoute)(route)) {
+    if ((0, functions_1.isBasedRoute)('function', route)) {
         if (method !== 'post' && method !== 'get') {
             (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
             return;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/http/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/http/index.ts"],"names":[],"mappings":";;;;;;AAEA,gDAMyB;AACzB,yCAAyC;AACzC,qDAAqD;AACrD,mCAAiC;AACjC,yCAAqC;AACrC,uCAA4C;AAC5C,+CAA2C;AAC3C,6CAIuB;AACvB,8DAAqC;AACrC,iCAAgC;AAChC,qCAA+D;AAC/D,+CAA2C;AAC3C,6DAA4C;AAC5C,uCAAuC;AAEvC,IAAI,QAAQ,GAAG,CAAC,CAAA;AAEhB,MAAM,aAAa,GAAG,CACpB,MAAmB,EACnB,MAAc,EACd,GAAyB,EACzB,KAAiB,EACjB,KAA8B,EAC9B,EAAE;IACF,IAAI,MAAM,KAAK,MAAM,EAAE;QACrB,IAAA,mBAAQ,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;KACpC;SAAM;QACL,KAAK,CAAC,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC,CAAA;KACvB;AACH,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;QACtB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;QACtB,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IACpB,CAAC,CAAC,CAAA;IAEF,MAAM,EAAE,GAAG,IAAA,UAAK,EAAC,GAAG,CAAC,CAAA;IAErB,IAAI,IAAA,+BAAoB,EAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE;QACxE,OAAM;KACP;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAA;IAC9B,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAA;IACxB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAElD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,EAAE;QACjD,IAAA,qBAAS,EACP,MAAM,EACN;YACE,OAAO,EAAE;gBACP,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC;gBAC/B,EAAE;gBACF,MAAM;gBACN,EAAE,EAAE,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,SAAS,EAAE,EAAE;gBACb,GAAG;gBACH,GAAG;aACJ;SACF,EACD,sBAAc,CAAC,gBAAgB,EAC/B,IAAI,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;YAChD,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,CACzD,CAAA;QACD,OAAM;KACP;IAED,IAAI,SAAS,GAAc,EAAE,CAAA;IAE7B,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE;QACzB,MAAM,aAAa,GAAW,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;QAC5D,IAAI,aAAa,EAAE;YACjB,SAAS,GAAG,IAAA,qBAAc,EAAC,aAAa,CAAC,CAAA;SAC1C;aAAM;YACL,+CAA+C;YAC/C,MAAM,aAAa,GAAW,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;YACjE,IAAI,aAAa,EAAE;gBACjB,SAAS,GAAG,IAAA,yBAAkB,EAAC,aAAa,CAAC,CAAA;aAC9C;SACF;KACF;IAED,MAAM,GAAG,GAAyB;QAChC,OAAO,EAAE;YACP,GAAG;YACH,GAAG;YACH,MAAM;YACN,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC;YAC/B,EAAE;YACF,EAAE,EAAE,EAAE,QAAQ;YACd,SAAS;YACT,OAAO,EAAE;gBACP,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC;gBAC7C,kBAAkB,EAAE,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC;gBACrD,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC;aAC3C;SACF;KACF,CAAA;IAED,IAAI,KAAK,CAAC,OAAO,EAAE;QACjB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;YAClC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;SACpD;QACD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CACzB,8BAA8B,EAC9B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CACxB,CAAA;QACD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;QACjE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;QAC/D,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;KAC5B;IAED,IACE,IAAA,2BAAgB,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAC3E;QACA,IAAA,2BAAgB,EAAC,GAAG,CAAC,CAAA;QACrB,OAAM;KACP;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA;IAC5B,IAAI,KAAK,EAAE;QACT,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;KAC1B;IAED,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IAC3C,MAAM,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAClD,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;QACtD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,YAAY,CAAA;KACrD;IAED,IACE,MAAM,KAAK,MAAM;QACjB,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,SAAS,EACnD;QACA,oCAAoC;QACpC,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QAC5D,OAAM;KACP;IAED,IAAI,KAAK,CAAC,OAAO,EAAE;QACjB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;YAClC,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YAC/B,IAAI,CAAC,EAAE;gBACL,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;aAChC;SACF;KACF;IAED,IAAI,IAAA,wBAAY,EAAC,OAAO,EAAE,KAAK,CAAC,EAAE;QAChC,cAAc;QACd,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,KAAK,EAAE;YACzC,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;YAC9D,OAAM;SACP;QACD,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;QAClD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;YACpD,IAAA,eAAO,EAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;QACF,OAAM;KACP;IAED,IAAI,IAAA,wBAAY,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;QACjC,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,IAAA,sBAAG,EAAC,GAAG,CAAC,CAAA;YACR,OAAM;SACP;QACD,IAAI,MAAM,KAAK,MAAM,EAAE;YACrB,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;YAC9D,OAAM;SACP;QACD,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YAC/C,uCAAuC;YACvC,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;YAC5D,OAAM;SACP;QACD,IAAA,mCAAkB,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QACtC,OAAM;KACP;IAED,IAAI,IAAA,wBAAY,EAAC,SAAS,EAAE,KAAK,CAAC,EAAE;QAClC,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,KAAK,EAAE;YACzC,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;YAC9D,OAAM;SACP;QACD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;YACpD,IAAA,qBAAS,EACP,KAAK,EACL,MAAM,EACN,GAAG,EACH,OAAO,EACP,qBAAW,EACX,SAAS,EACT,SAAS,EACT,KAAK,CAAC,eAAe,IAAI,KAAK,CAAC,MAAM,CACtC,CAAA;QACH,CAAC,CAAC,CAAA;QACF,OAAM;KACP;IAED,IAAI,IAAA,wBAAY,EAAC,UAAU,EAAE,KAAK,CAAC,EAAE;QACnC,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,KAAK,EAAE;YACzC,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;YAC9D,OAAM;SACP;QACD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;YACpD,IAAA,qBAAS,EAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,uBAAY,CAAC,CAAA;QACtD,CAAC,CAAC,CAAA;KACH;AACH,CAAC,CAAA;AA5LY,QAAA,WAAW,eA4LvB"}

package/dist/incoming/http/publish.js

@@ -5,7 +5,7 @@ const sendHttpResponse_1 = require("../../sendHttpResponse");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
 const installFn_1 = require("../../installFn");
-const observable_1 = require("../../observable");
+const query_1 = require("../../query");
 const channel_1 = require("../../channel");
 const httpPublish = async (route, spec, server, ctx, payload) => {
     // parse channel payload / msg
@@ -43,7 +43,7 @@ const httpPublish = async (route, spec, server, ctx, payload) => {
         }
     }
     const name = route.name;
-    const id = (0, observable_1.genObservableId)(name, channelPayload);
+    const id = (0, query_1.genObservableId)(name, channelPayload);
     (0, installFn_1.installFn)(server, ctx, route).then(async (spec) => {
         if (spec === null) {
             return;
@@ -56,7 +56,7 @@ const httpPublish = async (route, spec, server, ctx, payload) => {
             (0, channel_1.extendChannel)(server, server.activeChannelsById.get(id));
         }
         try {
-            spec.publish(server.client, channelPayload, msg, id, ctx);
+            spec.publisher(server.client, channelPayload, msg, id, ctx);
             if (spec.httpResponse) {
                 const send = (responseData, headers, status) => {
                     (0, sendHttpResponse_1.sendHttpResponse)(ctx, responseData, headers, status !== undefined

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

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

package/dist/incoming/http/query.d.ts

@@ -1,4 +1,3 @@
 import { BasedServer } from '../../server';
-import { HttpSession, Context } from '@based/functions';
-import { BasedQueryFunctionRoute } from '../../functions';
-export declare const httpGet: (route: BasedQueryFunctionRoute, payload: any, ctx: Context<HttpSession>, server: BasedServer, checksum: number) => void;
+import { HttpSession, Context, BasedRoute } from '@based/functions';
+export declare const httpGet: (route: BasedRoute<'query'>, payload: any, ctx: Context<HttpSession>, server: BasedServer, checksum: number) => void;