fix(native-bridge): address PR review feedback

- Extract BridgeState/BridgeStatus to shared/types/common/nativeBridge.ts
- Dynamic permission check via chrome.permissions.contains() in getStatus()
- Port race safety: capture currentPort in connect(), guard all listeners
- Hello handshake error handling with try/catch and .catch()
- Validate boolean input in nativeBridgeSetEnabled
- Remove getExtStorage/getLogger from bridge allowlist (security)
- getSiteList: include isDead from site metadata, fallback name to id
- getDownloaderList: remove address field (may contain credentials)
- Browser detection via UA for setup command (chrome/chromium/edge/firefox)

Author: LeiShi1313

src/entries/background/utils/nativeMessaging.ts

@@ -1,5 +1,6 @@
 import { onMessage, sendMessage } from "@/messages.ts";
 import { setupOffscreenDocument } from "./offscreen.ts";
+import type { BridgeState, BridgeStatus } from "@/shared/types.ts";
 
 const NATIVE_HOST_NAME = "com.ptd.native";
 const INSTANCE_ID_KEY = "ptd_native_instance_id";
@@ -16,9 +17,6 @@ const FATAL_ERRORS = [
 
 /** Methods the bridge will proxy to sendMessage(). Everything else is rejected. */
 const ALLOWED_METHODS = new Set([
-  // Storage and logging (read-only)
-  "getExtStorage",
-  "getLogger",
   // Site config
   "getSiteList",
   "getSiteUserConfig",
@@ -54,12 +52,10 @@ const ALLOWED_METHODS = new Set([
 ]);
 
 // ── Module-scoped state ──────────────────────────────────────────────
-type BridgeState = "no-permission" | "disabled" | "connecting" | "connected" | "retrying" | "error";
 
 let port: chrome.runtime.Port | null = null;
 let reconnectTimer: ReturnType<typeof setTimeout> | null = null;
 let reconnectAttempt = 0;
-let permissionGranted = false;
 let enabled = true;
 let state: BridgeState = "no-permission";
 let lastError: string | undefined;
@@ -79,12 +75,21 @@ async function getOrCreateInstanceId(): Promise<string> {
   return id;
 }
 
-function getStatus() {
+async function checkPermission(): Promise<boolean> {
+  try {
+    return await chrome.permissions.contains({ permissions: ["nativeMessaging"] });
+  } catch {
+    return false;
+  }
+}
+
+async function getStatus(): Promise<BridgeStatus> {
+  const permissionGranted = await checkPermission();
   return {
     permissionGranted,
     enabled,
     state,
-    connected: state === "connected",
+    connected: port !== null && state === "connected",
     lastError,
   };
 }
@@ -133,7 +138,7 @@ function scheduleReconnect() {
 }
 
 function connect() {
-  if (!permissionGranted || !enabled) {
+  if (!enabled) {
     return;
   }
 
@@ -142,8 +147,10 @@ function connect() {
   lastError = undefined;
   intentionalDisconnect = false;
 
+  let currentPort: chrome.runtime.Port;
   try {
-    port = chrome.runtime.connectNative(NATIVE_HOST_NAME);
+    currentPort = chrome.runtime.connectNative(NATIVE_HOST_NAME);
+    port = currentPort;
   } catch (e: any) {
     state = "error";
     lastError = e?.message ?? String(e);
@@ -154,29 +161,50 @@ function connect() {
   // Send hello handshake — mark connected after successful send.
   // The native host does not send an ack, so a successful postMessage
   // is our best signal. If the host is absent, onDisconnect fires.
-  getOrCreateInstanceId().then((instanceId) => {
-    if (!port) return;
-    port.postMessage({
-      type: "hello",
-      instanceId,
-      browser: __BROWSER__,
-      extensionId: chrome.runtime.id,
-      version: __EXT_VERSION__,
-      capabilities: ["bridge-v1"],
+  getOrCreateInstanceId()
+    .then((instanceId) => {
+      if (port !== currentPort) return;
+
+      try {
+        currentPort.postMessage({
+          type: "hello",
+          instanceId,
+          browser: __BROWSER__,
+          extensionId: chrome.runtime.id,
+          version: __EXT_VERSION__,
+          capabilities: ["bridge-v1"],
+        });
+      } catch (e: any) {
+        state = "error";
+        lastError = e?.message ?? String(e);
+        console.debug("[PTD] Failed to send native hello message:", lastError);
+        return;
+      }
+
+      state = "connected";
+      reconnectAttempt = 0;
+    })
+    .catch((e: any) => {
+      if (port !== currentPort) return;
+      state = "error";
+      lastError = e?.message ?? String(e);
+      console.debug("[PTD] Failed to get or create native instance id:", lastError);
+      try {
+        currentPort.disconnect();
+      } catch {
+        // ignore
+      }
     });
-    state = "connected";
-    reconnectAttempt = 0;
-  });
 
-  port.onMessage.addListener(async (msg: any) => {
+  currentPort.onMessage.addListener(async (msg: any) => {
     if (msg?.type !== "request" || !msg.id || !msg.method) {
       return;
     }
 
     const { id, method, params } = msg;
 
     if (!ALLOWED_METHODS.has(method)) {
-      port!.postMessage({
+      currentPort.postMessage({
         type: "response",
         id,
         error: { code: "METHOD_NOT_ALLOWED", message: `Method '${method}' is not allowed` },
@@ -187,58 +215,56 @@ function connect() {
     try {
       await setupOffscreenDocument();
       const result = await sendMessage(method as any, params);
-      port?.postMessage({ type: "response", id, result });
+      if (port === currentPort) {
+        currentPort.postMessage({ type: "response", id, result });
+      }
     } catch (e: any) {
-      port?.postMessage({
-        type: "response",
-        id,
-        error: { code: "EXTENSION_ERROR", message: e?.message ?? String(e) },
-      });
+      if (port === currentPort) {
+        currentPort.postMessage({
+          type: "response",
+          id,
+          error: { code: "EXTENSION_ERROR", message: e?.message ?? String(e) },
+        });
+      }
     }
   });
 
-  port.onDisconnect.addListener(() => {
+  currentPort.onDisconnect.addListener(() => {
     const err = chrome.runtime.lastError;
     const errMsg = err?.message ?? "";
 
+    // Stale port — a new connection has already replaced this one
+    if (port !== currentPort) return;
+
     port = null;
 
     if (intentionalDisconnect) {
-      // Intentional disconnect — don't retry
       return;
     }
 
     if (err) {
       console.debug("[PTD] Native messaging disconnected:", errMsg);
     }
 
-    // Fatal errors — no retry
     if (FATAL_ERRORS.some((e) => errMsg.includes(e))) {
       state = "error";
       lastError = errMsg;
       console.debug("[PTD] Native host not available, CLI bridge disabled.");
       return;
     }
 
-    // Recoverable (e.g. host exited) — retry with backoff
     lastError = errMsg || "Connection lost";
     scheduleReconnect();
   });
 }
 
 async function init() {
-  // Refresh permission state
-  try {
-    permissionGranted = await chrome.permissions.contains({ permissions: ["nativeMessaging"] });
-  } catch {
-    permissionGranted = false;
-  }
+  const permissionGranted = await checkPermission();
 
   // Refresh enabled flag
   const stored = await chrome.storage.local.get(ENABLED_KEY);
   enabled = stored[ENABLED_KEY] !== false; // default true
 
-  // Reconcile desired state
   if (!permissionGranted) {
     disconnect(true);
     state = "no-permission";
@@ -253,7 +279,6 @@ async function init() {
     return;
   }
 
-  // Permission granted and enabled — connect
   connect();
 }
 
@@ -278,16 +303,19 @@ onMessage("nativeBridgeGetStatus", async () => {
 });
 
 onMessage("nativeBridgeSetEnabled", async ({ data }) => {
+  if (typeof data !== "boolean") {
+    return getStatus();
+  }
   await chrome.storage.local.set({ [ENABLED_KEY]: data });
   await init();
-  // Brief wait for the async hello handshake to complete
   if (state === "connecting") {
     await new Promise((r) => setTimeout(r, 200));
   }
   return getStatus();
 });
 
 onMessage("nativeBridgeReconnect", async () => {
+  const permissionGranted = await checkPermission();
   if (!permissionGranted) {
     lastError = "Permission not granted — cannot reconnect";
     return getStatus();

src/entries/messages.ts

@@ -40,6 +40,7 @@ import {
   AugmentedRequired,
   IKeepUploadTask,
   TKeepUploadTaskKey,
+  BridgeStatus,
 } from "@/shared/types.ts";
 
 import { isDebug } from "~/helper.ts";
@@ -148,30 +149,12 @@ interface ProtocolMap extends TMessageMap {
 
   // 2.8 Lightweight list queries (for CLI discovery)
   getSiteList(): Array<{ id: string; name: string; url: string; offline: boolean }>;
-  getDownloaderList(): Array<{ id: string; name: string; type: string; enabled: boolean; address: string }>;
+  getDownloaderList(): Array<{ id: string; name: string; type: string; enabled: boolean }>;
 
   // 2.9 Native messaging bridge control
-  nativeBridgeGetStatus(): {
-    permissionGranted: boolean;
-    enabled: boolean;
-    state: "no-permission" | "disabled" | "connecting" | "connected" | "retrying" | "error";
-    connected: boolean;
-    lastError?: string;
-  };
-  nativeBridgeSetEnabled(data: boolean): {
-    permissionGranted: boolean;
-    enabled: boolean;
-    state: "no-permission" | "disabled" | "connecting" | "connected" | "retrying" | "error";
-    connected: boolean;
-    lastError?: string;
-  };
-  nativeBridgeReconnect(): {
-    permissionGranted: boolean;
-    enabled: boolean;
-    state: "no-permission" | "disabled" | "connecting" | "connected" | "retrying" | "error";
-    connected: boolean;
-    lastError?: string;
-  };
+  nativeBridgeGetStatus(): BridgeStatus;
+  nativeBridgeSetEnabled(data: boolean): BridgeStatus;
+  nativeBridgeReconnect(): BridgeStatus;
 }
 
 // 全局消息处理函数映射

src/entries/offscreen/utils/download.ts

@@ -49,7 +49,6 @@ onMessage("getDownloaderList", async () => {
     name: config.name ?? "",
     type: config.type ?? "",
     enabled: config.enabled ?? false,
-    address: config.address ?? "",
   }));
 });
 

src/entries/offscreen/utils/site.ts

@@ -57,12 +57,18 @@ onMessage("getSiteList", async () => {
   const metadata = (await sendMessage("getExtStorage", "metadata")) as IMetadataPiniaStorageSchema;
   const sites = metadata?.sites ?? {};
   const nameMap = metadata?.siteNameMap ?? {};
-  return Object.entries(sites).map(([id, config]) => ({
-    id,
-    name: nameMap[id] ?? "",
-    url: config.url ?? "",
-    offline: config.isOffline ?? false,
-  }));
+  return Promise.all(
+    Object.entries(sites).map(async ([id, config]) => {
+      const siteMetaData = await getDefinedSiteMetadata(id as TSiteID);
+      const isDead = siteMetaData.isDead ?? false;
+      return {
+        id,
+        name: nameMap[id] ?? config.merge?.name ?? id,
+        url: config.url ?? "",
+        offline: (isDead || config.isOffline) ?? false,
+      };
+    }),
+  );
 });
 
 export async function getSiteInstance<TYPE extends "private" | "public">(

src/entries/options/views/Settings/SetBase/NativeBridgeWindow.vue

@@ -3,27 +3,28 @@ import { computed, onMounted, ref, shallowRef } from "vue";
 import { useI18n } from "vue-i18n";
 
 import { sendMessage } from "@/messages.ts";
+import type { BridgeState, BridgeStatus } from "@/shared/types.ts";
 
 const { t } = useI18n();
 
 const extensionId = chrome.runtime.id;
+
+function detectBrowserFamily(): string {
+  if (__BROWSER__ === "firefox") return "firefox";
+  const ua = navigator.userAgent;
+  if (ua.includes("Edg/")) return "edge";
+  if (ua.includes("Chromium/")) return "chromium";
+  return "chrome";
+}
+
+const browserFamily = detectBrowserFamily();
 const setupCommand = computed(() => {
-  if (__BROWSER__ === "firefox") {
+  if (browserFamily === "firefox") {
     return "ptd install --browser firefox";
   }
-  return `ptd install --browser chrome --extension-id ${extensionId}`;
+  return `ptd install --browser ${browserFamily} --extension-id ${extensionId}`;
 });
 
-type BridgeState = "no-permission" | "disabled" | "connecting" | "connected" | "retrying" | "error";
-
-interface BridgeStatus {
-  permissionGranted: boolean;
-  enabled: boolean;
-  state: BridgeState;
-  connected: boolean;
-  lastError?: string;
-}
-
 const status = shallowRef<BridgeStatus>({
   permissionGranted: false,
   enabled: true,
@@ -48,7 +49,6 @@ async function grantPermission() {
   try {
     const granted = await chrome.permissions.request({ permissions: ["nativeMessaging"] });
     if (granted) {
-      // Permission granted — refresh status (onAdded listener in background will call init())
       await refreshStatus();
     } else {
       console.debug("[PTD]", t("SetNativeBridge.permission.grantFailed"));
@@ -99,7 +99,6 @@ async function testConnection() {
   testLoading.value = true;
   try {
     status.value = await sendMessage("nativeBridgeReconnect", undefined);
-    // Poll until state settles (connected/error) or timeout
     if (status.value.state === "connecting") {
       await waitForSettledState();
     }

src/entries/shared/types.ts

@@ -8,6 +8,7 @@ import type { TBackupFields } from "./types/storages/metadata.ts";
 export * from "./types/extends.ts";
 export * from "./types/common/download.ts";
 export * from "./types/common/ptpp.ts";
+export * from "./types/common/nativeBridge.ts";
 export * from "./types/storages/config.ts";
 export * from "./types/storages/indexdb.ts";
 export * from "./types/storages/metadata.ts";

src/entries/shared/types/common/nativeBridge.ts

@@ -0,0 +1,9 @@
+export type BridgeState = "no-permission" | "disabled" | "connecting" | "connected" | "retrying" | "error";
+
+export interface BridgeStatus {
+  permissionGranted: boolean;
+  enabled: boolean;
+  state: BridgeState;
+  connected: boolean;
+  lastError?: string;
+}