@based/server 4.0.0 → 4.0.2

package/dist/incoming/http/streamFunction/stream/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/incoming/http/streamFunction/stream/index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA6C;AAE7C,qDAAiD;AACjD,mEAA0C;AAG1C,6CAAkD;AAClD,mEAA+D;AAC/D,4DAAkC;AAClC,wCAAyC;AACzC,qDAAiD;AACjD,qDAAiD;AAE1C,MAAM,YAAY,GAAG,CAC1B,MAAmB,EACnB,GAAyB,EACzB,KAA+B,EAC/B,IAAY,EACZ,IAAY,EACZ,EAAE;IACF,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAChE,IAAI,SAAS,EAAE;QACb,MAAM,IAAI,GAAG,oBAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACxC,IAAI,IAAI,EAAE;YACR,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAA;SAClD;KACF;IAED,MAAM,MAAM,GAAG,IAAA,sBAAgB,EAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAEzD,IAAI,OAAY,CAAA;IAChB,IAAI,OAAO,IAAI,GAAG,CAAC,OAAO,EAAE;QAC1B,IAAI;YACF,OAAO,GAAG,IAAA,kBAAU,EAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE,GAAE;KACjB;IAED,MAAM,aAAa,GAAkB;QACnC,OAAO;QACP,MAAM;QACN,IAAI;QACJ,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAA,sBAAY,EAAC,IAAI,CAAC,IAAI,EAAE;KACpC,CAAA;IAED,IAAA,qBAAS,EACP,KAAK,EACL,MAAM,EACN,GAAG,EACH,OAAO,EACP,GAAG,EAAE;QACH,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1C,IAAI,IAAI,KAAK,IAAI,EAAE;gBACjB,MAAM,CAAC,OAAO,EAAE,CAAA;gBAChB,OAAM;aACP;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;YACxB,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC;iBAClC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,mBAAmB;gBACnB,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,aAAa,EAAE;oBACnD,GAAG;oBACH,KAAK;iBACN,CAAC,CAAA;YACJ,CAAC,CAAC;iBACD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACV,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oBAC9D,IAAA,mCAAgB,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;iBACzB;qBAAM;oBACL,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;wBACpB,IAAA,mCAAgB,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;oBAC1B,CAAC,CAAC,CAAA;iBACH;YACH,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC,EACD,SAAS,EACT,SAAS,EACT,GAAG,EAAE;QACH,MAAM,CAAC,OAAO,EAAE,CAAA;IAClB,CAAC,CACF,CAAA;AACH,CAAC,CAAA;AArEY,QAAA,YAAY,gBAqExB"}

package/dist/incoming/http/streamFunction/stream.d.ts

@@ -1,5 +1,5 @@
 import { DataStream } from './DataStream';
-import { HttpSession, Context } from '../../../context';
+import { HttpSession, Context } from '@based/functions';
 import { BasedFunctionRoute } from '../../../functions';
 import { BasedServer } from '../../../server';
 declare const _default: (server: BasedServer, route: BasedFunctionRoute, ctx: Context<HttpSession>, size: number) => DataStream;

package/dist/incoming/index.d.ts

@@ -1,3 +1,3 @@
 import type { BasedServer, ServerOptions } from '../server';
-declare const _default: (server: BasedServer, { key, cert, port, ws: wsListeners }: ServerOptions) => void;
+declare const _default: (server: BasedServer, { key, cert, port, ws: wsListeners, disableRest }: ServerOptions) => void;
 export default _default;

package/dist/incoming/index.js

@@ -9,7 +9,7 @@ const ws_1 = require("./ws");
 const observable_1 = require("../observable");
 const http_1 = require("./http");
 const auth_1 = require("./ws/auth");
-exports.default = (server, { key, cert, port, ws: wsListeners }) => {
+exports.default = (server, { key, cert, port, ws: wsListeners, disableRest }) => {
     const app = key && cert
         ? uws_1.default.SSLApp({
             key_file_name: key,
@@ -26,11 +26,11 @@ exports.default = (server, { key, cert, port, ws: wsListeners }) => {
             close: () => undefined,
         };
     }
-    app
-        .ws('/*', {
+    app.ws('/*', {
         maxPayloadLength: 1024 * 1024 * 10,
         idleTimeout: 100,
         maxBackpressure: 1024,
+        // No compression handled in the protocol
         // compression: uws.SHARED_COMPRESSOR,
         upgrade: server.auth?.authorizeConnection
             ? (res, req, ctx) => {
@@ -49,13 +49,12 @@ exports.default = (server, { key, cert, port, ws: wsListeners }) => {
                 };
                 ws.c = ctx;
                 wsListeners.open(ctx);
-                if (ctx.session.authState) {
-                    (0, auth_1.sendAuthMessage)(ctx);
+                if (ctx.session.authState.token || ctx.session.authState.refreshToken) {
+                    (0, auth_1.sendAndVerifyAuthMessage)(server, ctx);
                 }
             }
         },
         close: (ws) => {
-            console.info('CLOSE!');
             // cl--
             ws.obs.forEach((id) => {
                 (0, observable_1.unsubscribeWsIgnoreClient)(server, id, ws.c);
@@ -74,11 +73,14 @@ exports.default = (server, { key, cert, port, ws: wsListeners }) => {
             //   ws.client.drain()
             // }
         },
-    })
-        // REST
-        .get('/*', (res, req) => (0, http_1.httpHandler)(server, req, res))
-        .post('/*', (res, req) => (0, http_1.httpHandler)(server, req, res))
-        .options('/*', (res, req) => (0, http_1.httpHandler)(server, req, res));
+    });
+    if (!disableRest) {
+        app.get('/*', (res, req) => (0, http_1.httpHandler)(server, req, res));
+        app.post('/*', (res, req) => (0, http_1.httpHandler)(server, req, res));
+        app.options('/*', (res, req) => (0, http_1.httpHandler)(server, req, res));
+    }
+    // REST make this configurable
+    // .options('/*', (res, req) => httpHandler(server, req, res))
     server.uwsApp = app;
 };
 //# sourceMappingURL=index.js.map

package/dist/incoming/index.js.map

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

package/dist/incoming/upgrade.js

@@ -4,14 +4,25 @@ exports.upgradeAuthorize = exports.upgrade = void 0;
 const auth_1 = require("../auth");
 const security_1 = require("../security");
 const ip_1 = require("../ip");
+const error_1 = require("../error");
 let clientId = 0;
-const upgradeInternal = (res, req, 
+const upgradeInternal = (server, res, req, 
 // eslint-disable-next-line
 ctx, ip) => {
-    const query = req.getQuery(); // encode
+    const secWebSocketProtocol = req.getHeader('sec-websocket-protocol');
     const ua = req.getHeader('user-agent');
+    if (!secWebSocketProtocol) {
+        server.emit('error', {
+            session: {
+                ua,
+                ip,
+            },
+        }, { code: error_1.BasedErrorCode.MissingAuthStateProtocolHeader });
+        res.close();
+        return;
+    }
+    const query = req.getQuery();
     const secWebSocketKey = req.getHeader('sec-websocket-key');
-    const secWebSocketProtocol = req.getHeader('sec-websocket-protocol');
     const secWebSocketExtensions = req.getHeader('sec-websocket-extensions');
     res.writeStatus('101 Switching Protocols');
     res.upgrade({
@@ -19,9 +30,7 @@ ctx, ip) => {
         ua,
         ip,
         id: ++clientId,
-        authState: secWebSocketProtocol
-            ? (0, auth_1.parseAuthState)(decodeURI(secWebSocketProtocol))
-            : undefined,
+        authState: (0, auth_1.parseAuthState)(secWebSocketProtocol),
         obs: new Set(),
         unauthorizedObs: new Set(),
     }, secWebSocketKey, secWebSocketProtocol, secWebSocketExtensions, ctx);
@@ -33,7 +42,7 @@ ctx) => {
     if ((0, security_1.blockIncomingRequest)(server, ip, res, req, server.rateLimit.ws, 10)) {
         return;
     }
-    upgradeInternal(res, req, ctx, ip);
+    upgradeInternal(server, res, req, ctx, ip);
 };
 exports.upgrade = upgrade;
 const upgradeAuthorize = (server, res, req, 
@@ -47,12 +56,12 @@ ctx) => {
     if ((0, security_1.blockIncomingRequest)(server, ip, res, req, server.rateLimit.ws, 10)) {
         return;
     }
-    server.auth.authorizeConnection(req).then((authorized) => {
+    server.auth.authorizeConnection(server.client, req).then((authorized) => {
         if (aborted) {
             return;
         }
         if (authorized) {
-            upgradeInternal(res, req, ctx, ip);
+            upgradeInternal(server, res, req, ctx, ip);
         }
         else {
             res.writeStatus('401 Unauthorized');

package/dist/incoming/upgrade.js.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/incoming/upgrade.ts"],"names":[],"mappings":";;;AACA,kCAAwC;AAExC,0CAAkD;AAElD,8BAA6B;AAE7B,IAAI,QAAQ,GAAG,CAAC,CAAA;AAEhB,MAAM,eAAe,GAAG,CACtB,GAAqB,EACrB,GAAoB;AACpB,2BAA2B;AAC3B,GAA4B,EAC5B,EAAU,EACV,EAAE;IACF,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA,CAAC,SAAS;IACtC,MAAM,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IACtC,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAC1D,MAAM,oBAAoB,GAAG,GAAG,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAA;IACpE,MAAM,sBAAsB,GAAG,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAA;IACxE,GAAG,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAA;IAC1C,GAAG,CAAC,OAAO,CACS;QAChB,KAAK;QACL,EAAE;QACF,EAAE;QACF,EAAE,EAAE,EAAE,QAAQ;QACd,SAAS,EAAE,oBAAoB;YAC7B,CAAC,CAAC,IAAA,qBAAc,EAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;YACjD,CAAC,CAAC,SAAS;QACb,GAAG,EAAE,IAAI,GAAG,EAAE;QACd,eAAe,EAAE,IAAI,GAAG,EAAE;KAC3B,EACD,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,GAAG,CACJ,CAAA;AACH,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CACrB,MAAmB,EACnB,GAAqB,EACrB,GAAoB;AACpB,2BAA2B;AAC3B,GAA4B,EAC5B,EAAE;IACF,MAAM,EAAE,GAAG,IAAA,UAAK,EAAC,GAAG,CAAC,CAAA;IACrB,IAAI,IAAA,+BAAoB,EAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;QACvE,OAAM;KACP;IACD,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;AACpC,CAAC,CAAA;AAZY,QAAA,OAAO,WAYnB;AAEM,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,GAAqB,EACrB,GAAoB;AACpB,2BAA2B;AAC3B,GAA4B,EAC5B,EAAE;IACF,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,OAAO,GAAG,IAAI,CAAA;IAChB,CAAC,CAAC,CAAA;IACF,MAAM,EAAE,GAAG,IAAA,UAAK,EAAC,GAAG,CAAC,CAAA;IACrB,IAAI,IAAA,+BAAoB,EAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;QACvE,OAAM;KACP;IACD,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;QACvD,IAAI,OAAO,EAAE;YACX,OAAM;SACP;QACD,IAAI,UAAU,EAAE;YACd,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;SACnC;aAAM;YACL,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;YACnC,GAAG,CAAC,GAAG,EAAE,CAAA;SACV;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AA1BY,QAAA,gBAAgB,oBA0B5B"}
+{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/incoming/upgrade.ts"],"names":[],"mappings":"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"}

package/dist/incoming/ws/auth.d.ts

@@ -1,5 +1,5 @@
 import { BasedServer } from '../../server';
-import { WebSocketSession, Context } from '../../context';
-export declare type AuthState = any;
-export declare const authMessage: (arr: Uint8Array, start: number, len: number, isDeflate: boolean, ctx: Context<WebSocketSession>, server: BasedServer) => boolean;
-export declare const sendAuthMessage: (ctx: Context<WebSocketSession>) => void;
+import { WebSocketSession, Context } from '@based/functions';
+import { BinaryMessageHandler } from './types';
+export declare const authMessage: BinaryMessageHandler;
+export declare const sendAndVerifyAuthMessage: (server: BasedServer, ctx: Context<WebSocketSession>) => void;

package/dist/incoming/ws/auth.js

@@ -1,40 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendAuthMessage = exports.authMessage = void 0;
+exports.sendAndVerifyAuthMessage = exports.authMessage = void 0;
 const protocol_1 = require("../../protocol");
 const observable_1 = require("./observable");
-const auth_1 = require("../../auth");
 const security_1 = require("../../security");
+const sendAuthMessage = (ctx, payload) => ctx.session?.send((0, protocol_1.encodeAuthResponse)((0, protocol_1.valueToBuffer)(payload)), true, false);
+const parse = (payload) => {
+    try {
+        return JSON.parse(payload);
+    }
+    catch (err) {
+        return { error: 'invalid token' };
+    }
+};
 const authMessage = (arr, start, len, isDeflate, ctx, server) => {
-    // TODO: Check refresh etc here!
-    // TODO: Allow AUTH to be calleed in http to refresh a token
-    // include an REQ-ID in the auth request
-    // | 4 header | * payload |
-    const authPayload = (0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 4, start + len)), isDeflate);
-    // 10 rate limit tokens for auth (very strange when this gets called often)
     if ((0, security_1.rateLimitRequest)(server, ctx, 10, server.rateLimit.ws)) {
         ctx.session.close();
         return false;
     }
-    const authState = (0, auth_1.parseAuthState)(authPayload);
-    ctx.session.authState = authState;
+    // | 4 header | * payload |
+    const payload = (0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 4, start + len)), isDeflate);
+    const authState = parse(payload);
+    const verified = server.auth.verifyAuthState(server.client, ctx, authState);
+    ctx.session.authState = verified === true ? authState : verified;
+    if (verified !== true && verified.error) {
+        sendAuthMessage(ctx, verified);
+        return true;
+    }
     if (ctx.session.unauthorizedObs.size) {
         ctx.session.unauthorizedObs.forEach((obs) => {
             const { id, name, checksum, payload } = obs;
-            (0, observable_1.enableSubscribe)(server, ctx, id, checksum, name, payload, {
-                name: 'internal-websocket-auth',
-            });
+            (0, observable_1.enableSubscribe)({
+                name,
+                query: true,
+            }, server, ctx, payload, id, checksum);
         });
         ctx.session.unauthorizedObs.clear();
     }
-    // TODO needs to call refresh mechanism or something also need that on HTTP
-    ctx.session.send((0, protocol_1.encodeAuthResponse)((0, protocol_1.valueToBuffer)(true)), true, false);
+    sendAuthMessage(ctx, verified);
     return true;
 };
 exports.authMessage = authMessage;
-const sendAuthMessage = (ctx) => {
-    // TODO needs to call refresh mechanism or something
-    ctx.session.send((0, protocol_1.encodeAuthResponse)((0, protocol_1.valueToBuffer)(true)), true, false);
+// send and verify
+const sendAndVerifyAuthMessage = (server, ctx) => {
+    if (!ctx.session) {
+        return;
+    }
+    const verified = server.auth.verifyAuthState(server.client, ctx, ctx.session.authState);
+    if (verified === true) {
+        sendAuthMessage(ctx, true);
+        return;
+    }
+    ctx.session.authState = verified;
+    sendAuthMessage(ctx, verified);
 };
-exports.sendAuthMessage = sendAuthMessage;
+exports.sendAndVerifyAuthMessage = sendAndVerifyAuthMessage;
 //# sourceMappingURL=auth.js.map

package/dist/incoming/ws/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":";;;AAAA,6CAIuB;AAGvB,6CAA8C;AAC9C,qCAA2C;AAC3C,6CAAiD;AAI1C,MAAM,WAAW,GAAG,CACzB,GAAe,EACf,KAAa,EACb,GAAW,EACX,SAAkB,EAClB,GAA8B,EAC9B,MAAmB,EACV,EAAE;IACX,gCAAgC;IAChC,4DAA4D;IAC5D,wCAAwC;IAExC,2BAA2B;IAC3B,MAAM,WAAW,GAAG,IAAA,wBAAa,EAC/B,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,EACjD,SAAS,CACV,CAAA;IAED,2EAA2E;IAC3E,IAAI,IAAA,2BAAgB,EAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;QAC1D,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACnB,OAAO,KAAK,CAAA;KACb;IAED,MAAM,SAAS,GAAc,IAAA,qBAAc,EAAC,WAAW,CAAC,CAAA;IACxD,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;IACjC,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE;QACpC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1C,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;YAC3C,IAAA,4BAAe,EAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE;gBACxD,IAAI,EAAE,yBAAyB;aAChC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;KACpC;IACD,2EAA2E;IAC3E,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAA,6BAAkB,EAAC,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;IACtE,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAtCY,QAAA,WAAW,eAsCvB;AAEM,MAAM,eAAe,GAAG,CAAC,GAA8B,EAAE,EAAE;IAChE,oDAAoD;IACpD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAA,6BAAkB,EAAC,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;AACxE,CAAC,CAAA;AAHY,QAAA,eAAe,mBAG3B"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":"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"}

package/dist/incoming/ws/function.d.ts

@@ -1,3 +1,2 @@
-import { BasedServer } from '../../server';
-import { WebSocketSession, Context } from '../../context';
-export declare const functionMessage: (arr: Uint8Array, start: number, len: number, isDeflate: boolean, ctx: Context<WebSocketSession>, server: BasedServer) => boolean;
+import { BinaryMessageHandler } from './types';
+export declare const functionMessage: BinaryMessageHandler;

package/dist/incoming/ws/function.js

@@ -4,34 +4,24 @@ exports.functionMessage = void 0;
 const protocol_1 = require("../../protocol");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
-const functions_1 = require("../../functions");
 const security_1 = require("../../security");
-const sendFunction = (server, ctx, route, payload, requestId) => {
-    server.functions
-        .install(route.name)
-        .then((spec) => {
-        if (!ctx.session) {
-            return;
-        }
-        if (spec && !(0, functions_1.isObservableFunctionSpec)(spec)) {
-            spec
-                .function(payload, ctx)
-                .then(async (v) => {
-                ctx.session?.send((0, protocol_1.encodeFunctionResponse)(requestId, (0, protocol_1.valueToBuffer)(v)), true, false);
-            })
-                .catch((err) => {
-                (0, sendError_1.sendError)(server, ctx, err.code, {
-                    route,
-                    requestId,
-                    err,
-                });
-            });
-        }
+const verifyRoute_1 = require("../../verifyRoute");
+const installFn_1 = require("../../installFn");
+const authorize_1 = require("../../authorize");
+const sendFunction = async (route, server, ctx, payload, requestId) => {
+    const spec = await (0, installFn_1.installFn)(server, ctx, route, requestId);
+    spec
+        ?.function(server.client, payload, ctx)
+        .then(async (v) => {
+        ctx.session?.send((0, protocol_1.encodeFunctionResponse)(requestId, (0, protocol_1.valueToBuffer)(v)), true, false);
     })
-        .catch(() => (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
-        name: route.name,
-        requestId,
-    }));
+        .catch((err) => {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
+            route,
+            requestId,
+            err,
+        });
+    });
 };
 const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
     // | 4 header | 3 id | 1 name length | * name | * payload |
@@ -41,66 +31,24 @@ const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
     if (!name || !requestId) {
         return false;
     }
-    const route = server.functions.route(name);
+    const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'fn', server.functions.route(name), name, requestId);
     // TODO: add strictness setting - if strict return false here
-    if (!route) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
-            name,
-            requestId,
-        });
+    if (route === null) {
         return true;
     }
     if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
         ctx.session.close();
         return false;
     }
-    if (route.observable === true) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsObservable, {
-            name,
-            requestId,
-        });
-        return true;
-    }
     if (len > route.maxPayloadSize) {
         (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, {
-            name,
-            requestId,
-        });
-        return true;
-    }
-    if (route.stream === true) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsStream, {
-            name,
+            route,
             requestId,
         });
         return true;
     }
-    const payload = (0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 8 + nameLen, start + len)), isDeflate);
-    if (route.public === true) {
-        sendFunction(server, ctx, route, payload, requestId);
-        return true;
-    }
-    // TODO: make this fn a bit nicer.... remove nestedness...
-    server.auth
-        .authorize(ctx, name, payload)
-        .then((ok) => {
-        if (!ctx.session) {
-            return false;
-        }
-        if (!ok) {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.AuthorizeRejectedError, {
-                route,
-            });
-            return false;
-        }
-        sendFunction(server, ctx, route, payload, requestId);
-    })
-        .catch((err) => {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.AuthorizeFunctionError, {
-            route,
-            err,
-        });
-    });
+    const payload = (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 8 + nameLen, start + len)), isDeflate));
+    (0, authorize_1.authorize)(route, server, ctx, payload, sendFunction, requestId);
     return true;
 };
 exports.functionMessage = functionMessage;

package/dist/incoming/ws/function.js.map

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":";;;AAAA,6CAOuB;AACvB,uCAA4C;AAC5C,+CAA2C;AAG3C,6CAAiD;AACjD,mDAA+C;AAC/C,+CAA2C;AAC3C,+CAAgE;AAGhE,MAAM,YAAY,GAGd,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;IACnD,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;IAC3D,IAAI;QACF,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;SACtC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAChB,GAAG,CAAC,OAAO,EAAE,IAAI,CACf,IAAA,iCAAsB,EAAC,SAAS,EAAE,IAAA,wBAAa,EAAC,CAAC,CAAC,CAAC,EACnD,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,aAAa,EAAE;YACnD,KAAK;YACL,SAAS;YACT,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAEM,MAAM,eAAe,GAAyB,CACnD,GAAG,EACH,KAAK,EACL,GAAG,EACH,SAAS,EACT,GAAG,EACH,MAAM,EACN,EAAE;IACF,2DAA2D;IAC3D,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC9B,MAAM,IAAI,GAAG,IAAA,qBAAU,EAAC,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,CAAA;IAE5D,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;QACvB,OAAO,KAAK,CAAA;KACb;IAED,MAAM,KAAK,GAAG,IAAA,yBAAW,EACvB,MAAM,EACN,GAAG,EACH,IAAI,EACJ,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,EACJ,SAAS,CACV,CAAA;IAED,6DAA6D;IAC7D,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,OAAO,IAAI,CAAA;KACZ;IAED,IACE,IAAA,2BAAgB,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EACzE;QACA,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACnB,OAAO,KAAK,CAAA;KACb;IAED,IAAI,GAAG,GAAG,KAAK,CAAC,cAAc,EAAE;QAC9B,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,eAAe,EAAE;YACrD,KAAK;YACL,SAAS;SACV,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,OAAO,GAAG,IAAA,uBAAY,EAC1B,IAAA,wBAAa,EACX,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,OAAO,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,EAC3D,SAAS,CACV,CACF,CAAA;IAED,IAAA,qBAAS,EAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;IAE/D,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAxDY,QAAA,eAAe,mBAwD3B"}

package/dist/incoming/ws/get.d.ts

@@ -1,3 +1,2 @@
-import { BasedServer } from '../../server';
-import { WebSocketSession, Context } from '../../context';
-export declare const getMessage: (arr: Uint8Array, start: number, len: number, isDeflate: boolean, ctx: Context<WebSocketSession>, server: BasedServer) => boolean;
+import { BinaryMessageHandler } from './types';
+export declare const getMessage: BinaryMessageHandler;

package/dist/incoming/ws/get.js

@@ -6,8 +6,12 @@ const observable_1 = require("../../observable");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
 const security_1 = require("../../security");
+const verifyRoute_1 = require("../../verifyRoute");
+const authorize_1 = require("../../authorize");
+const installFn_1 = require("../../installFn");
 const sendGetData = (server, id, obs, checksum, ctx) => {
     if (!ctx.session) {
+        (0, observable_1.destroyObs)(server, id);
         return;
     }
     if (checksum === 0) {
@@ -24,10 +28,10 @@ const sendGetData = (server, id, obs, checksum, ctx) => {
     }
     (0, observable_1.destroyObs)(server, id);
 };
-const getFromExisting = (server, id, ctx, checksum, name) => {
+const getFromExisting = (server, id, ctx, checksum) => {
     const obs = (0, observable_1.getObs)(server, id);
     if (obs.error) {
-        (0, observable_1.sendObsGetError)(server, ctx, id, name, obs.error);
+        (0, observable_1.sendObsGetError)(server, ctx, id, obs.error);
         return;
     }
     if (obs.cache) {
@@ -36,41 +40,46 @@ const getFromExisting = (server, id, ctx, checksum, name) => {
     }
     (0, observable_1.subscribeNext)(obs, (err) => {
         if (err) {
-            (0, observable_1.sendObsGetError)(server, ctx, id, name, err);
+            (0, observable_1.sendObsGetError)(server, ctx, id, err);
         }
         else {
             sendGetData(server, id, obs, checksum, ctx);
         }
     });
 };
-const install = (server, name, ctx, route, id, checksum, payload) => {
-    server.functions
-        .install(name)
-        .then((spec) => {
-        if (!ctx.session) {
-            return;
-        }
-        if (!(0, observable_1.verifyRoute)(server, name, spec, ctx)) {
+const isAuthorized = (route, server, ctx, payload, id, checksum) => {
+    if ((0, observable_1.hasObs)(server, id)) {
+        getFromExisting(server, id, ctx, checksum);
+        return;
+    }
+    (0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
+        if (spec === null) {
             return;
         }
         if ((0, observable_1.hasObs)(server, id)) {
-            getFromExisting(server, id, ctx, checksum, name);
+            getFromExisting(server, id, ctx, checksum);
             return;
         }
-        const obs = (0, observable_1.createObs)(server, name, id, payload);
+        const obs = (0, observable_1.createObs)(server, route.name, id, payload, true);
         if (!ctx.session?.obs.has(id)) {
             (0, observable_1.subscribeNext)(obs, (err) => {
                 if (err) {
-                    (0, observable_1.sendObsGetError)(server, ctx, id, name, err);
+                    (0, observable_1.sendObsGetError)(server, ctx, id, err);
                 }
                 else {
                     sendGetData(server, id, obs, checksum, ctx);
                 }
             });
         }
-    })
-        .catch(() => {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route);
+        (0, observable_1.start)(server, id);
+    });
+};
+const isNotAuthorized = (route, server, ctx, payload, id, checksum) => {
+    ctx.session.unauthorizedObs.add({
+        id,
+        checksum,
+        name: route.name,
+        payload,
     });
 };
 const getMessage = (arr, start, len, isDeflate, ctx, server) => {
@@ -82,9 +91,9 @@ const getMessage = (arr, start, len, isDeflate, ctx, server) => {
     if (!name || !id) {
         return false;
     }
-    const route = (0, observable_1.verifyRoute)(server, name, server.functions.route(name), ctx);
+    const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'query', server.functions.route(name), name, id);
     // TODO: add strictness setting - if strict return false here
-    if (!route) {
+    if (route === null) {
         return true;
     }
     if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
@@ -92,44 +101,14 @@ const getMessage = (arr, start, len, isDeflate, ctx, server) => {
         return false;
     }
     if (route.maxPayloadSize !== -1 && len > route.maxPayloadSize) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
-        return true;
-    }
-    const payload = (0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate);
-    if (route.public === true) {
-        if ((0, observable_1.hasObs)(server, id)) {
-            getFromExisting(server, id, ctx, checksum, name);
-            return;
-        }
-        install(server, name, ctx, route, id, checksum, payload);
-        return true;
-    }
-    server.auth
-        .authorize(ctx, name, payload)
-        .then((ok) => {
-        if (!ctx.session) {
-            return false;
-        }
-        if (!ok) {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.AuthorizeRejectedError, {
-                route,
-                observableId: id,
-            });
-            return false;
-        }
-        if ((0, observable_1.hasObs)(server, id)) {
-            getFromExisting(server, id, ctx, checksum, name);
-            return;
-        }
-        install(server, name, ctx, route, id, checksum, payload);
-    })
-        .catch((err) => {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.AuthorizeFunctionError, {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, {
             route,
             observableId: id,
-            err,
         });
-    });
+        return true;
+    }
+    const payload = (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate));
+    (0, authorize_1.authorize)(route, server, ctx, payload, isAuthorized, id, checksum, isNotAuthorized);
     return true;
 };
 exports.getMessage = getMessage;

package/dist/incoming/ws/get.js.map

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

package/dist/incoming/ws/index.d.ts

@@ -1,3 +1,3 @@
 import { BasedServer } from '../../server';
-import { WebSocketSession, Context } from '../../context';
+import { WebSocketSession, Context } from '@based/functions';
 export declare const message: (server: BasedServer, ctx: Context<WebSocketSession>, msg: ArrayBuffer, isBinary: boolean) => void;

package/dist/incoming/ws/index.js

@@ -19,7 +19,8 @@ const reader = (server, ctx, arr, start) => {
         return next;
     }
     // type 2 = unsubscribe
-    if (type === 2 && (0, observable_1.unsubscribeMessage)(arr, start, ctx, server)) {
+    if (type === 2 &&
+        (0, observable_1.unsubscribeMessage)(arr, start, len, isDeflate, ctx, server)) {
         return next;
     }
     // type 3 = get