@based/server 4.0.1 → 4.0.3

package/dist/sendError.d.ts

@@ -1,5 +1,6 @@
 import { BasedServer } from './server';
-import { HttpSession, WebSocketSession, Context } from './context';
-import { BasedErrorCode, ErrorPayload } from './error';
+import { HttpSession, WebSocketSession, Context } from '@based/functions';
+import { BasedErrorCode, ErrorPayload, BasedErrorData } from './error';
 export declare function sendHttpError<T extends BasedErrorCode>(server: BasedServer, ctx: Context<HttpSession>, basedCode: T, payload: ErrorPayload[T]): void;
+export declare function sendErrorData(ctx: Context<WebSocketSession | HttpSession>, errorData: BasedErrorData): void;
 export declare function sendError<T extends BasedErrorCode>(server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, basedCode: T, payload: ErrorPayload[T]): void;

package/dist/sendError.js

@@ -1,38 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendError = exports.sendHttpError = void 0;
+exports.sendError = exports.sendErrorData = exports.sendHttpError = void 0;
 const sendHttpResponse_1 = require("./sendHttpResponse");
-const context_1 = require("./context");
+const functions_1 = require("@based/functions");
 const protocol_1 = require("./protocol");
 const error_1 = require("./error");
-const sendHttpErrorMessage = (res, error) => {
-    const { code, message, statusCode, statusMessage } = error;
-    res.writeStatus(`${statusCode} ${statusMessage}`);
-    res.writeHeader('Access-Control-Allow-Origin', '*');
-    res.writeHeader('Access-Control-Allow-Headers', 'content-type');
-    res.writeHeader('Content-Type', 'application/json');
-    return JSON.stringify({
-        error: message,
-        code,
+const sendHttpErrorData = (errorData, ctx) => {
+    const { code, message, statusCode, statusMessage } = errorData;
+    ctx.session.res.cork(() => {
+        ctx.session.res.writeStatus(`${statusCode} ${statusMessage}`);
+        if (ctx.session.method !== 'options') {
+            ctx.session.res.writeHeader('Content-Type', 'application/json');
+        }
+        (0, sendHttpResponse_1.end)(ctx, JSON.stringify({
+            error: message,
+            code,
+        }));
     });
 };
 function sendHttpError(server, ctx, basedCode, payload) {
     if (!ctx.session) {
         return;
     }
-    ctx.session.res.cork(() => {
-        (0, sendHttpResponse_1.end)(ctx, sendHttpErrorMessage(ctx.session.res, (0, error_1.createError)(server, ctx, basedCode, payload)));
-    });
+    const errData = (0, error_1.createError)(server, ctx, basedCode, payload);
+    sendHttpErrorData(errData, ctx);
 }
 exports.sendHttpError = sendHttpError;
+function sendErrorData(ctx, errorData) {
+    if (!ctx.session) {
+        return;
+    }
+    if ((0, functions_1.isHttpContext)(ctx)) {
+        sendHttpErrorData(errorData, ctx);
+    }
+    else if ((0, functions_1.isWsSession)(ctx.session)) {
+        const ws = ctx.session;
+        ws.send((0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(errorData)), true, false);
+    }
+}
+exports.sendErrorData = sendErrorData;
 function sendError(server, ctx, basedCode, payload) {
     if (!ctx.session) {
         return;
     }
-    if ((0, context_1.isHttpContext)(ctx)) {
+    if ((0, functions_1.isHttpContext)(ctx)) {
         return sendHttpError(server, ctx, basedCode, payload);
     }
-    else if ((0, context_1.isWsSession)(ctx.session)) {
+    else if ((0, functions_1.isWsSession)(ctx.session)) {
         const errorData = (0, error_1.createError)(server, ctx, basedCode, payload);
         const ws = ctx.session;
         ws.send((0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(errorData)), true, false);

package/dist/sendError.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":";;;AACA,yDAAwC;AAExC,uCAMkB;AAClB,yCAA+D;AAC/D,mCAKgB;AAEhB,MAAM,oBAAoB,GAAG,CAC3B,GAAqB,EACrB,KAAqB,EACb,EAAE;IACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,KAAK,CAAA;IAC1D,GAAG,CAAC,WAAW,CAAC,GAAG,UAAU,IAAI,aAAa,EAAE,CAAC,CAAA;IACjD,GAAG,CAAC,WAAW,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;IACnD,GAAG,CAAC,WAAW,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAA;IAC/D,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;IACnD,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,KAAK,EAAE,OAAO;QACd,IAAI;KACL,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,SAAgB,aAAa,CAC3B,MAAmB,EACnB,GAAyB,EACzB,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,IAAA,sBAAG,EACD,GAAG,EACH,oBAAoB,CAClB,GAAG,CAAC,OAAO,CAAC,GAAG,EACf,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAC7C,CACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAlBD,sCAkBC;AAED,SAAgB,SAAS,CACvB,MAAmB,EACnB,GAA4C,EAC5C,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,uBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,OAAO,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;KACtD;SAAM,IAAI,IAAA,qBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC9D,MAAM,EAAE,GAAqB,GAAG,CAAC,OAAO,CAAA;QACxC,EAAE,CAAC,IAAI,CAAC,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACpE;AACH,CAAC;AAhBD,8BAgBC"}
+{"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":";;;AAAA,yDAAwC;AAExC,gDAMyB;AACzB,yCAA+D;AAC/D,mCAKgB;AAEhB,MAAM,iBAAiB,GAAG,CACxB,SAAyB,EACzB,GAAyB,EACzB,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;IAC9D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,UAAU,IAAI,aAAa,EAAE,CAAC,CAAA;QAC7D,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;YACpC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;SAChE;QACD,IAAA,sBAAG,EACD,GAAG,EACH,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE,OAAO;YACd,IAAI;SACL,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,SAAgB,aAAa,CAC3B,MAAmB,EACnB,GAAyB,EACzB,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IAC5D,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC;AAXD,sCAWC;AAED,SAAgB,aAAa,CAC3B,GAA4C,EAC5C,SAAyB;IAEzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,yBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;KAClC;SAAM,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,EAAE,GAAqB,GAAG,CAAC,OAAO,CAAA;QACxC,EAAE,CAAC,IAAI,CAAC,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACpE;AACH,CAAC;AAbD,sCAaC;AAED,SAAgB,SAAS,CACvB,MAAmB,EACnB,GAA4C,EAC5C,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,yBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,OAAO,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;KACtD;SAAM,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC9D,MAAM,EAAE,GAAqB,GAAG,CAAC,OAAO,CAAA;QACxC,EAAE,CAAC,IAAI,CAAC,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACpE;AACH,CAAC;AAhBD,8BAgBC"}

package/dist/sendHttpResponse.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
-import { Context, HttpSession } from './context';
+import { Context, HttpSession, HttpHeaders } from '@based/functions';
 export declare const end: (ctx: Context<HttpSession>, payload?: string | Buffer | Uint8Array) => void;
-export declare const sendHttpResponse: (ctx: Context<HttpSession>, result: any) => void;
+export declare const sendHeaders: (ctx: Context<HttpSession>, headers: HttpHeaders) => void;
+export declare const sendHttpResponse: (ctx: Context<HttpSession>, result: any, headers?: HttpHeaders, statusCode?: string) => void;

package/dist/sendHttpResponse.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendHttpResponse = exports.end = void 0;
+exports.sendHttpResponse = exports.sendHeaders = exports.end = void 0;
+const stream_1 = require("stream");
 const compress_1 = require("./compress");
 const end = (ctx, payload) => {
     if (!ctx.session) {
         return;
     }
-    ctx.session.res.writeHeader('Access-Control-Allow-Origin', '*');
-    // only allowed headers
-    ctx.session.res.writeHeader('Access-Control-Allow-Headers', '*');
-    if (payload === undefined) {
+    // check for 'headers set'
+    if (!ctx.session.corsSend) {
+        ctx.session.res.writeHeader('Access-Control-Allow-Origin', '*');
+        ctx.session.res.writeHeader('Access-Control-Allow-Headers', '*');
+    }
+    if (payload === undefined || ctx.session.method === 'options') {
         ctx.session.res.end();
     }
     else {
@@ -20,7 +23,23 @@ const end = (ctx, payload) => {
     ctx.session = null;
 };
 exports.end = end;
-const sendHttpResponse = (ctx, result) => {
+const sendHeaders = (ctx, headers) => {
+    for (const header in headers) {
+        const value = headers[header];
+        ctx.session.res.writeHeader(header, Array.isArray(value)
+            ? value.join(',')
+            : typeof value === 'string'
+                ? value
+                : String(value));
+        if (header === 'Access-Control-Allow-Origin' ||
+            header === 'access-control-allow-origin') {
+            ctx.session.corsSend = true;
+        }
+    }
+};
+exports.sendHeaders = sendHeaders;
+const sendHttpResponse = (ctx, result, headers, statusCode = '200 OK') => {
+    // handle custom http response here...
     if (!ctx.session) {
         return;
     }
@@ -31,16 +50,49 @@ const sendHttpResponse = (ctx, result) => {
         cType = 'text/plain';
         parsed = result;
     }
+    else if (result instanceof stream_1.Readable || result instanceof stream_1.Duplex) {
+        // received stream....
+        ctx.session.res.cork(() => {
+            ctx.session.res.writeStatus(statusCode);
+            if (headers) {
+                (0, exports.sendHeaders)(ctx, headers);
+            }
+            if (!ctx.session.corsSend) {
+                ctx.session.res.writeHeader('Access-Control-Allow-Origin', '*');
+                ctx.session.res.writeHeader('Access-Control-Allow-Headers', '*');
+            }
+        });
+        result.on('data', (d) => {
+            ctx.session?.res.write(d);
+        });
+        result.on('end', () => {
+            ctx.session?.res.end();
+        });
+        return;
+    }
     else {
         cType = 'application/json';
         parsed = JSON.stringify(result);
     }
-    (0, compress_1.compress)(parsed, ctx.session.headers.encoding).then(({ payload, encoding }) => {
+    (0, compress_1.compress)(parsed, headers && ('Content-Encoding' in headers || 'content-encoding' in headers)
+        ? undefined
+        : ctx.session.headers.encoding).then(({ payload, encoding }) => {
         if (ctx.session.res) {
             ctx.session.res.cork(() => {
-                ctx.session.res.writeStatus('200 OK');
-                ctx.session.res.writeHeader('Cache-Control', 'max-age=0, must-revalidate');
-                ctx.session.res.writeHeader('Content-Type', cType);
+                ctx.session.res.writeStatus(statusCode);
+                if (headers) {
+                    (0, exports.sendHeaders)(ctx, headers);
+                    if (!('Cache-Control' in headers || 'cache-control' in headers)) {
+                        ctx.session.res.writeHeader('Cache-Control', 'max-age=0, must-revalidate');
+                    }
+                    if (!('Content-Type' in headers || 'content-type' in headers)) {
+                        ctx.session.res.writeHeader('Content-Type', cType);
+                    }
+                }
+                else {
+                    ctx.session.res.writeHeader('Cache-Control', 'max-age=0, must-revalidate');
+                    ctx.session.res.writeHeader('Content-Type', cType);
+                }
                 if (encoding) {
                     ctx.session.res.writeHeader('Content-Encoding', encoding);
                 }

package/dist/sendHttpResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendHttpResponse.js","sourceRoot":"","sources":["../src/sendHttpResponse.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AAE9B,MAAM,GAAG,GAAG,CACjB,GAAyB,EACzB,OAAsC,EACtC,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;IAC/D,uBAAuB;IACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAA;IAChE,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;KACtB;SAAM;QACL,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;KAC7B;IACD,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;IACtB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;IACtB,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;AACpB,CAAC,CAAA;AAlBY,QAAA,GAAG,OAkBf;AAEM,MAAM,gBAAgB,GAAG,CAAC,GAAyB,EAAE,MAAW,EAAE,EAAE;IACzE,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IAED,IAAI,KAAa,CAAA;IAEjB,uGAAuG;IACvG,IAAI,MAAc,CAAA;IAClB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,KAAK,GAAG,YAAY,CAAA;QACpB,MAAM,GAAG,MAAM,CAAA;KAChB;SAAM;QACL,KAAK,GAAG,kBAAkB,CAAA;QAC1B,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;KAChC;IACD,IAAA,mBAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CACjD,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;QACxB,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE;YACnB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;gBACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;gBACrC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CACzB,eAAe,EACf,4BAA4B,CAC7B,CAAA;gBACD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;gBAClD,IAAI,QAAQ,EAAE;oBACZ,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;iBAC1D;gBACD,IAAA,WAAG,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YACnB,CAAC,CAAC,CAAA;SACH;IACH,CAAC,CACF,CAAA;AACH,CAAC,CAAA;AAlCY,QAAA,gBAAgB,oBAkC5B"}
+{"version":3,"file":"sendHttpResponse.js","sourceRoot":"","sources":["../src/sendHttpResponse.ts"],"names":[],"mappings":"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"}

package/dist/server.d.ts

@@ -1,17 +1,20 @@
 /// <reference types="node" />
-import type { Context } from './context';
+/// <reference types="node" />
+import type { Context, BasedFunctionClient } from '@based/functions';
 import type { ActiveObservable } from './observable';
 import uws from '@based/uws';
 import { BasedFunctions, FunctionConfig } from './functions';
 import { BasedAuth, AuthConfig } from './auth';
 import { BasedErrorCode, BasedErrorData } from './error';
+import { BasedFunctionClient as BasedServerFunctionClient } from './functionApi';
+import util from 'node:util';
 declare type EventMap = {
     error: BasedErrorData;
     ratelimit: void;
     log: any;
 };
 declare type Event = keyof EventMap;
-declare type Listener<T> = (context: Context, data?: T, err?: Error) => void;
+declare type Listener<T> = (context: Context, data?: T, err?: Error | string) => void;
 declare type RateLimit = {
     ws: number;
     http: number;
@@ -20,9 +23,11 @@ declare type RateLimit = {
 export declare type ServerOptions = {
     port?: number;
     key?: string;
+    disableRest?: boolean;
     cert?: string;
     functions?: FunctionConfig;
     rateLimit?: RateLimit;
+    client?: (server: BasedServer) => BasedFunctionClient;
     auth?: AuthConfig;
     workerRequest?: (type: string, payload?: any) => void | Promise<any>;
     ws?: {
@@ -35,6 +40,7 @@ export declare type ServerOptions = {
     };
 };
 export declare class BasedServer {
+    client: BasedServerFunctionClient;
     functions: BasedFunctions;
     auth: BasedAuth;
     port: number;
@@ -57,8 +63,9 @@ export declare class BasedServer {
         [E in Event]?: Listener<EventMap[E]>[];
     };
     workerRequest: (type: string, payload?: any) => void | Promise<any>;
+    [util.inspect.custom](): string;
     constructor(opts: ServerOptions);
-    emit(type: Event, client: Context, val: EventMap[Event], err?: Error): void;
+    emit(type: Event, client: Context, val: EventMap[Event], err?: Error | string): void;
     on(type: Event, fn: Listener<EventMap[Event]>): void;
     removeAllListeners(): void;
     once(type: Event, fn: Listener<EventMap[Event]>): void;

package/dist/server.js

@@ -9,6 +9,9 @@ const incoming_1 = __importDefault(require("./incoming"));
 const functions_1 = require("./functions");
 const auth_1 = require("./auth");
 const utils_1 = require("@saulx/utils");
+const picocolors = require("picocolors");
+const functionApi_1 = require("./functionApi");
+const node_util_1 = __importDefault(require("node:util"));
 // extend emitter
 class BasedServer {
     constructor(opts) {
@@ -29,6 +32,13 @@ class BasedServer {
         this.listeners = {};
         this.functions = new functions_1.BasedFunctions(this, opts.functions);
         this.auth = new auth_1.BasedAuth(this, opts.auth);
+        if (opts.client) {
+            // @ts-ignore - allow different ones if you want a special client
+            this.client = opts.client(this);
+        }
+        else {
+            this.client = new functionApi_1.BasedFunctionClient(this);
+        }
         if (opts.workerRequest) {
             this.workerRequest = opts.workerRequest;
         }
@@ -37,6 +47,9 @@ class BasedServer {
         }
         (0, incoming_1.default)(this, opts);
     }
+    [node_util_1.default.inspect.custom]() {
+        return `BasedServer [${this.port}]`;
+    }
     emit(type, client, val, err) {
         if (this.listeners[type]) {
             this.listeners[type].forEach((fn) => fn(client, val, err));
@@ -87,20 +100,19 @@ class BasedServer {
         return new Promise((resolve, reject) => {
             this.uwsApp.listen(this.port, sharedSocket ? 0 : 1, (listenSocket) => {
                 if (listenSocket) {
-                    console.info('💫  Based-edge-server listening on port:', this.port);
-                    // do this better wrap a nice thing arround it
+                    console.info('    Based-server listening on port:', this.port);
                     this.listenSocket = listenSocket;
                     resolve(this);
                 }
                 else {
-                    console.info('🤮  Based-edge-server error on port:', this.port);
+                    console.info(picocolors.red('🤮  Based-server error on port:'), this.port);
                     reject(new Error('Cannot start based-server on port: ' + this.port));
                 }
             });
         });
     }
     async destroy() {
-        console.info('🔥 Destroy Based-edge-server');
+        console.info(picocolors.gray('    Destroy Based-server\n'));
         if (this.listenSocket) {
             uws_1.default.us_listen_socket_close(this.listenSocket);
             this.listenSocket = null;

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;AAEA,qDAA4B;AAC5B,0DAAoC;AACpC,2CAA4D;AAC5D,iCAA8C;AAE9C,wCAAmC;AAoCnC,iBAAiB;AACjB,MAAa,WAAW;IAgDtB,YAAY,IAAmB;QAvCxB,cAAS,GAAc;YAC5B,EAAE,EAAE,GAAG;YACP,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,GAAG;SACX,CAAA;QAIM,eAAU,GAAgB,IAAI,GAAG,EAAE,CAAA;QAE1C,+CAA+C;QACxC,eAAU,GAAgB,IAAI,GAAG,EAAE,CAAA;QAE1C,mCAAmC;QACnC,wDAAwD;QACjD,qBAAgB,GAMnB,IAAI,GAAG,EAAE,CAAA;QAEN,8BAAyB,GAAY,KAAK,CAAA;QAI1C,sBAAiB,GAEpB,EAAE,CAAA;QAEC,0BAAqB,GAAkC,IAAI,GAAG,EAAE,CAAA;QAEhE,cAAS,GAEZ,EAAE,CAAA;QAKJ,IAAI,CAAC,SAAS,GAAG,IAAI,0BAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACzD,IAAI,CAAC,IAAI,GAAG,IAAI,gBAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QAC1C,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;SACxC;QACD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;SAChC;QACD,IAAA,kBAAW,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACzB,CAAC;IAED,IAAI,CAAC,IAAW,EAAE,MAAe,EAAE,GAAoB,EAAE,GAAW;QAClE,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;SAC3D;IACH,CAAC;IAED,EAAE,CAAC,IAAW,EAAE,EAA6B;QAC3C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;SAC1B;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,kBAAkB;QAChB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;IACrB,CAAC;IAED,IAAI,CAAC,IAAW,EAAE,EAA6B;QAC7C,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;YAClB,EAAE,CAAC,CAAC,CAAC,CAAA;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACpB,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,IAAW,EAAE,EAA6B;QAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,EAAE,EAAE;gBACP,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;aAC5B;iBAAM;gBACL,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;oBACpD,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;wBACvB,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;wBACtB,MAAK;qBACN;iBACF;gBACD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC5B;aACF;SACF;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAa,EAAE,YAAsB;QAC/C,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;SACjB;aAAM;YACL,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;SACjB;QACD,MAAM,IAAA,YAAI,EAAC,EAAE,CAAC,CAAA;QACd,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE;gBACnE,IAAI,YAAY,EAAE;oBAChB,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;oBACnE,8CAA8C;oBAC9C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;oBAChC,OAAO,CAAC,IAAI,CAAC,CAAA;iBACd;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;oBAC/D,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;iBACrE;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;QAC5C,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,aAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAC7C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;SACzB;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;IACpB,CAAC;CACF;AAtID,kCAsIC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/dist/verifyRoute.d.ts

@@ -0,0 +1,14 @@
+import { Context } from '@based/functions';
+import { BasedFunctionRoute, BasedQueryFunctionRoute, BasedRoute, BasedStreamFunctionRoute } from './functions';
+import { BasedServer } from './server';
+declare type FnType = 'query' | 'stream' | 'fn';
+export declare const verifyRoute: <T extends FnType>(server: BasedServer, ctx: Context, type: T, route: BasedRoute | null, name: string, id?: number) => T extends "query" ? BasedQueryFunctionRoute : T extends "stream" ? BasedStreamFunctionRoute : {
+    name: string;
+    path?: string;
+    maxPayloadSize?: number;
+    rateLimitTokens?: number;
+    public?: boolean;
+    headers?: string[];
+    internalOnly?: boolean;
+};
+export {};

package/dist/verifyRoute.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyRoute = void 0;
+const functions_1 = require("@based/functions");
+const functions_2 = require("./functions");
+const sendError_1 = require("./sendError");
+const error_1 = require("./error");
+const verifyRoute = (server, ctx = server.client.ctx, type, route, name, id) => {
+    if (!ctx.session) {
+        // console.warn('VERIFY ROUTE NO SESSION', name)
+        return null;
+    }
+    if (!route) {
+        if (!(0, functions_1.isClientContext)(ctx)) {
+            throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
+                route: {
+                    name,
+                },
+            });
+        }
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, type === 'query'
+            ? {
+                route: { name },
+                observableId: id,
+            }
+            : {
+                route: { name },
+                requestId: id,
+            });
+        return null;
+    }
+    if (route.internalOnly === true && (0, functions_1.isClientContext)(ctx)) {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, type === 'query'
+            ? {
+                route: { name },
+                observableId: id,
+            }
+            : {
+                route: { name },
+                requestId: id,
+            });
+        return null;
+    }
+    if (type === 'query') {
+        if (!(0, functions_2.isQueryFunctionRoute)(route)) {
+            if (!(0, functions_1.isClientContext)(ctx)) {
+                throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotObservable, {
+                    route,
+                });
+            }
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotObservable, {
+                route: { name },
+                observableId: id,
+            });
+            return null;
+        }
+    }
+    if (type === 'stream') {
+        if (!(0, functions_2.isStreamFunctionRoute)(route)) {
+            if (!(0, functions_1.isClientContext)(ctx)) {
+                throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotStream, {
+                    route,
+                });
+            }
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotStream, {
+                route: { name },
+                requestId: id,
+            });
+            return null;
+        }
+    }
+    if (type === 'fn' && !(0, functions_2.isFunctionRoute)(route)) {
+        if (!(0, functions_1.isClientContext)(ctx)) {
+            if ((0, functions_2.isStreamFunctionRoute)(route)) {
+                throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotObservable, {
+                    route,
+                });
+            }
+            throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsObservable, {
+                route,
+            });
+        }
+        if ((0, functions_2.isStreamFunctionRoute)(route)) {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsStream, {
+                route,
+                requestId: id,
+            });
+        }
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsObservable, {
+            route,
+            requestId: id,
+        });
+        return null;
+    }
+    // @ts-ignore fixed by checking the routes
+    return route;
+};
+exports.verifyRoute = verifyRoute;
+//# sourceMappingURL=verifyRoute.js.map

package/dist/verifyRoute.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/server",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "license": "MIT",
   "main": "./dist/index.js",
   "files": [
@@ -22,13 +22,15 @@
     "@based/uws": "2.4.0",
     "@saulx/diff": "^1.1.3",
     "@saulx/hash": "^1.1.0",
-    "@saulx/utils": "^2.4.0",
+    "@saulx/utils": "^3.2.0",
     "picocolors": "^1.0.0",
     "jsonexport": "^3.2.0",
     "jsonwebtoken": "^8.5.1",
     "mime-types": "^2.1.31"
   },
   "devDependencies": {
+    "@types/mime-types": "2.1.1",
+    "@based/functions": "^1.0.0",
     "@types/node": "^17.0.23",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5",

package/dist/BasedServerClient.d.ts

@@ -1,71 +0,0 @@
-import { Query, SetOptions, GetOptions, GenericObject, Copy, Configuration, Based as BasedAdminClient, TrackOpts } from '@based/client';
-import RedisSelvaClient from '@saulx/selva/dist/src/redis';
-import { Params } from './Params';
-import { SignOptions } from 'jsonwebtoken';
-declare class BasedServerClient {
-    private _params;
-    private _noAuth;
-    constructor(params: Params, noAuth?: boolean);
-    opts: {
-        cluster: string;
-        org: string;
-        project: string;
-        env: string;
-    };
-    get state(): GenericObject;
-    get redis(): RedisSelvaClient;
-    destroy(): void;
-    private _authorize;
-    event(type: string, params: {
-        [key: string]: string | number | boolean;
-    }, opts?: TrackOpts): Promise<void>;
-    clearAnalytics(type: string, params?: {
-        [key: string]: number | string | boolean;
-    }): Promise<void>;
-    observeUntil(query: Query, condition: (data: GenericObject, checksum: number) => boolean, onData?: (data: any, checksum: number) => void): Promise<GenericObject>;
-    admin(key: string): Promise<BasedAdminClient>;
-    observe(query: Query, onData: (data: any, checksum: number) => void, onErr?: (err: Error) => void): Promise<() => void>;
-    observe(name: string, onData: (data: any, checksum: number) => void, onErr?: (err: Error) => void): Promise<() => void>;
-    observe(name: string, payload: any, onData: (data: any, checksum: number) => void, onErr?: (err: Error) => void): Promise<() => void>;
-    get(query: GetOptions): Promise<GenericObject>;
-    get(name: string, payload?: any): Promise<GenericObject>;
-    copy(payload: Copy): Promise<{
-        ids: string[];
-    }>;
-    id(type: string, opts?: any): Promise<string>;
-    call(name: string, payload?: any): Promise<GenericObject>;
-    delete(payload: {
-        $id: string;
-        $db?: string;
-    }): Promise<{
-        isDeleted: boolean;
-    }>;
-    set(payload: SetOptions): Promise<{
-        id: string;
-    }>;
-    schema(): Promise<Configuration>;
-    updateSchema(configuration: {
-        schema?: GenericObject;
-        db?: string;
-    }): Promise<GenericObject>;
-    encode(payload: string | object, privateKeySecret: string | {
-        secret: string;
-    } | {
-        key: string;
-    }, type?: 'jwt', signOptions?: SignOptions): Promise<string>;
-    decode(payload: string, secretOrPublicKey: string | {
-        publicKey: string;
-    }, type?: 'jwt'): Promise<any>;
-    secret(secret: string): Promise<any>;
-    digest(payload: string): Promise<string>;
-    sendEmail(payload: {
-        to: string;
-        subject: string;
-        body: string;
-        from?: string;
-    }): Promise<{
-        status: 'ok';
-        message?: string;
-    }>;
-}
-export default BasedServerClient;