@e-mc/file-manager 0.5.3 → 0.6.0

package/index.js

@@ -36,7 +36,7 @@ const CACHE_ETAG = {};
 const DISK = {
     ENABLED: false,
     EXPIRES: 0,
-    LIMIT: (0, types_1.formatSize)('1gb'),
+    LIMIT: (0, types_1.formatSize)("1gb" /* CACHE_SIZE.FILE_MANAGER_DISK_LIMIT */),
     INCLUDE: [],
     EXCLUDE: []
 };
@@ -46,8 +46,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" /* CACHE_SIZE.FILE_MANAGER_MEMORY_LIMIT */),
+    LIMIT_ALL: (0, types_1.formatSize)("512mb" /* CACHE_SIZE.FILE_MANAGER_MEMORY_LIMIT_ALL */),
     INCLUDE: [],
     EXCLUDE: [],
     PURGE: 0.25,
@@ -2242,22 +2242,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 /* FETCH_TYPE.HTTP */ && (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 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
-                                        applyHeaders(file, res.headers);
-                                    }
-                                    resolve(file);
-                                })
-                                    .on('error', () => resolve(file))
-                                    .on('timeout', () => resolve(file));
-                            }));
-                        }
+                    let url, parent;
+                    if (file.fetchType === 1 /* FETCH_TYPE.HTTP */ && (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 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
+                                    applyHeaders(file, res.headers);
+                                }
+                                resolve(file);
+                            })
+                                .on('error', () => resolve(file))
+                                .on('timeout', () => resolve(file));
+                        }));
                     }
                     return true;
                 }
@@ -2322,9 +2319,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];
@@ -2607,8 +2605,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;
                 }
@@ -2640,13 +2639,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])) {
@@ -2726,13 +2725,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 {
@@ -2753,12 +2751,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) {
@@ -2779,18 +2777,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 /* FETCH_TYPE.UNKNOWN */;
                 const bundleMain = !(0, types_1.isEmpty)(item.bundleId) && item.bundleIndex === 0;
-                let isHttp;
-                if ((isHttp = type === 1 /* FETCH_TYPE.HTTP */) || type === 2 /* FETCH_TYPE.UNIX_SOCKET */) {
-                    const url = item.url;
-                    const checkEtag = hasEtag(item);
+                const isHttp = type === 1 /* FETCH_TYPE.HTTP */;
+                if (isHttp || type === 2 /* FETCH_TYPE.UNIX_SOCKET */) {
+                    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);
                         }
@@ -2804,6 +2806,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);
@@ -3078,9 +3081,6 @@ class FileManager extends core_1.Host {
                     }
                 }
             }
-            else {
-                item.invalid = true;
-            }
         }
         this.cleared = true;
     }
@@ -3091,35 +3091,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" /* ERR_MESSAGE.COMPRESS_FILE */, path.basename(file)], err, { type: 8 /* LOG_TYPE.COMPRESS */, 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" /* ERR_MESSAGE.COMPRESS_FILE */, path.basename(file)], err, { type: 8 /* LOG_TYPE.COMPRESS */, startTime: options.startTime })));
                 }
             }
         }
@@ -3132,7 +3134,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 /* LOG_TYPE.PROCESS */));
                 if (this.aborted) {
-                    break;
+                    return;
                 }
             }
         }
@@ -3144,16 +3146,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 /* LOG_TYPE.PROCESS */));
                     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 /* LOG_TYPE.CLOUD */));
-        }
+    finalizeCloud() {
+        const cloud = this.Cloud;
+        return cloud ? cloud_1.default.finalize.call(this, cloud).catch(err => rejectModule.call(cloud, err, 64 /* LOG_TYPE.CLOUD */)) : Promise.resolve();
     }
     async finalizeCleanup() {
         if (this.Compress) {
@@ -3248,7 +3249,7 @@ class FileManager extends core_1.Host {
             const errorCount = this.errorCount;
             const message = [];
             if (errorCount) {
-                message.push(`ERROR ${errorCount}`);
+                message.push('ERROR ' + errorCount); // eslint-disable-line @typescript-eslint/no-base-to-string
             }
             let [size, count] = h;
             if (count) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,14 +20,14 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.5.3",
-    "@e-mc/compress": "0.5.3",
-    "@e-mc/core": "0.5.3",
-    "@e-mc/document": "0.5.3",
-    "@e-mc/image": "0.5.3",
-    "@e-mc/request": "0.5.3",
-    "@e-mc/task": "0.5.3",
-    "@e-mc/types": "0.5.3",
-    "@e-mc/watch": "0.5.3"
+    "@e-mc/cloud": "0.6.0",
+    "@e-mc/compress": "0.6.0",
+    "@e-mc/core": "0.6.0",
+    "@e-mc/document": "0.6.0",
+    "@e-mc/image": "0.6.0",
+    "@e-mc/request": "0.6.0",
+    "@e-mc/task": "0.6.0",
+    "@e-mc/types": "0.6.0",
+    "@e-mc/watch": "0.6.0"
   }
 }