dsh-subscriptions 0.1.2 → 0.1.3

package/lib/index.js

@@ -1033,7 +1033,37 @@ async function setDefaultAccount(provider, account, path = authFilePath()) {
 
 //#endregion
 //#region src/providers/minimax-usage.ts
-/** MiniMax subscription quota, not the balance API for sk-api-* inference keys. */
+/**
+* Used percentage from the legacy counts, read as the official CLI does when no
+* explicit percentage exists: the count is the quota remaining. Undefined
+* unless the total is a positive finite number, so a zero total never yields a
+* bar.
+*/
+function usedFromCounts(total, count) {
+	return typeof total === "number" && Number.isFinite(total) && total > 0 && typeof count === "number" ? (1 - count / total) * 100 : void 0;
+}
+/**
+* Read MiniMax subscription quota (M Plan and Token Plan), not the balance API
+* that `sk-api-*` pay-as-you-go keys use.
+*
+* Each `model_remains` row can yield an interval window and a weekly window.
+* A window needs a finite share: the explicit `*_remaining_percent` (the weekly
+* one scaled by `weekly_boost_permille`), else the legacy counts. Time-based
+* plans report zero counts beside the percentage for standard models, so the
+* percentage stands on its own and a zero total does not hide the window.
+* Windows that cannot be a finite bar are omitted rather than approximated:
+* status 3 (unlimited, or no quota in the plan), a weekly pool boosted past
+* 100% remaining, a percentage outside 0-100, and a row with neither a
+* percentage nor positive counts. Start and end times are kept only when both
+* are valid millisecond bounds.
+* @param key - subscription key for the region; never copied into a result or error.
+* @param region - `global` or `cn`, which selects the fixed quota host.
+* @param http - fetch implementation (injectable for tests).
+* @param signal - caller cancellation from the RPC transport.
+* @returns the finite windows in the order the API lists them.
+* @throws when the key is pay-as-you-go, the endpoint or its business status
+*   fails, the body has no `model_remains`, or no window is a finite bar.
+*/
 async function fetchMiniMaxUsage(key, region, http$1 = fetch, signal) {
 	if (key.startsWith("sk-api-")) throw new Error("MiniMax requires a subscription key, not a pay-as-you-go key");
 	const response = await http$1(`https://www.minimax.${region === "cn" ? "cn" : "io"}/v1/token_plan/remains`, {
@@ -1066,10 +1096,7 @@ async function fetchMiniMaxUsage(key, region, http$1 = fetch, signal) {
 			const remaining = row[`${prefix}_remaining_percent`];
 			const boost = prefix === "current_weekly" ? row.weekly_boost_permille ?? 1e3 : 1e3;
 			if (typeof boost !== "number" || !Number.isFinite(boost) || boost <= 0) continue;
-			const total = row[`${prefix}_total_count`];
-			const count = row[`${prefix}_usage_count`];
-			if (typeof total !== "number" || !Number.isFinite(total) || total <= 0) continue;
-			const usedPercent = typeof remaining === "number" ? 100 - remaining * boost / 1e3 : typeof total === "number" && total > 0 && typeof count === "number" ? (1 - count / total) * 100 : void 0;
+			const usedPercent = typeof remaining === "number" ? 100 - remaining * boost / 1e3 : usedFromCounts(row[`${prefix}_total_count`], row[`${prefix}_usage_count`]);
 			if (usedPercent === void 0 || !Number.isFinite(usedPercent) || usedPercent < 0 || usedPercent > 100) continue;
 			const start = row[startKey];
 			const end = row[endKey];

package/lib/providers/minimax-usage.d.ts

@@ -1,3 +1,24 @@
 import type { ProviderUsage } from './common.js';
-/** MiniMax subscription quota, not the balance API for sk-api-* inference keys. */
+/**
+ * Read MiniMax subscription quota (M Plan and Token Plan), not the balance API
+ * that `sk-api-*` pay-as-you-go keys use.
+ *
+ * Each `model_remains` row can yield an interval window and a weekly window.
+ * A window needs a finite share: the explicit `*_remaining_percent` (the weekly
+ * one scaled by `weekly_boost_permille`), else the legacy counts. Time-based
+ * plans report zero counts beside the percentage for standard models, so the
+ * percentage stands on its own and a zero total does not hide the window.
+ * Windows that cannot be a finite bar are omitted rather than approximated:
+ * status 3 (unlimited, or no quota in the plan), a weekly pool boosted past
+ * 100% remaining, a percentage outside 0-100, and a row with neither a
+ * percentage nor positive counts. Start and end times are kept only when both
+ * are valid millisecond bounds.
+ * @param key - subscription key for the region; never copied into a result or error.
+ * @param region - `global` or `cn`, which selects the fixed quota host.
+ * @param http - fetch implementation (injectable for tests).
+ * @param signal - caller cancellation from the RPC transport.
+ * @returns the finite windows in the order the API lists them.
+ * @throws when the key is pay-as-you-go, the endpoint or its business status
+ *   fails, the body has no `model_remains`, or no window is a finite bar.
+ */
 export declare function fetchMiniMaxUsage(key: string, region: 'global' | 'cn', http?: typeof fetch, signal?: AbortSignal): Promise<ProviderUsage>;

package/lib/providers/minimax-usage.js

@@ -1,4 +1,36 @@
-/** MiniMax subscription quota, not the balance API for sk-api-* inference keys. */
+/**
+ * Used percentage from the legacy counts, read as the official CLI does when no
+ * explicit percentage exists: the count is the quota remaining. Undefined
+ * unless the total is a positive finite number, so a zero total never yields a
+ * bar.
+ */
+function usedFromCounts(total, count) {
+    return typeof total === 'number' && Number.isFinite(total) && total > 0 && typeof count === 'number'
+        ? (1 - count / total) * 100
+        : undefined;
+}
+/**
+ * Read MiniMax subscription quota (M Plan and Token Plan), not the balance API
+ * that `sk-api-*` pay-as-you-go keys use.
+ *
+ * Each `model_remains` row can yield an interval window and a weekly window.
+ * A window needs a finite share: the explicit `*_remaining_percent` (the weekly
+ * one scaled by `weekly_boost_permille`), else the legacy counts. Time-based
+ * plans report zero counts beside the percentage for standard models, so the
+ * percentage stands on its own and a zero total does not hide the window.
+ * Windows that cannot be a finite bar are omitted rather than approximated:
+ * status 3 (unlimited, or no quota in the plan), a weekly pool boosted past
+ * 100% remaining, a percentage outside 0-100, and a row with neither a
+ * percentage nor positive counts. Start and end times are kept only when both
+ * are valid millisecond bounds.
+ * @param key - subscription key for the region; never copied into a result or error.
+ * @param region - `global` or `cn`, which selects the fixed quota host.
+ * @param http - fetch implementation (injectable for tests).
+ * @param signal - caller cancellation from the RPC transport.
+ * @returns the finite windows in the order the API lists them.
+ * @throws when the key is pay-as-you-go, the endpoint or its business status
+ *   fails, the body has no `model_remains`, or no window is a finite bar.
+ */
 export async function fetchMiniMaxUsage(key, region, http = fetch, signal) {
     if (key.startsWith('sk-api-'))
         throw new Error('MiniMax requires a subscription key, not a pay-as-you-go key');
@@ -30,13 +62,11 @@ export async function fetchMiniMaxUsage(key, region, http = fetch, signal) {
             const boost = prefix === 'current_weekly' ? row.weekly_boost_permille ?? 1000 : 1000;
             if (typeof boost !== 'number' || !Number.isFinite(boost) || boost <= 0)
                 continue;
-            const total = row[`${prefix}_total_count`];
-            const count = row[`${prefix}_usage_count`];
-            if (typeof total !== 'number' || !Number.isFinite(total) || total <= 0)
-                continue;
-            // Official CLI compatibility: absent percentages use legacy remaining counts.
+            // An explicit percentage needs no counts: time-based plans send zero
+            // counts beside it. Official CLI compatibility: without a percentage, the
+            // legacy counts are the quota remaining.
             const usedPercent = typeof remaining === 'number' ? 100 - remaining * boost / 1000
-                : typeof total === 'number' && total > 0 && typeof count === 'number' ? (1 - count / total) * 100 : undefined;
+                : usedFromCounts(row[`${prefix}_total_count`], row[`${prefix}_usage_count`]);
             if (usedPercent === undefined || !Number.isFinite(usedPercent) || usedPercent < 0 || usedPercent > 100)
                 continue;
             const start = row[startKey];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-subscriptions",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Unified subscription providers and usage dashboard for DeepSeek Harness",
   "icon": "./icon.svg",
   "license": "MIT",