koishi-plugin-rocom 1.0.1 → 1.0.3

package/lib/client.d.ts

@@ -14,6 +14,7 @@ export declare class RocomClient {
     private sanitizeForLog;
     private headersForLog;
     private stringifyForLog;
+    private isApiKeyPermissionUndeclaredError;
     private logRequestFailureDetails;
     private get;
     private post;

package/lib/client.js

@@ -18,9 +18,9 @@ class RocomClient {
             return '';
         return uid.trim().replace(/[^a-zA-Z0-9_\- \u4e00-\u9fa5]/g, '').trim();
     }
-    wegameHeaders(fwToken = '', userIdentifier = '', clientType = '', clientId = '') {
+    wegameHeaders(fwToken = '', userIdentifier = '', clientType = '', clientId = '', includeApiKey = true) {
         const headers = {};
-        if (this.apiKey)
+        if (includeApiKey && this.apiKey)
             headers['X-API-Key'] = this.apiKey;
         if (fwToken)
             headers['X-Framework-Token'] = fwToken;
@@ -99,6 +99,11 @@ class RocomClient {
             return String(value);
         }
     }
+    isApiKeyPermissionUndeclaredError(message) {
+        if (!message)
+            return false;
+        return /未声明\s*api\s*key\s*权限|api\s*key\s*permission|api key 权限/i.test(message);
+    }
     logRequestFailureDetails(method, path, headers, params, body, errorOrResponse) {
         const err = errorOrResponse;
         const response = err?.response;
@@ -247,8 +252,8 @@ class RocomClient {
             return { status: null, data: null };
         }
     }
-    async getIngameTask(ctx, taskId) {
-        return this.requestWithStatus(ctx, 'GET', `/api/v1/games/rocom/ingame/tasks/${taskId}`, this.wegameHeaders(), { acceptedStatuses: [200, 202] });
+    async getIngameTask(ctx, taskId, includeApiKey = true) {
+        return this.requestWithStatus(ctx, 'GET', `/api/v1/games/rocom/ingame/tasks/${taskId}`, this.wegameHeaders('', '', '', '', includeApiKey), { acceptedStatuses: [200, 202] });
     }
     async qqQrLogin(ctx, userIdentifier) {
         const params = { client_type: 'bot', client_id: 'koishi', provider: 'rocom' };
@@ -338,7 +343,8 @@ class RocomClient {
             return null;
         }
         const path = '/api/v1/games/rocom/ingame/player/search';
-        const headers = this.wegameHeaders();
+        let includeApiKey = true;
+        let headers = this.wegameHeaders();
         const payload = { uid: sanitizedUid, wait_ms: 5000 };
         let { status, data } = await this.requestWithStatus(ctx, 'POST', path, headers, {
             json: payload,
@@ -356,6 +362,29 @@ class RocomClient {
             if (status === 200 && data && this.isIngamePlayerPayload(data))
                 return data;
         }
+        if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
+            logger.warn('ingame/player/search rejected X-API-Key, retrying without API key');
+            includeApiKey = false;
+            headers = this.wegameHeaders('', '', '', '', false);
+            const retry = await this.requestWithStatus(ctx, 'POST', path, headers, {
+                json: payload,
+                acceptedStatuses: [200, 202],
+            });
+            status = retry.status;
+            data = retry.data;
+            if (status === 200 && data && this.isIngamePlayerPayload(data))
+                return data;
+            if (status === null) {
+                const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
+                    params: payload,
+                    acceptedStatuses: [200, 202],
+                });
+                status = fallback.status;
+                data = fallback.data;
+                if (status === 200 && data && this.isIngamePlayerPayload(data))
+                    return data;
+            }
+        }
         if (!data)
             return null;
         if (this.isIngamePlayerPayload(data))
@@ -368,7 +397,7 @@ class RocomClient {
         }
         for (let i = 0; i < 8; i++) {
             await new Promise(resolve => setTimeout(resolve, 1000));
-            const task = await this.getIngameTask(ctx, taskId);
+            const task = await this.getIngameTask(ctx, taskId, includeApiKey);
             if (task.status === 200)
                 return task.data;
             if (task.status === null)
@@ -404,7 +433,8 @@ class RocomClient {
             return null;
         }
         const path = '/api/v1/games/rocom/ingame/home/info';
-        const headers = this.wegameHeaders();
+        let includeApiKey = true;
+        let headers = this.wegameHeaders();
         const payload = { uid: sanitizedUid, wait_ms: waitMs };
         let { status, data } = await this.requestWithStatus(ctx, 'POST', path, headers, {
             json: payload,
@@ -422,6 +452,29 @@ class RocomClient {
             if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
                 return data;
         }
+        if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
+            logger.warn('ingame/home/info rejected X-API-Key, retrying without API key');
+            includeApiKey = false;
+            headers = this.wegameHeaders('', '', '', '', false);
+            const retry = await this.requestWithStatus(ctx, 'POST', path, headers, {
+                json: payload,
+                acceptedStatuses: [200, 202],
+            });
+            status = retry.status;
+            data = retry.data;
+            if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
+                return data;
+            if (status === null) {
+                const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
+                    params: payload,
+                    acceptedStatuses: [200, 202],
+                });
+                status = fallback.status;
+                data = fallback.data;
+                if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
+                    return data;
+            }
+        }
         const taskId = data?.task_id || data?.taskId || data?.taskID;
         if (!taskId) {
             if (status === 202)
@@ -430,7 +483,7 @@ class RocomClient {
         }
         for (let i = 0; i < 10; i++) {
             await new Promise(resolve => setTimeout(resolve, 1000));
-            const task = await this.getIngameTask(ctx, taskId);
+            const task = await this.getIngameTask(ctx, taskId, includeApiKey);
             if (task.status === 200)
                 return task.data;
             if (task.status === null)
@@ -441,10 +494,22 @@ class RocomClient {
     }
     async ingameMerchantInfo(ctx, shopId) {
         const params = { shop_id: shopId };
-        const data = await this.get(ctx, '/api/v1/games/rocom/ingame/merchant/info', this.wegameHeaders(), params, { silentFailureDetails: true });
+        let headers = this.wegameHeaders();
+        const data = await this.get(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params, { silentFailureDetails: true });
         if (data)
             return data;
-        return this.post(ctx, '/api/v1/games/rocom/ingame/merchant/info', this.wegameHeaders(), params);
+        const postData = await this.post(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params);
+        if (postData)
+            return postData;
+        if (this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
+            logger.warn('ingame/merchant/info rejected X-API-Key, retrying without API key');
+            headers = this.wegameHeaders('', '', '', '', false);
+            const fallbackData = await this.get(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params, { silentFailureDetails: true });
+            if (fallbackData)
+                return fallbackData;
+            return this.post(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params);
+        }
+        return null;
     }
     async getFriendship(ctx, fwToken, userIds, userIdentifier = '') {
         return this.get(ctx, '/api/v1/games/rocom/social/friendship', this.rocomHeaders(fwToken, userIdentifier), { user_ids: userIds });

package/lib/commands/query.js

@@ -373,10 +373,18 @@ function homePlantIcon(deps, iconId) {
     return deps.renderer.resourceUrl(`render-templates/home/img/home_icon/${text}_2.png`);
 }
 let homePlantMapCache = null;
+const HOME_PLANT_MAP_RELATIVE_PATH = node_path_1.default.join('render-templates', 'home', 'data', 'home_item_list.json');
+function resolveHomePlantMapPath() {
+    const candidates = [
+        node_path_1.default.resolve(__dirname, '..', HOME_PLANT_MAP_RELATIVE_PATH),
+        node_path_1.default.resolve(__dirname, HOME_PLANT_MAP_RELATIVE_PATH),
+    ];
+    return candidates.find(candidate => node_fs_1.default.existsSync(candidate)) || candidates[0];
+}
 function loadHomePlantMap() {
     if (homePlantMapCache)
         return homePlantMapCache;
-    const filePath = node_path_1.default.resolve(__dirname, '..', 'render-templates', 'home', 'data', 'home_item_list.json');
+    const filePath = resolveHomePlantMapPath();
     try {
         const data = JSON.parse(node_fs_1.default.readFileSync(filePath, 'utf-8'));
         homePlantMapCache = data && typeof data === 'object' ? data : {};