dsh-plugin-subscription-oauth 0.10.0 → 0.10.2

package/lib/auth/mimo-flow.d.ts

@@ -114,4 +114,16 @@ export declare function refreshMimoSession(creds: MimoCredentials, fetchFn: type
     cookies: Record<string, string>;
     expiresAt: number;
 }>;
+/** One metered window the Settings card reads. */
+export interface MimoUsageWindow {
+    label: string;
+    usedPercent?: number;
+    resetsAt?: number;
+}
+/** The account's plan and weekly allowance, for the Settings card and chip. */
+export declare function readMimoUsage(session: MimoSessionCookies, creds: MimoCredentials, fetchFn: typeof fetch): Promise<{
+    plan: string;
+    renewsAt?: number;
+    windows: MimoUsageWindow[];
+}>;
 export {};

package/lib/auth/mimo-flow.js

@@ -353,3 +353,109 @@ export async function refreshMimoSession(creds, fetchFn) {
     const session = await mimoSignOn(creds, creds.base, fetchFn);
     return { cookies: session.cookies, expiresAt: Date.now() + MIMO_RENEW_AFTER_MS };
 }
+/** The MiMo server's names for its plans' tiers. */
+const TIERS = { 1: 'Starter', 2: 'Plus', 3: 'Pro', 4: 'Ultra' };
+/** Read one of the MiMo server's pages with the session's cookies; signs on again once when refused. */
+async function mimoPage(session, creds, path, fetchFn) {
+    for (let attempt = 0;; attempt++) {
+        const headers = { Cookie: cookieHeaderOf(session.cookies), ...appHeaders() };
+        const response = await fetchFn(creds.base.replace(/\/+$/, '') + path, {
+            headers,
+            signal: AbortSignal.timeout(20_000),
+        });
+        const text = await response.text();
+        let env = {};
+        try {
+            env = JSON.parse(text);
+        }
+        catch {
+            env = {};
+        }
+        const bad = !isRecord(env) || Array.isArray(env) || (env.code != null && !Number.isInteger(env.code)) ||
+            (env.msg != null && typeof env.msg !== 'string');
+        if (response.status === 401 || (response.status === 200 && bad)) {
+            if (attempt === 0) {
+                // The session went stale: re-sign on once and retry.
+                const renewed = await refreshMimoSession(creds, fetchFn);
+                session = { cookies: renewed.cookies, userId: session.userId };
+                continue;
+            }
+            throw new MimoSignInLapsed('the Xiaomi MiMo sign-in has expired — sign in again');
+        }
+        if (response.status !== 200 || bad) {
+            throw new Error(`Xiaomi MiMo ${path}: HTTP ${response.status}`);
+        }
+        if ((env.code ?? 0) !== 0) {
+            throw new Error(`Xiaomi MiMo ${path}: code ${String(env.code)} ${String(env.msg ?? '')}`.trim());
+        }
+        return isRecord(env.data) ? env.data : null;
+    }
+}
+/** The session's cookies as one Cookie header, in a steady order. */
+function cookieHeaderOf(cookies) {
+    const first = ['serviceToken', 'userId', 'cUserId'];
+    const parts = first.filter((key) => key in cookies).map((key) => `${key}=${cookies[key]}`);
+    for (const [key, value] of Object.entries(cookies)) {
+        if (!first.includes(key))
+            parts.push(`${key}=${value}`);
+    }
+    return parts.join('; ');
+}
+/** Read one of the server's times; they carry no zone and are Beijing/Singapore time. */
+function mimoServerTime(value) {
+    const text = String(value ?? '').trim();
+    let iso = '';
+    if (/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d+)?(Z|[+-]\d\d:\d\d)$/i.test(text))
+        iso = text;
+    else if (/^\d{4}-\d\d-\d\d[T ]\d\d:\d\d:\d\d(\.\d+)?$/.test(text))
+        iso = `${text.replace(' ', 'T')}+08:00`;
+    else if (/^\d{4}-\d\d-\d\d$/.test(text))
+        iso = `${text}T00:00:00+08:00`;
+    const at = iso === '' ? NaN : Date.parse(iso);
+    return Number.isNaN(at) ? undefined : at;
+}
+/** The account's plan and weekly allowance, for the Settings card and chip. */
+export async function readMimoUsage(session, creds, fetchFn) {
+    // The plan, from the app's subscription page.
+    let self = null;
+    try {
+        self = await mimoPage(session, creds, '/user/xiaomi/subscription/self', fetchFn);
+    }
+    catch {
+        self = null;
+    }
+    const current = self?.current !== undefined && isRecord(self.current) ? self.current : undefined;
+    let plan = 'Free';
+    let renewsAt;
+    if (current !== undefined) {
+        const title = typeof current.title === 'string' ? current.title.trim() : '';
+        const tier = typeof current.planTier === 'number' ? TIERS[current.planTier] : undefined;
+        const code = typeof current.planCode === 'string' ? current.planCode.trim() : '';
+        plan = title || tier || code || 'MiMo';
+        const end = mimoServerTime(current.endTime);
+        if (end !== undefined)
+            renewsAt = end;
+    }
+    // The week's allowance, from the app's usage page.
+    const windows = [];
+    try {
+        const use = await mimoPage(session, creds, '/user/usage', fetchFn);
+        const percent = typeof use?.percent === 'number' ? use.percent : undefined;
+        const reset = typeof use?.resetDate === 'string' ? use.resetDate : undefined;
+        // No plan: the free offer shows no allowance.
+        if (percent !== undefined && reset !== undefined) {
+            const window = {
+                label: '7 days',
+                usedPercent: Math.max(0, Math.min(100, 100 - percent)),
+            };
+            const at = mimoServerTime(reset);
+            if (at !== undefined)
+                window.resetsAt = at;
+            windows.push(window);
+        }
+    }
+    catch {
+        // The plan alone, when the week's allowance can't be read.
+    }
+    return { plan, ...renewsAt === undefined ? {} : { renewsAt }, windows };
+}

package/lib/auth/workbuddy-flow.d.ts

@@ -93,3 +93,16 @@ export declare function workbuddyStale(token: Pick<WorkBuddyTokenSet, 'expiresAt
 export declare function workbuddyRefreshable(token: WorkBuddyTokenSet): boolean;
 /** Spend a refresh token for a new access token. */
 export declare function refreshWorkBuddyToken(token: WorkBuddyTokenSet, fetchFn: typeof fetch): Promise<WorkBuddyTokenSet>;
+/** One metered window the Settings card reads. */
+export interface WorkBuddyUsageWindow {
+    label: string;
+    usedPercent?: number;
+    used?: number;
+    limit?: number;
+    resetsAt?: number;
+}
+/** Read the account's plan and metered credits for the Settings card. */
+export declare function readWorkBuddyUsage(token: WorkBuddyTokenSet, plan: string | undefined, fetchFn: typeof fetch): Promise<{
+    plan: string;
+    windows: WorkBuddyUsageWindow[];
+}>;

package/lib/auth/workbuddy-flow.js

@@ -263,3 +263,106 @@ function workbuddyEnterpriseHeaders(token) {
     const enterprise = typeof token.enterpriseId === 'string' ? token.enterpriseId.trim() : '';
     return enterprise === '' ? {} : { 'X-Enterprise-Id': enterprise, 'X-Tenant-Id': enterprise };
 }
+/** A capacity the billing API sends, as a string or number; empty is 0. */
+function capacity(value) {
+    if (value === null || value === undefined || value === '')
+        return 0;
+    if (typeof value === 'number')
+        return value;
+    const text = String(value);
+    const number = Number(text);
+    return Number.isNaN(number) ? 0 : number;
+}
+/** A count as the card says one: whole, else to two places. */
+function compact(number) {
+    return Number.isInteger(number)
+        ? String(number)
+        : number.toFixed(2).replace(/0+$/, '').replace(/\.$/, '');
+}
+/** Ask the billing API, saying its message, else its code, else the HTTP status. */
+async function workbuddyMeter(token, path, body, fetchFn) {
+    const response = await fetchFn(WORKBUDDY_ENDPOINT + path, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+            'Accept': 'application/json',
+            'User-Agent': `WorkBuddy/${WORKBUDDY_UA_VERSION}`,
+            ...workbuddyHeaders(token),
+        },
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(20_000),
+    });
+    let env = {};
+    try {
+        env = JSON.parse(await response.text());
+    }
+    catch {
+        env = {};
+    }
+    const code = Number.parseInt(String(env.code ?? ''), 10) || 0;
+    if (!response.ok) {
+        if (code)
+            throw new Error(String(env.msg ?? `error ${code}`));
+        if (env.msg)
+            throw new Error(String(env.msg));
+        throw new Error(`HTTP ${response.status}`);
+    }
+    if (code !== 0)
+        throw new Error(String(env.msg ?? `error ${code}`));
+    return isRecord(env.data) ? env.data : null;
+}
+/** The account's credits from its resource summary: the plan's used against granted. */
+function usageOfSummary(summary, plan) {
+    const isPaid = summary?.IsPaidUser === true;
+    const out = { plan: plan ?? (isPaid ? 'Pro' : 'Free'), windows: [] };
+    let total = 0;
+    let used = 0;
+    const packages = Array.isArray(summary?.Packages) ? summary.Packages.filter(isRecord) : [];
+    for (const pkg of packages) {
+        total += capacity(pkg.CycleTotalCapacity);
+        used += capacity(pkg.CycleUsedCapacity);
+    }
+    if (total > 0) {
+        out.windows.push({
+            label: 'Credits',
+            usedPercent: (100 * used) / total,
+            used,
+            limit: total,
+        });
+    }
+    return out;
+}
+/** An enterprise account's credits, from the enterprise meter; null when it grants none. */
+function enterpriseUsageOf(data) {
+    const limit = capacity(data?.limitNum);
+    if (!(limit > 0))
+        return null;
+    const used = capacity(data?.credit);
+    const window = { label: 'Credits', usedPercent: (100 * used) / limit, used, limit };
+    const at = (value) => typeof value === 'string' && /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(value.trim())
+        ? Date.parse(value.trim().replace(' ', 'T') + '+08:00')
+        : 0;
+    const reset = at(data?.cycleResetTime);
+    const start = at(data?.cycleStartTime);
+    if (reset > 0)
+        window.resetsAt = reset;
+    return window;
+}
+/** Read the account's plan and metered credits for the Settings card. */
+export async function readWorkBuddyUsage(token, plan, fetchFn) {
+    const summary = await workbuddyMeter(token, '/billing/meter/get-user-resource-summary', {}, fetchFn);
+    const out = usageOfSummary(summary, plan);
+    // An enterprise account's summary has no packages: its credits are the enterprise meter's.
+    if (out.windows.length === 0) {
+        try {
+            const enterprise = enterpriseUsageOf(await workbuddyMeter(token, '/billing/meter/get-enterprise-user-usage', {}, fetchFn));
+            if (enterprise !== null) {
+                return { plan: plan ?? 'Enterprise', windows: [enterprise] };
+            }
+        }
+        catch {
+            // The personal-account refusal (10001) leaves the card as the summary said.
+        }
+    }
+    return out;
+}

package/lib/providers/mimo-provider.js

@@ -8,7 +8,7 @@ import { REAUTH_REQUIRED, ProviderError } from '../errors.js';
 import { TokenStore } from '../auth/store.js';
 import { TokenManager } from '../auth/tokens.js';
 import { LOGIN_CANCELLED_MESSAGE } from '../auth/device-flow.js';
-import { finishMimoSignIn, mimoCredentialsFrom, refreshMimoSession, startMimoSignIn, waitMimoPoll, } from '../auth/mimo-flow.js';
+import { finishMimoSignIn, mimoCredentialsFrom, readMimoUsage, refreshMimoSession, startMimoSignIn, waitMimoPoll, } from '../auth/mimo-flow.js';
 import { MimoAdapter, MIMO_CODE_URL, MIMO_CONTEXT_WINDOW, MIMO_DEFAULT_MODEL, MIMO_MODELS, MIMO_PROVIDER_ID, MIMO_PROVIDER_NAME, parseMimoSession, } from './mimo.js';
 import { ProviderController } from '../auth/provider-controller.js';
 import { proxiedFetch } from '../http.js';
@@ -132,7 +132,22 @@ export function createMimoProvider(options) {
         catalogOwn: () => adapter.ownCatalogEntries(),
         fallbackContextWindow: MIMO_CONTEXT_WINDOW,
         discover: () => Promise.resolve(undefined),
-        usage: () => Promise.resolve({ windows: [] }),
+        usage: async (_accessToken, account) => {
+            const held = await store.get(account);
+            if (held === undefined)
+                return undefined;
+            let creds;
+            let cookies;
+            try {
+                creds = JSON.parse(held.mimoCreds);
+                cookies = JSON.parse(held.mimoCookies);
+            }
+            catch {
+                return undefined;
+            }
+            const read = await readMimoUsage({ cookies, userId: creds.userId }, creds, fetchFn);
+            return { plan: read.plan, ...read.renewsAt === undefined ? {} : { renewsAt: read.renewsAt }, windows: read.windows };
+        },
         details: () => [
             { key: 'provider', value: MIMO_PROVIDER_NAME },
             { key: 'credentialFile', value: options.credentialFile },

package/lib/providers/workbuddy-provider.js

@@ -8,7 +8,7 @@ import { REAUTH_REQUIRED, ProviderError } from '../errors.js';
 import { TokenStore } from '../auth/store.js';
 import { TokenManager } from '../auth/tokens.js';
 import { LOGIN_CANCELLED_MESSAGE } from '../auth/device-flow.js';
-import { finishWorkBuddySignIn, parseWorkBuddySession, refreshWorkBuddyToken, startWorkBuddySignIn, workbuddyRefreshable, workbuddyStale, WORKBUDDY_EARLY_MS, } from '../auth/workbuddy-flow.js';
+import { finishWorkBuddySignIn, parseWorkBuddySession, readWorkBuddyUsage, refreshWorkBuddyToken, startWorkBuddySignIn, workbuddyRefreshable, workbuddyStale, WORKBUDDY_EARLY_MS, } from '../auth/workbuddy-flow.js';
 import { WorkBuddyAdapter, WORKBUDDY_CODE_URL, WORKBUDDY_CATALOG, WORKBUDDY_DEFAULT_MODEL, WORKBUDDY_PROVIDER_ID, WORKBUDDY_PROVIDER_NAME, } from './workbuddy.js';
 import { ProviderController } from '../auth/provider-controller.js';
 import { proxiedFetch } from '../http.js';
@@ -130,6 +130,17 @@ export function createWorkBuddyProvider(options) {
         userModels: () => options.preferences.extraIds(WORKBUDDY_PROVIDER_ID),
         fetchFn,
     });
+    /** The stored session's fields as the token a request or meter signs with. */
+    const tokenOf = (session) => ({
+        accessToken: session.accessToken,
+        expiresAt: session.expiresAt,
+        ...session.refreshToken === undefined ? {} : { refreshToken: session.refreshToken },
+        ...session.uid === undefined ? {} : { uid: session.uid },
+        ...session.enterpriseId === undefined ? {} : { enterpriseId: session.enterpriseId },
+        ...session.domain === undefined ? {} : { domain: session.domain },
+        ...session.tokenType === undefined ? {} : { tokenType: session.tokenType },
+        ...session.refreshExpiresAt === undefined ? {} : { refreshExpiresAt: session.refreshExpiresAt },
+    });
     const spec = {
         id: WORKBUDDY_PROVIDER_ID,
         displayName: WORKBUDDY_PROVIDER_NAME,
@@ -142,7 +153,13 @@ export function createWorkBuddyProvider(options) {
         catalogOwn: () => adapter.ownCatalogEntries(),
         fallbackContextWindow: WORKBUDDY_CATALOG[0]?.contextWindow ?? 0,
         discover: () => Promise.resolve(undefined),
-        usage: () => Promise.resolve({ windows: [] }),
+        usage: async (_accessToken, account) => {
+            const held = await store.get(account);
+            if (held === undefined)
+                return undefined;
+            const read = await readWorkBuddyUsage(tokenOf(held), held.accountId, fetchFn);
+            return { plan: read.plan, windows: read.windows };
+        },
         details: () => [
             { key: 'provider', value: WORKBUDDY_PROVIDER_NAME },
             { key: 'endpoint', value: 'https://copilot.tencent.com' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-subscription-oauth",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Use subscription accounts as DeepSeek Harness LLM providers — Kimi Code (OAuth device flow), Grok / X Premium (OIDC + PKCE), Google Antigravity (Google OAuth + Cloud Code Assist) and GLM / BigModel (ZCode's browser sign-in) — with per-model visibility, drag-to-reorder Auto fallback and plan quotas from the web Settings page",
   "license": "MIT",
   "author": "EricFL1998",