@newbeebox/newbeebox-client-web-sdk 1.0.10 → 1.0.13

package/README.md

@@ -45,7 +45,7 @@ console.log(info);
 
 获取当前用户的订阅信息。
 
-#### `InstallWoWAddon(game_version_id, addon_id): Promise<any>`
+#### `InstallWoWAddon(game_version_id, addon_id, secret_key?): Promise<any>`
 
 安装魔兽世界插件。
 
@@ -53,6 +53,7 @@ console.log(info);
 |------|------|------|
 | game_version_id | string \| number | 游戏版本ID |
 | addon_id | string \| number | 插件ID |
+| secret_key | string | 密钥（可选） |
 
 #### `Patch(tool_name, data?): Promise<any>`
 

package/index.js

@@ -1,11 +1,110 @@
+// 当前 SDK 版本号（发布新版本时请同步 package.json 的 version 字段）
+const SDK_VERSION = "1.0.13";
 // 设置超时时间
 const CLIENT_CHECK_TIMEOUT = 200; // 0.2秒
 // 任务超时时间
 const TASK_REQUEST_TIMEOUT = 1000; // 1秒
 // 客户端可能使用的端口列表
-const LOCAL_PORT_LIST = [35560, 35561, 35562, 35563, 35564, 35565, 35566, 35567, 35568, 35569, 35570, 35571, 35572, 35573, 35574, 35575, 35576, 35577, 35578, 35579];
+// 原始端口列表（兼容已部署的老 SDK，必须保留且优先）
+const LEGACY_PORT_LIST = [
+    35560, 35561, 35562, 35563, 35564, 35565, 35566, 35567, 35568, 35569,
+    35570, 35571, 35572, 35573, 35574, 35575, 35576, 35577, 35578, 35579,
+];
+// 新增端口列表（抗端口被整段占用，分散在多个不相邻区间）
+const EXTRA_PORT_LIST = [
+    1278, 6817, 11456, 14923, 19372, 23814, 28651, 33279, 41537, 46813,
+];
+// 实际使用的候选端口：原始端口优先，其后接新增端口
+const LOCAL_PORT_LIST = [...LEGACY_PORT_LIST, ...EXTRA_PORT_LIST];
 // 服务端地址
 const CLIENT_SERVICE_BASE_URL = "http://127.0.0.1";
+
+// 端口缓存的 key
+const PORT_CACHE_KEY = "nbb_client_port";
+// 内存兜底缓存：用于没有 localStorage 的环境（Electron 主进程 / Node / 受限 webview）
+let _memPortCache = null;
+
+// 读取缓存端口：优先 localStorage，不可用时回退内存缓存（兼容浏览器/Electron/Tauri/Node）
+function readPortCache() {
+    try {
+        if (typeof localStorage !== "undefined" && localStorage) {
+            const v = localStorage.getItem(PORT_CACHE_KEY);
+            if (v) return Number(v) || null;
+        }
+    } catch (e) { /* localStorage 不可用，忽略，走内存缓存 */ }
+    return _memPortCache;
+}
+
+// 写入缓存端口：内存 + localStorage(若可用)
+function writePortCache(port) {
+    _memPortCache = port;
+    try {
+        if (typeof localStorage !== "undefined" && localStorage) {
+            localStorage.setItem(PORT_CACHE_KEY, String(port));
+        }
+    } catch (e) { /* 忽略 */ }
+}
+
+// 清除缓存端口
+function clearPortCache() {
+    _memPortCache = null;
+    try {
+        if (typeof localStorage !== "undefined" && localStorage) {
+            localStorage.removeItem(PORT_CACHE_KEY);
+        }
+    } catch (e) { /* 忽略 */ }
+}
+
+// 探测单个端口的 /ping：成功 resolve(port)，失败 reject
+function pingPort(port) {
+    return new Promise((resolve, reject) => {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), CLIENT_CHECK_TIMEOUT);
+        fetch(CLIENT_SERVICE_BASE_URL + ":" + port + "/ping", {
+            method: "GET",
+            signal: controller.signal,
+        })
+            .then((response) => response.json())
+            .then((data) => {
+                clearTimeout(timeoutId);
+                if (data && data.code === 1) resolve(port);
+                else reject(new Error("not newbee client"));
+            })
+            .catch((e) => {
+                clearTimeout(timeoutId);
+                reject(e);
+            });
+    });
+}
+
+// 并行探测多个端口，返回第一个成功的端口
+// 不依赖 Promise.any（ES2021），自己实现以兼容老版本 webview
+function probeFirstPort(ports) {
+    return new Promise((resolve, reject) => {
+        let pending = ports.length;
+        if (pending === 0) {
+            reject(new Error("no candidate ports"));
+            return;
+        }
+        let settled = false;
+        ports.forEach((port) => {
+            pingPort(port)
+                .then((p) => {
+                    if (!settled) {
+                        settled = true;
+                        resolve(p);
+                    }
+                })
+                .catch(() => {
+                    pending--;
+                    if (pending === 0 && !settled) {
+                        reject(new Error("all ports failed"));
+                    }
+                });
+        });
+    });
+}
+
 export class NewBeeClient {
     app_id = "";
 
@@ -21,47 +120,32 @@ export class NewBeeClient {
     }
 
     async Init(app_id) {
+        console.log(`[NewBeeBox SDK] version ${SDK_VERSION}`);
+
         if (!app_id || typeof app_id !== "string") {
             throw new Error("APPID格式不正确 请前往后台获取");
         }
 
         this.app_id = app_id;
 
-        for (const port of LOCAL_PORT_LIST) {
-            // 创建 AbortController 实例
-            const controller = new AbortController();
-
-            const signal = controller.signal;
-
-            let check_response;
-
-            const timeoutId = setTimeout(() => {
-                controller.abort(); // 超时后取消请求
-                console.log("端口:", port, '请求超时');
-            }, CLIENT_CHECK_TIMEOUT);
-
+        // 1) 先试缓存端口：命中直接用，重连最快且不打扰其他端口
+        const cachedPort = readPortCache();
+        if (cachedPort) {
             try {
-                let response = await fetch( CLIENT_SERVICE_BASE_URL + (port ? ":" + port : "") + "/ping", {
-                    method: "GET",
-                    signal: signal
-                });
-
-                check_response = await response.json();
-
-                clearTimeout(timeoutId);
+                this.newbee_client_port = await pingPort(cachedPort);
+                console.log("客户端开启的端口号(缓存命中):", this.newbee_client_port);
+                return;
             } catch (e) {
-                console.error(port, "端口检查失败:", e);
-            }
-
-            console.log("端口检查:", check_response);
-
-            if (check_response && check_response.code === 1) {
-                this.newbee_client_port = port;
-                break;
+                clearPortCache(); // 缓存失效，继续全量探测
             }
         }
 
-        if (!this.newbee_client_port) {
+        // 2) 并行探测全部候选端口，取第一个成功的（老端口段 + 分散端口）
+        try {
+            this.newbee_client_port = await probeFirstPort(LOCAL_PORT_LIST);
+            writePortCache(this.newbee_client_port);
+        } catch (e) {
+            clearPortCache();
             throw new Error("未检测到新手盒子客户端 初始化失败");
         }
 
@@ -145,21 +229,25 @@ export class NewBeeClient {
     }
 
     // 安装魔兽世界插件
-    async InstallWoWAddon(game_version_id, addon_id) {
+    async InstallWoWAddon(game_version_id, addon_id, secret_key) {
         this._ensureInitialized();
 
         let install_response = null;
         try {
+            const body = {
+                app_id: this.app_id,
+                game_version_id: game_version_id,
+                addon_id: addon_id
+            };
+            if (secret_key) {
+                body.secret_key = secret_key;
+            }
             let response = await fetch(CLIENT_SERVICE_BASE_URL + ":" + this.newbee_client_port + "/tool/wow_install_addon", {
                 method: "POST",
                 headers: {
                     "Content-Type": 'application/json',
                 },
-                body: JSON.stringify({
-                    app_id: this.app_id,
-                    game_version_id: game_version_id,
-                    addon_id: addon_id
-                })
+                body: JSON.stringify(body)
             });
 
             install_response = await response.json();

package/package.json

@@ -1,29 +1,29 @@
-{
-  "name": "@newbeebox/newbeebox-client-web-sdk",
-  "version": "1.0.10",
-  "description": "NewBeeBox Client SDK for Web",
-  "main": "index.js",
-  "type": "module",
-  "types": "./types/index.d.ts",
-  "files": [
-    "*.js",
-    "types/*.d.ts"
-  ],
-  "scripts": {
-    "release:patch": "npm version patch && npm publish",
-    "release:minor": "npm version minor && npm publish",
-    "release:major": "npm version major && npm publish"
-  },
-  "keywords": [
-    "newbeebox",
-    "wow",
-    "sdk",
-    "client"
-  ],
-  "author": "NewBeeBoxTeam",
-  "license": "ISC",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  }
-}
+{
+  "name": "@newbeebox/newbeebox-client-web-sdk",
+  "version": "1.0.13",
+  "description": "NewBeeBox Client SDK for Web",
+  "main": "index.js",
+  "type": "module",
+  "types": "./types/index.d.ts",
+  "files": [
+    "*.js",
+    "types/*.d.ts"
+  ],
+  "scripts": {
+    "release:patch": "npm version patch && npm publish",
+    "release:minor": "npm version minor && npm publish",
+    "release:major": "npm version major && npm publish"
+  },
+  "keywords": [
+    "newbeebox",
+    "wow",
+    "sdk",
+    "client"
+  ],
+  "author": "NewBeeBoxTeam",
+  "license": "ISC",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  }
+}

package/types/index.d.ts

@@ -37,10 +37,11 @@ export class NewBeeClient {
     /**
      * 安装魔兽世界插件
      * @param game_version_id 游戏版本ID
-     * @param mod_id 插件ID
+     * @param addon_id 插件ID
+     * @param secret_key 密钥（可选）
      * @return {Promise<any>}
      */
-    InstallWoWAddon(game_version_id: string | number, mod_id: string | number): Promise<any>;
+    InstallWoWAddon(game_version_id: string | number, addon_id: string | number, secret_key?: string): Promise<any>;
 
     /**
      * 通用请求接口