@sunshaobei/dsh-balance-panel 3.0.6 → 3.0.8

package/lib/client.js

@@ -25,7 +25,7 @@
  * follows the product theme (light/dark) instead of carrying its own palette.
  */
 window.__ModuleLoader__.load({
-    id: "dsh-balance-panel",
+    id: "@sunshaobei/dsh-balance-panel",
     factory: (require) => {
         var module = { exports: {} };
         var exports = module.exports;
@@ -37,6 +37,10 @@ window.__ModuleLoader__.load({
         // (from the host's modelDirectories service) into this tiny store;
         // the indicator component subscribes to it.
         var selStore = { sel: null, listeners: new Set() };
+        let clientLogQueue = Promise.resolve();
+        function clientLog(line) {
+            clientLogQueue = clientLogQueue.then(() => ctx.connection.rpc.call(CHANNEL, 'client-log', { line })).catch(() => { });
+        }
         function setSel(next) {
             var cur = selStore.sel;
             if (!cur && !next)
@@ -46,6 +50,7 @@ window.__ModuleLoader__.load({
             if (cur && next && cur.provider === next.provider && cur.model === next.model && cur.src === next.src)
                 return;
             selStore.sel = next;
+            clientLog('setSel provider=' + JSON.stringify(next && next.provider) + ' model=' + JSON.stringify(next && next.model) + ' src=' + JSON.stringify(next && next.src));
             selStore.listeners.forEach(function (l) { l(next); });
         }
         /** Map a provider/model/spec string to a coarse provider family key. */
@@ -1148,6 +1153,8 @@ window.__ModuleLoader__.load({
                 // expands the full card with EVERY provider.
                 var RING_R = 7, RING_C = 2 * Math.PI * RING_R;
                 var curSpec = matchSpec(specs, sel);
+                if (specs && specs.rows)
+                    clientLog('capsule sel=' + JSON.stringify(sel) + ' rows=[' + specs.rows.map(function (r3x) { return r3x.id + ':' + r3x.kind; }).join(',') + '] matched=' + (curSpec ? curSpec.id : 'null'));
                 var curView = curSpec ? views[curSpec.id] : null;
                 // Compact window group: small ring first, tiny label beside it.
                 var makeRing = function (key, pct, status, label) {

package/lib/index.js

@@ -268,6 +268,31 @@ let chatgptTokenCache = null;
 // ChatGPT/Codex token resolver read the shared grant record that
 // dsh-codex-auth writes (llm-pi-ai/openai-codex).
 let codexCredentialsRef = null;
+// Auto-detected local proxy for ChatGPT/Codex upstream calls. The usage and
+// token endpoints are region-blocked on direct connections, and Node's fetch
+// never reads the OS proxy — so when the panel row has no explicit proxy we
+// probe the well-known local proxy ports once and remember the answer.
+let localProxyCache = null; // null = not probed yet
+async function detectLocalProxy() {
+    if (localProxyCache !== null)
+        return localProxyCache || undefined;
+    for (const port of [7897, 7890, 1087, 8118, 6152]) {
+        const ok = await new Promise((resolve) => {
+            const req = http.request({ host: '127.0.0.1', port, method: 'CONNECT', path: 'chatgpt.com:443', timeout: 2000 });
+            req.on('connect', (res, socket) => { socket.destroy(); resolve(res.statusCode === 200); });
+            req.on('error', () => resolve(false));
+            req.on('timeout', () => { req.destroy(); resolve(false); });
+            req.end();
+        });
+        if (ok) {
+            localProxyCache = 'http://127.0.0.1:' + port;
+            break;
+        }
+    }
+    if (localProxyCache === null)
+        localProxyCache = '';
+    return localProxyCache || undefined;
+}
 async function readChatGPTAuthFile() {
     const authJson = chatgptAuthJsonPath();
     let raw;
@@ -1669,7 +1694,7 @@ async function fetchRow(ctx, provider, proxies, clientProxyUrl) {
                 // query AND token refresh — same region constraints apply.
                 const cgProxy = clientProxyUrl !== undefined
                     ? clientProxyUrl
-                    : (provider.proxy !== undefined ? proxies[provider.proxy] : undefined);
+                    : (provider.proxy !== undefined ? proxies[provider.proxy] : await detectLocalProxy());
                 let { accessToken, accountId } = await resolveChatGPTToken(UPSTREAM_TIMEOUT_MS, cgProxy);
                 let body;
                 try {
@@ -1976,8 +2001,24 @@ export function apply(ctx, config = {}) {
                 catalog
             });
             if (endpoint === 'specs') {
+                try {
+                    const fsp2 = await import('node:fs/promises');
+                    const dbg = path.join(chatgptDshStoreDir(), 'debug.log');
+                    await fsp2.appendFile(dbg, new Date().toISOString() + ' specs rows=[' + rows.map(r2 => r2.id + ':' + r2.kind).join(',') + ']\n').catch(() => { });
+                }
+                catch { }
                 return { ok: true, value: { rows: rows.map(rowSpec), refreshMs } };
             }
+            if (endpoint === 'client-log') {
+                try {
+                    const fsp2 = await import('node:fs/promises');
+                    const line = payload && typeof payload.line === 'string' ? payload.line : '';
+                    const dbg = path.join(chatgptDshStoreDir(), 'debug.log');
+                    await fsp2.appendFile(dbg, new Date().toISOString() + ' client: ' + line + '\n').catch(() => { });
+                }
+                catch { }
+                return { ok: true, value: { logged: true } };
+            }
             if (endpoint === 'fetch-all') {
                 const overrides = {};
                 const overrideErrors = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sunshaobei/dsh-balance-panel",
   "description": "Provider quota/balance widget for the dsh web surface: an inline sidebar card above the Settings row (collapsed glanceable row expanding into a Harness-native card with a settings panel), fed by a loopback Connection RPC channel whose host half proxies each provider with credentials that never reach the browser.",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/client.ts

@@ -25,7 +25,7 @@
  * follows the product theme (light/dark) instead of carrying its own palette.
  */
 (window as any).__ModuleLoader__.load({
-	id: "dsh-balance-panel",
+	id: "@sunshaobei/dsh-balance-panel",
 	factory: (require) => {
 		var module = { exports: {} as any };
 		var exports = module.exports;
@@ -39,6 +39,10 @@
 		// (from the host's modelDirectories service) into this tiny store;
 		// the indicator component subscribes to it.
 		var selStore = { sel: null, listeners: new Set() };
+		let clientLogQueue = Promise.resolve();
+		function clientLog(line) {
+			clientLogQueue = clientLogQueue.then(() => ctx.connection.rpc.call(CHANNEL, 'client-log', { line })).catch(() => {});
+		}
 		function setSel(next) {
 			var cur = selStore.sel;
 			if (!cur && !next) return;
@@ -46,6 +50,7 @@
 			// republishes the same value on every tick).
 			if (cur && next && cur.provider === next.provider && cur.model === next.model && cur.src === next.src) return;
 			selStore.sel = next;
+			clientLog('setSel provider=' + JSON.stringify(next && next.provider) + ' model=' + JSON.stringify(next && next.model) + ' src=' + JSON.stringify(next && next.src));
 			selStore.listeners.forEach(function (l) { l(next); });
 		}
 		/** Map a provider/model/spec string to a coarse provider family key. */
@@ -1149,6 +1154,7 @@
 				// expands the full card with EVERY provider.
 				var RING_R = 7, RING_C = 2 * Math.PI * RING_R;
 				var curSpec = matchSpec(specs, sel);
+				if (specs && specs.rows) clientLog('capsule sel=' + JSON.stringify(sel) + ' rows=[' + specs.rows.map(function (r3x) { return r3x.id + ':' + r3x.kind; }).join(',') + '] matched=' + (curSpec ? curSpec.id : 'null'));
 				var curView = curSpec ? views[curSpec.id] : null;
 				// Compact window group: small ring first, tiny label beside it.
 				var makeRing = function (key, pct, status, label) {

package/src/index.ts

@@ -292,6 +292,27 @@ let chatgptTokenCache: { bundle: ChatGPTTokenBundle } | null = null;
 // dsh-codex-auth writes (llm-pi-ai/openai-codex).
 let codexCredentialsRef: any = null;
 
+// Auto-detected local proxy for ChatGPT/Codex upstream calls. The usage and
+// token endpoints are region-blocked on direct connections, and Node's fetch
+// never reads the OS proxy — so when the panel row has no explicit proxy we
+// probe the well-known local proxy ports once and remember the answer.
+let localProxyCache: string | undefined | null = null; // null = not probed yet
+async function detectLocalProxy(): Promise<string | undefined> {
+	if (localProxyCache !== null) return localProxyCache || undefined;
+	for (const port of [7897, 7890, 1087, 8118, 6152]) {
+		const ok = await new Promise<boolean>((resolve) => {
+			const req = http.request({ host: '127.0.0.1', port, method: 'CONNECT', path: 'chatgpt.com:443', timeout: 2000 });
+			req.on('connect', (res, socket) => { socket.destroy(); resolve(res.statusCode === 200); });
+			req.on('error', () => resolve(false));
+			req.on('timeout', () => { req.destroy(); resolve(false); });
+			req.end();
+		});
+		if (ok) { localProxyCache = 'http://127.0.0.1:' + port; break; }
+	}
+	if (localProxyCache === null) localProxyCache = '';
+	return localProxyCache || undefined;
+}
+
 async function readChatGPTAuthFile(): Promise<ChatGPTTokenBundle> {
 	const authJson = chatgptAuthJsonPath();
 	let raw: string;
@@ -1628,7 +1649,7 @@ async function fetchRow(ctx, provider, proxies, clientProxyUrl) {
 				// query AND token refresh — same region constraints apply.
 				const cgProxy = clientProxyUrl !== undefined
 					? clientProxyUrl
-					: (provider.proxy !== undefined ? proxies[provider.proxy] : undefined);
+					: (provider.proxy !== undefined ? proxies[provider.proxy] : await detectLocalProxy());
 				let { accessToken, accountId } = await resolveChatGPTToken(UPSTREAM_TIMEOUT_MS, cgProxy);
 				let body: any;
 				try {
@@ -1921,8 +1942,22 @@ export function apply(ctx, config: Record<string, any> = {}) {
 				catalog
 			});
 			if (endpoint === 'specs') {
+				try {
+					const fsp2 = await import('node:fs/promises');
+					const dbg = path.join(chatgptDshStoreDir(), 'debug.log');
+					await fsp2.appendFile(dbg, new Date().toISOString() + ' specs rows=[' + rows.map(r2 => r2.id + ':' + r2.kind).join(',') + ']\n').catch(() => {});
+				} catch {}
 				return { ok: true, value: { rows: rows.map(rowSpec), refreshMs } };
 			}
+			if (endpoint === 'client-log') {
+				try {
+					const fsp2 = await import('node:fs/promises');
+					const line = payload && typeof payload.line === 'string' ? payload.line : '';
+					const dbg = path.join(chatgptDshStoreDir(), 'debug.log');
+					await fsp2.appendFile(dbg, new Date().toISOString() + ' client: ' + line + '\n').catch(() => {});
+				} catch {}
+				return { ok: true, value: { logged: true } };
+			}
 			if (endpoint === 'fetch-all') {
 				const overrides = {};
 				const overrideErrors = {};