@e-mc/watch 0.13.9 → 0.14.0

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/watch
 
-* NodeJS 18.20 LTS
+* NodeJS 20 (Minimum 18)
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.9/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.14.0/lib/index.d.ts)
 
 ```typescript
 import type { IFileManager, ModuleConstructor } from "./index";
@@ -110,11 +110,11 @@ instance.start(assets, { disk_read: ["/path/workspace/output/**"] });
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/watch.d.ts
 
 * https://www.npmjs.com/package/@types/ws
 

package/filegroup/index.js

@@ -1,9 +1,10 @@
 "use strict";
-const util = require("node:util");
-const pm = require("picomatch");
-const ws = require("ws");
-const types_1 = require("@e-mc/types");
-const core_1 = require("@e-mc/core");
+
+const util = require('node:util');
+const pm = require('picomatch');
+const { WebSocket } = require('ws');
+const { cloneObject, isArray, isObject, supported } = require('@e-mc/types');
+const { AbortComponent, Permission } = require('@e-mc/core');
 class SocketRequest {
     expires;
     socketId;
@@ -18,11 +19,11 @@ class SocketRequest {
         return expires > 0 && expires !== Infinity && Date.now() > expires;
     }
 }
-class FileGroup extends core_1.AbortComponent {
+class FileGroup extends AbortComponent {
     static CONNECTION_TIMEOUT = 10 * 60000;
     static CLIENT_SESSION = new Map();
     static checkTimeout(client) {
-        if (client.readyState !== ws.OPEN) {
+        if (client.readyState !== WebSocket.OPEN) {
             return false;
         }
         const session = this.CLIENT_SESSION;
@@ -38,7 +39,7 @@ class FileGroup extends core_1.AbortComponent {
     }
     static cloneAsset(file) {
         const watch = file.watch;
-        return (0, types_1.cloneObject)(file, (0, types_1.isPlainObject)(watch) && (0, types_1.isArray)(watch.assets) ? new WeakSet([watch.assets]) : true);
+        return cloneObject(file, isObject(watch) && isArray(watch.assets) ? new WeakMap([[watch.assets, watch.assets]]) : true);
     }
     captured = false;
     port = NaN;
@@ -73,8 +74,8 @@ class FileGroup extends core_1.AbortComponent {
         }
         this._abortable = abortable === true;
         this.#startTime = startTime || Date.now();
-        if (recursive && (0, types_1.supported)(19, 1)) {
-            this.#recursive = (Array.isArray(recursive) ? recursive : typeof recursive === 'string' ? [recursive] : []).map(value => core_1.Permission.toPosix(value));
+        if (recursive && supported(19, 1)) {
+            this.#recursive = (Array.isArray(recursive) ? recursive : typeof recursive === 'string' ? [recursive] : []).map(value => Permission.toPosix(value));
         }
     }
     connection(server, port = 0, secure = false) {
@@ -140,7 +141,7 @@ class FileGroup extends core_1.AbortComponent {
         if (!this.recursive) {
             return false;
         }
-        return this.#recursive?.length ? pm.isMatch(core_1.Permission.toPosix(value), this.#recursive, { nocase: process.platform === 'win32' }) : true;
+        return this.#recursive?.length ? pm.isMatch(Permission.toPosix(value), this.#recursive, { nocase: process.platform === 'win32' }) : true;
     }
     get server() {
         return this.#server;
@@ -222,4 +223,5 @@ class FileGroup extends core_1.AbortComponent {
         }
     }
 }
+
 module.exports = FileGroup;

package/index.js

@@ -1,14 +1,15 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const https = require("node:https");
-const ws = require("ws");
-const pm = require("picomatch");
-const types_1 = require("@e-mc/types");
-const core_1 = require("@e-mc/core");
-const util_1 = require("@e-mc/request/util");
-const request_1 = require("@e-mc/request");
-const filegroup_1 = require("@e-mc/watch/filegroup");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const https = require('node:https');
+const pm = require('picomatch');
+const { WebSocketServer } = require('ws');
+const { THRESHOLD, WATCH_EVENT, cloneObject, createAbortError, errorMessage, errorValue, existsFlag, hasGlob, ignoreFlag, isArray, isEmpty, isObject, isPlainObject, isString, parseExpires, parseTime, watchFlag } = require('@e-mc/types');
+const { Client } = require('@e-mc/core');
+const { asInt, checkRetryable } = require('@e-mc/request/util');
+const Request = require('@e-mc/request');
+const FileGroup = require('@e-mc/watch/filegroup');
 const kWatch = Symbol.for('watch:constructor');
 const HTTP_MAP = new Map();
 const DISK_MAP = new Map();
@@ -25,9 +26,9 @@ function abortTimeout(group) {
 }
 function getInterval({ watch }) {
     let interval;
-    if ((0, types_1.isObject)(watch) && (interval = watch.interval)) {
+    if (isObject(watch) && (interval = watch.interval)) {
         if (typeof interval === 'string') {
-            interval = (0, types_1.parseTime)(interval);
+            interval = parseTime(interval);
         }
         if (interval > 0) {
             return interval;
@@ -62,7 +63,7 @@ function wasAborted(result, current) {
 function getErrorMessage(item, status) {
     switch (status) {
         case 1:
-            if ((0, types_1.existsFlag)(item)) {
+            if (existsFlag(item)) {
                 return;
             }
             return "ETag not supported";
@@ -76,7 +77,7 @@ function getErrorMessage(item, status) {
 }
 const isMap = (value) => value ? value.size > 0 : false;
 const formatDate = (value) => new Date(value).toLocaleString().replace(/\/20\d+, /, '@').replace(/:\d+ (AM|PM)$/, (...match) => match[1]);
-class Watch extends core_1.Client {
+class Watch extends Client {
     static [kWatch] = true;
     static PROCESS_TIMEOUT = 5 * 1000;
     static createServer(port, secure, active) {
@@ -86,37 +87,37 @@ class Watch extends core_1.Client {
         }
         let wss;
         try {
-            if ((0, types_1.isPlainObject)(secure)) {
+            if (isPlainObject(secure)) {
                 if (wss = SECURE_MAP.get(port.toString())) {
                     return wss;
                 }
                 const { ca, passphrase, ciphers, version, config } = secure;
                 let { key, cert } = secure;
-                if (key && cert && (key = request_1.readTLSKey(key, true)) && (cert = request_1.readTLSKey(cert, true))) {
+                if (key && cert && (key = Request.readTLSKey(key, true)) && (cert = Request.readTLSKey(cert, true))) {
                     const server = https.createServer({
                         ...config,
-                        ca: ca && request_1.readCACert(ca, true) || undefined,
+                        ca: ca && Request.readCACert(ca, true) || undefined,
                         key: passphrase ? [{ pem: key, passphrase }] : key,
                         cert,
                         ciphers,
                         minVersion: version || config?.minVersion
                     });
                     server.listen(port);
-                    wss = new ws.Server({ server });
+                    wss = new WebSocketServer({ server });
                     SECURE_MAP.set(port.toString(), 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"));
+                    this.writeFail("TLS/SSL key and cert not found", errorMessage('ws', "Missing TLS/SSL credentials"));
                 }
             }
             else if (wss = PORT_MAP.get(port.toString())) {
                 return wss;
             }
             else {
-                wss = new ws.Server({ port });
+                wss = new WebSocketServer({ port });
                 PORT_MAP.set(port.toString(), wss);
                 if (active) {
                     STATE_MAP.add(wss);
@@ -131,19 +132,19 @@ class Watch extends core_1.Client {
         }
         wss.on('connection', function (socket) {
             socket.on('message', function () {
-                filegroup_1.CLIENT_SESSION.delete(this);
+                FileGroup.CLIENT_SESSION.delete(this);
             });
             socket.on('close', function () {
-                filegroup_1.CLIENT_SESSION.delete(this);
+                FileGroup.CLIENT_SESSION.delete(this);
             });
             for (const client of this.clients) {
-                filegroup_1.checkTimeout(client);
+                FileGroup.checkTimeout(client);
             }
         });
         wss.on('error', function (err) {
-            const data = JSON.stringify({ event: types_1.WATCH_EVENT.ERROR, errors: [err.message] });
+            const data = JSON.stringify({ event: WATCH_EVENT.ERROR, errors: [err.message] });
             for (const client of this.clients) {
-                if (filegroup_1.checkTimeout(client)) {
+                if (FileGroup.checkTimeout(client)) {
                     client.send(data);
                 }
             }
@@ -160,19 +161,19 @@ class Watch extends core_1.Client {
         closeFileGroup(DISK_MAP);
         closeServer(PORT_MAP);
         closeServer(SECURE_MAP);
-        filegroup_1.CLIENT_SESSION.clear();
+        FileGroup.CLIENT_SESSION.clear();
         STATE_MAP = new WeakSet();
     }
     static checkTimeout(client) {
-        return filegroup_1.checkTimeout(client);
+        return FileGroup.checkTimeout(client);
     }
     static setTimeout(value) {
-        if ((value = (0, types_1.parseTime)(value)) > 0) {
-            filegroup_1.CONNECTION_TIMEOUT = Math.min(value, core_1.Client.MAX_TIMEOUT);
+        if ((value = parseTime(value)) > 0) {
+            FileGroup.CONNECTION_TIMEOUT = Math.min(value, Client.MAX_TIMEOUT);
         }
     }
     static isConnectionError(err) {
-        return (0, util_1.checkRetryable)(err);
+        return checkRetryable(err);
     }
     connectTimeout = Watch.PROCESS_TIMEOUT;
     _moduleName = 'watch';
@@ -180,7 +181,7 @@ class Watch extends core_1.Client {
     _extensions = [];
     _recursiveMap = Object.create(null);
     _hostEvents = [];
-    #internal = types_1.THRESHOLD.WATCH_INTERVAL;
+    #internal = THRESHOLD.WATCH_INTERVAL;
     #port = 80;
     #securePort = 443;
     #ca = '';
@@ -195,13 +196,13 @@ class Watch extends core_1.Client {
     init(config) {
         const { interval, port, secure } = this.module;
         if (secure) {
-            this.securePort = (0, util_1.asInt)(secure.port);
+            this.securePort = asInt(secure.port);
             if (secure.cert && secure.key) {
                 this.configureServer(secure);
             }
         }
-        this.interval = (0, util_1.asInt)(interval);
-        this.port = (0, util_1.asInt)(port);
+        this.interval = asInt(interval);
+        this.port = asInt(port);
         return super.init(config);
     }
     start(assets, permission) {
@@ -214,9 +215,9 @@ class Watch extends core_1.Client {
         const settings = this.getUserSettings();
         const destMap = Object.create(null);
         for (const item of assets) {
-            if (!(0, types_1.ignoreFlag)(item)) {
+            if (!ignoreFlag(item)) {
                 const { bundleId, uri, localUri } = item;
-                if (!(0, types_1.isEmpty)(bundleId)) {
+                if (!isEmpty(bundleId)) {
                     (destMap[':' + bundleId] ||= []).push(item);
                 }
                 else if (uri && localUri) {
@@ -242,12 +243,12 @@ class Watch extends core_1.Client {
             const related = [];
             for (let i = 0, length = items.length; i < length; ++i) {
                 const watch = items[i].watch;
-                if ((0, types_1.isObject)(watch)) {
+                if (isObject(watch)) {
                     watch.assets?.forEach(other => {
                         if (!items.includes(other)) {
-                            if ((0, types_1.watchFlag)(other)) {
+                            if (watchFlag(other)) {
                                 if (!other.watch) {
-                                    other = filegroup_1.cloneAsset(other);
+                                    other = FileGroup.cloneAsset(other);
                                     other.watch = { ...watch };
                                 }
                                 other.flags &= ~1;
@@ -272,16 +273,16 @@ class Watch extends core_1.Client {
                     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])) {
+                            if (hasGlob(pattern) && pm.isMatch(uri, pattern, { matchBase: true }) && (watch = settings[pattern])) {
                                 break;
                             }
                         }
                     }
                     if (!watch && localUri && !(watch = settings[localUri])) {
-                        const pathname = core_1.Client.PLATFORM_WIN32 ? core_1.Client.toPosix(localUri) : localUri;
-                        const options = core_1.Client.PLATFORM_WIN32 ? { nocase: true, matchBase: true, windows: true, posixSlashes: true } : { matchBase: true };
+                        const pathname = Client.PLATFORM_WIN32 ? Client.toPosix(localUri) : localUri;
+                        const options = Client.PLATFORM_WIN32 ? { matchBase: true, nocase: true, windows: true } : { matchBase: true };
                         for (const pattern in settings) {
-                            if ((0, types_1.hasGlob)(pattern) && pm.isMatch(pathname, pattern, options) && (watch = settings[pattern])) {
+                            if (hasGlob(pattern) && pm.isMatch(pathname, pattern, options) && (watch = settings[pattern])) {
                                 break;
                             }
                         }
@@ -295,20 +296,20 @@ class Watch extends core_1.Client {
                     }
                 }
                 let startTime = Date.now();
-                if ((0, types_1.isPlainObject)(watch)) {
+                if (isPlainObject(watch)) {
                     const reload = watch.reload;
                     id = watch.id;
                     if (watch.main) {
                         main = item;
                     }
                     if (watch.start) {
-                        const offset = (0, types_1.parseTime)(watch.start);
+                        const offset = parseTime(watch.start);
                         if (offset > 0) {
                             startTime += offset;
                         }
                     }
                     if (watch.expires) {
-                        expires = (0, types_1.parseExpires)(watch.expires, startTime);
+                        expires = parseExpires(watch.expires, startTime);
                     }
                     if (watch.recursive) {
                         recursive = true;
@@ -327,7 +328,7 @@ class Watch extends core_1.Client {
                             wss = Watch.createServer(port ||= this.port);
                         }
                         if (!wss) {
-                            this.writeFail("Unable to create WebSocket server", (0, types_1.errorMessage)(secure ? 'wss' : 'ws', "Invalid parameters", 'port: ' + (port || "Unknown")), 16);
+                            this.writeFail("Unable to create WebSocket server", errorMessage(secure ? 'wss' : 'ws', "Invalid parameters", 'port: ' + (port || "Unknown")), 16);
                             socketId = undefined;
                             port = undefined;
                             secure = undefined;
@@ -339,7 +340,7 @@ class Watch extends core_1.Client {
                 }
                 const interval = getInterval(item) || watchInterval || this.interval;
                 const watching = (uri, esm) => {
-                    const group = new filegroup_1(uri, main ? assets : items, startTime, this.willAbort("(watch)"), recursive);
+                    const group = new FileGroup(uri, main ? assets : items, startTime, this.willAbort("(watch)"), recursive);
                     group.add(expires, socketId, id);
                     if (main) {
                         group.main = main;
@@ -426,7 +427,7 @@ class Watch extends core_1.Client {
                         data.set(dest, target);
                         return 0;
                     };
-                    if (core_1.Client.isFile(uri, 'http/s')) {
+                    if (Client.isFile(uri, 'http/s')) {
                         group.url = item.url;
                         group.etag = item.etag;
                         group.lastModified = item.lastModified;
@@ -438,7 +439,7 @@ class Watch extends core_1.Client {
                             return pre;
                         }
                         const url = group.url ||= new URL(uri);
-                        const request = this.host?.Request || new request_1();
+                        const request = this.host?.Request || new Request();
                         const agentTimeout = Math.max(timeout.interval * 10, this.connectTimeout);
                         const opts = request.opts(url, { method: 'HEAD', httpVersion: 1, timeout: agentTimeout, agentTimeout });
                         (function recurse() {
@@ -450,7 +451,7 @@ class Watch extends core_1.Client {
                                         return;
                                     }
                                     if (this.aborted) {
-                                        reject((0, types_1.createAbortError)());
+                                        reject(createAbortError());
                                         return;
                                     }
                                     const statusCode = res.statusCode;
@@ -498,7 +499,7 @@ class Watch extends core_1.Client {
                                     }
                                     else {
                                         if (isMap(map)) {
-                                            reject(valid ? (0, types_1.errorValue)("ETag not supported", uri) : (0, types_1.errorMessage)(statusCode, "Invalid HTTP request", uri));
+                                            reject(valid ? errorValue("ETag not supported", uri) : errorMessage(statusCode, "Invalid HTTP request", uri));
                                             return;
                                         }
                                         this.watchExpired(HTTP_MAP, group);
@@ -517,7 +518,7 @@ class Watch extends core_1.Client {
                                 })
                                     .on('timeout', () => {
                                     if (!timeout.aborted && ++timeout.retries > 10) {
-                                        reject((0, types_1.errorMessage)(408, "HTTP request timeout"));
+                                        reject(errorMessage(408, "HTTP request timeout"));
                                     }
                                     else {
                                         resolve();
@@ -546,7 +547,7 @@ class Watch extends core_1.Client {
                         }).call(this);
                         HTTP_MAP.set(uri, new Map([[dest, target]]));
                     }
-                    else if (esm || path.isAbsolute(uri = core_1.Client.resolveFile(uri)) && this.canRead(uri, { hostPermissionOnly: !!this.host })) {
+                    else if (esm || path.isAbsolute(uri = Client.resolveFile(uri)) && this.canRead(uri, { hostPermissionOnly: !!this.host })) {
                         const pre = checkPreceding(DISK_MAP);
                         const options = {};
                         let src = uri;
@@ -575,7 +576,7 @@ class Watch extends core_1.Client {
                         let ptime = 0;
                         target.watcher = fs.watch(src, options, (event, filename) => {
                             if (this.aborted || group.aborted) {
-                                this.#sendFatalError((0, types_1.createAbortError)(), DISK_MAP, target);
+                                this.#sendFatalError(createAbortError(), DISK_MAP, target);
                                 return;
                             }
                             const map = DISK_MAP.get(uri);
@@ -585,7 +586,7 @@ class Watch extends core_1.Client {
                                         try {
                                             const mtime = Math.floor(fs.statSync(uri).mtimeMs);
                                             if (mtime > ptime) {
-                                                ptime = mtime + types_1.THRESHOLD.WATCH_CHANGE;
+                                                ptime = mtime + THRESHOLD.WATCH_CHANGE;
                                                 if (filename && options.recursive && !group.matchRecursive(path.join(src, filename.toString()))) {
                                                     this.formatMessage(16, 'WATCH', ['File modification ignored', 'recursive'], path.join(src, filename.toString()), { titleColor: 'yellow' });
                                                     return;
@@ -634,7 +635,7 @@ class Watch extends core_1.Client {
                     }
                     return 0;
                 };
-                if ((0, types_1.isArray)(sourceFiles) && (sourceFiles = sourceFiles.filter(file => this.canRead(file, { hostPermissionOnly: !!this.host }))).length > 0) {
+                if (isArray(sourceFiles) && (sourceFiles = sourceFiles.filter(file => this.canRead(file, { hostPermissionOnly: !!this.host }))).length > 0) {
                     let index = 0;
                     for (const file of Array.from(new Set(sourceFiles)).sort((a, b) => a.length - b.length)) {
                         if (index++ > 0) {
@@ -656,7 +657,7 @@ class Watch extends core_1.Client {
                 }
                 if (status > 0) {
                     if (message ||= getErrorMessage(item, status)) {
-                        this.formatFail((16 | (status === 2 ? 8192 : 0)), 'WATCH', ["Unable to watch file", watched && path.basename(watched)], (0, types_1.errorValue)(message, watched), { fatal: false });
+                        this.formatFail((16 | (status === 2 ? 8192 : 0)), 'WATCH', ["Unable to watch file", watched && path.basename(watched)], errorValue(message, watched), { fatal: false });
                     }
                 }
                 else {
@@ -670,19 +671,19 @@ class Watch extends core_1.Client {
         let message = "File modified", uri = watch.uri;
         if (recursive.length > 0) {
             const time = this.#recursiveTime.get(watch) || 0;
-            if (time + types_1.THRESHOLD.WATCH_RECURSIVE_CHANGE >= Date.now()) {
+            if (time + THRESHOLD.WATCH_RECURSIVE_CHANGE >= Date.now()) {
                 return;
             }
             message = "Directory was modified";
             uri = path.dirname(watch.uri);
             this.#recursiveTime.set(watch, Date.now());
         }
-        this.formatMessage(16, 'WATCH', message, uri, { ...core_1.Client.LOG_STYLE_WARN });
+        this.formatMessage(16, 'WATCH', message, uri, { ...Client.LOG_STYLE_WARN });
         const { host, assets } = this;
         let items, sanitize = false;
         if (watch.main) {
             sanitize = watch.assets.length > assets.length;
-            items = sanitize ? watch.assets.map(item => filegroup_1.cloneAsset(item)) : assets.map(item => (0, types_1.cloneObject)(item, true));
+            items = sanitize ? watch.assets.map(item => FileGroup.cloneAsset(item)) : assets.map(item => cloneObject(item, true));
         }
         else {
             items = [];
@@ -693,16 +694,16 @@ class Watch extends core_1.Client {
                         sanitize = true;
                         break;
                     }
-                    items.push((0, types_1.cloneObject)(item, true));
+                    items.push(cloneObject(item, true));
                 }
             }
             else {
                 sanitize = true;
             }
             if (sanitize) {
-                items = watch.assets.map(item => filegroup_1.cloneAsset(item));
+                items = watch.assets.map(item => FileGroup.cloneAsset(item));
             }
-            if ((0, types_1.isArray)(watch.related)) {
+            if (isArray(watch.related)) {
                 items.push(...watch.related);
             }
         }
@@ -737,7 +738,7 @@ class Watch extends core_1.Client {
                     if (host.hasDocument(instance, watch.document)) {
                         const result = instance.watchInit?.(watch, items, sanitize);
                         if (result) {
-                            if ((0, types_1.isArray)(result.using)) {
+                            if (isArray(result.using)) {
                                 manager.using(...result.using);
                             }
                             if (Array.isArray(result.dataSource)) {
@@ -761,25 +762,25 @@ class Watch extends core_1.Client {
         }
     }
     configureServer({ ca, key, cert, passphrase, version, ciphers, config }) {
-        if (!(0, types_1.isString)(key) || !(0, types_1.isString)(cert)) {
+        if (!isString(key) || !isString(cert)) {
             return false;
         }
         if (ca) {
             this.setCA(ca);
         }
-        if (request_1.isCert(key) || core_1.Client.isPath(key = path.resolve(key)) && this.canRead(key, { ownPermissionOnly: true })) {
+        if (Request.isCert(key) || Client.isPath(key = path.resolve(key)) && this.canRead(key, { ownPermissionOnly: true })) {
             this.#tlsKey = key;
         }
-        if (request_1.isCert(cert) || core_1.Client.isPath(cert = path.resolve(cert)) && this.canRead(cert, { ownPermissionOnly: true })) {
+        if (Request.isCert(cert) || Client.isPath(cert = path.resolve(cert)) && this.canRead(cert, { ownPermissionOnly: true })) {
             this.#tlsCert = cert;
         }
-        if ((0, types_1.isString)(passphrase)) {
+        if (isString(passphrase)) {
             this.#tlsPassphrase = passphrase;
         }
-        if ((0, types_1.isString)(ciphers)) {
+        if (isString(ciphers)) {
             this.#ciphers = ciphers;
         }
-        if (!(0, types_1.isPlainObject)(config)) {
+        if (!isPlainObject(config)) {
             config = undefined;
         }
         else if (version ||= config.minVersion) {
@@ -801,7 +802,7 @@ class Watch extends core_1.Client {
         return this.hasSecureProtocol();
     }
     setCA(value) {
-        if ((0, types_1.isString)(value) && core_1.Client.isPath(value = path.resolve(value)) && this.canRead(value, { ownPermissionOnly: true })) {
+        if (isString(value) && Client.isPath(value = path.resolve(value)) && this.canRead(value, { ownPermissionOnly: true })) {
             this.#ca = value;
             return true;
         }
@@ -810,10 +811,10 @@ class Watch extends core_1.Client {
     setSSLKey(value) {
         this.#tlsConfig = { secureProtocol: 'SSLv23_method' };
         this.#tlsVersion = undefined;
-        return !!(this.#tlsKey = request_1.readTLSKey(value, true));
+        return !!(this.#tlsKey = Request.readTLSKey(value, true));
     }
     setSSLCert(value) {
-        return !!(this.#tlsCert = request_1.readTLSCert(value, true));
+        return !!(this.#tlsCert = Request.readTLSCert(value, true));
     }
     hasSecureProtocol() {
         return !!this.#tlsKey && !!this.#tlsCert;
@@ -850,7 +851,7 @@ class Watch extends core_1.Client {
     }
     set host(value) {
         super.host = value;
-        if ((0, types_1.isArray)(value?.assets)) {
+        if (isArray(value?.assets)) {
             this.assets = value.assets;
         }
     }
@@ -861,7 +862,7 @@ class Watch extends core_1.Client {
         const length = value.length;
         const items = new Array(length);
         for (let i = 0; i < length; ++i) {
-            items[i] = Object.freeze((0, types_1.cloneObject)(value[i], true));
+            items[i] = Object.freeze(cloneObject(value[i], true));
         }
         this._assets = items;
     }
@@ -893,4 +894,5 @@ class Watch extends core_1.Client {
         return this.#securePort;
     }
 }
+
 module.exports = Watch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/watch",
-  "version": "0.13.9",
+  "version": "0.14.0",
   "description": "Watch constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,10 +19,10 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.13.9",
-    "@e-mc/request": "0.13.9",
-    "@e-mc/types": "0.13.9",
-    "picomatch": "^4.0.3",
-    "ws": "^8.18.3"
+    "@e-mc/core": "0.14.0",
+    "@e-mc/request": "0.14.0",
+    "@e-mc/types": "0.14.0",
+    "picomatch": "^4.0.4",
+    "ws": "^8.20.0"
   }
 }