cloudflared-manager 0.1.0 → 0.1.1

package/cloudflared_manager.sh

@@ -160,6 +160,22 @@ dir_exists() {
   [[ -d "$1" ]]
 }
 
+# 判断数组是否至少包含一个元素，兼容 macOS Bash 3 在 set -u 下的空数组行为。
+array_has_items() {
+  local array_name="$1"
+  eval "[[ \${${array_name}[0]+_} == _ ]]"
+}
+
+# 返回数组长度，兼容 macOS Bash 3 在 set -u 下的空数组行为。
+array_length() {
+  local array_name="$1"
+  if array_has_items "$array_name"; then
+    eval "printf '%s\n' \"\${#${array_name}[@]}\""
+  else
+    printf '0\n'
+  fi
+}
+
 # 判断命令是否可用。
 command_exists() {
   command -v "$1" >/dev/null 2>&1
@@ -1777,6 +1793,18 @@ cmd_add() {
   local foreground=0
   local activate=0
 
+  if [[ "$name" == "-h" || "$name" == "--help" ]]; then
+    cat <<EOF
+用法:
+  $SCRIPT_NAME add NAME [--hostname HOST --service URL] [--ingress HOST=URL ...] [--tunnel-name NAME] [--use-existing] [--overwrite-dns] [--skip-check] [--start] [--foreground] [--activate]
+
+说明:
+  - 兼容旧写法：使用一组 --hostname 和 --service
+  - 多 ingress 写法：重复传 --ingress hostname=service
+  - 可以混用，首条规则会作为“主入口”展示
+EOF
+    return 0
+  fi
   [[ -z "$name" ]] && die "add 需要 NAME"
   shift
 
@@ -1818,7 +1846,11 @@ EOF
     die "受管应用已存在: $name"
   fi
 
-  build_requested_ingress_rules "$hostname" "$service" "${ingress_specs[@]}"
+  if array_has_items ingress_specs; then
+    build_requested_ingress_rules "$hostname" "$service" "${ingress_specs[@]}"
+  else
+    build_requested_ingress_rules "$hostname" "$service"
+  fi
   if [[ "$skip_check" == "0" ]]; then
     check_all_ingress_targets
   fi
@@ -1863,6 +1895,17 @@ cmd_adopt() {
   local skip_check=0
   local activate=0
 
+  if [[ "$name" == "-h" || "$name" == "--help" ]]; then
+    cat <<EOF
+用法:
+  $SCRIPT_NAME adopt NAME --tunnel-name NAME [--hostname HOST --service URL] [--ingress HOST=URL ...] [--ensure-dns] [--overwrite-dns] [--skip-check] [--activate]
+
+说明:
+  - 至少要提供一条 ingress 规则
+  - 如果远端 DNS 已经配好，可不传 --ensure-dns
+EOF
+    return 0
+  fi
   [[ -z "$name" ]] && die "adopt 需要 NAME"
   shift
 
@@ -1903,7 +1946,11 @@ EOF
     die "受管应用已存在: $name"
   fi
 
-  build_requested_ingress_rules "$hostname" "$service" "${ingress_specs[@]}"
+  if array_has_items ingress_specs; then
+    build_requested_ingress_rules "$hostname" "$service" "${ingress_specs[@]}"
+  else
+    build_requested_ingress_rules "$hostname" "$service"
+  fi
   if [[ "$skip_check" == "0" ]]; then
     check_all_ingress_targets
   fi
@@ -2002,7 +2049,7 @@ EOF
     [[ -n "$pid" ]] && was_running=1
   fi
 
-  if [[ "${#modify_specs[@]}" -gt 0 ]]; then
+  if array_has_items modify_specs; then
     if [[ -n "$new_hostname" || -n "$new_service" || "$index" != "1" ]]; then
       die "使用 --set 批量修改时，不要再混用 --index / --hostname / --service"
     fi
@@ -2052,7 +2099,7 @@ EOF
       i=$((i + 1))
     done
 
-    changed_count="${#changed_indices[@]}"
+    changed_count="$(array_length changed_indices)"
     if [[ "$changed_count" == "0" ]]; then
       info "没有变更。"
       return 0
@@ -2132,13 +2179,13 @@ EOF
   if [[ "$was_running" == "1" && "$no_restart" == "0" ]]; then
     stop_app 0
     start_app 0 "$skip_check"
-    if [[ "${#modify_specs[@]}" -gt 0 ]]; then
+    if array_has_items modify_specs; then
       info "已批量修改 ${changed_count} 条 ingress 并重启: $META_NAME"
     else
       info "已修改并重启: $META_NAME"
     fi
   else
-    if [[ "${#modify_specs[@]}" -gt 0 ]]; then
+    if array_has_items modify_specs; then
       info "已批量修改 ingress 规则数量: ${changed_count}"
     else
       info "已修改: $META_NAME"
@@ -2226,18 +2273,20 @@ EOF
     requested_services+=("$(normalize_service "$service")")
   fi
 
-  for candidate_service in "${ingress_specs[@]}"; do
-    parse_ingress_spec "$candidate_service"
-    requested_hosts+=("$PARSED_INGRESS_HOSTNAME")
-    requested_services+=("$PARSED_INGRESS_SERVICE")
-  done
+  if array_has_items ingress_specs; then
+    for candidate_service in "${ingress_specs[@]}"; do
+      parse_ingress_spec "$candidate_service"
+      requested_hosts+=("$PARSED_INGRESS_HOSTNAME")
+      requested_services+=("$PARSED_INGRESS_SERVICE")
+    done
+  fi
 
-  if [[ "${#requested_hosts[@]}" == "0" ]]; then
+  if [[ "$(array_length requested_hosts)" == "0" ]]; then
     die "至少需要提供一条 ingress 规则。可使用 --hostname/--service，或重复传 --ingress hostname=service"
   fi
 
   i=0
-  while [[ "$i" -lt "${#requested_hosts[@]}" ]]; do
+  while [[ "$i" -lt "$(array_length requested_hosts)" ]]; do
     candidate_hostname="${requested_hosts[$i]}"
     candidate_service="${requested_services[$i]}"
 
@@ -2340,7 +2389,7 @@ EOF
     esac
   done
 
-  if [[ "${#hostnames[@]}" == "0" && "${#indices[@]}" == "0" ]]; then
+  if [[ "$(array_length hostnames)" == "0" && "$(array_length indices)" == "0" ]]; then
     die "ingress-remove 至少需要一个 --hostname 或 --index"
   fi
 
@@ -2359,21 +2408,25 @@ EOF
     i=$((i + 1))
   done
 
-  for hostname in "${hostnames[@]}"; do
-    hostname="$(normalize_hostname "$hostname")"
-    current_index="$(find_ingress_rule_index_by_hostname "$hostname" 2>/dev/null || true)"
-    [[ -n "$current_index" ]] || die "未找到要删除的 ingress 主机名: $hostname"
-    remove_flags[$current_index]=1
-  done
+  if array_has_items hostnames; then
+    for hostname in "${hostnames[@]}"; do
+      hostname="$(normalize_hostname "$hostname")"
+      current_index="$(find_ingress_rule_index_by_hostname "$hostname" 2>/dev/null || true)"
+      [[ -n "$current_index" ]] || die "未找到要删除的 ingress 主机名: $hostname"
+      remove_flags[$current_index]=1
+    done
+  fi
 
-  for index in "${indices[@]}"; do
-    [[ "$index" =~ ^[1-9][0-9]*$ ]] || die "--index 必须是大于等于 1 的整数"
-    current_index=$((index - 1))
-    if [[ "$current_index" -lt 0 || "$current_index" -ge "$total_rules" ]]; then
-      die "要删除的 ingress 序号超出范围: $index"
-    fi
-    remove_flags[$current_index]=1
-  done
+  if array_has_items indices; then
+    for index in "${indices[@]}"; do
+      [[ "$index" =~ ^[1-9][0-9]*$ ]] || die "--index 必须是大于等于 1 的整数"
+      current_index=$((index - 1))
+      if [[ "$current_index" -lt 0 || "$current_index" -ge "$total_rules" ]]; then
+        die "要删除的 ingress 序号超出范围: $index"
+      fi
+      remove_flags[$current_index]=1
+    done
+  fi
 
   i=0
   while [[ "$i" -lt "$total_rules" ]]; do
@@ -2390,7 +2443,7 @@ EOF
   if [[ "$remove_count" == "0" ]]; then
     die "未找到要删除的 ingress 规则。"
   fi
-  if [[ "${#remaining_hosts[@]}" == "0" ]]; then
+  if [[ "$(array_length remaining_hosts)" == "0" ]]; then
     die "至少需要保留一条 ingress 规则。当前删除范围会把全部规则删空。"
   fi
 
@@ -2402,7 +2455,7 @@ EOF
   save_ingress_rules
   write_config 0
   save_meta
-  warn "已从配置中移除 ${#removed_hosts[@]} 条 ingress。Cloudflare 上旧 DNS 记录不会自动删除，如已弃用请手工清理。"
+  warn "已从配置中移除 $(array_length removed_hosts) 条 ingress。Cloudflare 上旧 DNS 记录不会自动删除，如已弃用请手工清理。"
 
   if [[ "$activate" == "1" ]]; then
     activate_default_config
@@ -2412,7 +2465,7 @@ EOF
     start_app 0 0
     info "已移除 ingress 并重启: $META_NAME"
   else
-    info "已移除 ingress 规则数量: ${#removed_hosts[@]}"
+    info "已移除 ingress 规则数量: $(array_length removed_hosts)"
   fi
 }
 

package/package.json

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