@e-mc/watch 0.6.2 → 0.6.4

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Ninja Scroll
+Copyright 2024 An Pham
 
 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:
 

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/watch
 
-PEP 402 - Forever Kagerō
+PEP 402 - Forever Any Mayo
 
 ## LICENSE
 

package/filegroup/index.js

@@ -95,11 +95,12 @@ class FileGroup extends core_1.AbortComponent {
         return this.sockets.find(item => item.socketId === socketId);
     }
     send(event, data) {
+        var _g;
         const server = this.server;
         let result = false;
         if (server && (data.socketId = this.socketId)) {
             data.event = event;
-            data.always ?? (data.always = this.always);
+            (_g = data.always) !== null && _g !== void 0 ? _g : (data.always = this.always);
             const value = data.value;
             if (value && (util.types.isAnyArrayBuffer(value) || util.types.isArrayBufferView(value))) {
                 try {

package/index.js

@@ -88,7 +88,7 @@ class Watch extends core_1.Client {
                         ca: ca && request_1.default.readCACert(ca, true) || undefined,
                         key: passphrase ? [{ pem: key, passphrase }] : key,
                         cert,
-                        minVersion: version || config?.minVersion
+                        minVersion: version || (config === null || config === void 0 ? void 0 : config.minVersion)
                     });
                     server.listen(port);
                     wss = new ws.Server({ server });
@@ -191,14 +191,15 @@ class Watch extends core_1.Client {
         }
     }
     start(assets, permission) {
-        var _k;
+        var _k, _l, _m;
+        var _o;
         if (this.aborted) {
             return;
         }
         if (permission) {
             this.permission = permission;
         }
-        const username = this.host?.username;
+        const username = (_k = this.host) === null || _k === void 0 ? void 0 : _k.username;
         const destMap = Object.create(null);
         for (const item of assets) {
             if ((0, types_1.ignoreFlag)(item.flags)) {
@@ -206,7 +207,7 @@ class Watch extends core_1.Client {
             }
             const { bundleId, uri, localUri } = item;
             if (!(0, types_1.isEmpty)(bundleId)) {
-                (destMap[_k = ':' + bundleId] || (destMap[_k] = [])).push(item);
+                (destMap[_o = ':' + bundleId] || (destMap[_o] = [])).push(item);
             }
             else if (uri && localUri) {
                 (destMap[localUri] || (destMap[localUri] = [])).push(item);
@@ -231,7 +232,7 @@ class Watch extends core_1.Client {
             for (let i = 0, length = items.length; i < length; ++i) {
                 const watch = items[i].watch;
                 if ((0, types_1.isObject)(watch)) {
-                    watch.assets?.forEach(other => {
+                    (_l = watch.assets) === null || _l === void 0 ? void 0 : _l.forEach(other => {
                         if (items.includes(other)) {
                             return;
                         }
@@ -271,7 +272,7 @@ 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])) {
+                if (watch === true && username && (settings = (_m = this.settings.users) === null || _m === void 0 ? void 0 : _m[username])) {
                     const { uri, localUri, mimeType } = item;
                     watch = false;
                     if (uri && !(watch = settings[uri])) {
@@ -338,6 +339,7 @@ class Watch extends core_1.Client {
                 }
                 const interval = getInterval(item) || watchInterval || this.interval;
                 const watching = (uri, esm) => {
+                    var _k;
                     const group = new filegroup_1.default(uri, main ? assets : items, startTime, this.willAbort("(watch)"));
                     group.add(expires, socketId, id);
                     if (main) {
@@ -367,13 +369,14 @@ 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 checkAborted = (result, current) => (result === null || result === void 0 ? void 0 : result.aborted) && current.abortable && current.abort();
                     const checkPreceding = (map) => {
+                        var _k;
                         const data = map[uri];
                         if (!data) {
                             return;
                         }
-                        const current = data.get(dest)?.value;
+                        const current = (_k = data.get(dest)) === null || _k === void 0 ? void 0 : _k.value;
                         if (current && !current.expired) {
                             let reset;
                             if (id) {
@@ -438,7 +441,7 @@ class Watch extends core_1.Client {
                             return status;
                         }
                         const url = group.url || (group.url = new URL(uri));
-                        const request = this.host?.Request || new request_1.default();
+                        const request = ((_k = this.host) === null || _k === void 0 ? void 0 : _k.Request) || new request_1.default();
                         const agentTimeout = Math.max(timeout.interval * 10, this.connectTimeout);
                         const opts = request.opts(url, { method: 'HEAD', httpVersion: 1, timeout: agentTimeout, agentTimeout });
                         (function recurse() {
@@ -458,7 +461,7 @@ class Watch extends core_1.Client {
                                     const map = HTTP_MAP[uri];
                                     const etag = res.headers.etag;
                                     const lastModified = res.headers['last-modified'];
-                                    if (valid && map?.size && (etag || lastModified)) {
+                                    if (valid && (map === null || map === void 0 ? void 0 : map.size) && (etag || lastModified)) {
                                         for (const [destUrl, input] of map) {
                                             const value = input.value;
                                             if (value.paused) {
@@ -654,6 +657,7 @@ class Watch extends core_1.Client {
         }
     }
     async modified(watch) {
+        var _k, _l, _m, _o;
         this.formatMessage(16, 'WATCH', 'File modified', watch.uri, { ...core_1.Client.LOG_STYLE_WARN });
         const { host, assets } = this;
         let items, sanitize = false;
@@ -688,7 +692,7 @@ class Watch extends core_1.Client {
         }
         watch.captured = false;
         try {
-            const manager = this.whenModified?.(items, sanitize);
+            const manager = (_k = this.whenModified) === null || _k === void 0 ? void 0 : _k.call(this, items, sanitize);
             for (const callback of this.extensions) {
                 try {
                     const listener = callback(watch, items);
@@ -710,7 +714,7 @@ class Watch extends core_1.Client {
             if (host && watch.document) {
                 for (const { instance } of host.Document) {
                     if (host.hasDocument(instance, watch.document)) {
-                        const result = instance.watchInit?.(watch, items, sanitize);
+                        const result = (_l = instance.watchInit) === null || _l === void 0 ? void 0 : _l.call(instance, watch, items, sanitize);
                         if (result) {
                             if ((0, types_1.isArray)(result.using)) {
                                 manager.using(...result.using);
@@ -722,7 +726,7 @@ class Watch extends core_1.Client {
                                 }
                             }
                         }
-                        const listener = instance.watchModified?.(watch, items);
+                        const listener = (_m = instance.watchModified) === null || _m === void 0 ? void 0 : _m.call(instance, watch, items);
                         if (typeof listener === 'function') {
                             manager.on('end', listener);
                         }
@@ -732,7 +736,7 @@ class Watch extends core_1.Client {
             return await manager.start();
         }
         catch (err) {
-            this.writeFail(["Unknown", watch.url?.pathname || path.basename(watch.uri)], err);
+            this.writeFail(["Unknown", ((_o = watch.url) === null || _o === void 0 ? void 0 : _o.pathname) || path.basename(watch.uri)], err);
         }
     }
     configureServer({ ca, key, cert, passphrase, version, config }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/watch",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Watch constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,10 +20,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.6.2",
-    "@e-mc/request": "0.6.2",
-    "@e-mc/types": "0.6.2",
+    "@e-mc/core": "0.6.4",
+    "@e-mc/request": "0.6.4",
+    "@e-mc/types": "0.6.4",
     "picomatch": "^2.3.1",
-    "ws": "^8.16.0"
+    "ws": "^8.17.0"
   }
 }