@xbongbong/xbbcli 2.4.4 → 2.4.6

package/form-data-list.js

@@ -1,36 +1,20 @@
-import crypto from 'node:crypto';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway, createPagination } from './xbb-http.js';
 
-const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
-const FORM_DATA_LIST_API_URL = 'https://proapi.xbongbong.com/pro/v2/api/paas/list';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const FORM_DATA_LIST_API_PATH = '/pro/v2/api/paas/list';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
-let lastPagination = null;
-
-function readConfig() {
-  return readActiveConfig();
-}
-
-function getRuntimeConfig() {
-  const config = readConfig();
-  return {
-    corpid: String(config.corpid || '').trim(),
-    token: String(config.token || '').trim(),
-    baseUrl: String(config.baseurl || DEFAULT_BASE_URL).trim(),
-    userId: String(config.userId || '').trim(),
-  };
-}
-
-function buildApiUrl(baseUrl, apiUrl) {
-  const apiPath = new URL(apiUrl).pathname;
-  return `${baseUrl.replace(/\/+$/, '')}${apiPath}`;
-}
+const pagination = createPagination();
 
 function buildConditions(kwargs) {
+  const conditions = kwargs.conditions;
+  if (typeof conditions === 'string' && conditions.trim()) {
+    const parsed = JSON.parse(conditions);
+    if (!Array.isArray(parsed)) {
+      throw new Error('INVALID_CONDITIONS:conditions 必须是 JSON 数组');
+    }
+    return parsed;
+  }
+
   if (!(kwargs.attr && kwargs.value)) {
     return [];
   }
@@ -120,6 +104,7 @@ cli({
     { name: 'formId', type: 'int', help: '表单id（必填）' },
     { name: 'userId', type: 'str', default: '', help: '操作人id（可选）' },
     { name: 'viewApproval', type: 'str', default: '', help: '是否查询审批中数据，1是，0否' },
+    { name: 'conditions', type: 'str', default: '', help: '条件集合 JSON 数组字符串，优先级高于 --attr/--value' },
     { name: 'attr', type: 'str', default: '', help: '筛选字段 attr，例如 text_1' },
     { name: 'value', type: 'str', default: '', help: '筛选值，和 --attr 配合使用' },
     { name: 'symbol', type: 'str', default: 'equal', help: '筛选操作符，默认 equal' },
@@ -129,53 +114,42 @@ cli({
     { name: 'raw', type: 'bool', default: false, help: '输出接口返回的原文' },
   ],
   columns: ['rank', 'dataId', 'formId', 'addTime', 'updateTime', 'data', 'code', 'msg'],
-  footerExtra: () => (lastPagination ? `totalCount ${lastPagination.totalCount} / totalPage ${lastPagination.totalPage}` : undefined),
+  footerExtra: pagination.footerExtra,
   func: async function (kwargs) {
     const debug = Boolean(kwargs.debug);
     const { corpid, token, baseUrl, userId } = getRuntimeConfig();
-    const payload = buildPayload(kwargs, corpid, userId);
-    const requestBody = JSON.stringify(payload);
+    let payload;
+    try {
+      payload = buildPayload(kwargs, corpid, userId);
+    } catch (error) {
+      const message = String(error?.message || error);
+      const separatorIndex = message.indexOf(':');
+      const code = separatorIndex > 0 ? message.slice(0, separatorIndex) : 'INVALID_PAYLOAD';
+      const detail = separatorIndex > 0 ? message.slice(separatorIndex + 1) : message;
+      return makeErrorRow(code, detail);
+    }
 
     const validationError = getValidationError(payload, token);
     if (validationError) {
       return makeErrorRow(validationError.code, validationError.msg);
     }
 
-    const apiUrl = buildApiUrl(baseUrl, FORM_DATA_LIST_API_URL);
-    const sign = crypto.createHash('sha256').update(requestBody + token).digest('hex');
-    const headers = Object.assign({
-      'Content-Type': 'application/json;charset=UTF-8',
-      sign,
-    }, userId ? { userId } : {});
-
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${apiUrl}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${requestBody}\n`);
-    }
-
-    const resp = await fetch(apiUrl, {
-      method: 'POST',
-      headers,
-      body: requestBody,
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: FORM_DATA_LIST_API_PATH,
+      payload,
+      token,
+      userId,
+      debug,
     });
-
-    if (!resp.ok) {
-      const responseText = await resp.text();
-      if (debug) process.stderr.write(`[debug] ResponseBody: ${responseText}\n`);
-      return makeErrorRow(resp.status, `HTTP ${resp.status} ${resp.statusText}`);
-    }
-
-    const data = await resp.json();
-    lastPagination = data?.code === 1 && data?.result?.totalCount != null && data?.result?.totalPage != null
-      ? { totalCount: data.result.totalCount, totalPage: data.result.totalPage }
-      : null;
-    const responseBody = JSON.stringify(data);
-    if (debug) process.stderr.write(`[debug] ResponseBody: ${responseBody}\n`);
-    if (kwargs.raw) return [{ raw: responseBody }];
-    if (data.code !== 1) {
-      return makeErrorRow(data.code ?? '', data.msg ?? '未知错误');
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    pagination.update(gateway.data);
+    if (kwargs.raw) return [{ raw: gateway.responseBody }];
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
 
-    const list = Array.isArray(data.result?.list) ? data.result.list : [];
+    const list = Array.isArray(gateway.data.result?.list) ? gateway.data.result.list : [];
     if (!list.length) {
       return makeErrorRow('NO_DATA', '接口成功，但 list 为空');
     }

package/form-get.js

@@ -1,34 +1,9 @@
-import crypto from 'node:crypto';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway } from './xbb-http.js';
 
-const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
-const FORM_GET_API_URL = 'https://proapi.xbongbong.com/pro/v2/api/form/get';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const FORM_GET_API_PATH = '/pro/v2/api/form/get';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
-function readConfig() {
-  return readActiveConfig();
-}
-
-function getRuntimeConfig() {
-  const config = readConfig();
-  return {
-    corpid: String(config.corpid || '').trim(),
-    token: String(config.token || '').trim(),
-    baseUrl: String(config.baseurl || DEFAULT_BASE_URL).trim(),
-    userId: String(config.userId || '').trim(),
-  };
-}
-
-function buildApiUrl(baseUrl, defaultUrl) {
-  const apiPath = new URL(defaultUrl).pathname;
-  return `${baseUrl.replace(/\/+$/, '')}${apiPath}`;
-}
-
 function buildPayload(kwargs, corpid) {
   const payload = {
     formId: Number(kwargs.formId || 0),
@@ -110,41 +85,26 @@ cli({
     const debug = Boolean(kwargs.debug);
     const { corpid, token, baseUrl, userId } = getRuntimeConfig();
     const payload = buildPayload(kwargs, corpid);
-    const body = JSON.stringify(payload);
 
     const validationError = getValidationError(payload, token);
     if (validationError) {
       return makeErrorRow(validationError.code, validationError.msg);
     }
 
-    const sign = crypto.createHash('sha256').update(body + token).digest('hex');
-    const headers = Object.assign({
-      'Content-Type': 'application/json;charset=UTF-8',
-      sign,
-    }, userId ? { userId } : {});
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${buildApiUrl(baseUrl, FORM_GET_API_URL)}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${body}\n`);
-    }
-    const resp = await fetch(buildApiUrl(baseUrl, FORM_GET_API_URL), {
-      method: 'POST',
-      headers,
-      body,
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: FORM_GET_API_PATH,
+      payload,
+      token,
+      userId,
+      debug,
     });
-
-    if (!resp.ok) {
-      const responseText = await resp.text();
-      if (debug) process.stderr.write(`[debug] ResponseBody: ${responseText}\n`);
-      return makeErrorRow(resp.status, `HTTP ${resp.status} ${resp.statusText}`);
-    }
-
-    const data = await resp.json();
-    const responseBody = JSON.stringify(data);
-    if (debug) process.stderr.write(`[debug] ResponseBody: ${responseBody}\n`);
-    if (data.code !== 1) {
-      return makeErrorRow(data.code ?? '', data.msg ?? '未知错误');
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
 
-    const explainList = Array.isArray(data.result?.explainList) ? data.result.explainList : [];
+    const explainList = Array.isArray(gateway.data.result?.explainList) ? gateway.data.result.explainList : [];
     if (!explainList.length) {
       return makeErrorRow('NO_DATA', '接口成功，但 explainList 为空');
     }

package/form-list.js

@@ -1,39 +1,9 @@
-import crypto from 'node:crypto';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway, createPagination } from './xbb-http.js';
 
-const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
-const FORM_LIST_API_URL = 'https://proapi.xbongbong.com/pro/v2/api/form/list';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const FORM_LIST_API_PATH = '/pro/v2/api/form/list';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
-let lastPagination = null;
-
-function readConfig() {
-  return readActiveConfig();
-}
-
-function getRuntimeConfig() {
-  const config = readConfig();
-  return {
-    corpid: String(config.corpid || '').trim(),
-    token: String(config.token || '').trim(),
-    baseUrl: String(config.baseurl || DEFAULT_BASE_URL).trim(),
-    userId: String(config.userId || '').trim(),
-  };
-}
-
-function buildApiUrl(baseUrl, defaultUrl) {
-  const apiPath = new URL(defaultUrl).pathname;
-  return `${baseUrl.replace(/\/+$/, '')}${apiPath}`;
-}
-
-function hasCliArg(name) {
-  const flag = `--${name}`;
-  return process.argv.some((arg) => arg === flag || arg.startsWith(`${flag}=`));
-}
+const pagination = createPagination();
 
 function buildPayload(kwargs, corpid) {
   const payload = {
@@ -47,7 +17,7 @@ function buildPayload(kwargs, corpid) {
   if (kwargs.name) {
     payload.name = String(kwargs.name);
   }
-  if (hasCliArg('businessType')) {
+  if (String(kwargs.businessType ?? '') !== '') {
     payload.businessType = Number(kwargs.businessType);
   }
 
@@ -106,57 +76,40 @@ cli({
   domain: 'proapi.xbongbong.com',
   args: [
     { name: 'saasMark', type: 'int', help: '表单类型（必填）：1系统表单，2自定义表单' },
-    { name: 'businessType', type: 'int', default: '', help: '业务类型（可选）' },
+    { name: 'businessType', type: 'str', default: '', help: '业务类型（可选）' },
     { name: 'name', type: 'str', default: '', help: '模板名称模糊查询（可选）' },
     { name: 'userId', type: 'str', default: '', help: '操作人id（可选）' },
     { name: 'debug', type: 'bool', default: false, help: '输出请求体和返回体调试信息' },
     { name: 'raw', type: 'bool', default: false, help: '输出接口返回的原文' },
   ],
   columns: ['rank', 'formId', 'appId', 'menuId', 'businessType', 'isProcessForm', 'name', 'code', 'msg'],
-  footerExtra: () => (lastPagination ? `totalCount ${lastPagination.totalCount} / totalPage ${lastPagination.totalPage}` : undefined),
+  footerExtra: pagination.footerExtra,
   func: async function (kwargs) {
     const debug = Boolean(kwargs.debug);
     const { corpid, token, baseUrl, userId } = getRuntimeConfig();
     const payload = buildPayload(kwargs, corpid);
-    const body = JSON.stringify(payload);
 
     const validationError = getValidationError(payload, token);
     if (validationError) {
       return makeErrorRow(validationError.code, validationError.msg);
     }
 
-    const sign = crypto.createHash('sha256').update(body + token).digest('hex');
-    const headers = Object.assign({
-      'Content-Type': 'application/json;charset=UTF-8',
-      sign,
-    }, userId ? { userId } : {});
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${buildApiUrl(baseUrl, FORM_LIST_API_URL)}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${body}\n`);
-    }
-    const resp = await fetch(buildApiUrl(baseUrl, FORM_LIST_API_URL), {
-      method: 'POST',
-      headers,
-      body,
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: FORM_LIST_API_PATH,
+      payload,
+      token,
+      userId,
+      debug,
     });
-
-    if (!resp.ok) {
-      const responseText = await resp.text();
-      if (debug) process.stderr.write(`[debug] ResponseBody: ${responseText}\n`);
-      return makeErrorRow(resp.status, `HTTP ${resp.status} ${resp.statusText}`);
-    }
-
-    const data = await resp.json();
-    lastPagination = data?.code === 1 && data?.result?.totalCount != null && data?.result?.totalPage != null
-      ? { totalCount: data.result.totalCount, totalPage: data.result.totalPage }
-      : null;
-    const responseBody = JSON.stringify(data);
-    if (debug) process.stderr.write(`[debug] ResponseBody: ${responseBody}\n`);
-    if (kwargs.raw) return [{ raw: responseBody }];
-    if (data.code !== 1) {
-      return makeErrorRow(data.code ?? '', data.msg ?? '未知错误');
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    pagination.update(gateway.data);
+    if (kwargs.raw) return [{ raw: gateway.responseBody }];
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
 
-    const formList = Array.isArray(data.result?.formList) ? data.result.formList : [];
+    const formList = Array.isArray(gateway.data.result?.formList) ? gateway.data.result.formList : [];
     if (!formList.length) {
       return makeErrorRow('NO_DATA', '接口成功，但 formList 为空');
     }

package/hkh-call-add-task.js

@@ -1,34 +1,9 @@
-import crypto from 'node:crypto';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway } from './xbb-http.js';
 
-const CONFIG_FILE = path.join(os.homedir(), '.opencli', 'xbb', 'config.env');
-const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/hkh/call/addTask';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const API_PATH = '/pro/v2/api/hkh/call/addTask';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 opencli xbb token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
-function readConfig() {
-  return readActiveConfig();
-}
-
-function getRuntimeConfig() {
-  const config = readConfig();
-  return {
-    corpid: String(config.corpid || '').trim(),
-    token: String(config.token || '').trim(),
-    baseUrl: String(config.baseurl || DEFAULT_BASE_URL).trim(),
-    userId: String(config.userId || '').trim(),
-  };
-}
-
-function buildApiUrl(baseUrl, apiUrl) {
-  const apiPath = new URL(apiUrl).pathname;
-  return `${baseUrl.replace(/\/+$/, '')}${apiPath}`;
-}
-
 function parseJsonArray(raw) {
   const text = String(raw || '').trim();
   if (!text) {
@@ -74,7 +49,6 @@ cli({
     payload.id = Number(kwargs.id || 0);
     payload.businessType = Number(kwargs.businessType || 0);
     if (runtimeUserId) payload.userId = runtimeUserId;
-    const requestBody = JSON.stringify(payload);
     if (!payload.corpid) return makeErrorRow('NO_CORPID', '缺少本地 corpid；请先执行 opencli xbb token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     if (!payload.formId) return makeErrorRow('NO_FORMID', '缺少 --formId');
     if (parsedDataIdList === null) return makeErrorRow('NO_DATAIDLIST', '缺少 --dataIdList');
@@ -82,22 +56,18 @@ cli({
     if (!payload.id) return makeErrorRow('NO_ID', '缺少 --id');
     if (!payload.businessType) return makeErrorRow('NO_BUSINESSTYPE', '缺少 --businessType');
     if (!token) return makeErrorRow('NO_TOKEN', MISSING_TOKEN_MESSAGE);
-    const sign = crypto.createHash('sha256').update(requestBody + token).digest('hex');
-    const headers = Object.assign({ 'Content-Type': 'application/json;charset=UTF-8', sign }, runtimeUserId ? { userId: runtimeUserId } : {});
-    const apiUrl = buildApiUrl(baseUrl, API_URL);
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${apiUrl}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${requestBody}\n`);
-    }
-    const resp = await fetch(apiUrl, { method: 'POST', headers, body: requestBody });
-    if (!resp.ok) {
-      const responseText = await resp.text();
-      if (debug) process.stderr.write(`[debug] ResponseBody: ${responseText}\n`);
-      return makeErrorRow(resp.status, `HTTP ${resp.status} ${resp.statusText}`);
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: API_PATH,
+      payload,
+      token,
+      userId: runtimeUserId,
+      debug,
+    });
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
-    const data = await resp.json();
-    const responseBody = JSON.stringify(data);
-    if (debug) process.stderr.write(`[debug] ResponseBody: ${responseBody}\n`);
-    if (data.code !== 1) return makeErrorRow(data.code ?? '', data.msg ?? '未知错误');
-    return [{ code: data.code ?? '', msg: data.msg || '' }];
+    return [{ code: gateway.data.code ?? '', msg: gateway.data.msg || '' }];
   },
 });

package/hkh-word-list.js

@@ -1,34 +1,9 @@
-import crypto from 'node:crypto';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway } from './xbb-http.js';
 
-const CONFIG_FILE = path.join(os.homedir(), '.opencli', 'xbb', 'config.env');
-const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/hkh/call/aiWords';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const API_PATH = '/pro/v2/api/hkh/call/aiWords';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 opencli xbb token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
-function readConfig() {
-  return readActiveConfig();
-}
-
-function getRuntimeConfig() {
-  const config = readConfig();
-  return {
-    corpid: String(config.corpid || '').trim(),
-    token: String(config.token || '').trim(),
-    baseUrl: String(config.baseurl || DEFAULT_BASE_URL).trim(),
-    userId: String(config.userId || '').trim(),
-  };
-}
-
-function buildApiUrl(baseUrl, apiUrl) {
-  const apiPath = new URL(apiUrl).pathname;
-  return `${baseUrl.replace(/\/+$/, '')}${apiPath}`;
-}
-
 function makeErrorRow(code, msg) {
   return [{ rank: '', id: '', wordsname: '', isonline: '', isuse: '', ismarket: '', ispy: '', code, msg }];
 }
@@ -44,6 +19,7 @@ cli({
   args: [
     { name: 'userId', type: 'str', default: '', help: '操作人id（可选）' },
     { name: 'debug', type: 'bool', default: false, help: '输出请求体和返回体调试信息' },
+    { name: 'raw', type: 'bool', default: false, help: '输出接口返回的原文' },
   ],
   columns: ['rank', 'id', 'wordsname', 'isonline', 'isuse', 'ismarket', 'ispy', 'code', 'msg'],
   func: async function (kwargs) {
@@ -52,26 +28,22 @@ cli({
     const runtimeUserId = String(kwargs.userId || userId || '').trim();
     const payload = { corpid };
     if (runtimeUserId) payload.userId = runtimeUserId;
-    const requestBody = JSON.stringify(payload);
     if (!payload.corpid) return makeErrorRow('NO_CORPID', '缺少本地 corpid；请先执行 opencli xbb token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     if (!token) return makeErrorRow('NO_TOKEN', MISSING_TOKEN_MESSAGE);
-    const sign = crypto.createHash('sha256').update(requestBody + token).digest('hex');
-    const headers = Object.assign({ 'Content-Type': 'application/json;charset=UTF-8', sign }, runtimeUserId ? { userId: runtimeUserId } : {});
-    const apiUrl = buildApiUrl(baseUrl, API_URL);
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${apiUrl}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${requestBody}\n`);
-    }
-    const resp = await fetch(apiUrl, { method: 'POST', headers, body: requestBody });
-    if (!resp.ok) {
-      const responseText = await resp.text();
-      if (debug) process.stderr.write(`[debug] ResponseBody: ${responseText}\n`);
-      return makeErrorRow(resp.status, `HTTP ${resp.status} ${resp.statusText}`);
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: API_PATH,
+      payload,
+      token,
+      userId: runtimeUserId,
+      debug,
+    });
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    if (kwargs.raw) return [{ raw: gateway.responseBody }];
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
-    const data = await resp.json();
-    const responseBody = JSON.stringify(data);
-    if (debug) process.stderr.write(`[debug] ResponseBody: ${responseBody}\n`);
-    if (data.code !== 1) return makeErrorRow(data.code ?? '', data.msg ?? '未知错误');
-    const list = Array.isArray(data.result?.wordList) ? data.result.wordList : [];
+    const list = Array.isArray(gateway.data.result?.wordList) ? gateway.data.result.wordList : [];
     if (!list.length) return makeErrorRow('NO_DATA', '接口成功，但 wordList 为空');
     return list.map((item, index) => ({ rank: index + 1, id: item.id || '', wordsname: item.wordsname || '', isonline: item.isonline ?? '', isuse: item.isuse ?? '', ismarket: item.ismarket ?? '', ispy: item.ispy ?? '', code: '', msg: '' }));
   },

package/invoice-add.js

@@ -1,34 +1,9 @@
-import crypto from 'node:crypto';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway } from './xbb-http.js';
 
-const CONFIG_FILE = path.join(os.homedir(), '.opencli', 'xbb', 'config.env');
-const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/invoice/add';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const API_PATH = '/pro/v2/api/invoice/add';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 opencli xbb token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
-function readConfig() {
-  return readActiveConfig();
-}
-
-function getRuntimeConfig() {
-  const config = readConfig();
-  return {
-    corpid: String(config.corpid || '').trim(),
-    token: String(config.token || '').trim(),
-    baseUrl: String(config.baseurl || DEFAULT_BASE_URL).trim(),
-    userId: String(config.userId || '').trim(),
-  };
-}
-
-function buildApiUrl(baseUrl, apiUrl) {
-  const apiPath = new URL(apiUrl).pathname;
-  return `${baseUrl.replace(/\/+$/, '')}${apiPath}`;
-}
-
 function parseJsonObject(raw) {
   const text = String(raw || '').trim();
   if (!text) {
@@ -68,28 +43,23 @@ cli({
     const parsedDataList = parseJsonObject(kwargs.dataList);
     if (parsedDataList) payload.dataList = parsedDataList;
     if (runtimeUserId) payload.userId = runtimeUserId;
-    const requestBody = JSON.stringify(payload);
     if (!payload.corpid) return makeErrorRow('NO_CORPID', '缺少本地 corpid；请先执行 opencli xbb token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     if (parsedDataList === null) return makeErrorRow('NO_DATALIST', '缺少 --dataList');
     if (parsedDataList === undefined) return makeErrorRow('INVALID_DATALIST', '--dataList 必须是 JSON 对象字符串');
     if (!token) return makeErrorRow('NO_TOKEN', MISSING_TOKEN_MESSAGE);
-    const sign = crypto.createHash('sha256').update(requestBody + token).digest('hex');
-    const headers = Object.assign({ 'Content-Type': 'application/json;charset=UTF-8', sign }, runtimeUserId ? { userId: runtimeUserId } : {});
-    const apiUrl = buildApiUrl(baseUrl, API_URL);
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${apiUrl}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${requestBody}\n`);
-    }
-    const resp = await fetch(apiUrl, { method: 'POST', headers, body: requestBody });
-    if (!resp.ok) {
-      const responseText = await resp.text();
-      if (debug) process.stderr.write(`[debug] ResponseBody: ${responseText}\n`);
-      return makeErrorRow(resp.status, `HTTP ${resp.status} ${resp.statusText}`);
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: API_PATH,
+      payload,
+      token,
+      userId: runtimeUserId,
+      debug,
+    });
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
-    const data = await resp.json();
-    const responseBody = JSON.stringify(data);
-    if (debug) process.stderr.write(`[debug] ResponseBody: ${responseBody}\n`);
-    if (data.code !== 1) return makeErrorRow(data.code ?? '', data.msg ?? '未知错误');
-    const result = data.result || {};
-    return [{ dataId: result.dataId || '', resultCode: result.code ?? '', resultMsg: result.msg || '', code: data.code ?? '', msg: data.msg || '' }];
+    const result = gateway.data.result || {};
+    return [{ dataId: result.dataId || '', resultCode: result.code ?? '', resultMsg: result.msg || '', code: gateway.data.code ?? '', msg: gateway.data.msg || '' }];
   },
 });