@xbongbong/xbbcli 2.4.5 → 2.4.6

package/worktimerecorddetail.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 WORK_TIME_RECORD_DETAIL_API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTimeRecord/detail';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const WORK_TIME_RECORD_DETAIL_API_PATH = '/pro/v2/api/workTimeRecord/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 buildPayload(kwargs, corpid) {
   const payload = {
     dataId: Number(kwargs.dataId || 0),
@@ -114,41 +89,25 @@ cli({
     const debug = Boolean(kwargs.debug);
     const { corpid, token, baseUrl, userId } = getRuntimeConfig();
     const payload = buildPayload(kwargs, corpid);
-    const requestBody = JSON.stringify(payload);
 
     const validationError = getValidationError(payload, token);
     if (validationError) {
       return makeErrorRow(validationError.code, validationError.msg);
     }
 
-    const sign = crypto.createHash('sha256').update(requestBody + token).digest('hex');
-    const apiUrl = buildApiUrl(baseUrl, WORK_TIME_RECORD_DETAIL_API_URL);
-    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: WORK_TIME_RECORD_DETAIL_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 makeSuccessRow(data);
+    return makeSuccessRow(gateway.data);
   },
 });

package/worktimerecordlist.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, createPagination } from './xbb-http.js';
 
-const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
-const WORK_TIME_RECORD_LIST_API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTimeRecord/list';
-const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+const WORK_TIME_RECORD_LIST_API_PATH = '/pro/v2/api/workTimeRecord/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;
@@ -135,9 +110,10 @@ cli({
     { 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', 'creatorId', 'ownerId', 'coUserId', '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();
@@ -148,45 +124,28 @@ cli({
       return makeErrorRow('INVALID_CONDITIONS', 'conditions 不是合法 JSON');
     }
 
-    const requestBody = JSON.stringify(payload);
 
     const validationError = getValidationError(payload, token);
     if (validationError) {
       return makeErrorRow(validationError.code, validationError.msg);
     }
 
-    const sign = crypto.createHash('sha256').update(requestBody + token).digest('hex');
-    const apiUrl = buildApiUrl(baseUrl, WORK_TIME_RECORD_LIST_API_URL);
-    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: WORK_TIME_RECORD_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 为空');
     }

package/xbb-http.js

@@ -0,0 +1,71 @@
+import crypto from 'node:crypto';
+import { readActiveConfig } from './xbb-config.js';
+
+const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
+
+// 业务命令统一的运行时配置：从 config.env 读取 enable=true 的公司并规范化字段
+export function getRuntimeConfig() {
+  const config = readActiveConfig();
+  return {
+    corpid: String(config.corpid || '').trim(),
+    token: String(config.token || '').trim(),
+    baseUrl: String(config.baseurl || DEFAULT_BASE_URL).trim(),
+    userId: String(config.userId || '').trim(),
+  };
+}
+
+// 网关 POST：序列化、SHA256 签名、headers 组装、debug 输出与 HTTP 层错误处理
+// 成功返回 { ok: true, data, responseBody }；HTTP 失败返回 { ok: false, code, msg }
+export async function requestGateway({ baseUrl, apiPath, payload, token, userId, debug }) {
+  const body = JSON.stringify(payload);
+  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 = `${String(baseUrl || DEFAULT_BASE_URL).replace(/\/+$/, '')}${apiPath}`;
+
+  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,
+  });
+
+  if (!resp.ok) {
+    const responseText = await resp.text();
+    if (debug) process.stderr.write(`[debug] ResponseBody: ${responseText}\n`);
+    return { ok: false, code: resp.status, msg: `HTTP ${resp.status} ${resp.statusText}` };
+  }
+
+  const data = await resp.json();
+  const responseBody = JSON.stringify(data);
+  if (debug) process.stderr.write(`[debug] ResponseBody: ${responseBody}\n`);
+  return { ok: true, data, responseBody };
+}
+
+// 分页 footer 骨架：update(data) 记录 totalCount/totalPage，footerExtra 交给 cli()
+// countOnly 用于只有顶层 totalCount 的接口（orginal-text-list 变体）
+export function createPagination({ countOnly = false } = {}) {
+  let state = null;
+  return {
+    update(data) {
+      const result = data?.result;
+      const totalCount = countOnly
+        ? (data?.totalCount ?? result?.totalCount)
+        : (result?.totalCount ?? data?.totalCount);
+      const totalPage = countOnly ? undefined : (result?.totalPage ?? data?.totalPage);
+      const valid = data?.code === 1 && totalCount != null && (countOnly || totalPage != null);
+      state = valid ? { totalCount, totalPage } : null;
+    },
+    footerExtra() {
+      if (!state) return undefined;
+      return countOnly
+        ? `totalCount ${state.totalCount}`
+        : `totalCount ${state.totalCount} / totalPage ${state.totalPage}`;
+    },
+  };
+}