@e-mc/watch 0.10.5 → 0.11.0

package/LICENSE

@@ -8,4 +8,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
 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.
+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,7 +1,7 @@
 # @e-mc/watch
 
-* NodeJS 16
-* ES2020
+* NodeJS 16 LTS
+* ES2021
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.5/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.0/lib/index.d.ts)
 
 ```typescript
 import type { IFileManager, ModuleConstructor } from "./index";
@@ -41,6 +41,8 @@ interface IWatch extends IClient<IFileManager, WatchModule, ModifiedPostFinalize
     get port(): number;
     set securePort(value);
     get securePort(): number;
+    set host(value);
+    get host(): IFileManager | null;
 }
 
 interface WatchConstructor extends ModuleConstructor {
@@ -49,6 +51,7 @@ interface WatchConstructor extends ModuleConstructor {
     shutdown(): void;
     setTimeout(value: number | string): void;
     checkTimeout(client: ws): boolean;
+    isConnectionError(err: unknown): boolean;
     readonly prototype: IWatch;
     new(module?: WatchModule): IWatch;
 }
@@ -106,14 +109,14 @@ instance.start(assets, { disk_read: ["/path/workspace/output/**"] });
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.5/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.5/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.5/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.5/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.5/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.0/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.0/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.0/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.0/lib/watch.d.ts
 
 * https://www.npmjs.com/package/@types/ws
 
 ## LICENSE
 
-BSD 3-Clause
+BSD 3-Clause

package/filegroup/index.js

@@ -1,6 +1,6 @@
 "use strict";
 var _a, _b, _c, _d, _e, _f;
-const util = require("util");
+const util = require("node:util");
 const ws = require("ws");
 const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");

package/index.js

@@ -1,8 +1,8 @@
 "use strict";
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-const path = require("path");
-const fs = require("fs");
-const https = require("https");
+const path = require("node:path");
+const fs = require("node:fs");
+const https = require("node:https");
 const ws = require("ws");
 const pm = require("picomatch");
 const types_1 = require("@e-mc/types");
@@ -25,15 +25,6 @@ const DISK_MAP = new Map();
 const PORT_MAP = new Map();
 const SECURE_MAP = new Map();
 let STATE_MAP = new WeakSet();
-function isConnectionTimeout(err) {
-    switch (err instanceof Error && err.code) {
-        case 'ETIMEDOUT':
-        case 'ECONNRESET':
-            return true;
-        default:
-            return false;
-    }
-}
 function abortTimeout(group) {
     group.timeout.aborted = true;
     const watcher = group.watcher;
@@ -84,11 +75,11 @@ function fatalError(instance, map, target, err) {
     abortTimeout(target);
     instance.writeFail(["Unable to watch file", uri], err, 16);
 }
-function getErrorMessage(item, status = 0) {
+function getErrorMessage(item, status) {
     switch (status) {
         case 1:
-            if ((0, types_1.existsFlag)(item.flags)) {
-                return '';
+            if ((0, types_1.existsFlag)(item)) {
+                return;
             }
             return "ETag not supported";
         case 2:
@@ -212,6 +203,9 @@ class Watch extends core_1.Client {
             filegroup_1.CONNECTION_TIMEOUT = Math.min(value, core_1.Client.MAX_TIMEOUT);
         }
     }
+    static isConnectionError(err) {
+        return (0, util_1.checkRetryable)(err);
+    }
     init(config) {
         const { interval, port, secure } = this.module;
         if (secure) {
@@ -234,7 +228,7 @@ class Watch extends core_1.Client {
         const settings = this.getUserSettings();
         const destMap = Object.create(null);
         for (const item of assets) {
-            if (!(0, types_1.ignoreFlag)(item.flags)) {
+            if (!(0, types_1.ignoreFlag)(item)) {
                 const { bundleId, uri, localUri } = item;
                 if (!(0, types_1.isEmpty)(bundleId)) {
                     (destMap[':' + bundleId] ||= []).push(item);
@@ -264,20 +258,19 @@ class Watch extends core_1.Client {
                 const watch = items[i].watch;
                 if ((0, types_1.isObject)(watch)) {
                     watch.assets?.forEach(other => {
-                        if (items.includes(other)) {
-                            return;
-                        }
-                        if ((0, types_1.watchFlag)(other.flags)) {
-                            if (!other.watch) {
-                                other = filegroup_1.cloneAsset(other);
-                                other.watch = { ...watch };
+                        if (!items.includes(other)) {
+                            if ((0, types_1.watchFlag)(other)) {
+                                if (!other.watch) {
+                                    other = filegroup_1.cloneAsset(other);
+                                    other.watch = { ...watch };
+                                }
+                                other.flags &= ~1;
+                                other.invalid = undefined;
+                                items.push(other);
+                            }
+                            else if (!related.includes(other)) {
+                                related.push(other);
                             }
-                            other.flags &= ~1;
-                            other.invalid = undefined;
-                            items.push(other);
-                        }
-                        else if (!related.includes(other)) {
-                            related.push(other);
                         }
                     });
                 }
@@ -390,10 +383,10 @@ class Watch extends core_1.Client {
                         }
                         const current = data.get(dest)?.value;
                         if (current && !current.expired) {
-                            let reset;
+                            let reset = false;
                             if (id) {
                                 const sockets = current.sockets;
-                                for (let i = 0, active; i < sockets.length; ++i) {
+                                for (let i = 0, active = false; i < sockets.length; ++i) {
                                     const socket = sockets[i];
                                     if (socket.id === id) {
                                         if (active) {
@@ -449,8 +442,9 @@ class Watch extends core_1.Client {
                         if (!group.etag && !group.lastModified) {
                             return 1;
                         }
-                        if ((status = checkPreceding(HTTP_MAP)) !== undefined) {
-                            return status;
+                        const pre = checkPreceding(HTTP_MAP);
+                        if (pre !== undefined) {
+                            return pre;
                         }
                         const url = group.url ||= new URL(uri);
                         const request = this.host?.Request || new request_1();
@@ -485,20 +479,8 @@ class Watch extends core_1.Client {
                                                     aborted = true;
                                                 }
                                                 else if (value.etag) {
-                                                    if (etag) {
-                                                        if (etag !== value.etag) {
-                                                            value.etag = etag;
-                                                            if (value.started) {
-                                                                void this.modified(value).then(result => {
-                                                                    wasAborted(result, value);
-                                                                });
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                else if (value.lastModified && lastModified) {
-                                                    if (lastModified !== value.lastModified) {
-                                                        value.lastModified = lastModified;
+                                                    if (etag && etag !== value.etag) {
+                                                        value.etag = etag;
                                                         if (value.started) {
                                                             void this.modified(value).then(result => {
                                                                 wasAborted(result, value);
@@ -506,6 +488,14 @@ class Watch extends core_1.Client {
                                                         }
                                                     }
                                                 }
+                                                else if (lastModified && value.lastModified && lastModified !== value.lastModified) {
+                                                    value.lastModified = lastModified;
+                                                    if (value.started) {
+                                                        void this.modified(value).then(result => {
+                                                            wasAborted(result, value);
+                                                        });
+                                                    }
+                                                }
                                             }
                                             if (aborted) {
                                                 map.delete(destUrl);
@@ -527,18 +517,20 @@ class Watch extends core_1.Client {
                                     resolve();
                                 })
                                     .on('error', err => {
-                                    if (!timeout.aborted && !(isConnectionTimeout(err) && ++timeout.retries <= 10)) {
+                                    if (!timeout.aborted && !(Watch.isConnectionError(err) && ++timeout.retries <= 10)) {
                                         reject(err);
-                                        return;
                                     }
-                                    resolve();
+                                    else {
+                                        resolve();
+                                    }
                                 })
                                     .on('timeout', () => {
                                     if (!timeout.aborted && ++timeout.retries > 10) {
                                         reject((0, types_1.errorMessage)(408, "HTTP request timeout"));
-                                        return;
                                     }
-                                    resolve();
+                                    else {
+                                        resolve();
+                                    }
                                 });
                             })
                                 .then(() => {
@@ -564,8 +556,9 @@ class Watch extends core_1.Client {
                         HTTP_MAP.set(uri, new Map([[dest, target]]));
                     }
                     else if (esm || path.isAbsolute(uri = core_1.Client.resolveFile(uri)) && this.canRead(uri, { hostPermissionOnly: !!this.host })) {
-                        if ((status = checkPreceding(DISK_MAP)) !== undefined) {
-                            return status;
+                        const pre = checkPreceding(DISK_MAP);
+                        if (pre !== undefined) {
+                            return pre;
                         }
                         let ptime = 0;
                         target.watcher = fs.watch(uri, (event, filename) => {
@@ -622,7 +615,7 @@ class Watch extends core_1.Client {
                     }
                     return 0;
                 };
-                if ((0, types_1.isArray)(sourceFiles) && sourceFiles.some(file => this.canRead(file, { hostPermissionOnly: !!this.host }))) {
+                if ((0, types_1.isArray)(sourceFiles) && (sourceFiles = sourceFiles.filter(file => this.canRead(file, { hostPermissionOnly: !!this.host }))).length > 0) {
                     let index = 0;
                     for (const file of new Set(sourceFiles)) {
                         if (index++ > 0) {
@@ -639,11 +632,13 @@ class Watch extends core_1.Client {
                 else {
                     continue;
                 }
-                if (status === 0) {
-                    this.formatMessage(16, 'WATCH', ['Start', interval + 'ms ' + (expires ? formatDate(expires) : 'never')], watched, { titleColor: 'blue' });
+                if (status > 0) {
+                    if (message ||= getErrorMessage(item, status)) {
+                        this.formatFail((16 | (status === 2 ? 8192 : 0)), 'WATCH', ["Unable to watch file", watched && path.basename(watched)], (0, types_1.errorValue)(message, watched), { fatal: false });
+                    }
                 }
-                else if (message ||= getErrorMessage(item, status)) {
-                    this.formatFail((16 | (status === 2 ? 8192 : 0)), 'WATCH', ["Unable to watch file", watched && path.basename(watched)], (0, types_1.errorValue)(message, watched));
+                else {
+                    this.formatMessage(16, 'WATCH', ['Start', interval + 'ms ' + (expires ? formatDate(expires) : 'never')], watched, { titleColor: 'blue' });
                 }
             }
         }
@@ -822,7 +817,7 @@ class Watch extends core_1.Client {
         return this._assets;
     }
     set interval(value) {
-        if ((value = Math.trunc(value)) > 0) {
+        if (value > 0) {
             this[kInterval] = value;
         }
     }
@@ -830,7 +825,7 @@ class Watch extends core_1.Client {
         return this[kInterval];
     }
     set port(value) {
-        if ((value = Math.trunc(value)) > 0) {
+        if (value > 0) {
             this[kPort] = value;
         }
     }
@@ -838,7 +833,7 @@ class Watch extends core_1.Client {
         return this[kPort];
     }
     set securePort(value) {
-        if ((value = Math.trunc(value)) > 0) {
+        if (value > 0) {
             this[kSecurePort] = value;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/watch",
-  "version": "0.10.5",
+  "version": "0.11.0",
   "description": "Watch constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,9 +20,9 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.10.5",
-    "@e-mc/request": "0.10.5",
-    "@e-mc/types": "0.10.5",
+    "@e-mc/core": "0.11.0",
+    "@e-mc/request": "0.11.0",
+    "@e-mc/types": "0.11.0",
     "picomatch": "^4.0.2",
     "ws": "^8.18.0"
   }