@apocaliss92/nodelink-js 0.5.1 → 0.6.0

package/dist/index.cjs

@@ -34,7 +34,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 function bcHeaderHasPayloadOffset(messageClass) {
   return messageClass === BC_CLASS_MODERN_24 || messageClass === BC_CLASS_MODERN_24_ALT || messageClass === BC_CLASS_FILE_DOWNLOAD;
 }
-var BC_TCP_DEFAULT_PORT, BC_MAGIC, BC_MAGIC_REV, BC_XML_KEY, BC_AES_IV, BC_CLASS_LEGACY, BC_CLASS_MODERN_20, BC_CLASS_MODERN_24, BC_CLASS_MODERN_24_ALT, BC_CLASS_FILE_DOWNLOAD, BC_CMD_ID_LOGIN, BC_CMD_ID_LOGOUT, BC_CMD_ID_VIDEO, BC_CMD_ID_VIDEO_STOP, BC_CMD_ID_FILE_INFO_LIST_REPLAY, BC_CMD_ID_FILE_INFO_LIST_STOP, BC_CMD_ID_FILE_INFO_LIST_DL_VIDEO, BC_CMD_ID_FILE_INFO_LIST_DOWNLOAD, BC_CMD_ID_FILE_INFO_LIST_OPEN, BC_CMD_ID_FILE_INFO_LIST_GET, BC_CMD_ID_FILE_INFO_LIST_CLOSE, BC_CMD_ID_FIND_REC_VIDEO_OPEN, BC_CMD_ID_FIND_REC_VIDEO_GET, BC_CMD_ID_FIND_REC_VIDEO_CLOSE, BC_CMD_ID_COVER_PREVIEW, BC_CMD_ID_COVER_STANDALONE_458, BC_CMD_ID_COVER_STANDALONE_459, BC_CMD_ID_COVER_STANDALONE_460, BC_CMD_ID_COVER_STANDALONE_461, BC_CMD_ID_COVER_STANDALONE_462, BC_CMD_ID_COVER_RESPONSE, BC_CMD_ID_TALK_ABILITY, BC_CMD_ID_TALK_RESET, BC_CMD_ID_TALK_CONFIG, BC_CMD_ID_TALK, BC_CMD_ID_PTZ_CONTROL, BC_CMD_ID_PTZ_CONTROL_PRESET, BC_CMD_ID_GET_PTZ_PRESET, BC_CMD_ID_GET_PTZ_POSITION, BC_CMD_ID_GET_ZOOM_FOCUS, BC_CMD_ID_SET_ZOOM_FOCUS, BC_CMD_ID_GET_BATTERY_INFO_LIST, BC_CMD_ID_GET_BATTERY_INFO, BC_CMD_ID_UDP_KEEP_ALIVE, BC_CMD_ID_GET_PIR_INFO, BC_CMD_ID_SET_PIR_INFO, BC_CMD_ID_GET_MOTION_ALARM, BC_CMD_ID_SET_MOTION_ALARM, BC_CMD_ID_ALARM_EVENT_LIST, BC_CMD_ID_GET_AI_ALARM, BC_CMD_ID_SET_AI_ALARM, BC_CMD_ID_GET_AUDIO_ALARM, BC_CMD_ID_AUDIO_ALARM_PLAY, BC_CMD_ID_GET_WHITE_LED, BC_CMD_ID_SET_WHITE_LED_STATE, BC_CMD_ID_SET_WHITE_LED_TASK, BC_CMD_ID_FLOODLIGHT_STATUS_LIST, BC_CMD_ID_ABILITY_INFO, BC_CMD_ID_SUPPORT, BC_CMD_ID_PING, BC_CMD_ID_GET_SNAPSHOT, BC_CMD_ID_GET_UID, BC_CMD_ID_CHANNEL_INFO_ALL, BC_CMD_ID_GET_OSD_DATETIME, BC_CMD_ID_SET_OSD_DATETIME, BC_CMD_ID_GET_RECORD_CFG, BC_CMD_ID_GET_ABILITY_SUPPORT, BC_CMD_ID_GET_FTP_TASK, BC_CMD_ID_GET_VERSION_INFO, BC_CMD_ID_GET_RECORD, BC_CMD_ID_GET_HDD_INFO_LIST, BC_CMD_ID_GET_WIFI_SIGNAL, BC_CMD_ID_GET_WIFI, BC_CMD_ID_GET_ONLINE_USER_LIST, BC_CMD_ID_GET_DAY_RECORDS, BC_CMD_ID_GET_STREAM_INFO_LIST, BC_CMD_ID_GET_LED_STATE, BC_CMD_ID_GET_EMAIL_TASK, BC_CMD_ID_GET_AUDIO_TASK, BC_CMD_ID_GET_AUDIO_CFG, BC_CMD_ID_GET_DAY_NIGHT_THRESHOLD, BC_CMD_ID_GET_TIMELAPSE_CFG, BC_CMD_ID_GET_AI_DENOISE, BC_CMD_ID_GET_KIT_AP_CFG, BC_CMD_ID_GET_REC_ENC_CFG, BC_CMD_ID_GET_ACCESS_USER_LIST, BC_CMD_ID_GET_SLEEP_STATE, BC_CMD_ID_GET_VIDEO_INPUT, BC_CMD_ID_GET_SYSTEM_GENERAL, BC_CMD_ID_GET_SUPPORT, BC_CMD_ID_GET_AI_CFG, BC_CMD_ID_SET_AI_CFG, BC_CMD_ID_GET_SIREN_STATUS, BC_CMD_ID_SET_AUDIO_TASK, BC_CMD_ID_SET_VIDEO_INPUT, BC_CMD_ID_SET_DAY_NIGHT_THRESHOLD, BC_CMD_ID_GET_ENC, BC_CMD_ID_SET_ENC, BC_CMD_ID_GET_PRIVACY_MASK, BC_CMD_ID_SET_PRIVACY_MASK, BC_CMD_ID_SET_AI_DENOISE, BC_CMD_ID_SET_LED_STATE, BC_CMD_ID_SET_AUDIO_CFG, BC_CMD_ID_SET_RECORD, BC_CMD_ID_SET_RECORD_CFG, BC_CMD_ID_SET_EMAIL_TASK, BC_CMD_ID_GET_PUSH_TASK, BC_CMD_ID_SET_PUSH_TASK, BC_CMD_ID_GET_AUTO_FOCUS, BC_CMD_ID_SET_AUTO_FOCUS, BC_CMD_ID_GET_EMAIL, BC_CMD_ID_SET_EMAIL, BC_CMD_ID_TEST_EMAIL, BC_CMD_ID_GET_NTP, BC_CMD_ID_SET_NTP, BC_CMD_ID_SET_SYSTEM_GENERAL, BC_CMD_ID_GET_DST, BC_CMD_ID_SET_DST, BC_CMD_ID_GET_AUTO_REBOOT, BC_CMD_ID_SET_AUTO_REBOOT, BC_CMD_ID_CMD_123, BC_CMD_ID_CMD_209, BC_CMD_ID_CMD_265, BC_CMD_ID_CMD_440, BC_CMD_ID_PUSH_VIDEO_INPUT, BC_CMD_ID_PUSH_SERIAL, BC_CMD_ID_PUSH_NET_INFO, BC_CMD_ID_PUSH_DINGDONG_LIST, BC_CMD_ID_PUSH_SLEEP_STATUS, BC_CMD_ID_PUSH_COORDINATE_POINT_LIST, BC_CMD_ID_DING_DONG_CTRL, BC_CMD_ID_GET_DING_DONG_LIST, BC_CMD_ID_DING_DONG_OPT, BC_CMD_ID_GET_DING_DONG_CFG, BC_CMD_ID_SET_DING_DONG_CFG, BC_CMD_ID_QUICK_REPLY_PLAY, BC_CMD_ID_GET_DING_DONG_SILENT, BC_CMD_ID_SET_DING_DONG_SILENT;
+var BC_TCP_DEFAULT_PORT, BC_MAGIC, BC_MAGIC_REV, BC_XML_KEY, BC_AES_IV, BC_CLASS_LEGACY, BC_CLASS_MODERN_20, BC_CLASS_MODERN_24, BC_CLASS_MODERN_24_ALT, BC_CLASS_FILE_DOWNLOAD, BC_CMD_ID_LOGIN, BC_CMD_ID_LOGOUT, BC_CMD_ID_VIDEO, BC_CMD_ID_VIDEO_STOP, BC_CMD_ID_FILE_INFO_LIST_REPLAY, BC_CMD_ID_FILE_INFO_LIST_STOP, BC_CMD_ID_FILE_INFO_LIST_DL_VIDEO, BC_CMD_ID_FILE_INFO_LIST_DOWNLOAD, BC_CMD_ID_FILE_INFO_LIST_OPEN, BC_CMD_ID_FILE_INFO_LIST_GET, BC_CMD_ID_FILE_INFO_LIST_CLOSE, BC_CMD_ID_FIND_REC_VIDEO_OPEN, BC_CMD_ID_FIND_REC_VIDEO_GET, BC_CMD_ID_FIND_REC_VIDEO_CLOSE, BC_CMD_ID_COVER_PREVIEW, BC_CMD_ID_COVER_STANDALONE_458, BC_CMD_ID_COVER_STANDALONE_459, BC_CMD_ID_COVER_STANDALONE_460, BC_CMD_ID_COVER_STANDALONE_461, BC_CMD_ID_COVER_STANDALONE_462, BC_CMD_ID_COVER_RESPONSE, BC_CMD_ID_TALK_ABILITY, BC_CMD_ID_TALK_RESET, BC_CMD_ID_TALK_CONFIG, BC_CMD_ID_TALK, BC_CMD_ID_PTZ_CONTROL, BC_CMD_ID_PTZ_CONTROL_PRESET, BC_CMD_ID_GET_PTZ_PRESET, BC_CMD_ID_GET_PTZ_POSITION, BC_CMD_ID_GET_ZOOM_FOCUS, BC_CMD_ID_SET_ZOOM_FOCUS, BC_CMD_ID_GET_BATTERY_INFO_LIST, BC_CMD_ID_GET_BATTERY_INFO, BC_CMD_ID_UDP_KEEP_ALIVE, BC_CMD_ID_GET_PIR_INFO, BC_CMD_ID_SET_PIR_INFO, BC_CMD_ID_GET_MOTION_ALARM, BC_CMD_ID_SET_MOTION_ALARM, BC_CMD_ID_ALARM_EVENT_LIST, BC_CMD_ID_GET_AI_ALARM, BC_CMD_ID_SET_AI_ALARM, BC_CMD_ID_GET_AUDIO_ALARM, BC_CMD_ID_AUDIO_ALARM_PLAY, BC_CMD_ID_GET_WHITE_LED, BC_CMD_ID_SET_WHITE_LED_STATE, BC_CMD_ID_SET_WHITE_LED_TASK, BC_CMD_ID_FLOODLIGHT_STATUS_LIST, BC_CMD_ID_ABILITY_INFO, BC_CMD_ID_SUPPORT, BC_CMD_ID_PING, BC_CMD_ID_DEVICE_DETECT_CANDIDATES, BC_CMD_ID_DEVICE_DETECT, BC_CMD_ID_GET_SNAPSHOT, BC_CMD_ID_GET_UID, BC_CMD_ID_CHANNEL_INFO_ALL, BC_CMD_ID_GET_OSD_DATETIME, BC_CMD_ID_SET_OSD_DATETIME, BC_CMD_ID_GET_RECORD_CFG, BC_CMD_ID_GET_ABILITY_SUPPORT, BC_CMD_ID_GET_FTP_TASK, BC_CMD_ID_GET_VERSION_INFO, BC_CMD_ID_GET_RECORD, BC_CMD_ID_GET_HDD_INFO_LIST, BC_CMD_ID_GET_WIFI_SIGNAL, BC_CMD_ID_GET_WIFI, BC_CMD_ID_GET_ONLINE_USER_LIST, BC_CMD_ID_GET_DAY_RECORDS, BC_CMD_ID_GET_STREAM_INFO_LIST, BC_CMD_ID_GET_LED_STATE, BC_CMD_ID_GET_EMAIL_TASK, BC_CMD_ID_GET_AUDIO_TASK, BC_CMD_ID_GET_AUDIO_CFG, BC_CMD_ID_GET_DAY_NIGHT_THRESHOLD, BC_CMD_ID_GET_TIMELAPSE_CFG, BC_CMD_ID_GET_AI_DENOISE, BC_CMD_ID_GET_KIT_AP_CFG, BC_CMD_ID_GET_REC_ENC_CFG, BC_CMD_ID_GET_ACCESS_USER_LIST, BC_CMD_ID_GET_SLEEP_STATE, BC_CMD_ID_GET_VIDEO_INPUT, BC_CMD_ID_GET_SYSTEM_GENERAL, BC_CMD_ID_GET_SUPPORT, BC_CMD_ID_GET_AI_CFG, BC_CMD_ID_SET_AI_CFG, BC_CMD_ID_GET_SIREN_STATUS, BC_CMD_ID_SET_AUDIO_TASK, BC_CMD_ID_SET_VIDEO_INPUT, BC_CMD_ID_SET_DAY_NIGHT_THRESHOLD, BC_CMD_ID_GET_ENC, BC_CMD_ID_SET_ENC, BC_CMD_ID_GET_PRIVACY_MASK, BC_CMD_ID_SET_PRIVACY_MASK, BC_CMD_ID_SET_AI_DENOISE, BC_CMD_ID_SET_LED_STATE, BC_CMD_ID_SET_AUDIO_CFG, BC_CMD_ID_SET_RECORD, BC_CMD_ID_SET_RECORD_CFG, BC_CMD_ID_SET_EMAIL_TASK, BC_CMD_ID_GET_PUSH_TASK, BC_CMD_ID_SET_PUSH_TASK, BC_CMD_ID_GET_AUTO_FOCUS, BC_CMD_ID_SET_AUTO_FOCUS, BC_CMD_ID_GET_EMAIL, BC_CMD_ID_SET_EMAIL, BC_CMD_ID_TEST_EMAIL, BC_CMD_ID_GET_NTP, BC_CMD_ID_SET_NTP, BC_CMD_ID_SET_SYSTEM_GENERAL, BC_CMD_ID_GET_DST, BC_CMD_ID_SET_DST, BC_CMD_ID_GET_AUTO_REBOOT, BC_CMD_ID_SET_AUTO_REBOOT, BC_CMD_ID_CMD_123, BC_CMD_ID_CMD_209, BC_CMD_ID_CMD_265, BC_CMD_ID_CMD_440, BC_CMD_ID_PUSH_VIDEO_INPUT, BC_CMD_ID_PUSH_SERIAL, BC_CMD_ID_PUSH_NET_INFO, BC_CMD_ID_PUSH_DINGDONG_LIST, BC_CMD_ID_PUSH_SLEEP_STATUS, BC_CMD_ID_PUSH_COORDINATE_POINT_LIST, BC_CMD_ID_DING_DONG_CTRL, BC_CMD_ID_GET_DING_DONG_LIST, BC_CMD_ID_DING_DONG_OPT, BC_CMD_ID_GET_DING_DONG_CFG, BC_CMD_ID_SET_DING_DONG_CFG, BC_CMD_ID_QUICK_REPLY_PLAY, BC_CMD_ID_GET_DING_DONG_SILENT, BC_CMD_ID_SET_DING_DONG_SILENT;
 var init_constants = __esm({
   "src/protocol/constants.ts"() {
     "use strict";
@@ -107,6 +107,8 @@ var init_constants = __esm({
     BC_CMD_ID_ABILITY_INFO = 151;
     BC_CMD_ID_SUPPORT = 199;
     BC_CMD_ID_PING = 93;
+    BC_CMD_ID_DEVICE_DETECT_CANDIDATES = [31, 132, 150];
+    BC_CMD_ID_DEVICE_DETECT = null;
     BC_CMD_ID_GET_SNAPSHOT = 109;
     BC_CMD_ID_GET_UID = 114;
     BC_CMD_ID_CHANNEL_INFO_ALL = 145;
@@ -8256,6 +8258,8 @@ __export(index_exports, {
   BC_CMD_ID_COVER_STANDALONE_460: () => BC_CMD_ID_COVER_STANDALONE_460,
   BC_CMD_ID_COVER_STANDALONE_461: () => BC_CMD_ID_COVER_STANDALONE_461,
   BC_CMD_ID_COVER_STANDALONE_462: () => BC_CMD_ID_COVER_STANDALONE_462,
+  BC_CMD_ID_DEVICE_DETECT: () => BC_CMD_ID_DEVICE_DETECT,
+  BC_CMD_ID_DEVICE_DETECT_CANDIDATES: () => BC_CMD_ID_DEVICE_DETECT_CANDIDATES,
   BC_CMD_ID_DING_DONG_CTRL: () => BC_CMD_ID_DING_DONG_CTRL,
   BC_CMD_ID_DING_DONG_OPT: () => BC_CMD_ID_DING_DONG_OPT,
   BC_CMD_ID_FILE_INFO_LIST_CLOSE: () => BC_CMD_ID_FILE_INFO_LIST_CLOSE,
@@ -9017,6 +9021,143 @@ function parseD2cHb(xml) {
   return { cid: Number(cid), did: Number(did) };
 }
 
+// src/cloud/server-binding.ts
+var REOLINK_API_V2_BASE = "https://apis.reolink.com/v2";
+var POSITIVE_TTL_MS = 24 * 60 * 60 * 1e3;
+var NEGATIVE_TTL_MS = 30 * 1e3;
+var cache = /* @__PURE__ */ new Map();
+function readCache(uid, now) {
+  const e = cache.get(uid);
+  if (!e) return void 0;
+  if (now >= e.expires) {
+    cache.delete(uid);
+    return void 0;
+  }
+  return e;
+}
+async function getServerBinding(uid, options = {}) {
+  if (!uid || typeof uid !== "string") return void 0;
+  const now = Date.now();
+  const cached = readCache(uid, now);
+  if (cached?.kind === "ok") return cached.response;
+  if (cached?.kind === "err") return void 0;
+  const language = options.language ?? "en";
+  const baseUrl = options.baseUrl ?? REOLINK_API_V2_BASE;
+  const timeoutMs = options.timeoutMs ?? 4e3;
+  const fetchImpl = options.fetchImpl ?? globalThis.fetch;
+  const logger = options.logger;
+  if (typeof fetchImpl !== "function") {
+    logger?.debug?.(
+      `[server-binding] global fetch unavailable; skipping cloud lookup`
+    );
+    cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
+    return void 0;
+  }
+  const url = `${baseUrl}/devices/${encodeURIComponent(uid)}/server-binding?language=${encodeURIComponent(language)}`;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const res = await fetchImpl(url, {
+      method: "GET",
+      signal: controller.signal,
+      headers: { Accept: "application/json" }
+    });
+    if (!res.ok) {
+      logger?.debug?.(
+        `[server-binding] ${uid}: HTTP ${res.status} ${res.statusText}`
+      );
+      cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
+      return void 0;
+    }
+    const json = await res.json();
+    const parsed = parseServerBindingResponse(json);
+    if (!parsed) {
+      logger?.debug?.(
+        `[server-binding] ${uid}: response shape did not match expectations`
+      );
+      cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
+      return void 0;
+    }
+    cache.set(uid, {
+      kind: "ok",
+      response: parsed,
+      expires: now + POSITIVE_TTL_MS
+    });
+    const pick = parsed.availableZones.find(
+      (z) => z.status === "active" && z.services.p2p?.server
+    );
+    const hint = pick?.services.p2p?.server ?? parsed.availableZones[0]?.services.p2p?.server;
+    logger?.log?.(
+      `[server-binding] ${uid}: ${parsed.availableZones.length} zone(s)${hint ? `, p2p hint=${hint}` : ""}`
+    );
+    return parsed;
+  } catch (e) {
+    logger?.debug?.(
+      `[server-binding] ${uid}: ${e?.message ?? String(e)}`
+    );
+    cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
+    return void 0;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function pickP2pHostFromBinding(response) {
+  if (!response) return void 0;
+  const zones = response.availableZones;
+  if (!zones || zones.length === 0) return void 0;
+  const active = zones.find(
+    (z) => z.status === "active" && z.services.p2p?.server
+  );
+  if (active?.services.p2p?.server) return active.services.p2p.server;
+  const def = zones.find(
+    (z) => z.status === "default" && z.services.p2p?.server
+  );
+  if (def?.services.p2p?.server) return def.services.p2p.server;
+  const any = zones.find((z) => z.services.p2p?.server);
+  return any?.services.p2p?.server;
+}
+function isString(v) {
+  return typeof v === "string";
+}
+function parseServerBindingResponse(raw) {
+  if (!raw || typeof raw !== "object") return void 0;
+  const rawZones = raw.availableZones;
+  if (!Array.isArray(rawZones)) return void 0;
+  const zones = [];
+  for (const r of rawZones) {
+    if (!r || typeof r !== "object") continue;
+    const rec = r;
+    const id = rec.id;
+    const name = rec.name;
+    const status = rec.status;
+    if (!isString(id) || !isString(name) || !isString(status)) continue;
+    const servicesRaw = rec.services;
+    const services = {};
+    if (servicesRaw && typeof servicesRaw === "object") {
+      const s = servicesRaw;
+      for (const key of ["p2p", "cloud", "roms_ota", "alarm_push"]) {
+        const v = s[key];
+        if (v && typeof v === "object") {
+          const server = v.server;
+          if (isString(server) && server.length > 0) {
+            services[key] = { server };
+          }
+        }
+      }
+    }
+    const locationsRaw = rec.locations;
+    const locations = Array.isArray(locationsRaw) && locationsRaw.every(isString) ? locationsRaw : void 0;
+    zones.push({
+      id,
+      name,
+      status,
+      services,
+      ...locations ? { locations } : {}
+    });
+  }
+  return { availableZones: zones };
+}
+
 // src/bcudp/BcUdpStream.ts
 var AckLatency = class {
   currentValues = [];
@@ -9098,6 +9239,16 @@ var P2P_MAX_WAIT_MS = 15e3;
 var P2P_RESEND_WAIT_MS = 500;
 var BcUdpStream = class extends import_node_events.EventEmitter {
   opts;
+  /**
+   * Optional info-level logger for diagnostic milestones — set via
+   * {@link BcUdpStream.setLogger} by `BaichuanClient` so the lib's
+   * standard logger sink sees BCUDP / P2P progress (DNS resolutions,
+   * outgoing UDP probes, timeouts with elapsed times) without the user
+   * having to opt into the per-packet `debug` event firehose. Kept
+   * separate from `emit('debug', ...)` because that channel is intended
+   * for the per-packet debug trace and is gated by debugOptions.
+   */
+  discoveryLogger;
   sock;
   remote;
   mtu;
@@ -9141,6 +9292,17 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
     this.mtu = BCUDP_DEFAULT_MTU;
   }
   /** True if the underlying UDP socket is open and the remote peer is known. */
+  /**
+   * Attach an info-level logger for high-signal diagnostic milestones
+   * (DNS resolution, outgoing UDP probe sends, P2P UID lookup wins/losses,
+   * BCUDP local discovery timeouts). The lib's `BaichuanClient` calls
+   * this immediately after constructing the stream so consumers get
+   * actionable progress logs without enabling the per-packet debug trace.
+   * Safe to call repeatedly; only the most recent logger is used.
+   */
+  setLogger(logger) {
+    this.discoveryLogger = logger;
+  }
   isConnected() {
     return !!this.sock && !!this.remote && this.cameraId != null;
   }
@@ -9258,20 +9420,60 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
     this.remote = { host: connected.rhost, port: connected.rport };
   }
   async p2pUidLookup(sock, uid) {
+    const log = (msg) => this.discoveryLogger?.log?.(`[P2P] ${msg}`);
+    const shortUid = uid.length > 7 ? `${uid.slice(0, 5)}\u2026${uid.slice(-2)}` : uid;
+    const t0 = Date.now();
+    const hostnamesToTry = [];
+    const binding = await getServerBinding(uid, {
+      ...this.discoveryLogger ? { logger: this.discoveryLogger } : {}
+    }).catch(() => void 0);
+    const hintedHost = pickP2pHostFromBinding(binding);
+    if (hintedHost) {
+      hostnamesToTry.push(hintedHost);
+      log(
+        `UID=${shortUid} cloud server-binding \u2192 hint=${hintedHost} (will try first)`
+      );
+    } else {
+      log(
+        `UID=${shortUid} cloud server-binding \u2192 no hint (apis.reolink.com unreachable / no zone match) \u2192 sweeping ${P2P_RELAY_HOSTNAMES.length} fallback hostnames`
+      );
+    }
+    for (const host of P2P_RELAY_HOSTNAMES) {
+      if (!hostnamesToTry.includes(host)) hostnamesToTry.push(host);
+    }
     const resolved = [];
     const sinkholed = [];
-    for (const host of P2P_RELAY_HOSTNAMES) {
+    for (const host of hostnamesToTry) {
       try {
         const answers = await import_promises.default.lookup(host, { family: 4, all: true });
+        let publicCount = 0;
+        let sinkCount = 0;
         for (const a of answers) {
           if (!a.address) continue;
           if (isUnroutableForP2P(a.address)) {
             sinkholed.push({ host, ip: a.address });
+            sinkCount++;
             continue;
           }
-          if (!resolved.includes(a.address)) resolved.push(a.address);
+          if (!resolved.includes(a.address)) {
+            resolved.push(a.address);
+            publicCount++;
+          }
         }
-      } catch {
+        if (sinkCount > 0 && publicCount === 0) {
+          log(
+            `DNS ${host} \u2192 sinkhole (${sinkholed[sinkholed.length - 1]?.ip}) \u2014 DNS filter / /etc/hosts override`
+          );
+        } else if (publicCount > 0) {
+          if (host === hintedHost) {
+            log(`DNS ${host} \u2192 ${answers.find((a) => !isUnroutableForP2P(a.address))?.address} \u2713`);
+          }
+        }
+      } catch (e) {
+        log(`DNS ${host} \u2192 ENOTFOUND/timeout (${e?.code ?? "?"})`);
+      }
+      if (hintedHost && host === hintedHost && resolved.length > 0 && sinkholed.length === 0) {
+        break;
       }
     }
     if (resolved.length === 0) {
@@ -9285,11 +9487,22 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
         "P2P UID lookup failed: no p2p.reolink.com addresses resolved (DNS failure)"
       );
     }
+    log(
+      `Resolved ${resolved.length} P2P relay IP(s) (${resolved.slice(0, 3).join(", ")}${resolved.length > 3 ? "\u2026" : ""}). Sending C2M_Q probes (3s budget each, ${P2P_MAX_WAIT_MS}ms total)`
+    );
     const start = Date.now();
     let lastErr;
+    let attemptsMade = 0;
     for (const ip of resolved) {
       const remaining = P2P_MAX_WAIT_MS - (Date.now() - start);
-      if (remaining <= 0) break;
+      if (remaining <= 0) {
+        log(
+          `Aborting after ${attemptsMade} attempt(s) \u2014 total budget ${P2P_MAX_WAIT_MS}ms exhausted`
+        );
+        break;
+      }
+      attemptsMade++;
+      const probeStart = Date.now();
       try {
         const res = await this.p2pUidLookupOne(
           sock,
@@ -9297,11 +9510,20 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
           { host: ip, port: P2P_LOOKUP_PORT },
           Math.min(remaining, 3e3)
         );
+        log(
+          `${ip}:${P2P_LOOKUP_PORT} replied in ${Date.now() - probeStart}ms \u2713 (total ${Date.now() - t0}ms)`
+        );
         return res;
       } catch (e) {
+        const ms = Date.now() - probeStart;
+        const msg = e?.message ?? String(e);
+        log(`${ip}:${P2P_LOOKUP_PORT} no reply after ${ms}ms (${msg})`);
         lastErr = e instanceof Error ? e : new Error(String(e));
       }
     }
+    log(
+      `Exhausted all ${attemptsMade} relay candidate(s) after ${Date.now() - t0}ms \u2014 UID lookup failed`
+    );
     throw lastErr ?? new Error("P2P UID lookup failed");
   }
   async p2pUidLookupOne(sock, uid, dest, timeoutMs) {
@@ -9640,13 +9862,23 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
     const directHost = (this.opts.directHost ?? "").trim();
     const localMode = opts?.localMode ?? "local-broadcast";
     const directFirstWindowMs = localMode === "local-direct" && directHost ? 3e3 : 0;
-    const discoveryTimeout = 3e4;
+    const discoveryTimeout = typeof this.opts.localDiscoveryTimeoutMs === "number" && this.opts.localDiscoveryTimeoutMs > 0 ? this.opts.localDiscoveryTimeoutMs : 15e3;
     const retryInterval = 500;
     const startMs = Date.now();
     sock.setBroadcast(true);
     const addr = sock.address();
     const localPort = typeof addr === "string" ? 0 : addr.port;
     const cid = Math.floor(Math.random() * 2147483647) | 0 || 82e3;
+    const log = (msg) => this.discoveryLogger?.log?.(`[BCUDP] ${msg}`);
+    const shortUid = this.opts.uid.length > 7 ? `${this.opts.uid.slice(0, 5)}\u2026${this.opts.uid.slice(-2)}` : this.opts.uid;
+    log(
+      `local discovery: mode=${localMode} uid=${shortUid} ports=[${ports.join(", ")}] broadcasts=[${broadcastHosts.join(", ")}]${directHost ? ` direct=${directHost}` : ""} localBindPort=${localPort} timeout=${discoveryTimeout}ms`
+    );
+    let bytesSent = 0;
+    let pktsRecv = 0;
+    sock.on("message", () => {
+      pktsRecv++;
+    });
     const xml = buildC2dC({
       uid: this.opts.uid,
       clientPort: localPort,
@@ -9657,6 +9889,9 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
       const timeout = setTimeout(() => {
         if (retryTimer) clearInterval(retryTimer);
         sock.off("message", onMsg);
+        log(
+          `local discovery timeout after ${discoveryTimeout}ms \u2014 sent=${bytesSent}B replies=${pktsRecv} (camera likely sleeping / off-LAN / firewall dropping replies)`
+        );
         reject(
           new Error(
             `BCUDP discovery timeout after ${discoveryTimeout}ms (camera may be sleeping or unreachable)`
@@ -9850,6 +10085,7 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
           for (const port of ports) {
             try {
               sock.send(packet, port, host);
+              bytesSent += packet.length;
               retryCount++;
               this.emit("debug", "discovery_send", { retryCount, host, port });
             } catch {
@@ -11389,6 +11625,7 @@ var BaichuanClient = class _BaichuanClient extends import_node_events2.EventEmit
     sock.on("debug", (event, data) => {
       this.logDebug(`udp_${event}`, data);
     });
+    sock.setLogger(this.logger);
     await sock.connect();
     const shortUid = this.opts.uid ? this.opts.uid.substring(0, 5) : "";
     const udpDiscoveryMethod = this.opts.udpDiscoveryMethod ?? "local-direct";
@@ -34928,10 +35165,18 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
     }
   }
   async startFfmpegCompositionFromRtspUrls(mainWidth, mainHeight, pipWidth, pipHeight, position, widerRtspUrl, teleRtspUrl, rtspTransport) {
+    const videoEncoder = this.options.videoEncoder ?? "libx264";
+    const isX264 = videoEncoder === "libx264";
+    const encoderPreset = this.options.encoderPreset ?? "ultrafast";
+    const crf = this.options.crf ?? 23;
+    const gopSeconds = this.options.gopSeconds ?? 1;
+    const assumedFps = 30;
+    const gopFrames = Math.max(1, Math.round(gopSeconds * assumedFps));
     const ffmpegArgs = [
       "-hide_banner",
       "-loglevel",
       "error",
+      ...this.options.extraGlobalArgs ?? [],
       "-fflags",
       "+genpts",
       // Input 0: wider
@@ -34952,27 +35197,33 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       // Output: always H.264 Annex-B
       "-an",
       "-c:v",
-      "libx264",
+      videoEncoder,
       "-g",
-      "30",
+      String(gopFrames),
       "-keyint_min",
-      "30",
+      String(gopFrames),
       "-sc_threshold",
       "0",
-      "-x264-params",
-      "aud=1:repeat-headers=1:keyint=30:min-keyint=30:scenecut=0",
-      "-preset",
-      "ultrafast",
-      "-tune",
-      "zerolatency",
-      "-crf",
-      "23",
+      ...isX264 ? [
+        "-x264-params",
+        `aud=1:repeat-headers=1:keyint=${gopFrames}:min-keyint=${gopFrames}:scenecut=0`,
+        "-preset",
+        encoderPreset,
+        "-tune",
+        "zerolatency",
+        "-crf",
+        String(crf)
+      ] : [],
+      ...this.options.extraOutputArgs ?? [],
       "-f",
       "h264",
       "pipe:1"
     ];
-    this.logger.log?.(`[CompositeStream] Starting ffmpeg (rtsp inputs): ${ffmpegArgs.join(" ")}`);
-    this.ffmpegProcess = (0, import_node_child_process7.spawn)("ffmpeg", ffmpegArgs, {
+    const ffmpegBin = this.options.ffmpegPath ?? "ffmpeg";
+    this.logger.log?.(
+      `[CompositeStream] Starting ffmpeg (rtsp inputs): bin=${ffmpegBin} args=${ffmpegArgs.join(" ")}`
+    );
+    this.ffmpegProcess = (0, import_node_child_process7.spawn)(ffmpegBin, ffmpegArgs, {
       stdio: ["ignore", "pipe", "pipe"]
     });
     this.ffmpegProcess.on("error", (error) => {
@@ -35039,10 +35290,18 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       "-i",
       "pipe:3"
     ];
+    const videoEncoder = this.options.videoEncoder ?? "libx264";
+    const isX264 = videoEncoder === "libx264";
+    const encoderPreset = this.options.encoderPreset ?? "ultrafast";
+    const crf = this.options.crf ?? 23;
+    const gopSeconds = this.options.gopSeconds ?? 1;
+    const assumedFps = 30;
+    const gopFrames = Math.max(1, Math.round(gopSeconds * assumedFps));
     const ffmpegArgs = [
       "-hide_banner",
       "-loglevel",
       "error",
+      ...this.options.extraGlobalArgs ?? [],
       "-fflags",
       "+genpts",
       "-probesize",
@@ -35061,33 +35320,40 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       "-map",
       "[out]",
       "-c:v",
-      "libx264",
-      // Re-encode for compatibility
-      // Make the stream easy to join mid-flight: frequent IDRs + in-band headers + AUD.
-      // Without this, a new client may wait many seconds for the next keyframe.
+      videoEncoder,
+      // Make the stream easy to join mid-flight: frequent IDRs + in-band
+      // headers + AUD. Without this, a new client may wait many seconds
+      // for the next keyframe.
       "-g",
-      "30",
+      String(gopFrames),
       "-keyint_min",
-      "30",
+      String(gopFrames),
       "-sc_threshold",
       "0",
-      "-x264-params",
-      "aud=1:repeat-headers=1:keyint=30:min-keyint=30:scenecut=0",
-      "-preset",
-      "ultrafast",
-      "-tune",
-      "zerolatency",
-      "-crf",
-      "23",
+      // libx264-specific knobs. We deliberately skip these for HW encoders
+      // — each one has its own option vocabulary (`-q:v`, `-rc`, etc.)
+      // and the user is expected to express them via extraOutputArgs.
+      ...isX264 ? [
+        "-x264-params",
+        `aud=1:repeat-headers=1:keyint=${gopFrames}:min-keyint=${gopFrames}:scenecut=0`,
+        "-preset",
+        encoderPreset,
+        "-tune",
+        "zerolatency",
+        "-crf",
+        String(crf)
+      ] : [],
+      ...this.options.extraOutputArgs ?? [],
       "-f",
       "h264",
       "pipe:1"
       // Output (stdout)
     ];
+    const ffmpegBin = this.options.ffmpegPath ?? "ffmpeg";
     this.logger.log?.(
-      `[CompositeStream] Starting ffmpeg: ${ffmpegArgs.join(" ")}`
+      `[CompositeStream] Starting ffmpeg: bin=${ffmpegBin} args=${ffmpegArgs.join(" ")}`
     );
-    this.ffmpegProcess = (0, import_node_child_process7.spawn)("ffmpeg", ffmpegArgs, {
+    this.ffmpegProcess = (0, import_node_child_process7.spawn)(ffmpegBin, ffmpegArgs, {
       stdio: ["pipe", "pipe", "pipe", "pipe"]
     });
     this.ffmpegProcess.on("error", (error) => {
@@ -35795,6 +36061,20 @@ async function createRfc4571TcpServerInternal(options) {
       ...forceH264 !== void 0 ? { forceH264 } : defaultForceH264 ? { forceH264: true } : {},
       ...compositeOptions?.assumeH264Inputs !== void 0 ? { assumeH264Inputs: compositeOptions.assumeH264Inputs } : {},
       ...compositeOptions?.disableTranscode !== void 0 ? { disableTranscode: compositeOptions.disableTranscode } : {},
+      // Propagate ffmpeg binary path — required when the embedder strips
+      // PATH (Scrypted on Windows, Electron sandboxes, distroless Docker)
+      // and the bundled ffmpeg is at a fixed absolute path only the
+      // embedder knows.
+      ...compositeOptions?.ffmpegPath ? { ffmpegPath: compositeOptions.ffmpegPath } : {},
+      // Encoder tuning knobs — see CompositeStreamPipOptions for the
+      // semantic contract on each one. Plumbed verbatim so the
+      // CompositeStream layer can apply defaults.
+      ...compositeOptions?.videoEncoder ? { videoEncoder: compositeOptions.videoEncoder } : {},
+      ...compositeOptions?.encoderPreset ? { encoderPreset: compositeOptions.encoderPreset } : {},
+      ...typeof compositeOptions?.crf === "number" ? { crf: compositeOptions.crf } : {},
+      ...typeof compositeOptions?.gopSeconds === "number" ? { gopSeconds: compositeOptions.gopSeconds } : {},
+      ...compositeOptions?.extraGlobalArgs ? { extraGlobalArgs: compositeOptions.extraGlobalArgs } : {},
+      ...compositeOptions?.extraOutputArgs ? { extraOutputArgs: compositeOptions.extraOutputArgs } : {},
       logger
     });
     isCompositeStream = true;
@@ -40496,7 +40776,11 @@ async function discoverUidForHost(host, logger) {
 function isTcpFailureThatShouldFallbackToUdp(e) {
   const message = e?.message || e?.toString?.() || "";
   if (typeof message !== "string") return false;
-  return message.includes("ECONNREFUSED") || message.includes("ETIMEDOUT") || message.includes("EHOSTUNREACH") || message.includes("ENETUNREACH") || message.includes("socket hang up") || message.includes("TCP connection timeout") || message.includes("Baichuan socket closed") || message.includes("timeout waiting for nonce") || message.includes("expected encryption info") || message.includes("ECONNRESET") || message.includes("EPIPE");
+  return message.includes("ECONNREFUSED") || message.includes("ETIMEDOUT") || message.includes("EHOSTDOWN") || message.includes("EHOSTUNREACH") || message.includes("ENETUNREACH") || message.includes("ENETDOWN") || message.includes("socket hang up") || message.includes("TCP connection timeout") || // Autodetect's own hard deadline on the TCP login attempt — see
+  // `withTcpDeadline` in `autoDetectDeviceType`. Without this entry the
+  // catch block would rethrow the deadline error instead of awaiting
+  // the speculative UDP race.
+  message.includes("TCP login deadline exceeded") || message.includes("Baichuan socket closed") || message.includes("timeout waiting for nonce") || message.includes("expected encryption info") || message.includes("ECONNRESET") || message.includes("EPIPE");
 }
 async function pingHost(host, timeoutMs = 3e3) {
   if (!host || typeof host !== "string") return false;
@@ -40644,6 +40928,7 @@ function attachErrorHandler(api, transport, inputs) {
 }
 async function autoDetectDeviceType(inputs) {
   const { host, uid, logger } = inputs;
+  const autodetectStartedAt = Date.now();
   const mode = inputs.mode ?? "auto";
   const maxRetriesRaw = inputs.maxRetries;
   const maxRetries = Math.max(
@@ -40660,9 +40945,31 @@ async function autoDetectDeviceType(inputs) {
   const sleepMs3 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
   const shouldRetryTcp = (e) => {
     const msg = fmtErr(e);
-    if (msg.includes("ECONNREFUSED")) return false;
+    if (msg.includes("ECONNREFUSED") || msg.includes("EHOSTDOWN") || msg.includes("EHOSTUNREACH") || msg.includes("ENETUNREACH") || msg.includes("ENETDOWN")) {
+      return false;
+    }
     return isTcpFailureThatShouldFallbackToUdp(e) || msg.includes("timeout waiting for nonce") || msg.includes("expected encryption info") || msg.includes("Baichuan socket closed") || msg.includes("ECONNRESET") || msg.includes("EPIPE");
   };
+  const tcpDeadlineMs = typeof inputs.tcpConnectTimeoutMs === "number" && Number.isFinite(inputs.tcpConnectTimeoutMs) && inputs.tcpConnectTimeoutMs > 0 ? inputs.tcpConnectTimeoutMs : 8e3;
+  const withTcpDeadline = async (op) => {
+    let timer;
+    const deadline = new Promise((_, reject) => {
+      timer = setTimeout(
+        () => reject(
+          new Error(
+            `TCP login deadline exceeded (${tcpDeadlineMs}ms) \u2014 host unreachable`
+          )
+        ),
+        tcpDeadlineMs
+      );
+      timer.unref?.();
+    });
+    try {
+      return await Promise.race([op, deadline]);
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
+  };
   const shouldRetryUdp = (e) => {
     const msg = fmtErr(e);
     return msg.includes("Not running") || msg.includes("Baichuan UDP stream closed") || msg.includes("Baichuan socket closed") || msg.includes("ETIMEDOUT") || msg.toLowerCase().includes("timeout");
@@ -40815,6 +41122,127 @@ async function autoDetectDeviceType(inputs) {
       "Forced UDP autodetect failed for all methods."
     );
   }
+  const detectOverUdpApi = async (udpApi, udpDiscoveryMethod, resolvedUid) => {
+    const [deviceInfo, capabilities, hostNetworkInfo] = await Promise.all([
+      udpApi.getInfo(),
+      udpApi.getDeviceCapabilities(),
+      udpApi.getNetworkInfo(void 0, { timeoutMs: 1200 }).catch(() => void 0)
+    ]);
+    const channelNum = capabilities?.support?.channelNum ?? 1;
+    const model = deviceInfo.type?.trim();
+    const normalizedModel = model ? model.trim() : void 0;
+    const isMultifocalByModel = normalizedModel ? isDualLenseModel(normalizedModel) : false;
+    const channelNumValue = typeof channelNum === "string" ? Number.parseInt(channelNum, 10) : channelNum;
+    const hasDualLensChannelCount = (channelNumValue === 2 || channelNumValue === 3) && Number.isFinite(channelNumValue);
+    const isMultifocal = isMultifocalByModel || hasDualLensChannelCount;
+    const hasBattery = capabilities?.capabilities?.hasBattery === true;
+    udpApi.setIdleDisconnect(hasBattery);
+    if (isMultifocal) {
+      const detectionMethod = isMultifocalByModel ? "model match" : "channelNum fallback";
+      logger?.log?.(
+        `[AutoDetect] UDP (${udpDiscoveryMethod}) connection successful. Detected multi-focal device (${detectionMethod}: model=${normalizedModel ?? "unknown"}, channelNum=${channelNum}, hasBattery=${hasBattery}).`
+      );
+      return {
+        type: "multifocal",
+        transport: "udp",
+        uid: resolvedUid,
+        udpDiscoveryMethod,
+        deviceInfo,
+        ...hostNetworkInfo ? { hostNetworkInfo } : {},
+        channelNum,
+        hasBattery,
+        api: udpApi
+      };
+    }
+    const deviceType = hasBattery ? "battery-cam" : "udp-camera";
+    logger?.log?.(
+      `[AutoDetect] UDP (${udpDiscoveryMethod}) connection successful. Detected ${deviceType} (hasBattery=${hasBattery}, model=${normalizedModel ?? "unknown"}).`
+    );
+    return {
+      type: deviceType,
+      transport: "udp",
+      uid: resolvedUid,
+      udpDiscoveryMethod,
+      deviceInfo,
+      ...hostNetworkInfo ? { hostNetworkInfo } : {},
+      channelNum: 1,
+      hasBattery,
+      api: udpApi
+    };
+  };
+  const udpRaceAbort = new AbortController();
+  const speculativeUdpRace = mode === "auto" ? (async () => {
+    const resolvedUid = await speculativeUidPromise;
+    const viableMethods = selectViableUdpMethods(Boolean(resolvedUid));
+    return await runUdpMethodsParallel(
+      viableMethods,
+      async (m, isInnerAborted) => {
+        const isAborted = () => udpRaceAbort.signal.aborted || isInnerAborted();
+        if (isAborted()) {
+          throw new Error(
+            `UDP(${m}) speculative race aborted before start`
+          );
+        }
+        logger?.log?.(
+          `[AutoDetect] (race) Trying UDP discovery method: ${m}...`
+        );
+        const udpApi = await withRetries(
+          `UDP(${m})`,
+          maxRetries,
+          async (attempt) => {
+            const apiInputs = {
+              ...inputs,
+              udpDiscoveryMethod: m
+            };
+            if (resolvedUid) apiInputs.uid = resolvedUid;
+            const api = createBaichuanApi(apiInputs, "udp");
+            try {
+              await api.login();
+              return api;
+            } catch (e) {
+              try {
+                await api.close({
+                  reason: `autodetect:udp_failed:${m}:attempt_${attempt}`
+                });
+              } catch {
+              }
+              throw e;
+            }
+          },
+          shouldRetryUdp,
+          isAborted
+        );
+        if (isAborted()) {
+          try {
+            await udpApi.close({
+              reason: "autodetect:udp_aborted_after_tcp_won"
+            });
+          } catch {
+          }
+          throw new Error(
+            `UDP(${m}) speculative race aborted after login`
+          );
+        }
+        return detectOverUdpApi(udpApi, m, resolvedUid ?? "");
+      },
+      "Speculative UDP race failed for all methods."
+    );
+  })() : void 0;
+  speculativeUdpRace?.then(
+    (udpResult) => {
+      if (udpRaceAbort.signal.aborted && udpResult?.api) {
+        udpResult.api.close({ reason: "autodetect:tcp_won_race" }).catch(() => void 0);
+      }
+    },
+    () => void 0
+  );
+  const _tcpWin = (result) => {
+    udpRaceAbort.abort();
+    logger?.log?.(
+      `[AutoDetect] DONE in ${Date.now() - autodetectStartedAt}ms via TCP \u2014 type=${result.type} model=${result.deviceInfo?.type ?? "?"} channels=${result.channelNum}`
+    );
+    return result;
+  };
   let tcpApi;
   try {
     logger?.log?.(`[AutoDetect] Trying TCP connection to ${host}...`);
@@ -40824,7 +41252,7 @@ async function autoDetectDeviceType(inputs) {
       async (attempt) => {
         const api2 = createBaichuanApi(inputs, "tcp");
         try {
-          await api2.login();
+          await withTcpDeadline(api2.login());
           return api2;
         } catch (e) {
           try {
@@ -40936,7 +41364,7 @@ async function autoDetectDeviceType(inputs) {
       logger?.log?.(
         `[AutoDetect] Detected multi-focal device (${detectionMethod}: model=${normalizedModel ?? "unknown"}, channelNum=${channelNum})`
       );
-      return {
+      return _tcpWin({
         type: "multifocal",
         transport: "tcp",
         uid: effectiveUid || uid || "",
@@ -40944,13 +41372,13 @@ async function autoDetectDeviceType(inputs) {
         // ...(hostNetworkInfo ? { hostNetworkInfo } : {}),
         channelNum: effectiveChannelNum,
         api
-      };
+      });
     }
     if (effectiveChannelNum > 1) {
       logger?.log?.(
         `[AutoDetect] Detected NVR (${effectiveChannelNum} channels)`
       );
-      return {
+      return _tcpWin({
         type: "nvr",
         transport: "tcp",
         uid: effectiveUid || uid || "",
@@ -40958,10 +41386,10 @@ async function autoDetectDeviceType(inputs) {
         // ...(hostNetworkInfo ? { hostNetworkInfo } : {}),
         channelNum: effectiveChannelNum,
         api
-      };
+      });
     }
     logger?.log?.(`[AutoDetect] Detected regular camera (single channel)`);
-    return {
+    return _tcpWin({
       type: "camera",
       transport: "tcp",
       uid: effectiveUid || uid || "",
@@ -40969,7 +41397,7 @@ async function autoDetectDeviceType(inputs) {
       // ...(hostNetworkInfo ? { hostNetworkInfo } : {}),
       channelNum: 1,
       api
-    };
+    });
   } catch (tcpError) {
     if (mode === "tcp") {
       throw tcpError;
@@ -40984,100 +41412,20 @@ async function autoDetectDeviceType(inputs) {
       throw tcpError;
     }
     logger?.log?.(`[AutoDetect] TCP failed, trying UDP...`);
-    let normalizedUid = await speculativeUidPromise;
-    if (!normalizedUid) {
-      logger?.log?.(
-        `[AutoDetect] UID discovery failed; only local-direct can run without a UID. If the camera is sleeping or on a different subnet, supply its UID to enable BCUDP P2P fallback (remote/relay/map) which can wake it via Reolink's servers.`
-      );
-    } else if (effectiveUid === void 0) {
-      logger?.log?.(
-        `[AutoDetect] UID resolved via concurrent broadcast discovery: ${normalizedUid}`
+    if (!speculativeUdpRace) {
+      throw new Error(
+        `AutoDetect internal: speculative UDP race missing in mode=${mode}`
       );
     }
     try {
-      const detectOverUdpApi = async (udpApi, udpDiscoveryMethod) => {
-        const [deviceInfo, capabilities, hostNetworkInfo] = await Promise.all([
-          udpApi.getInfo(),
-          udpApi.getDeviceCapabilities(),
-          udpApi.getNetworkInfo(void 0, { timeoutMs: 1200 }).catch(() => void 0)
-        ]);
-        const channelNum = capabilities?.support?.channelNum ?? 1;
-        const model = deviceInfo.type?.trim();
-        const normalizedModel = model ? model.trim() : void 0;
-        const isMultifocalByModel = normalizedModel ? isDualLenseModel(normalizedModel) : false;
-        const channelNumValue = typeof channelNum === "string" ? Number.parseInt(channelNum, 10) : channelNum;
-        const hasDualLensChannelCount = (channelNumValue === 2 || channelNumValue === 3) && Number.isFinite(channelNumValue);
-        const isMultifocal = isMultifocalByModel || hasDualLensChannelCount;
-        const hasBattery = capabilities?.capabilities?.hasBattery === true;
-        udpApi.setIdleDisconnect(hasBattery);
-        if (isMultifocal) {
-          const detectionMethod = isMultifocalByModel ? "model match" : "channelNum fallback";
-          logger?.log?.(
-            `[AutoDetect] UDP (${udpDiscoveryMethod}) connection successful. Detected multi-focal device (${detectionMethod}: model=${normalizedModel ?? "unknown"}, channelNum=${channelNum}, hasBattery=${hasBattery}).`
-          );
-          return {
-            type: "multifocal",
-            transport: "udp",
-            uid: normalizedUid ?? "",
-            udpDiscoveryMethod,
-            deviceInfo,
-            ...hostNetworkInfo ? { hostNetworkInfo } : {},
-            channelNum,
-            hasBattery,
-            api: udpApi
-          };
-        }
-        const deviceType = hasBattery ? "battery-cam" : "udp-camera";
-        logger?.log?.(
-          `[AutoDetect] UDP (${udpDiscoveryMethod}) connection successful. Detected ${deviceType} (hasBattery=${hasBattery}, model=${normalizedModel ?? "unknown"}).`
-        );
-        return {
-          type: deviceType,
-          transport: "udp",
-          uid: normalizedUid ?? "",
-          udpDiscoveryMethod,
-          deviceInfo,
-          ...hostNetworkInfo ? { hostNetworkInfo } : {},
-          channelNum: 1,
-          hasBattery,
-          api: udpApi
-        };
-      };
-      const viableMethods = selectViableUdpMethods(Boolean(normalizedUid));
-      return await runUdpMethodsParallel(
-        viableMethods,
-        async (m, isAborted) => {
-          logger?.log?.(`[AutoDetect] Trying UDP discovery method: ${m}...`);
-          const udpApi = await withRetries(
-            `UDP(${m})`,
-            maxRetries,
-            async (attempt) => {
-              const apiInputs = { ...inputs, udpDiscoveryMethod: m };
-              if (normalizedUid) apiInputs.uid = normalizedUid;
-              const api = createBaichuanApi(apiInputs, "udp");
-              try {
-                await api.login();
-                return api;
-              } catch (e) {
-                try {
-                  await api.close({
-                    reason: `autodetect:udp_failed:${m}:attempt_${attempt}`
-                  });
-                } catch {
-                }
-                throw e;
-              }
-            },
-            shouldRetryUdp,
-            isAborted
-          );
-          return detectOverUdpApi(udpApi, m);
-        },
-        "UDP discovery failed for all methods."
+      const udpResult = await speculativeUdpRace;
+      logger?.log?.(
+        `[AutoDetect] DONE in ${Date.now() - autodetectStartedAt}ms via UDP \u2014 type=${udpResult.type} method=${udpResult.udpDiscoveryMethod ?? "n/a"} model=${udpResult.deviceInfo?.type ?? "?"} channels=${udpResult.channelNum}`
       );
+      return udpResult;
     } catch (udpError) {
       logger?.log?.(
-        `[AutoDetect] Both TCP and UDP failed. TCP error: ${tcpError}, UDP error: ${udpError}`
+        `[AutoDetect] FAILED after ${Date.now() - autodetectStartedAt}ms \u2014 neither TCP nor UDP could reach the camera. TCP: ${tcpError?.message ?? tcpError}. UDP: ${udpError?.message ?? udpError}`
       );
       throw new Error(
         `Failed to connect via both TCP and UDP. TCP: ${tcpError?.message || tcpError}, UDP: ${udpError?.message || udpError}`
@@ -42927,6 +43275,8 @@ function buildInitialStatus(config) {
   BC_CMD_ID_COVER_STANDALONE_460,
   BC_CMD_ID_COVER_STANDALONE_461,
   BC_CMD_ID_COVER_STANDALONE_462,
+  BC_CMD_ID_DEVICE_DETECT,
+  BC_CMD_ID_DEVICE_DETECT_CANDIDATES,
   BC_CMD_ID_DING_DONG_CTRL,
   BC_CMD_ID_DING_DONG_OPT,
   BC_CMD_ID_FILE_INFO_LIST_CLOSE,