adspower-browser 2.0.3 → 2.0.5

package/README.MD

@@ -65,7 +65,7 @@ ads start
 
 The CLI supports prefix tab completion for subcommands and common flags (`-k`, `-p`, etc.) via [`@bomb.sh/tab`](https://bomb.sh/docs/tab/). Enable it once in your shell:
 
-**zsh**
+**macOS — zsh**
 
 ```bash
 ads complete zsh > ~/.ads-completion.zsh
@@ -73,7 +73,7 @@ echo 'source ~/.ads-completion.zsh' >> ~/.zshrc
 source ~/.ads-completion.zsh
 ```
 
-**bash**
+**Linux — bash**
 
 ```bash
 ads complete bash > ~/.ads-completion.bash
@@ -81,7 +81,34 @@ echo 'source ~/.ads-completion.bash' >> ~/.bashrc
 source ~/.ads-completion.bash
 ```
 
-After setup, `ads`, `adspower`, and `adspower-browser` share the same completions:
+On Linux login shells, ensure `~/.bashrc` is sourced (e.g. from `~/.bash_profile`).
+
+**Linux — zsh**
+
+```bash
+ads complete zsh > ~/.ads-completion.zsh
+echo 'source ~/.ads-completion.zsh' >> ~/.zshrc
+source ~/.ads-completion.zsh
+```
+
+**Windows — PowerShell**
+
+```powershell
+ads complete powershell > $HOME\.ads-completion.ps1
+if (-not (Test-Path $PROFILE)) { New-Item -Path $PROFILE -ItemType File -Force }
+Add-Content $PROFILE '. $HOME\.ads-completion.ps1'
+. $HOME\.ads-completion.ps1
+```
+
+**Windows — Git Bash**
+
+```bash
+ads complete bash > ~/.ads-completion.bash
+echo 'source ~/.ads-completion.bash' >> ~/.bashrc
+source ~/.ads-completion.bash
+```
+
+After setup on zsh/bash, `ads`, `adspower`, and `adspower-browser` share the same completions. On PowerShell and Git Bash, use `ads` for tab completion:
 
 ```bash
 ads <Tab><Tab>      # list subcommands
@@ -115,7 +142,7 @@ ads close-browser <profile_id>                   # Or JSON: profile_id? | profil
 ads create-browser '{"group_id":"0","user_proxy_config":{"proxy_soft":"no_proxy"},...}'  # group_id + account field required; proxy optional (defaults to no_proxy; proxyid takes priority over user_proxy_config when both given)
 ads update-browser '{"profile_id":"...",...}'    # profile_id required
 ads delete-browser '{"profile_id":["..."]}'     # profile_id required
-ads get-browser-list '{}'                       # Or group_id?, limit?, page?, profile_id[]?, profile_no[]?, sort_type?, sort_order?, tag_ids?, tags_filter?, name?, name_filter?
+ads get-browser-list '{}'                       # CLI defaults to page=1,limit=200. Or group_id?, limit?, page?, profile_id[]?, profile_no[]?, sort_type?, sort_order?, tag_ids?, tags_filter?, name?, name_filter?
 ads get-opened-browser                          # No params
 ```
 
@@ -187,4 +214,4 @@ copy the [`docker-compose.yml`](./docker-compose.yml)
 docker-compose -f ./docker-compose.yml up -d
 
 docker-compose exec adspower-cli /bin/bash
-```
+```

package/cli/core/winHideChildProcess.js

@@ -0,0 +1,47 @@
+"use strict";
+
+// src/core/winHideChildProcess.js
+if (process.platform !== "win32") {
+  return;
+}
+var cp = require("child_process");
+function withWindowsHide(options) {
+  if (typeof options === "object" && options !== null && !Array.isArray(options)) {
+    if (options.windowsHide === false) {
+      return options;
+    }
+    return { ...options, windowsHide: true };
+  }
+  return { windowsHide: true };
+}
+function normalizeExecArgs(options, callback) {
+  if (typeof options === "function") {
+    return { options: { windowsHide: true }, callback: options };
+  }
+  return { options: withWindowsHide(options || {}), callback };
+}
+function normalizeSpawnArgs(args, options) {
+  if (Array.isArray(args)) {
+    return { args, options: withWindowsHide(options || {}) };
+  }
+  return { args: [], options: withWindowsHide(args || {}) };
+}
+var origExec = cp.exec.bind(cp);
+cp.exec = function exec(cmd, options, callback) {
+  const { options: opts, callback: cb } = normalizeExecArgs(options, callback);
+  return origExec(cmd, opts, cb);
+};
+var origExecSync = cp.execSync.bind(cp);
+cp.execSync = function execSync(cmd, options) {
+  return origExecSync(cmd, withWindowsHide(options || {}));
+};
+var origSpawn = cp.spawn.bind(cp);
+cp.spawn = function spawn(command, args, options) {
+  const normalized = normalizeSpawnArgs(args, options);
+  return origSpawn(command, normalized.args, normalized.options);
+};
+var origSpawnSync = cp.spawnSync.bind(cp);
+cp.spawnSync = function spawnSync(command, args, options) {
+  const normalized = normalizeSpawnArgs(args, options);
+  return origSpawnSync(command, normalized.args, normalized.options);
+};

package/cli/index.js

@@ -93,6 +93,7 @@ var Store = class {
 var store = new Store();
 
 // src/core/start.ts
+var fs2 = __toESM(require("fs"));
 var path2 = __toESM(require("path"));
 var import_node_child_process2 = require("child_process");
 
@@ -134,7 +135,7 @@ var browsersKill = async () => {
 };
 var taskKillBrowser = () => new Promise((resolve) => {
   const cmd = ["linux", "darwin"].includes(process.platform) ? 'pkill -u `whoami` -f "SunBrowser"' : "taskkill -PID SunBrowser.exe";
-  (0, import_node_child_process.exec)(cmd, (err) => {
+  (0, import_node_child_process.exec)(cmd, { windowsHide: true }, (err) => {
     if (err) {
     }
     resolve();
@@ -142,7 +143,7 @@ var taskKillBrowser = () => new Promise((resolve) => {
 });
 var taskKillFlowser = () => new Promise((resolve) => {
   const cmd = ["linux", "darwin"].includes(process.platform) ? 'pkill -u `whoami` -f "FlowerBrowser"' : "taskkill -PID FlowerBrowser.exe";
-  (0, import_node_child_process.exec)(cmd, (err) => {
+  (0, import_node_child_process.exec)(cmd, { windowsHide: true }, (err) => {
     if (err) {
     }
     resolve();
@@ -184,6 +185,7 @@ var isRunning = (pid) => {
     if (pid) {
       (0, import_node_child_process.exec)(
         util.format(process.platform === "win32" ? 'tasklist /fi "PID eq %s" | findstr /i "node.exe"' : 'ps -f -p %s | grep "node"', pid),
+        { windowsHide: true },
         function(err, stdout, stderr) {
           resolve(!err && !!stdout.toString().trim());
         }
@@ -288,6 +290,16 @@ var initSqlite3 = () => {
 };
 
 // src/core/start.ts
+var getRuntimeExecArgv = () => {
+  if (process.platform !== "win32") {
+    return [];
+  }
+  const preload = path2.join(__dirname, "core/winHideChildProcess.js");
+  if (!fs2.existsSync(preload)) {
+    return [];
+  }
+  return ["--require", preload];
+};
 var getEnv = () => {
   const env = {
     ...process.env,
@@ -328,7 +340,8 @@ var startChild = (type) => {
         detached: true,
         windowsHide: true,
         // 隐藏子进程的控制台窗口
-        stdio: ["ignore", "ignore", "ignore", "ipc"]
+        stdio: ["ignore", "ignore", "ignore", "ipc"],
+        execArgv: getRuntimeExecArgv()
       };
       child = (0, import_node_child_process2.fork)(mainJs, [], forkOptions);
       ensureBrowserPath();
@@ -657,8 +670,8 @@ var LOCAL_API_CONTRACTS = {
     path: "/api/v2/browser-profile/list",
     params: {
       group_id: { apiName: "group_id", location: "body" },
-      limit: { apiName: "limit", location: "body" },
-      page: { apiName: "page", location: "body" },
+      limit: { apiName: "limit", location: "body", default: 200 },
+      page: { apiName: "page", location: "body", default: 1 },
       profile_id: { apiName: "profile_id", location: "body" },
       profile_no: { apiName: "profile_no", location: "body" },
       sort_type: { apiName: "sort_type", location: "body" },
@@ -1274,6 +1287,9 @@ function toContractValue(value) {
   }
   return value;
 }
+function withContractDefault(value, defaultValue) {
+  return value === void 0 ? defaultValue : value;
+}
 function buildRequestBodyFor(command, params) {
   const requestBody = {};
   const contract = LOCAL_API_CONTRACTS[command];
@@ -1281,7 +1297,7 @@ function buildRequestBodyFor(command, params) {
     if (config2.location !== "body") {
       return;
     }
-    const value = params[inputName];
+    const value = withContractDefault(params[inputName], config2.default);
     if (value !== void 0) {
       requestBody[config2.apiName] = toContractValue(value);
     }
@@ -1295,7 +1311,7 @@ function buildQueryParamsFor(command, params) {
     if (config2.location !== "query") {
       return;
     }
-    const value = params[inputName];
+    const value = withContractDefault(params[inputName], config2.default);
     if (value === void 0) {
       return;
     }
@@ -2313,8 +2329,8 @@ var schemas = {
   }).strict(),
   getBrowserListSchema: import_zod.z.object({
     group_id: import_zod.z.string().regex(/^\d+$/, "Group ID must be a numeric string").optional().describe("Query by group ID; searches all groups if empty"),
-    limit: import_zod.z.number().min(1).max(200).optional().describe("Profiles per page. Number of profiles returned per page, range 1 ~ 200, default is 50"),
-    page: import_zod.z.number().min(1).optional().describe("Page number for results, default is 1"),
+    limit: import_zod.z.number().min(1).max(200).optional().describe("Profiles per page, range 1 ~ 200. If omitted the CLI sends limit=200; the Local API itself defaults to only 1, so always rely on this CLI default or pass an explicit value"),
+    page: import_zod.z.number().min(1).optional().describe("Page number for results. If omitted the CLI sends page=1"),
     profile_id: nonEmptyStringArraySchema.optional().describe('Query by profile ID. Example: ["h1yynkm","h1yynks"]'),
     profile_no: nonEmptyStringArraySchema.optional().describe('Query by profile number. Example: ["123","124"]'),
     sort_type: import_zod.z.enum(["profile_no", "last_open_time", "created_time"]).optional().describe("Sort results by: profile_no, last_open_time, or created_time"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adspower-browser",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "main": "cli/index.js",
   "type": "commonjs",
   "bin": {