@dainprotocol/cli 1.2.26 → 1.2.28

package/dist/commands/undeploy.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) {
@@ -42,6 +53,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = undeploy;
 var utils_1 = require("../utils");
 var ora_1 = __importDefault(require("ora"));
+var FETCH_TIMEOUT_MS = 30000;
+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 undeploy(options) {
     return __awaiter(this, void 0, void 0, function () {
         var config, spinner, orgId, _a, apiKey, deploymentId, undeployUrl, response, error_1;
@@ -52,41 +88,35 @@ function undeploy(options) {
                     spinner = (0, ora_1.default)("Undeploying deployment ".concat(config["deployment-id"], "...")).start();
                     _b.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, 4, 5]);
+                    _b.trys.push([1, 3, , 4]);
                     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*/];
+                    if (!deploymentId) {
+                        (0, utils_1.logError)("Deployment ID not found");
+                        process.exit(1);
                     }
-                    return [4 /*yield*/, fetch(undeployUrl, {
+                    return [4 /*yield*/, 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),
                             },
                         })];
                 case 2:
                     response = _b.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();
                     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*/];
             }
         });
     });
@@ -94,10 +124,9 @@ function undeploy(options) {
 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 };
+    var undeployUrl = "".concat(baseUrl, "/codegen-deploy/undeploy/").concat(orgId, "/").concat(serviceId, "/").concat(deploymentId, "/").concat(environment);
+    return { apiKey: apiKey, deploymentId: deploymentId, undeployUrl: undeployUrl };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dainprotocol/cli",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "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/"
   }
-}
+}