@xbongbong/xbbcli 2.4.4 → 2.4.6

package/work-task-detail.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 API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/detail';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const API_PATH = '/pro/v2/api/workTask/detail';
 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, apiUrl) {
-  const apiPath = new URL(apiUrl).pathname;
-  return `${baseUrl.replace(/\/+$/, '')}${apiPath}`;
-}
-
 function makeErrorRow(code, msg) {
   return [{ dataId: '', taskName: '', taskStartTime: '', taskEndTime: '', remark: '', code, msg }];
 }
@@ -77,22 +52,22 @@ cli({
     const payload = { corpid, dataId: Number(kwargs.dataId || 0) };
     if (kwargs.userId) payload.userId = String(kwargs.userId);
     if (String(kwargs.queryFlag ?? '') !== '') payload.queryFlag = Number(kwargs.queryFlag);
-    const requestBody = JSON.stringify(payload);
     if (!payload.corpid) return makeErrorRow('NO_CORPID', '缺少本地 corpid；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     if (!payload.dataId) return makeErrorRow('NO_DATAID', '缺少 --dataId');
     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 }, userId ? { userId } : {});
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${buildApiUrl(baseUrl, API_URL)}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${requestBody}\n`);
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: API_PATH,
+      payload,
+      token,
+      userId,
+      debug,
+    });
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
-    const resp = await fetch(buildApiUrl(baseUrl, API_URL), { method: 'POST', headers, body: requestBody });
-    if (!resp.ok) 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 ?? '未知错误');
-    const result = data.result || {};
-    return [{ dataId: result.dataId || '', taskName: result.data?.text_1 || '', taskStartTime: formatTimestampSeconds(result.data?.date_1), taskEndTime: formatTimestampSeconds(result.data?.date_2), remark: result.data?.text_3?.taskMemoText || '', code: data.code ?? '', msg: data.msg || '' }];
+    const result = gateway.data.result || {};
+    return [{ dataId: result.dataId || '', taskName: result.data?.text_1 || '', taskStartTime: formatTimestampSeconds(result.data?.date_1), taskEndTime: formatTimestampSeconds(result.data?.date_2), remark: result.data?.text_3?.taskMemoText || '', code: gateway.data.code ?? '', msg: gateway.data.msg || '' }];
   },
 });

package/work-task-edit.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 API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/edit';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const API_PATH = '/pro/v2/api/workTask/edit';
 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, apiUrl) {
-  const apiPath = new URL(apiUrl).pathname;
-  return `${baseUrl.replace(/\/+$/, '')}${apiPath}`;
-}
-
 function parseDataList(raw) {
   if (raw && typeof raw === 'object' && !Array.isArray(raw)) {
     return raw;
@@ -94,20 +69,20 @@ cli({
     const { corpid, token, baseUrl, userId } = getRuntimeConfig();
     const parsedDataList = parseDataList(kwargs.dataList);
     const payload = buildPayload(kwargs, parsedDataList, corpid, userId);
-    const requestBody = JSON.stringify(payload);
     const validationError = getValidationError(payload, token, parsedDataList);
     if (validationError) return makeErrorRow(validationError.code, validationError.msg);
-    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: ${buildApiUrl(baseUrl, API_URL)}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${requestBody}\n`);
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: API_PATH,
+      payload,
+      token,
+      userId,
+      debug,
+    });
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
-    const resp = await fetch(buildApiUrl(baseUrl, API_URL), { method: 'POST', headers, body: requestBody });
-    if (!resp.ok) 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 ?? '未知错误');
-    return makeSuccessRow(data);
+    return makeSuccessRow(gateway.data);
   },
 });

package/work-task-handover.js

@@ -1,34 +1,9 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import crypto from 'node:crypto';
 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 API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/handover';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const API_PATH = '/pro/v2/api/workTask/handover';
 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 makeErrorRow(code, msg) {
   return [{ resultType: '', resultMsg: '', code, msg }];
 }
@@ -60,23 +35,22 @@ cli({
       dataIdList = null;
     }
     if (Array.isArray(dataIdList)) payload.dataIdList = dataIdList;
-    const body = JSON.stringify(payload);
     if (!payload.corpid) return makeErrorRow('NO_CORPID', '缺少本地 corpid；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     if (!Array.isArray(dataIdList) || !dataIdList.length) return makeErrorRow('NO_DATAIDLIST', '缺少 --dataIdList 或格式不正确，需为JSON数组');
     if (!payload.businessUserId) return makeErrorRow('NO_BUSINESSUSERID', '缺少 --businessUserId');
     if (!token) return makeErrorRow('NO_TOKEN', MISSING_TOKEN_MESSAGE);
-    const sign = crypto.createHash('sha256').update(body + token).digest('hex');
-    const headers = Object.assign({ 'Content-Type': 'application/json;charset=UTF-8', sign }, userId ? { userId } : {});
-    const apiUrl = buildApiUrl(baseUrl, API_URL);
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${apiUrl}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${body}\n`);
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: API_PATH,
+      payload,
+      token,
+      userId,
+      debug,
+    });
+    if (!gateway.ok) return makeErrorRow(gateway.code, gateway.msg);
+    if (gateway.data.code !== 1) {
+      return makeErrorRow(gateway.data.code ?? '', gateway.data.msg ?? '未知错误');
     }
-    const resp = await fetch(apiUrl, { method: 'POST', headers, body });
-    if (!resp.ok) 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 ?? '未知错误');
-    return [{ resultType: data.result?.resultType || '', resultMsg: data.result?.resultMsg || '', code: data.code ?? '', msg: data.msg || '' }];
+    return [{ resultType: gateway.data.result?.resultType || '', resultMsg: gateway.data.result?.resultMsg || '', code: gateway.data.code ?? '', msg: gateway.data.msg || '' }];
   },
 });

package/workorder-add-couser.js

@@ -1,33 +1,7 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import crypto from 'node:crypto';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway } from './xbb-http.js';
 
-const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
-const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
-const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workOrderV2/addCoUser';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
-
-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}`;
-}
+const API_PATH = '/pro/v2/api/workOrderV2/addCoUser';
 
 function makeErrorRow(code, msg) {
   return [{
@@ -73,7 +47,6 @@ cli({
       payload.businessUserIdList = userIdList;
     }
 
-    const body = JSON.stringify(payload);
 
     if (!payload.corpid) {
       return makeErrorRow('NO_CORPID', '缺少本地 corpid；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
@@ -88,38 +61,24 @@ cli({
       return makeErrorRow('NO_TOKEN', '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     }
 
-    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, API_URL)}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${body}\n`);
-    }
-    const resp = await fetch(buildApiUrl(baseUrl, API_URL), {
-      method: 'POST',
-      headers,
-      body,
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: 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 ?? '未知错误');
     }
 
     return [{
-      resultCode: data.code ?? '',
-      resultMsg: data.msg || '',
-      code: data.code ?? '',
-      msg: data.msg || '',
+      resultCode: gateway.data.code ?? '',
+      resultMsg: gateway.data.msg || '',
+      code: gateway.data.code ?? '',
+      msg: gateway.data.msg || '',
     }];
   },
 });

package/workorder-delete-couser.js

@@ -1,33 +1,7 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import crypto from 'node:crypto';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway } from './xbb-http.js';
 
-const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
-const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
-const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workOrderV2/deleteCoUser';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
-
-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}`;
-}
+const API_PATH = '/pro/v2/api/workOrderV2/deleteCoUser';
 
 function makeErrorRow(code, msg) {
   return [{
@@ -73,7 +47,6 @@ cli({
       payload.businessUserIdList = userIdList;
     }
 
-    const body = JSON.stringify(payload);
 
     if (!payload.corpid) {
       return makeErrorRow('NO_CORPID', '缺少本地 corpid；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
@@ -88,39 +61,24 @@ cli({
       return makeErrorRow('NO_TOKEN', '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     }
 
-    const sign = crypto.createHash('sha256').update(body + token).digest('hex');
-    const headers = Object.assign({
-      'Content-Type': 'application/json;charset=UTF-8',
-      sign,
-    }, userId ? { userId } : {});
-    const apiUrl = buildApiUrl(baseUrl, API_URL);
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${apiUrl}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${body}\n`);
-    }
-    const resp = await fetch(apiUrl, {
-      method: 'POST',
-      headers,
-      body,
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: 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 ?? '未知错误');
     }
 
     return [{
-      resultCode: data.code ?? '',
-      resultMsg: data.msg || '',
-      code: data.code ?? '',
-      msg: data.msg || '',
+      resultCode: gateway.data.code ?? '',
+      resultMsg: gateway.data.msg || '',
+      code: gateway.data.code ?? '',
+      msg: gateway.data.msg || '',
     }];
   },
 });

package/workorder-handover.js

@@ -1,33 +1,7 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import crypto from 'node:crypto';
 import { cli, Strategy } from './xbb-registry.js';
-import { readActiveConfig } from './xbb-config.js';
+import { getRuntimeConfig, requestGateway } from './xbb-http.js';
 
-const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
-const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
-const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workOrderV2/handover';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
-
-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}`;
-}
+const API_PATH = '/pro/v2/api/workOrderV2/handover';
 
 function makeErrorRow(code, msg) {
   return [{
@@ -51,7 +25,7 @@ cli({
     { name: 'dataIdList', type: 'str', help: '需移交的工单id列表，JSON数组字符串（必填）' },
     { name: 'businessUserId', type: 'str', help: '移交人id（必填）' },
     { name: 'userId', type: 'str', default: '', help: '操作人id（可选）' },
-    { name: 'retainMainUser', type: 'int', default: '', help: '保留原负责人为协同人：1保留，0不保留（可选）' },
+    { name: 'retainMainUser', type: 'str', default: '', help: '保留原负责人为协同人：1保留，0不保留（可选）' },
     { name: 'transfer', type: 'str', default: '', help: '移交原因（可选）' },
     { name: 'debug', type: 'bool', default: false, help: '输出请求体和返回体调试信息' },
   ],
@@ -79,7 +53,6 @@ cli({
       payload.dataIdList = dataIdList;
     }
 
-    const body = JSON.stringify(payload);
 
     if (!payload.corpid) {
       return makeErrorRow('NO_CORPID', '缺少本地 corpid；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
@@ -97,38 +70,24 @@ cli({
       return makeErrorRow('NO_TOKEN', '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     }
 
-    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, API_URL)}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${body}\n`);
-    }
-    const resp = await fetch(buildApiUrl(baseUrl, API_URL), {
-      method: 'POST',
-      headers,
-      body,
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: 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 ?? '未知错误');
     }
 
     return [{
-      resultCode: data.code ?? '',
-      resultMsg: data.msg || '',
-      code: data.code ?? '',
-      msg: data.msg || '',
+      resultCode: gateway.data.code ?? '',
+      resultMsg: gateway.data.msg || '',
+      code: gateway.data.code ?? '',
+      msg: gateway.data.msg || '',
     }];
   },
 });

package/workorderlist.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 WORK_ORDER_LIST_API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workOrder/list';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const WORK_ORDER_LIST_API_PATH = '/pro/v2/api/workOrder/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}`;
-}
+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 [];
   }
@@ -130,58 +114,52 @@ 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，例如 serialNo' },
     { name: 'value', type: 'str', default: '', help: '筛选值，和 --attr 配合使用' },
     { name: 'symbol', type: 'str', default: 'equal', help: '筛选操作符，默认 equal' },
     { name: 'page', type: 'int', default: 1, help: '页码' },
     { name: 'pageSize', type: 'int', default: 20, help: '每页数量（最大100）' },
     { name: 'debug', type: 'bool', default: false, help: '输出请求体和返回体调试信息' },
+    { name: 'raw', type: 'bool', default: false, help: '输出接口返回的原文' },
   ],
   columns: ['rank', 'dataId', 'formId', 'serialNo', 'customerId', 'ownerId', 'status', 'creatorId', '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);
-    const body = JSON.stringify(payload);
+    let payload;
+    try {
+      payload = buildPayload(kwargs, corpid);
+    } 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 sign = crypto.createHash('sha256').update(body + token).digest('hex');
-    const headers = Object.assign({
-      'Content-Type': 'application/json;charset=UTF-8',
-      sign,
-    }, userId ? { userId } : {});
-    const apiUrl = buildApiUrl(baseUrl, WORK_ORDER_LIST_API_URL);
-    if (debug) {
-      process.stderr.write(`[debug] URL: ${apiUrl}\n[debug] Headers: ${JSON.stringify(headers)}\n[debug] RequestBody: ${body}\n`);
-    }
-    const resp = await fetch(apiUrl, {
-      method: 'POST',
-      headers,
-      body,
+    const gateway = await requestGateway({
+      baseUrl,
+      apiPath: WORK_ORDER_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 (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 为空');
     }