tt-help-cli-ycl 1.3.32 → 1.3.34

package/scripts/run-explore.ps1

@@ -1,107 +1,157 @@
-$packageName = "tt-help-cli-ycl"
-$configPath = Join-Path $env:USERPROFILE ".tt-help.json"
-
-Write-Host "========================================"
-Write-Host "  tt-help-cli-ycl 一键启动脚本 (Windows)"
-Write-Host "========================================"
-
-# ---------- 0. 根据本机 IP 自动选择 server ----------
-$localIp = (Get-NetIPAddress -AddressFamily IPv4 | Where-Object { $_.IPAddress -match '^172\.18\.154\.' }).IPAddress
-if ($localIp) {
-    $targetServer = "http://172.18.154.201:3001"
-    Write-Host "[提示] 检测到内网 IP: $localIp，使用内网 server"
-} else {
-    $targetServer = "http://117.71.53.99:17301"
-    Write-Host "[提示] 未检测到内网 IP，使用公网 server"
-}
-
-# ---------- 1. 检查/安装最新版本 ----------
-$latestVersion = npm view $packageName version 2>$null
-
-if (-not $latestVersion) {
-    Write-Host "[错误] 无法从 npm 获取最新版本信息"
-    exit 1
-}
-
-$installedVersion = ""
-$output = npm list -g $packageName --depth=0 2>$null
-if ($output -match "$packageName@([\d.]+)") {
-    $installedVersion = $matches[1]
-}
-
-if (-not $installedVersion) {
-    Write-Host "[提示] tt-help-cli-ycl 未安装，正在安装最新版本..."
-    npm install -g $packageName 2>$null
-    if ($LASTEXITCODE -eq 0) {
-        Write-Host "[OK] 安装完成: $latestVersion"
-    } else {
-        Write-Host "[错误] 安装失败，请手动执行: npm install -g $packageName"
-        exit 1
-    }
-} elseif ($installedVersion -eq $latestVersion) {
-    Write-Host "[OK] tt-help-cli-ycl 已是最新版本: $latestVersion"
-} else {
-    Write-Host "[提示] 当前版本: $installedVersion, 最新版本: $latestVersion"
-    Write-Host "[执行] 正在升级最新版本..."
-    npm install -g $packageName 2>$null
-    if ($LASTEXITCODE -eq 0) {
-        Write-Host "[OK] 升级完成: $latestVersion"
-    } else {
-        Write-Host "[警告] 升级失败，请手动执行: npm install -g $packageName"
-    }
-}
-
-# ---------- 2. 检查/设置 server 配置 ----------
-$currentServer = ""
-if (Test-Path $configPath) {
-    try {
-        $config = Get-Content $configPath -Raw | ConvertFrom-Json
-        $currentServer = $config.server
-    } catch {
-        $currentServer = ""
-    }
-}
-
-if ($currentServer -eq $targetServer) {
-    Write-Host "[OK] Server 配置正确: $targetServer"
-} else {
-    $currentDisplay = if ($currentServer) { $currentServer } else { "未设置" }
-    Write-Host "[提示] 当前 server: $currentDisplay, 目标: $targetServer"
-    Write-Host "[执行] 正在设置 server 配置..."
-
-    node -e "
-const fs = require('fs');
-const path = require('path');
-const configPath = path.join(require('os').homedir(), '.tt-help.json');
-let cfg = {};
-try { cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch(e) {}
-cfg.server = '$targetServer';
-fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-console.log('  已写入: ' + configPath);
-"
-    Write-Host "[OK] Server 配置已设置"
-}
-
-# ---------- 3. 询问用户参数 ----------
-Write-Host ""
-Write-Host "========================================"
-Write-Host "  参数配置"
-Write-Host "========================================"
-
-$inputBasePort = Read-Host "起始端口 (--base-port) [默认: 9222]"
-$basePort = if ($inputBasePort) { $inputBasePort } else { "9222" }
-
-$inputPortCount = Read-Host "端口数量 (--port-count) [默认: 10]"
-$portCount = if ($inputPortCount) { $inputPortCount } else { "10" }
-
-# ---------- 4. 启动 tt-help explore ----------
-Write-Host ""
-Write-Host "========================================"
-Write-Host "  启动 tt-help explore"
-Write-Host "========================================"
-Write-Host "  起始端口: $basePort"
-Write-Host "  端口数量: $portCount"
-Write-Host "  速度: stealth (最慢)"
-Write-Host "========================================"
-tt-help explore stealth --base-port $basePort --port-count $portCount
-tt-help explore
+$packageName = "tt-help-cli-ycl"
+$configPath = Join-Path $env:USERPROFILE ".tt-help.json"
+
+Write-Host "========================================"
+Write-Host "  tt-help-cli-ycl 一键启动脚本 (Windows)"
+Write-Host "========================================"
+
+# ---------- 0. 根据本机 IP 自动选择 server ----------
+$localIp = $null
+try {
+    $localIp = Get-WmiObject Win32_NetworkAdapterConfiguration |
+        Where-Object { $_.IPEnabled -eq $true } |
+        ForEach-Object { $_.IPAddress } |
+        Where-Object {
+            $_ -match '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' -and
+            $_ -ne '127.0.0.1' -and
+            $_ -notlike '169.254.*'
+        } |
+        Select-Object -First 1
+} catch {
+}
+if (-not $localIp) {
+    try {
+        $localIp = Get-NetIPAddress -AddressFamily IPv4 -ErrorAction Stop |
+            Where-Object { $_.IPAddress -ne '127.0.0.1' -and $_.IPAddress -notlike '169.254.*' } |
+            Select-Object -First 1 -ExpandProperty IPAddress
+    } catch {
+    }
+}
+if (-not $localIp) {
+    try {
+        $localIp = [System.Net.Dns]::GetHostAddresses([System.Net.Dns]::GetHostName()) |
+            Where-Object {
+                $_.AddressFamily -eq [System.Net.Sockets.AddressFamily]::InterNetwork -and
+                $_.IPAddressToString -ne '127.0.0.1' -and
+                $_.IPAddressToString -notlike '169.254.*'
+            } |
+            Select-Object -First 1 -ExpandProperty IPAddressToString
+    } catch {
+    }
+}
+Write-Host "[提示] 本机 IP: $(if ($localIp) { $localIp } else { '未检测到' })"
+if ($localIp -and $localIp -match '^172\.18\.154\.') {
+    $targetServer = "http://172.18.154.201:3001"
+    Write-Host "[提示] 检测到内网 IP: $localIp，使用内网 server"
+} else {
+    $targetServer = "http://117.71.53.99:17301"
+    Write-Host "[提示] 未检测到内网 IP，使用公网 server"
+}
+
+# ---------- 1. 检查/安装最新版本 ----------
+$latestVersion = npm view $packageName version 2>$null
+
+if (-not $latestVersion) {
+    Write-Host "[错误] 无法从 npm 获取最新版本信息"
+    exit 1
+}
+
+$installedVersion = ""
+$output = npm list -g $packageName --depth=0 2>$null
+if ($output -match "$packageName@([\d.]+)") {
+    $installedVersion = $matches[1]
+}
+
+if (-not $installedVersion) {
+    Write-Host "[提示] tt-help-cli-ycl 未安装，正在安装最新版本..."
+    npm install -g $packageName 2>$null
+    if ($LASTEXITCODE -eq 0) {
+        Write-Host "[OK] 安装完成: $latestVersion"
+    } else {
+        Write-Host "[错误] 安装失败，请手动执行: npm install -g $packageName"
+        exit 1
+    }
+} elseif ($installedVersion -eq $latestVersion) {
+    Write-Host "[OK] tt-help-cli-ycl 已是最新版本: $latestVersion"
+} else {
+    Write-Host "[提示] 当前版本: $installedVersion, 最新版本: $latestVersion"
+    Write-Host "[执行] 正在升级最新版本..."
+    npm install -g $packageName 2>$null
+    if ($LASTEXITCODE -eq 0) {
+        Write-Host "[OK] 升级完成: $latestVersion"
+    } else {
+        Write-Host "[警告] 升级失败，请手动执行: npm install -g $packageName"
+    }
+}
+
+# ---------- 2. 检查/设置 server 配置 ----------
+$currentServer = ""
+if (Test-Path $configPath) {
+    try {
+        $config = Get-Content $configPath -Raw | ConvertFrom-Json
+        $currentServer = $config.server
+    } catch {
+        $currentServer = ""
+    }
+}
+
+if ($currentServer -eq $targetServer) {
+    Write-Host "[OK] Server 配置正确: $targetServer"
+} else {
+    $currentDisplay = if ($currentServer) { $currentServer } else { "未设置" }
+    Write-Host "[提示] 当前 server: $currentDisplay, 目标: $targetServer"
+    Write-Host "[执行] 正在设置 server 配置..."
+
+    node -e "
+const fs = require('fs');
+const path = require('path');
+const configPath = path.join(require('os').homedir(), '.tt-help.json');
+let cfg = {};
+try { cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch(e) {}
+cfg.server = '$targetServer';
+fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+console.log('  已写入: ' + configPath);
+"
+    Write-Host "[OK] Server 配置已设置"
+}
+
+# ---------- 3. 询问用户参数 ----------
+Write-Host ""
+Write-Host "========================================"
+Write-Host "  参数配置"
+Write-Host "========================================"
+
+$inputBasePort = Read-Host "起始端口 (--base-port) [默认: 9222]"
+$basePort = if ($inputBasePort) { $inputBasePort } else { "9222" }
+
+$inputPortCount = Read-Host "端口数量 (--port-count) [默认: 10]"
+$portCount = if ($inputPortCount) { $inputPortCount } else { "10" }
+
+$inputJobLocations = Read-Host "任务国家 (--job-locations) [默认: 无，使用全部]"
+$jobLocationsArg = if ($inputJobLocations) { "--job-locations $inputJobLocations" } else { "" }
+
+# ---------- 4. 获取配置中的用户编号并拼接 ----------
+$configUserId = ""
+if (Test-Path $configPath) {
+    try {
+        $config = Get-Content $configPath -Raw | ConvertFrom-Json
+        $configUserId = $config.userId
+    } catch {
+        $configUserId = ""
+    }
+}
+if (-not $configUserId) { $configUserId = "user" }
+$userId = "${configUserId}_${basePort}_${portCount}"
+
+# ---------- 5. 启动 tt-help explore ----------
+Write-Host ""
+Write-Host "========================================"
+Write-Host "  启动 tt-help explore"
+Write-Host "========================================"
+Write-Host "  用户编号: $userId"
+Write-Host "  起始端口: $basePort"
+Write-Host "  端口数量: $portCount"
+if ($inputJobLocations) { Write-Host "  任务国家: $inputJobLocations" }
+Write-Host "  速度: stealth (最慢)"
+Write-Host "========================================"
+tt-help explore stealth --user-id $userId --base-port $basePort --port-count $portCount $jobLocationsArg

package/scripts/run-explore.sh

@@ -1,98 +1,119 @@
-#!/bin/bash
-
-PACKAGENAME="tt-help-cli-ycl"
-CONFIG_PATH="$HOME/.tt-help.json"
-
-echo "========================================"
-echo "  tt-help-cli-ycl 一键启动脚本 (macOS)"
-echo "========================================"
-
-# ---------- 0. 根据本机 IP 自动选择 server ----------
-LOCAL_IP=$(ifconfig | grep -oE 'inet (172\.18\.154\.[0-9]+)' | head -1 | awk '{print $2}')
-
-if [ -n "$LOCAL_IP" ]; then
-  TARGET_SERVER="http://172.18.154.201:3001"
-  echo "[提示] 检测到内网 IP: $LOCAL_IP，使用内网 server"
-else
-  TARGET_SERVER="http://117.71.53.99:17301"
-  echo "[提示] 未检测到内网 IP，使用公网 server"
-fi
-
-# ---------- 1. 检查/安装最新版本 ----------
-LATEST_VERSION=$(npm view "$PACKAGENAME" version 2>/dev/null)
-
-if [ -z "$LATEST_VERSION" ]; then
-  echo "[错误] 无法从 npm 获取最新版本信息"
-  exit 1
-fi
-
-INSTALLED_VERSION=$(npm list -g "$PACKAGENAME" --depth=0 2>/dev/null | grep "$PACKAGENAME@" | head -1 | sed 's/.*@//' | sed 's/[) ].*//')
-
-if [ -z "$INSTALLED_VERSION" ]; then
-  echo "[提示] tt-help-cli-ycl 未安装，正在安装最新版本..."
-  npm install -g "$PACKAGENAME"
-  if [ $? -eq 0 ]; then
-    echo "[OK] 安装完成: $LATEST_VERSION"
-  else
-    echo "[错误] 安装失败，请手动执行: npm install -g $PACKAGENAME"
-    exit 1
-  fi
-elif [ "$INSTALLED_VERSION" = "$LATEST_VERSION" ]; then
-  echo "[OK] tt-help-cli-ycl 已是最新版本: $LATEST_VERSION"
-else
-  echo "[提示] 当前版本: $INSTALLED_VERSION, 最新版本: $LATEST_VERSION"
-  echo "[执行] 正在升级最新版本..."
-  npm install -g "$PACKAGENAME" 2>/dev/null
-  if [ $? -eq 0 ]; then
-    echo "[OK] 安装完成: $LATEST_VERSION"
-  else
-    echo "[警告] 自动安装失败，尝试手动更新..."
-    npm update -g "$PACKAGENAME"
-  fi
-fi
-
-# ---------- 2. 检查/设置 server 配置 ----------
-CURRENT_SERVER=""
-if [ -f "$CONFIG_PATH" ]; then
-  CURRENT_SERVER=$(node -e "try{const c=JSON.parse(require('fs').readFileSync('$CONFIG_PATH','utf-8'));console.log(c.server||'')}catch(e){}" 2>/dev/null)
-fi
-
-if [ "$CURRENT_SERVER" = "$TARGET_SERVER" ]; then
-  echo "[OK] Server 配置正确: $TARGET_SERVER"
-else
-  echo "[提示] 当前 server: ${CURRENT_SERVER:-未设置}, 目标: $TARGET_SERVER"
-  echo "[执行] 正在设置 server 配置..."
-  node -e "
-const fs = require('fs');
-const path = require('path');
-const configPath = path.join(require('os').homedir(), '.tt-help.json');
-let cfg = {};
-try { cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch(e) {}
-cfg.server = '$TARGET_SERVER';
-fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-console.log('  已写入: ' + configPath);
-"
-  echo "[OK] Server 配置已设置"
-fi
-
-# ---------- 3. 询问用户参数 ----------
-echo ""
-echo "========================================"
-echo "  参数配置"
-echo "========================================"
-
-read -p "起始端口 (--base-port) [默认: 9222]: " INPUT_BASE_PORT
-BASE_PORT="${INPUT_BASE_PORT:-9222}"
-
-read -p "端口数量 (--port-count) [默认: 10]: " INPUT_PORT_COUNT
-PORT_COUNT="${INPUT_PORT_COUNT:-10}"
-
-echo ""
-echo "========================================"
-echo "  启动 tt-help explore"
-echo "========================================"
-echo "  起始端口: $BASE_PORT"
-echo "  端口数量: $PORT_COUNT"
-echo "  速度: stealth (最慢)"
-echo "========================================"
-tt-help explore stealth --base-port "$BASE_PORT" --port-count "$PORT_COUNT"
+#!/bin/bash
+
+PACKAGENAME="tt-help-cli-ycl"
+CONFIG_PATH="$HOME/.tt-help.json"
+
+echo "========================================"
+echo "  tt-help-cli-ycl 一键启动脚本 (macOS)"
+echo "========================================"
+
+# ---------- 0. 根据本机 IP 自动选择 server ----------
+LOCAL_IP=$(ifconfig | awk '/inet / && $2 != "127.0.0.1" { print $2; exit }')
+
+echo "[提示] 本机 IP: ${LOCAL_IP:-未检测到}"
+
+if [[ "$LOCAL_IP" =~ ^172\.18\.154\.[0-9]+$ ]]; then
+  TARGET_SERVER="http://172.18.154.201:3001"
+  echo "[提示] 检测到内网 IP: $LOCAL_IP，使用内网 server"
+else
+  TARGET_SERVER="http://117.71.53.99:17301"
+  echo "[提示] 未检测到内网 IP，使用公网 server"
+fi
+
+# ---------- 1. 检查/安装最新版本 ----------
+LATEST_VERSION=$(npm view "$PACKAGENAME" version 2>/dev/null)
+
+if [ -z "$LATEST_VERSION" ]; then
+  echo "[错误] 无法从 npm 获取最新版本信息"
+  exit 1
+fi
+
+INSTALLED_VERSION=$(npm list -g "$PACKAGENAME" --depth=0 2>/dev/null | grep "$PACKAGENAME@" | head -1 | sed 's/.*@//' | sed 's/[) ].*//')
+
+if [ -z "$INSTALLED_VERSION" ]; then
+  echo "[提示] tt-help-cli-ycl 未安装，正在安装最新版本..."
+  npm install -g "$PACKAGENAME"
+  if [ $? -eq 0 ]; then
+    echo "[OK] 安装完成: $LATEST_VERSION"
+  else
+    echo "[错误] 安装失败，请手动执行: npm install -g $PACKAGENAME"
+    exit 1
+  fi
+elif [ "$INSTALLED_VERSION" = "$LATEST_VERSION" ]; then
+  echo "[OK] tt-help-cli-ycl 已是最新版本: $LATEST_VERSION"
+else
+  echo "[提示] 当前版本: $INSTALLED_VERSION, 最新版本: $LATEST_VERSION"
+  echo "[执行] 正在升级最新版本..."
+  npm install -g "$PACKAGENAME" 2>/dev/null
+  if [ $? -eq 0 ]; then
+    echo "[OK] 安装完成: $LATEST_VERSION"
+  else
+    echo "[警告] 自动安装失败，尝试手动更新..."
+    npm update -g "$PACKAGENAME"
+  fi
+fi
+
+# ---------- 2. 检查/设置 server 配置 ----------
+CURRENT_SERVER=""
+if [ -f "$CONFIG_PATH" ]; then
+  CURRENT_SERVER=$(node -e "try{const c=JSON.parse(require('fs').readFileSync('$CONFIG_PATH','utf-8'));console.log(c.server||'')}catch(e){}" 2>/dev/null)
+fi
+
+if [ "$CURRENT_SERVER" = "$TARGET_SERVER" ]; then
+  echo "[OK] Server 配置正确: $TARGET_SERVER"
+else
+  echo "[提示] 当前 server: ${CURRENT_SERVER:-未设置}, 目标: $TARGET_SERVER"
+  echo "[执行] 正在设置 server 配置..."
+  node -e "
+const fs = require('fs');
+const path = require('path');
+const configPath = path.join(require('os').homedir(), '.tt-help.json');
+let cfg = {};
+try { cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch(e) {}
+cfg.server = '$TARGET_SERVER';
+fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+console.log('  已写入: ' + configPath);
+"
+  echo "[OK] Server 配置已设置"
+fi
+
+# ---------- 3. 询问用户参数 ----------
+echo ""
+echo "========================================"
+echo "  参数配置"
+echo "========================================"
+
+printf "起始端口 (--base-port) [默认: 9222]: "
+read INPUT_BASE_PORT
+BASE_PORT="${INPUT_BASE_PORT:-9222}"
+
+printf "端口数量 (--port-count) [默认: 10]: "
+read INPUT_PORT_COUNT
+PORT_COUNT="${INPUT_PORT_COUNT:-10}"
+
+printf "任务国家 (--job-locations) [默认: 无，使用全部]: "
+read INPUT_JOB_LOCATIONS
+
+# ---------- 4. 获取配置中的用户编号并拼接 ----------
+CONFIG_USER_ID=""
+if [ -f "$CONFIG_PATH" ]; then
+  CONFIG_USER_ID=$(node -e "try{const c=JSON.parse(require('fs').readFileSync('$CONFIG_PATH','utf-8'));console.log(c.userId||'')}catch(e){}" 2>/dev/null)
+fi
+if [ -z "$CONFIG_USER_ID" ]; then
+  CONFIG_USER_ID="user"
+fi
+USER_ID="${CONFIG_USER_ID}_${BASE_PORT}_${PORT_COUNT}"
+
+echo ""
+echo "========================================"
+echo "  启动 tt-help explore"
+echo "========================================"
+echo "  用户编号: $USER_ID"
+echo "  起始端口: $BASE_PORT"
+echo "  端口数量: $PORT_COUNT"
+if [ -n "$INPUT_JOB_LOCATIONS" ]; then echo "  任务国家: $INPUT_JOB_LOCATIONS"; fi
+echo "  速度: stealth (最慢)"
+echo "========================================"
+JOB_LOC_ARGS=""
+if [ -n "$INPUT_JOB_LOCATIONS" ]; then JOB_LOC_ARGS="--job-locations $INPUT_JOB_LOCATIONS"; fi
+tt-help explore stealth --user-id "$USER_ID" --base-port "$BASE_PORT" --port-count "$PORT_COUNT" $JOB_LOC_ARGS