@e-mc/file-manager 0.5.4 → 0.6.1

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+Copyright 2023 Studio Trigger
 
 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:
 

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/file-manager
 
-PEP 402 - Forever
+PEP 402 - Forever Ryuko
 
 ## LICENSE
 

package/index.js

@@ -35,7 +35,7 @@ const CACHE_ETAG = {};
 const DISK = {
     ENABLED: false,
     EXPIRES: 0,
-    LIMIT: (0, types_1.formatSize)('1gb'),
+    LIMIT: (0, types_1.formatSize)("1gb"),
     INCLUDE: [],
     EXCLUDE: []
 };
@@ -45,8 +45,8 @@ const MEMORY = {
     SIZE: 0,
     TOTAL: 0,
     EXPIRES: 0,
-    LIMIT: (0, types_1.formatSize)('100mb'),
-    LIMIT_ALL: (0, types_1.formatSize)('512mb'),
+    LIMIT: (0, types_1.formatSize)("100mb"),
+    LIMIT_ALL: (0, types_1.formatSize)("512mb"),
     INCLUDE: [],
     EXCLUDE: [],
     PURGE: 0.25,
@@ -2238,22 +2238,19 @@ class FileManager extends core_1.Host {
                 bundling[_l = file.uri] || (bundling[_l] = []);
                 if (bundleIndex > 0) {
                     items[bundleIndex - 1] = file;
-                    const url = file.url;
-                    if (file.fetchType === 1 && (cacheToDisk.has(url) || cacheToMemory.has(url))) {
-                        const parent = assets.find(item => item.bundleIndex === 0 && item.bundleId === bundleId);
-                        if (parent) {
-                            (parent.bundleQueue || (parent.bundleQueue = [])).push(new Promise(resolve => {
-                                this.Request.open(url, { method: 'HEAD', httpVersion: 1 })
-                                    .on('response', res => {
-                                    if (res.statusCode < 300) {
-                                        applyHeaders(file, res.headers);
-                                    }
-                                    resolve(file);
-                                })
-                                    .on('error', () => resolve(file))
-                                    .on('timeout', () => resolve(file));
-                            }));
-                        }
+                    let url, parent;
+                    if (file.fetchType === 1 && (cacheToDisk.has(url = file.url) || cacheToMemory.has(url)) && (parent = assets.find(item => item.bundleIndex === 0 && item.bundleId === bundleId))) {
+                        (parent.bundleQueue || (parent.bundleQueue = [])).push(new Promise(resolve => {
+                            this.Request.open(url, { method: 'HEAD', httpVersion: 1 })
+                                .on('response', res => {
+                                if (res.statusCode < 300) {
+                                    applyHeaders(file, res.headers);
+                                }
+                                resolve(file);
+                            })
+                                .on('error', () => resolve(file))
+                                .on('timeout', () => resolve(file));
+                        }));
                     }
                     return true;
                 }
@@ -2318,9 +2315,10 @@ class FileManager extends core_1.Host {
             completed[localUri] = file;
             if (!(0, types_1.isEmpty)(file.bundleId) && file.bundleIndex === 0) {
                 this.setAssetContent(file, this.getUTF8String(file, localUri));
+                const bundleQueue = file.bundleQueue;
                 let success = true, error, checkEtag = !file.trailingContent && hasEtag(file);
-                if (file.bundleQueue) {
-                    error = await Promise.all(file.bundleQueue).then(() => null).catch((err) => err);
+                if (bundleQueue) {
+                    error = await Promise.all(bundleQueue).then(() => null).catch((err) => err);
                     delete file.bundleQueue;
                 }
                 const items = appending[localUri];
@@ -2603,8 +2601,9 @@ class FileManager extends core_1.Host {
             if (item.invalid || (0, types_1.ignoreFlag)(item.flags)) {
                 continue;
             }
-            if (!item.filename) {
-                if (!(item.uri && core_1.Host.isFile(item.uri, 'torrent'))) {
+            let { filename, uri } = item;
+            if (!filename) {
+                if (!(uri && core_1.Host.isFile(uri, 'torrent'))) {
                     item.invalid = true;
                     continue;
                 }
@@ -2636,13 +2635,13 @@ class FileManager extends core_1.Host {
                     item.incremental = undefined;
                 }
             }
-            if (valid && item.filename) {
-                let uri = item.uri, cached;
+            if (valid && filename) {
                 const etag = (cacheEtag && type !== 'exists' || type === 'etag') && !!uri;
                 if (etag && imported.some(file => file.imported.includes(uri))) {
                     item.incremental = 'none';
                 }
                 else if (!(0, types_1.mainFlag)(item.flags)) {
+                    let cached;
                     const { bundleId, bundleIndex = -1 } = item;
                     const setBuffer = (target) => {
                         if (!etag && (uri = target.uri) && (cached = MEMORY.CACHE[uri])) {
@@ -2722,13 +2721,12 @@ class FileManager extends core_1.Host {
                     try {
                         const buffer = fs.readFileSync(localUri);
                         if (!etag) {
-                            (0, asset_1.setInitialValue)(item, false);
-                            item.initialValue.buffer = buffer;
+                            (0, asset_1.setInitialValue)(item, false).buffer = buffer;
                         }
                         else if (uri && CACHE_ETAG[uri]) {
-                            (0, asset_1.setInitialValue)(item, false);
-                            item.initialValue.buffer = buffer;
-                            item.initialValue.etag = CACHE_ETAG[uri];
+                            const initialValue = (0, asset_1.setInitialValue)(item, false);
+                            initialValue.buffer = buffer;
+                            initialValue.etag = CACHE_ETAG[uri];
                         }
                     }
                     catch {
@@ -2749,12 +2747,12 @@ class FileManager extends core_1.Host {
                 break;
             }
             const { pathname, localUri } = download;
-            let uri;
             if (item.content) {
                 if (!checkQueue(item, localUri, pathname, true)) {
-                    item.sourceUTF8 = item.content;
+                    const content = item.content;
+                    item.sourceUTF8 = content;
                     this.performAsyncTask();
-                    fs.writeFile(localUri, item.content, item.encoding || (item.encoding = 'utf-8'), err => fileReceived(item, localUri, err));
+                    fs.writeFile(localUri, content, item.encoding || (item.encoding = 'utf-8'), err => fileReceived(item, localUri, err));
                 }
             }
             else if (item.dataView) {
@@ -2775,18 +2773,22 @@ class FileManager extends core_1.Host {
                     fs.writeFile(localUri, item.base64, 'base64', err => fileReceived(item, localUri, err, false, true));
                 }
             }
-            else if (uri = item.uri) {
+            else {
+                const uri = item.uri;
+                if (!uri) {
+                    item.invalid = true;
+                    continue;
+                }
                 const checkDest = (src) => staging || !(0, lib_v4_1.hasSameStat)(src, localUri);
-                const type = item.fetchType;
+                const type = item.fetchType || 0;
                 const bundleMain = !(0, types_1.isEmpty)(item.bundleId) && item.bundleIndex === 0;
-                let isHttp;
-                if ((isHttp = type === 1) || type === 2) {
-                    const url = item.url;
-                    const checkEtag = hasEtag(item);
+                const isHttp = type === 1;
+                if (isHttp || type === 2) {
+                    let checkEtag;
                     if ((0, types_1.isEmpty)(item.bundleId) && bundling[uri]) {
                         bundling[uri].push(item);
                     }
-                    else if (checkEtag || !checkQueue(item, localUri, pathname)) {
+                    else if ((checkEtag = hasEtag(item)) || !checkQueue(item, localUri, pathname)) {
                         if (!isHttp && !checkDest(uri)) {
                             fileReceived(item, localUri);
                         }
@@ -2800,6 +2802,7 @@ class FileManager extends core_1.Host {
                             if (!checkEtag) {
                                 downloading[uri] = [];
                             }
+                            const url = item.url;
                             let cacheDir, cacheBuffer, mainEtag, encoding = item.encoding, client = null;
                             if (isHttp) {
                                 cacheDir = cacheToDisk.has(url) && isCacheable(item);
@@ -3075,9 +3078,6 @@ class FileManager extends core_1.Host {
                     }
                 }
             }
-            else {
-                item.invalid = true;
-            }
         }
         this.cleared = true;
     }
@@ -3088,35 +3088,37 @@ class FileManager extends core_1.Host {
         }
         const tasks = [];
         for (const item of assets) {
-            if (image_1.default.isBinary(item.mimeType)) {
-                const localUri = item.localUri;
-                const files = [localUri];
-                if (item.transforms) {
-                    files.push(...item.transforms);
-                }
-                const format = item.mimeType.split('/').pop();
-                for (const file of files) {
-                    if (this.has(file)) {
-                        const output = item.compress.filter(({ condition }) => !condition || withinSizeRange(file, condition));
-                        if (output.length) {
-                            const found = output.filter(value => value.format === format);
-                            for (const config of found.length ? found : output) {
-                                const options = { ...config };
-                                options.timeout = this[kProcessTimeout].compress ?? PROCESS_TIMEOUT.compress;
-                                options.proxyUrl = (uri) => {
-                                    const proxy = this.Request.proxyOf(uri);
-                                    return proxy ? proxy.host.href : '';
-                                };
-                                tasks.push(compress.tryImage(item.buffer && files.length === 1 ? item.buffer : file, file, options)
-                                    .then(result => {
-                                    if (result instanceof Buffer && file === localUri) {
-                                        item.buffer = result;
-                                    }
-                                })
-                                    .catch(err => this.writeFail(["Unable to compress file", path.basename(file)], err, { type: 8, startTime: options.startTime })));
-                            }
+            const localUri = item.localUri;
+            if (!(localUri && image_1.default.isBinary(item.mimeType))) {
+                continue;
+            }
+            const files = [localUri];
+            if (item.transforms) {
+                files.push(...item.transforms);
+            }
+            const format = item.mimeType.split('/').pop();
+            for (const file of files) {
+                const output = item.compress.filter(({ condition }) => !condition || withinSizeRange(file, condition));
+                if (!(output.length && this.has(file))) {
+                    continue;
+                }
+                const found = output.filter(value => value.format === format);
+                for (const config of found.length ? found : output) {
+                    const options = {
+                        ...config,
+                        timeout: this[kProcessTimeout].compress ?? PROCESS_TIMEOUT.compress,
+                        proxyUrl: (uri) => {
+                            const proxy = this.Request.proxyOf(uri);
+                            return proxy ? proxy.host.href : '';
                         }
-                    }
+                    };
+                    tasks.push(compress.tryImage(item.buffer && files.length === 1 ? item.buffer : file, file, options)
+                        .then(result => {
+                        if (result instanceof Buffer && file === localUri) {
+                            item.buffer = result;
+                        }
+                    })
+                        .catch(err => this.writeFail(["Unable to compress file", path.basename(file)], err, { type: 8, startTime: options.startTime })));
                 }
             }
         }
@@ -3129,7 +3131,7 @@ class FileManager extends core_1.Host {
             if (constructor.finalize && instance.assets.length) {
                 await constructor.finalize.call(this, instance).catch(err => rejectModule.call(instance, err, 4));
                 if (this.aborted) {
-                    break;
+                    return;
                 }
             }
         }
@@ -3141,16 +3143,15 @@ class FileManager extends core_1.Host {
                 if (items.length) {
                     await (constructor.using || constructor.finalize).call(this, instance, items).catch(err => rejectModule.call(instance, err, 4));
                     if (this.aborted) {
-                        break;
+                        return;
                     }
                 }
             }
         }
     }
     async finalizeCloud() {
-        if (this.Cloud) {
-            return cloud_1.default.finalize.call(this, this.Cloud).catch(err => rejectModule.call(this.Cloud, err, 64));
-        }
+        const cloud = this.Cloud;
+        return cloud ? cloud_1.default.finalize.call(this, cloud).catch(err => rejectModule.call(cloud, err, 64)) : Promise.resolve();
     }
     async finalizeCleanup() {
         if (this.Compress) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.5.4",
+  "version": "0.6.1",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
+    "url": "https://github.com/anpham6/e-mc.git",
     "directory": "src/file-manager"
   },
   "keywords": [
@@ -20,14 +20,14 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.5.4",
-    "@e-mc/compress": "0.5.4",
-    "@e-mc/core": "0.5.4",
-    "@e-mc/document": "0.5.4",
-    "@e-mc/image": "0.5.4",
-    "@e-mc/request": "0.5.4",
-    "@e-mc/task": "0.5.4",
-    "@e-mc/types": "0.5.4",
-    "@e-mc/watch": "0.5.4"
+    "@e-mc/cloud": "0.6.1",
+    "@e-mc/compress": "0.6.1",
+    "@e-mc/core": "0.6.1",
+    "@e-mc/document": "0.6.1",
+    "@e-mc/image": "0.6.1",
+    "@e-mc/request": "0.6.1",
+    "@e-mc/task": "0.6.1",
+    "@e-mc/types": "0.6.1",
+    "@e-mc/watch": "0.6.1"
   }
 }