@dainprotocol/cli 1.2.26 → 1.2.30

package/dist/commands/dev.js

@@ -65,124 +65,156 @@ 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)()
-            .listen(port, function () {
-            server.close();
-            resolve(true);
-        })
-            .on('error', function () {
-            resolve(false);
+            .listen(port, function () { server.close(); resolve(true); })
+            .on('error', function () { return resolve(false); });
+    });
+}
+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(command, options, isRestart) {
+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;
+    var tsNodePath = path_1.default.join(process.cwd(), 'node_modules', '.bin', 'ts-node');
+    if (!fs_extra_1.default.existsSync(tsNodePath)) {
+        spinner.fail('ts-node not found. Run: npm install ts-node typescript');
+        return;
+    }
+    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,
+    });
+    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);
-    });
-    (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', function (data) {
-        if (!serverStarted) {
+        else {
             spinner.fail('Development server error.');
-            serverStarted = true; // Prevent multiple error messages too
         }
-        (0, utils_1.logError)(data);
+    };
+    (_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) {
+        var output = data.toString();
+        markStarted(output.includes('Error:') || output.includes('error:') ? false : true);
+        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));
-        }
-    });
-}
-function cleanup() {
-    if (childProcess) {
-        childProcess.kill();
         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);
+    });
+    childProcess.on('error', function (error) { spinner.fail("Failed to start: ".concat(error.message)); childProcess = null; });
 }
 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, portNumber, runtime, mainFile, resolvedMain, envVars, proxySetup, watchPaths, dainDir, outFile, MFconfig_1, debounceTimer_1, 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 = process.env.PORT || 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';
-                    }
-                    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, ")"));
                     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;
+                    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)];
+                    return [4 /*yield*/, isPortAvailable(portNumber)];
                 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(portNumber, " 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']) {
+                    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 +222,33 @@ 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']),
-                        config['static-dir']
-                            ? path_1.default.join(process.cwd(), config['static-dir'])
-                            : (0, utils_1.getStaticFilesPath)(),
-                    ];
-                    watcher = chokidar_1.default.watch(watchPaths, {
-                        ignored: /(^|[\/\\])\../, // ignore dotfiles
-                        persistent: 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);
-                    });
+                        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: /(^|[\/\\])\./, persistent: true, ignoreInitial: 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),
-                        log: new miniflare_1.Log(miniflare_1.LogLevel.DEBUG),
-                        liveReload: true,
-                    };
+                    MFconfig_1 = { scriptPath: outFile, modules: true, 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 +257,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/init.js

@@ -13,25 +13,19 @@ function init(projectName) {
     var projectDir = path_1.default.join(process.cwd(), projectName);
     var templateDir = path_1.default.join(__dirname, '..', '..', 'templates', 'default');
     try {
-        // Check Node.js version
-        var nodeVersion = process.version;
-        var versionNum = Number(nodeVersion.slice(1).split('.')[0]);
-        if (versionNum < 20) {
+        var nodeVersion = Number(process.version.slice(1).split('.')[0]);
+        if (nodeVersion < 20) {
             spinner.fail('Node.js version 20.7 or higher is required');
             (0, utils_1.logError)('Please upgrade Node.js to version 20.7 or higher');
             (0, utils_1.logInfo)('You can download it from: https://nodejs.org/');
             process.exit(1);
         }
-        // Check if directory already exists
         if (fs_extra_1.default.existsSync(projectDir)) {
             spinner.fail("Directory ".concat(projectName, " already exists"));
             process.exit(1);
         }
-        // Create project directory
         fs_extra_1.default.ensureDirSync(projectDir);
-        // Copy template files
         fs_extra_1.default.copySync(templateDir, projectDir);
-        // Modify package.json
         var packageJsonPath = path_1.default.join(projectDir, 'package.json');
         var packageJson = fs_extra_1.default.readJsonSync(packageJsonPath);
         packageJson.name = projectName;
@@ -42,7 +36,6 @@ function init(projectName) {
         (0, utils_1.logInfo)("  cd ".concat(projectName));
         (0, utils_1.logInfo)('  npm install');
         (0, utils_1.logInfo)('  npm run dev');
-        // Explicitly exit with success
         process.exit(0);
     }
     catch (error) {

package/dist/commands/logs.js

@@ -53,123 +53,129 @@ 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; }
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+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, apiKey, deploymentId, serviceId, logsUrl, spinner, result, error_1;
+        var _this = this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
-                    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");
-                        return [2 /*return*/];
+                    orgId = (0, utils_1.resolveOrgId)(config);
+                    apiKey = config["api-key"];
+                    deploymentId = config["deployment-id"];
+                    serviceId = config["service-id"];
+                    if (!orgId) {
+                        (0, utils_1.logError)("Org ID not found. Ensure your API key or DAIN_ORG_ID is set.");
+                        process.exit(1);
+                    }
+                    if (!deploymentId || !serviceId) {
+                        (0, utils_1.logError)("Deployment ID or service ID not found");
+                        process.exit(1);
                     }
+                    if (!apiKey) {
+                        (0, utils_1.logError)("API key not found");
+                        process.exit(1);
+                    }
+                    process.once("SIGINT", function () { cleanup(); process.exit(0); });
+                    process.once("SIGTERM", function () { cleanup(); process.exit(0); });
+                    logsUrl = (0, utils_1.buildPlatformUrl)(config, orgId, "logs");
                     spinner = (0, ora_1.default)("Fetching logs for project ".concat(config["project-id"], "...")).start();
-                    _b.label = 1;
+                    _a.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, 4, 5]);
-                    result = null;
+                    _a.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));
+                    result = _a.sent();
+                    spinner.stop();
+                    (0, utils_1.logInfo)("Project logs: ".concat(formatProjectLogs(result, deploymentId)));
                     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, 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");
+                                        (0, utils_1.logInfo)("Project logs: ".concat(formatProjectLogs(newResult, deploymentId)));
+                                        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*/];
+                    error_1 = _a.sent();
+                    spinner.fail("Failed to retrieve project logs.");
+                    (0, utils_1.logError)("Error during log fetch", error_1);
+                    process.exit(1);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     });
 }
-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 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 () {
-    var response;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, fetch(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));
-                }
-                return [4 /*yield*/, response.json()];
-            case 2: return [2 /*return*/, _a.sent()];
-        }
+function fetchLogs(url, apiKey) {
+    return __awaiter(this, void 0, void 0, function () {
+        var response;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, utils_1.fetchWithTimeout)(url, {
+                        method: "GET",
+                        headers: { "Content-Type": "application/json", Authorization: "Bearer ".concat(apiKey) },
+                    })];
+                case 1:
+                    response = _a.sent();
+                    if (!response.ok) {
+                        throw new Error("Log fetch failed: ".concat(response.status, " ").concat(response.statusText));
+                    }
+                    return [2 /*return*/, response.json()];
+            }
+        });
     });
-}); };
-var handleError = function (spinner, error) {
-    spinner.fail("Failed to retrieve project logs.");
-    (0, utils_1.logError)("Error during log fetch", error);
-};
-var formatProjectLogs = function (projectLogs, deploymentId) {
+}
+function formatProjectLogs(projectLogs, deploymentId) {
     try {
         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();
-            }
-            catch (_a) {
-                return dateString;
-            }
-        };
         var formattedMetadata = Object.entries(metadata)
             .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"))
-                ? formatDate_1(value)
+                ? new Date(value).toLocaleString()
                 : value;
-            var formattedKey = key.replace(/([A-Z])/g, " $1").toLowerCase();
-            return "\u001B[36m".concat(formattedKey, ":\u001B[0m ").concat(formattedValue);
+            return "\u001B[36m".concat(key.replace(/([A-Z])/g, " $1").toLowerCase(), ":\u001B[0m ").concat(formattedValue);
         })
             .join("\n");
         var projectUrl = "\nurl: https://".concat(deploymentId.replace("codegen-", ""), "-agent.dainapp.com");
-        var output = [
-            "\n",
-            "\x1b[1m=== Project ===\x1b[0m",
-            formattedMetadata,
-            projectUrl,
-            "\n\x1b[1m=== Logs ===\x1b[0m",
-            logs_1,
-        ];
-        return output.join("\n");
+        return ["\n", "\x1b[1m=== Project ===\x1b[0m", formattedMetadata, projectUrl, "\n\x1b[1m=== Logs ===\x1b[0m", logs_1].join("\n");
     }
     catch (error) {
         return "Error formatting logs: ".concat(error.message);
     }
-};
+}

package/dist/commands/start.js

@@ -1,14 +1,25 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = start;
 var child_process_1 = require("child_process");
+var fs_1 = __importDefault(require("fs"));
+var path_1 = __importDefault(require("path"));
 var utils_1 = require("../utils");
 function start(options) {
+    var config = (0, utils_1.getDainConfig)();
     process.env.PORT = options.port;
-    var command = "node ".concat((0, utils_1.getDainConfig)()['main-file']);
-    var child = (0, child_process_1.spawn)('node', [(0, utils_1.getDainConfig)()['main-file']], {
-        stdio: 'inherit' // This pipes stdout/stderr directly to parent process
-    });
+    var mainFile = config['main-file'];
+    var outDir = config['out-dir'] || 'dist';
+    var outputFile = path_1.default.join(process.cwd(), outDir, "".concat(path_1.default.basename(mainFile, path_1.default.extname(mainFile)), ".js"));
+    var entryFile = fs_1.default.existsSync(outputFile) ? outputFile : mainFile;
+    if (entryFile === mainFile && mainFile.endsWith('.ts')) {
+        (0, utils_1.logError)("Build output not found: ".concat(outputFile, ". Run \"dain build\" first."));
+        process.exit(1);
+    }
+    var child = (0, child_process_1.spawn)('node', [entryFile], { stdio: 'inherit' });
     child.on('error', function (error) {
         console.error("Error: ".concat(error.message));
         process.exit(1);