@based/server 3.4.5 → 3.4.7

package/dist/{network → incoming}/http/readBody.js

@@ -5,23 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readBody = void 0;
 const node_zlib_1 = __importDefault(require("node:zlib"));
-const send_1 = require("./send");
 const error_1 = require("../../error");
+const sendError_1 = require("../../sendError");
+// TODO: might be good to use worker stream as well for this
 const MAX_CHUNK_SIZE = 1024 * 1024;
 const UNCOMPRESS_OPTS = {
     // can be endless scince we limit by incoming
     chunkSize: 1024 * 1024 * 1000,
 };
-const readBody = (server, client, onData, route) => {
-    if (!client.res) {
+const readBody = (server, ctx, onData, route) => {
+    if (!ctx.session) {
         return;
     }
-    const contentLen = client.context.headers['content-length'];
+    const contentLen = ctx.session.headers['content-length'];
     if (contentLen > route.maxPayloadSize) {
-        (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.PayloadTooLarge, route);
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
         return;
     }
-    const contentEncoding = client.context.headers['content-encoding'];
+    const contentEncoding = ctx.session.headers['content-encoding'];
     let size = 0;
     if (contentEncoding) {
         let uncompressStream;
@@ -35,16 +36,15 @@ const readBody = (server, client, onData, route) => {
             uncompressStream = node_zlib_1.default.createBrotliDecompress(UNCOMPRESS_OPTS);
         }
         if (uncompressStream) {
-            client.res.onData((c, isLast) => {
+            ctx.session.res.onData((c, isLast) => {
                 size += c.byteLength;
                 if (size > route.maxPayloadSize) {
-                    (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.PayloadTooLarge, route);
-                    // sendHttpError(client, 'Payload Too Large', 413)
+                    (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
                     uncompressStream.destroy();
                     return;
                 }
                 if (c.byteLength > MAX_CHUNK_SIZE) {
-                    (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.ChunkTooLarge, route);
+                    (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.ChunkTooLarge, route);
                     uncompressStream.destroy();
                     return;
                 }
@@ -58,51 +58,46 @@ const readBody = (server, client, onData, route) => {
                     }
                 }
             });
-            // TODO: NEED TO READ CONTENT LEN OF UNCOMPRESSED....
-            const data = new SharedArrayBuffer(contentLen);
-            const buf = new Uint8Array(data);
-            // let index = 0
+            // unfortunately need to make a copy of the data and decompress in the main thread
+            const chunks = [];
+            // will prob not work because shared data in uws
+            let len = 0;
             uncompressStream.on('data', (c) => {
-                console.info('bytes written???', uncompressStream.bytesWritten, c);
-                // FIX LATER
-                // const len = c.byteLength
-                // for (let i = 0; i < len; i++) {
-                // console.log(c[i])
-                // worng ofc..
-                // maybe unpack in worker? - will not work like this...
-                // Atomics.store(buf, index, c[i])
-                // }
-                // index += len
+                chunks.push(c);
+                len += c.byteLength;
             });
+            let i = 0;
             uncompressStream.on('end', () => {
                 uncompressStream.destroy();
-                // parseData(server, client, contentType, data, false, route)
+                const buf = new Uint8Array(len);
+                for (const c of chunks) {
+                    buf.set(c, i);
+                    i += c.byteLength;
+                }
                 onData(buf);
             });
         }
         else {
-            (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.InvalidPayload, route);
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, route);
         }
     }
     else {
-        const data = new SharedArrayBuffer(contentLen);
-        const buf = new Uint8Array(data);
+        const buf = new Uint8Array(contentLen);
         let index = 0;
-        client.res.onData((c, isLast) => {
+        ctx.session.res.onData((c, isLast) => {
             const len = c.byteLength;
             size += len;
             if (size > route.maxPayloadSize) {
-                (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.PayloadTooLarge, route);
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
                 return;
             }
             if (c.byteLength > MAX_CHUNK_SIZE) {
-                (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.ChunkTooLarge, route);
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.ChunkTooLarge, route);
                 return;
             }
             buf.set(new Uint8Array(c), index);
             index += len;
             if (isLast) {
-                console.info('shared buf time', buf);
                 onData(buf);
             }
         });

package/dist/incoming/http/readBody.js.map

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

package/dist/incoming/http/streamFunction/DataStream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataStream.js","sourceRoot":"","sources":["../../../../src/incoming/http/streamFunction/DataStream.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAE/B,qEAAqE;AAErE,2BAA2B;AAC3B,MAAa,UAAW,SAAQ,eAAM;IACpC,KAAK,KAAI,CAAC;IAEV,yBAAyB;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;QACvC,QAAQ,EAAE,CAAA;IACZ,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjB,CAAC;CACF;AAZD,gCAYC"}

package/dist/incoming/http/streamFunction/getExtension.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getExtension.js","sourceRoot":"","sources":["../../../../src/incoming/http/streamFunction/getExtension.ts"],"names":[],"mappings":";;;;;AAAA,4DAAkC;AAElC,kBAAe,CAAC,QAAgB,EAAE,EAAE;IAClC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACxC,IAAI,IAAI,KAAK,MAAM,EAAE;QACnB,OAAO,MAAM,CAAA;KACd;SAAM,IAAI,IAAI,KAAK,KAAK,EAAE;QACzB,OAAO,KAAK,CAAA;KACb;SAAM,IAAI,IAAI,KAAK,OAAO,EAAE;QAC3B,OAAO,OAAO,CAAA;KACf;SAAM;QACL,MAAM,CAAC,GAAG,oBAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACvC,IAAI,CAAC,KAAK,UAAU,EAAE;YACpB,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,CAAC,KAAK,IAAI,EAAE;YACd,OAAO,KAAK,CAAA;SACb;QACD,OAAO,CAAC,CAAA;KACT;AACH,CAAC,CAAA"}

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

@@ -0,0 +1,4 @@
+import { BasedServer } from '../../../server';
+import { BasedFunctionRoute } from '../../../functions';
+import { HttpSession, Context } from '../../../context';
+export declare const httpStreamFunction: (server: BasedServer, ctx: Context<HttpSession>, payload: any, route: BasedFunctionRoute) => void;

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

@@ -0,0 +1,106 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpStreamFunction = void 0;
+const stream_1 = __importDefault(require("./stream"));
+const sendError_1 = require("../../../sendError");
+const functions_1 = require("../../../functions");
+const authorize_1 = require("../authorize");
+const error_1 = require("../../../error");
+const multipartStream_1 = __importDefault(require("./multipartStream"));
+const sendHttpResponse_1 = require("../../../sendHttpResponse");
+const httpStreamFunction = (server, ctx, payload, route) => {
+    if (!ctx.session) {
+        return;
+    }
+    const size = ctx.session.headers['content-length'];
+    if (route.maxPayloadSize > -1 && route.maxPayloadSize < size) {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
+        return;
+    }
+    const type = ctx.session.headers['content-type'];
+    // replace this with transder encoding 'chunked'
+    if (type && type.startsWith('multipart/form-data')) {
+        const files = [];
+        let thisIsFn;
+        (0, multipartStream_1.default)(ctx, server, payload, route, (p) => {
+            return new Promise((resolve) => {
+                (0, authorize_1.authorizeRequest)(server, ctx, p.payload, route, () => {
+                    if (!thisIsFn) {
+                        files.push({ p, resolve });
+                    }
+                    else {
+                        resolve(thisIsFn(p, ctx));
+                    }
+                }, () => {
+                    resolve(undefined);
+                });
+            });
+        });
+        server.functions
+            .install(route.name)
+            .then((spec) => {
+            if (spec && !(0, functions_1.isObservableFunctionSpec)(spec) && spec.stream) {
+                thisIsFn = spec.function;
+                if (files.length) {
+                    for (const file of files) {
+                        console.info('File parsed before fn / auth');
+                        file.resolve(thisIsFn(file.p, ctx));
+                    }
+                }
+            }
+            else {
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route);
+            }
+        })
+            .catch(() => {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route);
+        });
+        return;
+    }
+    const stream = (0, stream_1.default)(server, route, ctx, size);
+    // destroy stream from context
+    (0, authorize_1.authorizeRequest)(server, ctx, payload, route, (payload) => {
+        server.functions
+            .install(route.name)
+            .then((spec) => {
+            if (spec && !(0, functions_1.isObservableFunctionSpec)(spec) && spec.stream) {
+                // const stream = createDataStream(server, route, client, size)
+                const streamPayload = { payload, stream };
+                const fn = spec.function;
+                fn(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);
+                        });
+                    }
+                });
+            }
+            else {
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route);
+            }
+        })
+            .catch((err) => {
+            console.error(err);
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route);
+        });
+    }, () => {
+        stream.destroy();
+    });
+};
+exports.httpStreamFunction = httpStreamFunction;
+//# sourceMappingURL=index.js.map

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

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

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

@@ -0,0 +1,13 @@
+import { HttpSession, Context } from '../../../context';
+import { BasedServer } from '../../../server';
+import { BasedFunctionRoute } from '../../../functions';
+export declare type FileOptions = {
+    name?: string;
+    size?: number;
+    type: string;
+    extension: string;
+} & {
+    [key: string]: string;
+};
+declare const _default: (ctx: Context<HttpSession>, server: BasedServer, payload: any, route: BasedFunctionRoute, fn: (payload: any) => Promise<any>) => void;
+export default _default;

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

@@ -5,7 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const DataStream_1 = require("./DataStream");
 const error_1 = require("../../../error");
-const send_1 = require("../send");
+const sendError_1 = require("../../../sendError");
+const sendHttpResponse_1 = require("../../../sendHttpResponse");
 const getExtension_1 = __importDefault(require("./getExtension"));
 const MAX_CHUNK_SIZE = 1024 * 1024 * 5;
 const streamProgress = (stream, size) => {
@@ -50,13 +51,12 @@ const setHeader = (file) => {
 const toBuffer = (str, firstWritten) => {
     return Buffer.from(firstWritten ? str + '\r\n' : str, 'binary');
 };
-exports.default = async (client, server, payload, route, spec) => {
+exports.default = (ctx, server, payload, route, fn) => {
     if (!payload || (!payload && typeof payload !== 'object')) {
         payload = {};
     }
-    const fn = require(spec.functionPath);
     const files = [];
-    const contentLength = client.context.headers['content-length'];
+    const contentLength = ctx.session.headers['content-length'];
     const promiseQ = [];
     let setInProgress = false;
     let boundary = null;
@@ -64,10 +64,10 @@ exports.default = async (client, server, payload, route, spec) => {
     let isWriting = false;
     let total = 0;
     let progress = 0;
-    client.res.onData((chunk, isLast) => {
+    ctx.session.res.onData((chunk, isLast) => {
         // see if this goes ok... (clearing mem etc)
         if (chunk.byteLength > MAX_CHUNK_SIZE) {
-            (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.ChunkTooLarge, route);
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.ChunkTooLarge, route);
             for (const file of files) {
                 file.stream.destroy();
             }
@@ -137,13 +137,13 @@ exports.default = async (client, server, payload, route, spec) => {
             const file = files[files.length - 1];
             if (!file) {
                 // TODO: invalid file
-                return (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.InvalidPayload, route);
+                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 (!meta) {
                     // TODO: invalid file
-                    return (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.InvalidPayload, route);
+                    return (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, route);
                 }
                 const opts = file.opts;
                 opts.name = line.match(/filename="(.*?)"/)?.[1] || 'untitled';
@@ -164,7 +164,7 @@ exports.default = async (client, server, payload, route, spec) => {
                 }
                 isWriting = setHeader(file);
                 if (isWriting) {
-                    promiseQ.push(fn({ payload: { ...payload, ...file.opts }, stream: file.stream }, client.context));
+                    promiseQ.push(fn({ payload: { ...payload, ...file.opts }, stream: file.stream }));
                 }
                 continue;
             }
@@ -172,13 +172,13 @@ exports.default = async (client, server, payload, route, spec) => {
                 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, send_1.sendHttpError)(server, client, 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);
                 isWriting = setHeader(file);
                 if (isWriting) {
-                    promiseQ.push(fn({ payload: { ...payload, ...file.opts }, stream: file.stream }, client.context));
+                    promiseQ.push(fn({ payload: { ...payload, ...file.opts }, stream: file.stream }));
                 }
                 continue;
             }
@@ -200,7 +200,7 @@ exports.default = async (client, server, payload, route, spec) => {
                         return v.value;
                     }
                 });
-                (0, send_1.sendHttpResponse)(client, r);
+                (0, sendHttpResponse_1.sendHttpResponse)(ctx, r);
             });
         }
     });

package/dist/incoming/http/streamFunction/multipartStream.js.map

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

package/dist/{network → incoming}/http/streamFunction/stream.d.ts

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

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

@@ -4,22 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const DataStream_1 = require("./DataStream");
-const send_1 = require("../send");
+const sendError_1 = require("../../../sendError");
 const node_zlib_1 = __importDefault(require("node:zlib"));
 const error_1 = require("../../../error");
 const MAX_CHUNK_SIZE = 1024 * 1024 * 5;
 const UNCOMPRESS_OPTS = {
-    // can be endless scince we limit by incoming
-    chunkSize: 1024 * 1024 * 100,
+    chunkSize: 1024 * 1024 * 5,
 };
-exports.default = (server, route, client, size) => {
+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 contentEncoding = client.context.headers['content-encoding'];
+    const contentEncoding = ctx.session.headers['content-encoding'];
     if (contentEncoding) {
         let uncompressStream;
         if (contentEncoding === 'deflate') {
@@ -32,10 +31,10 @@ exports.default = (server, route, client, size) => {
             uncompressStream = node_zlib_1.default.createBrotliDecompress(UNCOMPRESS_OPTS);
         }
         if (uncompressStream) {
-            client.res.onData((c, isLast) => {
+            ctx.session.res.onData((c, isLast) => {
                 total += c.byteLength;
                 if (c.byteLength > MAX_CHUNK_SIZE) {
-                    (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.ChunkTooLarge, route);
+                    (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.ChunkTooLarge, route);
                     uncompressStream.destroy();
                     stream.destroy();
                     return;
@@ -59,21 +58,27 @@ exports.default = (server, route, client, size) => {
                 }
                 else {
                     if (!uncompressStream.write(buf)) {
-                        // handle backpressure
+                        // console.info('BACKPRESSURE')
                     }
                 }
             });
+            uncompressStream.on('error', (err) => {
+                console.warn('Uncompress error', route, contentEncoding, err);
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.ChunkTooLarge, route);
+                uncompressStream.destroy();
+                stream.destroy();
+            });
             uncompressStream.pipe(stream);
         }
         else {
-            (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.UnsupportedContentEncoding, route);
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.UnsupportedContentEncoding, route);
         }
     }
     else {
-        client.res.onData((c, isLast) => {
+        ctx.session.res.onData((c, isLast) => {
             total += c.byteLength;
             if (c.byteLength > MAX_CHUNK_SIZE) {
-                (0, send_1.sendHttpError)(server, client, error_1.BasedErrorCode.ChunkTooLarge, route);
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.ChunkTooLarge, route);
                 stream.destroy();
                 return;
             }

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

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

package/dist/incoming/index.d.ts

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

package/dist/{network → incoming}/index.js

@@ -5,26 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const uws_1 = __importDefault(require("@based/uws"));
 const upgrade_1 = require("./upgrade");
-const message_1 = require("./message");
+const ws_1 = require("./ws");
 const observable_1 = require("../observable");
 const http_1 = require("./http");
-// ----------------- mem test code -------------------
-// let cl = 0
-// const genLargeMemBlock = (): string => {
-//   ++cl
-//   let str = ''
-//   for (let i = 0; i < 100000; i++) {
-//     str += Math.random() * 99999 + ' xxxx'
-//   }
-//   return str
-// }
-// let cnt = 0
-// setInterval(() => {
-//   ++cnt
-//   console.info('Amount of clients', cl, 'after', cnt, 'seconds')
-// }, 1e3)
-// -----------------------------------------------------
-exports.default = (server, { key, cert, port }) => {
+const auth_1 = require("./ws/auth");
+exports.default = (server, { key, cert, port, ws: wsListeners }) => {
     const app = key && cert
         ? uws_1.default.SSLApp({
             key_file_name: key,
@@ -35,39 +20,54 @@ exports.default = (server, { key, cert, port }) => {
     if (port) {
         server.port = port;
     }
+    if (!wsListeners) {
+        wsListeners = {
+            open: () => undefined,
+            close: () => undefined,
+        };
+    }
     app
         .ws('/*', {
         maxPayloadLength: 1024 * 1024 * 10,
         idleTimeout: 100,
         maxBackpressure: 1024,
         // compression: uws.SHARED_COMPRESSOR,
-        upgrade: server.auth?.config?.authorizeConnection
+        upgrade: server.auth?.authorizeConnection
             ? (res, req, ctx) => {
-                (0, upgrade_1.upgradeAuthorize)(server.auth.config.authorizeConnection, res, req, ctx);
+                (0, upgrade_1.upgradeAuthorize)(server, res, req, ctx);
             }
-            : upgrade_1.upgrade,
+            : (res, req, ctx) => {
+                (0, upgrade_1.upgrade)(server, res, req, ctx);
+            },
         message: (ws, data, isBinary) => {
-            (0, message_1.message)(server, ws.c, data, isBinary);
+            (0, ws_1.message)(server, ws.c, data, isBinary);
         },
         open: (ws) => {
             if (ws) {
-                // ws.bla = genLargeMemBlock()
-                const client = { ws };
-                ws.c = client;
+                const ctx = {
+                    session: ws,
+                };
+                ws.c = ctx;
+                wsListeners.open(ctx);
+                if (ctx.session.authState) {
+                    (0, auth_1.sendAuthMessage)(ctx);
+                }
             }
         },
         close: (ws) => {
+            console.info('CLOSE!');
             // cl--
             ws.obs.forEach((id) => {
-                (0, observable_1.unsubscribeIgnoreClient)(server, id, ws.c);
+                (0, observable_1.unsubscribeWsIgnoreClient)(server, id, ws.c);
             });
+            wsListeners.close(ws.c);
             // Looks really ugly but same impact on memory and GC as using the ws directly
             // and better for dc's when functions etc are in progress
-            ws.c.ws = null;
+            ws.c.session = null;
             ws.c = null;
         },
         drain: () => {
-            // console.info('drain')
+            console.info('drain');
             // lets handle drain efficiently (or more efficiently at least)
             // call client.drain can be much more efficient
             // if (ws.client && ws.client.backpressureQueue) {

package/dist/incoming/index.js.map

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

package/dist/incoming/upgrade.d.ts

@@ -0,0 +1,4 @@
+import uws from '@based/uws';
+import { BasedServer } from '../server';
+export declare const upgrade: (server: BasedServer, res: uws.HttpResponse, req: uws.HttpRequest, ctx: uws.us_socket_context_t) => void;
+export declare const upgradeAuthorize: (server: BasedServer, res: uws.HttpResponse, req: uws.HttpRequest, ctx: uws.us_socket_context_t) => void;