dsh-subscriptions 0.2.0 → 0.2.2

package/lib/providers/minimax-usage.js

@@ -6,7 +6,10 @@ import { parseProviderJson } from './common.js';
  * bar.
  */
 function usedFromCounts(total, count) {
-    return typeof total === 'number' && Number.isFinite(total) && total > 0 && typeof count === 'number'
+    return typeof total === 'number' &&
+        Number.isFinite(total) &&
+        total > 0 &&
+        typeof count === 'number'
         ? (1 - count / total) * 100
         : undefined;
 }
@@ -36,13 +39,18 @@ 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');
     const response = await http(`https://www.minimax.${region === 'cn' ? 'cn' : 'io'}/v1/token_plan/remains`, {
-        headers: { authorization: `Bearer ${key}`, 'content-type': 'application/json' },
+        headers: {
+            authorization: `Bearer ${key}`,
+            'content-type': 'application/json',
+        },
         ...(signal === undefined ? {} : { signal }),
     });
     if (!response.ok)
         throw new Error(`MiniMax usage endpoint returned HTTP ${response.status}`);
-    const body = await parseProviderJson(response, 'MiniMax usage');
-    if ((body?.base_resp?.status_code !== undefined && body.base_resp.status_code !== 0) || !Array.isArray(body?.model_remains)) {
+    const body = (await parseProviderJson(response, 'MiniMax usage'));
+    if ((body?.base_resp?.status_code !== undefined &&
+        body.base_resp.status_code !== 0) ||
+        !Array.isArray(body?.model_remains)) {
         throw new Error('MiniMax usage response failed or has no quota records');
     }
     const windows = [];
@@ -60,22 +68,34 @@ export async function fetchMiniMaxUsage(key, region, http = fetch, signal) {
             if (status === 3)
                 continue; // Unlimited pools cannot have a finite percentage.
             const remaining = row[`${prefix}_remaining_percent`];
-            const boost = prefix === 'current_weekly' ? row.weekly_boost_permille ?? 1000 : 1000;
+            const boost = prefix === 'current_weekly' ? (row.weekly_boost_permille ?? 1000) : 1000;
             if (typeof boost !== 'number' || !Number.isFinite(boost) || boost <= 0)
                 continue;
             // 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
+            const usedPercent = typeof remaining === 'number'
+                ? 100 - (remaining * boost) / 1000
                 : usedFromCounts(row[`${prefix}_total_count`], row[`${prefix}_usage_count`]);
-            if (usedPercent === undefined || !Number.isFinite(usedPercent) || usedPercent < 0 || usedPercent > 100)
+            if (usedPercent === undefined ||
+                !Number.isFinite(usedPercent) ||
+                usedPercent < 0 ||
+                usedPercent > 100)
                 continue;
             const start = row[startKey];
             const end = row[endKey];
-            const validBounds = typeof start === 'number' && Number.isFinite(start) && start > 0
-                && typeof end === 'number' && Number.isFinite(end) && end > start;
-            windows.push({ kind: fallback === 'session' && validBounds && end - start !== 18_000_000 ? 'other' : fallback,
-                scope: row.model_name, usedPercent,
+            const validBounds = typeof start === 'number' &&
+                Number.isFinite(start) &&
+                start > 0 &&
+                typeof end === 'number' &&
+                Number.isFinite(end) &&
+                end > start;
+            windows.push({
+                kind: fallback === 'session' && validBounds && end - start !== 18_000_000
+                    ? 'other'
+                    : fallback,
+                scope: row.model_name,
+                usedPercent,
                 ...(validBounds ? { startsAt: start, resetsAt: end } : {}),
             });
         }

package/lib/providers/npm-cli-version.js

@@ -34,13 +34,17 @@ export class NpmCliVersionCache {
         this.timeoutMs = options.timeoutMs ?? 5000;
     }
     /** A manual catalog refresh also checks for a newly released CLI. */
-    invalidate() { this.expiresAt = 0; }
+    invalidate() {
+        this.expiresAt = 0;
+    }
     resolve() {
         if (this.pending !== undefined)
             return this.pending;
         if (this.presented !== undefined && this.now() < this.expiresAt)
             return Promise.resolve(this.presented.version);
-        this.pending = this.refresh().finally(() => { this.pending = undefined; });
+        this.pending = this.refresh().finally(() => {
+            this.pending = undefined;
+        });
         return this.pending;
     }
     /**
@@ -82,7 +86,10 @@ export class NpmCliVersionCache {
                 }, this.timeoutMs);
             });
             // Also bounded when an injected transport ignores cancellation.
-            this.presented = { version: await Promise.race([lookup(), timeout]), source: 'npm' };
+            this.presented = {
+                version: await Promise.race([lookup(), timeout]),
+                source: 'npm',
+            };
             this.expiresAt = this.now() + 6 * 60 * 60_000;
         }
         catch {

package/lib/providers/ollama-settings.js

@@ -73,7 +73,9 @@ function readModel(entry, index) {
     const record = entry;
     // The id is the wire id, so surrounding whitespace is always a paste
     // artifact; trim it before the duplicate check sees it.
-    const model = { id: readNonEmptyString(record.id, `models[${index}].id`).trim() };
+    const model = {
+        id: readNonEmptyString(record.id, `models[${index}].id`).trim(),
+    };
     if (record.name !== undefined)
         model.name = readNonEmptyString(record.name, `models[${index}].name`);
     if (record.contextWindow !== undefined) {
@@ -169,20 +171,34 @@ export class OllamaSettingsStore {
         }
     }
     /** Why the stored file is ignored, when it is. */
-    corruption() { return this.corrupt; }
-    get() { return structuredClone(this.current); }
+    corruption() {
+        return this.corrupt;
+    }
+    get() {
+        return structuredClone(this.current);
+    }
     /** The stored catalog, or `undefined` when the store carries no override. */
-    models() { return this.current.models; }
-    web() { return this.current.web; }
-    baseURL() { return this.current.baseURL; }
-    apiKeyRef() { return this.current.apiKeyRef; }
+    models() {
+        return this.current.models;
+    }
+    web() {
+        return this.current.web;
+    }
+    baseURL() {
+        return this.current.baseURL;
+    }
+    apiKeyRef() {
+        return this.current.apiKeyRef;
+    }
     set(input) {
         const validated = validateOllamaSettings(input);
         const run = this.writes.then(async () => {
             await mkdir(dirname(this.path), { recursive: true });
             const temporary = `${this.path}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
             try {
-                await writeFile(temporary, JSON.stringify(validated, null, 2), { mode: 0o600 });
+                await writeFile(temporary, JSON.stringify(validated, null, 2), {
+                    mode: 0o600,
+                });
                 await rename(temporary, this.path);
             }
             finally {

package/lib/providers/ollama-web.js

@@ -18,7 +18,9 @@ export const OLLAMA_WEB_MAX_RESULTS = 10;
 export const OLLAMA_WEB_MAX_BYTES = 2 * 1024 * 1024;
 /** The effective base URL; both forms are read fresh so saves apply live. */
 function baseURLOf(options) {
-    return typeof options.baseURL === 'function' ? options.baseURL() : options.baseURL;
+    return typeof options.baseURL === 'function'
+        ? options.baseURL()
+        : options.baseURL;
 }
 function throwIfAborted(signal) {
     signal?.throwIfAborted();
@@ -48,6 +50,7 @@ async function postJson(url, apiKey, payload, options, signal) {
             controller.abort(new Error('ollama web request timed out'));
         }, timeoutMs);
         if (typeof timer.unref === 'function') {
+            ;
             timer.unref();
         }
         const onCallerAbort = () => controller.abort(signal?.reason);
@@ -57,8 +60,8 @@ async function postJson(url, apiKey, payload, options, signal) {
                 method: 'POST',
                 headers: {
                     'content-type': 'application/json',
-                    'accept': 'application/json',
-                    'authorization': `Bearer ${apiKey}`,
+                    accept: 'application/json',
+                    authorization: `Bearer ${apiKey}`,
                     ...attributionHeaders(),
                 },
                 body: JSON.stringify(payload),
@@ -69,7 +72,7 @@ async function postJson(url, apiKey, payload, options, signal) {
                 throw new WebError(`ollama web request failed (HTTP ${String(response.status)})`, 'OLLAMA_WEB_BAD_RESPONSE');
             }
             try {
-                return await readBoundedJson(response, 'ollama web request', OLLAMA_WEB_MAX_BYTES);
+                return (await readBoundedJson(response, 'ollama web request', OLLAMA_WEB_MAX_BYTES));
             }
             catch (error) {
                 if (signal?.aborted)
@@ -158,23 +161,33 @@ export class OllamaWebSearchProvider {
         const base = baseURLOf(this.options).replace(/\/+$/, '');
         const payload = await postJson(`${base}/web_search`, apiKey, {
             query: request.query,
-            ...(request.maxResults === undefined ? {} : { max_results: Math.min(request.maxResults, OLLAMA_WEB_MAX_RESULTS) }),
+            ...(request.maxResults === undefined
+                ? {}
+                : {
+                    max_results: Math.min(request.maxResults, OLLAMA_WEB_MAX_RESULTS),
+                }),
         }, this.options, signal);
         const results = recordOf(payload)?.['results'];
         if (!Array.isArray(results))
             throw new WebError('ollama web search returned no results array', 'OLLAMA_WEB_BAD_REPLY');
         // Official shape per docs: {title, url, content}. The snippet rides
         // `content`, not `snippet`.
-        const sources = results.flatMap(entry => {
+        const sources = results.flatMap((entry) => {
             const record = recordOf(entry);
             const url = record?.['url'];
             if (typeof url !== 'string' || url.length === 0)
                 return [];
-            return [{
+            return [
+                {
                     url,
-                    ...(typeof record?.['title'] === 'string' ? { title: record?.['title'] } : {}),
-                    ...(typeof record?.['content'] === 'string' ? { snippet: record?.['content'] } : {}),
-                }];
+                    ...(typeof record?.['title'] === 'string'
+                        ? { title: record?.['title'] }
+                        : {}),
+                    ...(typeof record?.['content'] === 'string'
+                        ? { snippet: record?.['content'] }
+                        : {}),
+                },
+            ];
         });
         return { sources, truncated: false };
     }
@@ -208,6 +221,11 @@ export class OllamaWebFetchProvider {
         if (typeof content !== 'string') {
             throw new WebError('ollama web fetch returned a malformed reply', 'OLLAMA_WEB_BAD_REPLY');
         }
-        return { url: request.url, statusCode: 200, body: { kind: 'text', content }, truncated: false };
+        return {
+            url: request.url,
+            statusCode: 200,
+            body: { kind: 'text', content },
+            truncated: false,
+        };
     }
 }