xypriss 9.7.6 → 9.7.7

package/dist/cjs/src/server/components/fastapi/console/ConsoleInterceptor.js

@@ -2,23 +2,47 @@
 
 var types = require('./types.js');
 var XHSCDirectIPC = require('../../../../xhsc/ipc/XHSCDirectIPC.js');
+require('../../../../index.js');
+var mergeWithDefaults = require('../../../../utils/mergeWithDefaults.js');
+var async_hooks = require('async_hooks');
+var ConfigurationManager = require('../../../../ConfigurationManager.js');
 
 /***************************************************************************
  * ConsoleInterceptor.ts - Lightweight Console Interception System
  * Delegated to XHSC (Go) for heavy lifting
  *************************************************************************** */
 /**
- * Lightweight Console Interception System (CSIS)
+ * XyPriss Console Interceptor (XCI)
+ * High-performance log delegation and filtering via XHSC.
  * When useNative is enabled, it delegates all filtering and encryption to XHSC (Go).
  */
 class ConsoleInterceptor {
-    constructor(logger, config) {
+    static getInstance(logger) {
+        if (!ConsoleInterceptor.instance) {
+            ConsoleInterceptor.instance = new ConsoleInterceptor(logger);
+        }
+        return ConsoleInterceptor.instance;
+    }
+    constructor(logger) {
         this.isIntercepting = false;
+        this.originalConsole = {};
+        this.storage = new async_hooks.AsyncLocalStorage();
+        this.hasSyncedConfig = false;
+        this.recentRawMessages = [];
+        /** Counter for head mode: how many lines have been displayed so far */
+        this.displayLineCount = 0;
+        /** Circular buffer for tail mode: holds the last N processed lines */
+        this.displayTailBuffer = [];
         this.logger = logger;
-        this.config = {
-            ...types.DEFAULT_CONSOLE_CONFIG,
-            ...(config?.consoleInterception || {}),
-        };
+        const globalConfig = ConfigurationManager.CM.get("logging")?.consoleInterception;
+        // Use Configs.merge to combine defaults with existing config
+        ConfigurationManager.CM.merge({
+            logging: {
+                consoleInterception: mergeWithDefaults.mergeWithDefaults(types.DEFAULT_CONSOLE_CONFIG, globalConfig || {}),
+            },
+        });
+        this.config = ConfigurationManager.CM.get("logging")
+            ?.consoleInterception;
         this.stats = {
             totalInterceptions: 0,
             interceptionsPerSecond: 0,
@@ -30,30 +54,356 @@ class ConsoleInterceptor {
         };
         this.ipcPath = process.env.XYPRISS_IPC_PATH;
     }
+    /**
+     * Decides whether a log line should be displayed given the current displayLimit config.
+     * In `head` mode, only the first N lines are allowed through.
+     * In `tail` mode, lines are always buffered; the buffer is printed on each new log.
+     *
+     * @returns true  when the line should be printed immediately (head/no-limit),
+     *          false when suppressed (head limit reached) or deferred (tail, handled internally).
+     */
+    shouldAllowDisplay(finalMsg, preserve, targetConsole) {
+        const limit = preserve && typeof preserve === "object"
+            ? preserve.displayLimit
+            : undefined;
+        if (!limit || !limit.maxLines) {
+            // No limit configured — always allow
+            return true;
+        }
+        const mode = limit.mode || "tail";
+        const max = limit.maxLines;
+        if (mode === "head") {
+            if (this.displayLineCount >= max) {
+                // Suppress: head limit already reached
+                return false;
+            }
+            this.displayLineCount++;
+            return true;
+        }
+        // tail mode: maintain a circular buffer and reprint
+        if (this.displayTailBuffer.length >= max) {
+            this.displayTailBuffer.shift();
+        }
+        this.displayTailBuffer.push(finalMsg);
+        // Clear terminal lines equal to current buffer length, then reprint
+        if (process.stdout.isTTY) {
+            // Move cursor up by buffer length - 1 (the new entry is not yet printed)
+            const linesToClear = this.displayTailBuffer.length - 1;
+            if (linesToClear > 0) {
+                process.stdout.write(`\x1b[${linesToClear}A\x1b[0J`);
+            }
+            this.displayTailBuffer.forEach((line) => targetConsole?.(line));
+        }
+        else {
+            // Non-TTY (piped output, CI): just print the line normally
+            return true;
+        }
+        // Already printed internally — skip the outer targetConsole call
+        return false;
+    }
     async start() {
         if (!this.config.enabled || this.isIntercepting) {
             return;
         }
-        if (this.ipcPath) {
-            try {
+        try {
+            // Always patch console if enabled
+            this.patchConsole();
+            this.isIntercepting = true;
+            this.stats.isActive = true;
+            // Try to sync config if IPC is already available
+            this.ipcPath = process.env.XYPRISS_IPC_PATH;
+            if (this.ipcPath) {
                 const ipc = new XHSCDirectIPC.XHSCDirectIPC(this.ipcPath);
                 await ipc.sendCommand("console", "update-config", this.config);
                 ipc.close();
-                this.logger.info("console", "Native XHSC console interception activated via IPC");
-                this.isIntercepting = true;
-                this.stats.isActive = true;
+            }
+        }
+        catch (err) {
+            // Silently fail in start - will retry in delegation
+        }
+    }
+    patchConsole() {
+        const methods = this.config.interceptMethods || [
+            "log",
+            "error",
+            "warn",
+            "info",
+            "debug",
+        ];
+        // Save all original console methods first
+        const allMethods = ["log", "error", "warn", "info", "debug", "trace"];
+        allMethods.forEach((m) => {
+            if (typeof console[m] === "function") {
+                // IMPORTANT: Do NOT overwrite if already saved to avoid recursive patching traps
+                if (!this.originalConsole[m] ||
+                    !console[m].__isIntercepted) {
+                    this.originalConsole[m] = console[m];
+                }
+            }
+        });
+        // this.originalConsole.log?.(
+        //     `[ConsoleInterceptor] Patching methods: ${methods.join(", ")}`,
+        // );
+        methods.forEach((method) => {
+            if (typeof console[method] !== "function")
+                return;
+            // Prevent double patching
+            if (console[method].__isIntercepted)
+                return;
+            console[method] = async (...args) => {
+                if (this.storage.getStore() || !this.isIntercepting) {
+                    return (this.originalConsole[method] || console.log).apply(console, args);
+                }
+                await this.storage.run(true, async () => {
+                    try {
+                        const message = args
+                            .map((arg) => typeof arg === "object"
+                            ? JSON.stringify(arg)
+                            : String(arg))
+                            .join(" ");
+                        const level = this.methodToLevel(method);
+                        // Trigger onLog if provided and NOT in filtered mode
+                        // In filtered mode (filteredOnLog: true), onLog fires after XHSC
+                        // processing inside delegateToXHSC with the processed message.
+                        if (typeof this.config.onLog === "function" &&
+                            !this.config.filteredOnLog) {
+                            try {
+                                this.config.onLog({ level, method, message, args }, false);
+                            }
+                            catch (e) {
+                                // silent
+                            }
+                        }
+                        const preserve = this.config.preserveOriginal;
+                        const isObject = preserve && typeof preserve === "object";
+                        const allowDuplication = isObject
+                            ? preserve.allowDuplication
+                            : true;
+                        if (allowDuplication === false) {
+                            // Check if message is in the last 20 logs (sliding window deduplication)
+                            const cacheKey = `${level}:${message}`;
+                            if (this.recentRawMessages.includes(cacheKey)) {
+                                return; // Suppress duplicate log in sliding window
+                            }
+                            this.recentRawMessages.push(cacheKey);
+                            if (this.recentRawMessages.length > 20) {
+                                this.recentRawMessages.shift(); // Keep last 20 logs
+                            }
+                        }
+                        const mode = isObject
+                            ? preserve.mode || "intercepted"
+                            : preserve === true
+                                ? "original"
+                                : preserve === false
+                                    ? "none"
+                                    : "intercepted";
+                        // this.originalConsole.log?.(`[DEBUG] Intercepting: "${message.substring(0, 30)}...", Mode: ${mode}`);
+                        // Delegate to XHSC - AWAIT it to honor filtering
+                        await this.delegateToXHSC(message, level, method, args);
+                        // If mode is original or both, handle separate from delegation (which happens after await or before)
+                        // Actually, to preserve original correctly and allow duplication without delay, we should do it here
+                        if (mode === "original" ||
+                            mode === "both" ||
+                            (mode === "none" && preserve === true)) {
+                            // Fallback handling
+                            if (mode !== "none") {
+                                this.handlePreserveOriginal(method, args, message);
+                            }
+                        }
+                    }
+                    catch (err) {
+                        this.originalConsole.error?.("[ConsoleInterceptor] Error in patch:", err.message);
+                    }
+                });
+            };
+            // Mark as intercepted
+            console[method].__isIntercepted = true;
+        });
+    }
+    async delegateToXHSC(message, level, method, args) {
+        const ipcPath = this.ipcPath || process.env.XYPRISS_IPC_PATH;
+        if (!ipcPath) {
+            return;
+        }
+        // Cache it if found and sync config
+        if (!this.ipcPath || !this.hasSyncedConfig) {
+            this.ipcPath = ipcPath;
+            try {
+                const ipcConfig = { ...this.config };
+                if (ipcConfig.filters) {
+                    const mapPatterns = (patterns) => patterns?.map((p) => p instanceof RegExp ? p.source : p) || [];
+                    ipcConfig.filters = {
+                        ...ipcConfig.filters,
+                        includePatterns: mapPatterns(ipcConfig.filters.includePatterns),
+                        excludePatterns: mapPatterns(ipcConfig.filters.excludePatterns),
+                        userAppPatterns: mapPatterns(ipcConfig.filters.userAppPatterns),
+                        systemPatterns: mapPatterns(ipcConfig.filters.systemPatterns),
+                    };
+                }
+                const ipc = new XHSCDirectIPC.XHSCDirectIPC(ipcPath);
+                await ipc.sendCommand("console", "update-config", ipcConfig);
+                ipc.close();
+                this.hasSyncedConfig = true;
             }
             catch (err) {
-                this.logger.error("console", `Failed to activate native interception: ${err.message}`);
+                // Ignore sync errors for now, will retry next time
+                return;
             }
         }
-        else {
-            this.logger.warn("console", "XYPRISS_IPC_PATH not set — native interception unavailable");
+        try {
+            const ipc = new XHSCDirectIPC.XHSCDirectIPC(ipcPath);
+            const res = await ipc.sendCommand("console", "intercept", {
+                message,
+                level,
+                worker_id: 0,
+            });
+            ipc.close();
+            if (res) {
+                // this.originalConsole.log?.(`[DEBUG] XHSC Response: processed=${!!res.processed}, level=${res.level}`);
+                if (res.processed) {
+                    const preserve = this.config.preserveOriginal;
+                    const isObject = preserve && typeof preserve === "object";
+                    const mode = isObject
+                        ? preserve.mode || "intercepted"
+                        : preserve === true
+                            ? "original"
+                            : preserve === false
+                                ? "none"
+                                : "intercepted";
+                    if (mode === "intercepted" || mode === "both") {
+                        const separateStreams = isObject && preserve.separateStreams;
+                        const onlyUserApp = isObject && preserve.onlyUserApp;
+                        let shouldDisplay = true;
+                        if (onlyUserApp) {
+                            if (!res.processed.includes("[USERAPP]")) {
+                                shouldDisplay = false;
+                            }
+                        }
+                        if (shouldDisplay) {
+                            const targetConsole = separateStreams &&
+                                (level === "error" || level === "warn")
+                                ? this.originalConsole[level] ||
+                                    this.originalConsole.error
+                                : this.originalConsole.log;
+                            let finalMsg = res.processed;
+                            const showPrefix = isObject
+                                ? preserve.showPrefix
+                                : true;
+                            if (showPrefix === false) {
+                                finalMsg = finalMsg.replace(/^.*?\d{2}:\d{2}:\d{2}\.\d{3}.*?\[.*?\]\[W\d+\].*?\s/, "");
+                            }
+                            // Filtered onLog: fires with the processed message after XHSC
+                            if (this.config.filteredOnLog &&
+                                typeof this.config.onLog === "function") {
+                                try {
+                                    this.config.onLog({
+                                        level: res.level || level,
+                                        method,
+                                        message: finalMsg,
+                                        args,
+                                    }, true);
+                                }
+                                catch (e) {
+                                    // silent
+                                }
+                            }
+                            const allowed = this.shouldAllowDisplay(finalMsg, preserve, targetConsole);
+                            if (allowed) {
+                                targetConsole?.(finalMsg);
+                            }
+                        }
+                    }
+                    // Trigger plugin hooks with processed data
+                    this.handleNativeLog({
+                        level: res.level || level,
+                        message: res.processed,
+                        timestamp: new Date(),
+                        component: "userApp",
+                        args: args,
+                    });
+                }
+                else {
+                    // Log was filtered out by XHSC
+                    this.stats.droppedMessages =
+                        (this.stats.droppedMessages || 0) + 1;
+                }
+            }
+            else {
+                this.originalConsole.warn?.("[ConsoleInterceptor] XHSC returned null response");
+            }
+        }
+        catch (err) {
+            this.originalConsole.error?.("[ConsoleInterceptor] Delegation failed:", err.message);
+        }
+    }
+    methodToLevel(method) {
+        switch (method) {
+            case "error":
+                return "error";
+            case "warn":
+                return "warn";
+            case "debug":
+            case "trace":
+                return "debug";
+            default:
+                return "info";
+        }
+    }
+    handlePreserveOriginal(method, args, _message) {
+        const preserve = this.config.preserveOriginal;
+        if (!preserve)
+            return;
+        const isEnabled = typeof preserve === "boolean" ? preserve : preserve.enabled;
+        if (!isEnabled)
+            return;
+        const mode = preserve && typeof preserve === "object"
+            ? preserve.mode || "intercepted"
+            : "original";
+        if (mode === "original" || mode === "both") {
+            let prefix = "";
+            if (preserve.showPrefix !== false) {
+                prefix = preserve.customPrefix || "[Original]";
+            }
+            const colorize = preserve.colorize;
+            if (colorize && prefix) {
+                // simple ANSI color for prefix
+                prefix = `\x1b[36m${prefix}\x1b[0m`;
+                // If it's an error level, make it red
+                if (method === "error") {
+                    args = [`\x1b[31m`, ...args, `\x1b[0m`];
+                }
+                else if (method === "warn") {
+                    args = [`\x1b[33m`, ...args, `\x1b[0m`];
+                }
+            }
+            const separateStreams = preserve.separateStreams;
+            let logMethod = method;
+            if (separateStreams) {
+                if (method !== "error" && method !== "warn")
+                    logMethod = "log";
+            }
+            else {
+                logMethod = "log"; // default everything to log if not separated
+            }
+            if (prefix) {
+                this.originalConsole[logMethod]?.apply(console, [
+                    prefix,
+                    ...args,
+                ]);
+            }
+            else {
+                this.originalConsole[logMethod]?.apply(console, args);
+            }
         }
     }
     async stop() {
         if (!this.isIntercepting)
             return;
+        // Restore original console
+        Object.keys(this.originalConsole).forEach((method) => {
+            console[method] = this.originalConsole[method];
+        });
+        this.originalConsole = {};
         if (this.ipcPath) {
             try {
                 const ipc = new XHSCDirectIPC.XHSCDirectIPC(this.ipcPath);
@@ -115,6 +465,7 @@ class ConsoleInterceptor {
         }
     }
 }
+ConsoleInterceptor.instance = null;
 
 exports.ConsoleInterceptor = ConsoleInterceptor;
 //# sourceMappingURL=ConsoleInterceptor.js.map

package/dist/cjs/src/server/components/fastapi/console/ConsoleInterceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConsoleInterceptor.js","sources":["../../../../../../../src/server/components/fastapi/console/ConsoleInterceptor.ts"],"sourcesContent":[null],"names":["DEFAULT_CONSOLE_CONFIG","XHSCDirectIPC"],"mappings":"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"}
+{"version":3,"file":"ConsoleInterceptor.js","sources":["../../../../../../../src/server/components/fastapi/console/ConsoleInterceptor.ts"],"sourcesContent":[null],"names":["AsyncLocalStorage","Configs","mergeWithDefaults","DEFAULT_CONSOLE_CONFIG","XHSCDirectIPC"],"mappings":"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"}

package/dist/cjs/src/server/components/fastapi/console/types.js

@@ -23,6 +23,12 @@ const DEFAULT_CONSOLE_CONFIG = {
         userAppPatterns: [],
         systemPatterns: [],
     },
+    preserveOriginal: {
+        enabled: true,
+        mode: "intercepted",
+        showPrefix: true,
+        colorize: true,
+    },
 };
 
 exports.DEFAULT_CONSOLE_CONFIG = DEFAULT_CONSOLE_CONFIG;

package/dist/cjs/src/server/components/fastapi/console/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sources":["../../../../../../../src/server/components/fastapi/console/types.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAAA;;AAEG;AA+CH;;;AAGG;AACI,MAAM,sBAAsB,GAA8B;AAC7D,IAAA,OAAO,EAAE,KAAK;AACd,IAAA,SAAS,EAAE,IAAI;IACf,gBAAgB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AAC3D,IAAA,yBAAyB,EAAE,GAAG;AAC9B,IAAA,UAAU,EAAE;AACR,QAAA,OAAO,EAAE,KAAK;AACjB,KAAA;AACD,IAAA,OAAO,EAAE;AACL,QAAA,QAAQ,EAAE,OAAO;AACjB,QAAA,SAAS,EAAE,IAAI;AACf,QAAA,eAAe,EAAE,EAAE;AACnB,QAAA,eAAe,EAAE,CAAC,cAAc,EAAE,UAAU,CAAC;AAC7C,QAAA,eAAe,EAAE,EAAE;AACnB,QAAA,cAAc,EAAE,EAAE;AACrB,KAAA;;;;;"}
+{"version":3,"file":"types.js","sources":["../../../../../../../src/server/components/fastapi/console/types.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAAA;;AAEG;AA8GH;;;AAGG;AACI,MAAM,sBAAsB,GAA8B;AAC7D,IAAA,OAAO,EAAE,KAAK;AACd,IAAA,SAAS,EAAE,IAAI;IACf,gBAAgB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AAC3D,IAAA,yBAAyB,EAAE,GAAG;AAC9B,IAAA,UAAU,EAAE;AACR,QAAA,OAAO,EAAE,KAAK;AACjB,KAAA;AACD,IAAA,OAAO,EAAE;AACL,QAAA,QAAQ,EAAE,OAAO;AACjB,QAAA,SAAS,EAAE,IAAI;AACf,QAAA,eAAe,EAAE,EAAE;AACnB,QAAA,eAAe,EAAE,CAAC,cAAc,EAAE,UAAU,CAAC;AAC7C,QAAA,eAAe,EAAE,EAAE;AACnB,QAAA,cAAc,EAAE,EAAE;AACrB,KAAA;AACD,IAAA,gBAAgB,EAAE;AACd,QAAA,OAAO,EAAE,IAAI;AACb,QAAA,IAAI,EAAE,aAAa;AACnB,QAAA,UAAU,EAAE,IAAI;AAChB,QAAA,QAAQ,EAAE,IAAI;AACjB,KAAA;;;;;"}

package/dist/cjs/src/server/core/XyLifecycleManager.js

@@ -74,7 +74,10 @@ class XyLifecycleManager {
             app,
             cacheManager: this.dependencies.cacheManager,
         });
-        this.dependencies.consoleInterceptor = new ConsoleInterceptor.ConsoleInterceptor(logger, options.logging);
+        if (!this.dependencies.consoleInterceptor) {
+            this.dependencies.consoleInterceptor =
+                ConsoleInterceptor.ConsoleInterceptor.getInstance(logger);
+        }
         this.dependencies.notFoundHandler = NotFoundHandler.createNotFoundHandler();
         // Bridge ConsoleInterceptor to XyprissApp
         const ci = this.dependencies.consoleInterceptor;

package/dist/cjs/src/server/core/XyLifecycleManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyLifecycleManager.js","sources":["../../../../../src/server/core/XyLifecycleManager.ts"],"sourcesContent":[null],"names":["RedirectManager","RequestProcessor","RouteManager","MonitoringManager","ConsoleInterceptor","createNotFoundHandler","DEFAULT_PORT","DEFAULT_HOST","PortUtility","StartupProcessor"],"mappings":"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"}
+{"version":3,"file":"XyLifecycleManager.js","sources":["../../../../../src/server/core/XyLifecycleManager.ts"],"sourcesContent":[null],"names":["RedirectManager","RequestProcessor","RouteManager","MonitoringManager","ConsoleInterceptor","createNotFoundHandler","DEFAULT_PORT","DEFAULT_HOST","PortUtility","StartupProcessor"],"mappings":";;;;;;;;;;;;AAAA;;;;;;;AAO6E;AAmB7E;;;AAGG;MACU,kBAAkB,CAAA;IAM3B,WAAA,CAAY,GAAe,EAAE,MAAc,EAAA;AACvC,QAAA,IAAI,CAAC,GAAG,GAAG,GAAG;AACd,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;QACpB,IAAI,CAAC,KAAK,GAAG;AACT,YAAA,KAAK,EAAE,KAAK;AACZ,YAAA,WAAW,EAAE,CAAC;AACd,YAAA,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE;SACjC;QACD,IAAI,CAAC,YAAY,GAAG;YAChB,GAAG;AACH,YAAA,OAAO,EAAG,GAAW,CAAC,OAAO,IAAI,EAAE;YACnC,MAAM;AACN,YAAA,eAAe,EAAE,IAAIA,+BAAe,CAAC,MAAM,CAAC;SAC/C;IACL;AAEA;;AAEG;AACI,IAAA,eAAe,CAAC,IAA0C,EAAA;AAC7D,QAAA,IAAI,CAAC,YAAY,GAAG,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,IAAI,EAAE;IACzD;AAEA;;AAEG;IACI,SAAS,GAAA;AACZ,QAAA,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI;IAC3B;AAEA;;AAEG;AACI,IAAA,MAAM,6BAA6B,GAAA;QACtC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY;AAElD,QAAA,IACI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY;AAC/B,YAAA,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAClC;;YAEE;QACJ;AAEA,QAAA,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,sCAAsC,CAAC;AAEjE,QAAA,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAG,IAAIC,iCAAgB,CAAC;AACtD,YAAA,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa;AAC9C,YAAA,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY;AAC/C,SAAA,CAAC;AAEF,QAAA,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAIC,yBAAY,CAAC;YAC9C,GAAG;AACH,YAAA,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY;AAC5C,YAAA,iBAAiB,EAAE,IAAI,CAAC,YAAY,CAAC,iBAAiB;AACzD,SAAA,CAAC;AAEF,QAAA,IAAI,CAAC,YAAY,CAAC,iBAAiB,GAAG,IAAIC,mCAAiB,CACvD,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,EAClC;YACI,GAAG;AACH,YAAA,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY;AAC/C,SAAA,CACJ;AAED,QAAA,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;YACvC,IAAI,CAAC,YAAY,CAAC,kBAAkB;AAChC,gBAAAC,qCAAkB,CAAC,WAAW,CAAC,MAAM,CAAC;QAC9C;QACA,IAAI,CAAC,YAAY,CAAC,eAAe,GAAGC,qCAAqB,CAAQ,CAAC;;AAGlE,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB;AAC9C,QAAA,GAAW,CAAC,qBAAqB,GAAG,MAAM,EAAE;AAC5C,QAAA,GAAW,CAAC,yBAAyB,GAAG,YAAY,MAAM,EAAE,CAAC,KAAK,EAAE;AACpE,QAAA,GAAW,CAAC,0BAA0B,GAAG,YAAY,MAAM,EAAE,CAAC,IAAI,EAAE;QACpE,GAAW,CAAC,eAAe,GAAG,MAAM,EAAE,CAAC,QAAQ,EAAE;AACjD,QAAA,GAAW,CAAC,mBAAmB,GAAG,OAAO,MAAW,KACjD,MAAM,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC;QAEjC,IAAI,OAAO,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE;AAC/C,YAAA,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK,EAAE;AAC5C,YAAA,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,uCAAuC,CAAC;QACnE;IACJ;AAEA;;AAEG;IACI,UAAU,GAAA;;QAGb,MAAM,IAAI,GAAG,IAAI;;QAGjB,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,OAAO,QAAqB,KAAI;YAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE;YACtC,IAAI,OAAO,OAAO,CAAC,MAAM,EAAE,IAAI,KAAK,QAAQ,EAAE;AAC1C,gBAAA,MAAM,IAAI,KAAK,CACX,uDAAuD,CAC1D;YACL;;AAGA,YAAA,IAAK,IAAI,CAAC,GAAW,CAAC,iBAAiB,EAAE;AACrC,gBAAA,MAAO,IAAI,CAAC,GAAW,CAAC,iBAAiB;YAC7C;;AAGA,YAAA,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAK,IAAI,CAAC,GAAW,CAAC,YAAY,EAAE;AACrD,gBAAA,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE;YACjC;YAEA,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,IAAIC,qBAAY;YACvD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,IAAIC,qBAAY;AAEjD,YAAA,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;AACtB,gBAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,QAAQ,EACR,CAAA,2BAAA,EAA8B,IAAI,CAAA,CAAA,EAAI,UAAU,CAAA,GAAA,CAAK,CACxD;YACL;YAEA,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC;AACrE,QAAA,CAAC;AAED,QAAA,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,YAAW;AAC/B,YAAA,IAAK,IAAI,CAAC,GAAW,CAAC,iBAAiB,EAAE;AACrC,gBAAA,MAAO,IAAI,CAAC,GAAW,CAAC,iBAAiB;YAC7C;AACA,YAAA,OAAO,OAAO,CAAC,OAAO,EAAE;AAC5B,QAAA,CAAC;AAED,QAAA,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW;QAE/C,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,OAAO,IAAY,KAAI;YAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAA,mBAAA,EAAsB,IAAI,CAAA,GAAA,CAAK,CAAC;YAC3D,OAAO,MAAM,IAAIC,mBAAW,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE;AACvD,QAAA,CAAC;QAED,IAAI,CAAC,qBAAqB,EAAE;AAE5B,QAAA,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACnD,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,QAAgC,KAAI;YAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,4BAA4B,CAAC;AAExD,YAAA,MAAM,aAAa,GAAI,IAAI,CAAC,GAAW,CAAC,aAAa;YACrD,IAAI,aAAa,IAAI,OAAO,aAAa,CAAC,QAAQ,KAAK,UAAU,EAAE;gBAC/D,aAAa,CAAC,QAAQ,EAAE;YAC5B;AAEA,YAAA,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;AACvB,gBAAA,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;AAC5B,gBAAA,IAAI,QAAQ;AAAE,oBAAA,QAAQ,EAAE;YAC5B;iBAAO;gBACH,aAAa,CAAC,QAAQ,CAAC;YAC3B;AACJ,QAAA,CAAC;AAEA,QAAA,IAAI,CAAC,GAAW,CAAC,gBAAgB,GAAG,IAAI;IAC7C;AAEA;;AAEG;IACI,cAAc,GAAA;AACjB,QAAA,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW;IACjC;AAEA;;AAEG;IACI,aAAa,GAAA;AAChB,QAAA,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU;IAChC;AAEQ,IAAA,MAAM,mBAAmB,CAC7B,UAAkB,EAClB,IAAY,EACZ,QAAqB,EAAA;;AAGrB,QAAA,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;AAC/D,YAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,SAAS,EACT,CAAA,qCAAA,EAAwC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA,CAAA,CAAG,CAC3E;YACD,MAAM,EAAE,UAAU,EAAE,GAChB,MAAM,oDAAO,kCAA+B,KAAC;YACjD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;AACvC,YAAA,MAAM,MAAM,CAAC,OAAO,EAAE;AACtB,YAAA,IAAI,QAAQ;AAAE,gBAAA,QAAQ,EAAE;;;;YAKxB,MAAM,IAAI,OAAO,CAAC,MAAK,EAAE,CAAC,CAAC;YAC3B,OAAO,IAAI,CAAC,GAAG;QACnB;QAEA,OAAO,MAAM,IAAI,CAAC,0BAA0B,CACxC,UAAU,EACV,IAAI,EACJ,QAAQ,CACX;IACL;AAEQ,IAAA,MAAM,0BAA0B,CACpC,UAAkB,EAClB,IAAY,EACZ,QAAqB,EAAA;AAErB,QAAA,MAAM,MAAM,GAAG,MAAMC,iCAAgB,CAAC,KAAK,CACvC;AACI,YAAA,IAAI,EAAE,UAAU;YAChB,IAAI;AACJ,YAAA,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE;YAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,MAAM,EAAE,IAAI,CAAC,MAAM;AACnB,YAAA,kBAAkB,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB;AAC3D,SAAA,EACD,OAAO,UAAU,KAAI;AACjB,YAAA,MAAM,aAAa,GAAI,IAAI,CAAC,GAAW,CAAC,eAAe;AACvD,YAAA,IACI,aAAa;AACb,gBAAA,OAAO,aAAa,CAAC,WAAW,KAAK,UAAU,EACjD;AACE,gBAAA,MAAM,aAAa,CAAC,WAAW,CAAC,eAAe,EAAE;oBAC7C,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,IAAI;oBACJ,QAAQ,EAAE,UAAU,CAAC,cAAc;AACtC,iBAAA,CAAC;YACN;AAEA,YAAA,IAAI,QAAQ;AAAE,gBAAA,QAAQ,EAAE;AAC5B,QAAA,CAAC,CACJ;QAED,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,IAAI;QACpC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,SAAS;AACtD,QAAA,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC;AAC3B,cAAE;AACF,cAAE,MAAM,CAAC,cAAc;AAC3B,QAAA,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI;QAEvB,MAAM,GAAG,GAAG,CAAA,OAAA,EAAU,IAAI,CAAA,CAAA,EAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAA,CAAE;AACtD,QAAA,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,GAAG,MAAM,GAAG,UAAU;;AAGzD,QAAA,IAAI,MAAM,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE;AACzD,YAAA,MAAM,UAAU,GACZ,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,IAAI,SAAS;AACtD,YAAA,IAAI,SAAS,KAAK,MAAM,EAAE;AACtB,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,QAAQ,EACR,CAAA,CAAA,EAAI,UAAU,CAAA,kEAAA,EAAqE,GAAG,CAAA,CAAE,CAC3F;YACL;iBAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE;;AAExC,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,QAAQ,EACR,CAAA,CAAA,EAAI,UAAU,CAAA,qCAAA,EAAwC,GAAG,CAAA,CAAE,CAC9D;YACL;QACJ;QACA,OAAO,MAAM,CAAC,cAAc;IAChC;IAEQ,qBAAqB,GAAA;AACzB,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe;AAC5C,QAAA,IAAI,CAAC,EAAE;YAAE;QACT,IAAI,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AACrE,QAAA,IAAI,CAAC,GAAG,CAAC,mBAAmB,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;AAC/D,QAAA,IAAI,CAAC,GAAG,CAAC,uBAAuB,GAAG,MAAM,EAAE,CAAC,uBAAuB,EAAE;AACrE,QAAA,IAAI,CAAC,GAAG,CAAC,kBAAkB,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAC7D,QAAA,IAAI,CAAC,GAAG,CAAC,sBAAsB,GAAG,MAAM,EAAE,CAAC,sBAAsB,EAAE;AACnE,QAAA,IAAI,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC7D;IAEO,IAAI,GAAA;AACP,QAAA,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU;AAAE,YAAA,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;IAC3D;AACH;;;;"}

package/dist/cjs/src/server/utils/internalFlagsFunctions.js

@@ -40,16 +40,32 @@ var internalFlags = require('../const/internalFlags.js');
  */
 const _TOKEN_KEY = "__xy_internal_token__";
 let _token;
-// Seal the token against any external mutation attempt
-Object.defineProperty(globalThis, "__xy_token_seal__", {
-    get: () => _token,
-    set: () => {
-        // Silently reject any external write attempt
-    },
-    configurable: false,
-    enumerable: false,
-});
-_token = crypto.randomBytes(32).toString("hex");
+// Seal the token against any external mutation attempt.
+// In complex scenarios (e.g. plugins with their own node_modules), multiple copies
+// of this module may be loaded. We use the global object to share the token
+// but we must be careful not to redefine a non-configurable property.
+const globalObj = globalThis;
+const existingDescriptor = Object.getOwnPropertyDescriptor(globalObj, "__xy_token_seal__");
+if (!existingDescriptor) {
+    try {
+        Object.defineProperty(globalObj, "__xy_token_seal__", {
+            get: () => _token,
+            set: () => {
+                // Silently reject any external write attempt
+            },
+            configurable: false,
+            enumerable: false,
+        });
+        _token = crypto.randomBytes(32).toString("hex");
+    }
+    catch {
+        // Someone else defined it between the check and defineProperty (rare race condition)
+        _token = globalObj.__xy_token_seal__;
+    }
+}
+else {
+    _token = globalObj.__xy_token_seal__;
+}
 /**
  * Attaches an internal framework flag to a server options object,
  * along with a signed token that authorizes its use.

package/dist/cjs/src/server/utils/internalFlagsFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"internalFlagsFunctions.js","sources":["../../../../../src/server/utils/internalFlagsFunctions.ts"],"sourcesContent":[null],"names":["internalFlags"],"mappings":";;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;AAsBiF;AAKjF;;;;;;;;;;;AAWG;AACH,MAAM,UAAU,GAAG,uBAAuB;AAC1C,IAAI,MAAc;AAElB;AACA,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,mBAAmB,EAAE;AACnD,IAAA,GAAG,EAAE,MAAM,MAAM;IACjB,GAAG,EAAE,MAAK;;IAEV,CAAC;AACD,IAAA,YAAY,EAAE,KAAK;AACnB,IAAA,UAAU,EAAE,KAAK;AACpB,CAAA,CAAC;AAEF,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;AAE/C;;;;;;;;;;;;;;;;;;;AAmBG;AACG,SAAU,gBAAgB,CAC5B,OAA4B,EAC5B,IAAoC,EAAA;AAEpC,IAAA,MAAM,MAAM,GAAG;AACX,QAAA,GAAG,OAAO;QACV,CAAC,IAAI,GAAG,IAAI;QACZ,CAAC,UAAU,GAAG,MAAM;KACvB;;;AAID,IAAA,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE;AACtC,QAAA,KAAK,EAAE,MAAM;AACb,QAAA,QAAQ,EAAE,KAAK;AACf,QAAA,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,KAAK;AACpB,KAAA,CAAC;AAEF,IAAA,OAAO,MAAM;AACjB;AAEA;;;;;;;;;;;;;;;;;;;;;;;AAuBG;AACG,SAAU,kBAAkB,CAAC,OAA4B,EAAA;;IAE3D,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,MAAM;;;AAIpD,IAAA,IAAI;AACA,QAAA,OAAO,OAAO,CAAC,UAAU,CAAC;IAC9B;AAAE,IAAA,MAAM;;;IAGR;AAEA,IAAA,KAAK,MAAM,IAAI,IAAIA,2BAAa,EAAE;AAC9B,QAAA,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;YACxD,IAAI,CAAC,aAAa,EAAE;;AAEhB,gBAAA,OAAO,OAAO,CAAC,IAAI,CAAC;AACpB,gBAAA,MAAM,IAAI,KAAK,CACX,CAAA,sDAAA,EAAyD,IAAI,CAAA,GAAA,CAAK;AAC9D,oBAAA,CAAA,yFAAA,CAA2F,CAClG;YACL;;QAEJ;IACJ;AACJ;;;;;"}
+{"version":3,"file":"internalFlagsFunctions.js","sources":["../../../../../src/server/utils/internalFlagsFunctions.ts"],"sourcesContent":[null],"names":["internalFlags"],"mappings":";;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;AAsBiF;AAKjF;;;;;;;;;;;AAWG;AACH,MAAM,UAAU,GAAG,uBAAuB;AAC1C,IAAI,MAAc;AAElB;AACA;AACA;AACA;AACA,MAAM,SAAS,GAAG,UAAiB;AACnC,MAAM,kBAAkB,GAAG,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,mBAAmB,CAAC;AAE1F,IAAI,CAAC,kBAAkB,EAAE;AACrB,IAAA,IAAI;AACA,QAAA,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,mBAAmB,EAAE;AAClD,YAAA,GAAG,EAAE,MAAM,MAAM;YACjB,GAAG,EAAE,MAAK;;YAEV,CAAC;AACD,YAAA,YAAY,EAAE,KAAK;AACnB,YAAA,UAAU,EAAE,KAAK;AACpB,SAAA,CAAC;AACF,QAAA,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;IACnD;AAAE,IAAA,MAAM;;AAEJ,QAAA,MAAM,GAAG,SAAS,CAAC,iBAAiB;IACxC;AACJ;KAAO;AACH,IAAA,MAAM,GAAG,SAAS,CAAC,iBAAiB;AACxC;AAEA;;;;;;;;;;;;;;;;;;;AAmBG;AACG,SAAU,gBAAgB,CAC5B,OAA4B,EAC5B,IAAoC,EAAA;AAEpC,IAAA,MAAM,MAAM,GAAG;AACX,QAAA,GAAG,OAAO;QACV,CAAC,IAAI,GAAG,IAAI;QACZ,CAAC,UAAU,GAAG,MAAM;KACvB;;;AAID,IAAA,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE;AACtC,QAAA,KAAK,EAAE,MAAM;AACb,QAAA,QAAQ,EAAE,KAAK;AACf,QAAA,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,KAAK;AACpB,KAAA,CAAC;AAEF,IAAA,OAAO,MAAM;AACjB;AAEA;;;;;;;;;;;;;;;;;;;;;;;AAuBG;AACG,SAAU,kBAAkB,CAAC,OAA4B,EAAA;;IAE3D,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,MAAM;;;AAIpD,IAAA,IAAI;AACA,QAAA,OAAO,OAAO,CAAC,UAAU,CAAC;IAC9B;AAAE,IAAA,MAAM;;;IAGR;AAEA,IAAA,KAAK,MAAM,IAAI,IAAIA,2BAAa,EAAE;AAC9B,QAAA,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;YACxD,IAAI,CAAC,aAAa,EAAE;;AAEhB,gBAAA,OAAO,OAAO,CAAC,IAAI,CAAC;AACpB,gBAAA,MAAM,IAAI,KAAK,CACX,CAAA,sDAAA,EAAyD,IAAI,CAAA,GAAA,CAAK;AAC9D,oBAAA,CAAA,yFAAA,CAA2F,CAClG;YACL;;QAEJ;IACJ;AACJ;;;;;"}

package/dist/cjs/src/xhsc/OSApi.js

@@ -90,6 +90,10 @@ class OSApi extends PathApi.BaseApi {
          * **Get Operating System Platform**
          */
         this.platform = () => process.platform;
+        /**
+         * **Get User Home Directory**
+         */
+        this.homeDir = () => this.runner.runSync("sys", "home-dir");
     }
     cpu(cores = false) {
         const results = this.runner.runSync("sys", "cpu", []);

package/dist/cjs/src/xhsc/OSApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"OSApi.js","sources":["../../../../src/xhsc/OSApi.ts"],"sourcesContent":[null],"names":["BaseApi"],"mappings":";;;;AAkBA;;AAEG;AACG,MAAO,KAAM,SAAQA,eAAO,CAAA;AAAlC,IAAA,WAAA,GAAA;;AAuBI;;AAEG;QACI,IAAA,CAAA,MAAM,GAAG,CAAC,KAAK,GAAG,KAAK,KAC1B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;AAEvD;;AAEG;AACI,QAAA,IAAA,CAAA,IAAI,GAAG,MAAkB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;AAuCtE;;AAEG;QACI,IAAA,CAAA,OAAO,GAAG,CACb,aAAsB,KAEtB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;AAE3E;;AAEG;AACI,QAAA,IAAA,CAAA,SAAS,GAAG,CACf,OAAA,GAA8D,EAAE,KACpB;AAC5C,YAAA,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,CAAC;AAChE,YAAA,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;AAChD,gBAAA,OAAO,GAAiC;YAC5C;YAEA,MAAM,UAAU,GAAG,GAAoB;;;;;;;;YAQvC,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,EAAe,KAAI;gBAC/C,QACI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;AAErE,YAAA,CAAC,CAAC;AACF,YAAA,OAAO,IAAI;AACf,QAAA,CAAC;AAED;;AAEG;AACI,QAAA,IAAA,CAAA,MAAM,GAAG,MAAW,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC;AAE/D;;AAEG;QACI,IAAA,CAAA,OAAO,GAAG,CAAC,QAAQ,GAAG,EAAE,EAAE,QAAQ,GAAG,CAAC,KACzC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;YACzC,QAAQ;YACR,QAAQ;AACR,YAAA,WAAW,EAAE,IAAI;AACpB,SAAA,CAAC;AAEN;;AAEG;QACI,IAAA,CAAA,cAAc,GAAG,CACpB,GAAW,EACX,QAAQ,GAAG,EAAE,KACoB;YACjC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE;gBACjD,GAAG;gBACH,QAAQ;AACR,gBAAA,WAAW,EAAE,IAAI;AACpB,aAAA,CAAC;AACN,QAAA,CAAC;AAED;;AAEG;AACI,QAAA,IAAA,CAAA,IAAI,GAAG,CAAC,MAAuB,KAAU;AAC5C,YAAA,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;AAC5B,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YAC3D;iBAAO;AACH,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAC5D;AACJ,QAAA,CAAC;AAED;;AAEG;AACI,QAAA,IAAA,CAAA,KAAK,GAAG,MAAkB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC;AAEpE;;AAEG;AACI,QAAA,IAAA,CAAA,IAAI,GAAG,MAAa,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;AAE7D;;AAEG;AACI,QAAA,IAAA,CAAA,OAAO,GAAG,MAAmB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC;AAEzE;;AAEG;AACI,QAAA,IAAA,CAAA,QAAQ,GAAG,MAAc,OAAO,CAAC,QAAQ;IACpD;IA/JW,GAAG,CAAC,KAAK,GAAG,KAAK,EAAA;AACpB,QAAA,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAc;AAClE,QAAA,IAAI,KAAK;AAAE,YAAA,OAAO,OAAO;QAEzB,IAAI,UAAU,GAAG,CAAC;QAClB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAI;AAC/B,YAAA,UAAU,IAAI,CAAC,CAAC,KAAK;YACrB,OAAO,CAAC,CAAC,KAAK;AAClB,QAAA,CAAC,CAAC;QAEF,OAAO;AACH,YAAA,OAAO,EAAE,OAAO,CAAC,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC;YACzD,QAAQ;AACR,YAAA,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACZ;IACjB;AAaA;;AAEG;AACH,IAAA,IAAW,QAAQ,GAAA;AACf,QAAA,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE;AACzB,QAAA,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAQ;AAE1D,QAAA,MAAM,EACF,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,YAAY,EACZ,GAAG,QAAQ,EACd,GAAG,IAAI;QAER,OAAO;AACH,YAAA,GAAG,GAAG;AACN,YAAA,GAAG,QAAQ;AACX,YAAA,IAAI,EAAE,YAAY;SACrB;IACL;AAOO,IAAA,KAAK,CAAC,KAAc,EAAA;AACvB,QAAA,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAe;QACnE,IAAI,KAAK,EAAE;AACP,YAAA,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,KAAK,KAAK,CAAC;QACrD;AACA,QAAA,OAAO,KAAK;IAChB;AAgGH;;;;"}
+{"version":3,"file":"OSApi.js","sources":["../../../../src/xhsc/OSApi.ts"],"sourcesContent":[null],"names":["BaseApi"],"mappings":"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"}

package/dist/cjs/src/xhsc/fs/FSExtended.js

@@ -182,6 +182,19 @@ class FSExtended extends FSWatch.FSWatch {
         this.decryptFile = async (p, key) => {
             await xyprissSecurity.Cipher.crypto.decryptFile(p, p, key);
         };
+        /**
+         * **Hardware-Linked Encryption**
+         * Ties encryption to this specific machine's hardware ID.
+         */
+        this.hardwareEncryptFile = async (p, key) => {
+            await this.runner.runAsync("fs", "hardware-encrypt", [p], { key });
+        };
+        /**
+         * **Hardware-Linked Decryption**
+         */
+        this.hardwareDecryptFile = async (p, key) => {
+            await this.runner.runAsync("fs", "hardware-decrypt", [p], { key });
+        };
         /**
          * **Diff Files**
          */