@e-mc/file-manager 0.9.3 → 0.9.5

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.3/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.5/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, IncrementalMatch, TaskAction } from "./squared";
@@ -286,15 +286,15 @@ NOTE: **FileManager** is a sub-class of [Host](https://www.npmjs.com/package/@e-
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -1201,26 +1201,17 @@ class FileManager extends core_1.Host {
         }
         switch (name) {
             case 'cloud': {
-                const instance = new cloud_1(args[0]);
-                instance.host = this;
-                instance.init(this.config);
-                observeFile.call(this, instance);
-                return this.Cloud = instance;
-            }
-            case 'watch': {
-                const instance = new watch_1(...args);
-                instance.host = this;
-                instance.init(this.config);
-                observeFile.call(this, instance);
-                return this.Watch = instance;
-            }
-            case 'compress': {
-                const instance = new compress_1(args[0]);
-                instance.host = this;
-                instance.init();
-                observeFile.call(this, instance);
-                return this.Compress = instance;
+                if ((0, types_1.isArray)(args[1])) {
+                    const instance = new cloud_1(args[0], args[1]);
+                    instance.host = this;
+                    instance.init(this.config);
+                    observeFile.call(this, instance);
+                    return this.Cloud = instance;
+                }
             }
+            case 'watch':
+            case 'compress':
+                return this.install(name, ...args);
             default:
                 return null;
         }
@@ -1693,25 +1684,8 @@ class FileManager extends core_1.Host {
         if (state === 0 && (this.cleared && this[kDelayed] <= 0 || override) || (this.aborted || state === 3) && override) {
             this.clearProcessTimeout();
             this[kDelayed] = Infinity;
-            const resetState = () => {
-                this.finalizeState = 2;
-                this._pendingResult = null;
-            };
-            const aborted = (err) => {
-                if (!this.restarting) {
-                    this.writeFail(["Transaction was not completed", this.baseDirectory], err);
-                    resetState();
-                }
-                else {
-                    this.finalizeState = 4;
-                }
-                this.emit('end', [], collectErrors.call(this), this.collectLog());
-                if (!this.restarting) {
-                    this.done = true;
-                }
-            };
             if (this.aborted) {
-                aborted((0, types_1.createAbortError)());
+                this.abortFinalize((0, types_1.createAbortError)());
                 return;
             }
             this.finalizeState = 1;
@@ -1731,7 +1705,7 @@ class FileManager extends core_1.Host {
                 if (LOG_TIMEELAPSED) {
                     this.writeTimeElapsed('END', this.baseDirectory, this.startTime, errors.length > 0 ? { failed: true, ...core_1.Host.LOG_STYLE_FAIL } : { ...core_1.Host.LOG_STYLE_SUCCESS });
                 }
-                resetState();
+                this.resetState();
                 const log = this.config.log;
                 let useNumeric, showSize;
                 if ((0, types_1.isObject)(log)) {
@@ -1744,7 +1718,7 @@ class FileManager extends core_1.Host {
                 this.emit('end', items, errors, this.collectLog());
                 this.done = true;
             })
-                .catch((err) => aborted(err));
+                .catch((err) => this.abortFinalize(err));
         }
     }
     hasDocument(instance, document) {
@@ -2321,12 +2295,14 @@ class FileManager extends core_1.Host {
             return 0;
         }
         const stat = this[kDownloadStats][type];
-        stat[0] += result;
-        stat[1]++;
+        if (stat) {
+            stat[0] += result;
+            stat[1]++;
+        }
         return result;
     }
     getDownload(type = 0) {
-        return this[kDownloadStats][type];
+        return this[kDownloadStats][type] || [NaN, 0];
     }
     async fetchObject(uri, options = {}) {
         if (typeof options === 'string') {
@@ -3212,7 +3188,7 @@ class FileManager extends core_1.Host {
                                 request.httpVersion = (originCount[request.url.origin] || 0) <= 1 ? 1 : undefined;
                                 request.connected = headers => {
                                     applyHeaders(item, headers, true, mainEtag);
-                                    return item.willChange || !!etagDir && (cacheDir || !item.contentLength || cacheToMemory.within(item.contentLength));
+                                    return item.willChange || !!etagDir && (cacheDir || !item.contentLength || cacheToMemory.within(item.contentLength)) || this.hasLog('progress');
                                 };
                             }
                             else {
@@ -3517,13 +3493,14 @@ class FileManager extends core_1.Host {
             }
             const length = status.length;
             const logCurrent = (0, types_1.getLogCurrent)();
-            const redraw = processTask.logCurrent !== logCurrent;
             const formatSegment = (endTime, value) => endTime ? value : chalk.bgGray.black(value);
+            let redraw = processTask.logCurrent !== logCurrent;
             if (redraw || length > processTask.length) {
                 this.pauseLog();
                 processTask.logCurrent = logCurrent;
                 PROCESS_STDOUT.write('\n'.repeat(redraw ? length : length - processTask.length));
                 processTask.length = length;
+                redraw = true;
             }
             PROCESS_STDOUT.moveCursor(0, -length);
             processTask.updated = currentTime;
@@ -3535,11 +3512,12 @@ class FileManager extends core_1.Host {
                 if (!endTime) {
                     finished = false;
                 }
-                if (item.previousBytes === receivedBytes && !redraw) {
+                if (!redraw && item.previousBytes === receivedBytes) {
                     PROCESS_STDOUT.moveCursor(0, 1);
                     continue;
                 }
                 if (item.output) {
+                    PROCESS_STDOUT.clearLine(0);
                     PROCESS_STDOUT.write(item.output);
                     continue;
                 }
@@ -3561,9 +3539,14 @@ class FileManager extends core_1.Host {
                 }
                 const diffTime = currentTime - item.startTime;
                 const time = formatSegment(endTime, formatMinutes(diffTime).padStart(titleWidth));
-                const size = formatSegment(endTime, (0, types_1.formatSize)(receivedBytes, { unit: receivedBytes < 1048576 ? 'KB' : receivedBytes < 1073741824 ? 'MB' : 'GB', unitSeparator: ' ' }).padStart(9));
+                const size = formatSegment(endTime, (0, types_1.formatSize)(receivedBytes, { unit: receivedBytes < 1048576 ? 'KB' : receivedBytes < 1073741824 ? 'MB' : 'GB', unitSeparator: ' ', fixedDecimals: true, decimalPlaces: 2 }).padStart(9));
                 const speed = formatSegment(endTime, (0, util_1.getTransferRate)(receivedBytes, item.dataTime ? (0, types_1.convertTime)(process.hrtime(item.dataTime), false) * 1000 : diffTime, ' ').padStart(10));
-                const output = time + ` ${chalk.blackBright(':')} ${endTime && bars !== -1 ? chalk.bgBlack.gray(item.url) : item.url}| ${size} | ${speed} |${bars === -1 ? chalk.bgBlack.green.bold('>'.repeat(25)) : (bars > 0 ? chalk.yellow('>'.repeat(bars)) : '') + (25 - bars > 0 ? chalk.gray((endTime ? '#' : '-').repeat(25 - bars)) : '')}| ${endTime ? bars === -1 ? chalk.bold('100%') : chalk.red('ERR!') : Math.trunc(percent).toString().padStart(3) + '%'}\n`;
+                let output = time + ` ${chalk.blackBright(':')} ${endTime && bars !== -1 ? chalk.bgBlack.gray(item.url) : item.url}| ${size} |`;
+                if (!isNaN(percent)) {
+                    output += speed + ` |${bars === -1 ? chalk.bgBlack.green.bold('>'.repeat(25)) : (bars > 0 ? chalk.yellow('>'.repeat(bars)) : '') + (25 - bars > 0 ? chalk.gray((endTime ? '#' : '-').repeat(25 - bars)) : '')}| ` + (endTime ? bars === -1 ? chalk.bold('100%') : chalk.red('ERR!') : Math.trunc(percent).toString().padStart(3) + '%');
+                }
+                output += '\n';
+                PROCESS_STDOUT.clearLine(0);
                 PROCESS_STDOUT.write(output);
                 if (endTime) {
                     item.output = output;
@@ -3625,7 +3608,7 @@ class FileManager extends core_1.Host {
             }
             else {
                 if (data instanceof URL && data.protocol === 'file:') {
-                    data = require('url').fileURLToPath(data);
+                    data = core_1.Host.resolveFile(data);
                 }
                 if ((0, types_1.isString)(data) && core_1.Host.isPath(data, true) && this.canRead(data)) {
                     data = fs.createReadStream(data);
@@ -3891,6 +3874,23 @@ class FileManager extends core_1.Host {
     close() {
         this.Request.close();
     }
+    resetState() {
+        this.finalizeState = 2;
+        this._pendingResult = null;
+    }
+    abortFinalize(err) {
+        if (!this.restarting) {
+            this.writeFail(["Transaction was not completed", this.baseDirectory], err);
+            this.resetState();
+        }
+        else {
+            this.finalizeState = 4;
+        }
+        this.emit('end', [], collectErrors.call(this), this.collectLog());
+        if (!this.restarting) {
+            this.done = true;
+        }
+    }
     set restarting(value) {
         this.finalizeState = (this[kRestarting] = value) ? 3 : 0;
     }

package/package.json

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