@e-mc/watch 0.6.0 → 0.7.1

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2023 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 2023 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/filegroup/index.d.ts

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

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { IFileManager, WatchConstructor } from '../types/lib';
-
-declare const Watch: WatchConstructor<IFileManager>;
-
+import type { IFileManager, WatchConstructor } from '../types/lib';
+
+declare const Watch: WatchConstructor<IFileManager>;
+
 export = Watch;

package/index.js

@@ -21,11 +21,11 @@ const kTlsVersion = Symbol('tlsVersion');
 const kTlsPassphrase = Symbol('tlsPassphrase');
 const kTlsConfig = Symbol('tlsConfig');
 const PLATFORM_WIN32 = process.platform === 'win32';
+const HTTP_MAP = new Map();
+const DISK_MAP = new Map();
+const PORT_MAP = new Map();
+const SECURE_MAP = new Map();
 let STATE_MAP = new WeakSet();
-let HTTP_MAP = {};
-let DISK_MAP = {};
-let PORT_MAP = {};
-let SECURE_MAP = {};
 function isConnectionTimeout(err) {
     switch (err instanceof Error && err.code) {
         case 'ETIMEDOUT':
@@ -56,16 +56,19 @@ function getInterval({ watch }) {
     return 0;
 }
 function closeFileGroup(map) {
-    for (const uri in map) {
-        for (const group of map[uri].values()) {
+    for (const item of map.values()) {
+        for (const group of item.values()) {
             abortTimeout(group);
         }
+        item.clear();
     }
+    map.clear();
 }
 function closeServer(map) {
-    for (const port in map) {
-        map[port].close(err => err && Watch.writeFail([`Unable to shutdown ${map === PORT_MAP ? 'WS' : 'WSS'} server`, 'port: ' + port], err));
+    for (const [port, value] of map) {
+        value.close(err => err && Watch.writeFail([`Unable to shutdown ${map === PORT_MAP ? 'WS' : 'WSS'} server`, 'port: ' + port], err));
     }
+    map.clear();
 }
 const formatDate = (value) => new Date(value).toLocaleString().replace(/\/20\d+, /, '@').replace(/:\d+ (AM|PM)$/, (...match) => match[1]);
 class Watch extends core_1.Client {
@@ -77,7 +80,7 @@ class Watch extends core_1.Client {
         let wss;
         try {
             if ((0, types_1.isPlainObject)(secure)) {
-                if (wss = SECURE_MAP[port]) {
+                if (wss = SECURE_MAP.get(port.toString())) {
                     return wss;
                 }
                 const { ca, passphrase, version, config } = secure;
@@ -92,7 +95,7 @@ class Watch extends core_1.Client {
                     });
                     server.listen(port);
                     wss = new ws.Server({ server });
-                    SECURE_MAP[port] = wss;
+                    SECURE_MAP.set(port.toString(), wss);
                     if (active) {
                         STATE_MAP.add(wss);
                     }
@@ -101,12 +104,12 @@ class Watch extends core_1.Client {
                     this.writeFail('TLS/SSL key and cert not found', (0, types_1.errorMessage)('ws', 'Missing TLS/SSL credentials'));
                 }
             }
-            else if (wss = PORT_MAP[port]) {
+            else if (wss = PORT_MAP.get(port.toString())) {
                 return wss;
             }
             else {
                 wss = new ws.Server({ port });
-                PORT_MAP[port] = wss;
+                PORT_MAP.set(port.toString(), wss);
                 if (active) {
                     STATE_MAP.add(wss);
                 }
@@ -142,10 +145,6 @@ class Watch extends core_1.Client {
         closeServer(PORT_MAP);
         closeServer(SECURE_MAP);
         filegroup_1.default.CLIENT_SESSION.clear();
-        HTTP_MAP = {};
-        DISK_MAP = {};
-        PORT_MAP = {};
-        SECURE_MAP = {};
         STATE_MAP = new WeakSet();
     }
     static checkTimeout(client) {
@@ -257,15 +256,15 @@ class Watch extends core_1.Client {
                 }
                 const fatalError = (map, target, err) => {
                     const uri = target.value.uri;
-                    delete map[uri];
+                    map.delete(uri);
                     abortTimeout(target);
                     this.writeFail(["Unable to watch file" /* ERR_MESSAGE.WATCH_FILE */, uri], err, 16 /* LOG_TYPE.WATCH */);
                 };
                 const watchExpired = (map, target, message = 'Expired') => {
                     this.formatMessage(16 /* LOG_TYPE.WATCH */, 'WATCH', [message, target.startTime ? 'since ' + formatDate(target.startTime) : ''], target.uri, { titleColor: 'grey' });
-                    const data = map[target.uri];
-                    if (!data || data.size === 0) {
-                        delete map[target.uri];
+                    const data = map.get(target.uri);
+                    if (!data?.size) {
+                        map.delete(target.uri);
                         return true;
                     }
                     return false;
@@ -369,7 +368,7 @@ class Watch extends core_1.Client {
                     const isMap = (value) => value ? value.size > 0 : false;
                     const checkAborted = (result, current) => result?.aborted && current.abortable && current.abort();
                     const checkPreceding = (map) => {
-                        const data = map[uri];
+                        const data = map.get(uri);
                         if (!data) {
                             return;
                         }
@@ -403,10 +402,10 @@ class Watch extends core_1.Client {
                                     else if (server !== wss) {
                                         if (wss.clients.size === 0 && !STATE_MAP.has(wss)) {
                                             if (secure) {
-                                                delete SECURE_MAP[port];
+                                                SECURE_MAP.delete(port.toString());
                                             }
                                             else {
-                                                delete PORT_MAP[port];
+                                                PORT_MAP.delete(port.toString());
                                             }
                                             wss.close();
                                         }
@@ -455,7 +454,7 @@ class Watch extends core_1.Client {
                                     }
                                     const statusCode = res.statusCode;
                                     const valid = statusCode >= 200 /* HTTP_STATUS.OK */ && statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */;
-                                    const map = HTTP_MAP[uri];
+                                    const map = HTTP_MAP.get(uri);
                                     const etag = res.headers.etag;
                                     const lastModified = res.headers['last-modified'];
                                     if (valid && map?.size && (etag || lastModified)) {
@@ -526,7 +525,7 @@ class Watch extends core_1.Client {
                             })
                                 .then(() => {
                                 if (!timeout.aborted) {
-                                    const map = HTTP_MAP[uri];
+                                    const map = HTTP_MAP.get(uri);
                                     if (isMap(map)) {
                                         let ms = Watch.MAX_TIMEOUT;
                                         for (const session of map.values()) {
@@ -535,18 +534,16 @@ class Watch extends core_1.Client {
                                         setTimeout(recurse.bind(this), timeout.interval = ms);
                                     }
                                     else {
-                                        delete HTTP_MAP[uri];
+                                        HTTP_MAP.delete(uri);
                                     }
                                 }
                             })
                                 .catch(err => {
                                 fatalError(HTTP_MAP, target, err);
-                                if (client) {
-                                    client.destroy();
-                                }
+                                client?.destroy();
                             });
                         }).call(this);
-                        HTTP_MAP[uri] = new Map([[dest, target]]);
+                        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) {
@@ -558,7 +555,7 @@ class Watch extends core_1.Client {
                                 fatalError(DISK_MAP, target, (0, types_1.createAbortError)());
                                 return;
                             }
-                            const map = DISK_MAP[uri];
+                            const map = DISK_MAP.get(uri);
                             switch (event) {
                                 case 'change': {
                                     if (isMap(map)) {
@@ -601,7 +598,7 @@ class Watch extends core_1.Client {
                                     break;
                             }
                         });
-                        DISK_MAP[uri] = new Map([[dest, target]]);
+                        DISK_MAP.set(uri, new Map([[dest, target]]));
                     }
                     else {
                         return 2 /* ERR.LOCAL_ACCESS */;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/watch",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Watch constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,10 +20,10 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.6.0",
-    "@e-mc/request": "0.6.0",
-    "@e-mc/types": "0.6.0",
-    "picomatch": "^2.3.1",
-    "ws": "^8.13.0"
+    "@e-mc/core": "0.7.1",
+    "@e-mc/request": "0.7.1",
+    "@e-mc/types": "0.7.1",
+    "picomatch": "^3.0.1",
+    "ws": "^8.14.2"
   }
 }