adspower-browser 2.1.0 → 2.1.1

package/cli/core/winHideChildProcess.js

@@ -1,30 +1,91 @@
 "use strict";
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+// src/core/winHideChildProcessLogic.js
+var require_winHideChildProcessLogic = __commonJS({
+  "src/core/winHideChildProcessLogic.js"(exports2, module2) {
+    "use strict";
+    var path = require("path");
+    var CONSOLE_EXECUTABLES = /^(cmd|powershell|pwsh|wmic|tasklist|reg|findstr|where|whoami|systeminfo|netstat|sc|net|chcp|hostname|conhost)(\.exe)?$/i;
+    var BROWSER_EXECUTABLES = /^(sunbrowser|flowerbrowser|chrome|chromium|msedge|firefox|brave|opera)(\.exe)?$/i;
+    function getExecutableBaseName(command) {
+      const trimmed = String(command).trim();
+      let executable = trimmed;
+      const quotedMatch = trimmed.match(/^"([^"]+)"|^'([^']+)'/);
+      if (quotedMatch) {
+        executable = quotedMatch[1] || quotedMatch[2];
+      } else {
+        executable = trimmed.split(/\s+/)[0] || trimmed;
+      }
+      executable = executable.replace(/^["']|["']$/g, "");
+      return path.basename(executable.replace(/\\/g, "/")).toLowerCase();
+    }
+    function shouldHideForSpawn(command, options) {
+      if (options?.windowsHide === false) {
+        return false;
+      }
+      const base = getExecutableBaseName(command);
+      if (BROWSER_EXECUTABLES.test(base)) {
+        return false;
+      }
+      if (CONSOLE_EXECUTABLES.test(base)) {
+        return true;
+      }
+      if (options?.shell) {
+        return true;
+      }
+      if (/\.(cmd|bat)$/i.test(base)) {
+        return true;
+      }
+      return false;
+    }
+    function withWindowsHideForExec2(options) {
+      if (typeof options === "object" && options !== null && !Array.isArray(options)) {
+        if (options.windowsHide === false) {
+          return options;
+        }
+        return { ...options, windowsHide: true };
+      }
+      return { windowsHide: true };
+    }
+    function withWindowsHideForSpawn2(command, options) {
+      const opts = typeof options === "object" && options !== null && !Array.isArray(options) ? { ...options } : {};
+      if (!shouldHideForSpawn(command, opts)) {
+        return opts;
+      }
+      return { ...opts, windowsHide: true };
+    }
+    module2.exports = {
+      CONSOLE_EXECUTABLES,
+      BROWSER_EXECUTABLES,
+      getExecutableBaseName,
+      shouldHideForSpawn,
+      withWindowsHideForExec: withWindowsHideForExec2,
+      withWindowsHideForSpawn: withWindowsHideForSpawn2
+    };
+  }
+});
 
 // 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 };
-}
+var { withWindowsHideForExec, withWindowsHideForSpawn } = require_winHideChildProcessLogic();
 function normalizeExecArgs(options, callback) {
   if (typeof options === "function") {
-    return { options: { windowsHide: true }, callback: options };
+    return { options: withWindowsHideForExec({}), callback: options };
   }
-  return { options: withWindowsHide(options || {}), callback };
+  return { options: withWindowsHideForExec(options || {}), callback };
 }
-function normalizeSpawnArgs(args, options) {
+function normalizeSpawnArgs(command, args, options) {
   if (Array.isArray(args)) {
-    return { args, options: withWindowsHide(options || {}) };
+    return { args, options: withWindowsHideForSpawn(command, options || {}) };
   }
-  return { args: [], options: withWindowsHide(args || {}) };
+  return { args: [], options: withWindowsHideForSpawn(command, args || {}) };
 }
 var origExec = cp.exec.bind(cp);
 cp.exec = function exec(cmd, options, callback) {
@@ -33,15 +94,15 @@ cp.exec = function exec(cmd, options, callback) {
 };
 var origExecSync = cp.execSync.bind(cp);
 cp.execSync = function execSync(cmd, options) {
-  return origExecSync(cmd, withWindowsHide(options || {}));
+  return origExecSync(cmd, withWindowsHideForExec(options || {}));
 };
 var origSpawn = cp.spawn.bind(cp);
 cp.spawn = function spawn(command, args, options) {
-  const normalized = normalizeSpawnArgs(args, options);
+  const normalized = normalizeSpawnArgs(command, 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);
+  const normalized = normalizeSpawnArgs(command, args, options);
   return origSpawnSync(command, normalized.args, normalized.options);
 };

package/cli/core/winHideChildProcessLogic.js

@@ -0,0 +1,61 @@
+"use strict";
+
+// src/core/winHideChildProcessLogic.js
+var path = require("path");
+var CONSOLE_EXECUTABLES = /^(cmd|powershell|pwsh|wmic|tasklist|reg|findstr|where|whoami|systeminfo|netstat|sc|net|chcp|hostname|conhost)(\.exe)?$/i;
+var BROWSER_EXECUTABLES = /^(sunbrowser|flowerbrowser|chrome|chromium|msedge|firefox|brave|opera)(\.exe)?$/i;
+function getExecutableBaseName(command) {
+  const trimmed = String(command).trim();
+  let executable = trimmed;
+  const quotedMatch = trimmed.match(/^"([^"]+)"|^'([^']+)'/);
+  if (quotedMatch) {
+    executable = quotedMatch[1] || quotedMatch[2];
+  } else {
+    executable = trimmed.split(/\s+/)[0] || trimmed;
+  }
+  executable = executable.replace(/^["']|["']$/g, "");
+  return path.basename(executable.replace(/\\/g, "/")).toLowerCase();
+}
+function shouldHideForSpawn(command, options) {
+  if (options?.windowsHide === false) {
+    return false;
+  }
+  const base = getExecutableBaseName(command);
+  if (BROWSER_EXECUTABLES.test(base)) {
+    return false;
+  }
+  if (CONSOLE_EXECUTABLES.test(base)) {
+    return true;
+  }
+  if (options?.shell) {
+    return true;
+  }
+  if (/\.(cmd|bat)$/i.test(base)) {
+    return true;
+  }
+  return false;
+}
+function withWindowsHideForExec(options) {
+  if (typeof options === "object" && options !== null && !Array.isArray(options)) {
+    if (options.windowsHide === false) {
+      return options;
+    }
+    return { ...options, windowsHide: true };
+  }
+  return { windowsHide: true };
+}
+function withWindowsHideForSpawn(command, options) {
+  const opts = typeof options === "object" && options !== null && !Array.isArray(options) ? { ...options } : {};
+  if (!shouldHideForSpawn(command, opts)) {
+    return opts;
+  }
+  return { ...opts, windowsHide: true };
+}
+module.exports = {
+  CONSOLE_EXECUTABLES,
+  BROWSER_EXECUTABLES,
+  getExecutableBaseName,
+  shouldHideForSpawn,
+  withWindowsHideForExec,
+  withWindowsHideForSpawn
+};

package/cli/index.js

@@ -907,12 +907,16 @@ var API_ENDPOINTS = {
   GET_KERNEL_LIST: LOCAL_API_CONTRACTS["get-kernel-list"].path,
   UPDATE_PATCH: LOCAL_API_CONTRACTS["update-patch"].path
 };
+var createClientHeaders = (apiKey) => ({
+  ...apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
+  "x-mcp-client": "mcp"
+});
 var apiClient = import_axios2.default.create({
-  headers: API_KEY ? { "Authorization": `Bearer ${API_KEY}` } : {}
+  headers: createClientHeaders(API_KEY)
 });
 var getApiClient = () => {
   const client = import_axios2.default.create({
-    headers: CONFIG.apiKey ? { "Authorization": `Bearer ${CONFIG.apiKey}` } : {}
+    headers: createClientHeaders(CONFIG.apiKey)
   });
   client.interceptors.request.use(async (config2) => {
     if (isLocalApiRequestUrl(config2.url)) {
@@ -1312,6 +1316,51 @@ function resolveOpenBrowserHeadless(params, env, platform) {
   };
 }
 
+// ../core/src/utils/systemVer.ts
+var import_os = __toESM(require("os"));
+function getUaSystemVersionFromOs(info = {}) {
+  const platform = info.platform ?? import_os.default.platform();
+  const release = info.release ?? import_os.default.release();
+  if (platform === "linux") {
+    return "Linux";
+  }
+  if (platform === "win32") {
+    return matchWindowsVersion(release);
+  }
+  if (platform === "darwin") {
+    return matchMacVersion(release);
+  }
+  return null;
+}
+function matchWindowsVersion(release) {
+  const [majorStr, minorStr = "0", buildStr = "0"] = release.split(".");
+  const major = Number(majorStr);
+  const minor = Number(minorStr);
+  const build = Number(buildStr);
+  if (major === 6) {
+    if (minor === 1) return "Windows 7";
+    if (minor === 2 || minor === 3) return "Windows 8";
+  }
+  if (major === 10 && minor === 0) {
+    return build >= 22e3 ? "Windows 11" : "Windows 10";
+  }
+  return "Windows";
+}
+function matchMacVersion(release) {
+  const darwinMajor = Number(release.split(".")[0]);
+  if (darwinMajor < 20) return "Mac OS X 10";
+  const darwinToMac = {
+    20: "Mac OS X 11",
+    21: "Mac OS X 12",
+    22: "Mac OS X 13",
+    23: "Mac OS X 14",
+    24: "Mac OS X 15",
+    25: "Mac OS X 26"
+    // macOS Tahoe 26，Darwin 仍为 25.x
+  };
+  return darwinToMac[darwinMajor] ?? "Mac OS X";
+}
+
 // ../core/src/handlers/browser.ts
 var browserHandlers = {
   async openBrowser(params) {
@@ -1336,7 +1385,23 @@ var browserHandlers = {
     throw new Error(response.data.msg);
   },
   async createBrowser(params) {
-    const requestBody = buildRequestBodyFor("create-browser", params);
+    let resolvedParams = params;
+    if (!params.fingerprint_config?.random_ua?.ua_system_version) {
+      const uaSystemVersion = getUaSystemVersionFromOs();
+      if (uaSystemVersion) {
+        resolvedParams = {
+          ...params,
+          fingerprint_config: {
+            ...params.fingerprint_config,
+            random_ua: {
+              ...params.fingerprint_config?.random_ua,
+              ua_system_version: [uaSystemVersion]
+            }
+          }
+        };
+      }
+    }
+    const requestBody = buildRequestBodyFor("create-browser", resolvedParams);
     const response = await getApiClient().post(`${getLocalApiBase()}${API_ENDPOINTS.CREATE_BROWSER}`, requestBody);
     if (response.data.code === 0) {
       return JSON.stringify(response.data.data, null, 2);
@@ -1598,7 +1663,7 @@ var tagHandlers = {
 
 // ../core/src/handlers/automation.ts
 var import_path2 = __toESM(require("path"));
-var import_os = __toESM(require("os"));
+var import_os2 = __toESM(require("os"));
 
 // ../core/src/utils/browserBase.ts
 var import_playwright_core = require("playwright-core");
@@ -1651,7 +1716,7 @@ var BrowserBase = class {
 var browserBase_default = new BrowserBase();
 
 // ../core/src/handlers/automation.ts
-var defaultDownloadsPath = import_path2.default.join(import_os.default.homedir(), "Downloads");
+var defaultDownloadsPath = import_path2.default.join(import_os2.default.homedir(), "Downloads");
 
 // ../core/src/handlers/kernel.ts
 var kernelHandlers = {
@@ -1805,6 +1870,7 @@ var randomUaConfigSchema = import_zod.z.object({
       "Mac OS X 13",
       "Mac OS X 14",
       "Mac OS X 15",
+      "Mac OS X 26",
       "Mac OS X",
       "Windows",
       "iOS",
@@ -2212,7 +2278,7 @@ var schemas = {
     ipchecker: import_zod.z.enum(["ip2location", "ipapi", "ipfoxy"]).optional().describe("IP query channel"),
     category_id: import_zod.z.string().optional().describe("The category id of the browser, you can use the get-application-list tool to get the application list"),
     profile_tag_ids: import_zod.z.array(import_zod.z.string()).max(30).optional().describe('Tag IDs to assign to the profile, max 30 tags per profile. Example: ["tag1","tag2"]'),
-    fingerprint_config: fingerprintConfigSchema.optional().default({ random_ua: { ua_system_version: ["Windows"] }, browser_kernel_config: { version: "latest", type: "chrome" } }),
+    fingerprint_config: fingerprintConfigSchema.optional().default({ browser_kernel_config: { version: "latest", type: "chrome" } }),
     platform_account: platformAccountSchema
   }).strict(),
   updateBrowserSchema: import_zod.z.object({
@@ -3050,9 +3116,6 @@ var startChild = (type) => {
         }
         if (text === "restart") {
           child && child.kill("SIGKILL");
-          store.setStoreValue("status", "restarting");
-          startChild("2").catch(() => {
-          });
         }
         if (text.indexOf("INTRANET_$$_") > -1) {
           const arr = text.split("_$$_");
@@ -3084,18 +3147,9 @@ var startChild = (type) => {
         process.exit(0);
       });
       child.on("exit", async (code, signal) => {
-        if (signal === "SIGKILL") {
-          await browsersKill();
-          store.clear();
-          removePidFile();
-        } else {
-          child = null;
-          await sleepTime(500);
-          startChild("2").then(() => {
-          }).catch(() => {
-            logError("[!] Restart failed");
-          });
-        }
+        await browsersKill();
+        store.clear();
+        removePidFile();
       });
       timer = setTimeout(() => {
         child && child.kill("SIGKILL");

package/package.json

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