@based/server 4.0.1 → 4.0.2

package/dist/incoming/http/get.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpGet = void 0;
-const functions_1 = require("../../functions");
 const sendHttpResponse_1 = require("../../sendHttpResponse");
 const compress_1 = require("../../compress");
 const observable_1 = require("../../observable");
@@ -13,6 +12,8 @@ const utils_1 = require("@saulx/utils");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
 const node_util_1 = require("node:util");
+const authorize_1 = require("../../authorize");
+const installFn_1 = require("../../installFn");
 const inflate = (0, node_util_1.promisify)(node_zlib_1.default.inflate);
 const sendCacheSwapEncoding = async (server, route, ctx, buffer, checksum) => {
     try {
@@ -52,6 +53,7 @@ const sendNotModified = (ctx) => {
 };
 const sendGetResponse = (route, server, id, obs, checksum, ctx) => {
     if (!ctx.session) {
+        (0, observable_1.destroyObs)(server, id);
         return;
     }
     const encoding = ctx.session.headers.encoding;
@@ -82,7 +84,7 @@ const sendGetResponse = (route, server, id, obs, checksum, ctx) => {
 const getFromExisting = (server, id, ctx, route, checksum) => {
     const obs = (0, observable_1.getObs)(server, id);
     if (obs.error) {
-        (0, observable_1.sendObsGetError)(server, ctx, obs.id, obs.name, obs.error);
+        (0, observable_1.sendObsGetError)(server, ctx, obs.id, obs.error);
         return;
     }
     if (obs.cache) {
@@ -94,62 +96,50 @@ const getFromExisting = (server, id, ctx, route, checksum) => {
             return;
         }
         if (err) {
-            (0, observable_1.sendObsGetError)(server, ctx, obs.id, obs.name, err);
+            (0, observable_1.sendObsGetError)(server, ctx, obs.id, err);
         }
         else {
             sendGetResponse(route, server, id, obs, checksum, ctx);
         }
     });
 };
-const httpGet = (route, payload, ctx, server, checksum) => {
-    if (!ctx.session) {
-        return;
-    }
-    if (payload === undefined && 'query' in ctx.session) {
-        try {
-            payload = (0, utils_1.parseQuery)(decodeURIComponent(ctx.session.query));
-        }
-        catch (err) { }
-    }
+const isAuthorized = (route, server, ctx, payload, id, checksum) => {
     const name = route.name;
-    const id = (0, observable_1.genObservableId)(name, payload);
     if ((0, observable_1.hasObs)(server, id)) {
         getFromExisting(server, id, ctx, route, checksum);
         return;
     }
-    server.functions
-        .install(name)
-        .then((spec) => {
-        if (!ctx.session) {
-            return;
-        }
-        if (!spec) {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route);
-            return;
-        }
-        if (!(0, functions_1.isObservableFunctionSpec)(spec)) {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotObservable, route);
+    (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, route, checksum);
             return;
         }
-        const obs = (0, observable_1.createObs)(server, name, id, payload);
+        const obs = (0, observable_1.createObs)(server, name, id, payload, true);
         (0, observable_1.subscribeNext)(obs, (err) => {
             if (err) {
-                (0, observable_1.sendObsGetError)(server, ctx, obs.id, obs.name, err);
+                (0, observable_1.sendObsGetError)(server, ctx, obs.id, err);
             }
             else {
                 sendGetResponse(route, server, id, obs, checksum, ctx);
             }
         });
-    })
-        .catch((err) => {
-        // TODO: error type
-        console.error('Internal: Unxpected error in observable', err);
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route);
+        (0, observable_1.start)(server, id);
     });
 };
+const httpGet = (route, payload, ctx, server, checksum) => {
+    if (!ctx.session) {
+        return;
+    }
+    if (payload === undefined && 'query' in ctx.session) {
+        try {
+            payload = (0, utils_1.parseQuery)(decodeURIComponent(ctx.session.query));
+        }
+        catch (err) { }
+    }
+    (0, authorize_1.authorize)(route, server, ctx, payload, isAuthorized, (0, observable_1.genObservableId)(route.name, payload), checksum);
+};
 exports.httpGet = httpGet;
 //# sourceMappingURL=get.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/incoming/http/get.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/incoming/http/get.ts"],"names":[],"mappings":";;;;;;AAGA,6DAA4C;AAC5C,6CAAyC;AACzC,iDAUyB;AACzB,0DAA4B;AAC5B,wCAAyC;AACzC,uCAA4C;AAC5C,+CAA2C;AAC3C,yCAAqC;AACrC,+CAAgE;AAChE,+CAA2C;AAE3C,MAAM,OAAO,GAAG,IAAA,qBAAS,EAAC,mBAAI,CAAC,OAAO,CAAC,CAAA;AAEvC,MAAM,qBAAqB,GAAG,KAAK,EACjC,MAAmB,EACnB,KAAyB,EACzB,GAAyB,EACzB,MAAkB,EAClB,QAAgB,EAChB,EAAE;IACF,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;QAChD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,mBAAQ,EAC1C,QAAQ,EACR,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAC7B,CAAA;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE;YACpB,OAAM;SACP;QACD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;YACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YACrC,IAAI,QAAQ,EAAE;gBACZ,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;aAC1D;YACD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;YACrD,IAAA,sBAAG,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QACnB,CAAC,CAAC,CAAA;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;KACzE;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAChB,GAAyB,EACzB,MAAkB,EAClB,QAAgB,EAChB,SAAkB,EAClB,EAAE;IACF,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QACrC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;QACrD,IAAI,SAAS,EAAE;YACb,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAA;SAC3D;QACD,IAAA,sBAAG,EAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,GAAyB,EAAE,EAAE;IACpD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;QAC/C,IAAA,sBAAG,EAAC,GAAG,CAAC,CAAA;IACV,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CACtB,KAAyB,EACzB,MAAmB,EACnB,EAAU,EACV,GAAqB,EACrB,QAAgB,EAChB,GAAyB,EACzB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,IAAA,uBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAM;KACP;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAA;IAE7C,IAAI,QAAQ,KAAK,CAAC,IAAI,QAAQ,KAAK,GAAG,CAAC,QAAQ,EAAE;QAC/C,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACd,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,yBAAyB,EAAE;gBAC/D,YAAY,EAAE,EAAE;gBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;aAC1B,CAAC,CAAA;SACH;aAAM,IAAI,GAAG,CAAC,SAAS,EAAE;YACxB,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAChE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;aAC9C;iBAAM;gBACL,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;aACnE;SACF;aAAM;YACL,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;SAC/C;KACF;SAAM;QACL,eAAe,CAAC,GAAG,CAAC,CAAA;KACrB;IACD,IAAA,uBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CACtB,MAAmB,EACnB,EAAU,EACV,GAAyB,EACzB,KAAyB,EACzB,QAAgB,EAChB,EAAE;IACF,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE9B,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,IAAA,4BAAe,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC/C,OAAM;KACP;IAED,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAA;QACtD,OAAM;KACP;IAED,IAAA,0BAAa,EAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;QACzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QACD,IAAI,GAAG,EAAE;YACP,IAAA,4BAAe,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;SAC1C;aAAM;YACL,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAA;SACvD;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,YAAY,GAGd,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;IAEvB,IAAI,IAAA,mBAAM,EAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACtB,eAAe,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;QACjD,OAAM;KACP;IAED,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9C,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,OAAM;SACP;QACD,IAAI,IAAA,mBAAM,EAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YACtB,eAAe,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;YACjD,OAAM;SACP;QAED,MAAM,GAAG,GAAG,IAAA,sBAAS,EAAC,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QACtD,IAAA,0BAAa,EAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,IAAI,GAAG,EAAE;gBACP,IAAA,4BAAe,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;aAC1C;iBAAM;gBACL,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAA;aACvD;QACH,CAAC,CAAC,CAAA;QACF,IAAA,kBAAK,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CACrB,KAA8B,EAC9B,OAAY,EACZ,GAAyB,EACzB,MAAmB,EACnB,QAAgB,EACV,EAAE;IACR,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IAED,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,IAAI,GAAG,CAAC,OAAO,EAAE;QACnD,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,IAAA,qBAAS,EACP,KAAK,EACL,MAAM,EACN,GAAG,EACH,OAAO,EACP,YAAY,EACZ,IAAA,4BAAe,EAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,EACpC,QAAQ,CACT,CAAA;AACH,CAAC,CAAA;AA1BY,QAAA,OAAO,WA0BnB"}

package/dist/incoming/http/index.js

@@ -6,15 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpHandler = void 0;
 const function_1 = require("./function");
 const streamFunction_1 = require("./streamFunction");
+const functions_1 = require("../../functions");
 const get_1 = require("./get");
 const readBody_1 = require("./readBody");
-const authorize_1 = require("./authorize");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
 const security_1 = require("../../security");
-const auth_1 = require("../../auth");
 const parseQuery_1 = __importDefault(require("./parseQuery"));
 const ip_1 = require("../../ip");
+const auth_1 = require("../../auth");
+const authorize_1 = require("../../authorize");
+const sendHttpResponse_1 = require("../../sendHttpResponse");
 let clientId = 0;
 const handleRequest = (server, method, ctx, route, ready) => {
     if (method === 'post') {
@@ -34,11 +36,11 @@ const httpHandler = (server, req, res) => {
     if ((0, security_1.blockIncomingRequest)(server, ip, res, req, server.rateLimit.http, 1)) {
         return;
     }
+    const method = req.getMethod();
     const url = req.getUrl();
     const path = url.split('/');
     const route = server.functions.route(path[1], url);
-    const method = req.getMethod();
-    if (route === false) {
+    if (route === null || route.internalOnly === true) {
         (0, sendError_1.sendError)(server, {
             session: {
                 ua: req.getHeader('user-agent'),
@@ -46,12 +48,16 @@ const httpHandler = (server, req, res) => {
                 method,
                 id: ++clientId,
                 headers: {},
+                authState: {},
                 res,
                 req,
             },
-        }, error_1.BasedErrorCode.FunctionNotFound, path[1] ? { name: path[1] } : { name: '', path: url });
+        }, error_1.BasedErrorCode.FunctionNotFound, path[1]
+            ? { route: { name: path[1] } }
+            : { route: { name: '', path: url } });
         return;
     }
+    const authorization = req.getHeader('authorization');
     const ctx = {
         session: {
             res,
@@ -60,7 +66,7 @@ const httpHandler = (server, req, res) => {
             ua: req.getHeader('user-agent'),
             ip,
             id: ++clientId,
-            authState: (0, auth_1.parseAuthState)(req.getHeader('authorization')),
+            authState: authorization ? (0, auth_1.parseAuthState)(authorization) : {},
             headers: {
                 'content-type': req.getHeader('content-type'),
                 'content-encoding': req.getHeader('content-encoding'),
@@ -68,9 +74,16 @@ const httpHandler = (server, req, res) => {
             },
         },
     };
+    if (route.headers) {
+        for (const header of route.headers) {
+            ctx.session.headers[header] = req.getHeader(header);
+        }
+    }
     if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.http)) {
+        (0, security_1.endRateLimitHttp)(res);
         return;
     }
+    // double check impact
     const query = req.getQuery();
     if (query) {
         ctx.session.query = query;
@@ -94,40 +107,46 @@ const httpHandler = (server, req, res) => {
             }
         }
     }
-    if (route.observable === true) {
-        if (route.stream) {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.CannotStreamToObservableFunction, route);
+    if ((0, functions_1.isQueryFunctionRoute)(route)) {
+        // handle HEAD
+        if (method !== 'post' && method !== 'get') {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
             return;
         }
         const checksumRaw = req.getHeader('if-none-match');
         const checksumNum = Number(checksumRaw);
         const checksum = !isNaN(checksumNum) ? checksumNum : 0;
         handleRequest(server, method, ctx, route, (payload) => {
-            (0, authorize_1.authorizeRequest)(server, ctx, payload, route, () => {
-                (0, get_1.httpGet)(route, payload, ctx, server, checksum);
-            });
+            (0, get_1.httpGet)(route, payload, ctx, server, checksum);
         });
+        return;
     }
-    else {
-        if (route.stream === true) {
-            if (method !== 'post') {
-                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
-                return;
-            }
-            if (ctx.session.headers['content-length'] === 0) {
-                // zero is also not allowed for streams
-                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.LengthRequired, route);
-                return;
-            }
-            (0, streamFunction_1.httpStreamFunction)(server, ctx, (0, parseQuery_1.default)(ctx), route);
+    if ((0, functions_1.isStreamFunctionRoute)(route)) {
+        if (method === 'options') {
+            (0, sendHttpResponse_1.end)(ctx);
+            return;
+        }
+        if (method !== 'post') {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
+            return;
         }
-        else {
-            handleRequest(server, method, ctx, route, (payload) => {
-                (0, authorize_1.authorizeRequest)(server, ctx, payload, route, () => {
-                    (0, function_1.httpFunction)(route, ctx, server, payload);
-                });
-            });
+        if (ctx.session.headers['content-length'] === 0) {
+            // zero is also not allowed for streams
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.LengthRequired, route);
+            return;
         }
+        (0, streamFunction_1.httpStreamFunction)(server, ctx, route);
+        return;
+    }
+    if ((0, functions_1.isFunctionRoute)(route)) {
+        // handle HEAD
+        if (method !== 'post' && method !== 'get') {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
+            return;
+        }
+        handleRequest(server, method, ctx, route, (payload) => {
+            (0, authorize_1.authorize)(route, server, ctx, payload, function_1.httpFunction);
+        });
     }
 };
 exports.httpHandler = httpHandler;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/http/index.ts"],"names":[],"mappings":";;;;;;AAGA,yCAAyC;AACzC,qDAAqD;AAErD,+BAA+B;AAC/B,yCAAqC;AACrC,2CAA8C;AAC9C,uCAA4C;AAC5C,+CAA2C;AAC3C,6CAAuE;AACvE,qCAA2C;AAC3C,8DAAqC;AACrC,iCAAgC;AAEhC,IAAI,QAAQ,GAAG,CAAC,CAAA;AAEhB,MAAM,aAAa,GAAG,CACpB,MAAmB,EACnB,MAAc,EACd,GAAyB,EACzB,KAAyB,EACzB,KAA8B,EAC9B,EAAE;IACF,IAAI,MAAM,KAAK,MAAM,EAAE;QACrB,IAAA,mBAAQ,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;KACpC;SAAM;QACL,KAAK,CAAC,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC,CAAA;KACvB;AACH,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;QACtB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;QACtB,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IACpB,CAAC,CAAC,CAAA;IAEF,MAAM,EAAE,GAAG,IAAA,UAAK,EAAC,GAAG,CAAC,CAAA;IAErB,IAAI,IAAA,+BAAoB,EAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE;QACxE,OAAM;KACP;IAED,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAA;IACxB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAElD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAA;IAE9B,IAAI,KAAK,KAAK,KAAK,EAAE;QACnB,IAAA,qBAAS,EACP,MAAM,EACN;YACE,OAAO,EAAE;gBACP,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC;gBAC/B,EAAE;gBACF,MAAM;gBACN,EAAE,EAAE,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,GAAG;gBACH,GAAG;aACJ;SACF,EACD,sBAAc,CAAC,gBAAgB,EAC/B,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CACtD,CAAA;QACD,OAAM;KACP;IAED,MAAM,GAAG,GAAyB;QAChC,OAAO,EAAE;YACP,GAAG;YACH,GAAG;YACH,MAAM;YACN,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC;YAC/B,EAAE;YACF,EAAE,EAAE,EAAE,QAAQ;YACd,SAAS,EAAE,IAAA,qBAAc,EAAC,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YACzD,OAAO,EAAE;gBACP,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC;gBAC7C,kBAAkB,EAAE,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC;gBACrD,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC;aAC3C;SACF;KACF,CAAA;IAED,IACE,IAAA,2BAAgB,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAC3E;QACA,OAAM;KACP;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA;IAC5B,IAAI,KAAK,EAAE;QACT,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;KAC1B;IAED,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IAC3C,MAAM,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAClD,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;QACtD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,YAAY,CAAA;KACrD;IAED,IACE,MAAM,KAAK,MAAM;QACjB,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,SAAS,EACnD;QACA,oCAAoC;QACpC,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QAC5D,OAAM;KACP;IAED,IAAI,KAAK,CAAC,OAAO,EAAE;QACjB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;YAClC,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YAC/B,IAAI,CAAC,EAAE;gBACL,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;aAChC;SACF;KACF;IAED,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,EAAE;QAC7B,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,IAAA,qBAAS,EACP,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,gCAAgC,EAC/C,KAAK,CACN,CAAA;YACD,OAAM;SACP;QACD,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;QAClD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;YACpD,IAAA,4BAAgB,EAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE;gBACjD,IAAA,aAAO,EAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YAChD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;KACH;SAAM;QACL,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE;YACzB,IAAI,MAAM,KAAK,MAAM,EAAE;gBACrB,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;gBAC9D,OAAM;aACP;YACD,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;gBAC/C,uCAAuC;gBACvC,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;gBAC5D,OAAM;aACP;YACD,IAAA,mCAAkB,EAAC,MAAM,EAAE,GAAG,EAAE,IAAA,oBAAU,EAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;SACxD;aAAM;YACL,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;gBACpD,IAAA,4BAAgB,EAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE;oBACjD,IAAA,uBAAY,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;gBAC3C,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;SACH;KACF;AACH,CAAC,CAAA;AArIY,QAAA,WAAW,eAqIvB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/http/index.ts"],"names":[],"mappings":"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"}

package/dist/incoming/http/parseQuery.d.ts

@@ -1,4 +1,4 @@
-import { Context, HttpSession } from '../../context';
+import { Context, HttpSession } from '@based/functions';
 import { parseQuery } from '@saulx/utils';
 declare const _default: (ctx: Context<HttpSession>) => ReturnType<typeof parseQuery>;
 export default _default;

package/dist/incoming/http/parseQuery.js

@@ -11,7 +11,9 @@ exports.default = (ctx) => {
     }
     try {
         ctx.session.parsedQuery = (0, utils_1.parseQuery)(ctx.session.query);
-        if (!ctx.session.authState &&
+        // TODO chekc if this is a good idea (can also call it 'autState')
+        if (!ctx.session.authState.token &&
+            !ctx.session.authState.refreshToken &&
             ctx.session.parsedQuery &&
             'token' in ctx.session.parsedQuery) {
             ctx.session.authState = (0, auth_1.parseAuthState)(ctx.session.parsedQuery.token);

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

@@ -1 +1 @@
-{"version":3,"file":"parseQuery.js","sourceRoot":"","sources":["../../../src/incoming/http/parseQuery.ts"],"names":[],"mappings":";;AACA,wCAAyC;AACzC,qCAA2C;AAE3C,kBAAe,CAAC,GAAyB,EAAiC,EAAE;IAC1E,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;QAC7B,OAAM;KACP;IACD,IAAI,aAAa,IAAI,GAAG,CAAC,OAAO,EAAE;QAChC,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAA;KAC/B;IACD,IAAI;QACF,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,IAAA,kBAAU,EAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEvD,IACE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS;YACtB,GAAG,CAAC,OAAO,CAAC,WAAW;YACvB,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAClC;YACA,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,IAAA,qBAAc,EAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;SACtE;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAA;KAC/B;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAA;KACpC;AACH,CAAC,CAAA"}
+{"version":3,"file":"parseQuery.js","sourceRoot":"","sources":["../../../src/incoming/http/parseQuery.ts"],"names":[],"mappings":";;AACA,wCAAyC;AACzC,qCAA2C;AAE3C,kBAAe,CAAC,GAAyB,EAAiC,EAAE;IAC1E,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;QAC7B,OAAM;KACP;IACD,IAAI,aAAa,IAAI,GAAG,CAAC,OAAO,EAAE;QAChC,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAA;KAC/B;IACD,IAAI;QACF,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,IAAA,kBAAU,EAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEvD,kEAAkE;QAClE,IACE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK;YAC5B,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY;YACnC,GAAG,CAAC,OAAO,CAAC,WAAW;YACvB,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAClC;YACA,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,IAAA,qBAAc,EAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;SACtE;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAA;KAC/B;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAA;KACpC;AACH,CAAC,CAAA"}

package/dist/incoming/http/readBody.d.ts

@@ -1,4 +1,5 @@
-import { HttpSession, Context } from '../../context';
-import { BasedFunctionRoute } from '../../functions';
+import { HttpSession, Context } from '@based/functions';
+import { BasedFunctionRoute, BasedQueryFunctionRoute } from '../../functions';
 import { BasedServer } from '../../server';
-export declare const readBody: (server: BasedServer, ctx: Context<HttpSession>, onData: (data: any | void) => void, route: BasedFunctionRoute) => void;
+export declare const parseHttpPayload: (server: BasedServer, ctx: Context<HttpSession>, data: Uint8Array, route: BasedFunctionRoute | BasedQueryFunctionRoute) => any;
+export declare const readBody: (server: BasedServer, ctx: Context<HttpSession>, onData: (data: any | void) => void, route: BasedFunctionRoute | BasedQueryFunctionRoute) => void;

package/dist/incoming/http/readBody.js

@@ -3,23 +3,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readBody = void 0;
+exports.readBody = exports.parseHttpPayload = void 0;
 const node_zlib_1 = __importDefault(require("node:zlib"));
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
-// TODO: might be good to use worker stream as well for this
+const decoder = new TextDecoder('utf-8');
 const MAX_CHUNK_SIZE = 1024 * 1024;
 const UNCOMPRESS_OPTS = {
     // can be endless scince we limit by incoming
     chunkSize: 1024 * 1024 * 1000,
 };
+const parseHttpPayload = (server, ctx, data, route) => {
+    const contentType = ctx.session.headers['content-type'];
+    if (contentType === 'application/json' || !contentType) {
+        const str = decoder.decode(data);
+        let parsedData;
+        try {
+            parsedData = data.byteLength ? JSON.parse(str) : undefined;
+            return parsedData;
+        }
+        catch (err) {
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, { route });
+        }
+    }
+    else if (contentType.startsWith('text') ||
+        contentType === 'application/xml') {
+        return decoder.decode(data);
+    }
+    else {
+        return data;
+    }
+};
+exports.parseHttpPayload = parseHttpPayload;
 const readBody = (server, ctx, onData, route) => {
     if (!ctx.session) {
         return;
     }
     const contentLen = ctx.session.headers['content-length'];
     if (contentLen > route.maxPayloadSize) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, { route });
         return;
     }
     const contentEncoding = ctx.session.headers['content-encoding'];
@@ -39,7 +61,7 @@ const readBody = (server, ctx, onData, route) => {
             ctx.session.res.onData((c, isLast) => {
                 size += c.byteLength;
                 if (size > route.maxPayloadSize) {
-                    (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
+                    (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, { route });
                     uncompressStream.destroy();
                     return;
                 }
@@ -74,11 +96,12 @@ const readBody = (server, ctx, onData, route) => {
                     buf.set(c, i);
                     i += c.byteLength;
                 }
-                onData(buf);
+                // readValue
+                onData((0, exports.parseHttpPayload)(server, ctx, buf, route));
             });
         }
         else {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, route);
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.InvalidPayload, { route });
         }
     }
     else {
@@ -88,7 +111,7 @@ const readBody = (server, ctx, onData, route) => {
             const len = c.byteLength;
             size += len;
             if (size > route.maxPayloadSize) {
-                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, { route });
                 return;
             }
             if (c.byteLength > MAX_CHUNK_SIZE) {
@@ -98,7 +121,8 @@ const readBody = (server, ctx, onData, route) => {
             buf.set(new Uint8Array(c), index);
             index += len;
             if (isLast) {
-                onData(buf);
+                // readValue
+                onData((0, exports.parseHttpPayload)(server, ctx, buf, route));
             }
         });
     }

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

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

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

@@ -1,7 +1,15 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { Duplex } from 'stream';
+import util from 'node:util';
 export declare class DataStream extends Duplex {
+    size: number;
+    receivedBytes: number;
+    progessTimer: NodeJS.Timeout;
+    constructor(size: number);
     _read(): void;
     _write(chunk: any, encoding: any, callback: any): void;
     _final(): void;
+    [util.inspect.custom](): string;
 }

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

@@ -1,19 +1,58 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataStream = void 0;
 const stream_1 = require("stream");
-// copy / ;/ or shall we just run stream functions on the main thread
-// how to send to worker...
+const node_util_1 = __importDefault(require("node:util"));
 class DataStream extends stream_1.Duplex {
+    constructor(size) {
+        super();
+        this.size = 0;
+        this.receivedBytes = 0;
+        this.size = size;
+        this.emit('progress', 0);
+    }
     _read() { }
-    // writableHighWaterMark:
     _write(chunk, encoding, callback) {
+        this.receivedBytes += chunk.byteLength;
+        if (this.size && this.size > 20000) {
+            if (!this.progessTimer) {
+                this.progessTimer = setTimeout(() => {
+                    const progress = this.receivedBytes / this.size;
+                    this.emit('progress', progress);
+                    this.progessTimer = null;
+                }, 200);
+            }
+        }
         this.push(Buffer.from(chunk, encoding));
         callback();
     }
     _final() {
+        if (!this.size) {
+            this.size = this.receivedBytes;
+        }
+        this.receivedBytes = this.size;
+        if (this.progessTimer) {
+            clearTimeout(this.progessTimer);
+            this.progessTimer = null;
+        }
+        this.emit('progress', 1);
         this.push(null);
     }
+    [node_util_1.default.inspect.custom]() {
+        if (this.size) {
+            const rb = this.receivedBytes < 1000
+                ? Math.round(this.receivedBytes / 1024) + 'kb'
+                : Math.round(this.receivedBytes / 1024 / 1024) + 'mb';
+            return `[BasedStream ${~~((this.receivedBytes / this.size) *
+                100)}% ${rb}]`;
+        }
+        else {
+            return `[BasedStream]`;
+        }
+    }
 }
 exports.DataStream = DataStream;
 //# sourceMappingURL=DataStream.js.map

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

@@ -1 +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"}
+{"version":3,"file":"DataStream.js","sourceRoot":"","sources":["../../../../src/incoming/http/streamFunction/DataStream.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA+B;AAC/B,0DAA4B;AAE5B,MAAa,UAAW,SAAQ,eAAM;IAKpC,YAAY,IAAY;QACtB,KAAK,EAAE,CAAA;QALF,SAAI,GAAW,CAAC,CAAA;QAChB,kBAAa,GAAW,CAAC,CAAA;QAK9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IAC1B,CAAC;IAED,KAAK,KAAI,CAAC;IAEV,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;QAC9B,IAAI,CAAC,aAAa,IAAI,KAAK,CAAC,UAAU,CAAA;QACtC,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,KAAK,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;gBACtB,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;oBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAA;oBAC/C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;oBAC/B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;gBAC1B,CAAC,EAAE,GAAG,CAAC,CAAA;aACR;SACF;QACD,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,EAAE;YACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,aAAa,CAAA;SAC/B;QACD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAA;QAC9B,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAC/B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;SACzB;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;QACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjB,CAAC;IAED,CAAC,mBAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACnB,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,MAAM,EAAE,GACN,IAAI,CAAC,aAAa,GAAG,IAAI;gBACvB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,IAAI;gBAC9C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,CAAA;YAEzD,OAAO,gBAAgB,CAAC,CAAC,CACvB,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC;gBAChC,GAAG,CACJ,KAAK,EAAE,GAAG,CAAA;SACZ;aAAM;YACL,OAAO,eAAe,CAAA;SACvB;IACH,CAAC;CACF;AAxDD,gCAwDC"}

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

@@ -1,2 +1,2 @@
-declare const _default: (mimeType: string) => any;
+declare const _default: (mimeType: string) => string | false;
 export default _default;

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

@@ -1,4 +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;
+import { BasedStreamFunctionRoute } from '../../../functions';
+import { HttpSession, Context } from '@based/functions';
+export declare const httpStreamFunction: (server: BasedServer, ctx: Context<HttpSession>, route: BasedStreamFunctionRoute) => void;