@dainprotocol/cli 1.1.21 → 1.1.28

package/dist/commands/deploy.js

@@ -47,62 +47,63 @@ var path_1 = __importDefault(require("path"));
 var archiver_1 = __importDefault(require("archiver"));
 var build_1 = __importDefault(require("./build"));
 var status_1 = __importDefault(require("./status"));
-var START_DEPLOY_URI = '/api/app/data/deployments/start-deploy';
+var START_DEPLOY_URI = "/api/app/data/deployments/start-deploy";
 function deploy(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, spinner, basePath, deployPath, envArray, result, deploymentId, dainJson, dainJsonObject, error_1;
+        var config, spinner, basePath, deployPath, isProduction, environmentName, envArray, result, deploymentId, serviceId, dainJson, dainJsonObject, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
-                    spinner = (0, ora_1.default)('Deploying project...').start();
-                    basePath = config['api-base-url'] || 'https://dain-platform-ochre.vercel.app';
+                    spinner = (0, ora_1.default)("Deploying project...").start();
+                    basePath = config["api-base-url"] || "https://dain-platform-ochre.vercel.app";
                     deployPath = "".concat(basePath).concat(START_DEPLOY_URI);
+                    isProduction = config["environment"] === "production";
+                    environmentName = config["environment"] || "production";
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 9, , 10]);
+                    _a.trys.push([1, 8, , 9]);
                     return [4 /*yield*/, loadAndValidateEnvVariables()];
                 case 2:
                     envArray = _a.sent();
                     return [4 /*yield*/, (0, build_1.default)({ config: options.config, deploy: true })];
                 case 3:
                     _a.sent();
-                    return [4 /*yield*/, deployAndPushFiles(deployPath, envArray)];
+                    return [4 /*yield*/, deployAndPushFiles(deployPath, envArray, isProduction, environmentName)];
                 case 4:
                     result = _a.sent();
-                    deploymentId = result.deploymentId.replace('codegen-', '');
-                    return [4 /*yield*/, recursiveStatusUntilRunning(JSON.stringify(config), deploymentId)];
+                    deploymentId = result.deploymentId;
+                    serviceId = result.serviceId;
+                    return [4 /*yield*/, fs_extra_1.default.readFile("./dain.json", "utf-8")];
                 case 5:
-                    _a.sent();
-                    return [4 /*yield*/, fs_extra_1.default.readFile('./dain.json', 'utf-8')];
-                case 6:
                     dainJson = _a.sent();
                     dainJsonObject = JSON.parse(dainJson);
-                    dainJsonObject['deployment-id'] = deploymentId;
-                    return [4 /*yield*/, fs_extra_1.default.writeFile('./dain.json', JSON.stringify(dainJsonObject, null, 2))];
-                case 7:
+                    dainJsonObject["deployment-id"] = deploymentId;
+                    dainJsonObject["service-id"] = serviceId;
+                    return [4 /*yield*/, fs_extra_1.default.writeFile("./dain.json", JSON.stringify(dainJsonObject, null, 2))];
+                case 6:
                     _a.sent();
-                    console.log('\n-----------------------');
+                    console.log("\n-----------------------");
                     spinner.succeed("Deployment URL: ".concat(result.service.url));
                     spinner.succeed("Deployment ID: ".concat(result.deploymentId));
-                    spinner.succeed('Deployment completed at: ' + new Date().toISOString());
-                    spinner.succeed('Deployment completed successfully.');
-                    spinner.info('You can access logs using `dain logs -w` command.');
-                    console.log('-----------------------');
+                    spinner.succeed("Deployment completed at: " + new Date().toISOString());
+                    spinner.succeed("Deployment completed successfully.");
+                    spinner.info("You can access logs using `dain logs -w` command.");
+                    console.log("-----------------------");
                     return [4 /*yield*/, fetch(result.service.url, {
-                            method: 'GET',
+                            method: "GET",
                         })];
-                case 8:
+                case 7:
                     _a.sent();
                     process.exit(0);
-                    return [3 /*break*/, 10];
-                case 9:
+                    return [3 /*break*/, 9];
+                case 8:
                     error_1 = _a.sent();
-                    spinner.fail('Deployment failed.');
-                    (0, utils_1.logError)('Error during deployment: ', error_1);
+                    spinner.fail("Deployment failed.");
+                    (0, utils_1.logError)("Error during deployment: ", error_1);
                     process.exit(1);
-                    return [3 /*break*/, 10];
-                case 10: return [2 /*return*/];
+                    return [3 /*break*/, 9];
+                case 9: return [2 /*return*/];
             }
         });
     });
@@ -117,11 +118,11 @@ function loadAndValidateEnvVariables() {
                 case 1:
                     envArray = _a.sent();
                     if (envArray.length === 0) {
-                        (0, utils_1.logError)('No environment variables found. Please ensure your .env file is correctly set up.');
+                        (0, utils_1.logError)("No environment variables found. Please ensure your .env file is correctly set up.");
                         process.exit(1);
                     }
-                    if (!envArray.some(function (env) { return env.name === 'DAIN_API_KEY'; })) {
-                        (0, utils_1.logError)('DAIN_API_KEY not found in environment variables. Please check your .env file.');
+                    if (!envArray.some(function (env) { return env.name === "DAIN_API_KEY"; })) {
+                        (0, utils_1.logError)("DAIN_API_KEY not found in environment variables. Please check your .env file.");
                         process.exit(1);
                     }
                     return [2 /*return*/, envArray];
@@ -130,25 +131,27 @@ function loadAndValidateEnvVariables() {
     });
 }
 // Deploys and pushes files to the platform
-function deployAndPushFiles(startDeployUrl, envArray) {
+function deployAndPushFiles(startDeployUrl, envArray, isProduction, environmentName) {
     return __awaiter(this, void 0, void 0, function () {
         var projectZip, projectZipBuffer, formData, response, errorText, result, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, zipDirectory('./', 'project.zip')];
+                case 0: return [4 /*yield*/, zipDirectory("./", "project.zip")];
                 case 1:
                     projectZip = _a.sent();
                     return [4 /*yield*/, fs_extra_1.default.readFile(projectZip)];
                 case 2:
                     projectZipBuffer = _a.sent();
                     formData = new FormData();
-                    formData.append('array', JSON.stringify(envArray));
-                    formData.append('file', new Blob([projectZipBuffer]), 'project.zip');
+                    formData.append("array", JSON.stringify(envArray));
+                    formData.append("file", new Blob([projectZipBuffer]), "project.zip");
+                    formData.append("isProduction", isProduction.toString());
+                    formData.append("environment", environmentName);
                     _a.label = 3;
                 case 3:
                     _a.trys.push([3, 8, , 9]);
                     return [4 /*yield*/, fetch(startDeployUrl, {
-                            method: 'POST',
+                            method: "POST",
                             body: formData,
                         })];
                 case 4:
@@ -164,8 +167,8 @@ function deployAndPushFiles(startDeployUrl, envArray) {
                     return [2 /*return*/, result];
                 case 8:
                     error_2 = _a.sent();
-                    (0, utils_1.logError)('Error during deployment and push files: ', error_2.stack);
-                    console.error('Detailed error:', error_2);
+                    (0, utils_1.logError)("Error during deployment and push files: ", error_2.stack);
+                    console.error("Detailed error:", error_2);
                     process.exit(1);
                     return [3 /*break*/, 9];
                 case 9: return [2 /*return*/];
@@ -179,21 +182,21 @@ function loadEnvVariables() {
         var files, envFile, envContent;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, fs_extra_1.default.readdir('./')];
+                case 0: return [4 /*yield*/, fs_extra_1.default.readdir("./")];
                 case 1:
                     files = _a.sent();
-                    envFile = files.find(function (file) { return file === '.env'; });
+                    envFile = files.find(function (file) { return file === ".env"; });
                     if (!envFile) {
-                        (0, utils_1.logError)('Environment file not found. Please create a .env file in the build directory.');
+                        (0, utils_1.logError)("Environment file not found. Please create a .env file in the build directory.");
                         process.exit(1);
                     }
-                    return [4 /*yield*/, fs_extra_1.default.readFile(path_1.default.join('./', envFile), 'utf-8')];
+                    return [4 /*yield*/, fs_extra_1.default.readFile(path_1.default.join("./", envFile), "utf-8")];
                 case 2:
                     envContent = _a.sent();
                     return [2 /*return*/, envContent
-                            .split('\n')
+                            .split("\n")
                             .map(function (line) {
-                            var _a = line.split('='), name = _a[0], value = _a[1];
+                            var _a = line.split("="), name = _a[0], value = _a[1];
                             return { name: name, value: value };
                         })
                             .filter(function (env) { return env.name && env.value; })];
@@ -207,33 +210,33 @@ function zipDirectory(sourceDir, outputZip) {
         return __generator(this, function (_a) {
             return [2 /*return*/, new Promise(function (resolve, reject) {
                     var output = fs_extra_1.default.createWriteStream(outputZip);
-                    var archive = (0, archiver_1.default)('zip', { zlib: { level: 9 } });
-                    output.on('close', function () { return resolve(outputZip); });
-                    archive.on('error', function (err) {
-                        (0, utils_1.logError)('Error during zipping the directory: ', err);
+                    var archive = (0, archiver_1.default)("zip", { zlib: { level: 9 } });
+                    output.on("close", function () { return resolve(outputZip); });
+                    archive.on("error", function (err) {
+                        (0, utils_1.logError)("Error during zipping the directory: ", err);
                         reject(err);
                     });
                     archive.pipe(output);
-                    archive.glob('**/*', { ignore: ['node_modules/**', 'project.zip'] });
+                    archive.glob("**/*", { ignore: ["node_modules/**", "project.zip"] });
                     archive.finalize();
                 })];
         });
     });
 }
-var recursiveStatusUntilRunning = function (config, deploymentId) { return __awaiter(void 0, void 0, void 0, function () {
+var recursiveStatusUntilRunning = function (config, deploymentId, environmentName, serviceId) { return __awaiter(void 0, void 0, void 0, function () {
     var statusResult;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, status_1.default)({}, deploymentId)];
+            case 0: return [4 /*yield*/, (0, status_1.default)({}, deploymentId, environmentName, serviceId)];
             case 1:
                 statusResult = _a.sent();
-                if (statusResult.status === 'RUNNING') {
+                if (statusResult.status === "RUNNING") {
                     return [2 /*return*/];
                 }
                 return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 15000); })];
             case 2:
                 _a.sent();
-                return [4 /*yield*/, recursiveStatusUntilRunning(config, deploymentId)];
+                return [4 /*yield*/, recursiveStatusUntilRunning(config, deploymentId, environmentName, serviceId)];
             case 3:
                 _a.sent();
                 return [2 /*return*/];

package/dist/commands/dev.js

@@ -59,18 +59,35 @@ var path_1 = __importDefault(require("path"));
 var miniflare_1 = require("miniflare");
 var build_1 = __importDefault(require("./build"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
+var net_1 = require("net");
 var childProcess = null;
 var watcher = null;
 var mf = null;
-function startProcess(command, env) {
+var tunnelUrl = null;
+function isPortAvailable(port) {
+    return new Promise(function (resolve) {
+        var server = (0, net_1.createServer)()
+            .listen(port, function () {
+            server.close();
+            resolve(true);
+        })
+            .on('error', function () {
+            resolve(false);
+        });
+    });
+}
+function startProcess(command, options) {
     var _a, _b;
     if (childProcess) {
         childProcess.kill();
     }
     var spinner = (0, ora_1.default)('Starting development server...').start();
-    childProcess = (0, child_process_1.exec)(command, { env: __assign(__assign({}, process.env), env) });
+    childProcess = (0, child_process_1.exec)(command, options);
     (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', function (data) {
         spinner.succeed('Development server started.');
+        if (tunnelUrl) {
+            (0, utils_1.displayTunnelUrl)(tunnelUrl);
+        }
         console.log(data);
     });
     (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', function (data) {
@@ -101,11 +118,33 @@ function cleanup() {
 }
 function dev(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, runtime, tsNodePath, command, envVars, proxyServer, watchPaths, dainDir, outFile, MFconfig_1, debounceTimer_1, watchDirs, error_1;
+        var config, portSource, port, portNumber, runtime, tsNodePath, command, envVars, proxyServer, portNumber_1, proxySetup, watchPaths, dainDir, outFile, MFconfig_1, debounceTimer_1, watchDirs, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
+                    if (process.env.PORT) {
+                        port = process.env.PORT;
+                        portSource = '.env file';
+                    }
+                    else if (options.port) {
+                        port = options.port;
+                        portSource = 'command line argument';
+                    }
+                    else {
+                        port = '2022';
+                        portSource = 'default value';
+                    }
+                    portNumber = parseInt(port);
+                    if (isNaN(portNumber) || portNumber < 0 || portNumber > 65535) {
+                        (0, utils_1.logError)('Invalid port number. Using default port 2022');
+                        options.port = '2022';
+                        portSource = 'default value (after invalid port)';
+                    }
+                    else {
+                        options.port = port;
+                    }
+                    (0, utils_1.logInfo)("Using port ".concat(options.port, " (from ").concat(portSource, ")"));
                     console.log('Config: ' + JSON.stringify(config));
                     runtime = options.runtime || config.runtime || 'node';
                     console.log('Runtime: ' + runtime);
@@ -121,19 +160,29 @@ function dev(options) {
                     proxyServer = null;
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 8, , 9]);
-                    if (!!options.noproxy) return [3 /*break*/, 3];
+                    _a.trys.push([1, 9, , 10]);
+                    portNumber_1 = parseInt(options.port);
+                    return [4 /*yield*/, isPortAvailable(portNumber_1)];
+                case 2:
+                    if (!(_a.sent())) {
+                        (0, utils_1.logError)("Port ".concat(portNumber_1, " is already in use. Please use a different port with --port option."));
+                        process.exit(1);
+                    }
+                    process.env.PORT = portNumber_1.toString();
+                    if (!!options.noproxy) return [3 /*break*/, 4];
                     if (!config['api-key']) {
                         throw new Error("'api-key' is required when using development proxy");
                     }
                     return [4 /*yield*/, (0, utils_1.setupProxy)(options.port, config['api-key'], config)];
-                case 2:
-                    proxyServer = _a.sent();
-                    _a.label = 3;
                 case 3:
-                    if (!(runtime === 'node')) return [3 /*break*/, 4];
+                    proxySetup = _a.sent();
+                    proxyServer = proxySetup.client;
+                    tunnelUrl = proxySetup.tunnelUrl;
+                    _a.label = 4;
+                case 4:
+                    if (!(runtime === 'node')) return [3 /*break*/, 5];
                     // Existing Node.js development process
-                    startProcess(command, envVars);
+                    startProcess(command, { env: __assign(__assign({}, process.env), envVars) });
                     watchPaths = [
                         path_1.default.dirname(config['main-file']),
                         config['static-dir']
@@ -146,7 +195,7 @@ function dev(options) {
                     });
                     watcher.on('change', function (path) {
                         (0, utils_1.logInfo)("File ".concat(path, " has been changed. Restarting..."));
-                        startProcess(command, envVars);
+                        startProcess(command, { env: __assign(__assign({}, process.env), envVars) });
                     });
                     (0, utils_1.logInfo)('Watching for file changes...');
                     // Add signal handlers for graceful shutdown
@@ -201,14 +250,14 @@ function dev(options) {
                             process.exit(1);
                         }, 500);
                     });
-                    return [3 /*break*/, 7];
-                case 4:
-                    if (!(runtime === 'workers')) return [3 /*break*/, 6];
+                    return [3 /*break*/, 8];
+                case 5:
+                    if (!(runtime === 'workers')) return [3 /*break*/, 7];
                     dainDir = path_1.default.join(process.cwd(), '.dain');
                     outFile = path_1.default.join(dainDir, path_1.default.basename(config['main-file'], '.ts') + '.mjs');
                     // Start the build process in watch mode
                     return [4 /*yield*/, (0, build_1.default)({ config: options.config, runtime: 'workers', watch: true })];
-                case 5:
+                case 6:
                     // Start the build process in watch mode
                     _a.sent();
                     MFconfig_1 = {
@@ -234,10 +283,10 @@ function dev(options) {
                         });
                     });
                     (0, utils_1.logInfo)('Watching for file changes in source and build directories...');
-                    return [3 /*break*/, 7];
-                case 6: throw new Error("Unsupported runtime: ".concat(runtime));
-                case 7: return [3 /*break*/, 9];
-                case 8:
+                    return [3 /*break*/, 8];
+                case 7: throw new Error("Unsupported runtime: ".concat(runtime));
+                case 8: return [3 /*break*/, 10];
+                case 9:
                     error_1 = _a.sent();
                     (0, utils_1.logError)("Error in dev process for ".concat(runtime, " runtime:"), error_1);
                     cleanup();
@@ -246,8 +295,8 @@ function dev(options) {
                     setTimeout(function () {
                         process.exit(1);
                     }, 500);
-                    return [3 /*break*/, 9];
-                case 9: return [2 /*return*/];
+                    return [3 /*break*/, 10];
+                case 10: return [2 /*return*/];
             }
         });
     });

package/dist/commands/logs.js

@@ -61,13 +61,13 @@ function logs(options_1) {
             switch (_b.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
-                    orgId = 'hackathon';
+                    orgId = "hackathon";
                     _a = initializeConfig(config, orgId), apiKey = _a.apiKey, deploymentId = _a.deploymentId, logsUrl = _a.logsUrl;
                     if (!orgId || !deploymentId) {
-                        (0, utils_1.logError)('Org ID or deployment ID not found');
+                        (0, utils_1.logError)("Org ID or deployment ID not found");
                         return [2 /*return*/];
                     }
-                    spinner = (0, ora_1.default)("Fetching logs for project ".concat(config['project-id'], "...")).start();
+                    spinner = (0, ora_1.default)("Fetching logs for project ".concat(config["project-id"], "...")).start();
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 3, 4, 5]);
@@ -78,7 +78,7 @@ function logs(options_1) {
                     formatLogs = formatProjectLogs(result, deploymentId);
                     if (isWatching) {
                         // clear terminal before printing logs when watching
-                        process.stdout.write('\x1Bc');
+                        process.stdout.write("\x1Bc");
                     }
                     (0, utils_1.logInfo)("Project logs: ".concat(formatLogs));
                     if (options.watch) {
@@ -101,10 +101,12 @@ function logs(options_1) {
     });
 }
 var initializeConfig = function (config, orgId) {
-    var baseUrl = config['platform-base-url'] || 'https://codegen-deploy-service.dainapp.com/';
-    var apiKey = config['api-key'];
-    var deploymentId = config['deployment-id'];
-    var logsUrl = "".concat(baseUrl, "/codegen-deploy/logs/").concat(orgId, "/").concat(deploymentId);
+    var baseUrl = config["platform-base-url"] || "https://codegen-deploy-service.dainapp.com/";
+    var apiKey = config["api-key"];
+    var deploymentId = config["deployment-id"];
+    var environment = config["environment"];
+    var serviceId = config["service-id"];
+    var logsUrl = "".concat(baseUrl, "/codegen-deploy/logs/").concat(orgId, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment);
     return { baseUrl: baseUrl, apiKey: apiKey, orgId: orgId, deploymentId: deploymentId, logsUrl: logsUrl };
 };
 var fetchLogs = function (logsUrl, apiKey) { return __awaiter(void 0, void 0, void 0, function () {
@@ -112,11 +114,11 @@ var fetchLogs = function (logsUrl, apiKey) { return __awaiter(void 0, void 0, vo
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, fetch(logsUrl, {
-                    method: 'GET',
+                    method: "GET",
                     headers: {
-                        'Content-Type': 'application/json',
-                        'X-DAIN-SIGNATORY-ADDRESS': 'TODO: X-DAIN-SIGNATORY-ADDRESS',
-                        'X-DAIN-SIGNATURE': 'TODO: X-DAIN-SIGNATORY-SIGNATURE',
+                        "Content-Type": "application/json",
+                        "X-DAIN-SIGNATORY-ADDRESS": "TODO: X-DAIN-SIGNATORY-ADDRESS",
+                        "X-DAIN-SIGNATURE": "TODO: X-DAIN-SIGNATORY-SIGNATURE",
                         Authorization: "Bearer ".concat(apiKey),
                     },
                 })];
@@ -131,12 +133,12 @@ var fetchLogs = function (logsUrl, apiKey) { return __awaiter(void 0, void 0, vo
     });
 }); };
 var handleError = function (spinner, error) {
-    spinner.fail('Failed to retrieve project logs.');
-    (0, utils_1.logError)('Error during log fetch', error);
+    spinner.fail("Failed to retrieve project logs.");
+    (0, utils_1.logError)("Error during log fetch", error);
 };
 var formatProjectLogs = function (projectLogs, deploymentId) {
     try {
-        var _a = projectLogs.logs, logs_1 = _a === void 0 ? '' : _a, metadata = __rest(projectLogs, ["logs"]);
+        var _a = projectLogs.logs, logs_1 = _a === void 0 ? "" : _a, metadata = __rest(projectLogs, ["logs"]);
         var formatDate_1 = function (dateString) {
             try {
                 return new Date(dateString).toLocaleString();
@@ -149,23 +151,23 @@ var formatProjectLogs = function (projectLogs, deploymentId) {
             .map(function (_a) {
             var _b;
             var key = _a[0], value = _a[1];
-            var formattedValue = ((_b = value === null || value === void 0 ? void 0 : value.includes) === null || _b === void 0 ? void 0 : _b.call(value, 'T'))
+            var formattedValue = ((_b = value === null || value === void 0 ? void 0 : value.includes) === null || _b === void 0 ? void 0 : _b.call(value, "T"))
                 ? formatDate_1(value)
                 : value;
-            var formattedKey = key.replace(/([A-Z])/g, ' $1').toLowerCase();
+            var formattedKey = key.replace(/([A-Z])/g, " $1").toLowerCase();
             return "\u001B[36m".concat(formattedKey, ":\u001B[0m ").concat(formattedValue);
         })
-            .join('\n');
-        var projectUrl = "\nurl: https://".concat(deploymentId.replace('codegen-', ''), "-agent.dainapp.com");
+            .join("\n");
+        var projectUrl = "\nurl: https://".concat(deploymentId.replace("codegen-", ""), "-agent.dainapp.com");
         var output = [
-            '\n',
-            '\x1b[1m=== Project ===\x1b[0m',
+            "\n",
+            "\x1b[1m=== Project ===\x1b[0m",
             formattedMetadata,
             projectUrl,
-            '\n\x1b[1m=== Logs ===\x1b[0m',
+            "\n\x1b[1m=== Logs ===\x1b[0m",
             logs_1,
         ];
-        return output.join('\n');
+        return output.join("\n");
     }
     catch (error) {
         return "Error formatting logs: ".concat(error.message);

package/dist/commands/status.js

@@ -42,29 +42,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = status;
 var ora_1 = __importDefault(require("ora"));
 var utils_1 = require("../utils");
-function status(options, preDefinedDeploymentId) {
+function status(options, preDefinedDeploymentId, preDefinedEnvironmentName, preDefinedServiceId) {
     return __awaiter(this, void 0, void 0, function () {
         var config, orgId, _a, apiKey, deploymentId, statusUrl, spinner, response, result, error_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
-                    orgId = 'hackathon';
-                    _a = initializeConfig(config, orgId, preDefinedDeploymentId), apiKey = _a.apiKey, deploymentId = _a.deploymentId, statusUrl = _a.statusUrl;
+                    orgId = "hackathon";
+                    _a = initializeConfig(config, orgId, preDefinedDeploymentId, preDefinedEnvironmentName, preDefinedServiceId), apiKey = _a.apiKey, deploymentId = _a.deploymentId, statusUrl = _a.statusUrl;
                     if (!orgId || !deploymentId) {
-                        (0, utils_1.logError)('Org ID or deployment ID not found');
+                        (0, utils_1.logError)("Org ID or deployment ID not found");
                         return [2 /*return*/];
                     }
-                    spinner = (0, ora_1.default)("Checking status for project ".concat(config['project-id'], "...")).start();
+                    spinner = (0, ora_1.default)("Checking status for project ".concat(config["project-id"], "...")).start();
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 4, , 5]);
                     return [4 /*yield*/, fetch(statusUrl, {
-                            method: 'GET',
+                            method: "GET",
                             headers: {
-                                'Content-Type': 'application/json',
-                                'X-DAIN-SIGNATORY-ADDRESS': 'TODO: X-DAIN-SIGNATORY-ADDRESS',
-                                'X-DAIN-SIGNATURE': 'TODO: X-DAIN-SIGNATORY-SIGNATURE',
+                                "Content-Type": "application/json",
+                                "X-DAIN-SIGNATORY-ADDRESS": "TODO: X-DAIN-SIGNATORY-ADDRESS",
+                                "X-DAIN-SIGNATURE": "TODO: X-DAIN-SIGNATORY-SIGNATURE",
                                 Authorization: "Bearer ".concat(apiKey),
                             },
                         })];
@@ -76,15 +76,15 @@ function status(options, preDefinedDeploymentId) {
                     return [4 /*yield*/, response.json()];
                 case 3:
                     result = _b.sent();
-                    spinner.info('Status: ' + result.message);
+                    spinner.info("Status: " + result.message);
                     if (!preDefinedDeploymentId) {
                         process.exit(0);
                     }
                     return [2 /*return*/, result];
                 case 4:
                     error_1 = _b.sent();
-                    spinner.fail('Failed to retrieve project status.');
-                    (0, utils_1.logError)('Error during status check', error_1);
+                    spinner.fail("Failed to retrieve project status.");
+                    (0, utils_1.logError)("Error during status check", error_1);
                     process.exit(1);
                     return [3 /*break*/, 5];
                 case 5: return [2 /*return*/];
@@ -92,11 +92,13 @@ function status(options, preDefinedDeploymentId) {
         });
     });
 }
-var initializeConfig = function (config, orgId, preDefinedDeploymentId) {
-    var baseUrl = config['platform-base-url'] || 'https://codegen-deploy-service.dainapp.com/';
-    var apiKey = config['api-key'];
+var initializeConfig = function (config, orgId, preDefinedDeploymentId, preDefinedEnvironment, preDefinedServiceId) {
+    var baseUrl = config["platform-base-url"] || "https://codegen-deploy-service.dainapp.com/";
+    var apiKey = config["api-key"];
     var orgIdToBeUsed = orgId || (0, utils_1.extractOrgId)(apiKey);
-    var deploymentId = preDefinedDeploymentId || config['deployment-id'];
-    var statusUrl = "".concat(baseUrl, "/codegen-deploy/status/").concat(orgIdToBeUsed, "/").concat(deploymentId);
+    var deploymentId = preDefinedDeploymentId || config["deployment-id"];
+    var environment = preDefinedEnvironment || config["environment"];
+    var serviceId = preDefinedServiceId || config["service-id"];
+    var statusUrl = "".concat(baseUrl, "/codegen-deploy/status/").concat(orgIdToBeUsed, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment);
     return { baseUrl: baseUrl, apiKey: apiKey, orgIdToBeUsed: orgIdToBeUsed, deploymentId: deploymentId, statusUrl: statusUrl };
 };

package/dist/commands/undeploy.js

@@ -49,22 +49,22 @@ function undeploy(options) {
             switch (_b.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
-                    spinner = (0, ora_1.default)("Undeploying deployment ".concat(config['deployment-id'], "...")).start();
+                    spinner = (0, ora_1.default)("Undeploying deployment ".concat(config["deployment-id"], "...")).start();
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 3, 4, 5]);
-                    orgId = 'hackathon';
+                    orgId = "hackathon";
                     _a = initializeConfig(config, orgId), apiKey = _a.apiKey, deploymentId = _a.deploymentId, undeployUrl = _a.undeployUrl;
                     if (!orgId || !deploymentId) {
-                        (0, utils_1.logError)('Org ID or deployment ID not found');
+                        (0, utils_1.logError)("Org ID or deployment ID not found");
                         return [2 /*return*/];
                     }
                     return [4 /*yield*/, fetch(undeployUrl, {
-                            method: 'DELETE',
+                            method: "DELETE",
                             headers: {
-                                'Content-Type': 'application/json',
-                                'X-DAIN-SIGNATORY-ADDRESS': 'TODO: X-DAIN-SIGNATORY-ADDRESS',
-                                'X-DAIN-SIGNATURE': 'TODO: X-DAIN-SIGNATORY-SIGNATURE',
+                                "Content-Type": "application/json",
+                                "X-DAIN-SIGNATORY-ADDRESS": "TODO: X-DAIN-SIGNATORY-ADDRESS",
+                                "X-DAIN-SIGNATURE": "TODO: X-DAIN-SIGNATORY-SIGNATURE",
                                 Authorization: "Bearer ".concat(apiKey),
                             },
                         })];
@@ -73,13 +73,13 @@ function undeploy(options) {
                     if (!response.ok) {
                         throw new Error("Undeployment failed: ".concat(response.statusText));
                     }
-                    spinner.succeed('Undeployment completed successfully.');
+                    spinner.succeed("Undeployment completed successfully.");
                     spinner.info("Undeployment completed with status code: ".concat(response.status));
                     return [3 /*break*/, 5];
                 case 3:
                     error_1 = _b.sent();
-                    spinner.fail('Failed to undeploy project.');
-                    (0, utils_1.logError)('Error during undeployment', error_1);
+                    spinner.fail("Failed to undeploy project.");
+                    (0, utils_1.logError)("Error during undeployment", error_1);
                     process.exit(1);
                     return [3 /*break*/, 5];
                 case 4:
@@ -92,10 +92,12 @@ function undeploy(options) {
     });
 }
 var initializeConfig = function (config, orgId) {
-    var baseUrl = config['platform-base-url'] || 'https://codegen-deploy-service.dainapp.com/';
-    var apiKey = config['api-key'];
+    var baseUrl = config["platform-base-url"] || "https://codegen-deploy-service.dainapp.com/";
+    var apiKey = config["api-key"];
     var orgIdToBeUsed = orgId || (0, utils_1.extractOrgId)(apiKey);
-    var deploymentId = config['deployment-id'];
-    var undeployUrl = "".concat(baseUrl, "/codegen-deploy/undeploy/").concat(orgIdToBeUsed, "/").concat(deploymentId);
+    var deploymentId = config["deployment-id"];
+    var environment = config["environment"];
+    var serviceId = config["service-id"];
+    var undeployUrl = "".concat(baseUrl, "/codegen-deploy/undeploy/").concat(orgIdToBeUsed, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment);
     return { baseUrl: baseUrl, apiKey: apiKey, orgIdToBeUsed: orgIdToBeUsed, deploymentId: deploymentId, undeployUrl: undeployUrl };
 };