@dainprotocol/cli 1.2.25 → 1.2.28

package/dist/commands/dev.js

@@ -60,12 +60,14 @@ var miniflare_1 = require("miniflare");
 var build_1 = __importDefault(require("./build"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var net_1 = require("net");
+// Module state
 var childProcess = null;
 var watcher = null;
 var mf = null;
 var tunnelUrl = null;
 var isFirstStart = true;
-var serverStarted = false;
+var proxyServer = null;
+var isCleaningUp = false;
 function isPortAvailable(port) {
     return new Promise(function (resolve) {
         var server = (0, net_1.createServer)()
@@ -78,58 +80,121 @@ function isPortAvailable(port) {
         });
     });
 }
-function startProcess(command, options, isRestart) {
+function cleanup() {
+    if (isCleaningUp)
+        return;
+    isCleaningUp = true;
+    if (childProcess) {
+        childProcess.kill('SIGTERM');
+        childProcess = null;
+    }
+    if (watcher) {
+        watcher.close();
+        watcher = null;
+    }
+    if (mf) {
+        mf.dispose();
+        mf = null;
+    }
+    (0, utils_1.logInfo)('Development server and file watcher stopped.');
+}
+function gracefulShutdown() {
+    return __awaiter(this, arguments, void 0, function (exitCode) {
+        var _a;
+        if (exitCode === void 0) { exitCode = 0; }
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    cleanup();
+                    if (!proxyServer) return [3 /*break*/, 4];
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, proxyServer.stop()];
+                case 2:
+                    _b.sent();
+                    (0, utils_1.logInfo)('Proxy server closed.');
+                    return [3 /*break*/, 4];
+                case 3:
+                    _a = _b.sent();
+                    return [3 /*break*/, 4];
+                case 4:
+                    process.exit(exitCode);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function startProcess(mainFile, envVars, isRestart) {
     var _a, _b;
     if (isRestart === void 0) { isRestart = false; }
     if (childProcess) {
-        childProcess.kill();
+        childProcess.kill('SIGTERM');
+        childProcess = null;
     }
-    serverStarted = false; // Reset for each new process
     var spinner = (0, ora_1.default)(isRestart ? 'Restarting development server...' : 'Starting development server...').start();
-    childProcess = (0, child_process_1.exec)(command, options);
-    (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', function (data) {
-        if (!serverStarted) {
+    var hasStarted = false;
+    // Use spawn with args array to prevent command injection
+    var tsNodePath = path_1.default.join(process.cwd(), 'node_modules', '.bin', 'ts-node');
+    // Check if ts-node exists
+    if (!fs_extra_1.default.existsSync(tsNodePath)) {
+        spinner.fail('ts-node not found. Run: npm install ts-node typescript');
+        return;
+    }
+    // Check if main file exists
+    if (!fs_extra_1.default.existsSync(mainFile)) {
+        spinner.fail("Main file not found: ".concat(mainFile));
+        return;
+    }
+    childProcess = (0, child_process_1.spawn)(tsNodePath, [mainFile], {
+        env: __assign(__assign({}, process.env), envVars),
+        stdio: ['inherit', 'pipe', 'pipe'],
+        shell: false, // Explicitly disable shell to prevent injection
+    });
+    var markStarted = function (success) {
+        if (hasStarted)
+            return;
+        hasStarted = true;
+        if (success) {
             spinner.succeed(isRestart ? 'Development server restarted.' : 'Development server started.');
             if (tunnelUrl && isFirstStart) {
                 (0, utils_1.displayTunnelUrl)(tunnelUrl);
                 isFirstStart = false;
             }
-            serverStarted = true;
         }
-        console.log(data);
+        else {
+            spinner.fail('Development server error.');
+        }
+    };
+    (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', function (data) {
+        markStarted(true);
+        process.stdout.write(data.toString());
     });
     (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', function (data) {
-        if (!serverStarted) {
-            spinner.fail('Development server error.');
-            serverStarted = true; // Prevent multiple error messages too
+        var output = data.toString();
+        // Don't fail on warnings, only on actual errors
+        if (output.includes('Error:') || output.includes('error:')) {
+            markStarted(false);
+        }
+        else {
+            markStarted(true);
         }
-        (0, utils_1.logError)(data);
+        process.stderr.write(output);
     });
     childProcess.on('close', function (code) {
-        if (code !== 0 && !serverStarted) {
+        if (code !== 0 && code !== null && !hasStarted) {
             spinner.fail("Development server exited with code ".concat(code));
         }
+        childProcess = null;
     });
-}
-function cleanup() {
-    if (childProcess) {
-        childProcess.kill();
+    childProcess.on('error', function (error) {
+        spinner.fail("Failed to start: ".concat(error.message));
         childProcess = null;
-    }
-    if (watcher) {
-        watcher.close();
-        watcher = null;
-    }
-    if (mf) {
-        mf.dispose();
-        mf = null;
-    }
-    (0, utils_1.logInfo)('Development server and file watcher stopped.');
-    process.exit(0);
+    });
 }
 function dev(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, portSource, port, portNumber, runtime, tsNodePath, command, envVars, proxyServer, portNumber_1, proxySetup, watchPaths, dainDir, outFile, MFconfig_1, debounceTimer_1, watchDirs, error_1;
+        var config, port, portSource, portNumber, runtime, mainFile, resolvedMain, envVars, parsedPort, proxySetup, watchPaths, dainDir, outFile, MFconfig_1, debounceTimer_1, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -146,43 +211,54 @@ function dev(options) {
                         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';
+                    portNumber = parseInt(port, 10);
+                    if (isNaN(portNumber) || portNumber < 1 || portNumber > 65535) {
+                        (0, utils_1.logError)("Invalid port: ".concat(port, ". Must be 1-65535. Using default port 2022"));
+                        port = '2022';
                         portSource = 'default value (after invalid port)';
                     }
-                    else {
-                        options.port = port;
-                    }
-                    (0, utils_1.logInfo)("Using port ".concat(options.port, " (from ").concat(portSource, ")"));
+                    (0, utils_1.logInfo)("Using port ".concat(port, " (from ").concat(portSource, ")"));
                     runtime = options.runtime || config.runtime || 'node';
-                    tsNodePath = path_1.default.join(process.cwd(), 'node_modules', '.bin', 'ts-node');
-                    command = "\"".concat(tsNodePath, "\" \"").concat(config['main-file'], "\"");
+                    mainFile = config['main-file'];
+                    resolvedMain = path_1.default.resolve(process.cwd(), mainFile);
+                    if (!resolvedMain.startsWith(process.cwd())) {
+                        (0, utils_1.logError)('Invalid main-file path: must be within project directory');
+                        process.exit(1);
+                    }
                     envVars = {
-                        PORT: options.port,
+                        PORT: port,
                         DAIN_API_KEY: config['api-key'],
                         DAIN_PROJECT_ID: config['project-id'],
                         DAIN_ENVIRONMENT: config['environment'],
                         DAIN_OUT_DIR: config['out-dir'],
                     };
-                    proxyServer = null;
+                    // Register signal handlers once
+                    process.once('SIGINT', function () { return gracefulShutdown(0); });
+                    process.once('SIGTERM', function () { return gracefulShutdown(0); });
+                    process.once('uncaughtException', function (error) {
+                        (0, utils_1.logError)('Uncaught Exception:', error);
+                        gracefulShutdown(1);
+                    });
+                    process.once('unhandledRejection', function (reason) {
+                        (0, utils_1.logError)('Unhandled Rejection:', reason);
+                        gracefulShutdown(1);
+                    });
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 9, , 10]);
-                    portNumber_1 = parseInt(options.port);
-                    return [4 /*yield*/, isPortAvailable(portNumber_1)];
+                    parsedPort = parseInt(port, 10);
+                    return [4 /*yield*/, isPortAvailable(parsedPort)];
                 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."));
+                        (0, utils_1.logError)("Port ".concat(parsedPort, " is already in use. Use --port to specify a different port."));
                         process.exit(1);
                     }
-                    process.env.PORT = portNumber_1.toString();
+                    process.env.PORT = port;
                     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)];
+                    return [4 /*yield*/, (0, utils_1.setupProxy)(port, config['api-key'], config)];
                 case 3:
                     proxySetup = _a.sent();
                     proxyServer = proxySetup.client;
@@ -190,106 +266,50 @@ function dev(options) {
                     _a.label = 4;
                 case 4:
                     if (!(runtime === 'node')) return [3 /*break*/, 5];
-                    // Existing Node.js development process
-                    startProcess(command, { env: __assign(__assign({}, process.env), envVars) });
+                    startProcess(mainFile, envVars);
                     watchPaths = [
-                        path_1.default.dirname(config['main-file']),
+                        path_1.default.dirname(mainFile),
                         config['static-dir']
                             ? path_1.default.join(process.cwd(), config['static-dir'])
                             : (0, utils_1.getStaticFilesPath)(),
-                    ];
+                    ].filter(function (p) { return fs_extra_1.default.existsSync(p); });
                     watcher = chokidar_1.default.watch(watchPaths, {
-                        ignored: /(^|[\/\\])\../, // ignore dotfiles
+                        ignored: /(^|[\/\\])\../,
                         persistent: true,
+                        ignoreInitial: true,
                     });
-                    watcher.on('change', function (path) {
-                        (0, utils_1.logInfo)("File ".concat(path, " has been changed. Restarting..."));
-                        startProcess(command, { env: __assign(__assign({}, process.env), envVars) }, true);
+                    watcher.on('change', function (changedPath) {
+                        (0, utils_1.logInfo)("File ".concat(changedPath, " changed. Restarting..."));
+                        startProcess(mainFile, envVars, true);
                     });
                     (0, utils_1.logInfo)('Watching for file changes...');
-                    // Add signal handlers for graceful shutdown
-                    process.on('SIGINT', function () {
-                        cleanup();
-                        if (proxyServer) {
-                            proxyServer.close(function () {
-                                (0, utils_1.logInfo)('Proxy server closed.');
-                                setTimeout(function () {
-                                    process.exit(0);
-                                }, 500);
-                            });
-                        }
-                        else {
-                            setTimeout(function () {
-                                process.exit(0);
-                            }, 500);
-                        }
-                    });
-                    process.on('SIGTERM', function () {
-                        cleanup();
-                        if (proxyServer) {
-                            proxyServer.close(function () {
-                                (0, utils_1.logInfo)('Proxy server closed.');
-                                setTimeout(function () {
-                                    process.exit(0);
-                                }, 500);
-                            });
-                        }
-                        else {
-                            setTimeout(function () {
-                                process.exit(0);
-                            }, 500);
-                        }
-                    });
-                    // Handle uncaught exceptions and unhandled rejections
-                    process.on('uncaughtException', function (error) {
-                        (0, utils_1.logError)('Uncaught Exception:', error);
-                        cleanup();
-                        if (proxyServer)
-                            proxyServer.close();
-                        setTimeout(function () {
-                            process.exit(1);
-                        }, 500);
-                    });
-                    process.on('unhandledRejection', function (reason, promise) {
-                        (0, utils_1.logError)('Unhandled Rejection at:', promise + '\n\nreason:' + reason);
-                        cleanup();
-                        if (proxyServer)
-                            proxyServer.close();
-                        setTimeout(function () {
-                            process.exit(1);
-                        }, 500);
-                    });
                     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 6:
-                    // Start the build process in watch mode
                     _a.sent();
                     MFconfig_1 = {
                         scriptPath: outFile,
                         modules: true,
-                        port: parseInt(options.port),
+                        port: parseInt(port, 10),
                         log: new miniflare_1.Log(miniflare_1.LogLevel.DEBUG),
                         liveReload: true,
                     };
                     mf = new miniflare_1.Miniflare(MFconfig_1);
-                    (0, utils_1.logSuccess)("Miniflare server started on port ".concat(options.port));
-                    watchDirs = [dainDir];
-                    watchDirs.forEach(function (dir) {
-                        fs_extra_1.default.watch(dir, { recursive: true }, function (eventType, filename) {
+                    (0, utils_1.logSuccess)("Miniflare server started on port ".concat(port));
+                    debounceTimer_1 = null;
+                    fs_extra_1.default.watch(dainDir, { recursive: true }, function (_eventType, filename) {
+                        if (debounceTimer_1)
                             clearTimeout(debounceTimer_1);
-                            debounceTimer_1 = setTimeout(function () {
-                                if (mf) {
-                                    //  mf.setOptions({ scriptPath: outFile });
-                                    mf.setOptions(MFconfig_1);
-                                    (0, utils_1.logInfo)("Build updated (".concat(filename, ")"));
-                                }
-                            }, 300); // 300ms debounce time
-                        });
+                        debounceTimer_1 = setTimeout(function () {
+                            if (mf) {
+                                mf.setOptions(MFconfig_1);
+                                (0, utils_1.logInfo)("Build updated (".concat(filename, ")"));
+                            }
+                        }, 300);
                     });
                     (0, utils_1.logInfo)('Watching for file changes in source and build directories...');
                     return [3 /*break*/, 8];
@@ -298,12 +318,7 @@ function dev(options) {
                 case 9:
                     error_1 = _a.sent();
                     (0, utils_1.logError)("Error in dev process for ".concat(runtime, " runtime:"), error_1);
-                    cleanup();
-                    if (proxyServer)
-                        proxyServer.close();
-                    setTimeout(function () {
-                        process.exit(1);
-                    }, 500);
+                    gracefulShutdown(1);
                     return [3 /*break*/, 10];
                 case 10: return [2 /*return*/];
             }

package/dist/commands/logs.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -53,10 +64,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = logs;
 var ora_1 = __importDefault(require("ora"));
 var utils_1 = require("../utils");
-function logs(options_1) {
-    return __awaiter(this, arguments, void 0, function (options, isWatching) {
-        var config, orgId, _a, apiKey, deploymentId, logsUrl, spinner, result, formatLogs, error_1;
-        if (isWatching === void 0) { isWatching = false; }
+// Module state for cleanup
+var watchInterval = null;
+var isShuttingDown = false;
+function cleanup() {
+    isShuttingDown = true;
+    if (watchInterval) {
+        clearInterval(watchInterval);
+        watchInterval = null;
+    }
+}
+function logs(options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var config, orgId, _a, apiKey, deploymentId, logsUrl, spinner, result, formattedLogs, error_1;
+        var _this = this;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -65,37 +86,65 @@ function logs(options_1) {
                     _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");
-                        return [2 /*return*/];
+                        process.exit(1);
                     }
+                    // Setup cleanup handlers
+                    process.once("SIGINT", function () {
+                        cleanup();
+                        process.exit(0);
+                    });
+                    process.once("SIGTERM", function () {
+                        cleanup();
+                        process.exit(0);
+                    });
                     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]);
-                    result = null;
+                    _b.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, fetchLogs(logsUrl, apiKey)];
                 case 2:
                     result = _b.sent();
-                    formatLogs = formatProjectLogs(result, deploymentId);
-                    if (isWatching) {
-                        // clear terminal before printing logs when watching
-                        process.stdout.write("\x1Bc");
-                    }
-                    (0, utils_1.logInfo)("Project logs: ".concat(formatLogs));
+                    spinner.stop();
+                    formattedLogs = formatProjectLogs(result, deploymentId);
+                    (0, utils_1.logInfo)("Project logs: ".concat(formattedLogs));
                     if (options.watch) {
-                        setTimeout(function () { return logs(options, true); }, 10000);
+                        (0, utils_1.logInfo)("Watching for log updates (Ctrl+C to stop)...");
+                        watchInterval = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
+                            var newResult, newFormattedLogs, error_2;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (isShuttingDown)
+                                            return [2 /*return*/];
+                                        _a.label = 1;
+                                    case 1:
+                                        _a.trys.push([1, 3, , 4]);
+                                        return [4 /*yield*/, fetchLogs(logsUrl, apiKey)];
+                                    case 2:
+                                        newResult = _a.sent();
+                                        process.stdout.write("\x1Bc"); // Clear terminal
+                                        newFormattedLogs = formatProjectLogs(newResult, deploymentId);
+                                        (0, utils_1.logInfo)("Project logs: ".concat(newFormattedLogs));
+                                        return [3 /*break*/, 4];
+                                    case 3:
+                                        error_2 = _a.sent();
+                                        (0, utils_1.logError)("Error fetching logs", error_2);
+                                        return [3 /*break*/, 4];
+                                    case 4: return [2 /*return*/];
+                                }
+                            });
+                        }); }, 10000);
                     }
-                    if (!options.watch) {
+                    else {
                         process.exit(0);
                     }
-                    return [3 /*break*/, 5];
+                    return [3 /*break*/, 4];
                 case 3:
                     error_1 = _b.sent();
                     handleError(spinner, error_1);
-                    return [3 /*break*/, 5];
-                case 4:
-                    spinner.stop();
-                    return [7 /*endfinally*/];
-                case 5: return [2 /*return*/];
+                    process.exit(1);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     });
@@ -107,28 +156,50 @@ var initializeConfig = function (config, orgId) {
     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 };
+    return { apiKey: apiKey, deploymentId: deploymentId, logsUrl: logsUrl };
 };
+var FETCH_TIMEOUT_MS = 30000;
+function fetchWithTimeout(url_1, options_1) {
+    return __awaiter(this, arguments, void 0, function (url, options, timeoutMs) {
+        var controller, timeoutId, response;
+        if (timeoutMs === void 0) { timeoutMs = FETCH_TIMEOUT_MS; }
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    controller = new AbortController();
+                    timeoutId = setTimeout(function () { return controller.abort(); }, timeoutMs);
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, , 3, 4]);
+                    return [4 /*yield*/, fetch(url, __assign(__assign({}, options), { signal: controller.signal }))];
+                case 2:
+                    response = _a.sent();
+                    return [2 /*return*/, response];
+                case 3:
+                    clearTimeout(timeoutId);
+                    return [7 /*endfinally*/];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
 var fetchLogs = function (logsUrl, apiKey) { return __awaiter(void 0, void 0, void 0, function () {
     var response;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, fetch(logsUrl, {
+            case 0: return [4 /*yield*/, fetchWithTimeout(logsUrl, {
                     method: "GET",
                     headers: {
                         "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),
                     },
                 })];
             case 1:
                 response = _a.sent();
                 if (!response.ok) {
-                    throw new Error("Log fetch failed: ".concat(response.statusText));
+                    throw new Error("Log fetch failed: ".concat(response.status, " ").concat(response.statusText));
                 }
-                return [4 /*yield*/, response.json()];
-            case 2: return [2 /*return*/, _a.sent()];
+                return [2 /*return*/, response.json()];
         }
     });
 }); };

package/dist/commands/status.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -42,6 +53,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = status;
 var ora_1 = __importDefault(require("ora"));
 var utils_1 = require("../utils");
+var FETCH_TIMEOUT_MS = 30000;
+function fetchWithTimeout(url_1, options_1) {
+    return __awaiter(this, arguments, void 0, function (url, options, timeoutMs) {
+        var controller, timeoutId, response;
+        if (timeoutMs === void 0) { timeoutMs = FETCH_TIMEOUT_MS; }
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    controller = new AbortController();
+                    timeoutId = setTimeout(function () { return controller.abort(); }, timeoutMs);
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, , 3, 4]);
+                    return [4 /*yield*/, fetch(url, __assign(__assign({}, options), { signal: controller.signal }))];
+                case 2:
+                    response = _a.sent();
+                    return [2 /*return*/, response];
+                case 3:
+                    clearTimeout(timeoutId);
+                    return [7 /*endfinally*/];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
 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;
@@ -51,27 +87,25 @@ function status(options, preDefinedDeploymentId, preDefinedEnvironmentName, preD
                     config = (0, utils_1.getDainConfig)(options.config);
                     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");
-                        return [2 /*return*/];
+                    if (!deploymentId) {
+                        (0, utils_1.logError)("Deployment ID not found");
+                        process.exit(1);
                     }
                     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, {
+                    return [4 /*yield*/, fetchWithTimeout(statusUrl, {
                             method: "GET",
                             headers: {
                                 "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),
                             },
                         })];
                 case 2:
                     response = _b.sent();
                     if (!response.ok) {
-                        throw new Error("Status check failed: ".concat(response.statusText));
+                        throw new Error("Status check failed: ".concat(response.status, " ").concat(response.statusText));
                     }
                     return [4 /*yield*/, response.json()];
                 case 3:
@@ -95,10 +129,9 @@ function status(options, preDefinedDeploymentId, preDefinedEnvironmentName, preD
 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 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 };
+    var statusUrl = "".concat(baseUrl, "/codegen-deploy/status/").concat(orgId, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment);
+    return { apiKey: apiKey, deploymentId: deploymentId, statusUrl: statusUrl };
 };