@dainprotocol/cli 1.1.31 → 1.2.0

package/dist/commands/build.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {

package/dist/commands/deploy.js

@@ -50,9 +50,9 @@ var status_1 = __importDefault(require("./status"));
 var START_DEPLOY_URI = "/api/app/data/deployments/start-deploy";
 function deploy(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, spinner, basePath, deployPath, isProduction, environmentName, envArray, result, deploymentId, serviceId, dainJson, dainJsonObject, error_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var config, spinner, basePath, deployPath, isProduction, environmentName, _a, repoName, branchName, projectId, _b, result, response, envArray, error_1;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
                     spinner = (0, ora_1.default)("Deploying project...").start();
@@ -60,50 +60,79 @@ function deploy(options) {
                     deployPath = "".concat(basePath).concat(START_DEPLOY_URI);
                     isProduction = config["environment"] === "production";
                     environmentName = config["environment"] || "production";
-                    _a.label = 1;
+                    _a = checkGitConfig(), repoName = _a.repoName, branchName = _a.branchName;
+                    if (repoName && branchName)
+                        spinner.info("Found git config, checking if project exists...").start();
+                    if (!(repoName && branchName)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, getProjectId({ basePath: basePath, repoName: repoName })];
                 case 1:
-                    _a.trys.push([1, 8, , 9]);
-                    return [4 /*yield*/, loadAndValidateEnvVariables()];
+                    _b = _c.sent();
+                    return [3 /*break*/, 3];
                 case 2:
-                    envArray = _a.sent();
-                    return [4 /*yield*/, (0, build_1.default)({ config: options.config, deploy: true })];
+                    _b = null;
+                    _c.label = 3;
                 case 3:
-                    _a.sent();
-                    return [4 /*yield*/, deployAndPushFiles(deployPath, envArray, isProduction, environmentName)];
+                    projectId = _b;
+                    if (!projectId && repoName && branchName)
+                        spinner.fail("No project found on platform linked to this repository.");
+                    _c.label = 4;
                 case 4:
-                    result = _a.sent();
-                    deploymentId = result.deploymentId;
-                    serviceId = result.serviceId;
-                    return [4 /*yield*/, fs_extra_1.default.readFile("./dain.json", "utf-8")];
+                    _c.trys.push([4, 16, , 17]);
+                    if (!(projectId && repoName && branchName)) return [3 /*break*/, 7];
+                    // Deploy project using github repository
+                    spinner.info("Deploying project using github repository...").start();
+                    return [4 /*yield*/, fetch("".concat(basePath, "/api/app/codegen/data/projects/").concat(projectId, "/start-deploy"), {
+                            method: "POST",
+                            body: JSON.stringify({
+                                environment: environmentName,
+                                isProduction: isProduction,
+                                branch: branchName,
+                            }),
+                        })];
                 case 5:
-                    dainJson = _a.sent();
-                    dainJsonObject = JSON.parse(dainJson);
-                    dainJsonObject["deployment-id"] = deploymentId;
-                    dainJsonObject["service-id"] = serviceId;
-                    return [4 /*yield*/, fs_extra_1.default.writeFile("./dain.json", JSON.stringify(dainJsonObject, null, 2))];
+                    response = _c.sent();
+                    return [4 /*yield*/, response.json()];
                 case 6:
-                    _a.sent();
-                    console.log("\n-----------------------");
-                    spinner.succeed("Deployment URL: ".concat(result.service.url));
-                    spinner.succeed("Deployment ID: ".concat(result.deploymentId));
-                    spinner.succeed("Deployment completed at: " + new Date().toISOString());
-                    spinner.succeed("Deployment completed successfully.");
-                    spinner.info("You can access logs using `dain logs -w` command.");
-                    console.log("-----------------------");
+                    result = _c.sent();
+                    return [3 /*break*/, 12];
+                case 7:
+                    // Deploy project using local files
+                    spinner.info("Deploying project using local files...").start();
+                    return [4 /*yield*/, loadAndValidateEnvVariables()];
+                case 8:
+                    envArray = _c.sent();
+                    return [4 /*yield*/, (0, build_1.default)({ config: options.config, deploy: true })];
+                case 9:
+                    _c.sent();
+                    return [4 /*yield*/, deployAndPushFiles(deployPath, envArray, isProduction, environmentName)];
+                case 10:
+                    result = _c.sent();
                     return [4 /*yield*/, fetch(result.service.url, {
                             method: "GET",
                         })];
-                case 7:
-                    _a.sent();
+                case 11:
+                    _c.sent();
+                    _c.label = 12;
+                case 12:
+                    if (!result) return [3 /*break*/, 14];
+                    return [4 /*yield*/, updateDainJson(result)];
+                case 13:
+                    _c.sent();
+                    printDeploymentResult(result, spinner);
                     process.exit(0);
-                    return [3 /*break*/, 9];
-                case 8:
-                    error_1 = _a.sent();
+                    return [3 /*break*/, 15];
+                case 14:
+                    spinner.fail("Deployment failed.");
+                    process.exit(1);
+                    _c.label = 15;
+                case 15: return [3 /*break*/, 17];
+                case 16:
+                    error_1 = _c.sent();
                     spinner.fail("Deployment failed.");
                     (0, utils_1.logError)("Error during deployment: ", error_1);
                     process.exit(1);
-                    return [3 /*break*/, 9];
-                case 9: return [2 /*return*/];
+                    return [3 /*break*/, 17];
+                case 17: return [2 /*return*/];
             }
         });
     });
@@ -243,3 +272,69 @@ var recursiveStatusUntilRunning = function (config, deploymentId, environmentNam
         }
     });
 }); };
+var checkGitConfig = function () {
+    try {
+        // Read git config and get repo name
+        var gitConfig = fs_extra_1.default.readFileSync(".git/config", "utf-8");
+        var remote = gitConfig.match(/\[remote "origin"\]\n\s*url = git@github.com:(.*).git/);
+        var repoName = remote ? remote[1] : null;
+        // Read git head and get branch name
+        var gitHead = fs_extra_1.default.readFileSync(".git/HEAD", "utf-8");
+        var branch = gitHead.match(/ref: refs\/heads\/(.*)/);
+        var branchName = branch ? branch[1] : null;
+        return { repoName: repoName, branchName: branchName };
+    }
+    catch (error) {
+        return { repoName: null, branchName: null };
+    }
+};
+var getProjectId = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
+    var project, projectId, error_3;
+    var basePath = _b.basePath, repoName = _b.repoName;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _c.trys.push([0, 3, , 4]);
+                return [4 /*yield*/, fetch("".concat(basePath, "/api/app/codegen/data/projects/get-by-repo?repo=").concat(repoName))];
+            case 1:
+                project = _c.sent();
+                return [4 /*yield*/, project.json()];
+            case 2:
+                projectId = _c.sent();
+                return [2 /*return*/, projectId];
+            case 3:
+                error_3 = _c.sent();
+                return [2 /*return*/, null];
+            case 4: return [2 /*return*/];
+        }
+    });
+}); };
+var updateDainJson = function (result) { return __awaiter(void 0, void 0, void 0, function () {
+    var deploymentId, serviceId, dainJson, dainJsonObject;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                deploymentId = result.deploymentId;
+                serviceId = result.serviceId;
+                return [4 /*yield*/, fs_extra_1.default.readFile("./dain.json", "utf-8")];
+            case 1:
+                dainJson = _a.sent();
+                dainJsonObject = JSON.parse(dainJson);
+                dainJsonObject["deployment-id"] = deploymentId;
+                dainJsonObject["service-id"] = serviceId;
+                return [4 /*yield*/, fs_extra_1.default.writeFile("./dain.json", JSON.stringify(dainJsonObject, null, 2))];
+            case 2:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+var printDeploymentResult = function (result, spinner) {
+    console.log("\n-----------------------");
+    spinner.succeed("Deployment URL: ".concat(result.service.url));
+    spinner.succeed("Deployment ID: ".concat(result.deploymentId));
+    spinner.succeed("Deployment completed at: " + new Date().toISOString());
+    spinner.succeed("Deployment completed successfully.");
+    spinner.info("You can access logs using `dain logs -w` command.");
+    console.log("-----------------------");
+};

package/dist/commands/dev.js

@@ -64,6 +64,8 @@ var childProcess = null;
 var watcher = null;
 var mf = null;
 var tunnelUrl = null;
+var isFirstStart = true;
+var serverStarted = false;
 function isPortAvailable(port) {
     return new Promise(function (resolve) {
         var server = (0, net_1.createServer)()
@@ -76,26 +78,38 @@ function isPortAvailable(port) {
         });
     });
 }
-function startProcess(command, options) {
+function startProcess(command, options, isRestart) {
     var _a, _b;
+    if (isRestart === void 0) { isRestart = false; }
     if (childProcess) {
         childProcess.kill();
     }
-    var spinner = (0, ora_1.default)('Starting development server...').start();
+    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) {
-        spinner.succeed('Development server started.');
-        if (tunnelUrl) {
-            (0, utils_1.displayTunnelUrl)(tunnelUrl);
+        var dataStr = data.toString().trim();
+        console.log("[DEBUG] stdout event - serverStarted: ".concat(serverStarted, ", data: \"").concat(dataStr.substring(0, 50), "...\""));
+        if (!serverStarted) {
+            spinner.succeed(isRestart ? 'Development server restarted.' : 'Development server started.');
+            if (tunnelUrl && isFirstStart) {
+                (0, utils_1.displayTunnelUrl)(tunnelUrl);
+                isFirstStart = false;
+            }
+            serverStarted = true;
+            console.log("[DEBUG] Set serverStarted to true");
         }
         console.log(data);
     });
     (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', function (data) {
-        spinner.fail('Development server error.');
+        if (!serverStarted) {
+            spinner.fail('Development server error.');
+            serverStarted = true; // Prevent multiple error messages too
+        }
         (0, utils_1.logError)(data);
     });
     childProcess.on('close', function (code) {
-        if (code !== 0) {
+        if (code !== 0 && !serverStarted) {
             spinner.fail("Development server exited with code ".concat(code));
         }
     });
@@ -195,7 +209,7 @@ function dev(options) {
                     });
                     watcher.on('change', function (path) {
                         (0, utils_1.logInfo)("File ".concat(path, " has been changed. Restarting..."));
-                        startProcess(command, { env: __assign(__assign({}, process.env), envVars) });
+                        startProcess(command, { env: __assign(__assign({}, process.env), envVars) }, true);
                     });
                     (0, utils_1.logInfo)('Watching for file changes...');
                     // Add signal handlers for graceful shutdown

package/dist/commands/testchat.js

@@ -26,13 +26,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dainprotocol/cli",
-  "version": "1.1.31",
+  "version": "1.2.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -21,8 +21,8 @@
   ],
   "dependencies": {
     "@ai-sdk/anthropic": "^0.0.50",
-    "@dainprotocol/service-sdk": "^1.1.13",
-    "@dainprotocol/tunnel": "^1.0.5",
+    "@dainprotocol/service-sdk": "^1.3.0",
+    "@dainprotocol/tunnel": "^1.1.0",
     "@types/fs-extra": "^11.0.4",
     "@types/localtunnel": "^2.0.4",
     "ai": "^3.3.41",