@dainprotocol/cli 1.2.30 → 1.2.33

package/dist/commands/build.js

@@ -165,7 +165,7 @@ function copyWasmDependencies(bundlePath, nodeModulesPath, outDir) {
                 case 7: return [3 /*break*/, 9];
                 case 8:
                     error_1 = _a.sent();
-                    console.warn('Warning: Could not process WASM dependencies:', error_1);
+                    (0, utils_1.logInfo)("Warning: Could not process WASM dependencies: ".concat(error_1));
                     return [3 /*break*/, 9];
                 case 9: return [2 /*return*/, copiedFiles];
             }

package/dist/commands/deploy.js

@@ -77,7 +77,8 @@ function deploy(options) {
                         spinner.fail("No project found on platform linked to this repository.");
                     _d.label = 4;
                 case 4:
-                    _d.trys.push([4, 18, , 19]);
+                    _d.trys.push([4, 16, , 17]);
+                    result = void 0;
                     if (!(projectId && repoName && branchName)) return [3 /*break*/, 7];
                     spinner.info("Deploying project using github repository...").start();
                     return [4 /*yield*/, (0, utils_1.fetchWithTimeout)((0, utils_1.joinUrl)(basePath, "/api/app/codegen/data/projects/".concat(projectId, "/start-deploy")), {
@@ -114,26 +115,19 @@ function deploy(options) {
                 case 13:
                     _c = _d.sent();
                     return [3 /*break*/, 14];
-                case 14:
-                    if (!result) return [3 /*break*/, 16];
-                    return [4 /*yield*/, updateDainJson(result)];
+                case 14: return [4 /*yield*/, updateDainJson(result)];
                 case 15:
                     _d.sent();
                     printDeploymentResult(result, spinner);
                     process.exit(0);
                     return [3 /*break*/, 17];
                 case 16:
-                    spinner.fail("Deployment failed.");
-                    process.exit(1);
-                    _d.label = 17;
-                case 17: return [3 /*break*/, 19];
-                case 18:
                     error_1 = _d.sent();
                     spinner.fail("Deployment failed.");
                     (0, utils_1.logError)("Error during deployment: ", error_1);
                     process.exit(1);
-                    return [3 /*break*/, 19];
-                case 19: return [2 /*return*/];
+                    return [3 /*break*/, 17];
+                case 17: return [2 /*return*/];
             }
         });
     });

package/dist/commands/dev.js

@@ -67,6 +67,7 @@ var tunnelUrl = null;
 var isFirstStart = true;
 var proxyServer = null;
 var isCleaningUp = false;
+var debounceTimer = null;
 function isPortAvailable(port) {
     return new Promise(function (resolve) {
         var server = (0, net_1.createServer)()
@@ -78,6 +79,10 @@ function cleanup() {
     if (isCleaningUp)
         return;
     isCleaningUp = true;
+    if (debounceTimer) {
+        clearTimeout(debounceTimer);
+        debounceTimer = null;
+    }
     if (childProcess) {
         childProcess.kill('SIGTERM');
         childProcess = null;
@@ -172,7 +177,7 @@ function startProcess(mainFile, envVars, isRestart) {
 }
 function dev(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, port, portNumber, runtime, mainFile, resolvedMain, envVars, proxySetup, watchPaths, dainDir, outFile, MFconfig_1, debounceTimer_1, error_1;
+        var config, port, portNumber, runtime, mainFile, resolvedMain, envVars, proxySetup, watchPaths, dainDir, outFile, MFconfig_1, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -228,7 +233,14 @@ function dev(options) {
                         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); });
+                    watcher.on('change', function (changedPath) {
+                        if (debounceTimer)
+                            clearTimeout(debounceTimer);
+                        debounceTimer = setTimeout(function () {
+                            (0, utils_1.logInfo)("File ".concat(changedPath, " changed. Restarting..."));
+                            startProcess(mainFile, envVars, true);
+                        }, 300);
+                    });
                     (0, utils_1.logInfo)('Watching for file changes...');
                     return [3 /*break*/, 8];
                 case 5:
@@ -241,11 +253,10 @@ function dev(options) {
                     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(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) {
+                        if (debounceTimer)
+                            clearTimeout(debounceTimer);
+                        debounceTimer = setTimeout(function () { if (mf) {
                             mf.setOptions(MFconfig_1);
                             (0, utils_1.logInfo)("Build updated (".concat(filename, ")"));
                         } }, 300);

package/dist/commands/logs.js

@@ -56,6 +56,8 @@ var utils_1 = require("../utils");
 var watchInterval = null;
 var isShuttingDown = false;
 function cleanup() {
+    if (isShuttingDown)
+        return;
     isShuttingDown = true;
     if (watchInterval) {
         clearInterval(watchInterval);
@@ -64,40 +66,24 @@ function cleanup() {
 }
 function logs(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, orgId, apiKey, deploymentId, serviceId, logsUrl, spinner, result, error_1;
+        var config, ctx, 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 = (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);
-                    }
+                    ctx = (0, utils_1.validatePlatformConfig)(config);
                     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();
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, fetchLogs(logsUrl, apiKey)];
+                    return [4 /*yield*/, fetchLogs(ctx)];
                 case 2:
                     result = _a.sent();
                     spinner.stop();
-                    (0, utils_1.logInfo)("Project logs: ".concat(formatProjectLogs(result, deploymentId)));
+                    (0, utils_1.logInfo)("Project logs: ".concat(formatProjectLogs(result, ctx.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 () {
@@ -110,11 +96,11 @@ function logs(options) {
                                         _a.label = 1;
                                     case 1:
                                         _a.trys.push([1, 3, , 4]);
-                                        return [4 /*yield*/, fetchLogs(logsUrl, apiKey)];
+                                        return [4 /*yield*/, fetchLogs(ctx)];
                                     case 2:
                                         newResult = _a.sent();
                                         process.stdout.write("\x1Bc");
-                                        (0, utils_1.logInfo)("Project logs: ".concat(formatProjectLogs(newResult, deploymentId)));
+                                        (0, utils_1.logInfo)("Project logs: ".concat(formatProjectLogs(newResult, ctx.deploymentId)));
                                         return [3 /*break*/, 4];
                                     case 3:
                                         error_2 = _a.sent();
@@ -140,15 +126,12 @@ function logs(options) {
         });
     });
 }
-function fetchLogs(url, apiKey) {
+function fetchLogs(ctx) {
     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 0: return [4 /*yield*/, (0, utils_1.platformRequest)(ctx, "logs")];
                 case 1:
                     response = _a.sent();
                     if (!response.ok) {
@@ -164,10 +147,10 @@ function formatProjectLogs(projectLogs, deploymentId) {
         var _a = projectLogs.logs, logs_1 = _a === void 0 ? "" : _a, metadata = __rest(projectLogs, ["logs"]);
         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"))
-                ? new Date(value).toLocaleString()
+            var stringValue = String(value);
+            var formattedValue = stringValue.includes("T")
+                ? new Date(stringValue).toLocaleString()
                 : value;
             return "\u001B[36m".concat(key.replace(/([A-Z])/g, " $1").toLowerCase(), ":\u001B[0m ").concat(formattedValue);
         })

package/dist/commands/status.js

@@ -44,35 +44,21 @@ 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, apiKey, deploymentId, serviceId, statusUrl, spinner, response, result, error_1;
+        var config, ctx, spinner, response, result, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
-                    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,
+                    ctx = (0, utils_1.validatePlatformConfig)(config, {
+                        deploymentId: preDefinedDeploymentId,
+                        serviceId: preDefinedServiceId,
                     });
                     spinner = (0, ora_1.default)("Checking status for project ".concat(config["project-id"], "...")).start();
                     _a.label = 1;
                 case 1:
                     _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) },
+                    return [4 /*yield*/, (0, utils_1.platformRequest)(ctx, "status", "GET", {
+                            environment: preDefinedEnvironmentName,
                         })];
                 case 2:
                     response = _a.sent();

package/dist/commands/undeploy.js

@@ -44,32 +44,17 @@ var ora_1 = __importDefault(require("ora"));
 var utils_1 = require("../utils");
 function undeploy(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, orgId, apiKey, deploymentId, serviceId, spinner, undeployUrl, response, error_1;
+        var config, ctx, spinner, response, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
-                    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);
-                    }
-                    undeployUrl = (0, utils_1.buildPlatformUrl)(config, orgId, "undeploy");
+                    ctx = (0, utils_1.validatePlatformConfig)(config);
+                    spinner = (0, ora_1.default)("Undeploying deployment ".concat(ctx.deploymentId, "...")).start();
                     _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) },
-                        })];
+                    return [4 /*yield*/, (0, utils_1.platformRequest)(ctx, "undeploy", "DELETE")];
                 case 2:
                     response = _a.sent();
                     if (!response.ok) {

package/dist/utils.js

@@ -65,6 +65,9 @@ exports.extractOrgId = extractOrgId;
 exports.resolveOrgId = resolveOrgId;
 exports.fetchWithTimeout = fetchWithTimeout;
 exports.buildPlatformUrl = buildPlatformUrl;
+exports.validatePlatformConfig = validatePlatformConfig;
+exports.platformRequest = platformRequest;
+exports.createIdempotentCleanup = createIdempotentCleanup;
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var client_1 = require("@dainprotocol/tunnel/client");
@@ -102,21 +105,32 @@ function parseDainApiKey(apiKey) {
     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 isOrgFormat = parts[2] === "org";
+    if (isOrgFormat) {
+        var orgId_1 = parts[3];
+        var isAgentKeyword = parts[4] === "agent";
+        var agentId_1 = parts[5];
         var secret_1 = parts.slice(6).join("_");
-        return secret_1 ? { agentId: parts[5], orgId: parts[3], secret: secret_1 } : null;
+        if (!orgId_1 || !isAgentKeyword || !agentId_1 || !secret_1)
+            return null;
+        return { agentId: agentId_1, orgId: orgId_1, secret: secret_1 };
     }
+    var agentId = parts[2];
+    var orgId = parts[3];
     var secret = parts.slice(4).join("_");
-    return parts[2] && parts[3] && secret ? { agentId: parts[2], orgId: parts[3], secret: secret } : null;
+    if (!agentId || !orgId || !secret)
+        return null;
+    return { agentId: agentId, orgId: orgId, secret: secret };
 }
 function loadEnvFiles() {
-    [".env.local", ".env", ".env.development", ".env.production"].forEach(function (file) {
+    var envFiles = [".env.local", ".env", ".env.development", ".env.production"];
+    for (var _i = 0, envFiles_1 = envFiles; _i < envFiles_1.length; _i++) {
+        var file = envFiles_1[_i];
         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();
@@ -154,7 +168,7 @@ function displayTunnelUrl(tunnelUrl) {
 }
 function setupProxy(port, apiKey, config) {
     return __awaiter(this, void 0, void 0, function () {
-        var spinner, client, tunnelUrl, error_1;
+        var spinner, client_2, tunnelUrl, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -162,12 +176,41 @@ 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"] || exports.DEFAULT_TUNNEL_BASE_URL, apiKey);
-                    return [4 /*yield*/, client.start(parseInt(port))];
+                    client_2 = new client_1.DainTunnel(config["tunnel-base-url"] || exports.DEFAULT_TUNNEL_BASE_URL, apiKey);
+                    // Handle tunnel lifecycle events
+                    client_2.on("disconnected", function () {
+                        console.log(chalk_1.default.yellow("\n⚠ Tunnel disconnected. Attempting to reconnect..."));
+                    });
+                    client_2.on("reconnecting", function (_a) {
+                        var attempt = _a.attempt, delay = _a.delay;
+                        console.log(chalk_1.default.yellow("  Reconnection attempt ".concat(attempt, "/10 in ").concat(Math.round(delay / 1000), "s...")));
+                    });
+                    client_2.on("reconnected", function () {
+                        console.log(chalk_1.default.green("✓ Tunnel reconnected successfully"));
+                    });
+                    client_2.on("error", function (error) {
+                        console.error(chalk_1.default.red("\n\u2717 Tunnel error: ".concat(error.message)));
+                    });
+                    client_2.on("max_reconnect_attempts", function () {
+                        console.error(chalk_1.default.red("\n✗ Tunnel failed to reconnect after 10 attempts."));
+                        console.log(chalk_1.default.yellow("  Resetting and trying again..."));
+                        // Reset and try one more time (resetReconnection added in tunnel 1.1.31)
+                        if (typeof client_2.resetReconnection === "function") {
+                            client_2.resetReconnection();
+                            client_2.start(parseInt(port)).catch(function (err) {
+                                console.error(chalk_1.default.red("\n\u2717 Unable to restore tunnel connection: ".concat(err.message)));
+                                console.log(chalk_1.default.yellow("  Please restart the dev server manually."));
+                            });
+                        }
+                        else {
+                            console.log(chalk_1.default.yellow("  Please restart the dev server manually."));
+                        }
+                    });
+                    return [4 /*yield*/, client_2.start(parseInt(port))];
                 case 2:
                     tunnelUrl = _a.sent();
                     spinner.succeed("Proxy setup complete");
-                    return [2 /*return*/, { client: client, tunnelUrl: tunnelUrl }];
+                    return [2 /*return*/, { client: client_2, tunnelUrl: tunnelUrl }];
                 case 3:
                     error_1 = _a.sent();
                     spinner.fail(chalk_1.default.red("Error setting up proxy"));
@@ -228,3 +271,48 @@ function buildPlatformUrl(config, orgId, endpoint, overrides) {
     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));
 }
+function validatePlatformConfig(config, overrides) {
+    var orgId = resolveOrgId(config);
+    var apiKey = config["api-key"];
+    var deploymentId = (overrides === null || overrides === void 0 ? void 0 : overrides.deploymentId) || config["deployment-id"];
+    var serviceId = (overrides === null || overrides === void 0 ? void 0 : overrides.serviceId) || config["service-id"];
+    if (!orgId) {
+        logError("Org ID not found. Ensure your API key or DAIN_ORG_ID is set.");
+        process.exit(1);
+    }
+    if (!deploymentId || !serviceId) {
+        logError("Deployment ID or service ID not found");
+        process.exit(1);
+    }
+    if (!apiKey) {
+        logError("API key not found");
+        process.exit(1);
+    }
+    return { config: config, orgId: orgId, apiKey: apiKey, deploymentId: deploymentId, serviceId: serviceId };
+}
+function platformRequest(ctx_1, endpoint_1) {
+    return __awaiter(this, arguments, void 0, function (ctx, endpoint, method, overrides) {
+        var url;
+        if (method === void 0) { method = "GET"; }
+        return __generator(this, function (_a) {
+            url = buildPlatformUrl(ctx.config, ctx.orgId, endpoint, {
+                deploymentId: ctx.deploymentId,
+                serviceId: ctx.serviceId,
+                environment: overrides === null || overrides === void 0 ? void 0 : overrides.environment,
+            });
+            return [2 /*return*/, fetchWithTimeout(url, {
+                    method: method,
+                    headers: { "Content-Type": "application/json", Authorization: "Bearer ".concat(ctx.apiKey) },
+                })];
+        });
+    });
+}
+function createIdempotentCleanup(cleanupFn) {
+    var hasRun = false;
+    return function idempotentCleanup() {
+        if (hasRun)
+            return;
+        hasRun = true;
+        cleanupFn();
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dainprotocol/cli",
-  "version": "1.2.30",
+  "version": "1.2.33",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -10,21 +10,14 @@
   "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"
   ],
   "dependencies": {
     "@ai-sdk/anthropic": "^0.0.50",
-    "@dainprotocol/service-sdk": "^2.0.77",
-    "@dainprotocol/tunnel": "^1.1.26",
+    "@dainprotocol/service-sdk": "2.0.80",
+    "@dainprotocol/tunnel": "1.1.33",
     "@types/fs-extra": "^11.0.4",
     "@types/localtunnel": "^2.0.4",
     "ai": "^3.3.41",
@@ -47,5 +40,11 @@
     "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
+  },
+  "scripts": {
+    "build": "tsc && cp -r templates dist/",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage"
   }
-}
+}