@based/server 4.0.1 → 4.0.2

package/dist/functions/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { BasedServer } from '../server';
-import { BasedFunctionRoute, BasedFunctionSpec, BasedObservableFunctionSpec, FunctionConfig } from './types';
+import { BasedRoute, BasedSpec, FunctionConfig } from './types';
 export * from './types';
 export declare class BasedFunctions {
     server: BasedServer;
@@ -10,11 +10,19 @@ export declare class BasedFunctions {
     installsInProgress: {
         [name: string]: Promise<any>;
     };
+    maxPayLoadSizeDefaults: {
+        stream: number;
+        query: number;
+        function: number;
+    };
     paths: {
         [path: string]: string;
     };
     specs: {
-        [name: string]: BasedFunctionSpec | BasedObservableFunctionSpec;
+        [name: string]: BasedSpec & {
+            maxPayloadSize: number;
+            rateLimitTokens: number;
+        };
     };
     beingUninstalled: {
         [name: string]: boolean;
@@ -22,13 +30,13 @@ export declare class BasedFunctions {
     constructor(server: BasedServer, config?: FunctionConfig);
     uninstallLoop(): void;
     updateConfig(config: FunctionConfig): void;
-    updateFunction(spec: BasedObservableFunctionSpec | BasedFunctionSpec): Promise<void>;
+    updateFunction(spec: BasedSpec): Promise<void>;
     private installGaurdedFromConfig;
-    install(name: string): Promise<BasedObservableFunctionSpec | BasedFunctionSpec | false>;
+    install(name: string): Promise<BasedSpec | null>;
     getNameFromPath(path: string): string;
-    route(name?: string, path?: string): BasedFunctionRoute | false;
-    getFromStore(name: string): BasedObservableFunctionSpec | BasedFunctionSpec | false;
-    update(spec: BasedObservableFunctionSpec | BasedFunctionSpec): boolean;
+    route(name?: string, path?: string): BasedRoute | null;
+    getFromStore(name: string): BasedSpec | null;
+    update(spec: BasedSpec): boolean;
     remove(name: string): boolean;
-    uninstall(name: string, spec?: BasedObservableFunctionSpec | BasedFunctionSpec | false): Promise<boolean>;
+    uninstall(name: string, spec?: BasedSpec | false): Promise<boolean>;
 }

package/dist/functions/index.js

@@ -24,6 +24,11 @@ class BasedFunctions {
     constructor(server, config) {
         this.reqId = 0;
         this.installsInProgress = {};
+        this.maxPayLoadSizeDefaults = {
+            stream: 5e6,
+            query: 2500,
+            function: 20e3,
+        };
         this.paths = {};
         this.specs = {};
         this.beingUninstalled = {};
@@ -37,7 +42,7 @@ class BasedFunctions {
             const q = [];
             for (const name in this.specs) {
                 const spec = this.specs[name];
-                if (spec.observable && this.server.activeObservables[name]) {
+                if ((0, types_1.isQueryFunctionSpec)(spec) && this.server.activeObservables[name]) {
                     (0, timeout_1.updateTimeoutCounter)(spec);
                 }
                 else if ((0, timeout_1.fnIsTimedOut)(spec)) {
@@ -90,6 +95,9 @@ class BasedFunctions {
                 this.update(spec);
             }
         }
+        else {
+            this.update(spec);
+        }
     }
     async installGaurdedFromConfig(name) {
         if (this.installsInProgress[name]) {
@@ -113,7 +121,7 @@ class BasedFunctions {
             this.update(spec);
             return this.getFromStore(name);
         }
-        return false;
+        return null;
     }
     getNameFromPath(path) {
         return this.paths[path];
@@ -130,12 +138,16 @@ class BasedFunctions {
             (0, timeout_1.updateTimeoutCounter)(spec);
             return spec;
         }
-        return false;
+        return null;
     }
     update(spec) {
         if (!spec) {
             return false;
         }
+        // Case when functions are installed exactly at the same time
+        if ((0, utils_1.deepEqual)(spec, this.specs[spec.name])) {
+            return false;
+        }
         if (!spec.idleTimeout) {
             spec.idleTimeout = this.config.idleTimeout;
         }
@@ -146,28 +158,45 @@ class BasedFunctions {
         if (spec.path) {
             this.paths[spec.path] = spec.name;
         }
+        if (!spec.maxPayloadSize) {
+            if ((0, types_1.isQueryFunctionSpec)(spec)) {
+                spec.maxPayloadSize = this.maxPayLoadSizeDefaults.query;
+            }
+            else if ((0, types_1.isStreamFunctionSpec)(spec)) {
+                spec.maxPayloadSize = this.maxPayLoadSizeDefaults.stream;
+            }
+            else {
+                spec.maxPayloadSize = this.maxPayLoadSizeDefaults.function;
+            }
+        }
+        if (!spec.rateLimitTokens) {
+            spec.rateLimitTokens = 1;
+        }
+        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 (!(0, types_1.isObservableFunctionSpec)(spec)) {
+            if (!(0, types_1.isQueryFunctionSpec)(spec)) {
                 for (const [id] of this.server.activeObservables[spec.name]) {
                     (0, observable_1.destroyObs)(this.server, id);
                 }
             }
             else {
-                for (const [id] of this.server.activeObservables[spec.name]) {
-                    (0, observable_1.start)(this.server, id);
+                if (previousChecksum !== spec.checksum) {
+                    for (const [id] of this.server.activeObservables[spec.name]) {
+                        (0, observable_1.start)(this.server, id);
+                    }
                 }
             }
         }
-        this.specs[spec.name] = spec;
-        return false;
+        return true;
     }
     remove(name) {
-        // Does not call unregister!
         const spec = this.specs[name];
         if (!spec) {
             return false;
         }
-        if ((0, types_1.isObservableFunctionSpec)(spec)) {
+        if ((0, types_1.isQueryFunctionRoute)(spec)) {
             const activeObs = this.server.activeObservables[name];
             if (activeObs) {
                 for (const [id] of activeObs) {

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 { BasedFunctionSpec, BasedObservableFunctionSpec } from './types';
-export declare const fnIsTimedOut: (spec: BasedObservableFunctionSpec | BasedFunctionSpec) => boolean;
-export declare const updateTimeoutCounter: (spec: BasedObservableFunctionSpec | BasedFunctionSpec) => void;
+import type { BasedSpec } from './types';
+export declare const fnIsTimedOut: (spec: BasedSpec) => boolean;
+export declare const updateTimeoutCounter: (spec: BasedSpec) => 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,CAC1B,IAAqD,EAC5C,EAAE;IACX,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;AAZY,QAAA,YAAY,gBAYxB;AAEM,MAAM,oBAAoB,GAAG,CAClC,IAAqD,EACrD,EAAE;IACF,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;AAPY,QAAA,oBAAoB,wBAOhC"}
+{"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"}

package/dist/functions/types.d.ts

@@ -1,67 +1,81 @@
-import { Context, HttpSession } from '../context';
-import { ObservableUpdateFunction } from '../observable';
+import { BasedQueryFunction, BasedFunction, CustomHttpResponse, BasedStreamFunction } from '@based/functions';
 import { BasedServer } from '../server';
-export declare type CustomHttpResponse = (result: any, payload: any, client: Context<HttpSession>) => Promise<boolean>;
-export declare type BasedFunctionRoute = {
+declare type Route = {
     name: string;
-    observable?: boolean;
-    headers?: string[];
     path?: string;
-    stream?: boolean;
     maxPayloadSize?: number;
     rateLimitTokens?: number;
     public?: boolean;
+    headers?: string[];
+    internalOnly?: boolean;
 };
-export declare type BasedObservableFunction = (payload: any, update: ObservableUpdateFunction) => Promise<() => void>;
-export declare type BasedObservableFunctionSpec = BasedFunctionRoute & {
-    name: string;
-    checksum: number;
-    observable: true;
-    function: BasedObservableFunction;
+export declare type BasedFunctionRoute = Route;
+export declare type BasedQueryFunctionRoute = Route & {
+    query: true;
+};
+export declare type BasedStreamFunctionRoute = Route & {
+    stream: true;
+};
+export declare type BasedQueryFunctionSpec = {
     customHttpResponse?: CustomHttpResponse;
+    checksum: number;
+    function: BasedQueryFunction;
     memCacheTimeout?: number;
     idleTimeout?: number;
     timeoutCounter?: number;
-};
-export declare type BasedFunction = (payload: any, client: Context) => Promise<any>;
-export declare type BasedFunctionSpec = BasedFunctionRoute & {
-    name: string;
-    observable?: false;
+} & BasedQueryFunctionRoute;
+export declare type BasedStreamFunctionSpec = {
+    checksum: number;
+    function: BasedStreamFunction;
+    maxExecTime?: number;
+    idleTimeout?: number;
+    timeoutCounter?: number;
+} & BasedStreamFunctionRoute;
+export declare type BasedFunctionSpec = {
     customHttpResponse?: CustomHttpResponse;
     checksum: number;
     function: BasedFunction;
     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;
+    maxPayLoadSizeDefaults?: {
+        stream: number;
+        query: number;
+        function: number;
+    };
     route: (opts: {
         server: BasedServer;
         name?: string;
         path?: string;
-    }) => false | (BasedFunctionRoute & {
+    }) => null | (BasedFunctionRoute & {
         maxPayloadSize: number;
         rateLimitTokens: number;
     });
     install: (opts: {
         server: BasedServer;
         name: string;
-        function?: BasedFunctionSpec | BasedObservableFunctionSpec;
-    }) => Promise<false | BasedObservableFunctionSpec | BasedFunctionSpec>;
+        function?: BasedFunctionSpec | BasedQueryFunctionSpec;
+    }) => Promise<null | BasedQueryFunctionSpec | BasedStreamFunctionSpec | BasedFunctionSpec>;
     uninstall: (opts: {
         server: BasedServer;
         name: string;
-        function: BasedObservableFunctionSpec | BasedFunctionSpec;
+        function: BasedQueryFunctionSpec | BasedStreamFunctionSpec | BasedFunctionSpec;
     }) => Promise<boolean>;
 };
-export declare enum FunctionType {
-    authorize = 0,
-    observe = 1,
-    function = 2,
-    streamFunction = 3
-}
-export declare function isObservableFunctionSpec(fn: BasedObservableFunctionSpec | BasedFunctionSpec): fn is BasedObservableFunctionSpec;
+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;
+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 isRoute(route: any): route is BasedRoute;
+export {};

package/dist/functions/types.js

@@ -1,15 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObservableFunctionSpec = exports.FunctionType = void 0;
-var FunctionType;
-(function (FunctionType) {
-    FunctionType[FunctionType["authorize"] = 0] = "authorize";
-    FunctionType[FunctionType["observe"] = 1] = "observe";
-    FunctionType[FunctionType["function"] = 2] = "function";
-    FunctionType[FunctionType["streamFunction"] = 3] = "streamFunction";
-})(FunctionType = exports.FunctionType || (exports.FunctionType = {}));
-function isObservableFunctionSpec(fn) {
-    return fn.observable;
-}
-exports.isObservableFunctionSpec = isObservableFunctionSpec;
+exports.isRoute = exports.isFunctionRoute = exports.isStreamFunctionRoute = exports.isQueryFunctionRoute = exports.isSpec = exports.isFunctionSpec = exports.isStreamFunctionSpec = exports.isQueryFunctionSpec = void 0;
+// specs
+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)));
+}
+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 isFunctionRoute(fn) {
+    return !('stream' in fn) && !('query' 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":";;;AA2EA,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,yDAAS,CAAA;IACT,qDAAO,CAAA;IACP,uDAAQ,CAAA;IACR,mEAAc,CAAA;AAChB,CAAC,EALW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAKvB;AAED,SAAgB,wBAAwB,CACtC,EAAmD;IAEnD,OAAQ,EAAkC,CAAC,UAAU,CAAA;AACvD,CAAC;AAJD,4DAIC"}
+{"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"}

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

@@ -1,4 +1,4 @@
 import { BasedServer } from '../../server';
 import { BasedFunctionRoute } from '../../functions';
-import { HttpSession, Context } from '../../context';
-export declare const authorizeRequest: (server: BasedServer, ctx: Context<HttpSession>, payload: any, route: BasedFunctionRoute, authorized: (payload: any) => void, notAuth?: () => void) => void;
+import { HttpSession, Context } from '@based/functions';
+export declare const authorizeRequest: <P = any>(server: BasedServer, ctx: Context<HttpSession>, payload: P, route: BasedFunctionRoute, authorized: (payload: P) => void, notAuth?: (payload: P) => void) => void;

package/dist/incoming/http/authorize.js

@@ -9,14 +9,14 @@ const authorizeRequest = (server, ctx, payload, route, authorized, notAuth = ()
         return;
     }
     server.auth
-        .authorize(ctx, route.name, payload)
+        .authorize(server.client, ctx, route.name, payload)
         .then((ok) => {
         if (!ctx.session) {
-            notAuth();
+            notAuth(payload);
             return;
         }
         if (!ok) {
-            notAuth();
+            notAuth(payload);
             (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.AuthorizeRejectedError, {
                 route,
             });
@@ -26,7 +26,7 @@ const authorizeRequest = (server, ctx, payload, route, authorized, notAuth = ()
         }
     })
         .catch((err) => {
-        notAuth();
+        notAuth(payload);
         (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.AuthorizeFunctionError, {
             route,
             err,

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

@@ -1 +1 @@
-{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../src/incoming/http/authorize.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAC3C,uCAA4C;AAGrC,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,GAAyB,EACzB,OAAY,EACZ,KAAyB,EACzB,UAAkC,EAClC,UAAsB,GAAG,EAAE,CAAC,SAAS,EACrC,EAAE;IACF,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE;QACzB,UAAU,CAAC,OAAO,CAAC,CAAA;QACnB,OAAM;KACP;IAED,MAAM,CAAC,IAAI;SACR,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QACX,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAO,EAAE,CAAA;YACT,OAAM;SACP;QACD,IAAI,CAAC,EAAE,EAAE;YACP,OAAO,EAAE,CAAA;YACT,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,sBAAsB,EAAE;gBAC5D,KAAK;aACN,CAAC,CAAA;SACH;aAAM;YACL,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,EAAE,CAAA;QACT,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,sBAAsB,EAAE;YAC5D,KAAK;YACL,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AApCY,QAAA,gBAAgB,oBAoC5B"}
+{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../src/incoming/http/authorize.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAC3C,uCAA4C;AAGrC,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,GAAyB,EACzB,OAAU,EACV,KAAyB,EACzB,UAAgC,EAChC,UAAgC,GAAG,EAAE,CAAC,SAAS,EAC/C,EAAE;IACF,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE;QACzB,UAAU,CAAC,OAAO,CAAC,CAAA;QACnB,OAAM;KACP;IACD,MAAM,CAAC,IAAI;SACR,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC;SAClD,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QACX,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAO,CAAC,OAAO,CAAC,CAAA;YAChB,OAAM;SACP;QACD,IAAI,CAAC,EAAE,EAAE;YACP,OAAO,CAAC,OAAO,CAAC,CAAA;YAChB,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,sBAAsB,EAAE;gBAC5D,KAAK;aACN,CAAC,CAAA;SACH;aAAM;YACL,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,CAAC,OAAO,CAAC,CAAA;QAChB,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,sBAAsB,EAAE;YAC5D,KAAK;YACL,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAnCY,QAAA,gBAAgB,oBAmC5B"}

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

@@ -1,4 +1,3 @@
-import { BasedServer } from '../../server';
-import { BasedFunctionRoute } from '../../functions';
-import { HttpSession, Context } from '../../context';
-export declare const httpFunction: (route: BasedFunctionRoute, ctx: Context<HttpSession>, server: BasedServer, payload?: Uint8Array) => void;
+import { HttpSession } from '@based/functions';
+import { IsAuthorizedHandler } from '../../authorize';
+export declare const httpFunction: IsAuthorizedHandler<HttpSession>;

package/dist/incoming/http/function.js

@@ -1,47 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpFunction = void 0;
-const functions_1 = require("../../functions");
 const sendHttpResponse_1 = require("../../sendHttpResponse");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
-const httpFunction = (route, ctx, server, payload) => {
-    if (!ctx.session) {
-        return;
-    }
-    const name = route.name;
-    server.functions
-        .install(name)
-        .then((spec) => {
-        if (!ctx.session) {
+const installFn_1 = require("../../installFn");
+const httpFunction = async (route, server, ctx, payload) => {
+    (0, installFn_1.installFn)(server, ctx, route).then((spec) => {
+        if (spec === null) {
             return;
         }
-        if (spec && !(0, functions_1.isObservableFunctionSpec)(spec)) {
-            spec
-                .function(payload, ctx)
-                .then(async (result) => {
-                if (!ctx.session) {
-                    return;
-                }
-                if (spec.customHttpResponse) {
-                    if (await spec.customHttpResponse(result, payload, ctx)) {
-                        return;
-                    }
-                    (0, sendHttpResponse_1.sendHttpResponse)(ctx, result);
-                }
-                else {
-                    (0, sendHttpResponse_1.sendHttpResponse)(ctx, result);
-                }
-            })
-                .catch((err) => {
-                (0, sendError_1.sendError)(server, ctx, err.code, {
-                    err,
-                    route,
-                });
+        spec
+            .function(server.client, payload, ctx)
+            .then(async (result) => {
+            if (!ctx.session) {
+                return;
+            }
+            if (
+            /* change signature
+              add (based, result, payload, ctx)
+              based.send(ctx, {
+                headers: {},
+                payload
+              }) ?
+            */
+            spec.customHttpResponse &&
+                (await spec.customHttpResponse(result, payload, ctx, sendHttpResponse_1.sendHttpResponse))) {
+                // return
+            }
+            // sendHttpResponse(ctx, result)
+        })
+            .catch((err) => {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
+                err,
+                route,
             });
-        }
-    })
-        .catch(() => (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route));
+        });
+    });
 };
 exports.httpFunction = httpFunction;
 //# sourceMappingURL=function.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/http/function.ts"],"names":[],"mappings":";;;AACA,+CAA8E;AAE9E,6DAAyD;AACzD,uCAA4C;AAC5C,+CAA2C;AAEpC,MAAM,YAAY,GAAG,CAC1B,KAAyB,EACzB,GAAyB,EACzB,MAAmB,EACnB,OAAoB,EACd,EAAE;IACR,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;IAEvB,MAAM,CAAC,SAAS;SACb,OAAO,CAAC,IAAI,CAAC;SACb,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACb,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QACD,IAAI,IAAI,IAAI,CAAC,IAAA,oCAAwB,EAAC,IAAI,CAAC,EAAE;YAC3C,IAAI;iBACD,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;iBACtB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACrB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;oBAChB,OAAM;iBACP;gBACD,IAAI,IAAI,CAAC,kBAAkB,EAAE;oBAC3B,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE;wBACvD,OAAM;qBACP;oBACD,IAAA,mCAAgB,EAAC,GAAG,EAAE,MAAM,CAAC,CAAA;iBAC9B;qBAAM;oBACL,IAAA,mCAAgB,EAAC,GAAG,EAAE,MAAM,CAAC,CAAA;iBAC9B;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE;oBAC/B,GAAG;oBACH,KAAK;iBACN,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;SACL;IACH,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAA;AAChF,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;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;YACD;YACE;;;;;;cAME;YACF,IAAI,CAAC,kBAAkB;gBACvB,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAC5B,MAAM,EACN,OAAO,EACP,GAAG,EACH,mCAAgB,CACjB,CAAC,EACF;gBACA,SAAS;aACV;YACD,gCAAgC;QAClC,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"}

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

@@ -1,4 +1,4 @@
 import { BasedServer } from '../../server';
-import { HttpSession, Context } from '../../context';
-import { BasedFunctionRoute } from '../../functions';
-export declare const httpGet: (route: BasedFunctionRoute, payload: any, ctx: Context<HttpSession>, server: BasedServer, checksum: number) => void;
+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;