str-native-video-player 2.0.0 → 2.0.1

package/android/src/main/java/com/strtv/app/STRTVPlugin.java

@@ -1,236 +1,236 @@
-package com.strtv.app;
-
-import static android.content.ContentValues.TAG;
-
-import android.app.Activity;
-import android.os.Handler;
-import android.os.HandlerThread;
-
-import android.util.Log;
-import android.view.SurfaceView;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import com.getcapacitor.JSArray;
-import com.getcapacitor.JSObject;
-import com.getcapacitor.Plugin;
-import com.getcapacitor.PluginCall;
-import com.getcapacitor.PluginMethod;
-import com.getcapacitor.annotation.CapacitorPlugin;
-
-import org.json.JSONArray;
-
-import java.io.File;
-
-@CapacitorPlugin(name = "STRTV")
-public class STRTVPlugin extends Plugin {
-
-    private STRTV implementation;
-    private VideoPlayer videoPlayer;
-    private SurfaceView surfaceView;
-    private HandlerThread playerThread;
-    private Handler playerHandler;
-
-    private String currentlyPlayingUuid = null;
-
-
-    @Override
-    public void load() {
-                        Log.i(TAG, "NEW LOADING: ");
-
-        implementation = new STRTV(getContext());
-        // Initialize ExoPlayer thread
-        playerThread = new HandlerThread("VideoPlayerThread");
-        playerThread.start();
-        playerHandler = new Handler(playerThread.getLooper());
-    }
-
-    @PluginMethod
-    public void echo(PluginCall call) {
-        String value = call.getString("value");
-        JSObject ret = new JSObject();
-        ret.put("value", implementation.echo(value));
-        call.resolve(ret);
-    }
-
-    @PluginMethod
-    public void play_video(PluginCall call) {
-        String uuid = call.getString("uuid");
-        String url = call.getString("url"); // optional for streaming
-        boolean loop = call.getBoolean("loop", false);
-
-        if (uuid == null) {
-            call.reject("Missing uuid");
-            return;
-        }
-
-        currentlyPlayingUuid = uuid; // mark this as the currently intended video
-
-
-        
-       if (videoPlayer == null) {
-            createAndAttachSurfaceView(() -> {
-                getBridge().execute(() -> {
-                    videoPlayer = new VideoPlayer(getContext(), surfaceView);
-
-                    // Now safe to play video
-                    playVideoInternal(uuid, url, loop, call);
-                });
-            });
-        } else {
-            // Player already exists
-            playVideoInternal(uuid, url, loop, call);
-        }
-    }
-
-    private void playVideoInternal(String uuid, String url, boolean loop, PluginCall call) {
-        File cachedFile = implementation.getVideoFile(uuid, url);
-        if (cachedFile != null && cachedFile.exists()) {
-            videoPlayer.playFile(cachedFile, loop);
-            call.resolve();
-            return;
-        }
-
-        if (url == null) {
-            call.reject("No cached file and no URL provided");
-            return;
-        }
-
-        videoPlayer.playUrl(url, loop);
-
-        implementation.downloadInBackground(uuid, url, _cachedFile -> {
-            if (!uuid.equals(currentlyPlayingUuid)) return;
-
-            getBridge().execute(() -> {
-                if (videoPlayer != null) {
-                    long currentPos = videoPlayer.getCurrentPositionMs();
-                    videoPlayer.playFile(_cachedFile, loop);
-                    videoPlayer.seekTo(currentPos);
-                }
-            });
-        });
-
-        call.resolve();
-    }
-
-
-    @PluginMethod
-    public void resume_video(PluginCall call) {
-         if (videoPlayer != null) videoPlayer.resume();
-        call.resolve();
-    }
-
-    @PluginMethod
-    public void pause_video(PluginCall call) {
-        if (videoPlayer != null) videoPlayer.pause();
-        call.resolve();
-    }
-
-    @PluginMethod
-    public void stop_video(PluginCall call) {
-        if (videoPlayer != null) videoPlayer.stop();
-        call.resolve();
-
-        currentlyPlayingUuid = null;
-    }
-
-    @PluginMethod
-    public void seek_video(PluginCall call) {
-        long pos = call.getLong("position_ms", 0L);
-        if (videoPlayer != null) videoPlayer.seekTo(pos);
-        call.resolve();
-    }
-
-    @PluginMethod
-    public void is_video_playing(PluginCall call) {
-        boolean playing = videoPlayer != null && videoPlayer.isPlaying();
-        JSObject ret = new JSObject();
-        ret.put("playing", playing);
-        call.resolve(ret);
-    }
-
-    @PluginMethod
-    public void preload_video(PluginCall call) {
-        String uuid = call.getString("uuid");
-        String url = call.getString("url");
-
-        if (uuid == null || url == null) {
-            call.reject("uuid and url required");
-            return;
-        }
-
-        boolean success = implementation.preloadVideo(uuid, url);
-        JSObject ret = new JSObject();
-        ret.put("success", success);
-        call.resolve(ret);
-    }
-
-    @PluginMethod
-    public void list_cached_videos(PluginCall call) {
-        JSArray list = implementation.listCachedVideos();
-        JSObject ret = new JSObject();
-        ret.put("value", list);
-        call.resolve(ret);
-    }
-
-    @PluginMethod
-    public void evict_videos(PluginCall call) {
-        JSArray arr = call.getArray("uuids");
-        if (arr == null) {
-            call.reject("uuids array required");
-            return;
-        }
-
-        try {
-            JSONArray list = new JSONArray(arr.toString());
-            boolean result = implementation.evictVideos(list);
-
-            JSObject ret = new JSObject();
-            ret.put("success", result);
-            call.resolve(ret);
-        } catch (Exception e) {
-            call.reject("Failed to evict videos: " + e.getMessage());
-        }
-    }
-
-    @PluginMethod
-    public void get_storage_stats(PluginCall call) {
-        JSObject stats = implementation.getStorageStats();
-        call.resolve(stats);
-    }
-
-    @PluginMethod
-    public void set_max_cache_size(PluginCall call) {
-        long maxBytes = call.getLong("max_bytes", -1L);
-        if (maxBytes < 0) {
-            call.reject("max_bytes required");
-            return;
-        }
-
-        implementation.setMaxCacheSize(maxBytes);
-        JSObject ret = new JSObject();
-        ret.put("success", true);
-        call.resolve(ret);
-    }
-
-     // --- Helper to create and attach SurfaceView ---
-    private void createAndAttachSurfaceView(Runnable onReady) {
-        Activity activity = getActivity();
-        if (activity == null) return;
-
-        activity.runOnUiThread(() -> {
-            SurfaceView sv = new SurfaceView(activity);
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                    FrameLayout.LayoutParams.MATCH_PARENT,
-                    FrameLayout.LayoutParams.MATCH_PARENT
-            );
-            sv.setLayoutParams(params);
-
-            ViewGroup container = activity.findViewById(android.R.id.content);
-            container.addView(sv, 0);
-
-            surfaceView = sv;
-            if (onReady != null) onReady.run();
-        });
-    }
-}
+package com.strtv.app;
+
+import static android.content.ContentValues.TAG;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.os.HandlerThread;
+
+import android.util.Log;
+import android.view.SurfaceView;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import com.getcapacitor.JSArray;
+import com.getcapacitor.JSObject;
+import com.getcapacitor.Plugin;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+
+import org.json.JSONArray;
+
+import java.io.File;
+
+@CapacitorPlugin(name = "STRTV")
+public class STRTVPlugin extends Plugin {
+
+    private STRTV implementation;
+    private VideoPlayer videoPlayer;
+    private SurfaceView surfaceView;
+    private HandlerThread playerThread;
+    private Handler playerHandler;
+
+    private String currentlyPlayingUuid = null;
+
+
+    @Override
+    public void load() {
+                        Log.i(TAG, "NEW LOADING: ");
+
+        implementation = new STRTV(getContext());
+        // Initialize ExoPlayer thread
+        playerThread = new HandlerThread("VideoPlayerThread");
+        playerThread.start();
+        playerHandler = new Handler(playerThread.getLooper());
+    }
+
+    @PluginMethod
+    public void echo(PluginCall call) {
+        String value = call.getString("value");
+        JSObject ret = new JSObject();
+        ret.put("value", implementation.echo(value));
+        call.resolve(ret);
+    }
+
+    @PluginMethod
+    public void play_video(PluginCall call) {
+        String uuid = call.getString("uuid");
+        String url = call.getString("url"); // optional for streaming
+        boolean loop = call.getBoolean("loop", false);
+
+        if (uuid == null) {
+            call.reject("Missing uuid");
+            return;
+        }
+
+        currentlyPlayingUuid = uuid; // mark this as the currently intended video
+
+
+        
+       if (videoPlayer == null) {
+            createAndAttachSurfaceView(() -> {
+                getBridge().execute(() -> {
+                    videoPlayer = new VideoPlayer(getContext(), surfaceView);
+
+                    // Now safe to play video
+                    playVideoInternal(uuid, url, loop, call);
+                });
+            });
+        } else {
+            // Player already exists
+            playVideoInternal(uuid, url, loop, call);
+        }
+    }
+
+    private void playVideoInternal(String uuid, String url, boolean loop, PluginCall call) {
+        File cachedFile = implementation.getVideoFile(uuid, url);
+        if (cachedFile != null && cachedFile.exists()) {
+            videoPlayer.playFile(cachedFile, loop);
+            call.resolve();
+            return;
+        }
+
+        if (url == null) {
+            call.reject("No cached file and no URL provided");
+            return;
+        }
+
+        videoPlayer.playUrl(url, loop);
+
+        implementation.downloadInBackground(uuid, url, _cachedFile -> {
+            if (!uuid.equals(currentlyPlayingUuid)) return;
+
+            getBridge().execute(() -> {
+                if (videoPlayer != null) {
+                    long currentPos = videoPlayer.getCurrentPositionMs();
+                    videoPlayer.playFile(_cachedFile, loop);
+                    videoPlayer.seekTo(currentPos);
+                }
+            });
+        });
+
+        call.resolve();
+    }
+
+
+    @PluginMethod
+    public void resume_video(PluginCall call) {
+         if (videoPlayer != null) videoPlayer.resume();
+        call.resolve();
+    }
+
+    @PluginMethod
+    public void pause_video(PluginCall call) {
+        if (videoPlayer != null) videoPlayer.pause();
+        call.resolve();
+    }
+
+    @PluginMethod
+    public void stop_video(PluginCall call) {
+        if (videoPlayer != null) videoPlayer.stop();
+        call.resolve();
+
+        currentlyPlayingUuid = null;
+    }
+
+    @PluginMethod
+    public void seek_video(PluginCall call) {
+        long pos = call.getLong("position_ms", 0L);
+        if (videoPlayer != null) videoPlayer.seekTo(pos);
+        call.resolve();
+    }
+
+    @PluginMethod
+    public void is_video_playing(PluginCall call) {
+        boolean playing = videoPlayer != null && videoPlayer.isPlaying();
+        JSObject ret = new JSObject();
+        ret.put("playing", playing);
+        call.resolve(ret);
+    }
+
+    @PluginMethod
+    public void preload_video(PluginCall call) {
+        String uuid = call.getString("uuid");
+        String url = call.getString("url");
+
+        if (uuid == null || url == null) {
+            call.reject("uuid and url required");
+            return;
+        }
+
+        boolean success = implementation.preloadVideo(uuid, url);
+        JSObject ret = new JSObject();
+        ret.put("success", success);
+        call.resolve(ret);
+    }
+
+    @PluginMethod
+    public void list_cached_videos(PluginCall call) {
+        JSArray list = implementation.listCachedVideos();
+        JSObject ret = new JSObject();
+        ret.put("value", list);
+        call.resolve(ret);
+    }
+
+    @PluginMethod
+    public void evict_videos(PluginCall call) {
+        JSArray arr = call.getArray("uuids");
+        if (arr == null) {
+            call.reject("uuids array required");
+            return;
+        }
+
+        try {
+            JSONArray list = new JSONArray(arr.toString());
+            boolean result = implementation.evictVideos(list);
+
+            JSObject ret = new JSObject();
+            ret.put("success", result);
+            call.resolve(ret);
+        } catch (Exception e) {
+            call.reject("Failed to evict videos: " + e.getMessage());
+        }
+    }
+
+    @PluginMethod
+    public void get_storage_stats(PluginCall call) {
+        JSObject stats = implementation.getStorageStats();
+        call.resolve(stats);
+    }
+
+    @PluginMethod
+    public void set_max_cache_size(PluginCall call) {
+        long maxBytes = call.getLong("max_bytes", -1L);
+        if (maxBytes < 0) {
+            call.reject("max_bytes required");
+            return;
+        }
+
+        implementation.setMaxCacheSize(maxBytes);
+        JSObject ret = new JSObject();
+        ret.put("success", true);
+        call.resolve(ret);
+    }
+
+     // --- Helper to create and attach SurfaceView ---
+    private void createAndAttachSurfaceView(Runnable onReady) {
+        Activity activity = getActivity();
+        if (activity == null) return;
+
+        activity.runOnUiThread(() -> {
+            SurfaceView sv = new SurfaceView(activity);
+            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT
+            );
+            sv.setLayoutParams(params);
+
+            ViewGroup container = activity.findViewById(android.R.id.content);
+            container.addView(sv, 0);
+
+            surfaceView = sv;
+            if (onReady != null) onReady.run();
+        });
+    }
+}

package/android/src/main/java/com/strtv/app/VideoPlayer.java

@@ -2,6 +2,7 @@ package com.strtv.app;
 
 import android.content.Context;
 import android.net.Uri;
+import android.os.Handler;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
@@ -26,12 +27,14 @@ public class VideoPlayer {
     private SurfaceView surfaceView;
     private Surface surface;
     private boolean isPrepared = false;
+    Handler playerHandler;
 
     public VideoPlayer(Context context, SurfaceView surfaceView) {
         this.context = context;
         this.surfaceView = surfaceView;
         initPlayer();
         attachSurfaceView(surfaceView);
+        playerHandler = new Handler(player.getApplicationLooper());
     }
 
     @OptIn(markerClass = UnstableApi.class)
@@ -53,7 +56,9 @@ public class VideoPlayer {
             @Override
             public void surfaceCreated(SurfaceHolder holder) {
                 surface = holder.getSurface();
-                player.setVideoSurface(surface);
+                playerHandler.post(() -> {
+                    player.setVideoSurface(surface);
+            });
             }
 
             @Override
@@ -63,11 +68,14 @@ public class VideoPlayer {
 
             @Override
             public void surfaceDestroyed(SurfaceHolder holder) {
-                player.setVideoSurface(null);
-                if (surface != null) {
-                    surface.release();
-                    surface = null;
-                }
+                playerHandler.post(() ->{
+                    player.setVideoSurface(null);
+                    if (surface != null) {
+                        surface.release();
+                        surface = null;
+                    }
+                });
+             
             }
         });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "str-native-video-player",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Allows for native video player functionality, fetching and storing videos from a CDN, switching between the playback of these videos with cross fade and preloading functionality",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",