@dainprotocol/cli 1.2.36 → 1.3.1

package/dist/commands/deploy.js

@@ -1,293 +1,149 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
+import { DEFAULT_API_BASE_URL, fetchWithTimeout, getDainConfig, joinUrl, logError, parseEnvContent, } from "../utils.js";
+import ora from "ora";
+import fs from "fs-extra";
+import path from "path";
+import archiver from "archiver";
+import build from "./build.js";
+const START_DEPLOY_URI = "/api/app/data/deployments/start-deploy";
+const DEPLOY_TIMEOUT_MS = 120000;
+export default async function deploy(options) {
+    const config = getDainConfig(options.config);
+    const spinner = ora("Deploying project...").start();
+    const basePath = config["api-base-url"] || DEFAULT_API_BASE_URL;
+    const deployPath = joinUrl(basePath, START_DEPLOY_URI);
+    const isProduction = config["environment"] === "production";
+    const environmentName = config["environment"] || "production";
+    const { repoName, branchName } = checkGitConfig();
+    if (repoName && branchName)
+        spinner.info("Found git config, checking if project exists...").start();
+    const projectId = repoName && branchName ? await getProjectId({ basePath, repoName }) : null;
+    if (!projectId && repoName && branchName)
+        spinner.fail("No project found on platform linked to this repository.");
+    try {
+        let result;
+        if (projectId && repoName && branchName) {
+            spinner.info("Deploying project using github repository...").start();
+            const response = await fetchWithTimeout(joinUrl(basePath, `/api/app/codegen/data/projects/${projectId}/start-deploy`), {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({ environment: environmentName, isProduction, branch: branchName }),
+            }, DEPLOY_TIMEOUT_MS);
+            if (!response.ok)
+                throw new Error(`Deploy failed: ${response.status} ${response.statusText}`);
+            result = await response.json();
+        }
+        else {
+            spinner.info("Deploying project using local files...").start();
+            const envArray = await loadAndValidateEnvVariables();
+            await build({ config: options.config, deploy: true });
+            result = await deployAndPushFiles(deployPath, envArray, isProduction, environmentName);
+            try {
+                await fetchWithTimeout(result.service.url, { method: "GET" }, 10000);
             }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+            catch { }
+        }
+        await updateDainJson(result);
+        printDeploymentResult(result, spinner);
+        process.exit(0);
+    }
+    catch (error) {
+        spinner.fail("Deployment failed.");
+        logError("Error during deployment: ", error);
+        process.exit(1);
     }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = deploy;
-var utils_1 = require("../utils");
-var ora_1 = __importDefault(require("ora"));
-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 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, _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"] || 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;
-                    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:
-                    _b = _d.sent();
-                    return [3 /*break*/, 3];
-                case 2:
-                    _b = null;
-                    _d.label = 3;
-                case 3:
-                    projectId = _b;
-                    if (!projectId && repoName && branchName)
-                        spinner.fail("No project found on platform linked to this repository.");
-                    _d.label = 4;
-                case 4:
-                    _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")), {
-                            method: "POST",
-                            headers: { "Content-Type": "application/json" },
-                            body: JSON.stringify({ environment: environmentName, isProduction: isProduction, branch: branchName }),
-                        }, DEPLOY_TIMEOUT_MS)];
-                case 5:
-                    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 = _d.sent();
-                    return [3 /*break*/, 14];
-                case 7:
-                    spinner.info("Deploying project using local files...").start();
-                    return [4 /*yield*/, loadAndValidateEnvVariables()];
-                case 8:
-                    envArray = _d.sent();
-                    return [4 /*yield*/, (0, build_1.default)({ config: options.config, deploy: true })];
-                case 9:
-                    _d.sent();
-                    return [4 /*yield*/, deployAndPushFiles(deployPath, envArray, isProduction, environmentName)];
-                case 10:
-                    result = _d.sent();
-                    _d.label = 11;
-                case 11:
-                    _d.trys.push([11, 13, , 14]);
-                    return [4 /*yield*/, (0, utils_1.fetchWithTimeout)(result.service.url, { method: "GET" }, 10000)];
-                case 12:
-                    _d.sent();
-                    return [3 /*break*/, 14];
-                case 13:
-                    _c = _d.sent();
-                    return [3 /*break*/, 14];
-                case 14: return [4 /*yield*/, updateDainJson(result)];
-                case 15:
-                    _d.sent();
-                    printDeploymentResult(result, spinner);
-                    process.exit(0);
-                    return [3 /*break*/, 17];
-                case 16:
-                    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*/];
-            }
-        });
-    });
 }
-function loadAndValidateEnvVariables() {
-    return __awaiter(this, void 0, void 0, function () {
-        var envArray;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, loadEnvVariables()];
-                case 1:
-                    envArray = _a.sent();
-                    if (envArray.length === 0) {
-                        (0, utils_1.logError)("No environment variables found. Please ensure your .env file is correctly set up.");
-                        process.exit(1);
-                    }
-                    if (!envArray.some(function (env) { return env.name === "DAIN_API_KEY"; })) {
-                        (0, utils_1.logError)("DAIN_API_KEY not found in environment variables. Please check your .env file.");
-                        process.exit(1);
-                    }
-                    return [2 /*return*/, envArray];
-            }
-        });
-    });
+async function loadAndValidateEnvVariables() {
+    const envArray = await loadEnvVariables();
+    if (envArray.length === 0) {
+        logError("No environment variables found. Please ensure your .env file is correctly set up.");
+        process.exit(1);
+    }
+    if (!envArray.some((env) => env.name === "DAIN_API_KEY")) {
+        logError("DAIN_API_KEY not found in environment variables. Please check your .env file.");
+        process.exit(1);
+    }
+    return envArray;
 }
-function deployAndPushFiles(startDeployUrl, envArray, isProduction, environmentName) {
-    return __awaiter(this, void 0, void 0, function () {
-        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();
-                    _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);
-                    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.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:
-                    _a.sent();
-                    return [7 /*endfinally*/];
-                case 9: return [2 /*return*/];
-            }
-        });
-    });
+async function deployAndPushFiles(startDeployUrl, envArray, isProduction, environmentName) {
+    const projectZip = await zipDirectory("./", "project.zip");
+    try {
+        const projectZipBuffer = await fs.readFile(projectZip);
+        const 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);
+        const response = await fetchWithTimeout(startDeployUrl, { method: "POST", body: formData }, DEPLOY_TIMEOUT_MS);
+        if (!response.ok) {
+            const errorText = await response.text();
+            throw new Error(`Deployment failed: ${response.status} ${response.statusText}. Response: ${errorText}`);
+        }
+        return response.json();
+    }
+    finally {
+        await fs.remove(projectZip).catch(() => undefined);
+    }
 }
-function loadEnvVariables() {
-    return __awaiter(this, void 0, void 0, function () {
-        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 = _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: return [2 /*return*/, _a.apply(void 0, [_b.sent()])];
-            }
-        });
-    });
+async function loadEnvVariables() {
+    const files = await fs.readdir("./");
+    const envFile = files.find((file) => file === ".env");
+    if (!envFile) {
+        logError("Environment file not found. Please create a .env file in the build directory.");
+        process.exit(1);
+    }
+    return parseEnvContent(await fs.readFile(path.join("./", envFile), "utf-8"));
 }
 function zipDirectory(sourceDir, outputZip) {
-    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); });
+    return new Promise((resolve, reject) => {
+        const output = fs.createWriteStream(outputZip);
+        const archive = archiver("zip", { zlib: { level: 9 } });
+        output.on("close", () => resolve(outputZip));
+        archive.on("error", (err) => { logError("Error during zipping: ", err); reject(err); });
         archive.pipe(output);
         archive.glob("**/*", { ignore: ["node_modules/**", "project.zip", ".git/**", ".env*", ".dain/**"] });
         archive.finalize();
     });
 }
 function checkGitConfig() {
-    var _a, _b, _c;
     try {
-        var gitConfig = fs_extra_1.default.readFileSync(".git/config", "utf-8");
-        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])
+        const gitConfig = fs.readFileSync(".git/config", "utf-8");
+        const remote = gitConfig.match(/\[remote "origin"\][\s\S]*?url = ([^\n]+)/);
+        const remoteUrl = remote ? remote[1].trim() : null;
+        const repoName = remoteUrl?.match(/git@github.com:(.+)\.git/)?.[1]
+            || remoteUrl?.match(/https?:\/\/github.com\/(.+)\.git/)?.[1]
             || null;
-        var gitHead = fs_extra_1.default.readFileSync(".git/HEAD", "utf-8");
-        var branchName = ((_c = gitHead.match(/ref: refs\/heads\/(.*)/)) === null || _c === void 0 ? void 0 : _c[1]) || null;
-        return { repoName: repoName, branchName: branchName };
+        const gitHead = fs.readFileSync(".git/HEAD", "utf-8");
+        const branchName = gitHead.match(/ref: refs\/heads\/(.*)/)?.[1] || null;
+        return { repoName, branchName };
     }
-    catch (_d) {
+    catch {
         return { repoName: null, branchName: null };
     }
 }
-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*/];
-            }
-        });
-    });
+async function getProjectId({ basePath, repoName }) {
+    try {
+        const response = await fetchWithTimeout(joinUrl(basePath, `/api/app/codegen/data/projects/get-by-repo?repo=${encodeURIComponent(repoName)}`), { method: "GET" });
+        return response.ok ? response.json() : null;
+    }
+    catch {
+        return null;
+    }
 }
-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*/];
-            }
-        });
-    });
+async function updateDainJson(result) {
+    try {
+        const dainJson = JSON.parse(await fs.readFile("./dain.json", "utf-8"));
+        dainJson["deployment-id"] = result.deploymentId;
+        dainJson["service-id"] = result.serviceId;
+        await fs.writeFile("./dain.json", JSON.stringify(dainJson, null, 2));
+    }
+    catch (error) {
+        logError("Failed to update dain.json", error);
+    }
 }
 function printDeploymentResult(result, spinner) {
     console.log("\n-----------------------");
-    spinner.succeed("Deployment URL: ".concat(result.service.url));
-    spinner.succeed("Deployment ID: ".concat(result.deploymentId));
+    spinner.succeed(`Deployment URL: ${result.service.url}`);
+    spinner.succeed(`Deployment ID: ${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.");

package/dist/commands/dev.d.ts

@@ -0,0 +1,6 @@
+export default function dev(options: {
+    port: string;
+    noproxy: boolean;
+    config?: string;
+    runtime?: 'node' | 'bun' | 'workers';
+}): Promise<void>;