@wwdrew/expo-spotify-sdk 0.8.0 → 2.0.0

package/ios/SpotifyAuthCoordinator.swift

@@ -1,3 +1,4 @@
+import ExpoModulesCore
 import Foundation
 import SpotifyiOS
 
@@ -9,7 +10,7 @@ enum SpotifyError: Error {
   case authInProgress
   case userCancelled
   case spotifyNotInstalled
-  case underlying(Error)
+  case underlying(message: String, cause: Error)
 
   var code: String {
     switch self {
@@ -23,22 +24,54 @@ enum SpotifyError: Error {
 
   var message: String {
     switch self {
-    case .invalidConfiguration(let m): return m
-    case .authInProgress:              return "Another authentication request is already in progress"
-    case .userCancelled:               return "Authentication was cancelled by the user"
-    case .spotifyNotInstalled:         return "The Spotify app is not installed on this device"
-    case .underlying(let err):         return err.localizedDescription
+    case .invalidConfiguration(let m):     return m
+    case .authInProgress:                  return "Another authentication request is already in progress"
+    case .userCancelled:                   return "Authentication was cancelled by the user"
+    case .spotifyNotInstalled:             return "The Spotify app is not installed on this device"
+    case .underlying(let message, _):      return message
+    }
+  }
+
+  /// The original error that caused this failure, if any. Surfaced as the
+  /// JS-facing exception's `cause` so debugging / Sentry breadcrumbs keep the
+  /// full chain rather than collapsing into "undefined reason".
+  var underlyingCause: Error? {
+    switch self {
+    case .underlying(_, let cause): return cause
+    default:                        return nil
     }
   }
 }
 
+/// `Exception` subclass that projects a `SpotifyError`'s `code` and `message`
+/// through `expo-modules-core`'s exception bridge so JS receives the structured
+/// code and a meaningful reason — not the default "undefined reason" placeholder.
+///
+/// Without this wrapper an `AsyncFunction` rejection collapses to
+/// `FunctionCallException` → `cause.reason = "undefined reason"` because the
+/// previously-used `GenericException<String>` does not override `reason`.
+final class SpotifyAuthException: Exception, @unchecked Sendable {
+  private let spotifyCode: String
+  private let spotifyMessage: String
+
+  init(_ error: SpotifyError, file: String = #fileID, line: UInt = #line, function: String = #function) {
+    self.spotifyCode = error.code
+    self.spotifyMessage = error.message
+    super.init(file: file, line: line, function: function)
+    self.cause = error.underlyingCause
+  }
+
+  override var code: String { spotifyCode }
+  override var reason: String { spotifyMessage }
+}
+
 /// `actor` ensures `pending` is mutated only on the actor's serial executor;
 /// no manual locks needed.
 actor SpotifyAuthCoordinator {
   static let shared: SpotifyAuthCoordinator? = SpotifyAuthCoordinator.create()
 
   private let sptConfiguration: SPTConfiguration
-  private let sessionManager: SPTSessionManager
+  nonisolated(unsafe) private let sessionManager: SPTSessionManager
   private let bridge: SpotifySessionDelegateBridge
   private var pending: CheckedContinuation<SPTSession, Error>?
 
@@ -72,7 +105,15 @@ actor SpotifyAuthCoordinator {
   /// Synchronous URL-handler dispatcher used by the AppDelegate / SceneDelegate
   /// subscribers to forward redirects to the SPTSessionManager.
   nonisolated func handleOpenURL(_ url: URL, options: [UIApplication.OpenURLOptionsKey: Any]) -> Bool {
-    sessionManager.application(UIApplication.shared, open: url, options: options)
+    let openSession: () -> Bool = { [self] in
+      MainActor.assumeIsolated {
+        sessionManager.application(UIApplication.shared, open: url, options: options)
+      }
+    }
+    if Thread.isMainThread {
+      return openSession()
+    }
+    return DispatchQueue.main.sync(execute: openSession)
   }
 
   func authenticate(
@@ -167,11 +208,10 @@ final class SpotifySessionDelegateBridge: NSObject, SPTSessionManagerDelegate {
     if description.contains("cancel") {
       return SpotifyError.userCancelled
     }
-    return SpotifyError.underlying(NSError(
-      domain: nsError.domain,
-      code: nsError.code,
-      userInfo: [NSLocalizedDescriptionKey: describeError(nsError)]
-    ))
+    // Keep the original NSError as `cause` so the structured underlying-chain
+    // is preserved (Sentry, debug breadcrumbs); the rendered string goes to
+    // `message` so JS callers get a single human-readable line.
+    return SpotifyError.underlying(message: describeError(nsError), cause: nsError)
   }
 
   /// Build a diagnostic string from an NSError that includes the domain,

package/ios/SpotifyTokenRefreshClient.swift

@@ -1,3 +1,4 @@
+import ExpoModulesCore
 import Foundation
 
 enum SpotifyRefreshError: Error {
@@ -28,6 +29,33 @@ enum SpotifyRefreshError: Error {
       return m
     }
   }
+
+  /// The original error that caused this failure, if any. Surfaced as the
+  /// JS-facing exception's `cause`.
+  var underlyingCause: Error? {
+    switch self {
+    case .network(let err): return err
+    default:                return nil
+    }
+  }
+}
+
+/// `Exception` subclass that projects a `SpotifyRefreshError`'s `code` and
+/// `message` through `expo-modules-core` so JS sees the structured taxonomy
+/// instead of "undefined reason". Mirrors `SpotifyAuthException`.
+final class SpotifyRefreshException: Exception, @unchecked Sendable {
+  private let spotifyCode: String
+  private let spotifyMessage: String
+
+  init(_ error: SpotifyRefreshError, file: String = #fileID, line: UInt = #line, function: String = #function) {
+    self.spotifyCode = error.code
+    self.spotifyMessage = error.message
+    super.init(file: file, line: line, function: function)
+    self.cause = error.underlyingCause
+  }
+
+  override var code: String { spotifyCode }
+  override var reason: String { spotifyMessage }
 }
 
 struct SpotifyRefreshResult {

package/package.json

@@ -1,18 +1,27 @@
 {
   "name": "@wwdrew/expo-spotify-sdk",
-  "version": "0.8.0",
-  "description": "Expo module wrapping the native Spotify iOS (v5) and Android (v4) SDKs for OAuth authentication",
+  "version": "2.0.0",
+  "description": "Expo module wrapping the native Spotify iOS (v5) and Android (v4) SDKs for OAuth authentication and App Remote playback control",
   "main": "build/index.js",
   "types": "build/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./build/index.d.ts",
+      "default": "./build/index.js"
+    },
+    "./plugin": {
+      "types": "./plugin/build/index.d.ts",
+      "default": "./plugin/index.js"
+    }
+  },
   "scripts": {
-    "build": "expo-module build",
-    "clean": "expo-module clean",
-    "lint": "expo-module lint",
-    "test": "expo-module test plugin",
-    "prepare": "expo-module prepare",
-    "prepublishOnly": "expo-module prepublishOnly",
-    "typecheck": "expo-module typecheck",
-    "expo-module": "expo-module",
+    "build": "tsc",
+    "build:plugin": "tsc -p plugin/tsconfig.json",
+    "clean": "rm -rf build plugin/build",
+    "lint": "eslint src",
+    "test": "jest --rootDir plugin --config plugin/jest.config.js",
+    "prepublishOnly": "yarn clean && yarn build && yarn build:plugin",
+    "typecheck": "tsc --noEmit",
     "open:ios": "open -a \"Xcode\" example/ios",
     "open:android": "open -a \"Android Studio\" example/android"
   },
@@ -39,17 +48,21 @@
   "license": "MIT",
   "homepage": "https://github.com/wwdrew/expo-spotify-sdk#readme",
   "devDependencies": {
-    "@expo/config-plugins": "^55.0.8",
-    "@types/react": "^18.0.25",
+    "@babel/runtime": "^7.29.7",
+    "@expo/config-plugins": "^56.0.8",
+    "@types/react": "^19.0.0",
+    "babel-preset-expo": "~56.0.0",
     "eslint": "^9.0.0",
-    "expo-module-scripts": "^55.0.2",
-    "expo-modules-core": "^3.0.30",
+    "expo-module-scripts": "^56.0.2",
+    "expo-modules-core": "^56.0.13",
     "jest": "^29.7.0",
-    "prettier": "^3.0.0"
+    "prettier": "^3.0.0",
+    "typescript": "^5.9.0"
   },
   "peerDependencies": {
     "expo": "*",
     "react": "*",
     "react-native": "*"
-  }
+  },
+  "dependencies": {}
 }

package/plugin/build/index.d.ts

@@ -1,4 +1,21 @@
-import { ConfigPlugin } from "@expo/config-plugins";
 import { SpotifyConfig } from "./types";
-export declare const withSpotifySdkConfig: ConfigPlugin<SpotifyConfig>;
-export default withSpotifySdkConfig;
+/**
+ * Typed config plugin helper for `app.config.ts` (Expo SDK 56+).
+ *
+ * @example
+ * import withSpotifySdk from "@wwdrew/expo-spotify-sdk/plugin";
+ *
+ * export default ({ config }) => ({
+ *   ...config,
+ *   plugins: [
+ *     withSpotifySdk({
+ *       clientID: "your-spotify-client-id",
+ *       scheme: "myapp",
+ *       host: "spotify-auth",
+ *     }),
+ *   ],
+ * });
+ */
+declare const _default: (props: SpotifyConfig) => [string, SpotifyConfig];
+export default _default;
+export type { SpotifyConfig, SpotifyScopes } from "./types";

package/plugin/build/index.js

@@ -1,27 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSpotifySdkConfig = void 0;
-const withSpotifyAndroidAppBuildGradle_1 = require("./android/withSpotifyAndroidAppBuildGradle");
-const withSpotifyConfigValues_1 = require("./ios/withSpotifyConfigValues");
-const withSpotifyQueryScheme_1 = require("./ios/withSpotifyQueryScheme");
-const withSpotifyURLScheme_1 = require("./ios/withSpotifyURLScheme");
-const withSpotifySdkConfig = (config, spotifyConfig) => {
-    if (!spotifyConfig.host) {
-        throw new Error("Missing required Spotify config value: host");
-    }
-    if (!spotifyConfig.scheme) {
-        throw new Error("Missing required Spotify config value: scheme");
-    }
-    if (!spotifyConfig.clientID) {
-        throw new Error("Missing required Spotify config value: clientID");
-    }
-    // Android specific
-    config = (0, withSpotifyAndroidAppBuildGradle_1.withSpotifyAndroidAppBuildGradle)(config, spotifyConfig);
-    // iOS specific
-    config = (0, withSpotifyConfigValues_1.withSpotifyConfigValues)(config, spotifyConfig);
-    config = (0, withSpotifyQueryScheme_1.withSpotifyQueryScheme)(config, spotifyConfig);
-    config = (0, withSpotifyURLScheme_1.withSpotifyURLScheme)(config, spotifyConfig);
-    return config;
-};
-exports.withSpotifySdkConfig = withSpotifySdkConfig;
-exports.default = exports.withSpotifySdkConfig;
+const PACKAGE_NAME = "@wwdrew/expo-spotify-sdk";
+/**
+ * Typed config plugin helper for `app.config.ts` (Expo SDK 56+).
+ *
+ * @example
+ * import withSpotifySdk from "@wwdrew/expo-spotify-sdk/plugin";
+ *
+ * export default ({ config }) => ({
+ *   ...config,
+ *   plugins: [
+ *     withSpotifySdk({
+ *       clientID: "your-spotify-client-id",
+ *       scheme: "myapp",
+ *       host: "spotify-auth",
+ *     }),
+ *   ],
+ * });
+ */
+exports.default = (props) => [
+    PACKAGE_NAME,
+    props,
+];

package/plugin/build/types.d.ts

@@ -8,7 +8,23 @@ export type SpotifyScopes = "ugc-image-upload" | "user-read-playback-state" | "u
  * Configuration accepted by the `@wwdrew/expo-spotify-sdk` Expo config plugin.
  *
  * @example
- * // app.config.ts
+ * // app.config.ts (Expo SDK 56+ — typed import)
+ * import withSpotifySdk from "@wwdrew/expo-spotify-sdk/plugin";
+ *
+ * export default ({ config }) => ({
+ *   ...config,
+ *   plugins: [
+ *     withSpotifySdk({
+ *       clientID: "<spotify-client-id>",
+ *       scheme: "myapp",
+ *       host: "spotify-auth",
+ *       redirectPathPattern: ".*",
+ *     }),
+ *   ],
+ * });
+ *
+ * @example
+ * // app.config.ts / app.json (string tuple — all SDK versions)
  * export default {
  *   plugins: [
  *     ["@wwdrew/expo-spotify-sdk", {

package/plugin/build/withSpotifySdkConfig.d.ts

@@ -0,0 +1,4 @@
+import { ConfigPlugin } from "@expo/config-plugins";
+import { SpotifyConfig } from "./types";
+export declare const withSpotifySdkConfig: ConfigPlugin<SpotifyConfig>;
+export default withSpotifySdkConfig;

package/plugin/build/withSpotifySdkConfig.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withSpotifySdkConfig = void 0;
+const withSpotifyAndroidAppBuildGradle_1 = require("./android/withSpotifyAndroidAppBuildGradle");
+const withSpotifyConfigValues_1 = require("./ios/withSpotifyConfigValues");
+const withSpotifyQueryScheme_1 = require("./ios/withSpotifyQueryScheme");
+const withSpotifyURLScheme_1 = require("./ios/withSpotifyURLScheme");
+const withSpotifySdkConfig = (config, spotifyConfig) => {
+    if (!spotifyConfig.host) {
+        throw new Error("Missing required Spotify config value: host");
+    }
+    if (!spotifyConfig.scheme) {
+        throw new Error("Missing required Spotify config value: scheme");
+    }
+    if (!spotifyConfig.clientID) {
+        throw new Error("Missing required Spotify config value: clientID");
+    }
+    // Android specific
+    config = (0, withSpotifyAndroidAppBuildGradle_1.withSpotifyAndroidAppBuildGradle)(config, spotifyConfig);
+    // iOS specific
+    config = (0, withSpotifyConfigValues_1.withSpotifyConfigValues)(config, spotifyConfig);
+    config = (0, withSpotifyQueryScheme_1.withSpotifyQueryScheme)(config, spotifyConfig);
+    config = (0, withSpotifyURLScheme_1.withSpotifyURLScheme)(config, spotifyConfig);
+    return config;
+};
+exports.withSpotifySdkConfig = withSpotifySdkConfig;
+exports.default = exports.withSpotifySdkConfig;