@dainprotocol/cli 1.2.26 → 1.2.30

package/dist/commands/deploy.js

@@ -46,18 +46,18 @@ var fs_extra_1 = __importDefault(require("fs-extra"));
 var path_1 = __importDefault(require("path"));
 var archiver_1 = __importDefault(require("archiver"));
 var build_1 = __importDefault(require("./build"));
-var status_1 = __importDefault(require("./status"));
 var START_DEPLOY_URI = "/api/app/data/deployments/start-deploy";
+var DEPLOY_TIMEOUT_MS = 120000;
 function deploy(options) {
     return __awaiter(this, void 0, void 0, function () {
-        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) {
+        var config, spinner, basePath, deployPath, isProduction, environmentName, _a, repoName, branchName, projectId, _b, result, response, envArray, _c, error_1;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
                     spinner = (0, ora_1.default)("Deploying project...").start();
-                    basePath = config["api-base-url"] || "https://dain-platform-ochre.vercel.app";
-                    deployPath = "".concat(basePath).concat(START_DEPLOY_URI);
+                    basePath = config["api-base-url"] || utils_1.DEFAULT_API_BASE_URL;
+                    deployPath = (0, utils_1.joinUrl)(basePath, START_DEPLOY_URI);
                     isProduction = config["environment"] === "production";
                     environmentName = config["environment"] || "production";
                     _a = checkGitConfig(), repoName = _a.repoName, branchName = _a.branchName;
@@ -66,78 +66,78 @@ function deploy(options) {
                     if (!(repoName && branchName)) return [3 /*break*/, 2];
                     return [4 /*yield*/, getProjectId({ basePath: basePath, repoName: repoName })];
                 case 1:
-                    _b = _c.sent();
+                    _b = _d.sent();
                     return [3 /*break*/, 3];
                 case 2:
                     _b = null;
-                    _c.label = 3;
+                    _d.label = 3;
                 case 3:
                     projectId = _b;
                     if (!projectId && repoName && branchName)
                         spinner.fail("No project found on platform linked to this repository.");
-                    _c.label = 4;
+                    _d.label = 4;
                 case 4:
-                    _c.trys.push([4, 16, , 17]);
+                    _d.trys.push([4, 18, , 19]);
                     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"), {
+                    return [4 /*yield*/, (0, utils_1.fetchWithTimeout)((0, utils_1.joinUrl)(basePath, "/api/app/codegen/data/projects/".concat(projectId, "/start-deploy")), {
                             method: "POST",
-                            body: JSON.stringify({
-                                environment: environmentName,
-                                isProduction: isProduction,
-                                branch: branchName,
-                            }),
-                        })];
+                            headers: { "Content-Type": "application/json" },
+                            body: JSON.stringify({ environment: environmentName, isProduction: isProduction, branch: branchName }),
+                        }, DEPLOY_TIMEOUT_MS)];
                 case 5:
-                    response = _c.sent();
+                    response = _d.sent();
+                    if (!response.ok)
+                        throw new Error("Deploy failed: ".concat(response.status, " ").concat(response.statusText));
                     return [4 /*yield*/, response.json()];
                 case 6:
-                    result = _c.sent();
-                    return [3 /*break*/, 12];
+                    result = _d.sent();
+                    return [3 /*break*/, 14];
                 case 7:
-                    // Deploy project using local files
                     spinner.info("Deploying project using local files...").start();
                     return [4 /*yield*/, loadAndValidateEnvVariables()];
                 case 8:
-                    envArray = _c.sent();
+                    envArray = _d.sent();
                     return [4 /*yield*/, (0, build_1.default)({ config: options.config, deploy: true })];
                 case 9:
-                    _c.sent();
+                    _d.sent();
                     return [4 /*yield*/, deployAndPushFiles(deployPath, envArray, isProduction, environmentName)];
                 case 10:
-                    result = _c.sent();
-                    return [4 /*yield*/, fetch(result.service.url, {
-                            method: "GET",
-                        })];
+                    result = _d.sent();
+                    _d.label = 11;
                 case 11:
-                    _c.sent();
-                    _c.label = 12;
+                    _d.trys.push([11, 13, , 14]);
+                    return [4 /*yield*/, (0, utils_1.fetchWithTimeout)(result.service.url, { method: "GET" }, 10000)];
                 case 12:
-                    if (!result) return [3 /*break*/, 14];
-                    return [4 /*yield*/, updateDainJson(result)];
+                    _d.sent();
+                    return [3 /*break*/, 14];
                 case 13:
-                    _c.sent();
+                    _c = _d.sent();
+                    return [3 /*break*/, 14];
+                case 14:
+                    if (!result) return [3 /*break*/, 16];
+                    return [4 /*yield*/, updateDainJson(result)];
+                case 15:
+                    _d.sent();
                     printDeploymentResult(result, spinner);
                     process.exit(0);
-                    return [3 /*break*/, 15];
-                case 14:
+                    return [3 /*break*/, 17];
+                case 16:
                     spinner.fail("Deployment failed.");
                     process.exit(1);
-                    _c.label = 15;
-                case 15: return [3 /*break*/, 17];
-                case 16:
-                    error_1 = _c.sent();
+                    _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*/, 17];
-                case 17: return [2 /*return*/];
+                    return [3 /*break*/, 19];
+                case 19: return [2 /*return*/];
             }
         });
     });
 }
-// Loads and validates environment variables
 function loadAndValidateEnvVariables() {
     return __awaiter(this, void 0, void 0, function () {
         var envArray;
@@ -159,177 +159,138 @@ function loadAndValidateEnvVariables() {
         });
     });
 }
-// Deploys and pushes files to the platform
 function deployAndPushFiles(startDeployUrl, envArray, isProduction, environmentName) {
     return __awaiter(this, void 0, void 0, function () {
-        var projectZip, projectZipBuffer, formData, response, errorText, result, error_2;
+        var projectZip, projectZipBuffer, formData, response, errorText;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, zipDirectory("./", "project.zip")];
                 case 1:
                     projectZip = _a.sent();
-                    return [4 /*yield*/, fs_extra_1.default.readFile(projectZip)];
+                    _a.label = 2;
                 case 2:
+                    _a.trys.push([2, , 7, 9]);
+                    return [4 /*yield*/, fs_extra_1.default.readFile(projectZip)];
+                case 3:
                     projectZipBuffer = _a.sent();
                     formData = new FormData();
                     formData.append("array", JSON.stringify(envArray));
                     formData.append("file", new Blob([new Uint8Array(projectZipBuffer)]), "project.zip");
                     formData.append("isProduction", isProduction.toString());
                     formData.append("environment", environmentName);
-                    _a.label = 3;
-                case 3:
-                    _a.trys.push([3, 8, , 9]);
-                    return [4 /*yield*/, fetch(startDeployUrl, {
-                            method: "POST",
-                            body: formData,
-                        })];
+                    return [4 /*yield*/, (0, utils_1.fetchWithTimeout)(startDeployUrl, { method: "POST", body: formData }, DEPLOY_TIMEOUT_MS)];
                 case 4:
                     response = _a.sent();
                     if (!!response.ok) return [3 /*break*/, 6];
                     return [4 /*yield*/, response.text()];
                 case 5:
                     errorText = _a.sent();
-                    throw new Error("Deployment failed: ".concat(response.statusText, ". Response: ").concat(errorText));
-                case 6: return [4 /*yield*/, response.json()];
-                case 7:
-                    result = _a.sent();
-                    return [2 /*return*/, result];
+                    throw new Error("Deployment failed: ".concat(response.status, " ").concat(response.statusText, ". Response: ").concat(errorText));
+                case 6: return [2 /*return*/, response.json()];
+                case 7: return [4 /*yield*/, fs_extra_1.default.remove(projectZip).catch(function () { return undefined; })];
                 case 8:
-                    error_2 = _a.sent();
-                    (0, utils_1.logError)("Error during deployment and push files: ", error_2.stack);
-                    console.error("Detailed error:", error_2);
-                    process.exit(1);
-                    return [3 /*break*/, 9];
+                    _a.sent();
+                    return [7 /*endfinally*/];
                 case 9: return [2 /*return*/];
             }
         });
     });
 }
-// Reads the .env file and returns an array of key-value pairs
 function loadEnvVariables() {
     return __awaiter(this, void 0, void 0, function () {
-        var files, envFile, envContent;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var files, envFile, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0: return [4 /*yield*/, fs_extra_1.default.readdir("./")];
                 case 1:
-                    files = _a.sent();
+                    files = _b.sent();
                     envFile = files.find(function (file) { return file === ".env"; });
                     if (!envFile) {
                         (0, utils_1.logError)("Environment file not found. Please create a .env file in the build directory.");
                         process.exit(1);
                     }
+                    _a = utils_1.parseEnvContent;
                     return [4 /*yield*/, fs_extra_1.default.readFile(path_1.default.join("./", envFile), "utf-8")];
-                case 2:
-                    envContent = _a.sent();
-                    return [2 /*return*/, envContent
-                            .split("\n")
-                            .map(function (line) {
-                            var _a = line.split("="), name = _a[0], value = _a[1];
-                            return { name: name, value: value };
-                        })
-                            .filter(function (env) { return env.name && env.value; })];
+                case 2: return [2 /*return*/, _a.apply(void 0, [_b.sent()])];
             }
         });
     });
 }
-// Zips the current directory and returns the path to the zip file
 function zipDirectory(sourceDir, outputZip) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            return [2 /*return*/, new Promise(function (resolve, reject) {
-                    var output = fs_extra_1.default.createWriteStream(outputZip);
-                    var archive = (0, archiver_1.default)("zip", { zlib: { level: 9 } });
-                    output.on("close", function () { return resolve(outputZip); });
-                    archive.on("error", function (err) {
-                        (0, utils_1.logError)("Error during zipping the directory: ", err);
-                        reject(err);
-                    });
-                    archive.pipe(output);
-                    archive.glob("**/*", { ignore: ["node_modules/**", "project.zip"] });
-                    archive.finalize();
-                })];
-        });
+    return new Promise(function (resolve, reject) {
+        var output = fs_extra_1.default.createWriteStream(outputZip);
+        var archive = (0, archiver_1.default)("zip", { zlib: { level: 9 } });
+        output.on("close", function () { return resolve(outputZip); });
+        archive.on("error", function (err) { (0, utils_1.logError)("Error during zipping: ", err); reject(err); });
+        archive.pipe(output);
+        archive.glob("**/*", { ignore: ["node_modules/**", "project.zip", ".git/**", ".env*", ".dain/**"] });
+        archive.finalize();
     });
 }
-var recursiveStatusUntilRunning = function (config, deploymentId, environmentName, serviceId) { return __awaiter(void 0, void 0, void 0, function () {
-    var statusResult;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, status_1.default)({}, deploymentId, environmentName, serviceId)];
-            case 1:
-                statusResult = _a.sent();
-                if (statusResult.status === "RUNNING") {
-                    return [2 /*return*/];
-                }
-                return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 15000); })];
-            case 2:
-                _a.sent();
-                return [4 /*yield*/, recursiveStatusUntilRunning(config, deploymentId, environmentName, serviceId)];
-            case 3:
-                _a.sent();
-                return [2 /*return*/];
-        }
-    });
-}); };
-var checkGitConfig = function () {
+function checkGitConfig() {
+    var _a, _b, _c;
     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 remote = gitConfig.match(/\[remote "origin"\][\s\S]*?url = ([^\n]+)/);
+        var remoteUrl = remote ? remote[1].trim() : null;
+        var repoName = ((_a = remoteUrl === null || remoteUrl === void 0 ? void 0 : remoteUrl.match(/git@github.com:(.+)\.git/)) === null || _a === void 0 ? void 0 : _a[1])
+            || ((_b = remoteUrl === null || remoteUrl === void 0 ? void 0 : remoteUrl.match(/https?:\/\/github.com\/(.+)\.git/)) === null || _b === void 0 ? void 0 : _b[1])
+            || null;
         var gitHead = fs_extra_1.default.readFileSync(".git/HEAD", "utf-8");
-        var branch = gitHead.match(/ref: refs\/heads\/(.*)/);
-        var branchName = branch ? branch[1] : null;
+        var branchName = ((_c = gitHead.match(/ref: refs\/heads\/(.*)/)) === null || _c === void 0 ? void 0 : _c[1]) || null;
         return { repoName: repoName, branchName: branchName };
     }
-    catch (error) {
+    catch (_d) {
         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*/];
-        }
+}
+function getProjectId(_a) {
+    return __awaiter(this, arguments, void 0, function (_b) {
+        var response, _c;
+        var basePath = _b.basePath, repoName = _b.repoName;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _d.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, (0, utils_1.fetchWithTimeout)((0, utils_1.joinUrl)(basePath, "/api/app/codegen/data/projects/get-by-repo?repo=".concat(encodeURIComponent(repoName))), { method: "GET" })];
+                case 1:
+                    response = _d.sent();
+                    return [2 /*return*/, response.ok ? response.json() : null];
+                case 2:
+                    _c = _d.sent();
+                    return [2 /*return*/, null];
+                case 3: 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*/];
-        }
+}
+function updateDainJson(result) {
+    return __awaiter(this, void 0, void 0, function () {
+        var dainJson, _a, _b, error_2;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _c.trys.push([0, 3, , 4]);
+                    _b = (_a = JSON).parse;
+                    return [4 /*yield*/, fs_extra_1.default.readFile("./dain.json", "utf-8")];
+                case 1:
+                    dainJson = _b.apply(_a, [_c.sent()]);
+                    dainJson["deployment-id"] = result.deploymentId;
+                    dainJson["service-id"] = result.serviceId;
+                    return [4 /*yield*/, fs_extra_1.default.writeFile("./dain.json", JSON.stringify(dainJson, null, 2))];
+                case 2:
+                    _c.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    error_2 = _c.sent();
+                    (0, utils_1.logError)("Failed to update dain.json", error_2);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
     });
-}); };
-var printDeploymentResult = function (result, spinner) {
+}
+function printDeploymentResult(result, spinner) {
     console.log("\n-----------------------");
     spinner.succeed("Deployment URL: ".concat(result.service.url));
     spinner.succeed("Deployment ID: ".concat(result.deploymentId));
@@ -337,4 +298,4 @@ var printDeploymentResult = function (result, spinner) {
     spinner.succeed("Deployment completed successfully.");
     spinner.info("You can access logs using `dain logs -w` command.");
     console.log("-----------------------");
-};
+}