pi-provider-qoder-cn 0.2.22 → 0.2.24

package/README.md

@@ -144,6 +144,10 @@ Notes:
   latest grant`, and an account that has never claimed prints no expiry line at
   all, because with no grant there is nothing to date from, and inventing one
   would show dates the API never sent.
+- `Enterprise` is the org-wide pool. It names its allowance `cap` and sends no
+  `total`, so the row is keyed on any of `cap`, `used` or `remaining` carrying a
+  value: a freshly refreshed cycle reports `used: 0`, and that used to drop the
+  whole row and leave the view saying `Buckets none returned`.
 - `Expires never` means the API reported the year-9999 sentinel, i.e. the
   allowance has no expiry date.
 - `Note  plan quota is prorated` appears after a mid-cycle plan change.

package/dist/index.js

@@ -1791,29 +1791,36 @@ var init_oauth = __esm({
 // src/index.ts
 init_oauth();
 
-// src/auth/usage.ts
-init_region();
-function num(value) {
+// src/quota.ts
+function quotaNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
-function round2(value) {
-  return Math.round(value * 100) / 100;
+function bucketLimit(bucket) {
+  return quotaNumber(bucket.total ?? bucket.cap);
 }
 function hasAllowance(bucket) {
   if (!bucket) return false;
-  return num(bucket.total ?? bucket.cap) > 0 || num(bucket.used) > 0 || num(bucket.remaining) > 0;
+  return bucketLimit(bucket) > 0 || quotaNumber(bucket.used) > 0 || quotaNumber(bucket.remaining) > 0;
+}
+function pickBucket(raw, camel) {
+  if (!raw) return void 0;
+  const source = raw;
+  const snake = camel.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
+  return source[snake] ?? source[camel];
+}
+
+// src/auth/usage.ts
+init_region();
+function round2(value) {
+  return Math.round(value * 100) / 100;
 }
 function resetTimestamp(expiresAt) {
-  const ms = num(expiresAt);
+  const ms = quotaNumber(expiresAt);
   if (ms <= 0) return void 0;
   const timestamp = ms < 1e12 ? ms * 1e3 : ms;
   if (new Date(timestamp).getUTCFullYear() >= 9999) return void 0;
   return new Date(timestamp).toISOString();
 }
-function pickBucket(raw, camel) {
-  const snake = camel.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
-  return raw[snake] ?? raw[camel];
-}
 async function fetchQoderUsageForMode(credentials, mode) {
   const region = getQoderRegionConfig(mode);
   const response = await fetch(getQoderUsageURL(mode), {
@@ -1838,12 +1845,12 @@ async function fetchQoderUsageForMode(credentials, mode) {
   const usageBuckets = buckets.map(({ id, label, quota }) => ({
     id,
     label,
-    usedDisplay: round2(num(quota?.used)).toFixed(2),
-    limitDisplay: round2(num(quota?.total ?? quota?.cap)).toFixed(2),
+    usedDisplay: round2(quotaNumber(quota?.used)).toFixed(2),
+    limitDisplay: round2(quotaNumber(quota?.total ?? quota?.cap)).toFixed(2),
     unit: quota?.unit || "credits",
     resetAt
   }));
-  const remaining = buckets.reduce((sum, { quota }) => sum + Math.max(0, num(quota?.remaining)), 0);
+  const remaining = buckets.reduce((sum, { quota }) => sum + Math.max(0, quotaNumber(quota?.remaining)), 0);
   const unit = buckets[0]?.quota?.unit || "credits";
   return {
     summary: buckets.length > 0 ? `${round2(remaining)} ${unit} remaining` : "",
@@ -2448,6 +2455,11 @@ function getBeijingDailyResetCountdown(now = Date.now()) {
   const minutes = totalMinutes % 60;
   return hours > 0 ? `${hours}\u5C0F\u65F6${minutes}\u5206\u949F` : `${minutes}\u5206\u949F`;
 }
+var CREDENTIAL_EXPIRED_CODES = /* @__PURE__ */ new Set(["105", "TOKEN_EXPIRE", "TOKEN_EXPIRED"]);
+var CREDENTIAL_EXPIRED_MESSAGE = /token expired|login expired|token is not active|token has expired/i;
+function isCredentialExpiredVerdict(code, message) {
+  return code !== void 0 && CREDENTIAL_EXPIRED_CODES.has(code) || CREDENTIAL_EXPIRED_MESSAGE.test(message);
+}
 function formatQoderStreamError(statusCode, rawBody, now = Date.now(), mode = "cn") {
   const parsed = parseQoderErrorPayload(rawBody);
   const code = parsed?.code;
@@ -2527,7 +2539,7 @@ function formatQoderStreamError(statusCode, rawBody, now = Date.now(), mode = "c
       `- Fix: purchase a credit pack at ${store}, or wait for the next billing cycle.`
     ].join("\n");
   }
-  if (code === "105" || /token expired/i.test(message) || /login expired/i.test(message)) {
+  if (isCredentialExpiredVerdict(code, message)) {
     if (isCn) {
       return [
         `[Qoder CN \u51ED\u8BC1\u5931\u6548] \u767B\u5F55\u6001\u5DF2\u8FC7\u671F\u6216 Token \u5931\u6548 (\u9519\u8BEF\u7801 105)`,
@@ -2591,7 +2603,8 @@ function formatQoderStreamError(statusCode, rawBody, now = Date.now(), mode = "c
 }
 function isCredentialExpiredError(error) {
   const message = error instanceof Error ? error.message : String(error ?? "");
-  return message.includes("\u9519\u8BEF\u7801 105") || message.includes("\u51ED\u8BC1\u5931\u6548") || /token expired|login expired/i.test(message);
+  if (message.includes("\u9519\u8BEF\u7801 105") || message.includes("\u51ED\u8BC1\u5931\u6548")) return true;
+  return isCredentialExpiredVerdict(void 0, message) || /TOKEN_EXPIRED?/i.test(message);
 }
 
 // src/commands/usage.ts
@@ -2744,33 +2757,28 @@ function bucketRow(label, bucket, danger) {
     danger
   };
 }
-function hasBucket(bucket) {
-  if (!bucket) return false;
-  return (bucket.total ?? 0) > 0 || (bucket.used ?? 0) > 0;
-}
-function pickBucket2(raw, camel) {
-  if (!raw) return void 0;
-  const snake = camel.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
-  return raw[snake] ?? raw[camel];
-}
 function formatQoderUsage(raw, mode, now = Date.now(), options = {}) {
   const color = options.color ?? false;
   const region = getQoderRegionConfig(mode);
   const danger = Boolean(raw?.isQuotaExceeded);
   const userType = raw?.userType ? ` (${raw.userType})` : "";
-  const showUserQuota = hasBucket(pickBucket2(raw, "userQuota"));
-  const showAddOnQuota = hasBucket(pickBucket2(raw, "addOnQuota"));
-  const org = pickBucket2(raw, "orgResourcePackage") ?? pickBucket2(raw, "sharedQuota");
-  const showOrg = hasBucket(org);
-  const orgPercent = typeof org?.used === "number" && typeof org?.cap === "number" && org.cap > 0 ? formatPercent(org.used / org.cap * 100) : void 0;
+  const showUserQuota = hasAllowance(pickBucket(raw, "userQuota"));
+  const showAddOnQuota = hasAllowance(pickBucket(raw, "addOnQuota"));
+  const org = pickBucket(raw, "orgResourcePackage") ?? pickBucket(raw, "sharedQuota");
+  const showOrg = hasAllowance(org);
+  const orgLimit = org ? bucketLimit(org) : 0;
+  const orgPercent = org && orgLimit > 0 ? formatPercent(quotaNumber(org.used) / orgLimit * 100) : void 0;
   const overallPercent = formatPercent(
-    showOrg ? normalizePercent(raw?.totalUsagePercentage) || orgPercent : normalizePercent(raw?.totalUsagePercentage)
+    showOrg ? orgPercent ?? normalizePercent(raw?.totalUsagePercentage) : normalizePercent(raw?.totalUsagePercentage)
   );
   const rows = [{ label: "Overall", percent: overallPercent, tail: "used", danger }];
-  if (showUserQuota) rows.push(bucketRow("Plan quota", pickBucket2(raw, "userQuota"), danger));
-  if (showAddOnQuota) rows.push(bucketRow("Add-on", pickBucket2(raw, "addOnQuota"), danger));
-  if (showOrg && org)
-    rows.push(bucketRow("Enterprise", { ...org, percentage: void 0, total: org.cap ?? org.total }, danger));
+  if (showUserQuota) rows.push(bucketRow("Plan quota", pickBucket(raw, "userQuota"), danger));
+  if (showAddOnQuota) rows.push(bucketRow("Add-on", pickBucket(raw, "addOnQuota"), danger));
+  if (showOrg && org) {
+    rows.push(
+      bucketRow("Enterprise", { ...org, percentage: void 0, total: orgLimit, used: quotaNumber(org.used) }, danger)
+    );
+  }
   const isPersonalStandard = raw?.userType === "personal_standard" || raw?.userType === "free";
   const notes = [];
   if (danger) {
@@ -2808,7 +2816,7 @@ function formatQoderUsage(raw, mode, now = Date.now(), options = {}) {
       });
     }
   }
-  const addOn = pickBucket2(raw, "addOnQuota");
+  const addOn = pickBucket(raw, "addOnQuota");
   if (showAddOnQuota && (addOn?.remaining ?? 0) > 0 && checkin) {
     const expiryMs = checkin.expiresAt ? Date.parse(checkin.expiresAt) : void 0;
     const grant = { expiryMs, amount: checkin.amount, validityDays: checkin.validityDays };
@@ -3518,7 +3526,7 @@ async function peekCredentialExpired(reader, decoder) {
     if (typeof envelope.statusCodeValue === "number" && envelope.statusCodeValue !== 200) {
       const parsed = parseQoderErrorPayload(envelope.body);
       const message = parsed?.message ?? (typeof envelope.body === "string" ? envelope.body : "");
-      return parsed?.code === "105" || /token expired|login expired/i.test(message);
+      return isCredentialExpiredVerdict(parsed?.code, message);
     }
     return false;
   } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-provider-qoder-cn",
-  "version": "0.2.22",
+  "version": "0.2.24",
   "description": "Pi extension for Qoder CN — PAT/OAuth auth, /qoder-cn.usage quota command, and enterprise VPC endpoint support",
   "type": "module",
   "license": "MIT",