@based/server 6.8.0 → 7.0.1

package/dist/server.d.ts

@@ -1,13 +1,13 @@
-/// <reference types="node" />
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { Context, BasedFunctionClient, WebSocketSession, HttpSession, Geo } from '@based/functions';
-import type { ActiveObservable } from './query';
+import type { ActiveObservable } from './query/index.js';
 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 { ActiveChannel } from './channel';
+import { BasedFunctions, FunctionConfig } from './functions/index.js';
+import { BasedAuth, AuthConfig } from './auth/index.js';
+import { BasedErrorCode, BasedErrorData } from './error/index.js';
+import { BasedFunctionClient as BasedServerFunctionClient } from './functionApi/index.js';
+import { ActiveChannel } from './channel/index.js';
 import util from 'node:util';
 type EventMap = {
     error: BasedErrorData | BasedErrorCode;

package/dist/server.js

@@ -1,18 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasedServer = void 0;
-const functions_1 = require("@based/functions");
-const uws_1 = __importDefault(require("@based/uws"));
-const incoming_1 = __importDefault(require("./incoming"));
-const functions_2 = 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"));
+import { createRequire as _createRequire } from "module";
+const __require = _createRequire(import.meta.url);
+import { isClientContext, } from '@based/functions';
+import uws from '@based/uws';
+import initNetwork from './incoming/index.js';
+import { BasedFunctions } from './functions/index.js';
+import { BasedAuth } from './auth/index.js';
+import { wait } from '@saulx/utils';
+const picocolors = __require("picocolors");
+import { BasedFunctionClient as BasedServerFunctionClient } from './functionApi/index.js';
+import util from 'node:util';
 /**
 Based server
 
@@ -44,51 +40,65 @@ server.functions.addRoutes({
 await server.start()
 ```
 */
-class BasedServer {
-    [node_util_1.default.inspect.custom]() {
+export class BasedServer {
+    clients; // for now any...
+    client;
+    functions;
+    auth;
+    port;
+    uwsApp;
+    silent;
+    queryEvents;
+    channelEvents;
+    rateLimit = {
+        ws: 2e3,
+        http: 1e3,
+        drain: 500,
+    };
+    listenSocket;
+    geo = async (ctx) => {
+        if (!ctx.session) {
+            throw new Error('Session expired while parsing geo location');
+        }
+        if (isClientContext(ctx)) {
+            return {
+                country: 'NL',
+                ip: ctx.session.ip,
+                accuracy: 0,
+                long: 0,
+                lat: 0,
+                regions: [],
+            };
+        }
+        else {
+            throw new Error('Cannot parse geo location from a non external context');
+        }
+    };
+    getIp = (res) => {
+        return Buffer.from(res.getRemoteAddressAsText()).toString();
+    };
+    blockedIps = new Set();
+    // opposite of blockedIps can never get blocked
+    allowedIps = new Set();
+    // per ip so consitent unfortanetly
+    // check how large it is and make a loop to downgrade it
+    rateLimitCounter = new Map();
+    requestsCounterInProgress = false;
+    requestsCounterTimeout;
+    obsCleanTimeout;
+    obsCleanupCycle = 30e3;
+    activeObservables = {};
+    activeObservablesById = new Map();
+    channelCleanTimeout;
+    channelCleanupCycle = 30e3;
+    activeChannels = {};
+    activeChannelsById = new Map();
+    listeners = {};
+    workerRequest;
+    [util.inspect.custom]() {
         return `BasedServer [${this.port}]`;
     }
     constructor(opts) {
-        this.rateLimit = {
-            ws: 2e3,
-            http: 1e3,
-            drain: 500,
-        };
-        this.geo = async (ctx) => {
-            if (!ctx.session) {
-                throw new Error('Session expired while parsing geo location');
-            }
-            if ((0, functions_1.isClientContext)(ctx)) {
-                return {
-                    country: 'NL',
-                    ip: ctx.session.ip,
-                    accuracy: 0,
-                    long: 0,
-                    lat: 0,
-                    regions: [],
-                };
-            }
-            else {
-                throw new Error('Cannot parse geo location from a non external context');
-            }
-        };
-        this.getIp = (res) => {
-            return Buffer.from(res.getRemoteAddressAsText()).toString();
-        };
-        this.blockedIps = new Set();
-        // opposite of blockedIps can never get blocked
-        this.allowedIps = new Set();
-        // per ip so consitent unfortanetly
-        // check how large it is and make a loop to downgrade it
-        this.rateLimitCounter = new Map();
-        this.requestsCounterInProgress = false;
-        this.obsCleanupCycle = 30e3;
-        this.activeObservables = {};
-        this.activeObservablesById = new Map();
-        this.channelCleanupCycle = 30e3;
-        this.activeChannels = {};
-        this.activeChannelsById = new Map();
-        this.listeners = {};
         if (opts.query) {
             this.queryEvents = opts.query;
         }
@@ -99,14 +109,14 @@ class BasedServer {
             this.silent = opts.silent;
         }
         this.clients = opts.clients ?? {};
-        this.functions = new functions_2.BasedFunctions(this, opts.functions);
-        this.auth = new auth_1.BasedAuth(this, opts.auth);
+        this.functions = new BasedFunctions(this, opts.functions);
+        this.auth = new 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);
+            this.client = new BasedServerFunctionClient(this);
         }
         if (opts.rateLimit) {
             this.rateLimit = opts.rateLimit;
@@ -117,7 +127,7 @@ class BasedServer {
         if (opts.getIp) {
             this.getIp = opts.getIp;
         }
-        (0, incoming_1.default)(this, opts);
+        initNetwork(this, opts);
     }
     emit(type, client, val, err) {
         if (this.listeners[type]) {
@@ -165,7 +175,7 @@ class BasedServer {
         else {
             this.port = port;
         }
-        await (0, utils_1.wait)(10);
+        await wait(10);
         return new Promise((resolve, reject) => {
             this.uwsApp.listen(this.port, sharedSocket ? 0 : 1, (listenSocket) => {
                 if (listenSocket) {
@@ -186,12 +196,11 @@ class BasedServer {
             console.info(picocolors.gray(`    Destroy Based-server ${this.port} \n`));
         }
         if (this.listenSocket) {
-            uws_1.default.us_listen_socket_close(this.listenSocket);
+            uws.us_listen_socket_close(this.listenSocket);
             this.listenSocket = null;
         }
         this.listenSocket = null;
         this.uwsApp = null;
     }
 }
-exports.BasedServer = BasedServer;
 //# sourceMappingURL=server.js.map

package/dist/server.js.map

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

package/dist/verifyRoute.d.ts

@@ -1,3 +1,3 @@
 import { Context, BasedRoute, BasedFunctionTypes } from '@based/functions';
-import { BasedServer } from './server';
-export declare const verifyRoute: <T extends BasedFunctionTypes>(server: BasedServer, ctx: Context, type: T, route: BasedRoute | null, name: string, id?: number) => BasedRoute<T, "type" | "name">;
+import { BasedServer } from './server.js';
+export declare const verifyRoute: <T extends BasedFunctionTypes>(server: BasedServer, ctx: Context, type: T, route: BasedRoute | null, name: string, id?: number) => BasedRoute<T>;

package/dist/verifyRoute.js

@@ -1,41 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyRoute = void 0;
-const functions_1 = require("@based/functions");
-const sendError_1 = require("./sendError");
-const error_1 = require("./error");
-const verifyRoute = (server, ctx = server.client.ctx, type, route, name, id) => {
+import { isClientContext, isBasedRoute, } from '@based/functions';
+import { sendSimpleError } from './sendError.js';
+import { BasedErrorCode, createError } from './error/index.js';
+export const verifyRoute = (server, ctx = server.client.ctx, type, route, name, id) => {
     if (!ctx.session) {
         return null;
     }
     if (!route) {
-        if (!(0, functions_1.isClientContext)(ctx)) {
-            throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
+        if (!isClientContext(ctx)) {
+            throw createError(server, ctx, BasedErrorCode.FunctionNotFound, {
                 route: {
                     name,
                     type: 'function',
                 },
             });
         }
-        (0, sendError_1.sendSimpleError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, { name, type }, id);
+        sendSimpleError(server, ctx, BasedErrorCode.FunctionNotFound, { name, type }, id);
         return null;
     }
-    if (route.internalOnly === true && (0, functions_1.isClientContext)(ctx)) {
-        (0, sendError_1.sendSimpleError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, { name, type }, id);
+    if (route.internalOnly === true && isClientContext(ctx)) {
+        sendSimpleError(server, ctx, BasedErrorCode.FunctionNotFound, { name, type }, id);
         return null;
     }
-    if (!(0, functions_1.isBasedRoute)(type, route)) {
-        if (!(0, functions_1.isClientContext)(ctx)) {
-            throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
+    if (!isBasedRoute(type, route)) {
+        if (!isClientContext(ctx)) {
+            throw createError(server, ctx, BasedErrorCode.FunctionIsWrongType, {
                 route,
                 observableId: id,
             });
         }
-        (0, sendError_1.sendSimpleError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, { name, type }, id);
+        sendSimpleError(server, ctx, BasedErrorCode.FunctionIsWrongType, { name, type }, id);
         return null;
     }
     // @ts-ignore fixed by checking the routes
     return route;
 };
-exports.verifyRoute = verifyRoute;
 //# sourceMappingURL=verifyRoute.js.map

package/dist/verifyRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyRoute.js","sourceRoot":"","sources":["../src/verifyRoute.ts"],"names":[],"mappings":";;;AAAA,gDAMyB;AACzB,2CAA6C;AAC7C,mCAAqD;AAG9C,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,MAAe,MAAM,CAAC,MAAM,CAAC,GAAG,EAChC,IAAO,EACP,KAAwB,EACxB,IAAY,EACZ,EAAW,EACW,EAAE;IACxB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,CAAC,KAAK,EAAE;QACV,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;YACzB,MAAM,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE;gBAC9D,KAAK,EAAE;oBACL,IAAI;oBACJ,IAAI,EAAE,UAAU;iBACjB;aACF,CAAC,CAAA;SACH;QACD,IAAA,2BAAe,EACb,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,gBAAgB,EAC/B,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,IAAI,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;QACvD,IAAA,2BAAe,EACb,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,gBAAgB,EAC/B,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,CAAC,IAAA,wBAAY,EAAC,IAAI,EAAE,KAAK,CAAC,EAAE;QAC9B,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;YACzB,MAAM,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,mBAAmB,EAAE;gBACjE,KAAK;gBACL,YAAY,EAAE,EAAE;aACjB,CAAC,CAAA;SACH;QACD,IAAA,2BAAe,EACb,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,mBAAmB,EAClC,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,0CAA0C;IAC1C,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AA7DY,QAAA,WAAW,eA6DvB"}
+{"version":3,"file":"verifyRoute.js","sourceRoot":"","sources":["../src/verifyRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAEf,YAAY,GAEb,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAG9D,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,MAAe,MAAM,CAAC,MAAM,CAAC,GAAG,EAChC,IAAO,EACP,KAAwB,EACxB,IAAY,EACZ,EAAW,EACW,EAAE;IACxB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,CAAC,KAAK,EAAE;QACV,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;YACzB,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,gBAAgB,EAAE;gBAC9D,KAAK,EAAE;oBACL,IAAI;oBACJ,IAAI,EAAE,UAAU;iBACjB;aACF,CAAC,CAAA;SACH;QACD,eAAe,CACb,MAAM,EACN,GAAG,EACH,cAAc,CAAC,gBAAgB,EAC/B,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE;QACvD,eAAe,CACb,MAAM,EACN,GAAG,EACH,cAAc,CAAC,gBAAgB,EAC/B,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;QAC9B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;YACzB,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,mBAAmB,EAAE;gBACjE,KAAK;gBACL,YAAY,EAAE,EAAE;aACjB,CAAC,CAAA;SACH;QACD,eAAe,CACb,MAAM,EACN,GAAG,EACH,cAAc,CAAC,mBAAmB,EAClC,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,0CAA0C;IAC1C,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/package.json

@@ -1,40 +1,36 @@
 {
   "name": "@based/server",
-  "version": "6.8.0",
+  "version": "7.0.1",
   "license": "MIT",
   "main": "./dist/index.js",
+  "type": "module",
   "files": [
     "package.json",
     "README.md",
     "dist"
   ],
-  "exports": {
-    ".": "./dist/index.js",
-    "./worker": "./dist/worker/api.js",
-    "./dist/worker/api": "./dist/worker/api.js"
-  },
   "scripts": {
-    "build": "npx  tsc",
+    "build": "npx tsc",
     "watch": "npm run build -- --watch",
     "clean": "rimraf {.turbo,dist,node_modules}"
   },
   "dependencies": {
     "utility-types": "^3.10.0",
     "@based/uws": "^4.1.0",
-    "@saulx/diff": "^1.1.4",
-    "@saulx/hash": "^2.0.0",
-    "@saulx/utils": "^3.2.2",
+    "@saulx/diff": "^2.0.1",
+    "@saulx/hash": "^3.0.0",
+    "@saulx/utils": "^4.0.1",
     "picocolors": "^1.0.0",
     "jsonexport": "^3.2.0",
     "jsonwebtoken": "^8.5.1",
     "mime-types": "^2.1.31",
-    "@based/functions": "^2.1.3"
+    "@based/functions": "^3.0.0"
   },
   "devDependencies": {
     "@types/mime-types": "2.1.1",
-    "@types/node": "^17.0.23",
-    "ts-node": "^10.1.0",
-    "typescript": "^4.3.5",
+    "@saulx/tsconfig": "^1.0.5",
+    "@saulx/prettier-config": "^1.0.0",
+    "typescript": "^5.2.2",
     "rimraf": "^3.0.2"
   }
 }