cloudflared-manager 0.1.2 → 0.1.3

package/cloudflared_manager.mjs

@@ -1002,13 +1002,21 @@ function buildSetupReviewMenu(type, baseArgs, state) {
   ];
 
   if (isAdd) {
+    prelude.push(colorize(`覆盖已有 DNS 记录: ${formatEnabled(state.overwriteDns)}`, COLORS.dim, COLORS.gray));
+    prelude.push(colorize(`跳过本地连通性检查: ${formatEnabled(state.skipCheck)}`, COLORS.dim, COLORS.gray));
     prelude.push(colorize(`立即启动: ${formatEnabled(state.start)}`, COLORS.dim, COLORS.gray));
     prelude.push(colorize(`激活为默认配置: ${formatEnabled(state.activate)}`, COLORS.dim, COLORS.gray));
+    if (state.overwriteDns) commandArgs.push("--overwrite-dns");
+    if (state.skipCheck) commandArgs.push("--skip-check");
     if (state.start) commandArgs.push("--start");
   } else {
     prelude.push(colorize(`同时确保 DNS 路由存在: ${formatEnabled(state.ensureDns)}`, COLORS.dim, COLORS.gray));
+    prelude.push(colorize(`覆盖已有 DNS 记录: ${formatEnabled(state.overwriteDns)}`, COLORS.dim, COLORS.gray));
+    prelude.push(colorize(`跳过本地连通性检查: ${formatEnabled(state.skipCheck)}`, COLORS.dim, COLORS.gray));
     prelude.push(colorize(`激活为默认配置: ${formatEnabled(state.activate)}`, COLORS.dim, COLORS.gray));
     if (state.ensureDns) commandArgs.push("--ensure-dns");
+    if (state.ensureDns && state.overwriteDns) commandArgs.push("--overwrite-dns");
+    if (state.skipCheck) commandArgs.push("--skip-check");
   }
   if (state.activate) commandArgs.push("--activate");
 
@@ -1022,12 +1030,24 @@ function buildSetupReviewMenu(type, baseArgs, state) {
     { value: "4", label: "重新录入 ingress 规则", hint: `当前共 ${state.specs.length} 条`, kind: "secondary" },
     {
       value: "5",
-      label: isAdd ? "切换“立即启动”" : "切换“确保 DNS 路由存在”",
-      hint: `当前: ${isAdd ? formatEnabled(state.start) : formatEnabled(state.ensureDns)}`,
+      label: isAdd ? "切换“覆盖已有 DNS”" : "切换“确保 DNS 路由存在”",
+      hint: `当前: ${isAdd ? formatEnabled(state.overwriteDns) : formatEnabled(state.ensureDns)}`,
       kind: "assist",
     },
     {
       value: "6",
+      label: isAdd ? "切换“跳过连通性检查”" : "切换“覆盖已有 DNS”",
+      hint: `当前: ${isAdd ? formatEnabled(state.skipCheck) : formatEnabled(state.overwriteDns)}`,
+      kind: "assist",
+    },
+    {
+      value: "7",
+      label: isAdd ? "切换“立即启动”" : "切换“跳过连通性检查”",
+      hint: `当前: ${isAdd ? formatEnabled(state.start) : formatEnabled(state.skipCheck)}`,
+      kind: "assist",
+    },
+    {
+      value: "8",
       label: "切换“激活为默认配置”",
       hint: `当前: ${formatEnabled(state.activate)}`,
       kind: "assist",
@@ -1104,7 +1124,14 @@ function buildIngressChangeReviewMenu(type, baseArgs, state, preview) {
 
   prelude.push(colorize("变更后：", COLORS.bold, COLORS.white));
   prelude.push(...renderRuleObjects(preview.nextRules).map((line) => colorize(line, COLORS.dim, COLORS.gray)));
-  prelude.push(colorize(`暂不重启: ${formatEnabled(state.noRestart)}`, COLORS.dim, COLORS.gray));
+  if (type === "add") {
+    prelude.push(colorize(`覆盖已有 DNS 记录: ${formatEnabled(state.overwriteDns)}`, COLORS.dim, COLORS.gray));
+    prelude.push(colorize(`跳过本地连通性检查: ${formatEnabled(state.skipCheck)}`, COLORS.dim, COLORS.gray));
+    prelude.push(colorize(`暂不重启: ${formatEnabled(state.noRestart)}`, COLORS.dim, COLORS.gray));
+    prelude.push(colorize(`激活为默认配置: ${formatEnabled(state.activate)}`, COLORS.dim, COLORS.gray));
+  } else {
+    prelude.push(colorize(`暂不重启: ${formatEnabled(state.noRestart)}`, COLORS.dim, COLORS.gray));
+  }
 
   let commandArgs;
   if (type === "modify") {
@@ -1117,24 +1144,41 @@ function buildIngressChangeReviewMenu(type, baseArgs, state, preview) {
   } else {
     commandArgs = ["ingress-remove", state.name, ...buildRemoveArgs(state.specs)];
   }
+  if (type === "add") {
+    if (state.overwriteDns) commandArgs.push("--overwrite-dns");
+    if (state.skipCheck) commandArgs.push("--skip-check");
+  }
   if (state.noRestart) {
     commandArgs.push("--no-restart");
   }
+  if (type === "add" && state.activate) {
+    commandArgs.push("--activate");
+  }
 
   prelude.push(colorize("命令预览：", COLORS.bold, COLORS.cyan));
   prelude.push(...renderCommandPreview(baseArgs, commandArgs).map((line) => colorize(line, COLORS.dim, COLORS.gray)));
 
-  const items = [
-    { value: "1", label: "执行变更", hint: "调用底层 shell 脚本真正落地", kind: "primary" },
-    {
-      value: "2",
-      label: type === "modify" ? "重新录入修改规则" : type === "add" ? "重新录入新增规则" : "重新录入删除规则",
-      hint: `当前共 ${state.specs.length} 条`,
-      kind: "secondary",
-    },
-    { value: "3", label: "切换“暂不重启”", hint: `当前: ${formatEnabled(state.noRestart)}`, kind: "assist" },
-    { value: "0", label: "取消当前流程", hint: "不执行这次变更", kind: "danger", back: true },
-  ];
+  const items = type === "add"
+    ? [
+        { value: "1", label: "执行变更", hint: "调用底层 shell 脚本真正落地", kind: "primary" },
+        { value: "2", label: "重新录入新增规则", hint: `当前共 ${state.specs.length} 条`, kind: "secondary" },
+        { value: "3", label: "切换“覆盖已有 DNS”", hint: `当前: ${formatEnabled(state.overwriteDns)}`, kind: "assist" },
+        { value: "4", label: "切换“跳过连通性检查”", hint: `当前: ${formatEnabled(state.skipCheck)}`, kind: "assist" },
+        { value: "5", label: "切换“暂不重启”", hint: `当前: ${formatEnabled(state.noRestart)}`, kind: "assist" },
+        { value: "6", label: "切换“激活为默认配置”", hint: `当前: ${formatEnabled(state.activate)}`, kind: "assist" },
+        { value: "0", label: "取消当前流程", hint: "不执行这次变更", kind: "danger", back: true },
+      ]
+    : [
+        { value: "1", label: "执行变更", hint: "调用底层 shell 脚本真正落地", kind: "primary" },
+        {
+          value: "2",
+          label: type === "modify" ? "重新录入修改规则" : "重新录入删除规则",
+          hint: `当前共 ${state.specs.length} 条`,
+          kind: "secondary",
+        },
+        { value: "3", label: "切换“暂不重启”", hint: `当前: ${formatEnabled(state.noRestart)}`, kind: "assist" },
+        { value: "0", label: "取消当前流程", hint: "不执行这次变更", kind: "danger", back: true },
+      ];
 
   return {
     key: `${type}_ingress_review`,
@@ -1198,7 +1242,10 @@ async function runIngressAddWizard(rl, baseArgs, name) {
     name,
     currentRules,
     specs: await collectRequiredIngressSpecs(rl),
+    overwriteDns: false,
+    skipCheck: false,
     noRestart: true,
+    activate: false,
   };
 
   while (true) {
@@ -1217,8 +1264,17 @@ async function runIngressAddWizard(rl, baseArgs, name) {
         state.specs = await collectRequiredIngressSpecs(rl);
         break;
       case "3":
+        state.overwriteDns = !state.overwriteDns;
+        break;
+      case "4":
+        state.skipCheck = !state.skipCheck;
+        break;
+      case "5":
         state.noRestart = !state.noRestart;
         break;
+      case "6":
+        state.activate = !state.activate;
+        break;
       case "0":
         return null;
       default:
@@ -1338,6 +1394,8 @@ async function runAddWizard(rl, baseArgs) {
     name: "",
     tunnelName: "",
     specs: [],
+    overwriteDns: false,
+    skipCheck: false,
     start: false,
     activate: false,
   };
@@ -1372,9 +1430,15 @@ async function runAddWizard(rl, baseArgs) {
         state.specs = await collectRequiredIngressSpecs(rl);
         break;
       case "5":
-        state.start = !state.start;
+        state.overwriteDns = !state.overwriteDns;
         break;
       case "6":
+        state.skipCheck = !state.skipCheck;
+        break;
+      case "7":
+        state.start = !state.start;
+        break;
+      case "8":
         state.activate = !state.activate;
         break;
       case "0":
@@ -1393,6 +1457,8 @@ async function runAdoptWizard(rl, baseArgs) {
     tunnelName: "",
     specs: [],
     ensureDns: false,
+    overwriteDns: false,
+    skipCheck: false,
     activate: false,
   };
 
@@ -1433,8 +1499,20 @@ async function runAdoptWizard(rl, baseArgs) {
         break;
       case "5":
         state.ensureDns = !state.ensureDns;
+        if (!state.ensureDns) {
+          state.overwriteDns = false;
+        }
         break;
       case "6":
+        state.overwriteDns = !state.overwriteDns;
+        if (state.overwriteDns) {
+          state.ensureDns = true;
+        }
+        break;
+      case "7":
+        state.skipCheck = !state.skipCheck;
+        break;
+      case "8":
         state.activate = !state.activate;
         break;
       case "0":
@@ -1871,6 +1949,8 @@ async function handleAction(rl, baseArgs, action, context = {}) {
             return { keepRunning: true };
           }
           args = ["add", addState.name, "--tunnel-name", addState.tunnelName, ...buildIngressArgs(addState.specs)];
+          if (addState.overwriteDns) args.push("--overwrite-dns");
+          if (addState.skipCheck) args.push("--skip-check");
           if (addState.start) args.push("--start");
           if (addState.activate) args.push("--activate");
           runShell(baseArgs, args);
@@ -1888,6 +1968,8 @@ async function handleAction(rl, baseArgs, action, context = {}) {
           }
           args = ["adopt", adoptState.name, "--tunnel-name", adoptState.tunnelName, ...buildIngressArgs(adoptState.specs)];
           if (adoptState.ensureDns) args.push("--ensure-dns");
+          if (adoptState.ensureDns && adoptState.overwriteDns) args.push("--overwrite-dns");
+          if (adoptState.skipCheck) args.push("--skip-check");
           if (adoptState.activate) args.push("--activate");
           runShell(baseArgs, args);
           return { keepRunning: true };
@@ -1937,7 +2019,10 @@ async function handleAction(rl, baseArgs, action, context = {}) {
             return { keepRunning: true };
           }
           args = ["ingress-add", name, ...buildIngressArgs(addState.specs)];
+          if (addState.overwriteDns) args.push("--overwrite-dns");
+          if (addState.skipCheck) args.push("--skip-check");
           if (addState.noRestart) args.push("--no-restart");
+          if (addState.activate) args.push("--activate");
           runShell(baseArgs, args);
           return { keepRunning: true };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflared-manager",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Interactive wrapper and shell-first manager for cloudflared tunnels",
   "type": "module",
   "bin": {