@e-mc/watch 0.5.3 → 0.5.5

package/LICENSE

@@ -1,11 +1,7 @@
-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.
+Copyright 2023 Anya Forger
+
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+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,5 +1,7 @@
-### @e-mc/watch
+# @e-mc/watch
 
-### LICENSE
+PEP 402 - Forever
 
-BSD 3-Clause
+## LICENSE
+
+MIT

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/filegroup/index.js

@@ -1,8 +1,8 @@
 "use strict";
 var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
-const types_1 = require("../../types");
-const core_1 = require("../../core");
+const types_1 = require("@e-mc/types");
+const core_1 = require("@e-mc/core");
 const kPaused = Symbol('paused');
 const kServer = Symbol('server');
 const kAssets = Symbol('assets');
@@ -132,7 +132,7 @@ class FileGroup extends core_1.AbortComponent {
     set related(value) {
         this._related = value.map(item => {
             item = FileGroup.cloneAsset(item);
-            item.flags = 1 /* ASSET_FLAG.IGNORE */;
+            item.flags = 1;
             return item;
         });
     }
@@ -187,7 +187,7 @@ class FileGroup extends core_1.AbortComponent {
     }
 }
 _a = kServer, _b = kPaused, _c = kEtag, _d = kLastModified, _e = kSockets;
-FileGroup.CONNECTION_TIMEOUT = 10 * 60000 /* TIME.m */;
+FileGroup.CONNECTION_TIMEOUT = 10 * 60000;
 FileGroup.CLIENT_SESSION = new Map();
 exports.default = 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

@@ -6,11 +6,11 @@ const fs = require("fs");
 const https = require("https");
 const ws = require("ws");
 const pm = require("picomatch");
-const util_1 = require("../request/util");
-const types_1 = require("../types");
-const core_1 = require("../core");
-const request_1 = require("../request");
-const filegroup_1 = require("./filegroup");
+const util_1 = require("@e-mc/request/util");
+const types_1 = require("@e-mc/types");
+const core_1 = require("@e-mc/core");
+const request_1 = require("@e-mc/request");
+const filegroup_1 = require("@e-mc/watch/filegroup");
 const kInterval = Symbol('interval');
 const kPort = Symbol('port');
 const kSecurePort = Symbol('securePort');
@@ -53,43 +53,45 @@ class Watch extends core_1.Client {
         let wss;
         try {
             if ((0, types_1.isPlainObject)(secure)) {
-                if (wss = SECURE_MAP[port]) {
-                    return wss;
-                }
-                const { ca, passphrase, version, config } = secure;
-                let { key, cert } = secure;
-                if (key && cert && (key = request_1.default.readTLSKey(key, true)) && (cert = request_1.default.readTLSKey(cert, true))) {
-                    const server = https.createServer({
-                        ...config,
-                        ca: ca && request_1.default.readCACert(ca, true) || undefined,
-                        key: passphrase ? [{ pem: key, passphrase }] : key,
-                        cert,
-                        minVersion: version || config?.minVersion
-                    });
-                    server.listen(port);
-                    wss = new ws.Server({ server });
-                    SECURE_MAP[port] = wss;
-                    if (active) {
-                        STATE_MAP.add(wss);
+                if (!(wss = SECURE_MAP[port])) {
+                    const { ca, passphrase, version, config } = secure;
+                    let { key, cert } = secure;
+                    if (key && cert && (key = request_1.default.readTLSKey(key, true)) && (cert = request_1.default.readTLSKey(cert, true))) {
+                        const server = https.createServer({
+                            ...config,
+                            ca: ca && request_1.default.readCACert(ca, true) || undefined,
+                            key: passphrase ? [{ pem: key, passphrase }] : key,
+                            cert,
+                            minVersion: version || config?.minVersion
+                        });
+                        server.listen(port);
+                        wss = new ws.Server({ server });
+                        SECURE_MAP[port] = wss;
+                        if (active) {
+                            STATE_MAP.add(wss);
+                        }
+                    }
+                    else {
+                        this.writeFail('TLS/SSL key and cert not found', (0, types_1.errorMessage)('ws', 'Missing TLS/SSL credentials'));
                     }
                 }
                 else {
-                    this.writeFail('TLS/SSL key and cert not found', (0, types_1.errorMessage)('ws', 'Missing TLS/SSL credentials'));
+                    return wss;
                 }
             }
-            else if (wss = PORT_MAP[port]) {
-                return wss;
-            }
-            else {
+            else if (!(wss = PORT_MAP[port])) {
                 wss = new ws.Server({ port });
                 PORT_MAP[port] = wss;
                 if (active) {
                     STATE_MAP.add(wss);
                 }
             }
+            else {
+                return wss;
+            }
         }
         catch (err) {
-            this.writeFail("Unknown" /* ERR_MESSAGE.UNKNOWN */, err);
+            this.writeFail("Unknown", err);
         }
         if (wss) {
             wss.on('connection', function (socket) {
@@ -147,8 +149,8 @@ class Watch extends core_1.Client {
         this._extensions = [];
         this._hostEvents = [];
         this[_a] = types_1.THRESHOLD.WATCH_INTERVAL;
-        this[_b] = 80 /* HTTP.PORT */;
-        this[_c] = 443 /* HTTP.PORT_SECURE */;
+        this[_b] = 80;
+        this[_c] = 443;
         this[_d] = '';
         this[_e] = '';
         this[_f] = '';
@@ -202,7 +204,7 @@ class Watch extends core_1.Client {
                 continue;
             }
             let watchInterval, bundleMain;
-            if (dest[0] === ':') {
+            if (dest.startsWith(':')) {
                 items.sort((a, b) => a.bundleIndex - b.bundleIndex);
                 bundleMain = items[0];
                 dest = bundleMain.localUri;
@@ -224,7 +226,7 @@ class Watch extends core_1.Client {
                                 other = filegroup_1.default.cloneAsset(other);
                                 other.watch = { ...watch };
                             }
-                            other.flags &= ~1 /* ASSET_FLAG.IGNORE */;
+                            other.flags &= ~1;
                             other.invalid = undefined;
                             items.push(other);
                         }
@@ -241,10 +243,10 @@ class Watch extends core_1.Client {
                         const uri = target.value.uri;
                         delete map[uri];
                         abortTimeout(target);
-                        this.writeFail(["Unable to watch file" /* ERR_MESSAGE.WATCH_FILE */, uri], err, 16 /* LOG_TYPE.WATCH */);
+                        this.writeFail(["Unable to watch file", uri], err, 16);
                     };
                     const watchExpired = (map, target, message = 'Expired') => {
-                        this.formatMessage(16 /* LOG_TYPE.WATCH */, 'WATCH', [message, target.startTime ? 'since ' + formatDate(target.startTime) : ''], target.uri, { titleColor: 'grey' });
+                        this.formatMessage(16, '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];
@@ -301,7 +303,7 @@ class Watch extends core_1.Client {
                                 wss = Watch.createServer(port || (port = this.port));
                             }
                             if (!wss) {
-                                this.writeFail('Unable to create WebSocket server', (0, types_1.errorMessage)(secure ? 'wss' : 'ws', "Invalid parameters" /* ERR_MESSAGE.PARAMETERS */, 'port: ' + (port || "Unknown" /* ERR_MESSAGE.UNKNOWN */)), 16 /* LOG_TYPE.WATCH */);
+                                this.writeFail('Unable to create WebSocket server', (0, types_1.errorMessage)(secure ? 'wss' : 'ws', "Invalid parameters", 'port: ' + (port || "Unknown")), 16);
                                 socketId = undefined;
                                 port = undefined;
                                 secure = undefined;
@@ -313,7 +315,7 @@ class Watch extends core_1.Client {
                     }
                     const interval = getInterval(item) || watchInterval || this.interval;
                     const watching = (uri, esm) => {
-                        const group = new filegroup_1.default(uri, main ? assets : items, startTime, this.willAbort("(watch)" /* ABORT_NAME.WATCH */));
+                        const group = new filegroup_1.default(uri, main ? assets : items, startTime, this.willAbort("(watch)"));
                         group.add(expires, socketId, id);
                         if (main) {
                             group.main = main;
@@ -386,7 +388,7 @@ class Watch extends core_1.Client {
                                                 wss.close();
                                             }
                                             message = 'Destination already watched @ ' + (current.secure ? 'wss' : 'ws') + '://hostname:' + current.port;
-                                            return 3 /* ERR.SERVER */;
+                                            return 3;
                                         }
                                     }
                                     const socket = socketId && current.find(socketId);
@@ -396,18 +398,18 @@ class Watch extends core_1.Client {
                                     else {
                                         current.add(expires, socketId, id);
                                     }
-                                    return 0 /* ERR.NONE */;
+                                    return 0;
                                 }
                             }
                             data.set(dest, target);
-                            return 0 /* ERR.NONE */;
+                            return 0;
                         };
                         if (core_1.Client.isFile(uri, 'http/s')) {
                             group.url = item.url;
                             group.etag = item.etag;
                             group.lastModified = item.lastModified;
                             if (!group.etag && !group.lastModified) {
-                                return 1 /* ERR.ETAG */;
+                                return 1;
                             }
                             if ((status = checkPreceding(HTTP_MAP)) !== undefined) {
                                 return status;
@@ -429,7 +431,7 @@ class Watch extends core_1.Client {
                                             return;
                                         }
                                         const statusCode = res.statusCode;
-                                        const valid = statusCode >= 200 /* HTTP_STATUS.OK */ && statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */;
+                                        const valid = statusCode >= 200 && statusCode < 300;
                                         const map = HTTP_MAP[uri];
                                         const etag = res.headers.etag;
                                         const lastModified = res.headers['last-modified'];
@@ -481,15 +483,15 @@ class Watch extends core_1.Client {
                                         resolve();
                                     })
                                         .on('error', err => {
-                                        if (!timeout.aborted && !(isConnectionTimeout(err) && ++timeout.retries <= 10 /* HTTP.TIMEOUT_LIMIT */)) {
+                                        if (!timeout.aborted && !(isConnectionTimeout(err) && ++timeout.retries <= 10)) {
                                             reject(err);
                                             return;
                                         }
                                         resolve();
                                     })
                                         .on('timeout', () => {
-                                        if (!timeout.aborted && ++timeout.retries > 10 /* HTTP.TIMEOUT_LIMIT */) {
-                                            reject((0, types_1.errorMessage)(408 /* HTTP_STATUS.REQUEST_TIMEOUT */, 'HTTP request timeout'));
+                                        if (!timeout.aborted && ++timeout.retries > 10) {
+                                            reject((0, types_1.errorMessage)(408, 'HTTP request timeout'));
                                             return;
                                         }
                                         resolve();
@@ -559,7 +561,7 @@ class Watch extends core_1.Client {
                                                 break;
                                             }
                                             catch (err) {
-                                                this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(uri)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: false });
+                                                this.writeFail(["Unable to read file", path.basename(uri)], err, { type: 32, fatal: false });
                                             }
                                         }
                                     }
@@ -575,9 +577,9 @@ class Watch extends core_1.Client {
                             DISK_MAP[uri] = new Map([[dest, target]]);
                         }
                         else {
-                            return 2 /* ERR.LOCAL_ACCESS */;
+                            return 2;
                         }
-                        return 0 /* ERR.NONE */;
+                        return 0;
                     };
                     if ((0, types_1.isArray)(sourceFiles) && sourceFiles.some(file => this.canRead(file, { hostPermissionOnly: !!this.host }))) {
                         let index = 0;
@@ -599,34 +601,34 @@ class Watch extends core_1.Client {
                     if (status > 0) {
                         if (!message) {
                             switch (status) {
-                                case 1 /* ERR.ETAG */:
+                                case 1:
                                     if ((0, types_1.existsFlag)(item.flags)) {
                                         continue;
                                     }
                                     message = 'ETag unavailable';
                                     break;
-                                case 2 /* ERR.LOCAL_ACCESS */:
+                                case 2:
                                     message = 'No read permission';
                                     break;
-                                case 3 /* ERR.SERVER */:
+                                case 3:
                                     message = 'Server already in use';
                                     break;
                                 default:
-                                    message = "Unknown" /* ERR_MESSAGE.UNKNOWN */;
+                                    message = "Unknown";
                                     break;
                             }
                         }
-                        this.formatFail((16 /* LOG_TYPE.WATCH */ | (status === 2 /* ERR.LOCAL_ACCESS */ ? 8192 /* LOG_TYPE.PERMISSION */ : 0)), 'WATCH', ["Unable to watch file" /* ERR_MESSAGE.WATCH_FILE */, watched && path.basename(watched)], (0, types_1.errorValue)(message, watched));
+                        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 /* LOG_TYPE.WATCH */, 'WATCH', ['Start', interval + 'ms ' + (expires ? formatDate(expires) : 'never')], watched, { titleColor: 'blue' });
+                        this.formatMessage(16, 'WATCH', ['Start', interval + 'ms ' + (expires ? formatDate(expires) : 'never')], watched, { titleColor: 'blue' });
                     }
                 }
             }
         }
     }
     async modified(watch) {
-        this.formatMessage(16 /* LOG_TYPE.WATCH */, 'WATCH', 'File modified', watch.uri, { ...core_1.Client.LOG_STYLE_WARN });
+        this.formatMessage(16, 'WATCH', 'File modified', watch.uri, { ...core_1.Client.LOG_STYLE_WARN });
         const { host, assets } = this;
         let items, sanitize = false;
         if (watch.main) {
@@ -656,7 +658,7 @@ class Watch extends core_1.Client {
             }
         }
         if (!sanitize) {
-            items.forEach(item => item.flags |= 2 /* ASSET_FLAG.CLONE */);
+            items.forEach(item => item.flags |= 2);
         }
         watch.captured = false;
         try {
@@ -703,7 +705,7 @@ class Watch extends core_1.Client {
             }
         }
         catch (err) {
-            this.writeFail(["Unknown" /* ERR_MESSAGE.UNKNOWN */, watch.url?.pathname || path.basename(watch.uri)], err);
+            this.writeFail(["Unknown", watch.url?.pathname || path.basename(watch.uri)], err);
         }
     }
     configureServer({ ca, key, cert, passphrase, version, config }) {
@@ -762,7 +764,7 @@ class Watch extends core_1.Client {
         return !!this[kTlsKey] && !!this[kTlsCert];
     }
     willAbort(value) {
-        return this.host ? this.host.willAbort(value) : value === "(watch)" /* ABORT_NAME.WATCH */;
+        return this.host ? this.host.willAbort(value) : value === "(watch)";
     }
     set host(value) {
         super.host = value;
@@ -810,7 +812,7 @@ class Watch extends core_1.Client {
     }
 }
 _a = kInterval, _b = kPort, _c = kSecurePort, _d = kCa, _e = kTlsKey, _f = kTlsCert, _g = kTlsPassphrase, _h = kTlsVersion, _j = kTlsConfig;
-Watch.PROCESS_TIMEOUT = 5 * 1000 /* TIME.S */;
+Watch.PROCESS_TIMEOUT = 5 * 1000;
 exports.default = Watch;
 
 if (exports.default) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/watch",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Watch constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/e-mc.git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
     "directory": "src/watch"
   },
   "keywords": [
@@ -17,13 +17,13 @@
     "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.5.3",
-    "@e-mc/request": "0.5.3",
-    "@e-mc/types": "0.5.3",
+    "@e-mc/core": "0.5.5",
+    "@e-mc/request": "0.5.5",
+    "@e-mc/types": "0.5.5",
     "picomatch": "^2.3.1",
-    "ws": "^8.13.0"
+    "ws": "^8.16.0"
   }
 }