@huaqiu/dsh-auth 0.3.11 → 0.3.12

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { getLogger } from "@huaqiu/dsh-plugin-log";
+import { createLogger } from "@hqedge/logging";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { dshHomePath } from "@deepseek-ai/dsh-home-paths";
@@ -26,7 +26,7 @@ import { dshHomePath } from "@deepseek-ai/dsh-home-paths";
 */
 let _log = null;
 function log$1() {
-	if (_log === null) _log = getLogger("dsh-auth");
+	if (_log === null) _log = createLogger({ component: "dsh-auth" });
 	return _log;
 }
 /**
@@ -102,10 +102,10 @@ var HostSessionResolver = class {
 			status = res.status;
 			if (res.ok) info = normalizeHostUser(await res.json());
 		} catch (err) {
-			log$1().warn("host session fetch failed", {
+			log$1().warn({
 				url,
 				error: String(err)
-			});
+			}, "host session fetch failed");
 			info = null;
 		}
 		if (info !== null && info.authenticated) {
@@ -113,22 +113,22 @@ var HostSessionResolver = class {
 				info,
 				fetchedAt: now
 			};
-			log$1().debug("host session resolved", {
+			log$1().debug({
 				url,
 				status,
 				userId: info.id,
 				version: info.version ?? null,
 				authenticated: info.authenticated
-			});
+			}, "host session resolved");
 			return info;
 		}
 		this.cache = null;
-		log$1().info("no usable host session", {
+		log$1().info({
 			url,
 			status,
 			parsed: info !== null,
 			hostAuthenticated: info?.authenticated ?? null
-		});
+		}, "no usable host session");
 		return null;
 	}
 	/** Drop the cached value so the next `resolve()` re-fetches (reactive invalidation). */
@@ -381,7 +381,7 @@ var InMemoryHuaqiuAuthService = class {
 	lastHostVersion = null;
 	_log = null;
 	get log() {
-		if (this._log === null) this._log = getLogger("dsh-auth");
+		if (this._log === null) this._log = createLogger({ component: "dsh-auth" });
 		return this._log;
 	}
 	constructor(config, opts) {
@@ -395,11 +395,11 @@ var InMemoryHuaqiuAuthService = class {
 			fetchImpl: this.doFetch
 		});
 		this.hostMode = this.host.enabled;
-		this.log.info("auth service started", {
+		this.log.info({
 			hostMode: this.hostMode,
 			hostAuthPath: resolved.hostAuthPath,
 			hostSessionTtlSeconds: resolved.hostSessionTtlSeconds
-		});
+		}, "auth service started");
 	}
 	/** Host mode is active iff a host base URL was configured (see HostSessionResolver.enabled). */
 	hostMode;
@@ -450,10 +450,10 @@ var InMemoryHuaqiuAuthService = class {
 		if (this.host.enabled) {
 			const host = await this.host.resolve();
 			if (!host || !host.authenticated) {
-				this.log.debug("host session unusable", {
+				this.log.debug({
 					hostReachable: host !== null,
 					hostAuthenticated: host?.authenticated ?? null
-				});
+				}, "host session unusable");
 				return null;
 			}
 			this.observeHostVersion(host.version);
@@ -476,7 +476,7 @@ var InMemoryHuaqiuAuthService = class {
 		if (this.lastHostVersion !== null && version !== this.lastHostVersion) {
 			this.stale = false;
 			this.validator.invalidate();
-			this.log.info("host credential replaced — re-arming session", { version });
+			this.log.info({ version }, "host credential replaced — re-arming session");
 		}
 		this.lastHostVersion = version;
 	}
@@ -656,7 +656,7 @@ function createAuthHandler(service) {
 }
 //#endregion
 //#region src/index.ts
-const log = getLogger("dsh-auth");
+const log = createLogger({ component: "dsh-auth" });
 const name = "@huaqiu/dsh-auth";
 const inject = ["webServer"];
 /**
@@ -668,11 +668,11 @@ const inject = ["webServer"];
 *   without a supervisor (spec §6.4).
 */
 function apply(ctx, config) {
-	log.info("applying dsh-auth node half", {
+	log.info({
 		hasConfig: config != null,
 		configKeys: config != null ? Object.keys(config) : [],
 		hqEdgeBaseUrl: config?.hqEdgeBaseUrl ?? null
-	});
+	}, "applying dsh-auth node half");
 	const service = new InMemoryHuaqiuAuthService(config);
 	ctx.effect(() => ctx.provide("huaqiuAuth", service));
 	ctx.effect(() => ctx.webServer.register({
@@ -680,10 +680,10 @@ function apply(ctx, config) {
 		path: AUTH_ROUTE_PREFIX,
 		handler: createAuthHandler(service)
 	}));
-	log.info("dsh-auth node half ready", {
+	log.info({
 		routes: AUTH_ROUTE_PREFIX,
 		hostMode: service.hostMode
-	});
+	}, "dsh-auth node half ready");
 }
 //#endregion
 export { AUTH_ROUTE_PREFIX, InMemoryHuaqiuAuthService, apply, createAuthHandler, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huaqiu/dsh-auth",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "type": "module",
   "main": "./lib/index.mjs",
   "types": "./lib/index.d.mts",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.0",
-    "@huaqiu/dsh-plugin-log": "0.3.11"
+    "@hqedge/logging": "^0.2.7"
   },
   "files": [
     "lib",

package/src/host.ts

@@ -20,15 +20,15 @@
  *   4. null           → tools return needs_auth
  */
 
-import { getLogger, type PluginLogger } from '@huaqiu/dsh-plugin-log'
+import { createLogger, type Logger } from '@hqedge/logging'
 
 // Lazy so test suites that `vi.mock('@deepseek-ai/dsh-home-paths', …)` before
 // the test's TMP constant is initialised don't trigger `dshHomePath('logs')` at
 // module-load time. Every site goes through `log()` instead of holding a module
 // reference to the logger.
-let _log: PluginLogger | null = null
-function log(): PluginLogger {
-  if (_log === null) _log = getLogger('dsh-auth')
+let _log: Logger | null = null
+function log(): Logger {
+  if (_log === null) _log = createLogger({ component: 'dsh-auth' })
   return _log
 }
 
@@ -170,31 +170,20 @@ export class HostSessionResolver {
       }
     } catch (err) {
       // Network error: nothing usable right now.
-      log().warn('host session fetch failed', { url, error: String(err) })
+      log().warn({ url, error: String(err) }, 'host session fetch failed')
       info = null
     }
     if (info !== null && info.authenticated) {
       this.cache = { info, fetchedAt: now }
       // Never log the credential itself — id/version are enough to correlate
       // this plugin with the HQ Edge log line that served it.
-      log().debug('host session resolved', {
-        url,
-        status,
-        userId: info.id,
-        version: info.version ?? null,
-        authenticated: info.authenticated,
-      })
+      log().debug({ url, status, userId: info.id, version: info.version ?? null, authenticated: info.authenticated }, 'host session resolved')
       return info
     }
     // Unusable (unreachable, unparseable, or the host says it has no
     // credential). Drop the cache so the very next call re-asks the host.
     this.cache = null
-    log().info('no usable host session', {
-      url,
-      status,
-      parsed: info !== null,
-      hostAuthenticated: info?.authenticated ?? null,
-    })
+    log().info({ url, status, parsed: info !== null, hostAuthenticated: info?.authenticated ?? null }, 'no usable host session')
     return null
   }
 

package/src/index.ts

@@ -6,12 +6,12 @@
  */
 import type { Context } from '@deepseek-ai/cordis'
 import type {} from '@deepseek-ai/dsh-host-webserver'
-import { getLogger } from '@huaqiu/dsh-plugin-log'
+import { createLogger } from '@hqedge/logging'
 import { InMemoryHuaqiuAuthService, type HuaqiuAuthService } from './service.js'
 import { AUTH_ROUTE_PREFIX, createAuthHandler } from './routes.js'
 import type { HuaqiuAuthConfig } from './host.js'
 
-const log = getLogger('dsh-auth')
+const log = createLogger({ component: 'dsh-auth' })
 
 export type { HuaqiuAuthApi, HuaqiuAuthService, HuaqiuUserInfo } from './service.js'
 export { InMemoryHuaqiuAuthService } from './service.js'
@@ -40,11 +40,7 @@ export function apply(ctx: Context, config?: Partial<HuaqiuAuthConfig>): void {
   // it proves whether the overlay `config` still reached `apply(ctx, config)`.
   // When `hostMode` is false under HQ Edge, the endpoint was not delivered and
   // every tool will report `needs_auth` no matter what the browser does.
-  log.info('applying dsh-auth node half', {
-    hasConfig: config != null,
-    configKeys: config != null ? Object.keys(config) : [],
-    hqEdgeBaseUrl: config?.hqEdgeBaseUrl ?? null,
-  })
+  log.info({ hasConfig: config != null, configKeys: config != null ? Object.keys(config) : [], hqEdgeBaseUrl: config?.hqEdgeBaseUrl ?? null }, 'applying dsh-auth node half')
 
   const service = new InMemoryHuaqiuAuthService(config)
   ctx.effect(() => ctx.provide('huaqiuAuth', service))
@@ -55,5 +51,5 @@ export function apply(ctx: Context, config?: Partial<HuaqiuAuthConfig>): void {
     handler: createAuthHandler(service),
   }))
 
-  log.info('dsh-auth node half ready', { routes: AUTH_ROUTE_PREFIX, hostMode: service.hostMode })
+  log.info({ routes: AUTH_ROUTE_PREFIX, hostMode: service.hostMode }, 'dsh-auth node half ready')
 }

package/src/routes.ts

@@ -15,15 +15,15 @@
  * the documented channel).
  */
 import type { IncomingMessage, ServerResponse } from 'node:http'
-import { getLogger, type PluginLogger } from '@huaqiu/dsh-plugin-log'
+import { createLogger, type Logger } from '@hqedge/logging'
 import type { HuaqiuAuthService, HuaqiuUserInfo } from './service.js'
 
 // Lazy so test suites that `vi.mock('@deepseek-ai/dsh-home-paths', …)` before
 // their TMP constant is initialised don't trigger `dshHomePath('logs')` at
 // module-load time.
-let _log: PluginLogger | null = null
-function log(): PluginLogger {
-  if (_log === null) _log = getLogger('dsh-auth')
+let _log: Logger | null = null
+function log(): Logger {
+  if (_log === null) _log = createLogger({ component: 'dsh-auth' })
   return _log
 }
 

package/src/service.ts

@@ -23,7 +23,7 @@
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { dshHomePath } from '@deepseek-ai/dsh-home-paths'
-import { getLogger, type PluginLogger } from '@huaqiu/dsh-plugin-log'
+import { createLogger, type Logger } from '@hqedge/logging'
 import {
   HostSessionResolver,
   resolveHostConfig,
@@ -159,9 +159,9 @@ export class InMemoryHuaqiuAuthService implements HuaqiuAuthService {
   private stale = false
   /** Last host credential version seen; see `observeHostVersion`. */
   private lastHostVersion: number | null = null
-  private _log: PluginLogger | null = null
-  private get log(): PluginLogger {
-    if (this._log === null) this._log = getLogger('dsh-auth')
+  private _log: Logger | null = null
+  private get log(): Logger {
+    if (this._log === null) this._log = createLogger({ component: 'dsh-auth' })
     return this._log
   }
 
@@ -184,11 +184,7 @@ export class InMemoryHuaqiuAuthService implements HuaqiuAuthService {
       fetchImpl: this.doFetch,
     })
     this.hostMode = this.host.enabled
-    this.log.info('auth service started', {
-      hostMode: this.hostMode,
-      hostAuthPath: resolved.hostAuthPath,
-      hostSessionTtlSeconds: resolved.hostSessionTtlSeconds,
-    })
+    this.log.info({ hostMode: this.hostMode, hostAuthPath: resolved.hostAuthPath, hostSessionTtlSeconds: resolved.hostSessionTtlSeconds }, 'auth service started')
   }
 
   /** Host mode is active iff a host base URL was configured (see HostSessionResolver.enabled). */
@@ -258,10 +254,7 @@ export class InMemoryHuaqiuAuthService implements HuaqiuAuthService {
     if (this.host.enabled) {
       const host = await this.host.resolve()
       if (!host || !host.authenticated) {
-        this.log.debug('host session unusable', {
-          hostReachable: host !== null,
-          hostAuthenticated: host?.authenticated ?? null,
-        })
+        this.log.debug({ hostReachable: host !== null, hostAuthenticated: host?.authenticated ?? null }, 'host session unusable')
         return null
       }
       this.observeHostVersion(host.version)
@@ -285,7 +278,7 @@ export class InMemoryHuaqiuAuthService implements HuaqiuAuthService {
     if (this.lastHostVersion !== null && version !== this.lastHostVersion) {
       this.stale = false
       this.validator.invalidate()
-      this.log.info('host credential replaced — re-arming session', { version })
+      this.log.info({ version }, 'host credential replaced — re-arming session')
     }
     this.lastHostVersion = version
   }