@e-mc/file-manager 0.9.0 → 0.9.2

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2024 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 2024 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,6 +1,6 @@
 # @e-mc/file-manager
 
-* NodeJS 14/16
+* NodeJS 16
 * ES2020
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.2/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, IncrementalMatch, TaskAction } from "./squared";
@@ -284,33 +284,17 @@ await instance.start();
 
 NOTE: **FileManager** is a sub-class of [Host](https://www.npmjs.com/package/@e-mc/core) and [Module](https://www.npmjs.com/package/@e-mc/module). Their ``loadSettings`` will be called as well which uses a combined [Settings](https://e-mc.readthedocs.io/en/latest/references.html#references-e-mc-types-lib-node) object.
 
-## NodeJS 14 LTS
-
-Any optional fail safe dependencies were removed as of `E-mc 0.9`. The code itself will still be *ES2020* and will continue to work equivalently when self-installing these dependencies:
-
-### Under 15.4 + 16.0
-
-```sh
-npm i abort-controller event-target-shim
-```
-
-### Under 14.17 + 15.6
-
-```sh
-  npm i uuid
-```
-
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.d.ts

@@ -1,6 +1,6 @@
-import type { FileManagerConstructor } from '../types/lib';
-import type { ExternalAsset } from '../types/lib/asset';
-
-declare const FileManager: FileManagerConstructor<ExternalAsset>;
-
+import type { FileManagerConstructor } from '../types/lib';
+import type { ExternalAsset } from '../types/lib/asset';
+
+declare const FileManager: FileManagerConstructor<ExternalAsset>;
+
 export = FileManager;

package/index.js

@@ -135,7 +135,8 @@ function resetAssets() {
 }
 function recurseDir(output, subDirs, options) {
     const { ignore, sortBy, recursive } = options;
-    const items = fs.readdirSync(path.join(...subDirs), { withFileTypes: true })
+    const baseDir = path.join(...subDirs);
+    const items = fs.readdirSync(baseDir, { withFileTypes: true })
         .filter(item => item.name)
         .sort((a, b) => {
         if (sortBy > 0) {
@@ -150,7 +151,7 @@ function recurseDir(output, subDirs, options) {
     });
     for (const item of items) {
         if (!item.isDirectory()) {
-            const pathname = path.join(item.path, item.name);
+            const pathname = path.join(baseDir, item.name);
             if (!ignore.includes(pathname)) {
                 output.push(pathname);
             }
@@ -2904,8 +2905,8 @@ class FileManager extends core_1.Host {
                 data[attr] = undefined;
             }
         };
-        const errorRequest = (file, err, preceding) => {
-            const { uri, localUri } = file;
+        const errorRequest = (file, localUri, err, preceding) => {
+            const uri = file.uri;
             clearQueue(processing, localUri);
             clearQueue(downloading, uri);
             clearQueue(appending, localUri);
@@ -3190,7 +3191,7 @@ class FileManager extends core_1.Host {
                             downloading[uri] = [];
                         }
                         const url = item.url;
-                        let cacheDir, cacheBuffer, mainEtag, encoding = item.encoding, client = null;
+                        let mainEtag = false, encoding = item.encoding, client = null, cacheDir, cacheBuffer;
                         if (type === 1) {
                             cacheDir = cacheToDisk.has(url) && isCacheable(item);
                             cacheBuffer = cacheToMemory.has(url);
@@ -3238,7 +3239,7 @@ class FileManager extends core_1.Host {
                                     });
                                 }
                             }, (err) => {
-                                errorRequest(item, err);
+                                errorRequest(item, localUri, err);
                             }, 1);
                         };
                         this.performAsyncTask();
@@ -3253,7 +3254,7 @@ class FileManager extends core_1.Host {
                                         const statusCode = res.statusCode;
                                         if (statusCode < 300) {
                                             const etag = applyHeaders(item, res.headers, false, mainEtag);
-                                            let tempDir, etagDir;
+                                            let etagDir = '', tempDir;
                                             if (etag) {
                                                 if (cacheDir || mainEtag) {
                                                     tempDir = this.getCacheDir(href);
@@ -3370,44 +3371,44 @@ class FileManager extends core_1.Host {
                                                 catch {
                                                 }
                                             }
-                                            errorRequest(item, (0, types_1.errorMessage)(statusCode, 'Exceeded redirect limit', url.toString()));
+                                            errorRequest(item, localUri, (0, types_1.errorMessage)(statusCode, 'Exceeded redirect limit', url.toString()));
                                         }
                                         else {
-                                            downloadUri(target);
+                                            downloadUri(target, null);
                                         }
                                     })
                                         .on('error', err => {
                                         if (!client.destroyed) {
                                             if ((0, util_1.checkRetryable)(err)) {
-                                                downloadUri(target);
+                                                downloadUri(target, null);
                                             }
                                             else {
-                                                errorRequest(item, err);
+                                                errorRequest(item, localUri, err);
                                             }
                                         }
                                     })
                                         .on('timeout', () => {
                                         if (!client.destroyed) {
-                                            downloadUri(target);
+                                            downloadUri(target, null);
                                         }
                                     });
                                 }
                                 catch {
-                                    downloadUri(request.opts(href));
+                                    downloadUri(request.opts(href), null);
                                 }
                             }).bind(this)(url);
                         }
                         else {
-                            downloadUri(this.Request.opts(url));
+                            downloadUri(this.Request.opts(url), null);
                         }
                     }
                 }
             }
             else if (type) {
                 if (bundleMain && !item.mimeType) {
-                    errorRequest(item, (0, types_1.errorValue)("MIME not found", uri), true);
+                    errorRequest(item, localUri, (0, types_1.errorValue)("MIME not found", uri), true);
                 }
-                else if (!checkQueue(item, localUri, pathname, false)) {
+                else if (!checkQueue(item, localUri, pathname)) {
                     if (downloading[uri]) {
                         downloading[uri].push(item);
                         continue;
@@ -3416,7 +3417,7 @@ class FileManager extends core_1.Host {
                     this.performAsyncTask();
                     this.scheduleTask(item.url || uri, { pathname, binOpts: item.binOpts }, (result) => {
                         if (result.length === 0) {
-                            errorRequest(item, (0, types_1.errorValue)("No files were successfully downloaded", uri));
+                            errorRequest(item, localUri, (0, types_1.errorValue)("No files were successfully downloaded", uri));
                         }
                         else if (bundleMain) {
                             const encoding = item.encoding || (item.encoding = 'utf-8');
@@ -3426,7 +3427,7 @@ class FileManager extends core_1.Host {
                                     processQueue(item, localUri);
                                 }
                                 else {
-                                    errorRequest(item, err);
+                                    errorRequest(item, localUri, err);
                                 }
                             });
                         }
@@ -3463,7 +3464,7 @@ class FileManager extends core_1.Host {
                             }
                         }
                     }, (err) => {
-                        errorRequest(item, err);
+                        errorRequest(item, localUri, err);
                     }, 4);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "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.0",
-    "@e-mc/compress": "0.9.0",
-    "@e-mc/core": "0.9.0",
-    "@e-mc/document": "0.9.0",
-    "@e-mc/image": "0.9.0",
-    "@e-mc/request": "0.9.0",
-    "@e-mc/task": "0.9.0",
-    "@e-mc/types": "0.9.0",
-    "@e-mc/watch": "0.9.0",
+    "@e-mc/cloud": "0.9.2",
+    "@e-mc/compress": "0.9.2",
+    "@e-mc/core": "0.9.2",
+    "@e-mc/document": "0.9.2",
+    "@e-mc/image": "0.9.2",
+    "@e-mc/request": "0.9.2",
+    "@e-mc/task": "0.9.2",
+    "@e-mc/types": "0.9.2",
+    "@e-mc/watch": "0.9.2",
     "chalk": "4.1.2",
     "picomatch": "^4.0.2"
   }