@dainprotocol/cli 1.2.26 → 1.2.30

package/dist/commands/status.js

@@ -44,45 +44,51 @@ var ora_1 = __importDefault(require("ora"));
 var utils_1 = require("../utils");
 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 (!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 = 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*/, fetch(statusUrl, {
+                    _a.trys.push([1, 4, , 5]);
+                    return [4 /*yield*/, (0, utils_1.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),
-                            },
+                            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.statusText));
+                        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);
@@ -92,13 +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 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 };
-};

package/dist/commands/undeploy.js

@@ -40,64 +40,52 @@ 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 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, 5]);
-                    orgId = "hackathon";
-                    _a = initializeConfig(config, orgId), apiKey = _a.apiKey, deploymentId = _a.deploymentId, undeployUrl = _a.undeployUrl;
-                    if (!orgId || !deploymentId) {
-                        (0, utils_1.logError)("Org ID or deployment ID not found");
-                        return [2 /*return*/];
+                    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);
+                    }
+                    if (!deploymentId || !serviceId) {
+                        (0, utils_1.logError)("Deployment ID or service ID not found");
+                        process.exit(1);
                     }
-                    return [4 /*yield*/, fetch(undeployUrl, {
+                    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",
-                                "X-DAIN-SIGNATORY-ADDRESS": "TODO: X-DAIN-SIGNATORY-ADDRESS",
-                                "X-DAIN-SIGNATURE": "TODO: X-DAIN-SIGNATORY-SIGNATURE",
-                                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.statusText));
+                        throw new Error("Undeployment failed: ".concat(response.status, " ").concat(response.statusText));
                     }
                     spinner.succeed("Undeployment completed successfully.");
-                    spinner.info("Undeployment completed with status code: ".concat(response.status));
-                    return [3 /*break*/, 5];
+                    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);
-                    return [3 /*break*/, 5];
-                case 4:
-                    spinner.stop();
-                    process.exit(0);
-                    return [7 /*endfinally*/];
-                case 5: return [2 /*return*/];
+                    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 orgIdToBeUsed = orgId || (0, utils_1.extractOrgId)(apiKey);
-    var deploymentId = config["deployment-id"];
-    var environment = config["environment"];
-    var serviceId = config["service-id"];
-    var undeployUrl = "".concat(baseUrl, "/codegen-deploy/undeploy/").concat(orgIdToBeUsed, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment);
-    return { baseUrl: baseUrl, apiKey: apiKey, orgIdToBeUsed: orgIdToBeUsed, deploymentId: deploymentId, undeployUrl: undeployUrl };
-};

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": ""
 }

package/dist/utils.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) {
@@ -39,6 +50,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_API_BASE_URL = exports.DEFAULT_PLATFORM_BASE_URL = exports.DEFAULT_TUNNEL_BASE_URL = void 0;
+exports.normalizeBaseUrl = normalizeBaseUrl;
+exports.joinUrl = joinUrl;
+exports.parseEnvContent = parseEnvContent;
 exports.getDainConfig = getDainConfig;
 exports.displayTunnelUrl = displayTunnelUrl;
 exports.setupProxy = setupProxy;
@@ -47,51 +62,87 @@ exports.logSuccess = logSuccess;
 exports.logInfo = logInfo;
 exports.getStaticFilesPath = getStaticFilesPath;
 exports.extractOrgId = extractOrgId;
+exports.resolveOrgId = resolveOrgId;
+exports.fetchWithTimeout = fetchWithTimeout;
+exports.buildPlatformUrl = buildPlatformUrl;
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var client_1 = require("@dainprotocol/tunnel/client");
 var ora_1 = __importDefault(require("ora"));
 var chalk_1 = __importDefault(require("chalk"));
 var dotenv_1 = __importDefault(require("dotenv"));
+exports.DEFAULT_TUNNEL_BASE_URL = "wss://tunnel.dain-local.com";
+exports.DEFAULT_PLATFORM_BASE_URL = "https://codegen-deploy-service.dainapp.com";
+exports.DEFAULT_API_BASE_URL = "https://dain-platform-ochre.vercel.app";
+function normalizeBaseUrl(value) {
+    var trimmed = value.trim();
+    if (!trimmed)
+        return trimmed;
+    try {
+        return new URL(trimmed).toString().replace(/\/+$/, "");
+    }
+    catch (_a) {
+        return trimmed.replace(/\/+$/, "");
+    }
+}
+function joinUrl(baseUrl, pathname) {
+    return "".concat(normalizeBaseUrl(baseUrl), "/").concat(pathname.replace(/^\/+/, ""));
+}
+function parseEnvContent(envContent) {
+    return Object.entries(dotenv_1.default.parse(envContent))
+        .map(function (_a) {
+        var name = _a[0], value = _a[1];
+        return ({ name: name.trim(), value: value });
+    })
+        .filter(function (env) { return env.name !== "" && env.value !== ""; });
+}
+function parseDainApiKey(apiKey) {
+    if (!(apiKey === null || apiKey === void 0 ? void 0 : apiKey.startsWith("sk_agent_")))
+        return null;
+    var parts = apiKey.split("_");
+    if (parts.length < 5)
+        return null;
+    if (parts[2] === "org") {
+        if (!parts[3] || parts[4] !== "agent" || !parts[5])
+            return null;
+        var secret_1 = parts.slice(6).join("_");
+        return secret_1 ? { agentId: parts[5], orgId: parts[3], secret: secret_1 } : null;
+    }
+    var secret = parts.slice(4).join("_");
+    return parts[2] && parts[3] && secret ? { agentId: parts[2], orgId: parts[3], secret: secret } : null;
+}
 function loadEnvFiles() {
-    var envFiles = [".env.local", ".env", ".env.development", ".env.production"];
-    envFiles.forEach(function (file) {
+    [".env.local", ".env", ".env.development", ".env.production"].forEach(function (file) {
         var envPath = path_1.default.join(process.cwd(), file);
-        if (fs_1.default.existsSync(envPath)) {
+        if (fs_1.default.existsSync(envPath))
             dotenv_1.default.config({ path: envPath });
-        }
     });
 }
 function getDainConfig(configFile) {
-    loadEnvFiles(); // Loads all env files first
-    var defaultConfigPath = path_1.default.join(process.cwd(), "dain.json");
-    var configPath = configFile ? path_1.default.join(process.cwd(), configFile) : defaultConfigPath;
+    loadEnvFiles();
+    var configPath = path_1.default.join(process.cwd(), configFile || "dain.json");
     if (!fs_1.default.existsSync(configPath)) {
         logError("Configuration file not found: ".concat(configPath));
         process.exit(1);
     }
     try {
-        var configData = fs_1.default.readFileSync(configPath, "utf8");
-        var config = JSON.parse(configData);
-        // Validate required fields
-        if (!config["main-file"]) {
+        var config = JSON.parse(fs_1.default.readFileSync(configPath, "utf8"));
+        if (!config["main-file"])
             throw new Error("Configuration must include 'main-file'");
-        }
-        // Set default values for optional fields
-        config["environment"] = config["environment"] || "development";
-        config["version"] = config["version"] || "1.0.0";
-        config["out-dir"] = config["out-dir"] || "dist"; // Default to 'dist' if not specified
-        config["tunnel-base-url"] = config["tunnel-base-url"] || "wss://tunnel.dain-local.com"; // Default value if not specified
-        config["runtime"] = config["runtime"] || "node"; // Add this line
-        // Handle API key
-        if (!config["api-key"] ||
-            config["api-key"] === "env" ||
-            config["api-key"] === "MUST PUT IN .env.development as DAIN_API_KEY=YOUR_API_KEY") {
+        config.environment || (config.environment = "development");
+        config.version || (config.version = "1.0.0");
+        config["out-dir"] || (config["out-dir"] = "dist");
+        config.runtime || (config.runtime = "node");
+        config["tunnel-base-url"] = normalizeBaseUrl(config["tunnel-base-url"] || exports.DEFAULT_TUNNEL_BASE_URL);
+        if (config["platform-base-url"])
+            config["platform-base-url"] = normalizeBaseUrl(config["platform-base-url"]);
+        if (config["api-base-url"])
+            config["api-base-url"] = normalizeBaseUrl(config["api-base-url"]);
+        if (!config["api-key"] || config["api-key"] === "env" || config["api-key"].startsWith("MUST PUT")) {
             config["api-key"] = process.env.DAIN_API_KEY;
         }
-        if (!config["api-key"]) {
+        if (!config["api-key"])
             throw new Error("API key is not set in config or DAIN_API_KEY environment variable");
-        }
         return config;
     }
     catch (error) {
@@ -99,13 +150,7 @@ function getDainConfig(configFile) {
     }
 }
 function displayTunnelUrl(tunnelUrl) {
-    var divider = chalk_1.default.green("------------------------------------------------------------");
-    var header = chalk_1.default.green("Your service is available publicly at:");
-    var url = chalk_1.default.cyan.underline(tunnelUrl);
-    var info = chalk_1.default.yellow("This service URL can be connected to by a DAIN client or assistant");
-    var subInfo = chalk_1.default.yellow("(such as butterfly in development mode)");
-    var warning = chalk_1.default.red("You should not visit this URL directly");
-    console.log("\n".concat(divider, "\n").concat(header, "\n").concat(url, "\n\n").concat(info, "\n").concat(subInfo, "\n\n").concat(warning, "\n").concat(divider, "\n"));
+    console.log("\n".concat(chalk_1.default.green("------------------------------------------------------------"), "\n").concat(chalk_1.default.green("Your service is available publicly at:"), "\n").concat(chalk_1.default.cyan.underline(tunnelUrl), "\n\n").concat(chalk_1.default.yellow("This service URL can be connected to by a DAIN client or assistant"), "\n").concat(chalk_1.default.yellow("(such as butterfly in development mode)"), "\n\n").concat(chalk_1.default.red("You should not visit this URL directly"), "\n").concat(chalk_1.default.green("------------------------------------------------------------"), "\n"));
 }
 function setupProxy(port, apiKey, config) {
     return __awaiter(this, void 0, void 0, function () {
@@ -117,12 +162,11 @@ function setupProxy(port, apiKey, config) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    client = new client_1.DainTunnel(config["tunnel-base-url"] || "wss://tunnel.dain-local.com", apiKey);
+                    client = new client_1.DainTunnel(config["tunnel-base-url"] || exports.DEFAULT_TUNNEL_BASE_URL, apiKey);
                     return [4 /*yield*/, client.start(parseInt(port))];
                 case 2:
                     tunnelUrl = _a.sent();
                     spinner.succeed("Proxy setup complete");
-                    displayTunnelUrl(tunnelUrl);
                     return [2 /*return*/, { client: client, tunnelUrl: tunnelUrl }];
                 case 3:
                     error_1 = _a.sent();
@@ -136,9 +180,8 @@ function setupProxy(port, apiKey, config) {
 }
 function logError(message, error) {
     console.error(chalk_1.default.red("\nError: ".concat(message)));
-    if (error) {
+    if (error)
         console.error(chalk_1.default.red(error));
-    }
 }
 function logSuccess(message) {
     console.log(chalk_1.default.green("\nSuccess: ".concat(message)));
@@ -150,6 +193,38 @@ function getStaticFilesPath() {
     return path_1.default.join(process.cwd(), "static");
 }
 function extractOrgId(apiKey) {
-    var apiKeySplit = apiKey === null || apiKey === void 0 ? void 0 : apiKey.split("_");
-    return apiKeySplit ? apiKeySplit[2] : "";
+    var _a;
+    return ((_a = parseDainApiKey(apiKey)) === null || _a === void 0 ? void 0 : _a.orgId) || "";
+}
+function resolveOrgId(config) {
+    return config["org-id"] || process.env.DAIN_ORG_ID || extractOrgId(config["api-key"]);
+}
+function fetchWithTimeout(url_1, options_1) {
+    return __awaiter(this, arguments, void 0, function (url, options, timeoutMs) {
+        var controller, timeoutId;
+        if (timeoutMs === void 0) { timeoutMs = 30000; }
+        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: return [2 /*return*/, _a.sent()];
+                case 3:
+                    clearTimeout(timeoutId);
+                    return [7 /*endfinally*/];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function buildPlatformUrl(config, orgId, endpoint, overrides) {
+    var baseUrl = config["platform-base-url"] || exports.DEFAULT_PLATFORM_BASE_URL;
+    var deploymentId = (overrides === null || overrides === void 0 ? void 0 : overrides.deploymentId) || config["deployment-id"];
+    var environment = (overrides === null || overrides === void 0 ? void 0 : overrides.environment) || config["environment"];
+    var serviceId = (overrides === null || overrides === void 0 ? void 0 : overrides.serviceId) || config["service-id"];
+    return joinUrl(baseUrl, "/codegen-deploy/".concat(endpoint, "/").concat(orgId, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dainprotocol/cli",
-  "version": "1.2.26",
+  "version": "1.2.30",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -10,6 +10,13 @@
   "bin": {
     "dain": "./dist/index.js"
   },
+  "scripts": {
+    "build": "tsc && cp -r templates dist/",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "prepublishOnly": "pnpm run build && pnpm test"
+  },
   "files": [
     "dist",
     "README.md"
@@ -34,11 +41,11 @@
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",
+    "@types/jest": "^30.0.0",
     "@types/node": "^22.5.4",
+    "jest": "^30.2.0",
+    "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
-  },
-  "scripts": {
-    "build": "tsc && cp -r templates dist/"
   }
-}
+}