@video-supply/dahua-player 0.1.4 → 0.1.5

package/README.md

@@ -58,7 +58,9 @@ player.sdk.playRecordVideo({
 });
 
 player.sdk.playSpeed(2, 0);
-player.sdk.jumpPlayByDateTime('2026-03-01 12:00:00', 0);
+await player.sdk.jumpPlayByDateTimeAsync('2026-03-01 12:00:00', 0, {
+  onDone: ({ timeSec }) => console.log('seek done', timeSec),
+});
 player.sdk.setFullScreen();
 ```
 
@@ -169,6 +171,18 @@ console.log('getPlaybackTimeMs:', player.getPlaybackTimeMs());
   - Seeks and plays at the given datetime (record mode only).
   - `datetime` supports `YYYY-MM-DD HH:mm:ss` string, `Date`, or epoch seconds/milliseconds.
   - `index` is the window index (defaults to 0).
+- `jumpPlayByDateTimeAsync(datetime: string | Date | number, index?: number, options?): Promise<{ timeMs, timeSec, windowIndex?, channelCode?, raw? }>`
+  - Record seek helper (record mode only).
+  - Resolves when playback time reaches the target (based on `getVideoFrameInfo`).
+  - Default timeout: 30s.
+  - Resolves with `{ timeMs, timeSec, windowIndex?, channelCode?, raw? }` (the matched playback-time payload).
+  - `options` supports two forms:
+    - callback form: `jumpPlayByDateTimeAsync(dt, idx, (payload) => {})` (same as `onDone`)
+    - object form:
+      - `timeoutMs?: number` (default 30000)
+      - `toleranceMs?: number` (default 1500)
+      - `onDone?: (payload) => void` (called before resolve)
+  - Rejects on timeout / destroyed / underlying SDK error (also reported via `onError` / `error` event).
 - `playSpeed(speed: number, index: number): void`
   - Sets record playback speed (record mode only).
   - Allowed speeds: `0.125/0.25/0.5/1/1.25/1.5/2/4/8`.

package/README.zh-CN.md

@@ -201,6 +201,18 @@ console.log('主动获取(可能为null)：', t);
     - `Date`
     - `number`：时间戳（秒或毫秒，内部会自动兼容）
   - `index`：窗口索引（默认窗口 0）
+- `jumpPlayByDateTimeAsync(datetime: string | Date | number, index?: number, options?): Promise<{ timeMs, timeSec, windowIndex?, channelCode?, raw? }>`
+  - 录像跳转播放（仅 `mode=record` 可用）
+  - 内部基于回放时间（`getVideoFrameInfo`）判断跳转是否完成
+  - 默认超时：30 秒
+  - 返回：Promise resolve 为 `{ timeMs, timeSec, windowIndex?, channelCode?, raw? }`（命中目标时间点时的回放时间 payload）
+  - `options` 支持两种写法：
+    - 直接传回调函数：`jumpPlayByDateTimeAsync(dt, idx, (payload) => {})`（等价于 `onDone`）
+    - 传配置对象：
+      - `timeoutMs?: number`：超时时间（默认 30000）
+      - `toleranceMs?: number`：时间命中容差（默认 1500）
+      - `onDone?: (payload) => void`：跳转完成回调（在 Promise resolve 前触发）
+  - reject 场景：超时 / 播放器销毁 / SDK 抛错（会触发 `onError`/`error` 事件）
 - `playSpeed(speed: number, index: number): void`
   - 设置录像回放倍速（仅 `mode=record` 可用）
   - `speed` 支持：`0.125/0.25/0.5/1/1.25/1.5/2/4/8`
@@ -236,5 +248,7 @@ player.sdk.playRecordVideo({
 });
 
 player.sdk.playSpeed(2, 0);
-player.sdk.jumpPlayByDateTime('2026-03-01 12:00:00', 0);
+await player.sdk.jumpPlayByDateTimeAsync('2026-03-01 12:00:00', 0, {
+  onDone: ({ timeSec }) => console.log('跳转完成', timeSec),
+});
 ```

package/dist/index.cjs

@@ -770,6 +770,35 @@ function buildPlaybackTimePayloadFromFrameInfo(data) {
   return { timeMs, timeSec, windowIndex, channelCode, raw: data };
 }
 
+// src/sdk/DateTime.ts
+function parseDateTimeToMs(datetime) {
+  if (typeof datetime === "number") {
+    if (!Number.isFinite(datetime)) return NaN;
+    return Math.floor(datetime > 1e12 ? datetime : datetime * 1e3);
+  }
+  if (datetime instanceof Date) {
+    const ms2 = datetime.getTime();
+    return Number.isFinite(ms2) ? Math.floor(ms2) : NaN;
+  }
+  const raw = (datetime || "").trim();
+  if (!raw) return NaN;
+  const v = raw.includes("T") ? raw : raw.replace(" ", "T");
+  const m = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})$/.exec(v);
+  if (!m) {
+    const ms2 = new Date(v).getTime();
+    return Number.isFinite(ms2) ? Math.floor(ms2) : NaN;
+  }
+  const y = Number(m[1]);
+  const mon = Number(m[2]);
+  const d = Number(m[3]);
+  const hh = Number(m[4]);
+  const mm = Number(m[5]);
+  const ss = Number(m[6]);
+  const dt = new Date(y, mon - 1, d, hh, mm, ss, 0);
+  const ms = dt.getTime();
+  return Number.isFinite(ms) ? Math.floor(ms) : NaN;
+}
+
 // src/DahuaPlayer.ts
 function normalizeStaticPath(path) {
   const raw = (path || "").trim();
@@ -943,6 +972,8 @@ var DahuaPlayer = class {
     };
     let lastPlaybackTimeMs = null;
     let lastEmittedPlaybackTimeSec = null;
+    const jumpWaiters = [];
+    let jumpWaiterId = 0;
     const safeOnError = (e) => {
       var _a2;
       try {
@@ -951,6 +982,29 @@ var DahuaPlayer = class {
       }
       emit(listeners, "error", e);
     };
+    const createDestroyedError = () => new DahuaPlayerError({
+      code: "DESTROYED" /* DESTROYED */,
+      message: "destroyed",
+      userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
+    });
+    const createNotReadyError = () => new DahuaPlayerError({
+      code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
+      message: "player not ready",
+      userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
+    });
+    const requireAdapter = () => {
+      if (destroyed) {
+        const err = createDestroyedError();
+        safeOnError(err);
+        throw err;
+      }
+      if (!adapter) {
+        const err = createNotReadyError();
+        safeOnError(err);
+        throw err;
+      }
+      return adapter;
+    };
     const tryAutoPlay = () => {
       if (!autoPlay) return;
       if (mode === "real") {
@@ -1024,7 +1078,7 @@ var DahuaPlayer = class {
           playerOptions: opts.playerOptions,
           debug: opts.debug,
           onMessage: (type, data) => {
-            var _a3, _b2;
+            var _a3, _b2, _c2;
             try {
               (_a3 = opts.onSdkMessage) == null ? void 0 : _a3.call(opts, type, data);
             } catch {
@@ -1041,6 +1095,23 @@ var DahuaPlayer = class {
                 }
                 emit(listeners, "playbackTime", payload);
               }
+              if (jumpWaiters.length > 0) {
+                for (let i = jumpWaiters.length - 1; i >= 0; i--) {
+                  const w = jumpWaiters[i];
+                  if (typeof w.index === "number" && typeof payload.windowIndex === "number" && w.index !== payload.windowIndex) {
+                    continue;
+                  }
+                  if (Math.abs(payload.timeMs - w.targetMs) <= w.toleranceMs) {
+                    jumpWaiters.splice(i, 1);
+                    clearTimeout(w.timeoutTimer);
+                    try {
+                      (_c2 = w.onDone) == null ? void 0 : _c2.call(w, payload);
+                    } catch {
+                    }
+                    w.resolve(payload);
+                  }
+                }
+              }
             }
           },
           emit: (event, payload) => {
@@ -1078,6 +1149,13 @@ var DahuaPlayer = class {
             }
             if (event === "error") {
               const msg = formatUserMessage(payload, "\u64AD\u653E\u5931\u8D25");
+              if (jumpWaiters.length > 0) {
+                const waiters = jumpWaiters.splice(0, jumpWaiters.length);
+                for (const w of waiters) {
+                  clearTimeout(w.timeoutTimer);
+                  w.reject(payload);
+                }
+              }
               if (payload instanceof DahuaPlayerError) {
                 const initCodes = /* @__PURE__ */ new Set([
                   "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
@@ -1136,6 +1214,14 @@ var DahuaPlayer = class {
         if (destroyed) return;
         destroyed = true;
         clearTimeout(readyTimer);
+        if (jumpWaiters.length > 0) {
+          const waiters = jumpWaiters.splice(0, jumpWaiters.length);
+          const err = createDestroyedError();
+          for (const w of waiters) {
+            clearTimeout(w.timeoutTimer);
+            w.reject(err);
+          }
+        }
         if (transientOverlayTimer) {
           clearTimeout(transientOverlayTimer);
           transientOverlayTimer = null;
@@ -1176,26 +1262,9 @@ var DahuaPlayer = class {
       sdk: {
         getRaw: () => adapter == null ? void 0 : adapter.getRaw(),
         callRaw: (method, ...args) => {
-          if (destroyed) {
-            const err = new DahuaPlayerError({
-              code: "DESTROYED" /* DESTROYED */,
-              message: "destroyed",
-              userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
-            });
-            safeOnError(err);
-            throw err;
-          }
-          if (!adapter) {
-            const err = new DahuaPlayerError({
-              code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
-              message: "player not ready",
-              userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
-            });
-            safeOnError(err);
-            throw err;
-          }
+          const ad = requireAdapter();
           try {
-            return adapter.callRaw(method, ...args);
+            return ad.callRaw(method, ...args);
           } catch (e) {
             const err = toDahuaError(e, {
               code: "PLAY_FAILED" /* PLAY_FAILED */,
@@ -1207,27 +1276,10 @@ var DahuaPlayer = class {
           }
         },
         playRealVideo: (opt) => {
-          if (destroyed) {
-            const err = new DahuaPlayerError({
-              code: "DESTROYED" /* DESTROYED */,
-              message: "destroyed",
-              userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
-            });
-            safeOnError(err);
-            throw err;
-          }
-          if (!adapter) {
-            const err = new DahuaPlayerError({
-              code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
-              message: "player not ready",
-              userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
-            });
-            safeOnError(err);
-            throw err;
-          }
+          const ad = requireAdapter();
           showLoading("\u52A0\u8F7D\u89C6\u9891\u4E2D\u2026");
           try {
-            adapter.playRealVideo(opt);
+            ad.playRealVideo(opt);
           } catch (e) {
             setLoading(false);
             const err = toDahuaError(e, {
@@ -1240,27 +1292,10 @@ var DahuaPlayer = class {
           }
         },
         playRecordVideo: (opt) => {
-          if (destroyed) {
-            const err = new DahuaPlayerError({
-              code: "DESTROYED" /* DESTROYED */,
-              message: "destroyed",
-              userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
-            });
-            safeOnError(err);
-            throw err;
-          }
-          if (!adapter) {
-            const err = new DahuaPlayerError({
-              code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
-              message: "player not ready",
-              userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
-            });
-            safeOnError(err);
-            throw err;
-          }
+          const ad = requireAdapter();
           showLoading("\u52A0\u8F7D\u5F55\u50CF\u4E2D\u2026");
           try {
-            adapter.playRecordVideo(opt);
+            ad.playRecordVideo(opt);
           } catch (e) {
             setLoading(false);
             const err = toDahuaError(e, {
@@ -1276,26 +1311,9 @@ var DahuaPlayer = class {
         play: (windowIndex) => adapter == null ? void 0 : adapter.playWindow(windowIndex),
         close: (windowIndex) => adapter == null ? void 0 : adapter.closeWindow(windowIndex),
         setPlayerNum: (n) => {
-          if (destroyed) {
-            const err = new DahuaPlayerError({
-              code: "DESTROYED" /* DESTROYED */,
-              message: "destroyed",
-              userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
-            });
-            safeOnError(err);
-            throw err;
-          }
-          if (!adapter) {
-            const err = new DahuaPlayerError({
-              code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
-              message: "player not ready",
-              userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
-            });
-            safeOnError(err);
-            throw err;
-          }
+          const ad = requireAdapter();
           try {
-            adapter.setPlayerNum(n);
+            ad.setPlayerNum(n);
           } catch (e) {
             const err = toDahuaError(e, {
               code: "PLAY_FAILED" /* PLAY_FAILED */,
@@ -1307,28 +1325,84 @@ var DahuaPlayer = class {
           }
         },
         jumpPlayByDateTime: (datetime, index) => {
-          if (destroyed) {
-            const err = new DahuaPlayerError({
-              code: "DESTROYED" /* DESTROYED */,
-              message: "destroyed",
-              userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
+          const ad = requireAdapter();
+          showLoading("\u8DF3\u8F6C\u4E2D\u2026");
+          try {
+            ad.jumpPlayByDateTime(datetime, index);
+          } catch (e) {
+            setLoading(false);
+            const err = toDahuaError(e, {
+              code: "PLAY_FAILED" /* PLAY_FAILED */,
+              message: "jumpPlayByDateTime failed",
+              userMessage: "\u5F55\u50CF\u8DF3\u8F6C\u64AD\u653E\u5931\u8D25"
             });
             safeOnError(err);
             throw err;
           }
-          if (!adapter) {
+        },
+        jumpPlayByDateTimeAsync: (datetime, index, options2) => {
+          let ad;
+          try {
+            ad = requireAdapter();
+          } catch (e) {
+            return Promise.reject(e);
+          }
+          const onDone = typeof options2 === "function" ? options2 : options2 == null ? void 0 : options2.onDone;
+          const timeoutMs = typeof options2 === "object" && options2 && Number.isFinite(options2.timeoutMs) ? Math.floor(Number(options2.timeoutMs)) : 3e4;
+          const toleranceMs = typeof options2 === "object" && options2 && Number.isFinite(options2.toleranceMs) ? Math.floor(Number(options2.toleranceMs)) : 1500;
+          const targetMs = parseDateTimeToMs(datetime);
+          if (!Number.isFinite(targetMs)) {
             const err = new DahuaPlayerError({
-              code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
-              message: "player not ready",
-              userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
+              code: "PLAY_FAILED" /* PLAY_FAILED */,
+              message: "invalid datetime",
+              userMessage: "\u8DF3\u8F6C\u65F6\u95F4\u683C\u5F0F\u4E0D\u5408\u6CD5",
+              cause: { datetime }
             });
             safeOnError(err);
-            throw err;
+            return Promise.reject(err);
           }
           showLoading("\u8DF3\u8F6C\u4E2D\u2026");
+          const idx = typeof index === "number" ? Math.floor(index) : void 0;
+          const id2 = ++jumpWaiterId;
+          const p = new Promise((resolve, reject) => {
+            const timeoutTimer = setTimeout(() => {
+              const at = jumpWaiters.findIndex((w) => w.id === id2);
+              if (at >= 0) jumpWaiters.splice(at, 1);
+              setLoading(false);
+              const err = new DahuaPlayerError({
+                code: "PLAY_FAILED" /* PLAY_FAILED */,
+                message: "jumpPlayByDateTimeAsync timeout",
+                userMessage: "\u5F55\u50CF\u8DF3\u8F6C\u8D85\u65F6",
+                cause: { timeoutMs, datetime, index: idx }
+              });
+              safeOnError(err);
+              reject(err);
+            }, Math.max(0, timeoutMs));
+            jumpWaiters.push({
+              id: id2,
+              targetMs,
+              toleranceMs: Math.max(0, toleranceMs),
+              index: idx,
+              timeoutTimer,
+              onDone,
+              resolve: (payload) => {
+                setLoading(false);
+                resolve(payload);
+              },
+              reject: (e) => {
+                setLoading(false);
+                reject(e);
+              }
+            });
+          });
           try {
-            adapter.jumpPlayByDateTime(datetime, index);
+            ad.jumpPlayByDateTime(datetime, idx);
           } catch (e) {
+            const at = jumpWaiters.findIndex((w) => w.id === id2);
+            if (at >= 0) {
+              const w = jumpWaiters.splice(at, 1)[0];
+              clearTimeout(w.timeoutTimer);
+            }
             setLoading(false);
             const err = toDahuaError(e, {
               code: "PLAY_FAILED" /* PLAY_FAILED */,
@@ -1336,30 +1410,14 @@ var DahuaPlayer = class {
               userMessage: "\u5F55\u50CF\u8DF3\u8F6C\u64AD\u653E\u5931\u8D25"
             });
             safeOnError(err);
-            throw err;
+            return Promise.reject(err);
           }
+          return p;
         },
         playSpeed: (speed, index) => {
-          if (destroyed) {
-            const err = new DahuaPlayerError({
-              code: "DESTROYED" /* DESTROYED */,
-              message: "destroyed",
-              userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
-            });
-            safeOnError(err);
-            throw err;
-          }
-          if (!adapter) {
-            const err = new DahuaPlayerError({
-              code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
-              message: "player not ready",
-              userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
-            });
-            safeOnError(err);
-            throw err;
-          }
+          const ad = requireAdapter();
           try {
-            adapter.playSpeed(speed, index);
+            ad.playSpeed(speed, index);
           } catch (e) {
             const err = toDahuaError(e, {
               code: "PLAY_FAILED" /* PLAY_FAILED */,
@@ -1371,26 +1429,9 @@ var DahuaPlayer = class {
           }
         },
         setFullScreen: () => {
-          if (destroyed) {
-            const err = new DahuaPlayerError({
-              code: "DESTROYED" /* DESTROYED */,
-              message: "destroyed",
-              userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
-            });
-            safeOnError(err);
-            throw err;
-          }
-          if (!adapter) {
-            const err = new DahuaPlayerError({
-              code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
-              message: "player not ready",
-              userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
-            });
-            safeOnError(err);
-            throw err;
-          }
+          const ad = requireAdapter();
           try {
-            adapter.setFullScreen();
+            ad.setFullScreen();
             return;
           } catch {
           }
@@ -1408,26 +1449,9 @@ var DahuaPlayer = class {
           void req.call(el);
         },
         setExitFullScreen: () => {
-          if (destroyed) {
-            const err2 = new DahuaPlayerError({
-              code: "DESTROYED" /* DESTROYED */,
-              message: "destroyed",
-              userMessage: "\u64AD\u653E\u5668\u5DF2\u9500\u6BC1"
-            });
-            safeOnError(err2);
-            throw err2;
-          }
-          if (!adapter) {
-            const err2 = new DahuaPlayerError({
-              code: "SDK_INIT_FAILED" /* SDK_INIT_FAILED */,
-              message: "player not ready",
-              userMessage: "\u64AD\u653E\u5668\u672A\u5C31\u7EEA\uFF0C\u8BF7\u7B49\u5F85 ready \u540E\u518D\u8C03\u7528"
-            });
-            safeOnError(err2);
-            throw err2;
-          }
+          const ad = requireAdapter();
           try {
-            adapter.setExitFullScreen();
+            ad.setExitFullScreen();
             return;
           } catch {
           }