@based/functions 3.0.2 → 3.1.1-alpha

package/dist/auth.d.ts

@@ -8,6 +8,7 @@ export type AuthState = {
     error?: string;
     persistent?: boolean;
     type?: string;
+    t?: 0 | 1;
 };
 export type Authorize = (based: BasedFunctionClient, context: Context<HttpSession | WebSocketSession>, name: string, // name as generic dope
 payload?: any) => Promise<boolean>;

package/dist/context.d.ts

@@ -11,6 +11,7 @@ export type WebSocketSession = {
     id: number;
     method: string;
     authState: AuthState;
+    type: '0' | '1';
     origin: string;
     obs: Set<number>;
     unauthorizedObs?: Set<{

package/dist/context.js.map

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

@@ -3,6 +3,7 @@ import { Context, HttpSession } from './context.js';
 import { BasedFunctionClient } from './client.js';
 import { BasedDataStream } from './stream.js';
 import { Authorize } from './auth.js';
+import type { BuildOptions } from 'esbuild';
 export type ObservableUpdateFunction<K = any> = (data: K, checksum?: number, err?: any, cache?: Uint8Array, diff?: any, fromChecksum?: number, isDeflate?: boolean) => void;
 export type ObserveErrorListener = (err: any) => void;
 export type HttpHeaders = {
@@ -160,6 +161,7 @@ type BasedAppFunctionConfig = {
     main: string;
     path?: string;
     favicon?: string;
+    plugins?: BuildOptions['plugins'];
 };
 type BasedJobFunctionConfig = {
     type: 'job';

package/dist/functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions.js","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":"AAmUA,MAAM,UAAU,YAAY,CAC1B,IAAO,EACP,KAAU;IAEV,OAAO,CACL,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,CAAC,IAAI,KAAK,IAAI;QACnB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAC/B,CAAA;AACH,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,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":"AAqUA,MAAM,UAAU,YAAY,CAC1B,IAAO,EACP,KAAU;IAEV,OAAO,CACL,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,CAAC,IAAI,KAAK,IAAI;QACnB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAC/B,CAAA;AACH,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,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/dist/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "@based/functions",
+  "version": "3.1.1-alpha",
+  "license": "MIT",
+  "type": "module",
+  "main": "index.js",
+  "files":[
+    "dist"
+  ],
+  "scripts": {
+    "copy:uws": "cp src/uws.d.ts dist/uws.d.ts",
+    "copy:client": "cp ./dist/client.d.ts ./dist/client_original.d.ts",
+    "copy:package": "cp ./package.json ./dist/package.json",
+    "clean:ts:before": "rm -rf ./dist ./tsconfig.tsbuildinfo || true",
+    "clean:ts:after": "rm ./dist/tsconfig.tsbuildinfo || true",
+    "build": "npm run clean:ts:before && npx tsc -b && npm run copy:uws && npm run copy:client && npm run copy:package && npm run clean:ts:after",
+    "watch": "npx tsc --watch",
+    "clean": "rimraf {.turbo,dist,node_modules}"
+  },
+  "sideEffects": false,
+  "dependencies": {
+    "@saulx/utils": "^5.0.0",
+    "esbuild": "^0.24.2",
+    "utility-types": "^3.10.0"
+  },
+  "devDependencies": {
+    "rimraf": "^3.0.2",
+    "ts-node": "10.9.1",
+    "typescript": "^4.3.5"
+  }
+}

package/dist/stream.d.ts

@@ -1,7 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Duplex, Readable } from "node:stream";
 import util from "node:util";
 export declare class BasedDataStream extends Duplex {

package/package.json

@@ -1,22 +1,31 @@
 {
   "name": "@based/functions",
-  "version": "3.0.2",
+  "version": "3.1.1-alpha",
   "license": "MIT",
   "type": "module",
-  "main": "dist/index.js",
+  "main": "index.js",
+  "files":[
+    "dist"
+  ],
   "scripts": {
-    "build": "npx tsc && cp src/uws.d.ts dist/uws.d.ts && cp ./dist/client.d.ts ./dist/client_original.d.ts",
+    "copy:uws": "cp src/uws.d.ts dist/uws.d.ts",
+    "copy:client": "cp ./dist/client.d.ts ./dist/client_original.d.ts",
+    "copy:package": "cp ./package.json ./dist/package.json",
+    "clean:ts:before": "rm -rf ./dist ./tsconfig.tsbuildinfo || true",
+    "clean:ts:after": "rm ./dist/tsconfig.tsbuildinfo || true",
+    "build": "npm run clean:ts:before && npx tsc -b && npm run copy:uws && npm run copy:client && npm run copy:package && npm run clean:ts:after",
     "watch": "npx tsc --watch",
     "clean": "rimraf {.turbo,dist,node_modules}"
   },
   "sideEffects": false,
   "dependencies": {
-    "utility-types": "^3.10.0",
-    "@saulx/utils": "^5.0.0"
+    "@saulx/utils": "^5.0.0",
+    "esbuild": "^0.24.2",
+    "utility-types": "^3.10.0"
   },
   "devDependencies": {
+    "rimraf": "^3.0.2",
     "ts-node": "10.9.1",
-    "typescript": "^4.3.5",
-    "rimraf": "^3.0.2"
+    "typescript": "^4.3.5"
   }
 }

package/src/auth.ts

@@ -1,34 +0,0 @@
-import { BasedFunctionClient } from './client.js'
-import { HttpRequest } from './uws.js'
-import { Context, WebSocketSession, HttpSession } from './context.js'
-
-export type AuthState = {
-  token?: string
-  userId?: string
-  refreshToken?: string
-  error?: string
-  persistent?: boolean
-  type?: string
-}
-
-export type Authorize = (
-  based: BasedFunctionClient,
-  context: Context<HttpSession | WebSocketSession>,
-  name: string, // name as generic dope
-  payload?: any
-) => Promise<boolean>
-
-// True - its the same all good
-// AuthState - new auth state send it
-//    if error send error state (and reject)
-export type VerifyAuthState = (
-  based: BasedFunctionClient,
-  context: Context<HttpSession | WebSocketSession>,
-  authState: AuthState
-) => Promise<true | AuthState>
-
-export type AuthorizeConnection = (
-  based: BasedFunctionClient,
-  req: HttpRequest,
-  ip: string
-) => Promise<boolean>

package/src/channel.ts

@@ -1,10 +0,0 @@
-import { ChannelMessageFunction } from './functions.js'
-
-export abstract class BasedChannel<K = any> {
-  abstract subscribe(
-    onMessage: ChannelMessageFunction<K>,
-    onError?: (err: any) => void
-  ): () => void
-
-  abstract publish(message: K): void
-}

package/src/client.ts

@@ -1,35 +0,0 @@
-import { AuthState } from './auth.js'
-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'
-
-export abstract class BasedFunctionClient {
-  server: any
-
-  db: any
-
-  abstract call(name: string, payload?: any, ctx?: Context): Promise<any>
-
-  abstract query(name: string, payload?: any): 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 = { [key: string]: { payload: any; result: any } }

package/src/context.ts

@@ -1,153 +0,0 @@
-import { parseQuery } from '@saulx/utils'
-import { AuthState } from './auth.js'
-import { WebSocket, HttpRequest, HttpResponse } from './uws.js'
-import { BasedFunctionClient } from './client.js'
-import { StreamPayload } from './functions.js'
-
-export type WebSocketSession = {
-  // State can be used for anything - for us the based class instance
-  state?: any
-  query: string
-  ua: string
-  ip: string
-  id: number // client-id
-  method: string
-  authState: AuthState
-  origin: string
-  obs: Set<number>
-  unauthorizedObs?: Set<{
-    id: number
-    checksum: number
-    name: string
-    payload: any
-  }>
-  streams?: { [reqId: string]: StreamPayload }
-  headers: { [key: string]: string }
-  unauthorizedChannels?: Set<{
-    id: number
-    name: string
-    payload: any
-  }>
-  // Optimization so we dont need to keep track of websockets outside of uws
-  c?: Context<WebSocketSession>
-  ws?: BasedWebSocket
-}
-
-export type BasedWebSocket = WebSocket<WebSocketSession>
-
-export type HttpSession = {
-  // State can be used for anything - for us the based class instance
-  state?: any
-  res: HttpResponse
-  url: string
-  origin: string
-  req: HttpRequest
-  query?: string
-  parsedQuery?: ReturnType<typeof parseQuery>
-  ua: string
-  ip: string
-  id: number // client-id
-  authState: AuthState
-  method: string
-  rawBody?: string
-  headers: {
-    'content-length'?: number
-    'content-type'?: string
-    'content-encoding'?: string
-    encoding?: string
-  } & { [key: string]: string }
-}
-
-export type InternalSessionObservable = {
-  id: number
-  name: string
-  headers: { [key: string]: string }
-  type: 'query'
-}
-
-export type InternalSessionChannel = {
-  id: number
-  name: string
-  headers: { [key: string]: string }
-  type: 'channel'
-}
-
-export type InternalSessionClient = {
-  client: BasedFunctionClient
-  headers: { [key: string]: string }
-  type: 'client'
-}
-
-// Internal session for internal functions
-export type InternalSession =
-  | InternalSessionClient
-  | InternalSessionObservable
-  | InternalSessionChannel
-
-// used for minimal security errors (e.g. rate limit)
-export type MinimalExternalSession = {
-  ua: string
-  ip: string
-  headers: { [key: string]: string }
-}
-
-export type Session = (
-  | WebSocketSession
-  | HttpSession
-  | InternalSession
-  | MinimalExternalSession
-) & {
-  origin?: string
-
-  /** Only available in Ws and Http contexts */
-  authState?: AuthState
-}
-
-export type Context<S extends Session = Session> = {
-  session?: S
-}
-
-export const isHttpContext = (
-  ctx: Context<Session>
-): ctx is Context<HttpSession> => {
-  if ('res' in ctx?.session) {
-    return true
-  }
-  return false
-}
-
-export const isWsContext = (
-  ctx: Context<Session>
-): ctx is Context<WebSocketSession> => {
-  if (ctx.session && isWsSession(ctx.session)) {
-    return true
-  }
-  return false
-}
-
-export const isClientContext = (
-  ctx: Context<Session>
-): ctx is Context<WebSocketSession | HttpSession> => {
-  if (ctx.session && (isWsSession(ctx.session) || isHttpSession(ctx.session))) {
-    return true
-  }
-  return false
-}
-
-export const isHttpSession = (
-  session: Session | undefined
-): session is HttpSession => {
-  if (session && 'res' in session) {
-    return true
-  }
-  return false
-}
-
-export const isWsSession = (
-  session: Session | undefined
-): session is WebSocketSession => {
-  if (session && 'send' in session) {
-    return true
-  }
-  return false
-}