@e-mc/file-manager 0.14.2 → 0.14.3

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.14.2/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.14.3/lib/index.d.ts)
 
 ```typescript
 import type { ChecksumValue, DataSource, IncrementalMatch, TaskAction } from "./squared";
@@ -51,6 +51,7 @@ interface IFileManager extends IHost, Set<string> {
     readonly emptyDir: Set<string>;
     readonly cacheToDisk: IHttpDiskCache<ExternalAsset>;
     readonly cacheToMemory: IHttpMemoryCache<ExternalAsset>;
+    [Symbol.asyncIterator](): IteratorObject<[string, Buffer, BufferEncoding?], BuiltinIteratorReturn>;
     install(name: "document", handler: string, module?: DocumentModule, ...args: unknown[]): IDocument | undefined;
     install(name: "document", target: DocumentConstructor, module?: DocumentModule, ...args: unknown[]): IDocument | undefined;
     install(name: "task", handler: string, module?: TaskModule, ...args: unknown[]): ITask | undefined;
@@ -297,15 +298,15 @@ NOTE: **FileManager** is a sub-class of [Host](https://www.npmjs.com/package/@e-
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.2/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -294,7 +294,7 @@ function processCacheHeaders(headers, noCache, noStore) {
         const maxAge = cacheControl.find(value => value.startsWith('max-age='));
         if (maxAge && (!noCache || cacheControl.includes('public') || cacheControl.includes('must-revalidate'))) {
             const age = parseHeader(headers, 'age');
-            let result = parseInt(maxAge.split('=').pop()) * 1000;
+            let result = parseInt(maxAge.split('=').at(-1)) * 1000;
             if (age) {
                 result -= age;
                 if (result < 0 && noCache) {
@@ -1731,6 +1731,20 @@ class FileManager extends Host {
             yield file;
         }
     }
+    *[Symbol.asyncIterator]() {
+        for (const file of this.files) {
+            const asset = this._assets.find(item => item.localUri === file);
+            try {
+                const buffer = asset && this.getBuffer(asset) || fs.readFileSync(file);
+                if (buffer) {
+                    yield [file, buffer, asset?.encoding];
+                }
+            }
+            catch (err) {
+                this.addLog(3, err, { source: file });
+            }
+        }
+    }
     add(value, parent, type = FILE_TYPE.TRANSFORM) {
         const file = this.removeCwd(value);
         if (file) {
@@ -2471,7 +2485,7 @@ class FileManager extends Host {
             }
             let filename = file.filename;
             if (!filename && !file.document && !isDownloadAll(type)) {
-                filename = url.pathname.split('/').pop();
+                filename = url.pathname.split('/').at(-1);
                 if (filename.includes('.')) {
                     const mimeType = file.mimeType || Host.lookupMime(filename);
                     if (mimeType) {
@@ -2552,7 +2566,7 @@ class FileManager extends Host {
         if (file.buffer) {
             return (typeof minStreamSize === 'number' ? Promise.resolve(file.buffer) : file.buffer);
         }
-        let { base64, localUri } = file;
+        let { base64, sourceUTF8, localUri } = file;
         if (localUri) {
             if (typeof minStreamSize === 'number') {
                 return Host.streamFile(localUri, { minStreamSize, cache: false, signal: this.signal });
@@ -2561,13 +2575,14 @@ class FileManager extends Host {
                 return fs.readFileSync(localUri);
             }
             catch (err) {
-                if (!(base64 && isErrorCode(err, 'ENOENT', 'EACCES'))) {
+                if (!(isErrorCode(err, 'ENOENT', 'EACCES') && (sourceUTF8 || base64))) {
                     this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
+                    sourceUTF8 = undefined;
                     base64 = undefined;
                 }
             }
         }
-        const result = base64 ? Buffer.from(base64, 'base64') : null;
+        const result = sourceUTF8 ? Buffer.from(sourceUTF8, file.encoding) : base64 ? Buffer.from(base64, 'base64') : null;
         return (typeof minStreamSize === 'number' ? Promise.resolve(result) : result);
     }
     getCacheDir(url, createDir = true) {

package/package.json

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