@e-mc/watch 0.3.0 → 0.3.2

package/index.js

@@ -5,6 +5,7 @@ const path = require("path");
 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");
@@ -19,6 +20,7 @@ const kTlsCert = Symbol('tlsCert');
 const kTlsVersion = Symbol('tlsVersion');
 const kTlsPassphrase = Symbol('tlsPassphrase');
 const kTlsConfig = Symbol('tlsConfig');
+const PLATFORM_WIN32 = process.platform === 'win32';
 let STATE_MAP = new WeakSet();
 let HTTP_MAP = {};
 let DISK_MAP = {};
@@ -187,8 +189,9 @@ class Watch extends core_1.Client {
         if (permission) {
             this.permission = permission;
         }
-        const destMap = Object.create(null);
         const startTime = Date.now();
+        const username = this.host?.username;
+        const destMap = Object.create(null);
         for (const item of assets) {
             if ((0, types_1.ignoreFlag)(item.flags)) {
                 continue;
@@ -240,9 +243,8 @@ class Watch extends core_1.Client {
                 }
             }
             for (const item of items) {
-                const { watch, sourceFiles } = item;
+                let { watch, sourceFiles } = item;
                 if (watch) {
-                    const interval = getInterval(item) || watchInterval || this.interval;
                     const fatalError = (map, target, err) => {
                         const uri = target.value.uri;
                         delete map[uri];
@@ -258,7 +260,32 @@ class Watch extends core_1.Client {
                         }
                         return false;
                     };
-                    let expires = 0, status = 0, wss, main, id, socketId, port, secure, hot, always, watched, message;
+                    let expires = 0, status = 0, wss, main, id, socketId, port, secure, hot, always, watched, message, settings;
+                    if (watch === true && username && (settings = this.settings.users?.[username])) {
+                        const { uri, localUri, mimeType } = item;
+                        watch = false;
+                        if (uri && !(watch = settings[uri])) {
+                            for (const pattern in settings) {
+                                if ((0, types_1.hasGlob)(pattern) && pm.isMatch(uri, pattern, { matchBase: true }) && (watch = settings[pattern])) {
+                                    break;
+                                }
+                            }
+                        }
+                        if (!watch && localUri && !(watch = settings[localUri])) {
+                            for (const pattern in settings) {
+                                if ((0, types_1.hasGlob)(pattern) && pm.isMatch(localUri, pattern, { nocase: PLATFORM_WIN32 }) && (watch = settings[pattern])) {
+                                    break;
+                                }
+                            }
+                        }
+                        if (!watch && mimeType && !(watch = settings[mimeType])) {
+                            for (const pattern in settings) {
+                                if (/^[^*/]+\/\*+$/.test(pattern) && pm.isMatch(mimeType, pattern) && (watch = settings[pattern])) {
+                                    break;
+                                }
+                            }
+                        }
+                    }
                     if ((0, types_1.isPlainObject)(watch)) {
                         const reload = watch.reload;
                         id = watch.id;
@@ -290,7 +317,9 @@ class Watch extends core_1.Client {
                                 always = undefined;
                             }
                         }
+                        item.watch = watch;
                     }
+                    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 */));
                         group.add(expires, socketId, id);
@@ -595,7 +624,7 @@ class Watch extends core_1.Client {
                                     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 */, path.basename(watched)], (0, types_1.errorValue)(message, watched));
+                        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));
                     }
                     else {
                         this.formatMessage(16 /* LOG_TYPE.WATCH */, 'WATCH', ['Start', interval + 'ms ' + (expires ? formatDate(expires) : 'never')], watched, { titleColor: 'blue' });

package/package.json

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