@e-mc/watch 0.8.6 → 0.8.8

package/LICENSE

@@ -1,11 +1,7 @@
 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:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,7 @@
 # @e-mc/watch
 
 * NodeJS 14
-* ES2020
+* ES2019
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/index.d.ts
 
 ```typescript
 import type { IFileManager, ModuleConstructor } from "./index";
@@ -57,12 +57,12 @@ interface WatchConstructor extends ModuleConstructor {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/watch.d.ts
 
 ## LICENSE
 
-BSD 3-Clause
+MIT

package/filegroup/index.js

@@ -95,11 +95,12 @@ class FileGroup extends core_1.AbortComponent {
         return this.sockets.find(item => item.socketId === socketId);
     }
     send(event, data) {
+        var _g;
         const server = this.server;
         let result = false;
         if (server && (data.socketId = this.socketId)) {
             data.event = event;
-            data.always ?? (data.always = this.always);
+            (_g = data.always) !== null && _g !== void 0 ? _g : (data.always = this.always);
             const value = data.value;
             if (value && (util.types.isAnyArrayBuffer(value) || util.types.isArrayBufferView(value))) {
                 try {

package/index.js

@@ -26,15 +26,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;
@@ -91,7 +82,7 @@ class Watch extends core_1.Client {
                         ca: ca && request_1.default.readCACert(ca, true) || undefined,
                         key: passphrase ? [{ pem: key, passphrase }] : key,
                         cert,
-                        minVersion: version || config?.minVersion
+                        minVersion: version || (config === null || config === void 0 ? void 0 : config.minVersion)
                     });
                     server.listen(port);
                     wss = new ws.Server({ server });
@@ -191,6 +182,7 @@ class Watch extends core_1.Client {
     }
     start(assets, permission) {
         var _k;
+        var _l;
         if (this.aborted) {
             return;
         }
@@ -205,7 +197,7 @@ class Watch extends core_1.Client {
             }
             const { bundleId, uri, localUri } = item;
             if (!(0, types_1.isEmpty)(bundleId)) {
-                (destMap[_k = ':' + bundleId] || (destMap[_k] = [])).push(item);
+                (destMap[_l = ':' + bundleId] || (destMap[_l] = [])).push(item);
             }
             else if (uri && localUri) {
                 (destMap[localUri] || (destMap[localUri] = [])).push(item);
@@ -230,7 +222,7 @@ class Watch extends core_1.Client {
             for (let i = 0, length = items.length; i < length; ++i) {
                 const watch = items[i].watch;
                 if ((0, types_1.isObject)(watch)) {
-                    watch.assets?.forEach(other => {
+                    (_k = watch.assets) === null || _k === void 0 ? void 0 : _k.forEach(other => {
                         if (items.includes(other)) {
                             return;
                         }
@@ -263,7 +255,7 @@ class Watch extends core_1.Client {
                 const watchExpired = (map, target, message = 'Expired') => {
                     this.formatMessage(16, 'WATCH', [message, target.startTime ? 'since ' + formatDate(target.startTime) : ''], target.uri, { titleColor: 'grey' });
                     const data = map.get(target.uri);
-                    if (!data?.size) {
+                    if (!(data === null || data === void 0 ? void 0 : data.size)) {
                         map.delete(target.uri);
                         return true;
                     }
@@ -337,6 +329,7 @@ class Watch extends core_1.Client {
                 }
                 const interval = getInterval(item) || watchInterval || this.interval;
                 const watching = (uri, esm) => {
+                    var _k;
                     const group = new filegroup_1.default(uri, main ? assets : items, startTime, this.willAbort("(watch)"));
                     group.add(expires, socketId, id);
                     if (main) {
@@ -366,13 +359,14 @@ class Watch extends core_1.Client {
                     const timeout = { interval, retries: 0, aborted: false };
                     const target = { value: group, timeout, watcher: null };
                     const isMap = (value) => value ? value.size > 0 : false;
-                    const wasAborted = (result, current) => result?.aborted && current.abortable && current.abort();
+                    const wasAborted = (result, current) => (result === null || result === void 0 ? void 0 : result.aborted) && current.abortable && current.abort();
                     const checkPreceding = (map) => {
+                        var _k;
                         const data = map.get(uri);
                         if (!data) {
                             return;
                         }
-                        const current = data.get(dest)?.value;
+                        const current = (_k = data.get(dest)) === null || _k === void 0 ? void 0 : _k.value;
                         if (current && !current.expired) {
                             let reset;
                             if (id) {
@@ -437,7 +431,7 @@ class Watch extends core_1.Client {
                             return status;
                         }
                         const url = group.url || (group.url = new URL(uri));
-                        const request = this.host?.Request || new request_1.default();
+                        const request = ((_k = this.host) === null || _k === void 0 ? void 0 : _k.Request) || new request_1.default();
                         const agentTimeout = Math.max(timeout.interval * 10, this.connectTimeout);
                         const opts = request.opts(url, { method: 'HEAD', httpVersion: 1, timeout: agentTimeout, agentTimeout });
                         (function recurse() {
@@ -457,7 +451,7 @@ class Watch extends core_1.Client {
                                     const map = HTTP_MAP.get(uri);
                                     const etag = res.headers.etag;
                                     const lastModified = res.headers['last-modified'];
-                                    if (valid && map?.size && (etag || lastModified)) {
+                                    if (valid && (map === null || map === void 0 ? void 0 : map.size) && (etag || lastModified)) {
                                         for (const [destUrl, input] of map) {
                                             const value = input.value;
                                             if (value.paused) {
@@ -509,7 +503,7 @@ class Watch extends core_1.Client {
                                     resolve();
                                 })
                                     .on('error', err => {
-                                    if (!timeout.aborted && !(isConnectionTimeout(err) && ++timeout.retries <= 10)) {
+                                    if (!timeout.aborted && !(core_1.Client.isErrorCode(err, 'ETIMEDOUT', 'ECONNRESET') && ++timeout.retries <= 10)) {
                                         reject(err);
                                         return;
                                     }
@@ -540,7 +534,7 @@ class Watch extends core_1.Client {
                             })
                                 .catch(err => {
                                 fatalError(HTTP_MAP, target, err);
-                                client?.destroy();
+                                client === null || client === void 0 ? void 0 : client.destroy();
                             });
                         }).call(this);
                         HTTP_MAP.set(uri, new Map([[dest, target]]));
@@ -651,6 +645,7 @@ class Watch extends core_1.Client {
         }
     }
     async modified(watch) {
+        var _k, _l, _m, _o;
         this.formatMessage(16, 'WATCH', 'File modified', watch.uri, { ...core_1.Client.LOG_STYLE_WARN });
         const { host, assets } = this;
         let items, sanitize = false;
@@ -685,7 +680,7 @@ class Watch extends core_1.Client {
         }
         watch.captured = false;
         try {
-            const manager = this.whenModified?.(items, sanitize);
+            const manager = (_k = this.whenModified) === null || _k === void 0 ? void 0 : _k.call(this, items, sanitize);
             for (const callback of this.extensions) {
                 try {
                     const listener = callback(watch, items);
@@ -707,7 +702,7 @@ class Watch extends core_1.Client {
             if (host && watch.document) {
                 for (const { instance } of host.Document) {
                     if (host.hasDocument(instance, watch.document)) {
-                        const result = instance.watchInit?.(watch, items, sanitize);
+                        const result = (_l = instance.watchInit) === null || _l === void 0 ? void 0 : _l.call(instance, watch, items, sanitize);
                         if (result) {
                             if ((0, types_1.isArray)(result.using)) {
                                 manager.using(...result.using);
@@ -719,7 +714,7 @@ class Watch extends core_1.Client {
                                 }
                             }
                         }
-                        const listener = instance.watchModified?.(watch, items);
+                        const listener = (_m = instance.watchModified) === null || _m === void 0 ? void 0 : _m.call(instance, watch, items);
                         if (typeof listener === 'function') {
                             manager.on('end', listener);
                         }
@@ -729,7 +724,7 @@ class Watch extends core_1.Client {
             return await manager.start();
         }
         catch (err) {
-            this.writeFail(["Unknown", watch.url?.pathname || path.basename(watch.uri)], err);
+            this.writeFail(["Unknown", ((_o = watch.url) === null || _o === void 0 ? void 0 : _o.pathname) || path.basename(watch.uri)], err);
         }
     }
     configureServer({ ca, key, cert, passphrase, version, config }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/watch",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "description": "Watch constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,12 +17,12 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.8.6",
-    "@e-mc/request": "0.8.6",
-    "@e-mc/types": "0.8.6",
+    "@e-mc/core": "0.8.8",
+    "@e-mc/request": "0.8.8",
+    "@e-mc/types": "0.8.8",
     "picomatch": "^3.0.1",
     "ws": "^8.16.0"
   }