@based/server 4.0.1 → 4.0.2

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

@@ -1,106 +1,25 @@
 "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) => {
+const multiPart_1 = require("./multiPart");
+const stream_1 = require("./stream");
+const httpStreamFunction = (server, ctx, 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);
+        (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);
-        });
+        (0, multiPart_1.multiPart)(server, ctx, 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();
-    });
+    (0, stream_1.singleStream)(server, ctx, route, type, size);
 };
 exports.httpStreamFunction = httpStreamFunction;
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/incoming/http/streamFunction/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/incoming/http/streamFunction/index.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAG9C,0CAA+C;AAC/C,2CAAuC;AACvC,qCAAuC;AAEhC,MAAM,kBAAkB,GAAG,CAChC,MAAmB,EACnB,GAAyB,EACzB,KAA+B,EAC/B,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAClD,IAAI,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,cAAc,GAAG,IAAI,EAAE;QAC5D,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QACjE,OAAM;KACP;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAChD,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE;QAClD,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QAC7B,OAAM;KACP;IACD,IAAA,qBAAY,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;AAC9C,CAAC,CAAA;AAnBY,QAAA,kBAAkB,sBAmB9B"}

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

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

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

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.multiPart = void 0;
+const installFn_1 = require("../../../../installFn");
+const readFormData_1 = __importDefault(require("./readFormData"));
+const error_1 = require("../../../../error");
+const sendHttpResponse_1 = require("../../../../sendHttpResponse");
+const handleFile = async (server, ctx, installedFn, file, route) => {
+    try {
+        const ok = await server.auth.authorize(server.client, ctx, route.name, file);
+        if (!ok) {
+            return {
+                error: (0, error_1.createErrorData)(error_1.BasedErrorCode.AuthorizeRejectedError, {
+                    route,
+                }),
+            };
+        }
+    }
+    catch (err) {
+        return {
+            error: (0, error_1.createErrorData)(error_1.BasedErrorCode.AuthorizeFunctionError, {
+                route,
+                err,
+            }),
+        };
+    }
+    const spec = await installedFn;
+    if (spec === null) {
+        return {
+            error: (0, error_1.createErrorData)(error_1.BasedErrorCode.FunctionNotFound, {
+                route,
+            }),
+        };
+    }
+    try {
+        const value = await spec.function(server.client, file, ctx);
+        return { value };
+    }
+    catch (err) {
+        return {
+            error: (0, error_1.createErrorData)(error_1.BasedErrorCode.FunctionError, { err, route }),
+        };
+    }
+};
+const multiPart = (server, ctx, route) => {
+    ctx.session.res.cork(() => {
+        ctx.session.res.writeHeader('Access-Control-Allow-Origin', '*');
+        ctx.session.res.writeHeader('Access-Control-Allow-Headers', '*');
+        ctx.session.corsSend = true;
+    });
+    const installedFn = (0, installFn_1.installFn)(server, server.client.ctx, route);
+    const pendingFiles = [];
+    const onFile = (file) => {
+        pendingFiles.push(handleFile(server, ctx, installedFn, file, route));
+    };
+    const ready = async () => {
+        const results = await Promise.all(pendingFiles);
+        (0, sendHttpResponse_1.sendHttpResponse)(ctx, results);
+    };
+    (0, readFormData_1.default)(ctx, server, route, onFile, ready);
+};
+exports.multiPart = multiPart;
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/incoming/http/streamFunction/multiPart/index.ts"],"names":[],"mappings":";;;;;;AAMA,qDAAiD;AACjD,kEAAyC;AACzC,6CAI0B;AAC1B,mEAA+D;AAE/D,MAAM,UAAU,GAAG,KAAK,EACtB,MAAmB,EACnB,GAAyB,EACzB,WAAoD,EACpD,IAAmB,EACnB,KAA+B,EAW/B,EAAE;IACF,IAAI;QACF,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAC5E,IAAI,CAAC,EAAE,EAAE;YACP,OAAO;gBACL,KAAK,EAAE,IAAA,uBAAe,EAAC,sBAAc,CAAC,sBAAsB,EAAE;oBAC5D,KAAK;iBACN,CAAC;aACH,CAAA;SACF;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO;YACL,KAAK,EAAE,IAAA,uBAAe,EAAC,sBAAc,CAAC,sBAAsB,EAAE;gBAC5D,KAAK;gBACL,GAAG;aACJ,CAAC;SACH,CAAA;KACF;IAED,MAAM,IAAI,GAAG,MAAM,WAAW,CAAA;IAE9B,IAAI,IAAI,KAAK,IAAI,EAAE;QACjB,OAAO;YACL,KAAK,EAAE,IAAA,uBAAe,EAAC,sBAAc,CAAC,gBAAgB,EAAE;gBACtD,KAAK;aACN,CAAC;SACH,CAAA;KACF;IACD,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;QAC3D,OAAO,EAAE,KAAK,EAAE,CAAA;KACjB;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO;YACL,KAAK,EAAE,IAAA,uBAAe,EAAC,sBAAc,CAAC,aAAa,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;SACrE,CAAA;KACF;AACH,CAAC,CAAA;AAEM,MAAM,SAAS,GAAG,CACvB,MAAmB,EACnB,GAAyB,EACzB,KAA+B,EAC/B,EAAE;IACF,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;QAC/D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAA;QAChE,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAE/D,MAAM,YAAY,GAAoC,EAAE,CAAA;IAExD,MAAM,MAAM,GAAG,CAAC,IAAmB,EAAE,EAAE;QACrC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;IACtE,CAAC,CAAA;IAED,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;QACvB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAC/C,IAAA,mCAAgB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChC,CAAC,CAAA;IAED,IAAA,sBAAY,EAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AACjD,CAAC,CAAA;AAzBY,QAAA,SAAS,aAyBrB"}

package/dist/incoming/http/streamFunction/multiPart/readFormData.d.ts

@@ -0,0 +1,12 @@
+import { HttpSession, Context, StreamPayload } from '@based/functions';
+import { BasedServer } from '../../../../server';
+import { BasedFunctionRoute } from '../../../../functions';
+export declare type FileOptions = {
+    name?: string;
+    size?: number;
+    type: string;
+    extension: string;
+    payload: any;
+};
+declare const _default: (ctx: Context<HttpSession>, server: BasedServer, route: BasedFunctionRoute, onFile: (payload: StreamPayload) => void, isReady: () => void) => void;
+export default _default;

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

@@ -3,43 +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 send_1 = require("../send");
-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) {
@@ -50,24 +19,54 @@ const setHeader = (file) => {
 const toBuffer = (str, firstWritten) => {
     return Buffer.from(firstWritten ? str + '\r\n' : str, 'binary');
 };
-exports.default = async (client, server, payload, route, spec) => {
-    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;
+            }
+        }
     }
-    const fn = require(spec.functionPath);
+    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 = client.context.headers['content-length'];
-    const promiseQ = [];
+    const contentLength = ctx.session.headers['content-length'];
     let setInProgress = false;
     let boundary = null;
     let prevLine;
     let isWriting = false;
+    let collectMeta;
     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();
             }
@@ -88,7 +87,6 @@ exports.default = async (client, server, payload, route, spec) => {
                                     if (progress === 1) {
                                         file.isDone = true;
                                     }
-                                    file.stream.emit('progress', progress);
                                 }
                             }
                             setInProgress = false;
@@ -115,9 +113,6 @@ exports.default = async (client, server, payload, route, spec) => {
                 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 = async (client, server, payload, route, spec) => {
             }
             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 = 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);
+                // 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, send_1.sendHttpError)(server, client, 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 }, client.context));
-                }
+                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, 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);
+                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 }, client.context));
+                    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 = async (client, server, payload, route, spec) => {
             }
         }
         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, send_1.sendHttpResponse)(client, 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/multipartStream.d.ts

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