bdy 1.15.7-dev-package → 1.16.2-dev

package/distTs/src/agent/system.js

@@ -9,22 +9,26 @@ const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 const texts_1 = require("../texts");
 const logger_1 = __importDefault(require("../logger"));
+const manager_1 = __importDefault(require("./manager"));
+const output_1 = __importDefault(require("../output"));
 class AgentSystem {
-    // extend
-    isEnabled() {
-        return Promise.resolve(false);
-    }
     // extend
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    enable(id, host, token, port, start, user, pass, debug) {
+    async install(id, host, token, port, start, user, pass, debug) {
         return Promise.reject();
     }
     // extend
-    update() {
+    async update() {
         return Promise.reject();
     }
     // extend
-    disable() {
+    async uninstall() {
+        return Promise.reject();
+    }
+    async stop() {
+        return Promise.reject();
+    }
+    async start() {
         return Promise.reject();
     }
     // extend
@@ -182,29 +186,83 @@ class AgentSystem {
         return this.downloadFile(`https://es.buddy.works/bdy/${env}/${version}/${archive}`, archivePath);
     }
     killStandaloneProc() {
-        try {
-            const str = this.loadStandaloneProcConfig();
-            const pid = Number.parseInt(str, 10);
-            if (pid) {
-                process.kill(pid);
+        return new Promise((resolve) => {
+            let pid = 0;
+            try {
+                const str = this.loadStandaloneProcConfig();
+                pid = Number.parseInt(str, 10);
+                if (pid) {
+                    process.kill(pid);
+                }
+            }
+            catch {
+                // do nothing
+            }
+            try {
+                this.clearStandaloneProcConfig();
+            }
+            catch {
+                // do nothing
             }
+            let tsInterval = null;
+            let tsTimeout = null;
+            const finish = () => {
+                if (tsInterval)
+                    clearInterval(tsInterval);
+                if (tsTimeout)
+                    clearTimeout(tsTimeout);
+                resolve();
+            };
+            if (!pid) {
+                finish();
+                return;
+            }
+            tsTimeout = setTimeout(finish, 30000);
+            tsInterval = setInterval(() => {
+                try {
+                    process.kill(pid, 0);
+                }
+                catch {
+                    finish();
+                }
+            }, 100);
+        });
+    }
+    startStandaloneProc() {
+        let json;
+        try {
+            json = this.loadSystemConfig();
         }
         catch {
-            // do nothing
+            output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
         }
-        try {
-            this.clearStandaloneProcConfig();
+        if (json.debug) {
+            logger_1.default.setDebug(true);
         }
-        catch {
-            // do nothing
+        const saved = this.saveStandaloneProcConfig();
+        if (!saved) {
+            output_1.default.exitError(texts_1.ERR_SWW_AGENT_ENABLING);
         }
+        logger_1.default.changeRootPath(this.getNewAgentConfigDir());
+        logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_STARTED);
+        output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_STARTED);
+        const onProcessExit = () => {
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_EXITING);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_EXITING);
+            this.clearStandaloneProcConfig();
+            process.exit(0);
+        };
+        process.on('SIGINT', onProcessExit);
+        process.on('SIGTERM', onProcessExit);
+        process.on('SIGQUIT', onProcessExit);
+        manager_1.default.start(json.id, json.host, json.token, json.port);
     }
     clearStandaloneProcConfig() {
         try {
             logger_1.default.info(texts_1.LOG_REMOVING_AGENT_PROC_ID);
             this.ensureSystemConfigDir();
             (0, fs_1.rmSync)(this.getSystemStandalonePath(), {
-                force: true
+                force: true,
             });
             return true;
         }
@@ -227,7 +285,16 @@ class AgentSystem {
             return false;
         }
     }
-    saveSystemConfig(id, host, token, port) {
+    hasSystemConfig() {
+        try {
+            this.loadSystemConfig();
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    saveSystemConfig(id, host, token, port, standalone, debug) {
         try {
             logger_1.default.info(texts_1.LOG_SAVING_AGENT_SYSTEM_CONFIG);
             this.ensureSystemConfigDir();
@@ -236,6 +303,8 @@ class AgentSystem {
                 host,
                 token,
                 port,
+                standalone,
+                debug
             }), 'utf-8');
             return true;
         }
@@ -245,7 +314,7 @@ class AgentSystem {
             return false;
         }
     }
-    saveNewAgentConfig(shouldStart, sshHostKey) {
+    saveNewAgentConfig(sshHostKey) {
         try {
             this.clearAgentFiles();
         }
@@ -255,7 +324,6 @@ class AgentSystem {
         try {
             logger_1.default.info(texts_1.LOG_SAVING_AGENT_LOCAL_CONFIG);
             (0, fs_1.writeFileSync)(this.getNewAgentConfigPath(), JSON.stringify({
-                shouldStart,
                 sshHostKey,
             }), 'utf-8');
             return true;

package/distTs/src/agent/windows.js

@@ -20,21 +20,6 @@ class AgentWindows extends system_1.default {
     isSupported() {
         return Promise.resolve(process.arch === 'x64');
     }
-    isEnabled() {
-        return new Promise((resolve) => {
-            if (this.isStandaloneProcRunning()) {
-                resolve(true);
-                return;
-            }
-            this.sc('query bdy')
-                .then(() => {
-                resolve(true);
-            })
-                .catch(() => {
-                resolve(false);
-            });
-        });
-    }
     getBinaryArchive() {
         return 'win-x64.zip';
     }
@@ -79,7 +64,7 @@ class AgentWindows extends system_1.default {
     async update() {
         try {
             logger_1.default.info(texts_1.LOG_AGENT_STOPPING_SYSTEM);
-            await this.nssm('stop bdy');
+            await this.stop();
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_DIR);
             await this.ensureSystemConfigDir();
             logger_1.default.info(texts_1.LOG_AGENT_DOWNLOADING_ARCHIVE);
@@ -88,7 +73,7 @@ class AgentWindows extends system_1.default {
             await this.extractBinaryArchive();
             try {
                 logger_1.default.info(texts_1.LOG_AGENT_STARTING_SYSTEM);
-                await this.nssm('start bdy');
+                await this.start();
             }
             catch {
                 // do nothing, it will throw operation pending
@@ -99,7 +84,14 @@ class AgentWindows extends system_1.default {
             throw err;
         }
     }
-    async enable(id, host, token, port, start, user, pass, debug) {
+    async install(id, host, token, port, start, user, pass, debug) {
+        try {
+            // ensure srv was clear
+            await this.uninstall();
+        }
+        catch {
+            // do nothing
+        }
         try {
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_DIR);
             await this.ensureSystemConfigDir();
@@ -115,7 +107,7 @@ class AgentWindows extends system_1.default {
             await this.extractBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_ENABLING_SYSTEM);
             await this.nssm(`install bdy ${this.getSystemBinaryPath()}`);
-            await this.nssm(`set bdy AppParameters agent run --id="${id}" --host="${host}" --token="${token}" --port=${port} --start=${!!start}`);
+            await this.nssm(`set bdy AppParameters agent run --id="${id}" --host="${host}" --token="${token}" --port=${port}`);
             await this.nssm('set bdy DisplayName Buddy Tunnel Agent');
             await this.nssm('set bdy AppThrottle 5000');
             await this.nssm('set bdy AppRestartDelay 0');
@@ -125,7 +117,8 @@ class AgentWindows extends system_1.default {
             if (user && pass) {
                 await this.nssm(`set bdy ObjectName ${user} ${pass}`);
             }
-            this.nssm('start bdy').then().catch();
+            if (start)
+                await this.start();
             logger_1.default.info(texts_1.LOG_AGENT_ENABLED);
         }
         catch (err) {
@@ -133,9 +126,15 @@ class AgentWindows extends system_1.default {
             throw err;
         }
     }
-    async disable() {
+    async stop() {
+        await this.nssm('stop bdy');
+    }
+    async start() {
+        await this.nssm('start bdy');
+    }
+    async uninstall() {
         try {
-            await this.nssm('stop bdy');
+            await this.stop();
         }
         catch {
             // do nothing
@@ -152,15 +151,5 @@ class AgentWindows extends system_1.default {
             });
         });
     }
-    sc(cmd) {
-        return new Promise((resolve, reject) => {
-            (0, child_process_1.exec)(`sc ${cmd}`, (err) => {
-                if (!err)
-                    resolve();
-                else
-                    reject(err);
-            });
-        });
-    }
 }
 exports.default = AgentWindows;

package/distTs/src/api/client.js

@@ -19,12 +19,26 @@ class ApiClient {
             },
         });
     }
-    async _request(opts, parseResponseBody = false, returnRawBody = false) {
+    async request(method, path, body, parseResponseBody = false) {
+        const headers = {
+            authorization: `Bearer ${this.token}`,
+        };
+        let bodyParsed = undefined;
+        if (body) {
+            headers['content-type'] = 'application/json; charset=utf-8';
+            bodyParsed = JSON.stringify(body);
+        }
+        const opts = {
+            method,
+            path,
+            headers,
+            body: bodyParsed,
+        };
         let status;
         let responseBody;
-        logger_1.default.debug(`API CLIENT: ${opts.method} ${this.baseUrl.protocol}//${this.baseUrl.host}${opts.path}`);
-        logger_1.default.debug(opts.headers);
-        logger_1.default.debug(opts.body);
+        logger_1.default.debug(`API CLIENT: ${method} ${this.baseUrl.protocol}//${this.baseUrl.host}${path}`);
+        logger_1.default.debug(headers);
+        logger_1.default.debug(body);
         try {
             const r = await this.client.request(opts);
             status = r.statusCode;
@@ -40,7 +54,11 @@ class ApiClient {
             await responseBody.dump();
             throw new Error(texts_1.ERR_REST_API_WRONG_TOKEN);
         }
-        if ([400, 404, 403].includes(status)) {
+        if (status === 403) {
+            await responseBody.dump();
+            throw new Error(texts_1.ERR_REST_API_RATE_LIMIT);
+        }
+        if ([400, 404].includes(status)) {
             let json;
             try {
                 json = await responseBody.json();
@@ -61,7 +79,7 @@ class ApiClient {
             else
                 throw new Error(texts_1.ERR_REST_API_GENERAL_ERROR);
         }
-        if ([200, 201].includes(status)) {
+        if (status === 200) {
             if (parseResponseBody) {
                 try {
                     const b = await responseBody.json();
@@ -75,9 +93,6 @@ class ApiClient {
                     throw new Error(texts_1.ERR_REST_API_GENERAL_ERROR);
                 }
             }
-            else if (returnRawBody) {
-                return responseBody;
-            }
             else {
                 await responseBody.dump();
                 return null;
@@ -88,58 +103,8 @@ class ApiClient {
             throw new Error(texts_1.ERR_REST_API_GENERAL_ERROR);
         }
     }
-    async requestMultipart(path, body, parseResponseBody = false) {
-        const headers = {
-            authorization: `Bearer ${this.token}`,
-        };
-        const opts = {
-            method: 'POST',
-            path,
-            headers,
-            body,
-        };
-        return await this._request(opts, parseResponseBody);
-    }
-    async request(method, path, body, parseResponseBody = false, returnRawBody = false) {
-        const headers = {
-            authorization: `Bearer ${this.token}`,
-        };
-        let bodyParsed = undefined;
-        if (body) {
-            headers['content-type'] = 'application/json; charset=utf-8';
-            bodyParsed = JSON.stringify(body);
-        }
-        const opts = {
-            method,
-            path,
-            headers,
-            body: bodyParsed,
-        };
-        return await this._request(opts, parseResponseBody, returnRawBody);
-    }
-    async getResourceByIdentifier(workspace, params) {
-        let query = '';
-        Object.keys(params).forEach((key) => {
-            if (!query)
-                query += '?';
-            else
-                query += '&';
-            query += encodeURIComponent(key) + '=' + encodeURIComponent(params[key]);
-        });
-        return await this.request('GET', `/workspaces/${encodeURIComponent(workspace)}/identifiers${query}`, null, true);
-    }
     async getPipelineByIdentifier(workspace, project, identifier) {
-        return await this.getResourceByIdentifier(workspace, { project, pipeline: identifier });
-    }
-    async getPackageVersionByIdentifier(workspace, project, pkg, version) {
-        const opts = {
-            package: pkg,
-        };
-        if (project)
-            opts.project = project;
-        if (version)
-            opts.package_version = version;
-        return await this.getResourceByIdentifier(workspace, opts);
+        return await this.request('GET', `/workspaces/${encodeURIComponent(workspace)}/identifiers?project=${encodeURIComponent(project)}&pipeline=${encodeURIComponent(identifier)}`, null, true);
     }
     async getPipelineRun(workspace, project, pipelineId, executionId) {
         return await this.request('GET', `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/pipelines/${encodeURIComponent(pipelineId)}/executions/${encodeURIComponent(executionId)}`, null, true);
@@ -147,46 +112,5 @@ class ApiClient {
     async postPipelineRun(workspace, project, pipelineId, body) {
         return await this.request('POST', `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/pipelines/${encodeURIComponent(pipelineId)}/executions`, body, true);
     }
-    async getPackageVersion(workspace, pkgId, versionId) {
-        return await this.request('GET', `/workspaces/${encodeURIComponent(workspace)}/packages/${encodeURIComponent(pkgId)}/versions/${encodeURIComponent(versionId)}`, null, true);
-    }
-    async getPackageLatest(workspace, pkgId) {
-        const res = await this.request('GET', `/workspaces/${encodeURIComponent(workspace)}/packages/${encodeURIComponent(pkgId)}/versions?page=1&per_page=1`, null, true);
-        if (res && res.versions && res.versions.length > 0) {
-            return res.versions[0];
-        }
-        return null;
-    }
-    async downloadPackageVersion(workspace, pkgId, versionId) {
-        return await this.request('GET', `/workspaces/${encodeURIComponent(workspace)}/packages/${encodeURIComponent(pkgId)}/versions/${encodeURIComponent(versionId)}/download`, null, false, true);
-    }
-    async postPackageVersion(workspace, pkgId, version) {
-        return await this.request('POST', `/workspaces/${encodeURIComponent(workspace)}/packages/${encodeURIComponent(pkgId)}/versions`, {
-            version
-        }, true);
-    }
-    async postPackageVersionZip(workspace, pkgId, versionId, file) {
-        const form = new undici_1.FormData();
-        form.append('file', file);
-        return await this.requestMultipart(`/workspaces/${encodeURIComponent(workspace)}/packages/${encodeURIComponent(pkgId)}/versions/${versionId}/upload`, form, true);
-    }
-    async postPackage(workspace, project, identifier) {
-        const body = {
-            name: identifier,
-            identifier,
-            type: 'FILE',
-            scope: 'WORKSPACE',
-            authorization: {
-                type: 'BUDDY'
-            }
-        };
-        if (project) {
-            body.project = {
-                name: project
-            };
-            body.scope = 'PROJECT';
-        }
-        return await this.request('POST', `/workspaces/${encodeURIComponent(workspace)}/packages`, body, true);
-    }
 }
 exports.default = ApiClient;

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

@@ -11,15 +11,22 @@ const agent_1 = __importDefault(require("../../tunnel/api/agent"));
 const commandAgentDebug = (0, utils_1.newCommand)('debug', texts_1.DESC_COMMAND_AGENT_DEBUG);
 commandAgentDebug.argument('<on/off>');
 commandAgentDebug.action(async (debug) => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    if (!hasAdminRights) {
+        output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
+    }
+    if (!commandAgentDebug.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentDebug.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
         const debugOn = debug === 'on';
         const json = manager_1.default.system.loadSystemConfig();
         const api = new agent_1.default(json.port);
         await api.debugChange(debugOn);
+        manager_1.default.system.saveSystemConfig(json.id, json.host, json.token, json.port, !!json.standalone, debugOn);
         output_1.default.exitSuccess(debugOn ? texts_1.TXT_AGENT_DEBUG_ON : texts_1.TXT_AGENT_DEBUG_OFF);
     }
     catch (err) {

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

@@ -5,18 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
-const manager_1 = __importDefault(require("../../agent/manager"));
 const output_1 = __importDefault(require("../../output"));
 const agent_1 = __importDefault(require("../../tunnel/api/agent"));
 const commandAgentDisable = (0, utils_1.newCommand)('disable', texts_1.DESC_COMMAND_AGENT_DISABLE);
 commandAgentDisable.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentDisable.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentDisable.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
+        const api = new agent_1.default(commandAgentDisable.agentPort || 0);
         await api.disableAgent();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_STOPPED);
     }

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

@@ -5,18 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
-const manager_1 = __importDefault(require("../../agent/manager"));
 const output_1 = __importDefault(require("../../output"));
 const agent_1 = __importDefault(require("../../tunnel/api/agent"));
 const commandAgentEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_ENABLE);
 commandAgentEnable.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentEnable.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentEnable.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
+        const api = new agent_1.default(commandAgentEnable.agentPort || 0);
         await api.enableAgent();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_STARTED);
     }