@based/client 5.3.0 → 6.0.0

package/dist/src/outgoing/protocol.js

@@ -17,7 +17,9 @@ const encodeHeader = (type, isDeflate, len) => {
     //   4 = auth
     //   5 = subscribeChannel
     //   6 = publishChannel
-    //   7 = unsubscribeChannel
+    //   7.0 = unsubscribeChannel
+    //   7.1 = register stream
+    //   7.2 = chunk
     // isDeflate (1 bit)
     // len (28 bits)
     // @ts-ignore
@@ -77,11 +79,12 @@ export const encodeSubscribeChannelMessage = (id, o) => {
     // Type 5 = subscribe
     // | 4 header | 8 id | 1 name length | * name | * payload |
     // Type 7 = unsubscribe
-    // | 4 header | 8 id |
+    // | 4 header | 1    = 0 | 8 id |
     if (type === 7) {
-        const buff = createBuffer(type, false, 12);
-        storeUint8(buff, id, 4, 8);
-        return { buffers: [buff], len: 12 };
+        const buff = createBuffer(type, false, 13);
+        storeUint8(buff, 0, 4, 1);
+        storeUint8(buff, id, 5, 8);
+        return { buffers: [buff], len: 13 };
     }
     const n = encoder.encode(name);
     len += 1 + n.length;
@@ -175,4 +178,81 @@ export const encodeAuthMessage = (authState) => {
     }
     return buff;
 };
+export const encodeStreamMessage = (f) => {
+    const [subType, reqId] = f;
+    // Type 7.1 Start stream
+    // | 4 header | 1 subType = 1 | 3 reqId | 4 content-size | 1 nameLen | 1 mimeLen | 1 fnNameLen | 1 extensionLength | name | mime | fnName | extension | payload
+    if (subType === 1) {
+        const [, , contentSize, name, mimeType, extension, fnName, payload] = f;
+        let sLen = 16;
+        let len = sLen;
+        const nameEncoded = encoder.encode(name);
+        len += nameEncoded.length;
+        const [isDeflate, p] = encodePayload(payload);
+        if (p) {
+            len += p.length;
+        }
+        const mimeTypeEncoded = encoder.encode(mimeType);
+        len += mimeTypeEncoded.length;
+        const fnNameEncoded = encoder.encode(fnName);
+        len += fnNameEncoded.length;
+        const extensionEncoded = encoder.encode(extension);
+        len += extensionEncoded.length;
+        const buff = createBuffer(7, isDeflate, len, sLen);
+        storeUint8(buff, 1, 4, 1);
+        storeUint8(buff, reqId, 5, 3);
+        storeUint8(buff, contentSize, 8, 4);
+        storeUint8(buff, nameEncoded.length, 12, 1);
+        storeUint8(buff, mimeTypeEncoded.length, 13, 1);
+        storeUint8(buff, fnNameEncoded.length, 14, 1);
+        storeUint8(buff, extensionEncoded.length, 15, 1);
+        if (p) {
+            return {
+                buffers: [
+                    buff,
+                    nameEncoded,
+                    mimeTypeEncoded,
+                    fnNameEncoded,
+                    extensionEncoded,
+                    p,
+                ],
+                len,
+            };
+        }
+        return {
+            buffers: [
+                buff,
+                nameEncoded,
+                mimeTypeEncoded,
+                fnNameEncoded,
+                extensionEncoded,
+            ],
+            len,
+        };
+    }
+    else if (subType === 2) {
+        // Type 7.2 Chunk
+        // | 4 header | 1 subType = 2 | 3 reqId | 1 seqId | content
+        let sLen = 9;
+        let len = sLen;
+        const [, , seqId, chunk] = f;
+        // only deflate is it makes sense
+        let isDeflate = false;
+        let processed = chunk;
+        if (chunk.length > 150) {
+            processed = deflateSync(chunk);
+            len += processed.length;
+            isDeflate = true;
+        }
+        else {
+            len += chunk.length;
+        }
+        const buff = createBuffer(7, isDeflate, len, sLen);
+        storeUint8(buff, 2, 4, 1);
+        storeUint8(buff, reqId, 5, 3);
+        storeUint8(buff, seqId, 8, 1);
+        return { buffers: [buff, processed], len };
+    }
+    return { buffers: [], len: 0 };
+};
 //# sourceMappingURL=protocol.js.map

package/dist/src/outgoing/protocol.js.map

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

package/dist/src/stream/browser.d.ts

@@ -1,4 +1,7 @@
 import { BasedClient } from '../index.js';
-import { StreamFunctionOpts } from './types.js';
-declare const _default: (client: BasedClient, name: string, options: StreamFunctionOpts, progressListener?: (progress: number) => void) => Promise<any>;
+import { StreamFunctionContents } from './types.js';
+export declare const isStreaming: {
+    streaming: boolean;
+};
+declare const _default: (client: BasedClient, name: string, options: StreamFunctionContents, progressListener?: (progress: number) => void) => Promise<any>;
 export default _default;

package/dist/src/stream/browser.js

@@ -1,33 +1,25 @@
-import { isFileContents, isStreamFunctionPath, isStreamFunctionStream, } from './types.js';
-import uploadFileBrowser from './uploadFileBrowser.js';
-import fetch from './fetch.js';
+import { isFileContents } from './types.js';
+import { uploadFile } from './browserStream.js';
+export const isStreaming = { streaming: false };
+// will get browser stream as well
 export default async (client, name, options, progressListener) => {
-    if (isStreamFunctionPath(options)) {
-        return;
-    }
-    if (isStreamFunctionStream(options)) {
-        return;
-    }
-    if (options.contents instanceof ArrayBuffer) {
+    if (options.contents instanceof ArrayBuffer ||
+        typeof options.contents === 'string') {
         options.contents = new global.Blob([options.contents], {
             type: options.mimeType || 'text/plain',
         });
-        // want to stream this XHR browser / stream + http nodejs
-        return fetch(client, name, options);
-    }
-    if (isFileContents(options)) {
-        return uploadFileBrowser(client, name, options, progressListener);
     }
     if (options.contents instanceof global.Blob) {
         if (!options.mimeType) {
             options.mimeType = options.contents.type;
         }
-        // want to stream this XHR browser / stream + http nodejs
-        return fetch(client, name, options);
+        options.contents = new File([options.contents], options.fileName || 'blob', { type: options.contents.type });
     }
-    if (typeof options.contents === 'string') {
-        // want to stream this XHR browser / stream + http nodejs
-        return fetch(client, name, options);
+    if (isFileContents(options)) {
+        if (!options.size) {
+            options.size = options.contents.size;
+        }
+        return uploadFile(client, name, options, progressListener);
     }
     throw new Error(`Invalid opts for file api ${name} ${JSON.stringify(options, null, 2)}`);
 };

package/dist/src/stream/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/stream/browser.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EAEd,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,YAAY,CAAA;AACnB,OAAO,iBAAiB,MAAM,wBAAwB,CAAA;AACtD,OAAO,KAAK,MAAM,YAAY,CAAA;AAE9B,eAAe,KAAK,EAClB,MAAmB,EACnB,IAAY,EACZ,OAA2B,EAC3B,gBAA6C,EAC/B,EAAE;IAChB,IAAI,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAM;IACR,CAAC;IAED,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,YAAY,WAAW,EAAE,CAAC;QAC5C,OAAO,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACrD,IAAI,EAAE,OAAO,CAAC,QAAQ,IAAI,YAAY;SACvC,CAAC,CAAA;QACF,yDAAyD;QACzD,OAAO,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAA;IACnE,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,YAAY,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtB,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAA;QAC1C,CAAC;QAED,yDAAyD;QACzD,OAAO,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACzC,yDAAyD;QACzD,OAAO,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACxE,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/stream/browser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAA0B,MAAM,YAAY,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;AAE/C,kCAAkC;AAElC,eAAe,KAAK,EAClB,MAAmB,EACnB,IAAY,EACZ,OAA+B,EAC/B,gBAA6C,EAC/B,EAAE;IAChB,IACE,OAAO,CAAC,QAAQ,YAAY,WAAW;QACvC,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EACpC,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACrD,IAAI,EAAE,OAAO,CAAC,QAAQ,IAAI,YAAY;SACvC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,YAAY,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtB,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAA;QAC1C,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,IAAI,IAAI,CACzB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAClB,OAAO,CAAC,QAAQ,IAAI,MAAM,EAC1B,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAChC,CAAA;IACH,CAAC;IAED,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAA;QACtC,CAAC;QACD,OAAO,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACxE,CAAA;AACH,CAAC,CAAA"}

package/dist/src/stream/browserStream.d.ts

@@ -0,0 +1,3 @@
+import { StreamFunctionContents } from './types.js';
+import { BasedClient } from '../index.js';
+export declare const uploadFile: (client: BasedClient, name: string, options: StreamFunctionContents<File>, progressListener?: (p: number, bytes: number) => void) => Promise<any>;

package/dist/src/stream/browserStream.js

@@ -0,0 +1,86 @@
+import { addStreamChunk, addStreamRegister } from '../outgoing/index.js';
+const waitForChunk = (reader) => {
+    return new Promise((resolve) => {
+        reader.addEventListener('loadend', (e) => {
+            console.log('loaded?');
+            resolve(new Uint8Array(reader.result));
+        });
+    });
+};
+export const uploadFile = async (client, name, options, progressListener) => {
+    if (!(options.contents instanceof File)) {
+        throw new Error('File Contents has to be an instance of "File"');
+    }
+    if (!client.connected) {
+        await client.once('connect');
+    }
+    let reqId = ++client.streamRequestId;
+    if (reqId > 16777215) {
+        reqId = client.streamRequestId = 0;
+    }
+    let seqId = 0;
+    addStreamRegister(client, reqId, options.size, options.fileName, options.mimeType, options.extension, name, options.payload);
+    const useDeflate = !(options.mimeType
+        ? /image|video|x-zip/i.test(options.mimeType)
+        : options.extension
+            ? /(mp4|avi|mov|zip|jpg|jpeg|png|gif|mkv)/i.test(options.extension)
+            : false);
+    // 100kb
+    const smallest = 100000;
+    // 10mb
+    const maxSize = 1000000 * 10;
+    // 1mb
+    const medium = 1000000 * 1;
+    let readSize = Math.min(medium, options.size);
+    if (options.size < medium * 5) {
+        readSize = Math.min(smallest, options.size);
+    }
+    else if (options.size > medium * 100) {
+        readSize = maxSize;
+    }
+    let streamHandler;
+    const waitForStream = () => {
+        return new Promise((resolve) => {
+            streamHandler[2] = (seqId, code, maxChunkSize) => {
+                if (maxChunkSize) {
+                    readSize = maxChunkSize;
+                }
+                resolve({ seqId, maxChunkSize, code });
+            };
+        });
+    };
+    async function* loadFileInChunks(file) {
+        let totalBytes = 0;
+        while (totalBytes < file.size) {
+            const end = Math.min(totalBytes + file.size, totalBytes + readSize);
+            const chunk = file.slice(totalBytes, end);
+            const reader = new FileReader();
+            reader.readAsArrayBuffer(chunk);
+            const result = await waitForChunk(reader);
+            if (seqId === 255) {
+                seqId = 0;
+            }
+            addStreamChunk(client, reqId, ++seqId, result, useDeflate);
+            await waitForStream();
+            totalBytes += chunk.size;
+            yield totalBytes;
+        }
+        yield totalBytes;
+    }
+    let id = Math.random().toString(16);
+    const dcHandler = () => {
+        console.error('CLIENT DC -> ABORT STREAM', Date.now(), id);
+    };
+    client.once('disconnect', dcHandler);
+    return new Promise(async (resolve, reject) => {
+        streamHandler = [resolve, reject, () => { }];
+        client.streamFunctionResponseListeners.set(reqId, streamHandler);
+        for await (const read of loadFileInChunks(options.contents)) {
+            if (progressListener) {
+                progressListener(read / options.size, read);
+            }
+        }
+        client.off('disconnect', dcHandler);
+    });
+};
+//# sourceMappingURL=browserStream.js.map

package/dist/src/stream/browserStream.js.map

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

package/dist/src/stream/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/stream/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,eAAe,EAAE,MAAM,aAAa,CAAA;AAE1D,OAAO,KAAK,MAAM,cAAc,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,SAAS,MAAM,aAAa,CAAA;AAEnC,eAAe,KAAK,EAClB,MAAmB,EACnB,IAAY,EACZ,OAA+B,EACjB,EAAE;IAChB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE9C,MAAM,OAAO,GAAkB;QAC7B,cAAc,EAAE,OAAO,CAAC,QAAQ,IAAI,YAAY;QAChD,aAAa,EAAE,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC;KACjD,CAAA;IAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAA;IAC5C,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAA;IACV,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC,GAAG,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3C,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE;QAC/C,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,UAAU;QACjB,OAAO;QACP,aAAa;QACb,IAAI,EAAE,OAAO,CAAC,QAAQ;KACvB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAExB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;IAEd,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/stream/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,eAAe,EAAE,MAAM,aAAa,CAAA;AAE1D,OAAO,KAAK,MAAM,cAAc,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,SAAS,MAAM,aAAa,CAAA;AAEnC,eAAe,KAAK,EAClB,MAAmB,EACnB,IAAY,EACZ,OAA+B,EACjB,EAAE;IAChB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QACrB,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;KAC7B;IAED,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE9C,MAAM,OAAO,GAAkB;QAC7B,cAAc,EAAE,OAAO,CAAC,QAAQ,IAAI,YAAY;QAChD,aAAa,EAAE,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC;KACjD,CAAA;IAED,IAAI,OAAO,CAAC,QAAQ,EAAE;QACpB,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAA;KAC3C;IAED,IAAI,CAAC,GAAG,EAAE,CAAA;IACV,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,CAAC,GAAG,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;KAC1C;IAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE;QAC/C,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,UAAU;QACjB,OAAO;QACP,aAAa;QACb,IAAI,EAAE,OAAO,CAAC,QAAQ;KACvB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAExB,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;KAC1B;IAAC,OAAO,CAAC,EAAE,GAAE;IAEd,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}

package/dist/src/stream/index.d.ts

@@ -1,4 +1,7 @@
 import { BasedClient } from '../index.js';
 import { StreamFunctionOpts } from './types.js';
-declare const _default: (client: BasedClient, name: string, options: StreamFunctionOpts, _progressListener?: (progress: number) => void) => Promise<any>;
+export declare const isStreaming: {
+    streaming: boolean;
+};
+declare const _default: (client: BasedClient, name: string, options: StreamFunctionOpts, progressListener?: (progress: number, bytes: number) => void) => Promise<any>;
 export default _default;

package/dist/src/stream/index.js

@@ -1,20 +1,40 @@
 import { isStreamFunctionPath, isStreamFunctionStream, } from './types.js';
-import fetch from './fetch.js';
+import { Readable } from 'node:stream';
 import { uploadFilePath, uploadFileStream } from './nodeStream.js';
-export default async (client, name, options, _progressListener) => {
+import { Buffer } from 'node:buffer';
+export const isStreaming = { streaming: false };
+async function* generateChunks(bytes) {
+    // 100kb (bit arbitrary)
+    const readBytes = 100000;
+    let index = 0;
+    while (index * readBytes < bytes.byteLength) {
+        const buf = bytes.slice(index * readBytes, Math.min(bytes.byteLength, (index + 1) * readBytes));
+        index++;
+        yield Buffer.from(buf);
+    }
+}
+const createReadableStreamFromContents = (bytes) => {
+    return Readable.from(generateChunks(bytes));
+};
+export default async (client, name, options, progressListener) => {
     if (isStreamFunctionPath(options)) {
-        return uploadFilePath(client, name, options);
+        return uploadFilePath(client, name, options, progressListener);
     }
     if (isStreamFunctionStream(options)) {
-        return uploadFileStream(client, name, options);
+        return uploadFileStream(client, name, options, progressListener);
+    }
+    if (options.contents instanceof Buffer) {
+        options.contents = new Uint8Array(options.contents.buffer, options.contents.byteOffset, options.contents.length);
     }
-    if (options.contents instanceof ArrayBuffer) {
-        options.contents = global.Buffer.from(options.contents);
-        return fetch(client, name, options);
+    if (typeof options.contents === 'string') {
+        options.contents = new TextEncoder().encode(options.contents);
     }
-    if (typeof options.contents === 'string' ||
-        options.contents instanceof global.Buffer) {
-        return fetch(client, name, options);
+    if (options.contents instanceof Uint8Array) {
+        return uploadFileStream(client, name, {
+            ...options,
+            size: options.contents.byteLength,
+            contents: createReadableStreamFromContents(options.contents),
+        }, progressListener);
     }
     throw new Error(`Invalid opts for file api ${name} ${JSON.stringify(options, null, 2)}`);
 };

package/dist/src/stream/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/stream/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,MAAM,YAAY,CAAA;AAC9B,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElE,eAAe,KAAK,EAClB,MAAmB,EACnB,IAAY,EACZ,OAA2B,EAC3B,iBAA8C,EAChC,EAAE;IAChB,IAAI,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAED,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,OAAO,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,YAAY,WAAW,EAAE,CAAC;QAC5C,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACvD,OAAO,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,IACE,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;QACpC,OAAO,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,EACzC,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACxE,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/stream/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;AAE/C,KAAK,SAAS,CAAC,CAAC,cAAc,CAAC,KAAiB;IAC9C,wBAAwB;IACxB,MAAM,SAAS,GAAG,MAAM,CAAA;IACxB,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,OAAO,KAAK,GAAG,SAAS,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CACrB,KAAK,GAAG,SAAS,EACjB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CACpD,CAAA;QACD,KAAK,EAAE,CAAA;QACP,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;AACH,CAAC;AAED,MAAM,gCAAgC,GAAG,CAAC,KAAiB,EAAY,EAAE;IACvE,OAAO,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;AAC7C,CAAC,CAAA;AAED,eAAe,KAAK,EAClB,MAAmB,EACnB,IAAY,EACZ,OAA2B,EAC3B,gBAA4D,EAC9C,EAAE;IAChB,IAAI,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAA;IAChE,CAAC;IAED,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,OAAO,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAA;IAClE,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,YAAY,MAAM,EAAE,CAAC;QACvC,OAAO,CAAC,QAAQ,GAAG,IAAI,UAAU,CAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,EACvB,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CACxB,CAAA;IACH,CAAC;IAED,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACzC,OAAO,CAAC,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,YAAY,UAAU,EAAE,CAAC;QAC3C,OAAO,gBAAgB,CACrB,MAAM,EACN,IAAI,EACJ;YACE,GAAG,OAAO;YACV,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU;YACjC,QAAQ,EAAE,gCAAgC,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC7D,EACD,gBAAgB,CACjB,CAAA;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACxE,CAAA;AACH,CAAC,CAAA"}

package/dist/src/stream/nodeStream.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Readable } from 'stream';
-import { StreamFunctionPath, StreamFunctionStream } from './types.js';
-import { BasedClient } from '../index.js';
+import { Readable } from "stream";
+import { StreamFunctionPath, StreamFunctionStream } from "./types.js";
+import { BasedClient } from "../index.js";
 export declare const isStream: (contents: any) => contents is Readable;
-export declare const uploadFilePath: (client: BasedClient, name: string, options: StreamFunctionPath) => Promise<any>;
-export declare const uploadFileStream: (client: BasedClient, name: string, options: StreamFunctionStream) => Promise<any>;
+export declare const uploadFilePath: (client: BasedClient, name: string, options: StreamFunctionPath, progressListener?: (p: number, bytes: number) => void) => Promise<any>;
+export declare const uploadFileStream: (client: BasedClient, name: string, options: StreamFunctionStream, progressListener?: (p: number, bytes: number) => void) => Promise<any>;

package/dist/src/stream/nodeStream.js

@@ -1,12 +1,7 @@
-import { Readable } from 'stream';
-import { request } from 'http';
-import { request as sslRequest } from 'https';
-import fs from 'fs';
-import { promisify } from 'util';
-import { encodeAuthState } from '../index.js';
-import parseOpts from '@based/opts';
-import { serializeQuery } from '@saulx/utils';
-import { convertDataToBasedError } from '@based/errors';
+import { Readable, Writable } from "stream";
+import fs from "fs";
+import { promisify } from "util";
+import { addStreamChunk, addStreamRegister } from "../outgoing/index.js";
 const stat = promisify(fs.stat);
 const checkFile = async (path) => {
     try {
@@ -20,8 +15,7 @@ const checkFile = async (path) => {
 export const isStream = (contents) => {
     return contents instanceof Readable;
 };
-const parseUrlRe = /^(?:(tcp|wss?|https?):\/\/)?([a-z0-9.-]*)(?::(\d+))?$/;
-export const uploadFilePath = async (client, name, options) => {
+export const uploadFilePath = async (client, name, options, progressListener) => {
     const info = await checkFile(options.path);
     if (info) {
         return uploadFileStream(client, name, {
@@ -31,75 +25,122 @@ export const uploadFilePath = async (client, name, options) => {
             size: info.size,
             payload: options.payload,
             serverKey: options.serverKey,
-        });
+        }, progressListener);
     }
     else {
         throw new Error(`File does not exist ${options.path}`);
     }
 };
-const streamRequest = (stream, name, url, headers, query) => {
-    const [, protocol, host, port] = parseUrlRe.exec(url);
-    // query
-    const httpOptions = {
-        port,
-        host: host,
-        path: '/' + name + query,
-        method: 'POST',
-        headers,
-    };
-    return new Promise((resolve, reject) => {
-        const incomingReady = (incomingReq) => {
-            const s = [];
-            incomingReq.on('data', (c) => {
-                s.push(c.toString());
-            });
-            incomingReq.once('end', () => {
-                const result = s.join('');
-                try {
-                    const parsed = JSON.parse(result);
-                    if ('code' in parsed && 'error' in parsed) {
-                        reject(convertDataToBasedError({
-                            code: parsed.code,
-                            message: parsed.error,
-                        }));
-                        return;
-                    }
-                    resolve(parsed);
-                }
-                catch (err) { }
-                resolve(result);
-            });
-        };
-        const req = protocol === 'wss' || protocol === 'https'
-            ? sslRequest(httpOptions, incomingReady)
-            : request(httpOptions, incomingReady);
-        stream.pipe(req);
-    });
-};
-export const uploadFileStream = async (client, name, options) => {
+export const uploadFileStream = async (client, name, options, progressListener) => {
     if (!(options.contents instanceof Readable)) {
         throw new Error('File Contents has to be an instance of "Readable"');
     }
     if (!client.connected) {
-        await client.once('connect');
+        await client.once("connect");
     }
-    // key is something special
-    const url = await parseOpts(client.opts, true);
-    const headers = {
-        'Content-Length': String(options.size),
-        'Content-Type': options.mimeType || 'text/plain',
-        Authorization: encodeAuthState(client.authState),
-    };
-    if (options.fileName) {
-        headers['Content-Name'] = options.fileName;
+    let reqId = ++client.streamRequestId;
+    if (reqId > 16777215) {
+        reqId = client.streamRequestId = 0;
     }
-    if (!options.mimeType && options.extension) {
-        headers['Content-Extension'] = options.extension;
+    let seqId = 0;
+    addStreamRegister(client, reqId, options.size, options.fileName, options.mimeType, options.extension, name, options.payload);
+    const useDeflate = !(options.mimeType
+        ? /image|video|x-zip/i.test(options.mimeType)
+        : options.extension
+            ? /(mp4|avi|mov|zip|jpg|jpeg|png|gif|mkv)/i.test(options.extension)
+            : false);
+    // 100kb
+    const smallest = 100000;
+    // 10mb
+    const maxSize = 1000000 * 10;
+    // 1mb
+    const medium = 1000000 * 1;
+    let readSize = Math.min(medium, options.size);
+    if (options.size < medium * 5) {
+        readSize = Math.min(smallest, options.size);
     }
-    let q = '';
-    if (options.payload) {
-        q = '?' + serializeQuery(options.payload);
+    else if (options.size > medium * 100) {
+        readSize = maxSize;
     }
-    return streamRequest(options.contents, name, url, headers, q);
+    let bufferSize = 0;
+    let nextHandler;
+    let chunks = [];
+    let lastReceived = 0;
+    let totalBytes = 0;
+    let streamHandler;
+    const wr = new Writable({
+        write: function (c, encoding, next) {
+            if (c.byteLength > maxSize) {
+                console.warn("CHUNK SIZE LARGER THEN MAX SIZE NOT HANDLED YET", c.byteLength, maxSize);
+            }
+            bufferSize += c.byteLength;
+            chunks.push(c);
+            if (bufferSize >= readSize || totalBytes + bufferSize === options.size) {
+                nextHandler = next;
+                if (seqId > 0) {
+                    if (lastReceived === seqId) {
+                        // Client is slower then server (most common)
+                        nextChunk(undefined);
+                    }
+                    // Else server is slower then client e.g. transcoding etc
+                }
+                else {
+                    setTimeout(nextChunk, 0);
+                }
+            }
+            else {
+                next();
+            }
+        },
+    });
+    const nextChunk = (receivedSeqId, code, maxChunkSize) => {
+        if (receivedSeqId !== undefined) {
+            if (maxChunkSize) {
+                // set readSize if sefver is busy
+                readSize = maxChunkSize;
+            }
+            lastReceived = receivedSeqId;
+        }
+        if (!nextHandler) {
+            return;
+        }
+        if (code === 1) {
+            progressListener(1, options.size);
+        }
+        else {
+            const n = new Uint8Array(bufferSize);
+            let c = 0;
+            for (const b of chunks) {
+                n.set(b, c);
+                c += b.length;
+            }
+            if (progressListener) {
+                progressListener(totalBytes / options.size, totalBytes);
+            }
+            totalBytes += bufferSize;
+            if (seqId === 255) {
+                seqId = 0;
+            }
+            addStreamChunk(client, reqId, ++seqId, n, useDeflate);
+            bufferSize = 0;
+            chunks = [];
+            nextHandler();
+            nextHandler = undefined;
+        }
+    };
+    options.contents.pipe(wr);
+    let id = Math.random().toString(16);
+    const dcHandler = () => {
+        // HANDLE THIS
+        console.error("CLIENT DC -> ABORT STREAM", Date.now(), id);
+    };
+    client.once("disconnect", dcHandler);
+    options.contents.on("end", () => {
+        client.off("disconnect", dcHandler);
+    });
+    return new Promise((resolve, reject) => {
+        streamHandler = [resolve, reject, nextChunk];
+        client.streamFunctionResponseListeners.set(reqId, streamHandler);
+    });
 };
 //# sourceMappingURL=nodeStream.js.map