@e-mc/cloud 0.8.3 → 0.8.5

package/LICENSE

@@ -1,11 +1,7 @@
-Copyright 2023 An Pham
+Copyright 2024 Mile Square Park
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

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

package/index.js

@@ -23,17 +23,19 @@ function hasSameBucket({ upload, service, bucket }, other) {
     return (service && other.service || endpoint && endpoint === other.upload.endpoint) && bucket === other.bucket;
 }
 function getFiles(file, data) {
-    const grouped = file.localUri ? [file.localUri] : [];
+    const localUri = file.localUri;
+    const grouped = [localUri && core_1.ClientDb.isPath(localUri, true) ? localUri : ''];
     if (data.all) {
-        const individual = new Set();
-        if (!file.cloudUrl) {
-            file.transforms?.forEach(value => individual.add(value));
-        }
-        file.torrentFiles?.forEach(value => individual.add(value));
         if (file.descendants) {
             grouped.push(...file.descendants);
         }
-        return [grouped, Array.from(individual)];
+        const individual = !file.cloudUrl && file.transforms || [];
+        if (file.torrentFiles) {
+            individual.push(...file.torrentFiles);
+        }
+        if (individual.length) {
+            return [grouped, Array.from(new Set(individual))];
+        }
     }
     return [grouped];
 }
@@ -161,7 +163,7 @@ class Cloud extends core_1.ClientDb {
             }
         }
         for (const [item, data] of localStorage) {
-            getFiles(item, data).forEach(group => group.forEach(value => this.deleteFile(value, { emptyDir: true })));
+            getFiles(item, data).forEach(group => group.forEach(value => value && this.deleteFile(value, { emptyDir: true })));
         }
         for (const item of this.assets) {
             const cloudStorage = item.cloudStorage;
@@ -172,12 +174,11 @@ class Cloud extends core_1.ClientDb {
                     }
                     const download = data.download;
                     const { pathname, filename, waitStatus, overwrite } = download;
-                    let active = download.active;
                     if (!filename) {
                         continue;
                     }
                     const localUri = item.localUri;
-                    let downloadUri;
+                    let active = download.active, downloadUri;
                     if (pathname && path.isAbsolute(pathname)) {
                         downloadUri = path.join(pathname, filename);
                         if (!Cloud.isPath(downloadUri) && !this.canWrite(pathname)) {
@@ -196,6 +197,7 @@ class Cloud extends core_1.ClientDb {
                         active = true;
                     }
                     else if (!Cloud.createDir(destDir)) {
+                        instance.writeFail(["Unable to create directory" /* ERR_MESSAGE.CREATE_DIRECTORY */, filename], (0, types_1.errorValue)("Path is not a directory" /* ERR_MESSAGE.NOT_DIRECTORY */, destDir), { type: 64 /* LOG_TYPE.CLOUD */, fatal: !!active, startTime });
                         continue;
                     }
                     else if (active) {
@@ -269,16 +271,17 @@ class Cloud extends core_1.ClientDb {
             contentType = file.mimeType;
         }
         const { host, instance } = state;
-        if (instance.aborted) {
+        const cloudStorage = file.cloudStorage;
+        if (instance.aborted || !Array.isArray(cloudStorage)) {
             return [];
         }
         const tasks = [];
-        for (const storage of file.cloudStorage) {
+        for (const storage of cloudStorage) {
             if (!instance.hasStorage('upload', storage)) {
                 continue;
             }
             const upload = storage.upload;
-            const active = storage === instance.getStorage('upload', file.cloudStorage);
+            const active = storage === instance.getStorage('upload', cloudStorage);
             if (active && upload.localStorage === false) {
                 state.localStorage.set(file, upload);
             }
@@ -301,30 +304,37 @@ class Cloud extends core_1.ClientDb {
                 const uploading = [];
                 getFiles(file, upload).forEach(async (group, index) => {
                     let fileGroup;
-                    if (index === 0 && group.length > 1) {
-                        if (SERVICE_CLIENT.get(service)?.CLOUD_UPLOAD_FROMDISK) {
-                            fileGroup = group.slice(1).filter(value => this.isPath(value)).map(value => [value, path.extname(value), value]);
+                    if (index === 0) {
+                        if (!group[0]) {
+                            instance.writeFail("Unable to read file" /* ERR_MESSAGE.READ_FILE */, (0, types_1.errorValue)("File not found" /* ERR_MESSAGE.NOTFOUND_FILE */, service), { type: 64 /* LOG_TYPE.CLOUD */, fatal: true });
+                            return;
                         }
-                        else {
-                            fileGroup = [];
-                            for (let i = 1; i < group.length; ++i) {
-                                const value = group[i];
-                                try {
-                                    if (fs.existsSync(value)) {
-                                        fileGroup.push([typeof minStreamSize === 'number' ? await this.streamFile(value, { minStreamSize, cache: false, signal: instance.signal }) : fs.readFileSync(value), path.extname(value), value]);
+                        if (group.length > 1) {
+                            if (SERVICE_CLIENT.get(service)?.CLOUD_UPLOAD_FROMDISK) {
+                                fileGroup = group.slice(1).filter(value => this.isPath(value, true)).map(value => [value, path.extname(value), value]);
+                            }
+                            else {
+                                fileGroup = [];
+                                for (let i = 1; i < group.length; ++i) {
+                                    const value = group[i];
+                                    if (this.isPath(value, true)) {
+                                        try {
+                                            fileGroup.push([typeof minStreamSize === 'number' ? await this.streamFile(value, { minStreamSize, cache: false, signal: instance.signal }) : fs.readFileSync(value), path.extname(value), value]);
+                                        }
+                                        catch (err) {
+                                            instance.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(value)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: false });
+                                        }
                                     }
                                 }
-                                catch (err) {
-                                    instance.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(value)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: false });
-                                }
                             }
+                            group = [group[0]];
                         }
-                        group = [group[0]];
                     }
-                    for (const localUri of group) {
-                        const exists = this.isPath(localUri);
+                    for (let i = 0; i < group.length; ++i) {
+                        const localUri = group[i];
+                        const exists = index === 0 || this.isPath(localUri, true);
                         if (!exists || !instance.canRead(localUri, { ownPermissionOnly: true })) {
-                            instance.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(localUri)], (0, types_1.errorValue)(exists ? "Not permitted to read file" /* ERR_MESSAGE.UNSUPPORTED_READ */ : "File not found" /* ERR_MESSAGE.NOTFOUND_FILE */, localUri), { type: 64 /* LOG_TYPE.CLOUD */, fatal: index === 0 });
+                            instance.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(localUri)], (0, types_1.errorValue)(exists ? "Not permitted to read file" /* ERR_MESSAGE.UNSUPPORTED_READ */ : "File not found" /* ERR_MESSAGE.NOTFOUND_FILE */, localUri), { type: 64 /* LOG_TYPE.CLOUD */, fatal: i === 0 && index === 0 });
                             continue;
                         }
                         let buffer, filename;
@@ -348,7 +358,7 @@ class Cloud extends core_1.ClientDb {
                             options.contentType = contentType;
                         }
                         uploading.push(instance.uploadObject(service, { ...credential }, bucket, options, localUri, callback)
-                            .catch(err => instance.writeFail(["Upload failed" /* ERR_CLOUD.UPLOAD_FAIL */, path.basename(localUri)], err, { type: 64 /* LOG_TYPE.CLOUD */, fatal: index === 0 })));
+                            .catch(err => instance.writeFail(["Upload failed" /* ERR_CLOUD.UPLOAD_FAIL */, path.basename(localUri)], err, { type: 64 /* LOG_TYPE.CLOUD */, fatal: i === 0 && index === 0 })));
                     }
                 });
                 instance.allSettled(uploading, [`Upload file "${contentType || "Unknown" /* ERR_MESSAGE.UNKNOWN */}"`, storage.service + ': ' + path.basename(file.localUri)]).then(() => resolve());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,12 +17,12 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.8.3",
-    "@e-mc/db": "0.8.3",
-    "@e-mc/types": "0.8.3",
+    "@e-mc/core": "0.8.5",
+    "@e-mc/db": "0.8.5",
+    "@e-mc/types": "0.8.5",
     "mime-types": "^2.1.35"
   }
 }

package/util.js

@@ -42,32 +42,30 @@ function createKeyAndBody(filename, items, mimeType, errorCallback) {
     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;
+        let buffer;
+        if (typeof content === 'string') {
+            try {
+                if (content === localFile || fs.existsSync(content)) {
+                    buffer = fs.readFileSync(content);
+                    localFile = content;
+                }
+                else {
+                    buffer = Buffer.from(content);
+                }
+            }
+            catch (err) {
+                errorCallback?.(err);
             }
+        }
+        else if (Buffer.isBuffer(content)) {
+            buffer = content;
+        }
+        if (buffer) {
             const output = filename + ext;
             key.push(ext === '.map' && localFile ? path.basename(localFile) : output);
-            body.push(content);
+            body.push(buffer);
             type.push(ext !== '.map' && mime.lookup(output) || mimeType || 'application/octet-stream');
         }
-        catch (err) {
-            errorCallback?.(err);
-        }
     }
     return [key, body, type];
 }
@@ -76,9 +74,10 @@ function generateFilename(filename) {
     let basename, suffix;
     return (i) => {
         if (i === 1) {
-            const j = filename.indexOf('.');
+            const type = /\.[a-z0-9]+\.[a-z0-9]+$/i.exec(filename);
+            const j = type ? type.index : filename.lastIndexOf('.');
             if (j !== -1) {
-                const match = /^([\S\s]+?)_(\d+)$/.exec(basename = filename.substring(0, j));
+                const match = /^(.+)_(\d+)$/.exec(basename = filename.substring(0, j));
                 if (match) {
                     basename = match[1];
                     i = parseInt(match[2]) + 1;