@e-mc/cloud 0.8.0 → 0.8.2

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2023 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2023 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,5 +1,7 @@
 ### @e-mc/cloud
 
+https://e-mc.readthedocs.io
+
 ### LICENSE
 
 BSD 3-Clause

package/index.d.ts

@@ -1,6 +1,6 @@
-import type { CloudConstructor, IFileManager } from '../types/lib';
-import type { CloudAsset } from '../types/lib/cloud';
-
-declare const Cloud: CloudConstructor<IFileManager<CloudAsset>>;
-
+import type { CloudConstructor, IFileManager } from '../types/lib';
+import type { CloudAsset } from '../types/lib/cloud';
+
+declare const Cloud: CloudConstructor<IFileManager<CloudAsset>>;
+
 export = Cloud;

package/index.js

@@ -210,53 +210,52 @@ class Cloud extends core_1.ClientDb {
                     let pending = (downloadMap || (downloadMap = {}))[location];
                     if (pending) {
                         pending.add(downloadUri);
+                        continue;
                     }
-                    else {
-                        pending = new Set([downloadUri]);
-                        download.admin = data.admin;
-                        const task = instance.downloadObject(data.service, instance.getCredential(data), data.bucket, download, async (value) => {
-                            let result;
-                            if (value && !instance.aborted) {
-                                const items = Array.from(pending);
-                                for (let i = 0, length = items.length, size, copy; i < length; ++i) {
-                                    const destUri = items[i];
-                                    try {
-                                        if (typeof value === 'string') {
-                                            if (!copy && i === length - 1) {
-                                                fs.renameSync(value, destUri);
-                                            }
-                                            else {
-                                                fs.copyFileSync(value, destUri);
-                                            }
-                                            size = this.addDownload(destUri);
+                    pending = new Set([downloadUri]);
+                    download.admin = data.admin;
+                    const task = instance.downloadObject(data.service, instance.getCredential(data), data.bucket, download, async (value) => {
+                        let result;
+                        if (value && !instance.aborted) {
+                            const items = Array.from(pending);
+                            for (let i = 0, length = items.length, size, copy; i < length; ++i) {
+                                const destUri = items[i];
+                                try {
+                                    if (typeof value === 'string') {
+                                        if (!copy && i === length - 1) {
+                                            fs.renameSync(value, destUri);
                                         }
                                         else {
-                                            fs.writeFileSync(destUri, value);
-                                            this.addDownload(size = value.length);
+                                            fs.copyFileSync(value, destUri);
                                         }
-                                        this.add(destUri);
-                                        this.formatMessage(64 /* LOG_TYPE.CLOUD */, data.service, ["Download success" /* VAL_CLOUD.DOWNLOAD_FILE */, (0, types_1.formatSize)(size)], destUri, { ...Cloud.LOG_CLOUD_DOWNLOAD });
-                                        result || (result = destUri);
+                                        size = this.addDownload(destUri);
                                     }
-                                    catch (err) {
-                                        if (!copy && core_1.ClientDb.isErrorCode(err, 'EXDEV')) {
-                                            copy = true;
-                                            --i;
-                                        }
-                                        else {
-                                            instance.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(destUri)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: !!active, startTime });
-                                        }
+                                    else {
+                                        fs.writeFileSync(destUri, value);
+                                        this.addDownload(size = value.length);
+                                    }
+                                    this.add(destUri);
+                                    this.formatMessage(64 /* LOG_TYPE.CLOUD */, data.service, ["Download success" /* VAL_CLOUD.DOWNLOAD_FILE */, (0, types_1.formatSize)(size)], destUri, { ...Cloud.LOG_CLOUD_DOWNLOAD });
+                                    result || (result = destUri);
+                                }
+                                catch (err) {
+                                    if (!copy && core_1.ClientDb.isErrorCode(err, 'EXDEV')) {
+                                        copy = true;
+                                        --i;
+                                    }
+                                    else {
+                                        instance.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(destUri)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: !!active, startTime });
                                     }
                                 }
                             }
-                            return result;
-                        })
-                            .catch(err => instance.writeFail(["Download failed" /* ERR_CLOUD.DOWNLOAD_FAIL */, path.basename(downloadUri)], err, { type: 64 /* LOG_TYPE.CLOUD */, startTime }));
-                        if (active || waitStatus || this.incremental === 'staging') {
-                            tasks.push(task);
                         }
-                        downloadMap[location] = pending;
+                        return result;
+                    })
+                        .catch(err => instance.writeFail(["Download failed" /* ERR_CLOUD.DOWNLOAD_FAIL */, path.basename(downloadUri)], err, { type: 64 /* LOG_TYPE.CLOUD */, startTime }));
+                    if (active || waitStatus || this.incremental === 'staging') {
+                        tasks.push(task);
                     }
+                    downloadMap[location] = pending;
                 }
             }
         }
@@ -284,20 +283,23 @@ class Cloud extends core_1.ClientDb {
                 state.localStorage.set(file, upload);
             }
             const callback = async (value) => {
-                if (ignoreProcess || !(0, types_1.isString)(value)) {
-                    return;
-                }
-                for (const { instance: document } of host.Document) {
-                    if (document.cloudUpload && await document.cloudUpload(state, file, value, active)) {
-                        return;
+                if ((0, types_1.isString)(value) && !ignoreProcess) {
+                    for (const { instance: document } of host.Document) {
+                        if (document.cloudUpload && await document.cloudUpload(state, file, value, active)) {
+                            return;
+                        }
                     }
                 }
             };
             const task = new Promise(resolve => {
                 const { service, bucket = state.bucketGroup, admin } = storage;
+                let minStreamSize = upload.minStreamSize;
+                if ((0, types_1.isString)(minStreamSize)) {
+                    minStreamSize = (0, types_1.formatSize)(minStreamSize);
+                }
                 const credential = instance.getCredential(storage, true);
                 const uploading = [];
-                getFiles(file, upload).forEach((group, index) => {
+                getFiles(file, upload).forEach(async (group, index) => {
                     let fileGroup;
                     if (index === 0 && group.length > 1) {
                         if (SERVICE_CLIENT.get(service)?.CLOUD_UPLOAD_FROMDISK) {
@@ -309,7 +311,7 @@ class Cloud extends core_1.ClientDb {
                                 const value = group[i];
                                 try {
                                     if (fs.existsSync(value)) {
-                                        fileGroup.push([fs.readFileSync(value), path.extname(value), value]);
+                                        fileGroup.push([typeof minStreamSize === 'number' ? await this.streamFile(value, { minStreamSize, cache: false, signal: instance.signal }) : fs.readFileSync(value), path.extname(value), value]);
                                     }
                                 }
                                 catch (err) {
@@ -336,7 +338,7 @@ class Cloud extends core_1.ClientDb {
                             else if (upload.overwrite) {
                                 filename = path.basename(localUri);
                             }
-                            buffer = file.sourceUTF8 ? Buffer.from(file.sourceUTF8, file.encoding) : host.getBuffer(file);
+                            buffer = file.sourceUTF8 ? Buffer.from(file.sourceUTF8, file.encoding) : typeof minStreamSize === 'number' ? await host.getBuffer(file, minStreamSize).catch(() => host.getBuffer(file)) : host.getBuffer(file);
                         }
                         else {
                             contentType = this.lookupMime(path.basename(localUri)) || file.mimeType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,9 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.8.0",
-    "@e-mc/db": "0.8.0",
-    "@e-mc/types": "0.8.0"
+    "@e-mc/core": "0.8.2",
+    "@e-mc/db": "0.8.2",
+    "@e-mc/types": "0.8.2",
+    "mime-types": "^2.1.35"
   }
 }

package/util.d.ts

@@ -1,3 +1,5 @@
+import type { UploadContent } from '../types/lib/cloud';
+
 import type { Readable } from 'stream';
 
 interface AuthValue {
@@ -8,11 +10,12 @@ interface AuthValue {
 declare namespace util {
     const IMPORTS: Record<string, string | undefined>;
     function readableAsBuffer(stream: Readable): Promise<Buffer | null>;
+    function createKeyAndBody(filename: string, items: UploadContent[], mimeType?: string | FunctionType<void>, errorCallback?: FunctionType<void>): [string[], Buffer[], string[]];
     function generateFilename(filename: string): (i: number) => [string, boolean];
     function getBasicAuth(auth: AuthValue): string;
     function getBasicAuth(username: unknown, password?: unknown): string;
     function hasBasicAuth(value: string): boolean;
-    function formatError(title: string | { service: string; }, message: string, hint?: string): Error;
+    function formatError(title: string | { service: string }, message: string, hint?: string): Error;
 }
 
 export = util;

package/util.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasBasicAuth = exports.getBasicAuth = exports.formatError = exports.generateFilename = exports.readableAsBuffer = exports.IMPORTS = void 0;
+exports.hasBasicAuth = exports.getBasicAuth = exports.formatError = exports.generateFilename = exports.createKeyAndBody = exports.readableAsBuffer = exports.IMPORTS = void 0;
 const path = require("path");
+const fs = require("fs");
+const mime = require("mime-types");
 const types_1 = require("../types");
 const util_1 = require("../db/util");
 Object.defineProperty(exports, "getBasicAuth", { enumerable: true, get: function () { return util_1.getBasicAuth; } });
@@ -31,6 +33,45 @@ async function readableAsBuffer(stream) {
     });
 }
 exports.readableAsBuffer = readableAsBuffer;
+function createKeyAndBody(filename, items, mimeType, errorCallback) {
+    if (typeof mimeType === 'function') {
+        errorCallback = mimeType;
+        mimeType = undefined;
+    }
+    const key = [];
+    const body = [];
+    const type = [];
+    for (let [content, ext, localFile] of items) {
+        try {
+            switch (typeof content) {
+                case 'string':
+                    if (fs.existsSync(content)) {
+                        content = fs.readFileSync(content);
+                    }
+                    else if (path.isAbsolute(content)) {
+                        continue;
+                    }
+                    else {
+                        content = Buffer.from(content);
+                    }
+                    break;
+                case 'object':
+                    break;
+                default:
+                    continue;
+            }
+            const output = filename + ext;
+            key.push(ext === '.map' && localFile ? path.basename(localFile) : output);
+            body.push(content);
+            type.push(ext !== '.map' && mime.lookup(output) || mimeType || 'application/octet-stream');
+        }
+        catch (err) {
+            errorCallback?.(err);
+        }
+    }
+    return [key, body, type];
+}
+exports.createKeyAndBody = createKeyAndBody;
 function generateFilename(filename) {
     let basename, suffix;
     return (i) => {