@based/server 10.1.1 → 10.2.0

package/dist/authorize.d.ts

@@ -1,8 +1,6 @@
-import { BasedServer } from './server.js';
-import { HttpSession, Context, WebSocketSession, BasedRoute, BasedFunctionConfig } from '@based/functions';
-type ClientSession = HttpSession | WebSocketSession;
-export type IsAuthorizedHandler<S extends ClientSession = ClientSession, R extends BasedRoute = BasedRoute, P = any> = (route: R, spec: BasedFunctionConfig<R['type']>, server: BasedServer, ctx: Context<S>, payload: P, id?: number, checksum?: number) => void;
-export type AuthErrorHandler<S extends ClientSession = ClientSession, R extends BasedRoute = BasedRoute, P = any> = (route: R, server: BasedServer, ctx: Context<S>, payload: P, id?: number, checksum?: number, err?: Error) => true | void;
-export declare const defaultAuthError: AuthErrorHandler;
-export declare const authorize: <S extends ClientSession = ClientSession, R extends BasedRoute = BasedRoute, P = any>(route: R, server: BasedServer, ctx: Context<S>, payload: P, isAuthorized: IsAuthorizedHandler<S, R, P>, id?: number, checksum?: number, isPublic?: boolean, authError?: AuthErrorHandler<S, R, P>) => void;
-export {};
+import { BasedFunctionConfig, BasedRoute } from '@based/functions';
+import { ClientSession, FunctionErrorHandler, FunctionProps } from './types.js';
+export declare const defaultAuthError: FunctionErrorHandler<ClientSession>;
+export declare const authorize: <S extends ClientSession = ClientSession, R extends BasedRoute = BasedRoute, P = any>(props: FunctionProps<S, R, P>, publicHandler?: boolean) => Promise<FunctionProps<S, R, P> & {
+    spec: BasedFunctionConfig<R["type"]>;
+}>;

package/dist/authorize.js

@@ -1,70 +1,85 @@
 import { sendError } from './sendError.js';
 import { BasedErrorCode } from '@based/errors';
-import { isBasedRoute, } from '@based/functions';
+import { isBasedRoute } from '@based/functions';
 import { installFn } from './installFn.js';
-export const defaultAuthError = (route, server, ctx, _payload, id, _checksum, err) => {
+export const defaultAuthError = (props, err) => {
     const code = err
         ? BasedErrorCode.AuthorizeFunctionError
         : BasedErrorCode.AuthorizeRejectedError;
-    if (id && isBasedRoute('channel', route)) {
-        sendError(server, ctx, code, {
+    const route = props.route;
+    if (props.id && isBasedRoute('channel', route)) {
+        sendError(props.server, props.ctx, code, {
             route,
             err,
-            channelId: id,
+            channelId: props.id,
         });
         return;
     }
-    if (id && isBasedRoute('query', route)) {
-        sendError(server, ctx, code, {
+    if (props.id && isBasedRoute('query', route)) {
+        sendError(props.server, props.ctx, code, {
             route,
             err,
-            observableId: id,
+            observableId: props.id,
         });
         return;
     }
-    if (id) {
-        sendError(server, ctx, code, {
+    if (props.id) {
+        sendError(props.server, props.ctx, code, {
             route,
             err,
-            requestId: id,
+            requestId: props.id,
         });
         return;
     }
-    sendError(server, ctx, code, {
+    sendError(props.server, props.ctx, code, {
         route,
         err,
     });
 };
-export const authorize = (route, server, ctx, payload, isAuthorized, id, checksum, isPublic = false, authError = defaultAuthError) => {
-    if (!ctx.session) {
-        return;
-    }
-    installFn(server, ctx, route, id).then((spec) => {
-        if (spec === null) {
-            return;
-        }
-        if (route.public === true || isPublic) {
-            isAuthorized(route, spec, server, ctx, payload, id, checksum);
-            return;
-        }
-        const authorize = spec.authorize || server.auth.authorize;
-        authorize(server.client, ctx, route.name, payload)
-            .then((ok) => {
-            if (!ctx.session || !ok) {
-                if (ctx.session &&
-                    !authError(route, server, ctx, payload, id, checksum)) {
-                    defaultAuthError(route, server, ctx, payload, id, checksum);
-                }
+export const authorize = (props, publicHandler = props.route.public) => {
+    return {
+        // @ts-ignore (higher perf then a promise)
+        then: (resolve) => {
+            if (!props.ctx.session) {
                 return;
             }
-            isAuthorized(route, spec, server, ctx, payload, id, checksum);
-        })
-            .catch((err) => {
-            if (ctx.session &&
-                !authError(route, server, ctx, payload, id, checksum, err)) {
-                defaultAuthError(route, server, ctx, payload, id, checksum, err);
-            }
-        });
-    });
+            const onAuthError = props.error ?? defaultAuthError;
+            installFn(props).then((spec) => {
+                if (!props.ctx.session) {
+                    return;
+                }
+                if (spec === null) {
+                    return;
+                }
+                if (publicHandler === true) {
+                    // @ts-ignore
+                    props.spec = spec;
+                    // @ts-ignore
+                    resolve(props);
+                    return;
+                }
+                const authorize = spec.authorize || props.server.auth.authorize;
+                // non async auth as option?
+                authorize(props.server.client, props.ctx, props.route.name, props.payload)
+                    .then((ok) => {
+                    if (!props.ctx.session || !ok) {
+                        if (props.ctx.session && !onAuthError(props)) {
+                            defaultAuthError(props);
+                        }
+                        return;
+                    }
+                    // @ts-ignore
+                    props.spec = spec;
+                    // @ts-ignore
+                    resolve(props);
+                })
+                    .catch((err) => {
+                    if (props.ctx.session && !onAuthError(props, err)) {
+                        defaultAuthError(props, err);
+                    }
+                });
+            });
+        },
+    };
 };
 //# sourceMappingURL=authorize.js.map

package/dist/authorize.js.map

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

package/dist/functionApi/callFunction.js

@@ -7,7 +7,7 @@ export const callFunction = async (server, name, ctx, payload) => {
     if (route === null) {
         return;
     }
-    const spec = await installFn(server, server.client.ctx, route);
+    const spec = await installFn({ server, ctx: server.client.ctx, route });
     if (!spec) {
         throw createError(server, ctx, BasedErrorCode.FunctionNotFound, {
             route,

package/dist/functionApi/callFunction.js.map

@@ -1 +1 @@
-{"version":3,"file":"callFunction.js","sourceRoot":"","sources":["../../src/functionApi/callFunction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,MAAmB,EACnB,IAAY,EACZ,GAAY,EACZ,OAAY,EACE,EAAE;IAChB,MAAM,KAAK,GAAG,WAAW,CACvB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,UAAU,EACV,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,CACL,CAAA;IAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAM;IACR,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAE9D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,gBAAgB,EAAE;YAC9D,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAChD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;gBAC3D,KAAK;gBACL,GAAG,EAAE,IAAI,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC;aACnD,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,CAAC;YACH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC7D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;gBAC3D,KAAK;gBACL,GAAG;aACJ,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;IAC7C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;YAC3D,KAAK;YACL,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"callFunction.js","sourceRoot":"","sources":["../../src/functionApi/callFunction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,MAAmB,EACnB,IAAY,EACZ,GAAY,EACZ,OAAY,EACE,EAAE;IAChB,MAAM,KAAK,GAAG,WAAW,CACvB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,UAAU,EACV,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,CACL,CAAA;IAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAM;IACR,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAEvE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,gBAAgB,EAAE;YAC9D,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAChD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;gBAC3D,KAAK;gBACL,GAAG,EAAE,IAAI,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC;aACnD,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,CAAC;YACH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC7D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;gBAC3D,KAAK;gBACL,GAAG;aACJ,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;IAC7C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;YAC3D,KAAK;YACL,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA"}

package/dist/functionApi/channelSubscribe.js

@@ -1,7 +1,7 @@
 import { verifyRoute } from '../verifyRoute.js';
 import { unsubscribeFunction, subscribeChannelFunction, hasChannel, createChannel, } from '../channel/index.js';
 import { installFn } from '../installFn.js';
-import { createError, } from '../error/index.js';
+import { createError } from '../error/index.js';
 import { BasedErrorCode } from '@based/errors';
 export const subscribeChannel = (server, name, id, payload, update) => {
     const route = verifyRoute(server, server.client.ctx, 'channel', server.functions.route(name), name, id);
@@ -20,7 +20,7 @@ export const subscribeChannel = (server, name, id, payload, update) => {
         subscribeChannelFunction(server, id, update);
         return close;
     }
-    installFn(server, server.client.ctx, route).then((spec) => {
+    installFn({ server, ctx: server.client.ctx, route }).then((spec) => {
         if (isClosed) {
             return;
         }

package/dist/functionApi/channelSubscribe.js.map

@@ -1 +1 @@
-{"version":3,"file":"channelSubscribe.js","sourceRoot":"","sources":["../../src/functionApi/channelSubscribe.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,UAAU,EACV,aAAa,GACd,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,WAAW,GAAG,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,IAAY,EACZ,EAAU,EACV,OAAY,EACZ,MAAsC,EACxB,EAAE;IAChB,MAAM,KAAK,GAAG,WAAW,CACvB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,SAAS,EACT,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,EACJ,EAAE,CACH,CAAA;IAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,qBAAqB,CAAC,CAAA;IAChD,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,QAAQ,GAAG,IAAI,CAAA;QACf,mBAAmB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,IAAI,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC3B,wBAAwB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;QAC5C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACxD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,CACJ,IAAI,EACJ,WAAW,CACT,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,cAAc,CAAC,gBAAgB,EAC/B;gBACE,KAAK;aACN,CACF,CACF,CAAA;YACD,OAAM;QACR,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YAC5B,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAChD,CAAC;QACD,wBAAwB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"channelSubscribe.js","sourceRoot":"","sources":["../../src/functionApi/channelSubscribe.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,UAAU,EACV,aAAa,GACd,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,IAAY,EACZ,EAAU,EACV,OAAY,EACZ,MAAsC,EACxB,EAAE;IAChB,MAAM,KAAK,GAAG,WAAW,CACvB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,SAAS,EACT,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,EACJ,EAAE,CACH,CAAA;IAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,qBAAqB,CAAC,CAAA;IAChD,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,QAAQ,GAAG,IAAI,CAAA;QACf,mBAAmB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,IAAI,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC3B,wBAAwB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;QAC5C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACjE,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,CACJ,IAAI,EACJ,WAAW,CACT,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,cAAc,CAAC,gBAAgB,EAC/B;gBACE,KAAK;aACN,CACF,CACF,CAAA;YACD,OAAM;QACR,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YAC5B,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAChD,CAAC;QACD,wBAAwB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/functionApi/client/channel.js

@@ -1,7 +1,7 @@
 import { BasedChannel as BasedChannelAbstract, } from '@based/functions';
-import { genObservableId } from '../../query/index.js';
 import { publish } from '../publish.js';
 import { subscribeChannel } from '../channelSubscribe.js';
+import { genObserveId } from '@based/protocol/client-server';
 export class BasedChannel extends BasedChannelAbstract {
     payload;
     name;
@@ -11,7 +11,7 @@ export class BasedChannel extends BasedChannelAbstract {
         super();
         this.ctx = ctx;
         this.payload = payload;
-        this.id = genObservableId(name, payload);
+        this.id = genObserveId(name, payload);
         this.name = name;
     }
     subscribe(onMessage, onError) {

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

@@ -1 +1 @@
-{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/functionApi/client/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,IAAI,oBAAoB,GAIrC,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,MAAM,OAAO,YAAa,SAAQ,oBAAoB;IAC7C,OAAO,CAAK;IACZ,IAAI,CAAQ;IACZ,EAAE,CAAQ;IACV,GAAG,CAAgC;IAE1C,YAAY,GAAmC,EAAE,IAAY,EAAE,OAAY;QACzE,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,SAAS,CACP,SAAiC,EACjC,OAA4B;QAE5B,OAAO,gBAAgB,CACrB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAC9B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACX,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,CAAC,GAAG,CAAC,CAAA;gBACd,CAAC;gBACD,OAAM;YACR,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,CAAA;QAChB,CAAC,CACF,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAY,EAAE,MAAe,IAAI,CAAC,GAAG;QAC3C,OAAO,CACL,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAC9B,IAAI,CAAC,IAAI,EACT,GAAG,EACH,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,OAAO,CACR,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/functionApi/client/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,IAAI,oBAAoB,GAIrC,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAE5D,MAAM,OAAO,YAAa,SAAQ,oBAAoB;IAC7C,OAAO,CAAK;IACZ,IAAI,CAAQ;IACZ,EAAE,CAAQ;IACV,GAAG,CAAgC;IAE1C,YAAY,GAAmC,EAAE,IAAY,EAAE,OAAY;QACzE,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,SAAS,CACP,SAAiC,EACjC,OAA4B;QAE5B,OAAO,gBAAgB,CACrB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAC9B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACX,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,CAAC,GAAG,CAAC,CAAA;gBACd,CAAC;gBACD,OAAM;YACR,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,CAAA;QAChB,CAAC,CACF,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAY,EAAE,MAAe,IAAI,CAAC,GAAG;QAC3C,OAAO,CACL,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAC9B,IAAI,CAAC,IAAI,EACT,GAAG,EACH,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,OAAO,CACR,CAAA;IACH,CAAC;CACF"}

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

@@ -7,9 +7,10 @@ export declare class BasedFunctionClient extends BasedfunctionClientAbstract {
     server: BasedServer;
     ctx: Context<InternalSessionClient>;
     constructor(server: BasedServer);
-    geo(ctx: Context): Promise<import("@based/functions").Geo>;
     call(name: string, payload?: any, ctx?: Context): Promise<any>;
-    query(name: string, payload?: any): BasedQuery;
+    query(name: string, payload?: any, attachedCtx?: Context | {
+        [key: string]: any;
+    }): BasedQuery;
     channel(name: string, payload?: any): BasedChannel;
     stream(name: string, streamOpts: StreamFunctionOpts, ctx?: Context): Promise<any>;
     renewAuthState(ctx: Context<Session>, authState?: AuthState): Promise<AuthState>;

package/dist/functionApi/client/index.js

@@ -13,15 +13,15 @@ export class BasedFunctionClient extends BasedfunctionClientAbstract {
             session: { type: 'client', client: this, headers: {} },
         };
     }
-    geo(ctx) {
-        return this.server.geo(ctx);
-    }
+    // geo(ctx: Context) {
+    //   return this.server.geo(ctx)
+    // }
     // TODO: CTX - Transpile the ctx in there by static analysis for "call" & "stream"
     call(name, payload, ctx = this.ctx) {
         return callFunction(this.server, name, ctx, payload);
     }
-    query(name, payload) {
-        return new BasedQuery(this.ctx, name, payload);
+    query(name, payload, attachedCtx) {
+        return new BasedQuery(this.ctx, name, payload, attachedCtx);
     }
     channel(name, payload) {
         return new BasedChannel(this.ctx, name, payload);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/functionApi/client/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAEL,mBAAmB,IAAI,2BAA2B,EAGlD,eAAe,EACf,WAAW,GAGZ,MAAM,kBAAkB,CAAA;AAEzB,MAAM,OAAO,mBAAoB,SAAQ,2BAA2B;IAGlE,GAAG,CAAgC;IAEnC,YAAY,MAAmB;QAC7B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,GAAG,GAAG;YACT,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;SACvD,CAAA;IACH,CAAC;IAED,GAAG,CAAC,GAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,kFAAkF;IAClF,IAAI,CAAC,IAAY,EAAE,OAAa,EAAE,MAAe,IAAI,CAAC,GAAG;QACvD,OAAO,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,OAAa;QAC/B,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,OAAa;QACjC,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,UAA8B,EAC9B,MAAe,IAAI,CAAC,GAAG;QAEvB,aAAa;QACb,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC3D,CAAC;IAED,cAAc,CACZ,GAAqB,EACrB,SAAqB;QAErB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACxD,CAAC;IAED,YAAY,CAAC,GAAqB,EAAE,SAAoB;QACtD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,OAAM;QACR,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAM;QACR,CAAC;QACD,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;QACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;IACtC,CAAC;IAED,aAAa,CAAC,GAAqB,EAAE,SAAoB;QACvD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,OAAM;QACR,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAChD,CAAC;IAED,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACnB,OAAO,uBAAuB,CAAA;IAChC,CAAC;CACF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/functionApi/client/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAEL,mBAAmB,IAAI,2BAA2B,EAGlD,eAAe,EACf,WAAW,GAGZ,MAAM,kBAAkB,CAAA;AAEzB,MAAM,OAAO,mBAAoB,SAAQ,2BAA2B;IAGlE,GAAG,CAAgC;IAEnC,YAAY,MAAmB;QAC7B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,GAAG,GAAG;YACT,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;SACvD,CAAA;IACH,CAAC;IAED,sBAAsB;IACtB,gCAAgC;IAChC,IAAI;IAEJ,kFAAkF;IAClF,IAAI,CAAC,IAAY,EAAE,OAAa,EAAE,MAAe,IAAI,CAAC,GAAG;QACvD,OAAO,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,KAAK,CACH,IAAY,EACZ,OAAa,EACb,WAA8C;QAE9C,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IAC7D,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,OAAa;QACjC,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,UAA8B,EAC9B,MAAe,IAAI,CAAC,GAAG;QAEvB,aAAa;QACb,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC3D,CAAC;IAED,cAAc,CACZ,GAAqB,EACrB,SAAqB;QAErB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACxD,CAAC;IAED,YAAY,CAAC,GAAqB,EAAE,SAAoB;QACtD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,OAAM;QACR,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAM;QACR,CAAC;QACD,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;QACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;IACtC,CAAC;IAED,aAAa,CAAC,GAAqB,EAAE,SAAoB;QACvD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,OAAM;QACR,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAChD,CAAC;IAED,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACnB,OAAO,uBAAuB,CAAA;IAChC,CAAC;CACF"}

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

@@ -1,10 +1,15 @@
-import { ObservableUpdateFunction, ObserveErrorListener } from '../../query/index.js';
-import { BasedQuery as BasedQueryAbstract, Context, InternalSessionClient } from '@based/functions';
+import { AttachedCtx, ObservableUpdateFunction, ObserveErrorListener } from '../../query/index.js';
+import { BasedQuery as BasedQueryAbstract, BasedRoute, Context, InternalSessionClient } from '@based/functions';
 export declare class BasedQuery extends BasedQueryAbstract {
-    query: any;
+    payload: any;
     name: string;
     ctx: Context<InternalSessionClient>;
-    constructor(ctx: Context<InternalSessionClient>, name: string, payload: any);
+    attachedCtx: AttachedCtx;
+    id: number;
+    route: BasedRoute<'query'>;
+    constructor(ctx: Context<InternalSessionClient>, name: string, payload: any, attachedCtx?: {
+        [key: string]: any;
+    } | Context);
     subscribe(onData: ObservableUpdateFunction, onError?: ObserveErrorListener): () => void;
     getWhen(condition: (data: any, checksum: number) => boolean): Promise<any>;
     get(): Promise<any>;

package/dist/functionApi/client/query.js

@@ -1,15 +1,33 @@
 import { observe } from '../observe.js';
 import { get } from '../get.js';
 import { BasedQuery as BasedQueryAbstract, } from '@based/functions';
+import { attachCtx, attachCtxInternal } from '../../query/attachCtx.js';
+import { genObserveId } from '@based/protocol/client-server';
+import { verifyRoute } from '../../verifyRoute.js';
 export class BasedQuery extends BasedQueryAbstract {
-    query;
+    payload;
     name;
     ctx;
-    constructor(ctx, name, payload) {
+    attachedCtx;
+    id;
+    route;
+    constructor(ctx, name, payload, attachedCtx) {
         super();
+        const server = ctx.session.client.server;
+        this.id = genObserveId(name, payload);
         this.ctx = ctx;
-        this.query = payload;
+        this.payload = payload;
         this.name = name;
+        this.route = verifyRoute(server, ctx, 'query', server.functions.route(name), name, this.id);
+        if (!this.route) {
+            throw new Error(`Query ${this.route.name} does not exist`);
+        }
+        if (attachedCtx && this.route.ctx) {
+            this.attachedCtx =
+                'session' in attachedCtx
+                    ? attachCtx(server, this.route, attachedCtx, this.id)
+                    : attachCtxInternal(this.route, attachedCtx, this.id);
+        }
     }
     subscribe(onData, onError) {
         // @ts-ignore
@@ -46,7 +64,7 @@ export class BasedQuery extends BasedQueryAbstract {
             // @ts-ignore
             onData.safe = true;
         }
-        return observe(this.ctx.session.client.server, this.name, this.ctx, this.query, onData, onError);
+        return observe(this, onData, onError);
     }
     async getWhen(condition) {
         return new Promise((resolve) => {
@@ -59,7 +77,7 @@ export class BasedQuery extends BasedQueryAbstract {
         });
     }
     async get() {
-        return get(this.ctx.session.client.server, this.name, this.ctx, this.query);
+        return get(this);
     }
 }
 //# sourceMappingURL=query.js.map

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

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

package/dist/functionApi/get.d.ts

@@ -1,3 +1,2 @@
-import { BasedServer } from '../server.js';
-import { Context } from '@based/functions';
-export declare const get: (server: BasedServer, name: string, ctx: Context, payload: any) => Promise<any>;
+import { BasedQuery } from './client/query.js';
+export declare const get: (query: BasedQuery) => Promise<any>;

package/dist/functionApi/get.js

@@ -1,6 +1,5 @@
-import { createError, } from '../error/index.js';
-import { genObservableId, hasObs, createObs, subscribeNext, getObsAndStopRemove, destroyObs, start, } from '../query/index.js';
-import { verifyRoute } from '../verifyRoute.js';
+import { createError } from '../error/index.js';
+import { hasObs, subscribeNext, getObsAndStopRemove, destroyObs, start, createObsNoStart, } from '../query/index.js';
 import { installFn } from '../installFn.js';
 import { BasedErrorCode } from '@based/errors';
 const getObsData = (resolve, reject, server, id, ctx, route) => {
@@ -30,31 +29,32 @@ const getObsData = (resolve, reject, server, id, ctx, route) => {
         }
     });
 };
-export const get = (server, name, ctx, payload) => {
+export const get = (query) => {
     return new Promise((resolve, reject) => {
-        let route;
-        try {
-            route = verifyRoute(server, server.client.ctx, 'query', server.functions.route(name), name);
-            if (route === null) {
-                reject(new Error(`[${name}] No session in ctx`));
-                return;
-            }
-        }
-        catch (err) {
-            reject(err);
-            return;
-        }
-        const id = genObservableId(name, payload);
+        const attachedCtx = query.attachedCtx;
+        const id = attachedCtx ? attachedCtx.id : query.id;
+        const server = query.ctx.session.client.server;
+        const route = query.route;
+        const ctx = query.ctx;
+        const payload = query.payload;
         if (!hasObs(server, id)) {
-            installFn(server, server.client.ctx, route).then((spec) => {
+            installFn({ server, ctx, route }).then((spec) => {
                 if (!spec) {
-                    reject(createError(server, ctx, BasedErrorCode.FunctionNotFound, {
+                    reject(createError(server, query.ctx, BasedErrorCode.FunctionNotFound, {
                         route,
                     }));
                     return;
                 }
                 if (!hasObs(server, id)) {
-                    createObs(server, name, id, payload, true);
+                    createObsNoStart({
+                        server,
+                        route,
+                        id,
+                        payload,
+                        ctx,
+                        spec,
+                        attachedCtx,
+                    });
                     getObsData(resolve, reject, server, id, ctx, route);
                     start(server, id);
                 }

package/dist/functionApi/get.js.map

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

package/dist/functionApi/observe.d.ts

@@ -1,4 +1,3 @@
-import { BasedServer } from '../server.js';
-import { Context } from '@based/functions';
 import { ObservableUpdateFunction, ObserveErrorListener } from '../query/index.js';
-export declare const observe: (server: BasedServer, name: string, ctx: Context, payload: any, update: ObservableUpdateFunction, error: ObserveErrorListener) => (() => void);
+import { BasedQuery } from './client/query.js';
+export declare const observe: (query: BasedQuery, update: ObservableUpdateFunction, error: ObserveErrorListener) => (() => void);

package/dist/functionApi/observe.js

@@ -1,14 +1,14 @@
 import { createError } from '../error/index.js';
-import { verifyRoute } from '../verifyRoute.js';
-import { genObservableId, hasObs, createObs, subscribeFunction, unsubscribeFunction, } from '../query/index.js';
+import { hasObs, createObs, subscribeFunction, unsubscribeFunction, } from '../query/index.js';
 import { installFn } from '../installFn.js';
 import { BasedErrorCode } from '@based/errors';
-export const observe = (server, name, ctx, payload, update, error) => {
-    const id = genObservableId(name, payload);
-    const route = verifyRoute(server, server.client.ctx, 'query', server.functions.route(name), name, id);
-    if (route === null) {
-        throw new Error(`[${name}] No session in ctx`);
-    }
+export const observe = (query, update, error) => {
+    const attachedCtx = query.attachedCtx;
+    const id = attachedCtx ? attachedCtx.id : query.id;
+    const server = query.ctx.session.client.server;
+    const route = query.route;
+    const ctx = query.ctx;
+    const payload = query.payload;
     let isClosed = false;
     const close = () => {
         if (isClosed) {
@@ -21,7 +21,7 @@ export const observe = (server, name, ctx, payload, update, error) => {
         subscribeFunction(server, id, update);
         return close;
     }
-    installFn(server, server.client.ctx, route).then((spec) => {
+    installFn({ server, ctx: server.client.ctx, route }).then((spec) => {
         if (isClosed) {
             return;
         }
@@ -32,7 +32,7 @@ export const observe = (server, name, ctx, payload, update, error) => {
             return;
         }
         if (!hasObs(server, id)) {
-            createObs(server, name, id, payload);
+            createObs({ server, route, id, payload, ctx, spec, attachedCtx });
         }
         subscribeFunction(server, id, update);
     });

package/dist/functionApi/observe.js.map

@@ -1 +1 @@
-{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../src/functionApi/observe.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,eAAe,EACf,MAAM,EACN,SAAS,EAGT,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAAmB,EACnB,IAAY,EACZ,GAAY,EACZ,OAAY,EACZ,MAAgC,EAChC,KAA2B,EACb,EAAE;IAChB,MAAM,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAEzC,MAAM,KAAK,GAAG,WAAW,CACvB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,OAAO,EACP,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,EACJ,EAAE,CACH,CAAA;IAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,qBAAqB,CAAC,CAAA;IAChD,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,QAAQ,GAAG,IAAI,CAAA;QACf,mBAAmB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QACvB,iBAAiB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;QACrC,OAAO,KAAK,CAAA;IACd,CAAC;IAED,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACxD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,KAAK,CACH,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,gBAAgB,EAAE;gBACxD,KAAK;aACN,CAAC,CACH,CAAA;YACD,OAAM;QACR,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACxB,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;QACtC,CAAC;QACD,iBAAiB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../src/functionApi/observe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,MAAM,EACN,SAAS,EAGT,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAG9C,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,KAAiB,EACjB,MAAgC,EAChC,KAA2B,EACb,EAAE;IAChB,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;IACrC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAA;IAClD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAA;IAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;IACzB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAA;IACrB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;IAE7B,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,QAAQ,GAAG,IAAI,CAAA;QACf,mBAAmB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QACvB,iBAAiB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;QACrC,OAAO,KAAK,CAAA;IACd,CAAC;IAED,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACjE,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,KAAK,CACH,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,gBAAgB,EAAE;gBACxD,KAAK;aACN,CAAC,CACH,CAAA;YACD,OAAM;QACR,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACxB,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAA;QACnE,CAAC;QACD,iBAAiB,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/functionApi/publish.js

@@ -7,7 +7,7 @@ export const publish = (server, name, ctx, id, payload, msg) => {
     if (route === null) {
         return;
     }
-    installFn(server, server.client.ctx, route).then((fn) => {
+    installFn({ server, ctx: server.client.ctx, route }).then((fn) => {
         if (fn === null) {
             return;
         }

package/dist/functionApi/publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/functionApi/publish.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAAmB,EACnB,IAAY,EACZ,GAAY,EACZ,EAAU,EACV,OAAY,EACZ,GAAQ,EACR,EAAE;IACF,MAAM,KAAK,GAAG,WAAW,CACvB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,SAAS,EACT,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,CACL,CAAA;IACD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAM;IACR,CAAC;IACD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QACtD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,OAAM;QACR,CAAC;QACD,IAAI,CAAC;YACH,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,sBAAsB;YACtB,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;gBACrD,GAAG;gBACH,KAAK;aACN,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/functionApi/publish.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAAmB,EACnB,IAAY,EACZ,GAAY,EACZ,EAAU,EACV,OAAY,EACZ,GAAQ,EACR,EAAE;IACF,MAAM,KAAK,GAAG,WAAW,CACvB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,GAAG,EACjB,SAAS,EACT,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,CACL,CAAA;IACD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAM;IACR,CAAC;IACD,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QAC/D,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,OAAM;QACR,CAAC;QACD,IAAI,CAAC;YACH,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,sBAAsB;YACtB,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;gBACrD,GAAG;gBACH,KAAK;aACN,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/functionApi/stream.js

@@ -16,7 +16,7 @@ export const streamFunction = async (server, name, ctx, streamOpts) => {
     if (route === null) {
         return;
     }
-    const fn = await installFn(server, server.client.ctx, route);
+    const fn = await installFn({ server, ctx: server.client.ctx, route });
     if (!fn) {
         throw createError(server, ctx, BasedErrorCode.FunctionNotFound, {
             route,

package/dist/functionApi/stream.js.map

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

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

@@ -1,3 +1,3 @@
-import { HttpSession } from '@based/functions';
-import { IsAuthorizedHandler } from '../../authorize.js';
-export declare const basicFunction: IsAuthorizedHandler<HttpSession>;
+import { HttpSession, BasedRoute } from '@based/functions';
+import { FunctionHandler } from '../../types.js';
+export declare const basicFunction: FunctionHandler<HttpSession, BasedRoute<'function'>>;

package/dist/incoming/http/basicFunction.js

@@ -1,7 +1,7 @@
 import { sendHttpResponse } from '../../sendHttpResponse.js';
 import { BasedErrorCode } from '@based/errors';
 import { sendError } from '../../sendError.js';
-export const basicFunction = async (route, spec, server, ctx, payload) => {
+export const basicFunction = async ({ route, server, ctx, payload, spec }) => {
     const send = (responseData, headers, status) => {
         if (!ctx.session) {
             return;

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

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