@javascriptcommon/react-native-track-player 1.2.9 → 1.2.23

package/lib/index.js

@@ -47,14 +47,6 @@ function setNowPlaying(track) {
     return TrackPlayer.setNowPlaying(track);
 }
 
-function remove(tracks) {
-    if(!Array.isArray(tracks)) {
-        tracks = [tracks];
-    }
-
-    return TrackPlayer.remove(tracks);
-}
-
 function registerPlaybackService(serviceFactory) {
     if (Platform.OS === 'android' && !registeredHeadlessTask) {
         // Registers the headless task
@@ -161,9 +153,18 @@ module.exports.addEventListener = addEventListener;
 
 // Player Queue Commands
 module.exports.setNowPlaying = setNowPlaying;
-module.exports.updateMetadataForTrack = TrackPlayer.updateMetadataForTrack;
 module.exports.updatePlayback = TrackPlayer.updatePlayback;
 module.exports.reset = TrackPlayer.reset;
+module.exports.clear = TrackPlayer.clear;
+module.exports.removeNotifications = TrackPlayer.removeNotifications;
+
+// Android Auto
+module.exports.setBrowseTree = TrackPlayer.setBrowseTree;
+module.exports.updateBrowseTree = TrackPlayer.updateBrowseTree;
+module.exports.setAndroidAutoPlayerTracks = TrackPlayer.setAndroidAutoPlayerTracks;
+module.exports.updateAndroidAutoPlayerOptions = TrackPlayer.updateAndroidAutoPlayerOptions;
+module.exports.setSearchResult = TrackPlayer.setSearchResult;
+module.exports.setIsAndroidTv = TrackPlayer.setIsAndroidTv;
 
 // Player Event Types
 module.exports.TrackPlayerEvents = require('./eventTypes');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@javascriptcommon/react-native-track-player",
-  "version": "1.2.9",
+  "version": "1.2.23",
   "description": "A fully fledged audio module created for music apps",
   "contributors": [
     {

package/android/src/main/java/com/guichaguri/trackplayer/TrackPlayer.java

@@ -1,28 +0,0 @@
-package com.guichaguri.trackplayer;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-import com.guichaguri.trackplayer.module.MusicModule;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * TrackPlayer
- * https://github.com/react-native-kit/react-native-track-player
- * @author Guichaguri
- */
-public class TrackPlayer implements ReactPackage {
-
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Collections.singletonList(new MusicModule(reactContext));
-    }
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Collections.emptyList();
-    }
-
-}

package/android/src/main/java/com/guichaguri/trackplayer/module/MusicEvents.java

@@ -1,55 +0,0 @@
-package com.guichaguri.trackplayer.module;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
-
-/**
- * @author Guichaguri
- */
-public class MusicEvents extends BroadcastReceiver {
-
-    // Media Control Events
-    public static final String BUTTON_PLAY = "remote-play";
-    public static final String BUTTON_PLAY_FROM_ID = "remote-play-id";
-    public static final String BUTTON_PLAY_FROM_SEARCH = "remote-play-search";
-    public static final String BUTTON_PAUSE = "remote-pause";
-    public static final String BUTTON_STOP = "remote-stop";
-    public static final String BUTTON_SKIP = "remote-skip";
-    public static final String BUTTON_SKIP_NEXT = "remote-next";
-    public static final String BUTTON_SKIP_PREVIOUS = "remote-previous";
-    public static final String BUTTON_SEEK_TO = "remote-seek";
-    public static final String BUTTON_SET_RATING = "remote-set-rating";
-    public static final String BUTTON_JUMP_FORWARD = "remote-jump-forward";
-    public static final String BUTTON_JUMP_BACKWARD = "remote-jump-backward";
-    public static final String BUTTON_DUCK = "remote-duck";
-
-    // Playback Events
-    public static final String PLAYBACK_STATE = "playback-state";
-    public static final String PLAYBACK_TRACK_CHANGED = "playback-track-changed";
-    public static final String PLAYBACK_QUEUE_ENDED = "playback-queue-ended";
-    public static final String PLAYBACK_METADATA = "playback-metadata-received";
-    public static final String PLAYBACK_ERROR = "playback-error";
-
-    private final ReactContext reactContext;
-
-    public MusicEvents(ReactContext reactContext) {
-        this.reactContext = reactContext;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        String event = intent.getStringExtra("event");
-        Bundle data = intent.getBundleExtra("data");
-
-        WritableMap map = data != null ? Arguments.fromBundle(data) : null;
-
-        reactContext.getJSModule(RCTDeviceEventEmitter.class).emit(event, map);
-    }
-
-}

package/android/src/main/java/com/guichaguri/trackplayer/module/MusicModule.java

@@ -1,298 +0,0 @@
-package com.guichaguri.trackplayer.module;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.support.v4.media.RatingCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
-import android.util.Log;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import com.facebook.react.bridge.*;
-import com.guichaguri.trackplayer.service.MusicBinder;
-import com.guichaguri.trackplayer.service.MusicService;
-import com.guichaguri.trackplayer.service.Utils;
-import com.guichaguri.trackplayer.service.models.Track;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.*;
-
-/**
- * @author Guichaguri
- */
-public class MusicModule extends ReactContextBaseJavaModule implements ServiceConnection {
-
-    private MusicBinder binder;
-    private MusicEvents eventHandler;
-    private ArrayDeque<Runnable> initCallbacks = new ArrayDeque<>();
-    private boolean connecting = false;
-    private Bundle options;
-
-    public MusicModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Override
-    @Nonnull
-    public String getName() {
-        return "TrackPlayerModule";
-    }
-
-    @Override
-    public void initialize() {
-        ReactContext context = getReactApplicationContext();
-        LocalBroadcastManager manager = LocalBroadcastManager.getInstance(context);
-
-        eventHandler = new MusicEvents(context);
-        manager.registerReceiver(eventHandler, new IntentFilter(Utils.EVENT_INTENT));
-    }
-
-    @Override
-    public void onCatalystInstanceDestroy() {
-        ReactContext context = getReactApplicationContext();
-
-        if(eventHandler != null) {
-            LocalBroadcastManager manager = LocalBroadcastManager.getInstance(context);
-
-            manager.unregisterReceiver(eventHandler);
-            eventHandler = null;
-        }
-    }
-
-    @Override
-    public void onServiceConnected(ComponentName name, IBinder service) {
-        binder = (MusicBinder)service;
-        connecting = false;
-
-        // Reapply options that user set before with updateOptions
-        if (options != null) {
-            binder.updateOptions(options);
-        }
-
-        // Triggers all callbacks
-        while(!initCallbacks.isEmpty()) {
-            binder.post(initCallbacks.remove());
-        }
-    }
-
-    @Override
-    public void onServiceDisconnected(ComponentName name) {
-        binder = null;
-        connecting = false;
-    }
-
-    /**
-     * Waits for a connection to the service and/or runs the {@link Runnable} in the player thread
-     */
-    private void waitForConnection(Runnable r) {
-        if(binder != null) {
-            binder.post(r);
-            return;
-        } else {
-            initCallbacks.add(r);
-        }
-
-        if(connecting) return;
-
-        ReactApplicationContext context = getReactApplicationContext();
-
-        // Binds the service to get a MediaWrapper instance
-        Intent intent = new Intent(context, MusicService.class);
-        //context.startService(intent);
-        try {
-            if (Build.VERSION.SDK_INT >= 26) {
-                context.startForegroundService(intent);
-            } else {
-                context.startService(intent);
-            }
-        }catch(Exception ex){
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                AlarmManager mgr = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
-                Intent i = new Intent(context, MusicService.class);
-                PendingIntent pi = PendingIntent.getForegroundService(context, 0, i, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTimeInMillis(System.currentTimeMillis());
-                calendar.add(Calendar.MILLISECOND, 200);
-                mgr.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), pi);
-            }
-        }
-        intent.setAction(Utils.CONNECT_INTENT);
-        context.bindService(intent, this, 0);
-
-
-
-        connecting = true;
-    }
-
-    /* ****************************** API ****************************** */
-
-    @Nullable
-    @Override
-    public Map<String, Object> getConstants() {
-        Map<String, Object> constants = new HashMap<>();
-
-        // Capabilities
-        constants.put("CAPABILITY_PLAY", PlaybackStateCompat.ACTION_PLAY);
-        constants.put("CAPABILITY_PLAY_FROM_ID", PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID);
-        constants.put("CAPABILITY_PLAY_FROM_SEARCH", PlaybackStateCompat.ACTION_PLAY_FROM_SEARCH);
-        constants.put("CAPABILITY_PAUSE", PlaybackStateCompat.ACTION_PAUSE);
-        constants.put("CAPABILITY_STOP", PlaybackStateCompat.ACTION_STOP);
-        constants.put("CAPABILITY_SEEK_TO", PlaybackStateCompat.ACTION_SEEK_TO);
-        constants.put("CAPABILITY_SKIP", PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM);
-        constants.put("CAPABILITY_SKIP_TO_NEXT", PlaybackStateCompat.ACTION_SKIP_TO_NEXT);
-        constants.put("CAPABILITY_SKIP_TO_PREVIOUS", PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS);
-        constants.put("CAPABILITY_SET_RATING", PlaybackStateCompat.ACTION_SET_RATING);
-        constants.put("CAPABILITY_JUMP_FORWARD", PlaybackStateCompat.ACTION_FAST_FORWARD);
-        constants.put("CAPABILITY_JUMP_BACKWARD", PlaybackStateCompat.ACTION_REWIND);
-
-        // States
-        constants.put("STATE_NONE", PlaybackStateCompat.STATE_NONE);
-        constants.put("STATE_READY", PlaybackStateCompat.STATE_PAUSED);
-        constants.put("STATE_PLAYING", PlaybackStateCompat.STATE_PLAYING);
-        constants.put("STATE_PAUSED", PlaybackStateCompat.STATE_PAUSED);
-        constants.put("STATE_STOPPED", PlaybackStateCompat.STATE_STOPPED);
-        constants.put("STATE_BUFFERING", PlaybackStateCompat.STATE_BUFFERING);
-        constants.put("STATE_CONNECTING", PlaybackStateCompat.STATE_CONNECTING);
-
-        // Rating Types
-        constants.put("RATING_HEART", RatingCompat.RATING_HEART);
-        constants.put("RATING_THUMBS_UP_DOWN", RatingCompat.RATING_THUMB_UP_DOWN);
-        constants.put("RATING_3_STARS", RatingCompat.RATING_3_STARS);
-        constants.put("RATING_4_STARS", RatingCompat.RATING_4_STARS);
-        constants.put("RATING_5_STARS", RatingCompat.RATING_5_STARS);
-        constants.put("RATING_PERCENTAGE", RatingCompat.RATING_PERCENTAGE);
-
-        return constants;
-    }
-
-    @ReactMethod
-    public void destroy() {
-        // Ignore if it was already destroyed
-        if (binder == null && !connecting) return;
-
-        try {
-            if(binder != null) {
-                binder.destroy();
-                binder = null;
-            }
-
-            ReactContext context = getReactApplicationContext();
-            if(context != null) context.unbindService(this);
-        } catch(Exception ex) {
-            // This method shouldn't be throwing unhandled errors even if something goes wrong.
-            Log.e(Utils.LOG, "An error occurred while destroying the service", ex);
-        }
-    }
-
-    @ReactMethod
-    public void updateOptions(ReadableMap data, final Promise callback) {
-        // keep options as we may need them for correct MetadataManager reinitialization later
-        options = Arguments.toBundle(data);
-
-        waitForConnection(() -> {
-            if(binder != null)
-                binder.updateOptions(options);
-            callback.resolve(null);
-        });
-    }
-
-    @ReactMethod
-    public void setNowPlaying(ReadableMap trackMap, final Promise callback) {
-        final Bundle bundle = Arguments.toBundle(trackMap);
-
-        waitForConnection(() -> {
-            try {
-                int state = trackMap.hasKey("state") ? trackMap.getInt("state") : 0;
-
-                long elapsedTime = -1;
-
-                if(trackMap.hasKey("elapsedTime")) {
-                    try {
-                        elapsedTime = Utils.toMillis(trackMap.getDouble("elapsedTime"));
-
-                    }
-                    catch(Exception ex){
-                        elapsedTime = Utils.toMillis((long)trackMap.getInt("elapsedTime"));
-                    }
-                }
-
-                Track track = new Track(getReactApplicationContext(), bundle, binder.getRatingType());
-                binder.getManager().setCurrentTrack(track);
-                binder.getManager().getMetadata().updateMetadata(track);
-                binder.getManager().setState(state, elapsedTime);
-            } catch(Exception ex) {
-                callback.reject("invalid_track_object", ex);
-                return;
-            }
-
-            if(binder != null && binder.getManager() != null && binder.getManager().getCurrentTrack() == null)
-                callback.reject("invalid_track_object", "Track is missing a required key");
-
-            callback.resolve(null);
-        });
-    }
-
-    @ReactMethod
-    public void updatePlayback(ReadableMap trackMap, final Promise callback) {
-        final Bundle bundle = Arguments.toBundle(trackMap);
-
-        waitForConnection(() -> {
-            try {
-                int state = trackMap.hasKey("state") ? trackMap.getInt("state") : 0;
-                long elapsedTime = -1;
-
-                if(trackMap.hasKey("elapsedTime")) {
-                    try {
-                        elapsedTime = Utils.toMillis((long)trackMap.getInt("elapsedTime"));
-                    }
-                    catch(Exception ex){
-                        elapsedTime = Utils.toMillis(trackMap.getDouble("elapsedTime"));
-                    }
-                }
-
-                long duration = -1;
-
-                if(trackMap.hasKey("duration")) {
-                    try {
-                        duration = Utils.toMillis((long)trackMap.getInt("duration"));
-                    }
-                    catch(Exception ex){
-                        duration = Utils.toMillis(trackMap.getDouble("duration"));
-                    }
-                }
-                //update current track duration
-                Track currentTrack = binder.getManager().getCurrentTrack();
-                if(currentTrack != null && duration > -1)
-                {
-                    currentTrack.duration = duration;
-                    binder.getManager().getMetadata().updateMetadata(currentTrack);
-                }
-
-                binder.getManager().setState(state, elapsedTime);
-            } catch (Exception ex) {
-                callback.reject("invalid_track_object", ex);
-                return;
-            }
-
-            if (binder != null && binder.getManager() != null && binder.getManager().getCurrentTrack() == null)
-                callback.reject("invalid_track_object", "Track is missing a required key");
-        });
-    }
-    @ReactMethod
-    public void reset(final Promise callback) {
-        waitForConnection(() -> {
-            if(binder != null && binder.getManager() != null) {
-                binder.getManager().onReset();
-                callback.resolve(null);
-            }
-        });
-    }
-}

package/android/src/main/java/com/guichaguri/trackplayer/service/MusicBinder.java

@@ -1,47 +0,0 @@
-package com.guichaguri.trackplayer.service;
-
-import android.os.Binder;
-import android.os.Bundle;
-import android.os.Handler;
-
-/**
- * @author Guichaguri
- */
-public class MusicBinder extends Binder {
-
-    private final MusicService service;
-    private final MusicManager manager;
-
-    public MusicBinder(MusicService service, MusicManager manager) {
-        this.service = service;
-        this.manager = manager;
-    }
-
-    public void post(Runnable r) {
-        if(service == null)
-            return;
-        
-        if(service.handler == null)
-            service.handler = new Handler();
-
-        service.handler.post(r);
-    }
-
-    public MusicManager getManager(){ return this.manager; }
-
-    public void updateOptions(Bundle bundle) {
-        manager.setStopWithApp(bundle.getBoolean("stopWithApp", false));
-        manager.setAlwaysPauseOnInterruption(bundle.getBoolean("alwaysPauseOnInterruption", false));
-        manager.getMetadata().updateOptions(bundle);
-    }
-
-    public int getRatingType() {
-        return manager.getMetadata().getRatingType();
-    }
-
-    public void destroy() {
-        service.destroy(true);
-        service.stopSelf();
-    }
-
-}