@based/functions 3.2.4 → 3.3.1

package/dist/auth.d.ts

@@ -3,7 +3,7 @@ import { HttpRequest } from './uws.js';
 import { Context, WebSocketSession, HttpSession } from './context.js';
 export type AuthState = {
     token?: string;
-    userId?: string;
+    userId?: string | number;
     refreshToken?: string;
     error?: string;
     persistent?: boolean;

package/dist/client.d.ts

@@ -3,18 +3,18 @@ import { BasedChannel } from './channel.js';
 import { Context } from './context.js';
 import { BasedQuery } from './query.js';
 import { StreamFunctionOpts } from './stream.js';
-import { Geo } from './geo.js';
 import type { DbClient } from '@based/db';
 export declare abstract class BasedFunctionClient {
     server: any;
     db: DbClient;
     dbs: Record<string, DbClient>;
     abstract call(name: string, payload?: any, ctx?: Context): Promise<any>;
-    abstract query(name: string, payload?: any): BasedQuery;
+    abstract query(name: string, payload?: any, ctx?: {
+        [key: string]: any;
+    } | Context): BasedQuery;
     abstract channel(name: string, payload?: any): BasedChannel;
     abstract stream(name: string, payload: StreamFunctionOpts, ctx?: Context): Promise<any>;
     abstract sendAuthState(ctx: Context, authState: AuthState): void;
-    abstract geo(ctx: Context): Promise<Geo>;
     abstract renewAuthState(ctx: Context, authState?: AuthState): Promise<AuthState>;
 }
 export type QueryMap = {

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAQA,MAAM,OAAgB,mBAAmB;IACvC,MAAM,CAAK;IAEX,EAAE,CAAU;IACZ,GAAG,CAA0B;CAsB9B"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAQA,MAAM,OAAgB,mBAAmB;IACvC,MAAM,CAAK;IAEX,EAAE,CAAU;IACZ,GAAG,CAA0B;CA0B9B"}

package/dist/client_original.d.ts

@@ -3,18 +3,18 @@ import { BasedChannel } from './channel.js';
 import { Context } from './context.js';
 import { BasedQuery } from './query.js';
 import { StreamFunctionOpts } from './stream.js';
-import { Geo } from './geo.js';
 import type { DbClient } from '@based/db';
 export declare abstract class BasedFunctionClient {
     server: any;
     db: DbClient;
     dbs: Record<string, DbClient>;
     abstract call(name: string, payload?: any, ctx?: Context): Promise<any>;
-    abstract query(name: string, payload?: any): BasedQuery;
+    abstract query(name: string, payload?: any, ctx?: {
+        [key: string]: any;
+    } | Context): BasedQuery;
     abstract channel(name: string, payload?: any): BasedChannel;
     abstract stream(name: string, payload: StreamFunctionOpts, ctx?: Context): Promise<any>;
     abstract sendAuthState(ctx: Context, authState: AuthState): void;
-    abstract geo(ctx: Context): Promise<Geo>;
     abstract renewAuthState(ctx: Context, authState?: AuthState): Promise<AuthState>;
 }
 export type QueryMap = {

package/dist/context.d.ts

@@ -2,7 +2,7 @@ import { parseQuery } from '@based/utils';
 import { AuthState } from './auth.js';
 import { WebSocket, HttpRequest, HttpResponse } from './uws.js';
 import { BasedFunctionClient } from './client.js';
-import { StreamPayload } from './functions.js';
+import { BasedRoute, StreamPayload } from './functions.js';
 export type WebSocketSession = {
     state?: any;
     query: string;
@@ -17,20 +17,21 @@ export type WebSocketSession = {
     unauthorizedObs?: Set<{
         id: number;
         checksum: number;
-        name: string;
+        route: BasedRoute<'query'>;
         payload: any;
     }>;
+    unauthorizedChannels?: Set<{
+        id: number;
+        route: BasedRoute<'channel'>;
+        payload: any;
+    }>;
+    attachedCtxObs?: Set<number>;
     streams?: {
         [reqId: string]: StreamPayload;
     };
     headers: {
         [key: string]: string;
     };
-    unauthorizedChannels?: Set<{
-        id: number;
-        name: string;
-        payload: any;
-    }>;
     v?: 2;
     c?: Context<WebSocketSession>;
     ws?: BasedWebSocket;

package/dist/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AA+GA,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,GAAqB,EACQ,EAAE;IAC/B,IAAI,KAAK,IAAI,GAAG,EAAE,OAAO,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,GAAqB,EACa,EAAE;IACpC,IAAI,GAAG,CAAC,OAAO,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,GAAqB,EAC2B,EAAE;IAClD,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAC5E,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,OAA4B,EACJ,EAAE;IAC1B,IAAI,OAAO,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;QAChC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAA4B,EACC,EAAE;IAC/B,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;QACjC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAgHA,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,GAAqB,EACQ,EAAE;IAC/B,IAAI,KAAK,IAAI,GAAG,EAAE,OAAO,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,GAAqB,EACa,EAAE;IACpC,IAAI,GAAG,CAAC,OAAO,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,GAAqB,EAC2B,EAAE;IAClD,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAC5E,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,OAA4B,EACJ,EAAE;IAC1B,IAAI,OAAO,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;QAChC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAA4B,EACC,EAAE;IAC/B,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;QACjC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/functions.d.ts

@@ -39,7 +39,7 @@ export type StreamPayload<P = any> = {
     seqId?: number;
 };
 export type BasedStreamFunction<P = any, K = any> = BasedFunction<StreamPayload<P>, K>;
-export type BasedQueryFunction<P = any, K = any> = ((based: BasedFunctionClient, payload: P, update: ObservableUpdateFunction<K>, error: ObserveErrorListener) => Promise<() => void>) | ((based: BasedFunctionClient, payload: P, update: ObservableUpdateFunction<K>, error: ObserveErrorListener) => () => void);
+export type BasedQueryFunction<P = any, K = any> = ((based: BasedFunctionClient, payload: P, update: ObservableUpdateFunction<K>, error: ObserveErrorListener, ctx?: any) => Promise<() => void>) | ((based: BasedFunctionClient, payload: P, update: ObservableUpdateFunction<K>, error: ObserveErrorListener, ctx?: any) => () => void);
 export type BasedChannelFunction<P = any, K = any> = (based: BasedFunctionClient, payload: P, id: number, update: ChannelMessageFunction<K>, error: (err?: any) => void) => () => void;
 export type BasedChannelPublishFunction<P = any, M = any> = (based: BasedFunctionClient, payload: P, message: M, id: number, ctx: Context) => void;
 export type ChannelMessageFunction<M = any> = (message: M) => void;
@@ -218,6 +218,8 @@ export type BasedQueryFunctionConfig = {
     closeAfterIdleTime?: number;
     /** Throttle amount of outgoing messages, in milliseconds */
     throttle?: number;
+    /** Bind this query function to specific paths in clients ctx */
+    ctx?: string[];
 };
 export type BasedStreamFunctionConfig = {
     /** Function type `app, http, channel, function, query, stream, authorize, job` */

package/dist/functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions.js","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":"AA8ZA,MAAM,UAAU,YAAY,CAC1B,IAAO,EACP,KAAU;IAEV,MAAM,YAAY,GAChB,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,CAAC,IAAI,KAAK,IAAI;QACnB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAA;IAChC,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAU;IACxC,OAAO,CACL,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;YACvB,KAAK,CAAC,IAAI,KAAK,OAAO;YACtB,KAAK,CAAC,IAAI,KAAK,UAAU;YACzB,KAAK,CAAC,IAAI,KAAK,MAAM;YACrB,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;QAC1B,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAC/B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,IAAO,EACP,MAAW;IAEX,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,MAAW;IAEX,OAAO,eAAe,CAAC,MAAM,CAAC,CAAA;AAChC,CAAC"}
+{"version":3,"file":"functions.js","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":"AAkaA,MAAM,UAAU,YAAY,CAC1B,IAAO,EACP,KAAU;IAEV,MAAM,YAAY,GAChB,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,CAAC,IAAI,KAAK,IAAI;QACnB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAA;IAChC,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAU;IACxC,OAAO,CACL,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;YACvB,KAAK,CAAC,IAAI,KAAK,OAAO;YACtB,KAAK,CAAC,IAAI,KAAK,UAAU;YACzB,KAAK,CAAC,IAAI,KAAK,MAAM;YACrB,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;QAC1B,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAC/B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,IAAO,EACP,MAAW;IAEX,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,MAAW;IAEX,OAAO,eAAe,CAAC,MAAM,CAAC,CAAA;AAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/functions",
-  "version": "3.2.4",
+  "version": "3.3.1",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -17,10 +17,9 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@based/db": "^0.1.0",
-    "@based/utils": "^1.0.0",
-    "utility-types": "^3.10.0",
-    "arktype": "^2.1.20"
+    "@based/db": "^0.1.2",
+    "@based/utils": "^1.1.0",
+    "utility-types": "^3.10.0"
   },
   "devDependencies": {
     "ts-node": "10.9.1"