dexbot 1.4.10 → 1.4.12

package/dist/modules/key_store.js

@@ -1,53 +1,17 @@
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
 'use strict';
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DirectKeyStore = exports.DaemonKeyStore = void 0;
-exports.setKeyStore = setKeyStore;
-exports.resetKeyStore = resetKeyStore;
-exports.getKeyStore = getKeyStore;
-const chainKeys = __importStar(require("./chain_keys"));
-const credentialPolicy = __importStar(require("./credential_policy"));
-const credentialRuntime = __importStar(require("./credential_runtime"));
-const dexbot_credential_client_1 = require("./dexbot_credential_client");
-const constants_1 = require("./constants");
-const paths_1 = require("./paths");
-const storage_1 = require("./storage");
-const runtime_1 = require("./runtime");
-const system_1 = require("./order/utils/system");
-const errors_1 = require("./utils/errors");
-const storage = (0, storage_1.getStorage)();
+import * as chainKeys from './chain_keys.js';
+import * as credentialPolicy from './credential_policy.js';
+import * as credentialRuntime from './credential_runtime.js';
+import { executeOperationsViaCredentialDaemon, BroadcastUncertainError, } from './dexbot_credential_client.js';
+import { DAEMON_ERRORS } from './constants.js';
+import { PATHS } from './paths.js';
+import { getStorage } from './storage/index.js';
+import { runtime } from './runtime.js';
+import { sleep } from './order/utils/system.js';
+import { getErrorMessage } from './utils/errors.js';
+const storage = getStorage();
 function buildDaemonBroadcastOptions(signingKey, extraOptions, sessionIdOverride) {
     return {
         socketPath: signingKey.socketPath,
@@ -84,7 +48,7 @@ async function broadcastViaChainOrders(accountName, operations, signingKey) {
     await broadcastTxWithClassification(tx, accountName, operations);
     return { success: true };
 }
-class DaemonKeyStore {
+export class DaemonKeyStore {
     async resolveSigningKey(accountName, vaultSecret, chainClient) {
         if (vaultSecret) {
             return chainKeys.resolvePrivateKey(accountName, vaultSecret, chainClient);
@@ -92,7 +56,7 @@ class DaemonKeyStore {
         if (await chainKeys.isDaemonResponsive()) {
             try {
                 const sessionId = await chainKeys.probeAccountInDaemon(accountName);
-                const botHmacSecret = credentialPolicy.loadBotHmacSecret(accountName, paths_1.PATHS.PROFILES.DAEMON_POLICIES_JSON, { quiet: true });
+                const botHmacSecret = credentialPolicy.loadBotHmacSecret(accountName, PATHS.PROFILES.DAEMON_POLICIES_JSON, { quiet: true });
                 return chainKeys.createDaemonSigningToken(accountName, { sessionId, botHmacSecret });
             }
             catch {
@@ -109,21 +73,21 @@ class DaemonKeyStore {
     async executeOperations(accountName, operations, signingKey, extraOptions = {}) {
         if (this.isDaemonSigningKey(signingKey)) {
             try {
-                const result = await (0, dexbot_credential_client_1.executeOperationsViaCredentialDaemon)(accountName, operations, buildDaemonBroadcastOptions(signingKey, extraOptions));
+                const result = await executeOperationsViaCredentialDaemon(accountName, operations, buildDaemonBroadcastOptions(signingKey, extraOptions));
                 return normalizeDaemonResult(result);
             }
             catch (err) {
-                if (err instanceof dexbot_credential_client_1.BroadcastUncertainError)
+                if (err instanceof BroadcastUncertainError)
                     throw err;
-                if ((0, errors_1.getErrorMessage)(err) && ((0, errors_1.getErrorMessage)(err).includes(constants_1.DAEMON_ERRORS.SESSION_EXPIRED) || (0, errors_1.getErrorMessage)(err).includes(constants_1.DAEMON_ERRORS.SOURCE_AUTH_DENIED))) {
-                    const isSourceAuthError = (0, errors_1.getErrorMessage)(err).includes(constants_1.DAEMON_ERRORS.SOURCE_AUTH_DENIED);
+                if (getErrorMessage(err) && (getErrorMessage(err).includes(DAEMON_ERRORS.SESSION_EXPIRED) || getErrorMessage(err).includes(DAEMON_ERRORS.SOURCE_AUTH_DENIED))) {
+                    const isSourceAuthError = getErrorMessage(err).includes(DAEMON_ERRORS.SOURCE_AUTH_DENIED);
                     if (isSourceAuthError) {
                         try {
-                            const readyFile = credentialRuntime.getCredentialReadyFilePath({ root: paths_1.PATHS.PROJECT_ROOT });
+                            const readyFile = credentialRuntime.getCredentialReadyFilePath({ root: PATHS.PROJECT_ROOT });
                             if (storage.exists(readyFile)) {
                                 const daemonInfo = storage.readJSON(readyFile);
                                 if (daemonInfo && typeof daemonInfo.pid === 'number') {
-                                    runtime_1.runtime.kill(daemonInfo.pid, 'SIGHUP');
+                                    runtime.kill(daemonInfo.pid, 'SIGHUP');
                                 }
                             }
                         }
@@ -132,9 +96,9 @@ class DaemonKeyStore {
                     const newSessionId = await chainKeys.probeAccountInDaemon(accountName);
                     signingKey.sessionId = newSessionId;
                     if (isSourceAuthError) {
-                        await (0, system_1.sleep)(500);
+                        await sleep(500);
                     }
-                    const retryResult = await (0, dexbot_credential_client_1.executeOperationsViaCredentialDaemon)(accountName, operations, buildDaemonBroadcastOptions(signingKey, extraOptions, signingKey.sessionId));
+                    const retryResult = await executeOperationsViaCredentialDaemon(accountName, operations, buildDaemonBroadcastOptions(signingKey, extraOptions, signingKey.sessionId));
                     return normalizeDaemonResult(retryResult);
                 }
                 throw err;
@@ -143,8 +107,7 @@ class DaemonKeyStore {
         return broadcastViaChainOrders(accountName, operations, signingKey);
     }
 }
-exports.DaemonKeyStore = DaemonKeyStore;
-class DirectKeyStore {
+export class DirectKeyStore {
     async resolveSigningKey(accountName, vaultSecret, chainClient) {
         if (vaultSecret) {
             return chainKeys.resolvePrivateKey(accountName, vaultSecret, chainClient);
@@ -157,15 +120,14 @@ class DirectKeyStore {
         return broadcastViaChainOrders(accountName, operations, signingKey);
     }
 }
-exports.DirectKeyStore = DirectKeyStore;
 let _instance = null;
-function setKeyStore(impl) {
+export function setKeyStore(impl) {
     _instance = impl;
 }
-function resetKeyStore() {
+export function resetKeyStore() {
     _instance = null;
 }
-function getKeyStore() {
+export function getKeyStore() {
     if (!_instance) {
         _instance = new DaemonKeyStore();
     }

package/dist/modules/key_store.js.map

@@ -1 +1 @@
-{"version":3,"file":"key_store.js","sourceRoot":"","sources":["../../modules/key_store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"key_store.js","sourceRoot":"","sources":["../../modules/key_store.ts"],"names":[],"mappings":"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"}

package/dist/modules/launcher/bot_supervisor.d.ts

@@ -1,4 +1,4 @@
-import { formatUptime } from '../process_discovery';
+import { formatUptime } from '../process_discovery.js';
 declare const SOCKET_PATH: string;
 declare function usesAmaGridPrice(bot: any): boolean;
 declare function parseCronExpression(expression: any): {

package/dist/modules/launcher/bot_supervisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot_supervisor.d.ts","sourceRoot":"","sources":["../../../modules/launcher/bot_supervisor.ts"],"names":[],"mappings":"AAYA,OAAO,EAAuB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAWzE,QAAA,MAAM,WAAW,QAAoE,CAAC;AAiBtF,iBAAS,gBAAgB,CAAC,GAAG,EAAE,GAAG,WAGjC;AAgID,iBAAS,mBAAmB,CAAC,UAAU,EAAE,GAAG;;;;;;EAY3C;AAqBD,iBAAS,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAgB,QAYjE;AAqBD,iBAAS,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAO7C;AAED,iBAAS,UAAU,CAAC,GAAG,EAAE,GAAG,WAE3B;AAED,iBAAe,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,oBAOrD;AAED,iBAAS,YAAY,CAAC,GAAG,EAAE,GAAG,YAE7B;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,GAAG,UAE5B;AAED,iBAAS,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,UAMjD;AAED,iBAAS,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,UAKlE;AAED,iBAAS,2BAA2B,CAAC,cAAc,EAAE,GAAG,eAmBvD;AAED,iBAAS,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,WAgB/D;AAED,iBAAS,4BAA4B,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,WAElE;AAED,iBAAS,wBAAwB,kBAQhC;AAED,iBAAe,yBAAyB,CAAC,SAAS,GAAE,GAAU;;;GAoB7D;AAED,iBAAS,WAAW,CAAC,KAAK,EAAE,GAAG,UAc9B;AAED,iBAAS,iBAAiB,CAAC,KAAK,EAAE,GAAG,oBAsBpC;AAED,iBAAS,mBAAmB,CAAC,EACzB,IAAW,EACX,QAA8B,EAC9B,OAAe,EACf,GAA+D,EAC/D,QAAsE,EACtE,aAAwD,EACxD,WAAyB,EACzB,qBAAgD,EAChD,mBAA4C,EAC5C,cAAiC,EACjC,YAAyB,EACzB,cAA6B,EAC7B,KAAwB,EACxB,iBAA6C,EAC7C,aAA8B,GACjC,GAAE,GAAQ;;qCA2hB2C,GAAG;oCANd,GAAG;;;;qCAyEU,GAAG;;;2DAlXuB,GAAG;EA+apF;AAED,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"bot_supervisor.d.ts","sourceRoot":"","sources":["../../../modules/launcher/bot_supervisor.ts"],"names":[],"mappings":"AAcA,OAAO,EAAuB,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAY5E,QAAA,MAAM,WAAW,QAAoE,CAAC;AAiBtF,iBAAS,gBAAgB,CAAC,GAAG,EAAE,GAAG,WAGjC;AAgID,iBAAS,mBAAmB,CAAC,UAAU,EAAE,GAAG;;;;;;EAY3C;AAqBD,iBAAS,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAgB,QAYjE;AAqBD,iBAAS,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAO7C;AAED,iBAAS,UAAU,CAAC,GAAG,EAAE,GAAG,WAE3B;AAED,iBAAe,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,oBAOrD;AAED,iBAAS,YAAY,CAAC,GAAG,EAAE,GAAG,YAE7B;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,GAAG,UAE5B;AAED,iBAAS,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,UAMjD;AAED,iBAAS,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,UAKlE;AAED,iBAAS,2BAA2B,CAAC,cAAc,EAAE,GAAG,eAYvD;AAED,iBAAS,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,WAgB/D;AAED,iBAAS,4BAA4B,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,WAElE;AAED,iBAAS,wBAAwB,kBAQhC;AAED,iBAAe,yBAAyB,CAAC,SAAS,GAAE,GAAU;;;GAoB7D;AAED,iBAAS,WAAW,CAAC,KAAK,EAAE,GAAG,UAc9B;AAED,iBAAS,iBAAiB,CAAC,KAAK,EAAE,GAAG,oBAsBpC;AAED,iBAAS,mBAAmB,CAAC,EACzB,IAAW,EACX,QAA8B,EAC9B,OAAe,EACf,GAA+D,EAC/D,QAAsE,EACtE,aAAwD,EACxD,WAAyB,EACzB,qBAAgD,EAChD,mBAA4C,EAC5C,cAAiC,EACjC,YAAyB,EACzB,cAA6B,EAC7B,KAAwB,EACxB,iBAA6C,EAC7C,aAA8B,GACjC,GAAE,GAAQ;;qCA2hB2C,GAAG;oCANd,GAAG;;;;qCAyEU,GAAG;;;2DAlXuB,GAAG;EA+apF;AAED,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,CAAA"}

package/dist/modules/launcher/bot_supervisor.js

@@ -1,50 +1,26 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatUptime = exports.SOCKET_PATH = void 0;
-exports.createBotSupervisor = createBotSupervisor;
-exports.parseCronExpression = parseCronExpression;
-exports.getNextCronDate = getNextCronDate;
-exports.forwardSignal = forwardSignal;
-exports.isPidAlive = isPidAlive;
-exports.waitForPidExit = waitForPidExit;
-exports.readProcArgs = readProcArgs;
-exports.readProcCwd = readProcCwd;
-exports.normalizeProcScriptArg = normalizeProcScriptArg;
-exports.scriptPathForRoot = scriptPathForRoot;
-exports.candidateRuntimeScriptPaths = candidateRuntimeScriptPaths;
-exports.pidMatchesScriptCandidates = pidMatchesScriptCandidates;
-exports.isNodeProcessWithExactScript = isNodeProcessWithExactScript;
-exports.readMarketAdapterLockPid = readMarketAdapterLockPid;
-exports.stopMarketAdapterFromLock = stopMarketAdapterFromLock;
-exports.usesAmaGridPrice = usesAmaGridPrice;
-exports.waitForChildSpawn = waitForChildSpawn;
-exports.getChildRSS = getChildRSS;
-const node_fs_1 = __importDefault(require("node:fs"));
-const path_api_1 = require("../path_api");
-const node_net_1 = __importDefault(require("node:net"));
-const storage_1 = require("../storage");
-const node_child_process_1 = require("node:child_process");
-const child_env_1 = require("./child_env");
-const paths_1 = require("../paths");
-const bot_settings_1 = require("../bot_settings");
-const constants_1 = require("../constants");
-const fs_utils_1 = require("../utils/fs_utils");
-const config_1 = require("../config");
-const process_discovery_1 = require("../process_discovery");
-Object.defineProperty(exports, "formatUptime", { enumerable: true, get: function () { return process_discovery_1.formatUptime; } });
-const runtime_1 = require("../runtime");
-const system_1 = require("../order/utils/system");
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+import fs from 'node:fs';
+import { path } from '../path_api.js';
+import net from 'node:net';
+import { getStorage } from '../storage/index.js';
+import { spawn } from 'node:child_process';
+import { buildScopedChildEnv } from './child_env.js';
+import { PATHS } from '../paths.js';
+import { normalizeBotEntries, resolveRawBotEntries, loadSettingsFile } from '../bot_settings.js';
+import { UPDATER, BUILD_DIR, LAUNCHER } from '../constants.js';
+import { Config } from '../config.js';
+import { getProcessDiscovery, formatUptime } from '../process_discovery.js';
+import { runtime } from '../runtime.js';
+import { sleep } from '../order/utils/system.js';
 'use strict';
-const storage = (0, storage_1.getStorage)();
-const runtime_entry_1 = require("./runtime_entry");
-const errors_1 = require("../utils/errors");
-const BOT_SCRIPT = (0, runtime_entry_1.buildRuntimeScriptPath)(runtime_entry_1.SCRIPTS_ROOT, ['bot']);
-const SOCKET_PATH = config_1.Config.DEXBOT_SUPERVISOR_SOCKET || paths_1.PATHS.PROFILES.SUPERVISOR_SOCK;
-exports.SOCKET_PATH = SOCKET_PATH;
-const { MAX_RESTARTS, MIN_UPTIME_MS, RESTART_DELAY_MS, SHUTDOWN_TIMEOUT_MS, STAGGER_DELAY_MS, MAX_MEMORY_MB, MEMORY_CHECK_INTERVAL_MS, STATUS_LOG_INTERVAL_MS, MAX_CRON_LOOKAHEAD_MINUTES, } = constants_1.LAUNCHER.SUPERVISOR;
+const storage = getStorage();
+const { ensureDir, readJSON, unlink: safeUnlink } = storage;
+import { buildRuntimeScriptPath, isDistCodeRoot, SCRIPTS_ROOT as CODE_ROOT } from './runtime_entry.js';
+import { getErrorMessage } from '../utils/errors.js';
+const BOT_SCRIPT = buildRuntimeScriptPath(CODE_ROOT, ['bot']);
+const SOCKET_PATH = Config.DEXBOT_SUPERVISOR_SOCKET || PATHS.PROFILES.SUPERVISOR_SOCK;
+const { MAX_RESTARTS, MIN_UPTIME_MS, RESTART_DELAY_MS, SHUTDOWN_TIMEOUT_MS, STAGGER_DELAY_MS, MAX_MEMORY_MB, MEMORY_CHECK_INTERVAL_MS, STATUS_LOG_INTERVAL_MS, MAX_CRON_LOOKAHEAD_MINUTES, } = LAUNCHER.SUPERVISOR;
 const MAX_MEMORY_BYTES = MAX_MEMORY_MB * 1024 * 1024;
 const SUPERVISOR_PREFIX = '[supervisor]';
 function usesAmaGridPrice(bot) {
@@ -59,16 +35,16 @@ function isServiceApp(app) {
     return name === 'dexbot-update' || name === 'dexbot-adapter';
 }
 function ensureLogDir() {
-    if (!storage.exists(paths_1.PATHS.LOGS_DIR)) {
-        (0, fs_utils_1.ensureDir)(paths_1.PATHS.LOGS_DIR);
+    if (!storage.exists(PATHS.LOGS_DIR)) {
+        ensureDir(PATHS.LOGS_DIR);
     }
 }
 function loadActiveBots(explicitBots) {
     if (explicitBots)
         return explicitBots;
-    const { config } = (0, bot_settings_1.loadSettingsFile)(paths_1.PATHS.PROFILES.BOTS_JSON);
-    const raw = (0, bot_settings_1.resolveRawBotEntries)(config);
-    return (0, bot_settings_1.normalizeBotEntries)(raw).filter((b) => b.active !== false);
+    const { config } = loadSettingsFile(PATHS.PROFILES.BOTS_JSON);
+    const raw = resolveRawBotEntries(config);
+    return normalizeBotEntries(raw).filter((b) => b.active !== false);
 }
 function buildSupervisedApps(bots, updaterActive) {
     const apps = (bots || []).map((bot, index) => {
@@ -78,40 +54,40 @@ function buildSupervisedApps(bots, updaterActive) {
             name: botName,
             script: BOT_SCRIPT,
             args: botName,
-            cwd: paths_1.PATHS.PROJECT_ROOT,
+            cwd: PATHS.PROJECT_ROOT,
             max_memory_restart: '250M',
-            error_file: path_api_1.path.join(paths_1.PATHS.LOGS_DIR, `${botName}-error.log`),
-            out_file: path_api_1.path.join(paths_1.PATHS.LOGS_DIR, `${botName}.log`),
-            max_restarts: 13,
-            min_uptime: 86400000,
-            restart_delay: 3000,
+            error_file: path.join(PATHS.LOGS_DIR, `${botName}-error.log`),
+            out_file: path.join(PATHS.LOGS_DIR, `${botName}.log`),
+            max_restarts: MAX_RESTARTS,
+            min_uptime: MIN_UPTIME_MS,
+            restart_delay: RESTART_DELAY_MS,
         };
     });
     if (needsMarketAdapter(bots)) {
         apps.unshift({
             kind: 'service',
             name: 'dexbot-adapter',
-            script: (0, runtime_entry_1.buildRuntimeScriptPath)(runtime_entry_1.SCRIPTS_ROOT, ['market_adapter', 'market_adapter']),
-            cwd: paths_1.PATHS.PROJECT_ROOT,
+            script: buildRuntimeScriptPath(CODE_ROOT, ['market_adapter', 'market_adapter']),
+            cwd: PATHS.PROJECT_ROOT,
             max_memory_restart: '150M',
-            error_file: path_api_1.path.join(paths_1.PATHS.LOGS_DIR, 'dexbot-adapter-error.log'),
-            out_file: path_api_1.path.join(paths_1.PATHS.LOGS_DIR, 'dexbot-adapter.log'),
-            max_restarts: 13,
+            error_file: path.join(PATHS.LOGS_DIR, 'dexbot-adapter-error.log'),
+            out_file: path.join(PATHS.LOGS_DIR, 'dexbot-adapter.log'),
+            max_restarts: MAX_RESTARTS,
             min_uptime: 60000,
-            restart_delay: 3000,
+            restart_delay: RESTART_DELAY_MS,
         });
     }
     if (updaterActive) {
         apps.push({
             kind: 'job',
             name: 'dexbot-update',
-            script: (0, runtime_entry_1.buildRuntimeScriptPath)(runtime_entry_1.SCRIPTS_ROOT, ['scripts', 'update']),
-            cwd: paths_1.PATHS.PROJECT_ROOT,
-            error_file: path_api_1.path.join(paths_1.PATHS.LOGS_DIR, 'dexbot-update-error.log'),
-            out_file: path_api_1.path.join(paths_1.PATHS.LOGS_DIR, 'dexbot-update.log'),
+            script: buildRuntimeScriptPath(CODE_ROOT, ['scripts', 'update']),
+            cwd: PATHS.PROJECT_ROOT,
+            error_file: path.join(PATHS.LOGS_DIR, 'dexbot-update-error.log'),
+            out_file: path.join(PATHS.LOGS_DIR, 'dexbot-update.log'),
             autorestart: false,
             bulk_control: false,
-            cron_schedule: constants_1.UPDATER.SCHEDULE,
+            cron_schedule: UPDATER.SCHEDULE,
         });
     }
     return apps;
@@ -242,52 +218,46 @@ function forwardSignal(child, signal) {
     }
 }
 function isPidAlive(pid) {
-    return (0, process_discovery_1.getProcessDiscovery)().isAlive(pid);
+    return getProcessDiscovery().isAlive(pid);
 }
 async function waitForPidExit(pid, timeoutMs) {
     const started = Date.now();
     while (Date.now() - started < timeoutMs) {
         if (!isPidAlive(pid))
             return true;
-        await (0, system_1.sleep)(200);
+        await sleep(200);
     }
     return !isPidAlive(pid);
 }
 function readProcArgs(pid) {
-    return (0, process_discovery_1.getProcessDiscovery)().readArgs(pid);
+    return getProcessDiscovery().readArgs(pid);
 }
 function readProcCwd(pid) {
-    return (0, process_discovery_1.getProcessDiscovery)().readCwd(pid);
+    return getProcessDiscovery().readCwd(pid);
 }
 function normalizeProcScriptArg(arg, cwd) {
     if (!arg || String(arg).startsWith('-'))
         return '';
     if (!/\.(?:[cm]?js|ts)$/i.test(String(arg)))
         return '';
-    return path_api_1.path.isAbsolute(arg)
-        ? path_api_1.path.normalize(arg)
-        : path_api_1.path.resolve(cwd || paths_1.PATHS.PROJECT_ROOT, arg);
+    return path.isAbsolute(arg)
+        ? path.normalize(arg)
+        : path.resolve(cwd || PATHS.PROJECT_ROOT, arg);
 }
 function scriptPathForRoot(root, scriptSegments, ext) {
     const segments = [...scriptSegments];
     const last = segments.pop();
     segments.push(String(last).replace(/\.(?:[cm]?js|ts)$/i, '') + ext);
-    return path_api_1.path.join(root, ...segments);
+    return path.join(root, ...segments);
 }
 function candidateRuntimeScriptPaths(scriptSegments) {
     const candidates = new Set([
-        (0, runtime_entry_1.buildRuntimeScriptPath)(runtime_entry_1.SCRIPTS_ROOT, scriptSegments),
-        scriptPathForRoot(paths_1.PATHS.PROJECT_ROOT, scriptSegments, '.ts'),
-        scriptPathForRoot(path_api_1.path.join(paths_1.PATHS.PROJECT_ROOT, constants_1.BUILD_DIR), scriptSegments, '.js'),
+        buildRuntimeScriptPath(CODE_ROOT, scriptSegments),
+        scriptPathForRoot(PATHS.PROJECT_ROOT, scriptSegments, '.ts'),
+        scriptPathForRoot(path.join(PATHS.PROJECT_ROOT, BUILD_DIR), scriptSegments, '.js'),
     ]);
     if (scriptSegments.length === 1) {
-        candidates.add(scriptPathForRoot(paths_1.PATHS.PROJECT_ROOT, scriptSegments, '.js'));
-    }
-    // Compatibility for wrappers already running from before the unlock-start -> unlock rename.
-    if (scriptSegments.length === 1 && scriptSegments[0] === 'unlock') {
-        candidates.add(scriptPathForRoot(paths_1.PATHS.PROJECT_ROOT, ['unlock-start'], '.js'));
-        candidates.add(scriptPathForRoot(paths_1.PATHS.PROJECT_ROOT, ['unlock-start'], '.ts'));
-        candidates.add(scriptPathForRoot(path_api_1.path.join(paths_1.PATHS.PROJECT_ROOT, constants_1.BUILD_DIR), ['unlock-start'], '.js'));
+        candidates.add(scriptPathForRoot(PATHS.PROJECT_ROOT, scriptSegments, '.js'));
     }
     return candidates;
 }
@@ -295,7 +265,7 @@ function pidMatchesScriptCandidates(pid, expectedPaths) {
     if (!expectedPaths || expectedPaths.size === 0)
         return false;
     const args = readProcArgs(pid);
-    if (!args.some((arg) => path_api_1.path.basename(String(arg)).includes('node'))) {
+    if (!args.some((arg) => path.basename(String(arg)).includes('node'))) {
         return false;
     }
     const cwd = readProcCwd(pid);
@@ -312,7 +282,7 @@ function isNodeProcessWithExactScript(pid, scriptSegments) {
 }
 function readMarketAdapterLockPid() {
     try {
-        const info = (0, fs_utils_1.readJSON)(paths_1.PATHS.MARKET_ADAPTER.LOCK_FILE);
+        const info = readJSON(PATHS.MARKET_ADAPTER.LOCK_FILE);
         const pid = Number(info.pid);
         return Number.isInteger(pid) && pid > 0 ? pid : null;
     }
@@ -326,10 +296,10 @@ async function stopMarketAdapterFromLock(timeoutMs = 5000) {
         return { pid, stopped: false };
     }
     try {
-        runtime_1.runtime.kill(pid, 'SIGTERM');
+        runtime.kill(pid, 'SIGTERM');
         let stopped = await waitForPidExit(pid, timeoutMs);
         if (!stopped && isNodeProcessWithExactScript(pid, ['market_adapter', 'market_adapter'])) {
-            runtime_1.runtime.kill(pid, 'SIGKILL');
+            runtime.kill(pid, 'SIGKILL');
             stopped = await waitForPidExit(pid, 2000);
         }
         return { pid, stopped };
@@ -345,12 +315,12 @@ function getChildRSS(child) {
     if (!child || !child.pid)
         return -1;
     try {
-        if (config_1.Config.PLATFORM === 'linux') {
-            const bytes = (0, process_discovery_1.getProcessDiscovery)().readRSSBytes(child.pid);
+        if (Config.PLATFORM === 'linux') {
+            const bytes = getProcessDiscovery().readRSSBytes(child.pid);
             if (bytes > 0)
                 return bytes;
         }
-        else if (config_1.Config.PLATFORM === 'darwin') {
+        else if (Config.PLATFORM === 'darwin') {
             const { execSync } = require('child_process');
             const out = execSync(`ps -o rss= -p ${child.pid}`, { encoding: 'utf8', timeout: 3000 });
             const rssKB = parseInt(out.trim(), 10);
@@ -386,7 +356,7 @@ function waitForChildSpawn(child) {
         child.once('error', handleError);
     });
 }
-function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedChildEnv, spawnFn = node_child_process_1.spawn, log = (...args) => console.log(SUPERVISOR_PREFIX, ...args), logError = (...args) => console.error(SUPERVISOR_PREFIX, ...args), controlSocket = !config_1.Config.DEXBOT_DISABLE_SUPERVISOR_SOCKET, getChildRss = getChildRSS, memoryCheckIntervalMs = MEMORY_CHECK_INTERVAL_MS, statusLogIntervalMs = STATUS_LOG_INTERVAL_MS, staggerDelayMs = STAGGER_DELAY_MS, setTimeoutFn = setTimeout, clearTimeoutFn = clearTimeout, nowFn = () => Date.now(), stopMarketAdapter = stopMarketAdapterFromLock, updaterActive = constants_1.UPDATER.ACTIVE, } = {}) {
+function createBotSupervisor({ bots = null, buildEnv = buildScopedChildEnv, spawnFn = spawn, log = (...args) => console.log(SUPERVISOR_PREFIX, ...args), logError = (...args) => console.error(SUPERVISOR_PREFIX, ...args), controlSocket = !Config.DEXBOT_DISABLE_SUPERVISOR_SOCKET, getChildRss = getChildRSS, memoryCheckIntervalMs = MEMORY_CHECK_INTERVAL_MS, statusLogIntervalMs = STATUS_LOG_INTERVAL_MS, staggerDelayMs = STAGGER_DELAY_MS, setTimeoutFn = setTimeout, clearTimeoutFn = clearTimeout, nowFn = () => Date.now(), stopMarketAdapter = stopMarketAdapterFromLock, updaterActive = UPDATER.ACTIVE, } = {}) {
     const botStates = new Map();
     let shuttingDown = false;
     let shutdownResolve = null;
@@ -416,7 +386,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
         for (const [name, state] of botStates) {
             const pid = state.child?.pid || '-';
             const uptime = state.lastStartTime && state.status === 'running'
-                ? (0, process_discovery_1.formatUptime)(nowFn() - state.lastStartTime)
+                ? formatUptime(nowFn() - state.lastStartTime)
                 : '-';
             let mem = '-';
             if (state.status === 'running' && state.child) {
@@ -469,7 +439,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
                     }
                 }
                 catch (err) {
-                    logError(`Failed to start scheduled job ${state.name}:`, (0, errors_1.getErrorMessage)(err));
+                    logError(`Failed to start scheduled job ${state.name}:`, getErrorMessage(err));
                     state.status = 'crashed';
                 }
                 finally {
@@ -481,7 +451,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
             }
         }
         catch (err) {
-            logError(`Invalid cron schedule for ${state.name}: ${(0, errors_1.getErrorMessage)(err)}`);
+            logError(`Invalid cron schedule for ${state.name}: ${getErrorMessage(err)}`);
         }
     }
     function runMemoryCheck() {
@@ -519,28 +489,28 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
             return null;
         }
         ensureLogDir();
-        const outFile = app.out_file || path_api_1.path.join(paths_1.PATHS.LOGS_DIR, `${appName}.log`);
-        const errorFile = app.error_file || path_api_1.path.join(paths_1.PATHS.LOGS_DIR, `${appName}-error.log`);
-        const outStream = node_fs_1.default.createWriteStream(outFile, { flags: 'a' });
-        const errStream = node_fs_1.default.createWriteStream(errorFile, { flags: 'a' });
+        const outFile = app.out_file || path.join(PATHS.LOGS_DIR, `${appName}.log`);
+        const errorFile = app.error_file || path.join(PATHS.LOGS_DIR, `${appName}-error.log`);
+        const outStream = fs.createWriteStream(outFile, { flags: 'a' });
+        const errStream = fs.createWriteStream(errorFile, { flags: 'a' });
         const isBot = !isServiceApp(app);
         const extraEnv = {
             ...(app.env || {}),
             DEXBOT_LAUNCH_MODE: 'isolated',
             ...(isBot ? { LIVE_BOT_NAME: appName } : {}),
         };
-        const runtimeArgs = (0, runtime_entry_1.isDistCodeRoot)(runtime_entry_1.SCRIPTS_ROOT)
+        const runtimeArgs = isDistCodeRoot(CODE_ROOT)
             ? [app.script || BOT_SCRIPT, ...normalizeAppArgs(app.args)]
             : ['--import', 'tsx', app.script || BOT_SCRIPT, ...normalizeAppArgs(app.args)];
-        const child = spawnFn(config_1.Config.EXEC_PATH, runtimeArgs, {
-            cwd: app.cwd || paths_1.PATHS.PROJECT_ROOT,
+        const child = spawnFn(Config.EXEC_PATH, runtimeArgs, {
+            cwd: app.cwd || PATHS.PROJECT_ROOT,
             env: buildEnv({ extra: extraEnv }),
             stdio: ['inherit', 'pipe', 'pipe'],
         });
         child.stdout.pipe(outStream);
-        child.stdout.pipe(runtime_1.runtime.stdout);
+        child.stdout.pipe(runtime.stdout);
         child.stderr.pipe(errStream);
-        child.stderr.pipe(runtime_1.runtime.stderr);
+        child.stderr.pipe(runtime.stderr);
         child.stdout.on('error', () => { });
         child.stderr.on('error', () => { });
         outStream.on('error', () => { });
@@ -611,7 +581,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
             }, restartDelay);
         });
         child.on('error', (err) => {
-            logError(`${appName} spawn error:`, (0, errors_1.getErrorMessage)(err));
+            logError(`${appName} spawn error:`, getErrorMessage(err));
         });
         return child;
     }
@@ -704,7 +674,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
             }
         }
         catch (err) {
-            return { error: (0, errors_1.getErrorMessage)(err) };
+            return { error: getErrorMessage(err) };
         }
     }
     function startSocketServer() {
@@ -716,7 +686,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
                 settled = true;
                 fn(value);
             };
-            const testSocket = node_net_1.default.createConnection(SOCKET_PATH);
+            const testSocket = net.createConnection(SOCKET_PATH);
             testSocket.on('connect', () => {
                 testSocket.end();
                 settle(reject, new Error('Another supervisor instance is already running (socket exists). Stop it first or use a different profile.'));
@@ -732,8 +702,8 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
     }
     function startSocketServerInternal() {
         return new Promise((resolve, reject) => {
-            (0, fs_utils_1.safeUnlink)(SOCKET_PATH);
-            socketServer = node_net_1.default.createServer((socket) => {
+            safeUnlink(SOCKET_PATH);
+            socketServer = net.createServer((socket) => {
                 socketConnections.add(socket);
                 let buffer = '';
                 let commandQueue = Promise.resolve();
@@ -743,7 +713,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
                         .then(handler)
                         .catch((err) => {
                         try {
-                            socket.write(JSON.stringify({ error: (0, errors_1.getErrorMessage)(err) }) + '\n');
+                            socket.write(JSON.stringify({ error: getErrorMessage(err) }) + '\n');
                         }
                         catch (_) { }
                     });
@@ -793,14 +763,14 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
                 });
             });
             const onError = (err) => {
-                logError(`Socket server error: ${(0, errors_1.getErrorMessage)(err)}`);
+                logError(`Socket server error: ${getErrorMessage(err)}`);
                 reject(err);
             };
             socketServer.once('error', onError);
             socketServer.listen(SOCKET_PATH, () => {
                 socketServer.off('error', onError);
                 socketServer.on('error', (err) => {
-                    logError(`Socket server error: ${(0, errors_1.getErrorMessage)(err)}`);
+                    logError(`Socket server error: ${getErrorMessage(err)}`);
                 });
                 try {
                     storage.chmod(SOCKET_PATH, 0o600);
@@ -810,7 +780,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
                 resolve(undefined);
             });
             process.once('exit', () => {
-                (0, fs_utils_1.safeUnlink)(SOCKET_PATH);
+                safeUnlink(SOCKET_PATH);
             });
         });
     }
@@ -832,7 +802,7 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
             catch (_) { }
         }
         socketConnections = new Set([...socketConnections].filter((sock) => preserved.has(sock)));
-        (0, fs_utils_1.safeUnlink)(SOCKET_PATH);
+        safeUnlink(SOCKET_PATH);
     }
     async function start() {
         const activeBots = loadActiveBots(bots);
@@ -884,14 +854,14 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
                 }
             }
             catch (err) {
-                logError(`Failed to start ${app.name}:`, (0, errors_1.getErrorMessage)(err));
+                logError(`Failed to start ${app.name}:`, getErrorMessage(err));
                 const state = botStates.get(app.name);
                 if (state) {
                     state.status = 'crashed';
                 }
             }
             if (i < activeApps.length - 1) {
-                await (0, system_1.sleep)(staggerDelayMs);
+                await sleep(staggerDelayMs);
             }
         }
         for (const [, state] of botStates) {
@@ -1049,4 +1019,5 @@ function createBotSupervisor({ bots = null, buildEnv = child_env_1.buildScopedCh
         waitForStableStartup,
     };
 }
+export { createBotSupervisor, SOCKET_PATH, parseCronExpression, getNextCronDate, forwardSignal, isPidAlive, waitForPidExit, readProcArgs, readProcCwd, normalizeProcScriptArg, scriptPathForRoot, candidateRuntimeScriptPaths, pidMatchesScriptCandidates, isNodeProcessWithExactScript, readMarketAdapterLockPid, stopMarketAdapterFromLock, usesAmaGridPrice, waitForChildSpawn, getChildRSS, formatUptime };
 //# sourceMappingURL=bot_supervisor.js.map