@xbongbong/xbbcli 2.0.0 → 2.2.0

package/work-report-monthly-list.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workReportMonthly/list';
@@ -11,11 +12,7 @@ const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --co
 let lastPagination = null;
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-report-weekly-add.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workReportWeekly/add';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-report-weekly-del.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workReportWeekly/del';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-report-weekly-detail.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workReportWeekly/detail';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-report-weekly-edit.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workReportWeekly/edit';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-report-weekly-list.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workReportWeekly/list';
@@ -11,11 +12,7 @@ const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --co
 let lastPagination = null;
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-task-add-couser.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/addCoUser';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-task-add.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/add';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-task-delete-couser.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/deleteCoUser';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-task-detail.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/detail';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-task-edit.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/edit';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/work-task-handover.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workTask/handover';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/workorder-add-couser.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
@@ -10,11 +11,7 @@ const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workOrderV2/addCoUser';
 const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/workorder-delete-couser.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
@@ -10,11 +11,7 @@ const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workOrderV2/deleteCoUse
 const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/workorder-handover.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
@@ -10,11 +11,7 @@ const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workOrderV2/handover';
 const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/workorderlist.js

@@ -3,6 +3,7 @@ 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';
 
 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';
@@ -11,11 +12,7 @@ const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --co
 let lastPagination = null;
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/workorderproductlist.js

@@ -3,6 +3,7 @@ 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';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const WORK_ORDER_PRODUCT_LIST_API_URL = 'https://proapi.xbongbong.com/pro/v2/api/workOrder/productList';
@@ -11,11 +12,7 @@ const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --co
 let lastPagination = null;
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/worktimerecorddetail.js

@@ -3,6 +3,7 @@ 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';
 
 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';
@@ -10,11 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/worktimerecordlist.js

@@ -3,6 +3,7 @@ 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';
 
 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';
@@ -11,11 +12,7 @@ const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --co
 let lastPagination = null;
 
 function readConfig() {
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/xbb-config.js

@@ -0,0 +1,113 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+
+const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
+const ENV_FILE = path.join(CONFIG_DIR, 'env.sh');
+
+// config.env 字段名 -> 对应环境变量名（环境变量模式只支持单公司）
+export const ENV_VAR_NAMES = Object.freeze({
+  corpid: 'XBB_CORPID',
+  token: 'XBB_TOKEN',
+  baseurl: 'XBB_BASEURL',
+  userId: 'XBB_USERID',
+  corpName: 'XBB_CORPNAME',
+  userName: 'XBB_USERNAME',
+});
+
+function trim(value) {
+  return String(value ?? '').trim();
+}
+
+function isTruthy(value) {
+  return ['1', 'true', 'yes', 'on'].includes(trim(value).toLowerCase());
+}
+
+// 读取环境中非空的 XBB_* 变量，返回与 config.env 单条配置同构的对象
+export function readEnvConfig() {
+  const config = {};
+  for (const [field, name] of Object.entries(ENV_VAR_NAMES)) {
+    const value = trim(process.env[name]);
+    if (value) config[field] = value;
+  }
+  return config;
+}
+
+export function hasEnvConfig(config = readEnvConfig()) {
+  return Boolean(trim(config.corpid) || trim(config.token));
+}
+
+// XBB_ENV_ONLY=1 时强制只使用环境变量，忽略 config.env
+export function isEnvOnly() {
+  return isTruthy(process.env.XBB_ENV_ONLY);
+}
+
+// 与旧版每个命令内联的 readConfig 行为保持一致：优先返回 enable=true 的公司
+function readFileConfig() {
+  try {
+    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+    const companies = Array.isArray(parsed)
+      ? parsed
+      : Array.isArray(parsed?.companies)
+        ? parsed.companies
+        : null;
+    if (companies) {
+      return companies.find((item) => item && item.enable) || {};
+    }
+    return parsed || {};
+  } catch {
+    return {};
+  }
+}
+
+// 配置文件优先：有启用公司就用配置，否则回落到环境变量
+export function readActiveConfig() {
+  const envConfig = readEnvConfig();
+  if (isEnvOnly()) {
+    return envConfig;
+  }
+  const fileConfig = readFileConfig();
+  if (Object.keys(fileConfig).length > 0) {
+    return fileConfig;
+  }
+  return envConfig;
+}
+
+// 当前生效来源是否为环境变量
+export function isEnvActive() {
+  if (isEnvOnly()) {
+    return hasEnvConfig();
+  }
+  return Object.keys(readFileConfig()).length === 0 && hasEnvConfig();
+}
+
+export function getEnvVarNames() {
+  return Object.values(ENV_VAR_NAMES);
+}
+
+// token-set 成功后把凭证写入环境变量：Windows 用 setx 写用户级变量，其他平台写 ~/.xbbcli/env.sh
+export function persistEnvVars(values) {
+  const entries = Object.entries(ENV_VAR_NAMES)
+    .map(([field, name]) => [name, trim(values?.[field])])
+    .filter(([, value]) => value !== '');
+  if (!entries.length) {
+    return { stored: 'none', file: '', failed: [] };
+  }
+  if (process.platform === 'win32') {
+    const failed = [];
+    for (const [name, value] of entries) {
+      const result = spawnSync('setx', [name, value], { encoding: 'utf8', windowsHide: true });
+      if (result.error || result.status !== 0) failed.push(name);
+    }
+    if (failed.length) {
+      throw new Error(`写入用户环境变量失败：${failed.join(', ')}`);
+    }
+    return { stored: 'user', file: '', failed: [] };
+  }
+  const lines = entries.map(([name, value]) => `export ${name}='${value.replaceAll("'", "'\\''")}'`);
+  fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  fs.writeFileSync(ENV_FILE, `${lines.join('\n')}\n`, { encoding: 'utf8', mode: 0o600 });
+  return { stored: 'file', file: ENV_FILE, failed: [] };
+}

package/version.js

@@ -1,18 +0,0 @@
-import { cli, Strategy } from './xbb-registry.js';
-
-const VERSION = 'v1.6';
-
-cli({
-  site: 'xbb',
-  name: 'version',
-  description: '查看销帮帮插件版本号',
-  strategy: Strategy.PUBLIC,
-  access: 'read',
-  browser: false,
-  domain: 'proapi.xbongbong.com',
-  args: [],
-  columns: ['version'],
-  func: async function () {
-    return [{ version: VERSION }];
-  },
-});