@scarlett-player/native 1.8.0 → 1.9.0

package/README.md

@@ -25,7 +25,7 @@ const player = await createPlayer({
 
 Video:
 
-- **MP4** - H.264/AAC (most common)
+- **MP4 / M4V** - H.264/AAC (most common)
 - **WebM** - VP8/VP9/Opus
 - **MOV** - QuickTime (H.264/AAC)
 - **MKV** - Matroska (browser support varies)
@@ -33,15 +33,20 @@ Video:
 
 Audio:
 
-- **MP3**, **WAV**, **OGG**, **FLAC**, **AAC**, **M4A**, **Opus** (pairs with
-  `@scarlett-player/audio-ui` and `@scarlett-player/media-session` for a full
-  audio player)
+- **MP3**, **WAV**, **OGG**, **FLAC**, **AAC**, **M4A**, **Opus**, **WebA**
+  (pairs with `@scarlett-player/audio-ui` and `@scarlett-player/media-session`
+  for a full audio player)
+
+The plugin claims a source by extension, then asks the browser whether it can
+play that MIME type, so an `.mkv` in a browser without Matroska support is
+declined rather than played into a black frame.
 
 ## Configuration
 
 ```typescript
 createNativePlugin({
-  preload: 'metadata', // 'none' | 'metadata' | 'auto'
+  preload: 'metadata',  // 'none' | 'metadata' | 'auto'
+  loadTimeoutMs: 30000, // Load watchdog; 0 disables
 });
 ```
 

package/dist/index.cjs

@@ -27,12 +27,18 @@ module.exports = __toCommonJS(index_exports);
 var import_core = require("@scarlett-player/core");
 
 // src/version.ts
-var PKG_VERSION = true ? "1.7.1" : "0.0.0-dev";
+var PKG_VERSION = true ? "1.9.0" : "0.0.0-dev";
 
 // src/index.ts
 var VIDEO_EXTENSIONS = ["mp4", "webm", "mov", "mkv", "ogv", "m4v"];
 var AUDIO_EXTENSIONS = ["mp3", "wav", "ogg", "flac", "aac", "m4a", "opus", "weba"];
 var SUPPORTED_EXTENSIONS = [...VIDEO_EXTENSIONS, ...AUDIO_EXTENSIONS];
+var MEDIA_ERR = {
+  ABORTED: 1,
+  NETWORK: 2,
+  DECODE: 3,
+  SRC_NOT_SUPPORTED: 4
+};
 var MIME_TYPES = {
   // Video
   mp4: "video/mp4",
@@ -59,6 +65,10 @@ function createNativePlugin(config) {
   let cleanupEvents = null;
   let derived_title = null;
   let is_audio_source = false;
+  let isCorePlayRequested = false;
+  let loadSession = 0;
+  let abortPendingLoad = null;
+  let has_parsed_source = false;
   const getExtension = (src) => {
     try {
       const url = new URL(src, window.location.href);
@@ -106,11 +116,33 @@ function createNativePlugin(config) {
     api?.container.appendChild(video);
     return video;
   };
+  const classifyMediaError = (error) => {
+    switch (error?.code) {
+      case MEDIA_ERR.ABORTED:
+        return { code: import_core.ErrorCode.PLAYBACK_FAILED, message: "Playback aborted" };
+      case MEDIA_ERR.NETWORK:
+        return { code: import_core.ErrorCode.MEDIA_NETWORK_ERROR, message: "Network error" };
+      case MEDIA_ERR.DECODE:
+        return {
+          code: import_core.ErrorCode.MEDIA_DECODE_ERROR,
+          message: "Decode error - format may not be supported"
+        };
+      case MEDIA_ERR.SRC_NOT_SUPPORTED:
+        return has_parsed_source ? { code: import_core.ErrorCode.MEDIA_NETWORK_ERROR, message: "Network error" } : { code: import_core.ErrorCode.SOURCE_LOAD_FAILED, message: "Format not supported" };
+      default:
+        return { code: import_core.ErrorCode.PLAYBACK_FAILED, message: "Unknown video error" };
+    }
+  };
   const setupEventListeners = (videoEl) => {
     const handlers = [];
+    const session = loadSession;
     const on = (event, handler) => {
-      videoEl.addEventListener(event, handler);
-      handlers.push([event, handler]);
+      const guarded = (event_object) => {
+        if (session !== loadSession) return;
+        handler(event_object);
+      };
+      videoEl.addEventListener(event, guarded);
+      handlers.push([event, guarded]);
     };
     const syncEndedFromElement = () => {
       if (videoEl.ended || !api?.getState("ended")) return;
@@ -125,14 +157,18 @@ function createNativePlugin(config) {
       api?.setState("playing", true);
       api?.setState("paused", false);
       api?.setState("playbackState", "playing");
-      api?.emit("playback:play", void 0);
       syncEndedFromElement();
+      if (isCorePlayRequested) {
+        isCorePlayRequested = false;
+      } else {
+        api?.emit("playback:play", void 0);
+      }
     });
     on("pause", () => {
+      isCorePlayRequested = false;
       api?.setState("playing", false);
       api?.setState("paused", true);
       api?.setState("playbackState", "paused");
-      api?.emit("playback:pause", void 0);
     });
     on("ended", () => {
       api?.setState("playing", false);
@@ -201,26 +237,10 @@ function createNativePlugin(config) {
     });
     on("error", () => {
       const error = videoEl.error;
-      let message = "Unknown video error";
-      if (error) {
-        switch (error.code) {
-          case MediaError.MEDIA_ERR_ABORTED:
-            message = "Playback aborted";
-            break;
-          case MediaError.MEDIA_ERR_NETWORK:
-            message = "Network error";
-            break;
-          case MediaError.MEDIA_ERR_DECODE:
-            message = "Decode error - format may not be supported";
-            break;
-          case MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED:
-            message = "Format not supported";
-            break;
-        }
-      }
-      api?.logger.error("Video error", { code: error?.code, message });
+      const { code, message } = classifyMediaError(error);
+      api?.logger.error("Video error", { mediaErrorCode: error?.code, code, message });
       api?.emit("error", {
-        code: import_core.ErrorCode.PLAYBACK_FAILED,
+        code,
         message,
         fatal: true,
         timestamp: Date.now()
@@ -283,18 +303,26 @@ function createNativePlugin(config) {
       api = pluginApi;
       api.logger.info("Native video plugin initialized");
       const unsubPlay = api.on("playback:play", async () => {
+        if (api?.getState("chromecastActive")) return;
         if (!video) return;
+        if (!video.paused) return;
         try {
+          isCorePlayRequested = true;
           await video.play();
         } catch (e) {
+          isCorePlayRequested = false;
           api?.logger.error("Play failed", e);
         }
       });
       const unsubPause = api.on("playback:pause", () => {
+        if (api?.getState("chromecastActive")) return;
+        isCorePlayRequested = false;
         video?.pause();
       });
       const unsubSeek = api.on("playback:seeking", ({ time }) => {
+        if (api?.getState("chromecastActive")) return;
         if (!video) return;
+        if (!Number.isFinite(time)) return;
         const clampedTime = Math.max(0, Math.min(time, video.duration || 0));
         video.currentTime = clampedTime;
       });
@@ -325,6 +353,10 @@ function createNativePlugin(config) {
     },
     async destroy() {
       api?.logger.info("Native video plugin destroying");
+      loadSession++;
+      const pending = abortPendingLoad;
+      abortPendingLoad = null;
+      pending?.(new Error("Player destroyed during load"));
       cleanup();
       if (video?.parentNode) {
         video.parentNode.removeChild(video);
@@ -333,6 +365,7 @@ function createNativePlugin(config) {
       api = null;
       derived_title = null;
       is_audio_source = false;
+      has_parsed_source = false;
     },
     async loadSource(src) {
       if (!api) throw new Error("Plugin not initialized");
@@ -340,7 +373,12 @@ function createNativePlugin(config) {
       const mimeType = getMimeType(ext);
       const isAudio = isAudioExtension(ext);
       is_audio_source = isAudio;
-      api.logger.info("Loading native media source", { src, mimeType, isAudio });
+      api.logger.info("Loading native media source", { src: (0, import_core.sanitizeUrl)(src), mimeType, isAudio });
+      const session = ++loadSession;
+      const superseded = abortPendingLoad;
+      abortPendingLoad = null;
+      superseded?.(new Error("Load superseded by a newer source"));
+      has_parsed_source = false;
       cleanup();
       api.setState("playbackState", "loading");
       api.setState("buffering", true);
@@ -375,9 +413,19 @@ function createNativePlugin(config) {
             clearTimeout(watchdog);
             watchdog = null;
           }
+          if (abortPendingLoad === abort) {
+            abortPendingLoad = null;
+          }
+        };
+        const abort = (reason) => {
+          settle();
+          reject(reason);
         };
+        abortPendingLoad = abort;
         const onLoaded = () => {
+          if (session !== loadSession) return;
           settle();
+          has_parsed_source = true;
           const muted = api?.getState("muted");
           const volume = api?.getState("volume");
           if (muted !== void 0) videoEl.muted = muted;
@@ -389,12 +437,14 @@ function createNativePlugin(config) {
           resolve();
         };
         const onError = () => {
+          if (session !== loadSession) return;
           settle();
           const error = videoEl.error;
           reject(new Error(error?.message || "Failed to load video source"));
         };
         if (load_timeout_ms > 0) {
           watchdog = setTimeout(() => {
+            if (session !== loadSession) return;
             settle();
             reject(new Error("Video took too long to load (network timeout)"));
           }, load_timeout_ms);

package/dist/index.js

@@ -1,13 +1,19 @@
 // src/index.ts
-import { ErrorCode } from "@scarlett-player/core";
+import { ErrorCode, sanitizeUrl } from "@scarlett-player/core";
 
 // src/version.ts
-var PKG_VERSION = true ? "1.7.1" : "0.0.0-dev";
+var PKG_VERSION = true ? "1.9.0" : "0.0.0-dev";
 
 // src/index.ts
 var VIDEO_EXTENSIONS = ["mp4", "webm", "mov", "mkv", "ogv", "m4v"];
 var AUDIO_EXTENSIONS = ["mp3", "wav", "ogg", "flac", "aac", "m4a", "opus", "weba"];
 var SUPPORTED_EXTENSIONS = [...VIDEO_EXTENSIONS, ...AUDIO_EXTENSIONS];
+var MEDIA_ERR = {
+  ABORTED: 1,
+  NETWORK: 2,
+  DECODE: 3,
+  SRC_NOT_SUPPORTED: 4
+};
 var MIME_TYPES = {
   // Video
   mp4: "video/mp4",
@@ -34,6 +40,10 @@ function createNativePlugin(config) {
   let cleanupEvents = null;
   let derived_title = null;
   let is_audio_source = false;
+  let isCorePlayRequested = false;
+  let loadSession = 0;
+  let abortPendingLoad = null;
+  let has_parsed_source = false;
   const getExtension = (src) => {
     try {
       const url = new URL(src, window.location.href);
@@ -81,11 +91,33 @@ function createNativePlugin(config) {
     api?.container.appendChild(video);
     return video;
   };
+  const classifyMediaError = (error) => {
+    switch (error?.code) {
+      case MEDIA_ERR.ABORTED:
+        return { code: ErrorCode.PLAYBACK_FAILED, message: "Playback aborted" };
+      case MEDIA_ERR.NETWORK:
+        return { code: ErrorCode.MEDIA_NETWORK_ERROR, message: "Network error" };
+      case MEDIA_ERR.DECODE:
+        return {
+          code: ErrorCode.MEDIA_DECODE_ERROR,
+          message: "Decode error - format may not be supported"
+        };
+      case MEDIA_ERR.SRC_NOT_SUPPORTED:
+        return has_parsed_source ? { code: ErrorCode.MEDIA_NETWORK_ERROR, message: "Network error" } : { code: ErrorCode.SOURCE_LOAD_FAILED, message: "Format not supported" };
+      default:
+        return { code: ErrorCode.PLAYBACK_FAILED, message: "Unknown video error" };
+    }
+  };
   const setupEventListeners = (videoEl) => {
     const handlers = [];
+    const session = loadSession;
     const on = (event, handler) => {
-      videoEl.addEventListener(event, handler);
-      handlers.push([event, handler]);
+      const guarded = (event_object) => {
+        if (session !== loadSession) return;
+        handler(event_object);
+      };
+      videoEl.addEventListener(event, guarded);
+      handlers.push([event, guarded]);
     };
     const syncEndedFromElement = () => {
       if (videoEl.ended || !api?.getState("ended")) return;
@@ -100,14 +132,18 @@ function createNativePlugin(config) {
       api?.setState("playing", true);
       api?.setState("paused", false);
       api?.setState("playbackState", "playing");
-      api?.emit("playback:play", void 0);
       syncEndedFromElement();
+      if (isCorePlayRequested) {
+        isCorePlayRequested = false;
+      } else {
+        api?.emit("playback:play", void 0);
+      }
     });
     on("pause", () => {
+      isCorePlayRequested = false;
       api?.setState("playing", false);
       api?.setState("paused", true);
       api?.setState("playbackState", "paused");
-      api?.emit("playback:pause", void 0);
     });
     on("ended", () => {
       api?.setState("playing", false);
@@ -176,26 +212,10 @@ function createNativePlugin(config) {
     });
     on("error", () => {
       const error = videoEl.error;
-      let message = "Unknown video error";
-      if (error) {
-        switch (error.code) {
-          case MediaError.MEDIA_ERR_ABORTED:
-            message = "Playback aborted";
-            break;
-          case MediaError.MEDIA_ERR_NETWORK:
-            message = "Network error";
-            break;
-          case MediaError.MEDIA_ERR_DECODE:
-            message = "Decode error - format may not be supported";
-            break;
-          case MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED:
-            message = "Format not supported";
-            break;
-        }
-      }
-      api?.logger.error("Video error", { code: error?.code, message });
+      const { code, message } = classifyMediaError(error);
+      api?.logger.error("Video error", { mediaErrorCode: error?.code, code, message });
       api?.emit("error", {
-        code: ErrorCode.PLAYBACK_FAILED,
+        code,
         message,
         fatal: true,
         timestamp: Date.now()
@@ -258,18 +278,26 @@ function createNativePlugin(config) {
       api = pluginApi;
       api.logger.info("Native video plugin initialized");
       const unsubPlay = api.on("playback:play", async () => {
+        if (api?.getState("chromecastActive")) return;
         if (!video) return;
+        if (!video.paused) return;
         try {
+          isCorePlayRequested = true;
           await video.play();
         } catch (e) {
+          isCorePlayRequested = false;
           api?.logger.error("Play failed", e);
         }
       });
       const unsubPause = api.on("playback:pause", () => {
+        if (api?.getState("chromecastActive")) return;
+        isCorePlayRequested = false;
         video?.pause();
       });
       const unsubSeek = api.on("playback:seeking", ({ time }) => {
+        if (api?.getState("chromecastActive")) return;
         if (!video) return;
+        if (!Number.isFinite(time)) return;
         const clampedTime = Math.max(0, Math.min(time, video.duration || 0));
         video.currentTime = clampedTime;
       });
@@ -300,6 +328,10 @@ function createNativePlugin(config) {
     },
     async destroy() {
       api?.logger.info("Native video plugin destroying");
+      loadSession++;
+      const pending = abortPendingLoad;
+      abortPendingLoad = null;
+      pending?.(new Error("Player destroyed during load"));
       cleanup();
       if (video?.parentNode) {
         video.parentNode.removeChild(video);
@@ -308,6 +340,7 @@ function createNativePlugin(config) {
       api = null;
       derived_title = null;
       is_audio_source = false;
+      has_parsed_source = false;
     },
     async loadSource(src) {
       if (!api) throw new Error("Plugin not initialized");
@@ -315,7 +348,12 @@ function createNativePlugin(config) {
       const mimeType = getMimeType(ext);
       const isAudio = isAudioExtension(ext);
       is_audio_source = isAudio;
-      api.logger.info("Loading native media source", { src, mimeType, isAudio });
+      api.logger.info("Loading native media source", { src: sanitizeUrl(src), mimeType, isAudio });
+      const session = ++loadSession;
+      const superseded = abortPendingLoad;
+      abortPendingLoad = null;
+      superseded?.(new Error("Load superseded by a newer source"));
+      has_parsed_source = false;
       cleanup();
       api.setState("playbackState", "loading");
       api.setState("buffering", true);
@@ -350,9 +388,19 @@ function createNativePlugin(config) {
             clearTimeout(watchdog);
             watchdog = null;
           }
+          if (abortPendingLoad === abort) {
+            abortPendingLoad = null;
+          }
+        };
+        const abort = (reason) => {
+          settle();
+          reject(reason);
         };
+        abortPendingLoad = abort;
         const onLoaded = () => {
+          if (session !== loadSession) return;
           settle();
+          has_parsed_source = true;
           const muted = api?.getState("muted");
           const volume = api?.getState("volume");
           if (muted !== void 0) videoEl.muted = muted;
@@ -364,12 +412,14 @@ function createNativePlugin(config) {
           resolve();
         };
         const onError = () => {
+          if (session !== loadSession) return;
           settle();
           const error = videoEl.error;
           reject(new Error(error?.message || "Failed to load video source"));
         };
         if (load_timeout_ms > 0) {
           watchdog = setTimeout(() => {
+            if (session !== loadSession) return;
             settle();
             reject(new Error("Video took too long to load (network timeout)"));
           }, load_timeout_ms);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scarlett-player/native",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Native Video Provider Plugin for Scarlett Player (MP4, WebM, MOV, MKV)",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -17,13 +17,13 @@
     "dist"
   ],
   "peerDependencies": {
-    "@scarlett-player/core": "^1.7.0"
+    "@scarlett-player/core": "^1.8.0"
   },
   "devDependencies": {
     "typescript": "^5.3.0",
     "tsup": "^8.0.0",
     "vitest": "^1.6.0",
-    "@scarlett-player/core": "1.8.0"
+    "@scarlett-player/core": "1.9.0"
   },
   "keywords": [
     "video",