bdy 1.14.8-stage → 1.14.9-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.14.8-stage",
+  "version": "1.14.9-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/agent/manager.js

@@ -273,6 +273,12 @@ class AgentManagerClass {
         catch {
             // do nothing
         }
+        try {
+            this.system.clearNewAgentFiles();
+        }
+        catch {
+            // do nothing
+        }
         output_1.default.exitError(txt);
     }
     async agentStop() {
@@ -491,7 +497,7 @@ class AgentManagerClass {
         if (!forceParam) {
             try {
                 // load from config
-                const json = this.system.loadAgentConfig();
+                const json = this.system.loadNewAgentConfig();
                 this.shouldStart = !!json.shouldStart;
                 this.sshHostKey = json.sshHostKey;
             }
@@ -508,7 +514,7 @@ class AgentManagerClass {
         }
         try {
             // resave config
-            this.system.saveAgentConfig(this.shouldStart, this.sshHostKey || '');
+            this.system.saveNewAgentConfig(this.shouldStart, this.sshHostKey || '');
             return true;
         }
         catch {

package/distTs/src/agent/system.js

@@ -35,9 +35,15 @@ class AgentSystem {
     getSystemConfigDir() {
         return '';
     }
+    getNewAgentConfigDir() {
+        return this.getSystemConfigDir();
+    }
     getAgentConfigDir() {
         return (0, utils_1.getHomeDirectory)();
     }
+    getNewAgentConfigPath() {
+        return path_1.default.join(this.getNewAgentConfigDir(), 'srv.json');
+    }
     getAgentConfigPath() {
         return path_1.default.join(this.getAgentConfigDir(), 'agent.json');
     }
@@ -78,8 +84,15 @@ class AgentSystem {
         const str = (0, fs_1.readFileSync)(this.getSystemConfigPath(), 'utf-8');
         return JSON.parse(str);
     }
-    loadAgentConfig() {
-        const str = (0, fs_1.readFileSync)(this.getAgentConfigPath(), 'utf-8');
+    loadNewAgentConfig() {
+        const exists = (0, fs_1.existsSync)(this.getAgentConfigPath());
+        if (exists) {
+            (0, fs_1.cpSync)(this.getAgentConfigPath(), this.getNewAgentConfigPath(), {
+                force: true,
+            });
+            this.clearAgentFiles();
+        }
+        const str = (0, fs_1.readFileSync)(this.getNewAgentConfigPath(), 'utf-8');
         return JSON.parse(str);
     }
     clearSystemFiles() {
@@ -89,6 +102,9 @@ class AgentSystem {
     clearAgentFiles() {
         (0, fs_1.rmSync)(this.getAgentConfigPath(), { force: true });
     }
+    clearNewAgentFiles() {
+        (0, fs_1.rmSync)(this.getNewAgentConfigPath(), { force: true });
+    }
     ensureSystemConfigDir() {
         (0, fs_1.mkdirSync)(this.getSystemConfigDir(), { recursive: true });
     }
@@ -160,10 +176,16 @@ class AgentSystem {
             return false;
         }
     }
-    saveAgentConfig(shouldStart, sshHostKey) {
+    saveNewAgentConfig(shouldStart, sshHostKey) {
+        try {
+            this.clearAgentFiles();
+        }
+        catch {
+            // do nothing
+        }
         try {
             logger_1.default.info(texts_1.LOG_SAVING_AGENT_LOCAL_CONFIG);
-            (0, fs_1.writeFileSync)(this.getAgentConfigPath(), JSON.stringify({
+            (0, fs_1.writeFileSync)(this.getNewAgentConfigPath(), JSON.stringify({
                 shouldStart,
                 sshHostKey,
             }), 'utf-8');

package/distTs/src/command/agent/install.js

@@ -37,6 +37,12 @@ const removeAllAndExit = async (txt, id, host, token) => {
     catch {
         // do nothing
     }
+    try {
+        manager_1.default.system.clearNewAgentFiles();
+    }
+    catch {
+        // do nothing
+    }
     output_1.default.exitError(txt);
 };
 const commandAgentInstall = (0, utils_1.newCommand)('install', texts_1.DESC_COMMAND_AGENT_INSTALL);
@@ -95,7 +101,18 @@ commandAgentInstall.action(async (options) => {
     if (!saved) {
         await removeAllAndExit(texts_1.ERR_SWW_AGENT_ENABLING, id, host, token);
     }
-    manager_1.default.system.clearAgentFiles();
+    try {
+        manager_1.default.system.clearAgentFiles();
+    }
+    catch {
+        // do nothing
+    }
+    try {
+        manager_1.default.system.clearNewAgentFiles();
+    }
+    catch {
+        // do nothing
+    }
     await output_1.default.spinner(texts_1.TXT_ENABLING_AGENT);
     if (process.env.DEBUG === '1') {
         manager_1.default.start(id, host, token, port, !!options.start);

package/distTs/src/command/agent/run.js

@@ -13,7 +13,7 @@ commandAgentRun.option('--token <token>');
 commandAgentRun.option('--port <port>');
 commandAgentRun.option('--start <start>');
 commandAgentRun.action(async (options) => {
-    logger_1.default.changeRootPath(manager_1.default.system.getAgentConfigDir());
+    logger_1.default.changeRootPath(manager_1.default.system.getNewAgentConfigDir());
     manager_1.default.start(options.id, options.host, options.token, parseInt(options.port, 10), String(options.start) === 'true');
 });
 exports.default = commandAgentRun;

package/distTs/src/command/agent/uninstall.js

@@ -39,6 +39,12 @@ commandAgentUninstall.action(async () => {
     catch {
         // do nothing
     }
+    try {
+        manager_1.default.system.clearNewAgentFiles();
+    }
+    catch {
+        // do nothing
+    }
     output_1.default.exitSuccess(texts_1.TXT_AGENT_DISABLED);
 });
 exports.default = commandAgentUninstall;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.14.8-stage",
+  "version": "1.14.9-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {