@e-mc/watch 0.7.0 → 0.8.0

package/index.js

@@ -197,7 +197,7 @@ class Watch extends core_1.Client {
         if (permission) {
             this.permission = permission;
         }
-        const username = this.host?.username;
+        const settings = this.getUserSettings();
         const destMap = Object.create(null);
         for (const item of assets) {
             if ((0, types_1.ignoreFlag)(item.flags)) {
@@ -217,7 +217,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;
@@ -269,8 +269,8 @@ class Watch extends core_1.Client {
                     }
                     return false;
                 };
-                let expires = 0, status = 0, wss = null, main, id, socketId, port, secure, hot, always, watched, message, settings;
-                if (watch === true && username && (settings = this.settings.users?.[username])) {
+                let expires = 0, status = 0, wss = null, main, id, socketId, port, secure, hot, always, watched, message;
+                if (watch === true && settings) {
                     const { uri, localUri, mimeType } = item;
                     watch = false;
                     if (uri && !(watch = settings[uri])) {
@@ -366,7 +366,7 @@ 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 checkAborted = (result, current) => result?.aborted && current.abortable && current.abort();
+                    const wasAborted = (result, current) => result?.aborted && current.abortable && current.abort();
                     const checkPreceding = (map) => {
                         const data = map.get(uri);
                         if (!data) {
@@ -473,7 +473,7 @@ class Watch extends core_1.Client {
                                                         if (etag !== value.etag) {
                                                             value.etag = etag;
                                                             if (value.started) {
-                                                                this.modified(value).then(result => checkAborted(result, value));
+                                                                this.modified(value).then(result => wasAborted(result, value));
                                                             }
                                                         }
                                                     }
@@ -482,7 +482,7 @@ class Watch extends core_1.Client {
                                                     if (lastModified !== value.lastModified) {
                                                         value.lastModified = lastModified;
                                                         if (value.started) {
-                                                            this.modified(value).then(result => checkAborted(result, value));
+                                                            this.modified(value).then(result => wasAborted(result, value));
                                                         }
                                                     }
                                                 }
@@ -577,7 +577,7 @@ class Watch extends core_1.Client {
                                                         }
                                                     }
                                                     else if (value.started) {
-                                                        this.modified(value).then(result => checkAborted(result, value));
+                                                        this.modified(value).then(result => wasAborted(result, value));
                                                     }
                                                 }
                                                 ptime = mtime + types_1.THRESHOLD.WATCH_CHANGE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/watch",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "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.7.0",
-    "@e-mc/request": "0.7.0",
-    "@e-mc/types": "0.7.0",
+    "@e-mc/core": "0.8.0",
+    "@e-mc/request": "0.8.0",
+    "@e-mc/types": "0.8.0",
     "picomatch": "^3.0.1",
-    "ws": "^8.14.2"
+    "ws": "^8.15.1"
   }
 }