@based/server 4.0.1 → 4.0.3

package/dist/incoming/http/streamFunction/{multipartStream.js → multiPart/readFormData.js}

@@ -3,44 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const DataStream_1 = require("./DataStream");
-const error_1 = require("../../../error");
-const sendError_1 = require("../../../sendError");
-const sendHttpResponse_1 = require("../../../sendHttpResponse");
-const getExtension_1 = __importDefault(require("./getExtension"));
+const DataStream_1 = require("../DataStream");
+const error_1 = require("../../../../error");
+const sendError_1 = require("../../../../sendError");
+const getExtension_1 = __importDefault(require("../getExtension"));
 const MAX_CHUNK_SIZE = 1024 * 1024 * 5;
-const streamProgress = (stream, size) => {
-    stream.emit('progress', 0);
-    if (size < 200000) {
-        stream.on('end', () => {
-            stream.emit('progress', 1);
-        });
-    }
-    else {
-        let progress = 0;
-        let total = 0;
-        let setInProgress = false;
-        const updateProgress = () => {
-            if (!setInProgress) {
-                setInProgress = true;
-                setTimeout(() => {
-                    stream.emit('progress', progress);
-                    setInProgress = false;
-                }, 250);
-            }
-        };
-        stream.on('end', () => {
-            progress = 1;
-            updateProgress();
-        });
-        stream.on('data', (chunk) => {
-            total += chunk.byteLength;
-            progress = total / size;
-            updateProgress();
-        });
-    }
-};
-// only use this if you have individual file else its just all
+// only use this if you have an individual file else its just all
 const setHeader = (file) => {
     file.headersSet++;
     if (file.headersSet === 2) {
@@ -51,17 +19,48 @@ const setHeader = (file) => {
 const toBuffer = (str, firstWritten) => {
     return Buffer.from(firstWritten ? str + '\r\n' : str, 'binary');
 };
-exports.default = (ctx, server, payload, route, fn) => {
-    if (!payload || (!payload && typeof payload !== 'object')) {
-        payload = {};
+const handleMeta = (file, line, meta, isWriting, fileCallback) => {
+    const opts = file.opts;
+    opts.name = line.match(/filename="(.*?)"/)?.[1] || 'untitled';
+    const firstCommaIndex = meta.indexOf(',');
+    if (firstCommaIndex !== -1 && meta.startsWith('size=')) {
+        const size = meta.slice(5, firstCommaIndex);
+        if (size) {
+            const sizeNr = Number(size);
+            file.opts.size = sizeNr;
+            file.stream.size = sizeNr;
+        }
+        const payloadRaw = decodeURI(meta.slice(firstCommaIndex + 1));
+        if (payloadRaw !== undefined && payloadRaw !== '') {
+            try {
+                file.opts.payload = JSON.parse(payloadRaw);
+            }
+            catch (err) {
+                file.opts.payload = payloadRaw;
+            }
+        }
     }
+    isWriting = setHeader(file);
+    if (isWriting) {
+        fileCallback({
+            payload: file.opts.payload || {},
+            fileName: file.opts.name,
+            mimeType: file.opts.type,
+            extension: file.opts.extension,
+            size: file.opts.size || 0,
+            stream: file.stream,
+        });
+    }
+    return isWriting;
+};
+exports.default = (ctx, server, route, onFile, isReady) => {
     const files = [];
     const contentLength = ctx.session.headers['content-length'];
-    const promiseQ = [];
     let setInProgress = false;
     let boundary = null;
     let prevLine;
     let isWriting = false;
+    let collectMeta;
     let total = 0;
     let progress = 0;
     ctx.session.res.onData((chunk, isLast) => {
@@ -88,7 +87,6 @@ exports.default = (ctx, server, payload, route, fn) => {
                                     if (progress === 1) {
                                         file.isDone = true;
                                     }
-                                    file.stream.emit('progress', progress);
                                 }
                             }
                             setInProgress = false;
@@ -115,9 +113,6 @@ exports.default = (ctx, server, payload, route, fn) => {
                 else {
                     file.stream.end();
                 }
-                if (!file.opts.size && !file.isDone) {
-                    file.stream.emit('progress', 1);
-                }
                 file.isDone = true;
                 prevLine = null;
                 if (line === boundary + '--') {
@@ -126,7 +121,7 @@ exports.default = (ctx, server, payload, route, fn) => {
             }
             if (line === boundary && !isWriting) {
                 const file = {
-                    stream: new DataStream_1.DataStream(),
+                    stream: new DataStream_1.DataStream(0),
                     headersSet: 0,
                     opts: {},
                     isDone: false,
@@ -136,49 +131,58 @@ exports.default = (ctx, server, payload, route, fn) => {
             }
             const file = files[files.length - 1];
             if (!file) {
-                // TODO: invalid file
-                return (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, route);
+                // TODO: invalid file error
+                return (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, { route });
             }
-            if (!isWriting && line.includes('Content-Disposition')) {
-                const meta = line.match(/name="(.*?)"/)?.[1];
+            if (!isWriting && collectMeta) {
+                const fullMeta = collectMeta + line;
+                const meta = fullMeta.match(/name="(.*?)"/)?.[1];
                 if (!meta) {
-                    // TODO: invalid file
-                    return (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, route);
+                    collectMeta = fullMeta;
+                    continue;
                 }
-                const opts = file.opts;
-                opts.name = line.match(/filename="(.*?)"/)?.[1] || 'untitled';
-                const disposition = meta.split('|');
-                for (const seg of disposition) {
-                    if (/=/.test(seg)) {
-                        const [k, v] = seg.split('=');
-                        if (k === 'size') {
-                            opts[k] = Number(v);
-                        }
-                        else {
-                            opts[k] = v;
-                        }
+                collectMeta = '';
+                isWriting = handleMeta(file, line, meta, isWriting, onFile);
+                continue;
+            }
+            if (!collectMeta && !isWriting && line.includes('Content-Disposition')) {
+                const meta = line.match(/name="(.*?)"/)?.[1];
+                if (!meta) {
+                    if (/name="(.*?)/.test(line)) {
+                        collectMeta = line;
+                        continue;
                     }
+                    // TODO: invalid file error
+                    return (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, {
+                        route,
+                    });
                 }
-                if (opts.size) {
-                    streamProgress(file.stream, opts.size);
-                }
-                isWriting = setHeader(file);
-                if (isWriting) {
-                    promiseQ.push(fn({ payload: { ...payload, ...file.opts }, stream: file.stream }));
-                }
+                isWriting = handleMeta(file, line, meta, isWriting, onFile);
                 continue;
             }
             if (!isWriting && line.includes('Content-Type')) {
                 const mimeType = line.match(/Content-Type: ([a-zA-Z0-9].+\/[a-zA-Z0-9].+)/)?.[1];
                 if (!mimeType) {
                     // TODO: invalid file (can speficy in route potentialy...)
-                    return (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, route);
+                    return (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, {
+                        route,
+                    });
                 }
                 file.opts.type = mimeType;
-                file.opts.extension = (0, getExtension_1.default)(mimeType);
+                const extension = (0, getExtension_1.default)(mimeType);
+                if (extension) {
+                    file.opts.extension = extension;
+                }
                 isWriting = setHeader(file);
                 if (isWriting) {
-                    promiseQ.push(fn({ payload: { ...payload, ...file.opts }, stream: file.stream }));
+                    onFile({
+                        payload: file.opts.payload,
+                        fileName: file.opts.name,
+                        mimeType: file.opts.type,
+                        extension: file.opts.extension,
+                        size: file.opts.size,
+                        stream: file.stream,
+                    });
                 }
                 continue;
             }
@@ -191,18 +195,8 @@ exports.default = (ctx, server, payload, route, fn) => {
             }
         }
         if (isLast) {
-            Promise.allSettled(promiseQ).then((results) => {
-                const r = results.map((v) => {
-                    if (v.status === 'rejected') {
-                        return { err: v.reason };
-                    }
-                    else {
-                        return v.value;
-                    }
-                });
-                (0, sendHttpResponse_1.sendHttpResponse)(ctx, r);
-            });
+            isReady();
         }
     });
 };
-//# sourceMappingURL=multipartStream.js.map
+//# sourceMappingURL=readFormData.js.map

package/dist/incoming/http/streamFunction/multiPart/readFormData.js.map

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

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

@@ -0,0 +1,6 @@
+import { DataStream } from '../DataStream';
+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;
+export default _default;

package/dist/incoming/http/streamFunction/{stream.js → stream/createStream.js}

@@ -3,21 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const DataStream_1 = require("./DataStream");
-const sendError_1 = require("../../../sendError");
+const DataStream_1 = require("../DataStream");
+const sendError_1 = require("../../../../sendError");
 const node_zlib_1 = __importDefault(require("node:zlib"));
-const error_1 = require("../../../error");
+const error_1 = require("../../../../error");
 const MAX_CHUNK_SIZE = 1024 * 1024 * 5;
 const UNCOMPRESS_OPTS = {
     chunkSize: 1024 * 1024 * 5,
 };
 exports.default = (server, route, ctx, size) => {
-    const stream = new DataStream_1.DataStream();
-    let total = 0;
-    let progress = 0;
-    let setInProgress = false;
-    stream.emit('progress', progress);
-    const emitProgress = size > 200000;
+    const stream = new DataStream_1.DataStream(size);
     const contentEncoding = ctx.session.headers['content-encoding'];
     if (contentEncoding) {
         let uncompressStream;
@@ -32,7 +27,6 @@ exports.default = (server, route, ctx, size) => {
         }
         if (uncompressStream) {
             ctx.session.res.onData((c, isLast) => {
-                total += c.byteLength;
                 if (c.byteLength > MAX_CHUNK_SIZE) {
                     (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.ChunkTooLarge, route);
                     uncompressStream.destroy();
@@ -40,20 +34,7 @@ exports.default = (server, route, ctx, size) => {
                     return;
                 }
                 const buf = Buffer.alloc(c.byteLength, Buffer.from(c));
-                if (emitProgress) {
-                    progress = total / size;
-                    if (!setInProgress) {
-                        setInProgress = true;
-                        setTimeout(() => {
-                            stream.emit('progress', progress);
-                            setInProgress = false;
-                        }, 250);
-                    }
-                }
                 if (isLast) {
-                    if (!emitProgress) {
-                        stream.emit('progress', 1);
-                    }
                     uncompressStream.end(buf);
                 }
                 else {
@@ -76,26 +57,12 @@ exports.default = (server, route, ctx, size) => {
     }
     else {
         ctx.session.res.onData((c, isLast) => {
-            total += c.byteLength;
             if (c.byteLength > MAX_CHUNK_SIZE) {
                 (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.ChunkTooLarge, route);
                 stream.destroy();
                 return;
             }
-            if (emitProgress) {
-                progress = total / size;
-                if (!setInProgress) {
-                    setInProgress = true;
-                    setTimeout(() => {
-                        stream.emit('progress', progress);
-                        setInProgress = false;
-                    }, 250);
-                }
-            }
             if (isLast) {
-                if (!emitProgress) {
-                    stream.emit('progress', 1);
-                }
                 stream.end(Buffer.from(c));
             }
             else {
@@ -105,4 +72,4 @@ exports.default = (server, route, ctx, size) => {
     }
     return stream;
 };
-//# sourceMappingURL=stream.js.map
+//# sourceMappingURL=createStream.js.map

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

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

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

@@ -0,0 +1,4 @@
+import { BasedServer } from '../../../../server';
+import { BasedStreamFunctionRoute } from '../../../../functions';
+import { HttpSession, Context } from '@based/functions';
+export declare const singleStream: (server: BasedServer, ctx: Context<HttpSession>, route: BasedStreamFunctionRoute, type: string, size: number) => void;

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

@@ -0,0 +1,70 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.singleStream = void 0;
+const createStream_1 = __importDefault(require("./createStream"));
+const sendError_1 = require("../../../../sendError");
+const getExtension_1 = __importDefault(require("../getExtension"));
+const error_1 = require("../../../../error");
+const sendHttpResponse_1 = require("../../../../sendHttpResponse");
+const mime_types_1 = __importDefault(require("mime-types"));
+const utils_1 = require("@saulx/utils");
+const installFn_1 = require("../../../../installFn");
+const authorize_1 = require("../../../../authorize");
+const singleStream = (server, ctx, route, type, size) => {
+    const extension = ctx.session.req.getHeader('content-extension');
+    if (extension) {
+        const mime = mime_types_1.default.lookup(extension);
+        if (mime) {
+            type = ctx.session.headers['content-type'] = mime;
+        }
+    }
+    const stream = (0, createStream_1.default)(server, route, ctx, size);
+    let payload;
+    if ('query' in ctx.session) {
+        try {
+            payload = (0, utils_1.parseQuery)(decodeURIComponent(ctx.session.query));
+        }
+        catch (err) { }
+    }
+    const streamPayload = {
+        payload,
+        stream,
+        size,
+        mimeType: type,
+        extension: (0, getExtension_1.default)(type) || '',
+    };
+    (0, authorize_1.authorize)(route, server, ctx, payload, () => {
+        (0, installFn_1.installFn)(server, ctx, route).then((spec) => {
+            if (spec === null) {
+                stream.destroy();
+                return;
+            }
+            const fn = spec.function;
+            fn(server.client, streamPayload, ctx)
+                .catch((err) => {
+                // stream.destroy()
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
+                    err,
+                    route,
+                });
+            })
+                .then((r) => {
+                if (stream.readableEnded || stream.listenerCount('data') === 0) {
+                    (0, sendHttpResponse_1.sendHttpResponse)(ctx, r);
+                }
+                else {
+                    stream.on('end', () => {
+                        (0, sendHttpResponse_1.sendHttpResponse)(ctx, r);
+                    });
+                }
+            });
+        });
+    }, undefined, undefined, () => {
+        stream.destroy();
+    });
+};
+exports.singleStream = singleStream;
+//# sourceMappingURL=index.js.map

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/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;