@huaqiu/dsh-auth 0.5.1 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huaqiu/dsh-auth",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "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.5.1"
+    "@huaqiu/dsh-plugin-log": "0.5.3"
   },
   "files": [
     "lib",

package/src/client/client.ts

@@ -5,12 +5,17 @@
 import {
   AUTH_ORIGIN,
   buildLoginUrl,
+  buildSubscriptionUrl,
+  fetchSubscriptionQuota,
   handleAuthMessage,
+  SUBSCRIPTION_PREFERRED_SIZE,
   type AuthMessageEventLike,
   type AuthTokenPayload,
   type LoginOptions,
+  type SubscriptionQuota,
 } from './lib.js'
 import { closeLoginDialog, isLoginDialogOpen, openLoginDialog } from './ui/login-dialog.js'
+import { closeSubscriptionDialog, isSubscriptionDialogOpen, openSubscriptionDialog } from './ui/subscription-dialog.js'
 import type { AuthStorage } from './storage.js'
 import type { AuthTransport } from './transport.js'
 
@@ -22,6 +27,19 @@ export interface AuthClientDeps {
   loginUrl?: string
   windowLike: Pick<Window, 'addEventListener' | 'removeEventListener'>
   documentLike: Pick<Document, 'createElement' | 'body'>
+  /**
+   * Host-side native dialog opener (wired by the client entry from the lazy
+   * `hqEdge` service). In host mode the subscription dialog must be opened by
+   * the EDA host through DialogService.OpenUrl (hqEdge.openUrl) — a browser
+   * iframe cannot be shown over the host UI. Absent/undefined = the host has
+   * no dialog service; `openSubscriptionDialog()` then no-ops and the caller
+   * degrades gracefully.
+   */
+  openHostDialog?: (url: string, options: {
+    title?: string
+    size?: { width?: number; height?: number }
+    key?: string
+  }) => Promise<void>
 }
 
 export interface AuthClient {
@@ -46,6 +64,22 @@ export interface AuthClient {
      * the UI keeps showing the authenticated state.
      */
     logout(): Promise<void>
+    /**
+     * Active subscription quota for one eda.cn product, fetched DIRECTLY from
+     * eda.cn (`/sub-api/subscriptions/active`) — no hq-edge hop, so the
+     * sidebar can show live quota even in standalone DSH. Null on fetch
+     * failure / no credential (callers decide fail-open vs fail-closed).
+     */
+    getSubscriptionQuota(productCode: string): Promise<SubscriptionQuota | null>
+    /**
+     * Open the subscription landing page (`gen.eda.cn/subscription` with the
+     * token). Host mode: ask the EDA host to open its NATIVE dialog through
+     * DialogService.OpenUrl (preferred size 1400×740). Standalone DSH: open
+     * the in-app iframe dialog at the same preferred size. No-op when the
+     * credential is missing; host mode without a dialog service no-ops too
+     * (the UI falls back to its own subscribe button + error copy).
+     */
+    openSubscriptionDialog(): Promise<void>
     onAuthStateChanged(listener: (info: AuthTokenPayload | null) => void): () => void
   }
   /** Route window 'message' events here. Exposed for direct testing. */
@@ -195,6 +229,34 @@ export function createAuthClient(deps: AuthClientDeps): AuthClient {
       emit(null)
       closeIframe()
     },
+    getSubscriptionQuota: async (productCode: string): Promise<SubscriptionQuota | null> => {
+      if (hostMode && !hostSessionLoaded) await resolveHost()
+      const token = await auth.getAccessToken()
+      const id = hostMode
+        ? (hostSession?.id ?? null)
+        : (hostSession?.id ?? storage.get()?.id ?? null)
+      if (!token || !id) return null
+      return fetchSubscriptionQuota({ userId: id, token, productCode })
+    },
+    openSubscriptionDialog: async (): Promise<void> => {
+      if (hostMode && !hostSessionLoaded) await resolveHost()
+      const token = await auth.getAccessToken()
+      if (!token) return
+      const url = buildSubscriptionUrl({ token })
+      if (hostMode) {
+        // The EDA host owns the UI — open its native dialog (fire-and-forget).
+        // No dialog service → no-op; the caller keeps its subscribe button.
+        if (!deps.openHostDialog) return
+        await deps.openHostDialog(url, {
+          title: 'Huaqiu EDA subscription',
+          size: { width: SUBSCRIPTION_PREFERRED_SIZE.width, height: SUBSCRIPTION_PREFERRED_SIZE.height },
+          key: 'hq-subscription-dialog',
+        })
+        return
+      }
+      if (isSubscriptionDialogOpen()) return
+      openSubscriptionDialog(url, { size: SUBSCRIPTION_PREFERRED_SIZE })
+    },
     onAuthStateChanged: (listener: (info: AuthTokenPayload | null) => void): (() => void) => {
       listeners.add(listener)
       return () => listeners.delete(listener)
@@ -293,6 +355,7 @@ export function createAuthClient(deps: AuthClientDeps): AuthClient {
     dispose() {
       deps.windowLike.removeEventListener('message', onWindowMessage)
       closeIframe()
+      if (isSubscriptionDialogOpen()) closeSubscriptionDialog()
       hostMode = false
       hostSession = null
       hostSessionLoaded = false

package/src/client/i18n.ts

@@ -26,6 +26,25 @@ const zh = {
   'menu.profile': '个人中心',
   'menu.logout': '退出登录',
 
+  // Subscription quota + upgrade (sidebar account menu / HIT cards).
+  'subscription.title': '订阅',
+  'subscription.dialogTitle': '华秋 EDA 订阅',
+  'subscription.gen': '系统设计（GEN）',
+  'subscription.erc': '电路检查（ERC）',
+  'subscription.package': '套餐：{name}',
+  'subscription.quota': '可用次数：{count}',
+  'subscription.quotaCount': '{used} / {total}次',
+  'subscription.noQuota': '无可用次数',
+  'subscription.unsubscribed': '未订阅',
+  'subscription.subscribe': '订阅 / 升级',
+  'subscription.subscribing': '正在打开订阅…',
+  'subscription.desc': '当前账号没有可用的 GEN 生成次数，请订阅或升级套餐后重试。',
+  'subscription.hostUnavailable': '无法打开订阅页面（宿主未提供对话框服务）。',
+  // Avatar popup (redesigned sidebar account menu).
+  'subscription.quotaHeader': '套餐与使用额度',
+  'subscription.upgrade': '订阅 / 升级套餐',
+  'subscription.online': '在线',
+
   'card.title': '华秋 EDA AI（eda.cn）登录',
   'card.desc': '工具「{tool}」需要登录华秋 EDA AI 账号才能继续。请在下方的登录框完成登录（或点击左侧「华秋EDA AI登录」按钮）；登录完成后，回复助手「已登录，请重试」，助手会自动重新调用该工具。',
   'card.loggedIn': '✓ 已登录{nickname} —— 现在可以回复助手「已登录，请重试」，助手会重新调用工具。',
@@ -52,6 +71,24 @@ const en: Record<AuthCopyKey, string> = {
   'menu.profile': 'Go to profile',
   'menu.logout': 'Log out',
 
+  'subscription.title': 'Subscription',
+  'subscription.dialogTitle': 'Huaqiu EDA subscription',
+  'subscription.gen': 'System design (GEN)',
+  'subscription.erc': 'Circuit check (ERC)',
+  'subscription.package': 'Plan: {name}',
+  'subscription.quota': 'Available: {count}',
+  'subscription.quotaCount': '{used} / {total}',
+  'subscription.noQuota': 'No quota left',
+  'subscription.unsubscribed': 'Not subscribed',
+  'subscription.subscribe': 'Subscribe / Upgrade',
+  'subscription.subscribing': 'Opening subscription…',
+  'subscription.desc': 'This account has no GEN generation quota left. Subscribe or upgrade to continue.',
+  'subscription.hostUnavailable': 'Cannot open the subscription page (the host provides no dialog service).',
+  // Avatar popup (redesigned sidebar account menu).
+  'subscription.quotaHeader': 'Plan & usage quota',
+  'subscription.upgrade': 'Subscribe / Upgrade plan',
+  'subscription.online': 'Online',
+
   'card.title': 'Huaqiu EDA AI (eda.cn) login',
   // The reply phrase used to be hardcoded to the Chinese "已登录，请重试" even
   // in these English strings, telling an English-speaking user to type Chinese.

package/src/client/index.tsx

@@ -73,6 +73,21 @@ export function apply(ctx: ClientContext): () => void {
     transport: createWebServerAuthTransport(),
     windowLike: window,
     documentLike: document,
+    // Host mode subscription dialog: the EDA host owns the UI. Open its
+    // native window through the hqEdge service's DialogService.OpenUrl
+    // bridge (fire-and-forget); absent hqEdge → no-op, the caller's
+    // subscribe button stays usable and reports the limitation.
+    openHostDialog: async (url, options) => {
+      const hqEdge = ctx.get?.<{
+        openUrl?(url: string, opts?: Record<string, unknown>): Promise<unknown>
+      } | undefined>('hqEdge')
+      if (!hqEdge || typeof hqEdge.openUrl !== 'function') return
+      await hqEdge.openUrl(url, {
+        ...(options.title ? { title: options.title } : {}),
+        ...(options.size ? { size: options.size } : {}),
+        ...(options.key ? { key: options.key } : {}),
+      })
+    },
   })
 
   // The sidebar needs the host identity (targetHost) to decide whether the

package/src/client/lib.ts

@@ -24,6 +24,117 @@ export const AUTH_ORIGIN = 'https://auth.eda.cn'
 /**「Go to profile」destination: the eda.cn account page. */
 export const PROFILE_URL = 'https://www.eda.cn/account/profile'
 
+// ── Subscription (quota + upgrade dialog) ────────────────────────────────────
+
+/**
+ * Subscription landing page — the same page `hq-eda-ai` serves at
+ * `gen.eda.cn/subscription` (token taken from the URL query; see its
+ * `UserInfoContext`). The preferred window size for BOTH surfaces (KiCad
+ * native dialog via DialogService.OpenUrl and the standalone iframe dialog)
+ * is 1400×740.
+ */
+export const SUBSCRIPTION_ORIGIN = 'https://gen.eda.cn'
+export const SUBSCRIPTION_PATH = '/subscription'
+export const SUBSCRIPTION_PREFERRED_SIZE = { width: 1400, height: 740 } as const
+
+/**
+ * eda.cn subscription product codes.
+ * - GEN (system/schematic design): `auto-design` — the SAME product code
+ *   `hq-eda-ai` uses (`apps/web/src/lib/config/product-code.ts`), i.e. the
+ *   subscription sold on `gen.eda.cn/subscription`.
+ * - ERC: `erc` — the code `hq-edge`'s own quota proxy
+ *   (`apps/server/src/routes/project.ts`) queries with.
+ */
+export const GEN_PRODUCT_CODE = 'auto-design'
+export const ERC_PRODUCT_CODE = 'erc'
+
+/**
+ * Build the subscription landing URL. Mirrors `buildProfileUrl`: the token is
+ * always attached — `gen.eda.cn/subscription` consumes it to establish the
+ * session and hides it itself. `encodeURIComponent` is required (tokens are
+ * base64-ish and may contain `+`, `/` or `=`).
+ */
+export function buildSubscriptionUrl(options: { token: string }): string {
+  return `${SUBSCRIPTION_ORIGIN}${SUBSCRIPTION_PATH}?token=${encodeURIComponent(options.token)}`
+}
+
+/** Normalized active-subscription quota view (whatever the backend sends). */
+export interface SubscriptionQuota {
+  hasSubscription: boolean
+  packageName: string
+  currentQuota: number
+  totalQuota: number
+}
+
+const SUB_API_PREFIX = '/sub-api'
+const SUB_API_SUCCESS_CODES = [200, 200000]
+
+function unwrapSubApiPayload<T>(payload: unknown): T | null {
+  if (payload && typeof payload === 'object' && 'code' in payload) {
+    const p = payload as { code: number; result?: T; data?: T }
+    if (!SUB_API_SUCCESS_CODES.includes(p.code)) return null
+    if (p.result !== undefined) return p.result as T
+    if (p.data !== undefined) return p.data as T
+    return undefined as T
+  }
+  return payload as T
+}
+
+function quotaOf(subscription: Record<string, unknown> | null | undefined): SubscriptionQuota {
+  if (!subscription || (typeof subscription === 'object' && Object.keys(subscription).length === 0)) {
+    return { hasSubscription: false, packageName: '', currentQuota: 0, totalQuota: 0 }
+  }
+  const currentQuota = Number(subscription.currentQuota) || 0
+  return {
+    hasSubscription: currentQuota > 0,
+    packageName: typeof subscription.packageName === 'string' ? subscription.packageName : '',
+    currentQuota,
+    totalQuota: Number(subscription.totalQuota) || 0,
+  }
+}
+
+/**
+ * Fetch the active subscription quota DIRECTLY from eda.cn
+ * (`GET {baseUrl}/sub-api/subscriptions/active?userId&productCode` with
+ * `x-token` + `X-User-Id` headers) — the same API `hq-eda-ai`'s
+ * `getActiveSubscription` and `hq-edge`'s ERC quota proxy call, so displaying
+ * the available quota never depends on an hq-edge hop.
+ *
+ * Returns null when the fetch/unwrap fails (callers decide fail-open vs
+ * fail-closed); a well-formed response always yields a `SubscriptionQuota`
+ * (possibly with `hasSubscription: false`).
+ */
+export async function fetchSubscriptionQuota(options: {
+  userId: string | number
+  token: string
+  productCode: string
+  baseUrl?: string
+  fetchImpl?: typeof fetch
+}): Promise<SubscriptionQuota | null> {
+  const { userId, token, productCode, baseUrl = 'https://www.eda.cn' } = options
+  const fetchImpl = options.fetchImpl ?? fetch
+  const url = `${baseUrl}${SUB_API_PREFIX}/subscriptions/active?${new URLSearchParams({
+    userId: String(userId),
+    productCode,
+  }).toString()}`
+  try {
+    const res = await fetchImpl(url, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json, text/plain, */*',
+        'Content-Type': 'application/json',
+        'x-token': token,
+        'X-User-Id': String(userId),
+      },
+    })
+    if (!res || !res.ok) return null
+    const json = (await res.json()) as unknown
+    return quotaOf(unwrapSubApiPayload<Record<string, unknown>>(json))
+  } catch {
+    return null
+  }
+}
+
 /**
  * Build the「Go to profile」URL: the eda.cn account page WITH the access token
  * in the query, mirroring `hq-eda-ai`'s `UserMenu`