@marktrue/dsh-mobile-remote 3.2.4-alpha.1 → 3.2.4-alpha.2-app

package/lib/account-usage.js

@@ -1,145 +0,0 @@
-// 用量与额度领域归一化：保持无运行时依赖，便于服务端单测与其它宿主复用。
-
-/** 额度窗口标签：优先使用 provider 约定名称，未知窗口保持稳定可读。 */
-export function usageWindowLabel(seconds) {
-  const value = Number(seconds);
-  if (!Number.isFinite(value) || value <= 0) return null;
-  if (value === 18_000) return '5h';
-  if (value === 604_800) return 'weekly';
-  if (value === 2_592_000) return 'monthly';
-  if (value % 604_800 === 0) return `${value / 604_800}w`;
-  if (value % 3_600 === 0) return `${value / 3_600}h`;
-  if (value % 60 === 0) return `${value / 60}m`;
-  return `${value}s`;
-}
-
-function finiteNumber(value) {
-  if (value === null || value === undefined || value === '' || typeof value === 'boolean') return undefined;
-  const number = typeof value === 'number' ? value : Number(value);
-  return Number.isFinite(number) ? number : undefined;
-}
-
-function clampPercent(value) {
-  const number = finiteNumber(value);
-  return number === undefined || number < 0 || number > 100 ? undefined : number;
-}
-
-function isoFromUnixSeconds(value) {
-  const seconds = finiteNumber(value);
-  if (seconds === undefined || seconds <= 0) return undefined;
-  const date = new Date(seconds * 1000);
-  return Number.isNaN(date.getTime()) ? undefined : date.toISOString();
-}
-
-function isoFromDate(value) {
-  if (typeof value !== 'string' || value.trim() === '') return undefined;
-  const date = new Date(value);
-  return Number.isNaN(date.getTime()) ? undefined : date.toISOString();
-}
-
-/** DeepSeek /user/balance 的顶层投影；优先选择 CNY 余额项。 */
-export function normalizeDeepSeekBalance(data) {
-  const infos = data && typeof data === 'object' && !Array.isArray(data) ? data.balance_infos : undefined;
-  const validInfos = Array.isArray(infos) ? infos.filter((item) => item && typeof item === 'object' && !Array.isArray(item)) : [];
-  const first = validInfos.find((item) => item.currency === 'CNY') ?? validInfos[0];
-  const amount = first ? finiteNumber(first.total_balance) : undefined;
-  if (!first || amount === undefined) throw new Error('invalid deepseek balance');
-  return {
-    amount: String(first.total_balance),
-    currency: typeof first.currency === 'string' && first.currency !== '' ? first.currency : 'CNY',
-    available: data.is_available !== false && first.is_available !== false,
-  };
-}
-
-/**
- * dsh-codex-connect 的无密钥投影 → 手机额度领域模型。
- * 保留主 bucket 与 additional_rate_limits 的全部有效窗口，仅返回百分比/金额/窗口，不接触 OAuth token。
- */
-export function normalizeCodexUsage(usage) {
-  if (!usage || typeof usage !== 'object' || Array.isArray(usage)) throw new Error('invalid codex usage');
-  if (usage.rateLimits !== undefined && !Array.isArray(usage.rateLimits)) throw new Error('invalid codex rate limits');
-  const rateLimits = (usage.rateLimits ?? []).filter((bucket) => bucket && typeof bucket === 'object' && !Array.isArray(bucket));
-  const primaryIndex = rateLimits.findIndex((bucket) => bucket.id === 'codex');
-  const orderedBuckets = primaryIndex >= 0
-    ? [rateLimits[primaryIndex], ...rateLimits.filter((_, index) => index !== primaryIndex)]
-    : rateLimits;
-  const windows = [];
-  for (const [bucketIndex, bucket] of orderedBuckets.entries()) {
-    if (!Array.isArray(bucket.windows)) continue;
-    const bucketName = typeof bucket.name === 'string' && bucket.name.trim() !== ''
-      ? bucket.name.trim().slice(0, 80)
-      : typeof bucket.id === 'string' && bucket.id.trim() !== '' ? bucket.id.trim().slice(0, 80) : undefined;
-    const seenInBucket = new Set();
-    for (const item of bucket.windows) {
-      if (!item || typeof item !== 'object' || Array.isArray(item)) continue;
-      const baseWindow = usageWindowLabel(item.windowSeconds);
-      const remainingPercent = clampPercent(item.remainingPercent);
-      const resetAt = isoFromUnixSeconds(item.resetAt);
-      if (!baseWindow || seenInBucket.has(baseWindow) || remainingPercent === undefined) continue;
-      seenInBucket.add(baseWindow);
-      const window = bucketIndex === 0 || !bucketName ? baseWindow : `${bucketName} · ${baseWindow}`;
-      windows.push({ window, remainingPercent, ...(resetAt ? { resetAt } : {}) });
-    }
-  }
-  const individual = usage.individualLimit;
-  let individualLimit;
-  if (individual && typeof individual === 'object' && !Array.isArray(individual)) {
-    const limit = finiteNumber(individual.limit);
-    const used = finiteNumber(individual.used);
-    const remaining = finiteNumber(individual.remaining);
-    const remainingPercent = clampPercent(individual.remainingPercent ?? (limit > 0 && remaining !== undefined ? remaining / limit * 100 : undefined));
-    if (limit !== undefined && used !== undefined && remaining !== undefined && limit > 0 && remainingPercent !== undefined) {
-      individualLimit = {
-        limit: String(individual.limit),
-        used: String(individual.used),
-        remaining: String(individual.remaining),
-        remainingPercent,
-      };
-    }
-  }
-  const credits = usage.credits;
-  let codexCredits;
-  if (credits && typeof credits === 'object' && !Array.isArray(credits) && typeof credits.unlimited === 'boolean') {
-    if (credits.unlimited) {
-      codexCredits = { unlimited: true };
-    } else if (typeof credits.balance === 'string' && credits.balance.trim() !== '') {
-      codexCredits = { unlimited: false, balance: credits.balance };
-    } else if (finiteNumber(credits.balance) !== undefined) {
-      codexCredits = { unlimited: false, balance: String(credits.balance) };
-    } else {
-      // balance 是可选字段，但 unlimited=false 仍是一个有效、可展示的 Credits 状态。
-      codexCredits = { unlimited: false };
-    }
-  }
-  if (windows.length === 0 && individualLimit === undefined && codexCredits === undefined) throw new Error('codex usage has no usable allowance');
-  return {
-    windows,
-    ...(individualLimit ? { individualLimit } : {}),
-    ...(codexCredits ? { credits: codexCredits } : {}),
-  };
-}
-
-/** OpenCode Go usage payload → 剩余百分比窗口；无效窗口单独跳过，限流窗口保留。 */
-export function normalizeOpenCodeUsage(payload) {
-  const usage = payload && typeof payload === 'object' && !Array.isArray(payload) ? (payload.usage ?? payload) : undefined;
-  if (!usage || typeof usage !== 'object' || Array.isArray(usage)) throw new Error('invalid opencode usage');
-  const windows = [];
-  for (const [key, label] of [['rolling', '5h'], ['weekly', 'weekly'], ['monthly', 'monthly']]) {
-    const detail = usage[key];
-    if (!detail || typeof detail !== 'object' || Array.isArray(detail)) continue;
-    const status = detail.status;
-    if (status !== undefined && status !== null && status !== 'ok' && status !== 'rate-limited') continue;
-    const usedPercent = clampPercent(detail.percent);
-    if (usedPercent === undefined) continue;
-    // percent=0 时 OpenCode 返回的是 now+window 占位值，不是可展示的 resetAt。
-    const resetAt = usedPercent === 0 ? undefined : isoFromDate(detail.resetsAt);
-    windows.push({
-      window: label,
-      remainingPercent: 100 - usedPercent,
-      ...(status === 'rate-limited' ? { limited: true } : {}),
-      ...(resetAt ? { resetAt } : {}),
-    });
-  }
-  if (windows.length === 0) throw new Error('opencode usage has no usable windows');
-  return { windows };
-}

package/lib/app-alignment.js

@@ -1,112 +0,0 @@
-// 两端对齐状态（CONTEXT「对齐提示」）。
-//
-// 判据是**版本号**，且只用于决定**提示文案**——不参与任何能力可用性判定
-// （能力看声明，见 ADR 0017 与 ADR 0019 的三条判据分离）。
-// 比较只看 core `X.Y.Z`：App 的 `+build` 是它自己的构建号，同一发布周期内每次构建
-// 都不同；插件可能是 prerelease（如 `3.2.1-alpha.1`，发布通道用）。两者都不参与配对，
-// 因此插件 `3.2.1-alpha.1` 与 App `3.2.1+24` 按 core `3.2.1` 视为对齐。
-//
-// 自举：已装在用户手机上的旧 App 不会上报版本头，因此「头缺失」本身就是
-// 「这是旧 App」的可靠信号——PC 端据此就能提示，不必等 App 先升级。
-import { parseVersion } from "./plugin-update.js";
-
-/** App 上报自身版本所用的请求头。 */
-export const APP_VERSION_HEADER = "x-mobile-app-version";
-
-/** 对齐状态。 */
-export const ALIGNMENT_STATE = {
-	/** 两端语义版本一致。 */
-	OK: "ok",
-	/** 手机 App 落后于插件：应更新 App。 */
-	APP_OUTDATED: "app-outdated",
-	/** 插件落后于手机 App：应更新插件。 */
-	PLUGIN_OUTDATED: "plugin-outdated",
-	/** 无法判定（旧 App 未上报、或版本不可解析）——如实报出，不猜。 */
-	UNKNOWN: "unknown",
-};
-
-/** 取 core `X.Y.Z`（prerelease 与 build 都剥离）；不可解析返回 ""。 */
-export function semanticVersion(value) {
-	const p = parseVersion(value);
-	return p ? p.version : "";
-}
-
-/** 从请求头读 App 版本；缺失或形状异常一律返回空串。 */
-export function readAppVersionHeader(headers) {
-	if (!headers || typeof headers !== "object") return "";
-	const raw = headers[APP_VERSION_HEADER];
-	const value = Array.isArray(raw) ? raw[0] : raw;
-	return typeof value === "string" ? value.trim() : "";
-}
-
-/**
- * 计算两端对齐状态。返回结构可直接放进 bootstrap / diagnostics 响应。
- * `hint` 是给人看的说明（PC 端日志与诊断页用）；手机端应按 `reason` 自行本地化。
- */
-export function computeAppAlignment({ appVersionHeader, pluginVersion }) {
-	const pluginSemver = semanticVersion(pluginVersion);
-	const appRaw = typeof appVersionHeader === "string" ? appVersionHeader.trim() : "";
-	const base = {
-		appVersion: appRaw === "" ? null : appRaw,
-		pluginVersion: pluginVersion ?? "",
-		expectedAppVersion: pluginSemver || null,
-	};
-	if (pluginSemver === "") {
-		return { ...base, state: ALIGNMENT_STATE.UNKNOWN, reason: "plugin-version-unparseable", hint: "插件自身版本不可解析，无法判定两端是否对齐" };
-	}
-	if (appRaw === "") {
-		return {
-			...base,
-			state: ALIGNMENT_STATE.UNKNOWN,
-			reason: "app-version-header-missing",
-			hint: `手机 App 未上报版本（通常是旧版 App）；无法确认两端是否对齐。插件为 ${pluginVersion}，建议把 App 更新到同版本。`,
-		};
-	}
-	const appSemver = semanticVersion(appRaw);
-	if (appSemver === "") {
-		return { ...base, state: ALIGNMENT_STATE.UNKNOWN, reason: "app-version-unparseable", hint: `手机 App 上报的版本无法解析：${appRaw}` };
-	}
-	if (appSemver === pluginSemver) {
-		return { ...base, state: ALIGNMENT_STATE.OK, reason: "aligned", hint: "" };
-	}
-	const older = compareSemver(appSemver, pluginSemver) < 0;
-	if (older) {
-		return {
-			...base,
-			state: ALIGNMENT_STATE.APP_OUTDATED,
-			reason: "app-older-than-plugin",
-			hint: `手机 App（${appRaw}）落后于本机插件（${pluginVersion}）：新功能会被明确提示而非静默失效。请在手机上把 App 更新到 ${pluginSemver}。`,
-		};
-	}
-	return {
-		...base,
-		state: ALIGNMENT_STATE.PLUGIN_OUTDATED,
-		reason: "plugin-older-than-app",
-		hint: `本机插件（${pluginVersion}）落后于手机 App（${appRaw}）：请在电脑上把插件更新到 ${appSemver} 并重启 DSH。`,
-	};
-}
-
-/** 内部：比较两个语义版本（入参已保证可解析）。 */
-function compareSemver(a, b) {
-	const pa = a.split(".").map(Number);
-	const pb = b.split(".").map(Number);
-	for (let i = 0; i < 3; i++) {
-		if (pa[i] !== pb[i]) return pa[i] < pb[i] ? -1 : 1;
-	}
-	return 0;
-}
-
-/**
- * 只在结论变化时提示一次（bootstrap 会在启动、下拉刷新、重连时反复调用，
- * 每次都记日志会把 DSH 日志刷满）。`seen` 是该插件实例作用域内的去重载体。
- */
-export function noteAppAlignment(logger, alignment, seen) {
-	if (!alignment || alignment.state === ALIGNMENT_STATE.OK) return false;
-	const key = `${alignment.state}:${alignment.appVersion ?? "-"}`;
-	if (seen.key === key) return false;
-	seen.key = key;
-	const line = `mobile-remote: ${alignment.hint}`;
-	if (alignment.state === ALIGNMENT_STATE.UNKNOWN) logger?.info?.(line);
-	else logger?.warn?.(line);
-	return true;
-}