@dainprotocol/cli 1.2.28 → 1.2.30

package/dist/commands/logs.js

@@ -1,15 +1,4 @@
 "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) {
@@ -64,7 +53,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = logs;
 var ora_1 = __importDefault(require("ora"));
 var utils_1 = require("../utils");
-// Module state for cleanup
 var watchInterval = null;
 var isShuttingDown = false;
 function cleanup() {
@@ -76,41 +64,44 @@ function cleanup() {
 }
 function logs(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, orgId, _a, apiKey, deploymentId, logsUrl, spinner, result, formattedLogs, error_1;
+        var config, orgId, apiKey, deploymentId, serviceId, logsUrl, spinner, result, error_1;
         var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        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");
+                    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);
                     }
-                    // Setup cleanup handlers
-                    process.once("SIGINT", function () {
-                        cleanup();
-                        process.exit(0);
-                    });
-                    process.once("SIGTERM", function () {
-                        cleanup();
-                        process.exit(0);
-                    });
+                    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]);
+                    _a.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, fetchLogs(logsUrl, apiKey)];
                 case 2:
-                    result = _b.sent();
+                    result = _a.sent();
                     spinner.stop();
-                    formattedLogs = formatProjectLogs(result, deploymentId);
-                    (0, utils_1.logInfo)("Project logs: ".concat(formattedLogs));
+                    (0, utils_1.logInfo)("Project logs: ".concat(formatProjectLogs(result, deploymentId)));
                     if (options.watch) {
                         (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;
+                            var newResult, error_2;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -122,9 +113,8 @@ function logs(options) {
                                         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));
+                                        process.stdout.write("\x1Bc");
+                                        (0, utils_1.logInfo)("Project logs: ".concat(formatProjectLogs(newResult, deploymentId)));
                                         return [3 /*break*/, 4];
                                     case 3:
                                         error_2 = _a.sent();
@@ -140,8 +130,9 @@ function logs(options) {
                     }
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _b.sent();
-                    handleError(spinner, error_1);
+                    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*/];
@@ -149,98 +140,42 @@ function logs(options) {
         });
     });
 }
-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 { 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; }
+function fetchLogs(url, apiKey) {
+    return __awaiter(this, void 0, void 0, function () {
+        var response;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0:
-                    controller = new AbortController();
-                    timeoutId = setTimeout(function () { return controller.abort(); }, timeoutMs);
-                    _a.label = 1;
+                case 0: return [4 /*yield*/, (0, utils_1.fetchWithTimeout)(url, {
+                        method: "GET",
+                        headers: { "Content-Type": "application/json", Authorization: "Bearer ".concat(apiKey) },
+                    })];
                 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*/];
+                    if (!response.ok) {
+                        throw new Error("Log fetch failed: ".concat(response.status, " ").concat(response.statusText));
+                    }
+                    return [2 /*return*/, response.json()];
             }
         });
     });
 }
-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*/, fetchWithTimeout(logsUrl, {
-                    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);

package/dist/commands/status.js

@@ -1,15 +1,4 @@
 "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,70 +42,53 @@ 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;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var config, orgId, apiKey, deploymentId, serviceId, statusUrl, spinner, response, result, error_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     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 (!deploymentId) {
-                        (0, utils_1.logError)("Deployment ID not found");
+                    orgId = (0, utils_1.resolveOrgId)(config);
+                    apiKey = config["api-key"];
+                    deploymentId = preDefinedDeploymentId || config["deployment-id"];
+                    serviceId = preDefinedServiceId || 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);
+                    }
+                    statusUrl = (0, utils_1.buildPlatformUrl)(config, orgId, "status", {
+                        deploymentId: deploymentId,
+                        environment: preDefinedEnvironmentName,
+                        serviceId: serviceId,
+                    });
                     spinner = (0, ora_1.default)("Checking status for project ".concat(config["project-id"], "...")).start();
-                    _b.label = 1;
+                    _a.label = 1;
                 case 1:
-                    _b.trys.push([1, 4, , 5]);
-                    return [4 /*yield*/, fetchWithTimeout(statusUrl, {
+                    _a.trys.push([1, 4, , 5]);
+                    return [4 /*yield*/, (0, utils_1.fetchWithTimeout)(statusUrl, {
                             method: "GET",
-                            headers: {
-                                "Content-Type": "application/json",
-                                Authorization: "Bearer ".concat(apiKey),
-                            },
+                            headers: { "Content-Type": "application/json", Authorization: "Bearer ".concat(apiKey) },
                         })];
                 case 2:
-                    response = _b.sent();
+                    response = _a.sent();
                     if (!response.ok) {
                         throw new Error("Status check failed: ".concat(response.status, " ").concat(response.statusText));
                     }
                     return [4 /*yield*/, response.json()];
                 case 3:
-                    result = _b.sent();
+                    result = _a.sent();
                     spinner.info("Status: " + result.message);
                     if (!preDefinedDeploymentId) {
                         process.exit(0);
                     }
                     return [2 /*return*/, result];
                 case 4:
-                    error_1 = _b.sent();
+                    error_1 = _a.sent();
                     spinner.fail("Failed to retrieve project status.");
                     (0, utils_1.logError)("Error during status check", error_1);
                     process.exit(1);
@@ -126,12 +98,3 @@ 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 deploymentId = preDefinedDeploymentId || config["deployment-id"];
-    var environment = preDefinedEnvironment || config["environment"];
-    var serviceId = preDefinedServiceId || config["service-id"];
-    var statusUrl = "".concat(baseUrl, "/codegen-deploy/status/").concat(orgId, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment);
-    return { apiKey: apiKey, deploymentId: deploymentId, statusUrl: statusUrl };
-};

package/dist/commands/undeploy.js

@@ -1,15 +1,4 @@
 "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) {
@@ -51,59 +40,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = undeploy;
-var utils_1 = require("../utils");
 var ora_1 = __importDefault(require("ora"));
-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 utils_1 = require("../utils");
 function undeploy(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, spinner, orgId, _a, apiKey, deploymentId, undeployUrl, response, error_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var config, orgId, apiKey, deploymentId, serviceId, spinner, undeployUrl, response, error_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
-                    spinner = (0, ora_1.default)("Undeploying deployment ".concat(config["deployment-id"], "...")).start();
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    orgId = "hackathon";
-                    _a = initializeConfig(config, orgId), apiKey = _a.apiKey, deploymentId = _a.deploymentId, undeployUrl = _a.undeployUrl;
-                    if (!deploymentId) {
-                        (0, utils_1.logError)("Deployment ID not found");
+                    orgId = (0, utils_1.resolveOrgId)(config);
+                    apiKey = config["api-key"];
+                    deploymentId = config["deployment-id"];
+                    serviceId = config["service-id"];
+                    spinner = (0, ora_1.default)("Undeploying deployment ".concat(deploymentId, "...")).start();
+                    if (!orgId) {
+                        (0, utils_1.logError)("Org ID not found. Ensure your API key or DAIN_ORG_ID is set.");
                         process.exit(1);
                     }
-                    return [4 /*yield*/, fetchWithTimeout(undeployUrl, {
+                    if (!deploymentId || !serviceId) {
+                        (0, utils_1.logError)("Deployment ID or service ID not found");
+                        process.exit(1);
+                    }
+                    undeployUrl = (0, utils_1.buildPlatformUrl)(config, orgId, "undeploy");
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, (0, utils_1.fetchWithTimeout)(undeployUrl, {
                             method: "DELETE",
-                            headers: {
-                                "Content-Type": "application/json",
-                                Authorization: "Bearer ".concat(apiKey),
-                            },
+                            headers: { "Content-Type": "application/json", Authorization: "Bearer ".concat(apiKey) },
                         })];
                 case 2:
-                    response = _b.sent();
+                    response = _a.sent();
                     if (!response.ok) {
                         throw new Error("Undeployment failed: ".concat(response.status, " ").concat(response.statusText));
                     }
@@ -111,7 +79,7 @@ function undeploy(options) {
                     process.exit(0);
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _b.sent();
+                    error_1 = _a.sent();
                     spinner.fail("Failed to undeploy project.");
                     (0, utils_1.logError)("Error during undeployment", error_1);
                     process.exit(1);
@@ -121,12 +89,3 @@ 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 deploymentId = config["deployment-id"];
-    var environment = config["environment"];
-    var serviceId = config["service-id"];
-    var undeployUrl = "".concat(baseUrl, "/codegen-deploy/undeploy/").concat(orgId, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment);
-    return { apiKey: apiKey, deploymentId: deploymentId, undeployUrl: undeployUrl };
-};

package/dist/index.js

@@ -14,7 +14,6 @@ var testchat_1 = __importDefault(require("./commands/testchat"));
 var status_1 = __importDefault(require("./commands/status"));
 var undeploy_1 = __importDefault(require("./commands/undeploy"));
 var logs_1 = __importDefault(require("./commands/logs"));
-var help_1 = __importDefault(require("./commands/help"));
 var program = new commander_1.Command();
 program
     .name('dain')
@@ -91,12 +90,6 @@ program
     .action(function (options) {
     (0, logs_1.default)(options);
 });
-program
-    .command('help')
-    .description('Show the help')
-    .action(function () {
-    (0, help_1.default)();
-});
 program.parse(process.argv);
 // Add a catch-all command for unknown commands
 program.on('command:*', function () {

package/dist/templates/default/dain.json

@@ -6,7 +6,7 @@
   "out-dir": "dist",
   "environment": "development",
   "version": "1.0.0",
-  "tunnel-base-url": "wss:///tunnel.dain-local.com",
+  "tunnel-base-url": "wss://tunnel.dain-local.com",
   "deployment-id": "",
   "service-id": ""
 }