@dainprotocol/cli 1.2.25 → 1.2.28

package/dist/commands/deploy.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) {
@@ -46,13 +57,37 @@ 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 FETCH_TIMEOUT_MS = 120000; // 2 minutes for deployment
+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 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();
@@ -66,23 +101,24 @@ 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*/, fetchWithTimeout("".concat(basePath, "/api/app/codegen/data/projects/").concat(projectId, "/start-deploy"), {
                             method: "POST",
+                            headers: { "Content-Type": "application/json" },
                             body: JSON.stringify({
                                 environment: environmentName,
                                 isProduction: isProduction,
@@ -90,49 +126,56 @@ function deploy(options) {
                             }),
                         })];
                 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*/, 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*/];
             }
         });
     });
@@ -162,7 +205,7 @@ 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")];
@@ -173,34 +216,21 @@ function deployAndPushFiles(startDeployUrl, envArray, isProduction, environmentN
                     projectZipBuffer = _a.sent();
                     formData = new FormData();
                     formData.append("array", JSON.stringify(envArray));
-                    formData.append("file", new Blob([projectZipBuffer]), "project.zip");
+                    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, {
+                    return [4 /*yield*/, fetchWithTimeout(startDeployUrl, {
                             method: "POST",
                             body: formData,
                         })];
-                case 4:
+                case 3:
                     response = _a.sent();
-                    if (!!response.ok) return [3 /*break*/, 6];
+                    if (!!response.ok) return [3 /*break*/, 5];
                     return [4 /*yield*/, response.text()];
-                case 5:
+                case 4:
                     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];
-                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];
-                case 9: return [2 /*return*/];
+                    throw new Error("Deployment failed: ".concat(response.status, " ").concat(response.statusText, ". Response: ").concat(errorText));
+                case 5: return [2 /*return*/, response.json()];
             }
         });
     });
@@ -224,11 +254,20 @@ function loadEnvVariables() {
                     envContent = _a.sent();
                     return [2 /*return*/, envContent
                             .split("\n")
+                            .filter(function (line) { return line.trim() && !line.trim().startsWith("#"); })
                             .map(function (line) {
-                            var _a = line.split("="), name = _a[0], value = _a[1];
-                            return { name: name, value: value };
+                            var equalsIndex = line.indexOf("=");
+                            if (equalsIndex === -1)
+                                return null;
+                            var name = line.substring(0, equalsIndex).trim();
+                            var value = line.substring(equalsIndex + 1).trim();
+                            // Remove surrounding quotes if present
+                            var unquotedValue = value.replace(/^["']|["']$/g, "");
+                            return { name: name, value: unquotedValue };
                         })
-                            .filter(function (env) { return env.name && env.value; })];
+                            .filter(function (env) {
+                            return env !== null && env.name !== "" && env.value !== "";
+                        })];
             }
         });
     });
@@ -252,26 +291,6 @@ function zipDirectory(sourceDir, outputZip) {
         });
     });
 }
-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 () {
     try {
         // Read git config and get repo name
@@ -289,43 +308,50 @@ var checkGitConfig = function () {
     }
 };
 var getProjectId = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var project, projectId, error_3;
+    var response, _c;
     var basePath = _b.basePath, repoName = _b.repoName;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    return __generator(this, function (_d) {
+        switch (_d.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))];
+                _d.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, fetchWithTimeout("".concat(basePath, "/api/app/codegen/data/projects/get-by-repo?repo=").concat(encodeURIComponent(repoName)), { method: "GET" }, 30000)];
             case 1:
-                project = _c.sent();
-                return [4 /*yield*/, project.json()];
+                response = _d.sent();
+                if (!response.ok)
+                    return [2 /*return*/, null];
+                return [2 /*return*/, response.json()];
             case 2:
-                projectId = _c.sent();
-                return [2 /*return*/, projectId];
-            case 3:
-                error_3 = _c.sent();
+                _c = _d.sent();
                 return [2 /*return*/, null];
-            case 4: return [2 /*return*/];
+            case 3: return [2 /*return*/];
         }
     });
 }); };
 var updateDainJson = function (result) { return __awaiter(void 0, void 0, void 0, function () {
-    var deploymentId, serviceId, dainJson, dainJsonObject;
+    var deploymentId, serviceId, dainJson, dainJsonObject, error_2;
     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")];
+                _a.label = 1;
             case 1:
+                _a.trys.push([1, 4, , 5]);
+                return [4 /*yield*/, fs_extra_1.default.readFile("./dain.json", "utf-8")];
+            case 2:
                 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:
+            case 3:
                 _a.sent();
-                return [2 /*return*/];
+                return [3 /*break*/, 5];
+            case 4:
+                error_2 = _a.sent();
+                (0, utils_1.logError)("Failed to update dain.json", error_2);
+                return [3 /*break*/, 5];
+            case 5: return [2 /*return*/];
         }
     });
 }); };