@e-mc/watch 0.7.1 → 0.8.0

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

@@ -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.1",
+  "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.1",
-    "@e-mc/request": "0.7.1",
-    "@e-mc/types": "0.7.1",
+    "@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"
   }
 }