@volley/vwr-loader 1.0.5 → 1.1.0

package/src/envDefaults.ts

@@ -3,7 +3,10 @@ export interface EnvConfig {
     vwrUrl: string
     configUrl: string
     configFile: string
+    platformApiUrl: string
+    platformAuthApiUrl: string
     amplitudeKey: string // Used for amplitude flag fetch, not part of VWRConfig
+    trustedOrigins?: string[]
 }
 
 const CONFIG_URL_DEFAULT = "https://vwr.volley.tv/config/"
@@ -15,22 +18,36 @@ const prodConfig: EnvConfig = {
     vwrUrl: `https://vwr.volley.tv/${VWR_URL_PATH_DEFAULT}`,
     configUrl: CONFIG_URL_DEFAULT,
     configFile: CONFIG_FILE_DEFAULT,
+    platformApiUrl: "https://platform.volley-services.net",
+    platformAuthApiUrl: "https://auth.volley.tv",
     amplitudeKey: "",
 }
 
 export const ENV_DEFAULTS: Record<string, EnvConfig> = {
     local: {
-        hubUrl: "http://localhost:5173",
-        vwrUrl: "http://localhost:5174/vwr.js",
-        configUrl: "http://localhost:5174/config/",
-        configFile: CONFIG_FILE_DEFAULT,
+        hubUrl: import.meta.env.VITE_HUB_URL || "http://localhost:5173",
+        vwrUrl: import.meta.env.VITE_VWR_URL || "http://localhost:5174/vwr.js",
+        configUrl:
+            import.meta.env.VITE_CONFIG_URL || "http://localhost:5174/config/",
+        configFile: import.meta.env.VITE_CONFIG_FILE || CONFIG_FILE_DEFAULT,
+        platformApiUrl:
+            import.meta.env.VITE_PLATFORM_API_URL ||
+            "https://platform-dev.volley-services.net",
+        platformAuthApiUrl:
+            import.meta.env.VITE_PLATFORM_AUTH_API_URL ||
+            "https://auth-dev.volley.tv",
         amplitudeKey: "client-uJJVW3zKPC1G9kqPhUumLnZN6eaY42iQ",
+        trustedOrigins: import.meta.env.VITE_TRUSTED_ORIGINS?.split(",").filter(
+            Boolean
+        ),
     },
     dev: {
         hubUrl: "https://game-clients-dev.volley.tv/hub",
         vwrUrl: `https://vwr.volley.tv/dev/${VWR_URL_PATH_DEFAULT}`,
         configUrl: CONFIG_URL_DEFAULT,
         configFile: CONFIG_FILE_DEFAULT,
+        platformApiUrl: "https://platform-dev.volley-services.net",
+        platformAuthApiUrl: "https://auth-dev.volley.tv",
         amplitudeKey: "client-uJJVW3zKPC1G9kqPhUumLnZN6eaY42iQ",
     },
     staging: {
@@ -38,6 +55,8 @@ export const ENV_DEFAULTS: Record<string, EnvConfig> = {
         vwrUrl: `https://vwr.volley.tv/staging/${VWR_URL_PATH_DEFAULT}`,
         configUrl: CONFIG_URL_DEFAULT,
         configFile: CONFIG_FILE_DEFAULT,
+        platformApiUrl: "https://platform-staging.volley-services.net",
+        platformAuthApiUrl: "https://auth-staging.volley.tv",
         amplitudeKey: "",
     },
     prod: prodConfig,

package/src/getDeviceId.test.ts

@@ -6,8 +6,9 @@ describe("getDeviceId", () => {
     beforeEach(() => {
         vi.clearAllMocks()
         // Clean up window properties
-        delete (window as any).DeviceInfo
-        delete (window as any).NativeBridge
+        delete (window as any).Capacitor
+        delete (window as any).iosAppContext
+        delete (window as any).androidAppContext
         delete (window as any).webapis
         delete (window as any).webOSDev
         delete (window as any).webOS
@@ -15,21 +16,26 @@ describe("getDeviceId", () => {
 
     afterEach(() => {
         vi.restoreAllMocks()
-        delete (window as any).DeviceInfo
-        delete (window as any).NativeBridge
+        delete (window as any).Capacitor
+        delete (window as any).iosAppContext
+        delete (window as any).androidAppContext
         delete (window as any).webapis
         delete (window as any).webOSDev
         delete (window as any).webOS
     })
 
     describe("FIRE_TV platform", () => {
-        it("returns device ID from DeviceInfo.getAndroidId when available", async () => {
+        it("returns device ID from Capacitor DeviceInfo.getAndroidId when available", async () => {
             const mockAndroidId = "firetv-android-id-123"
-            Object.defineProperty(window, "DeviceInfo", {
+            Object.defineProperty(window, "Capacitor", {
                 value: {
-                    getAndroidId: vi
-                        .fn()
-                        .mockResolvedValue({ androidId: mockAndroidId }),
+                    Plugins: {
+                        DeviceInfo: {
+                            getAndroidId: vi.fn().mockResolvedValue({
+                                androidId: mockAndroidId,
+                            }),
+                        },
+                    },
                 },
                 writable: true,
                 configurable: true,
@@ -40,11 +46,17 @@ describe("getDeviceId", () => {
         })
 
         it("returns null when DeviceInfo throws error", async () => {
-            Object.defineProperty(window, "DeviceInfo", {
+            Object.defineProperty(window, "Capacitor", {
                 value: {
-                    getAndroidId: vi
-                        .fn()
-                        .mockRejectedValue(new Error("DeviceInfo error")),
+                    Plugins: {
+                        DeviceInfo: {
+                            getAndroidId: vi
+                                .fn()
+                                .mockRejectedValue(
+                                    new Error("DeviceInfo error")
+                                ),
+                        },
+                    },
                 },
                 writable: true,
                 configurable: true,
@@ -55,9 +67,15 @@ describe("getDeviceId", () => {
         })
 
         it("returns null when DeviceInfo returns empty", async () => {
-            Object.defineProperty(window, "DeviceInfo", {
+            Object.defineProperty(window, "Capacitor", {
                 value: {
-                    getAndroidId: vi.fn().mockResolvedValue({ androidId: "" }),
+                    Plugins: {
+                        DeviceInfo: {
+                            getAndroidId: vi
+                                .fn()
+                                .mockResolvedValue({ androidId: "" }),
+                        },
+                    },
                 },
                 writable: true,
                 configurable: true,
@@ -147,33 +165,77 @@ describe("getDeviceId", () => {
         })
     })
 
-    describe("MOBILE platform", () => {
-        it("returns device ID from NativeBridge when available", async () => {
-            const mockDeviceId = "native-device-123"
-            Object.defineProperty(window, "NativeBridge", {
+    describe("IOS_MOBILE platform", () => {
+        it("returns device ID from iosAppContext when available", async () => {
+            const mockDeviceId = "ios-device-123"
+            Object.defineProperty(window, "iosAppContext", {
+                value: {
+                    phoneDeviceId: mockDeviceId,
+                },
+                writable: true,
+                configurable: true,
+            })
+
+            const result = await getDeviceId("IOS_MOBILE")
+            expect(result).toBe(mockDeviceId)
+        })
+
+        it("returns null when no app context is available", async () => {
+            const result = await getDeviceId("IOS_MOBILE")
+            expect(result).toBeNull()
+        })
+
+        it("returns null when phoneDeviceId is empty", async () => {
+            Object.defineProperty(window, "iosAppContext", {
+                value: {
+                    phoneDeviceId: "",
+                },
+                writable: true,
+                configurable: true,
+            })
+
+            const result = await getDeviceId("IOS_MOBILE")
+            expect(result).toBeNull()
+        })
+    })
+
+    describe("ANDROID_MOBILE platform", () => {
+        it("returns device ID from androidAppContext when available", async () => {
+            const mockDeviceId = "android-device-123"
+            Object.defineProperty(window, "androidAppContext", {
                 value: {
-                    getDeviceId: vi.fn().mockResolvedValue(mockDeviceId),
+                    phoneDeviceId: mockDeviceId,
                 },
                 writable: true,
                 configurable: true,
             })
 
-            const result = await getDeviceId("MOBILE")
+            const result = await getDeviceId("ANDROID_MOBILE")
             expect(result).toBe(mockDeviceId)
         })
 
-        it("returns null when NativeBridge throws error", async () => {
-            Object.defineProperty(window, "NativeBridge", {
+        it("prefers iosAppContext over androidAppContext", async () => {
+            Object.defineProperty(window, "iosAppContext", {
+                value: {
+                    phoneDeviceId: "ios-id",
+                },
+                writable: true,
+                configurable: true,
+            })
+            Object.defineProperty(window, "androidAppContext", {
                 value: {
-                    getDeviceId: vi
-                        .fn()
-                        .mockRejectedValue(new Error("Native error")),
+                    phoneDeviceId: "android-id",
                 },
                 writable: true,
                 configurable: true,
             })
 
-            const result = await getDeviceId("MOBILE")
+            const result = await getDeviceId("ANDROID_MOBILE")
+            expect(result).toBe("ios-id")
+        })
+
+        it("returns null when no app context is available", async () => {
+            const result = await getDeviceId("ANDROID_MOBILE")
             expect(result).toBeNull()
         })
     })

package/src/getDeviceId.ts

@@ -1,4 +1,5 @@
 import { defaultLogger, type Logger } from "./logger"
+import type { LGDeviceIdResponse, MobileExtendedWindow } from "./types"
 
 /**
  * Get a unique device identifier for the current platform.
@@ -7,12 +8,12 @@ import { defaultLogger, type Logger } from "./logger"
  *
  * Platform handling:
  * - FireTV: DeviceInfo (Capacitor plugin)
- * - Android/iOS: NativeBridge
+ * - Android/iOS: window.iosAppContext / window.androidAppContext (phoneDeviceId)
  * - Samsung TV: webapis
  * - LG TV: webOS Luna service
  * - Web: localStorage (with generated UUID fallback)
  *
- * @param platform - Platform identifier ('FIRE_TV', 'SAMSUNG_TV', 'LG_TV', 'MOBILE', 'WEB')
+ * @param platform - Platform identifier ('FIRE_TV', 'SAMSUNG_TV', 'LG_TV', 'ANDROID_MOBILE', 'IOS_MOBILE', 'WEB')
  * @param logger - Optional logger for error reporting. Defaults to defaultLogger.
  * @returns A promise that resolves to a unique device identifier string, or null if retrieval fails
  *
@@ -36,7 +37,8 @@ export async function getDeviceId(
             return await getSamsungDeviceId(logger)
         case "LG_TV":
             return await getLGDeviceId(logger)
-        case "MOBILE": // iOS and Android
+        case "ANDROID_MOBILE":
+        case "IOS_MOBILE":
             return await getMobileDeviceId(logger)
         case "WEB":
             return getLocalStorageDeviceId()
@@ -84,24 +86,40 @@ async function getFireTVDeviceId(logger: Logger): Promise<string | null> {
 }
 
 /**
- * Attempt to get device ID from Native Bridge (Android/iOS)
+ * Attempt to get device ID from mobile app context (Android/iOS)
+ *
+ * iOS exposes phoneDeviceId via window.iosAppContext
+ * Android exposes phoneDeviceId via window.androidAppContext (also check window.top for iframes)
  */
-async function getMobileDeviceId(logger: Logger): Promise<string | null> {
+function getMobileDeviceId(logger: Logger): string | null {
+    // Try iOS first
+    const iosId = (window as MobileExtendedWindow).iosAppContext?.phoneDeviceId
+    if (iosId && iosId.trim()) {
+        return iosId
+    }
+
+    // Try Android (check both window and window.top for iframe scenarios)
+    const androidContext = (window as MobileExtendedWindow).androidAppContext
     try {
-        if (!window.NativeBridge?.getDeviceId) {
-            return null
+        const androidId =
+            androidContext?.phoneDeviceId ??
+            (window.top as MobileExtendedWindow | null)?.androidAppContext
+                ?.phoneDeviceId
+        if (androidId && androidId.trim()) {
+            return androidId
         }
-
-        const id = await window.NativeBridge.getDeviceId()
-        if (id && id.trim()) {
-            return id
-        } else {
-            logger.error("NativeBridge.getDeviceId returned empty")
+    } catch {
+        // window.top access can throw if cross-origin
+        const androidId = androidContext?.phoneDeviceId
+        if (androidId && androidId.trim()) {
+            return androidId
         }
-    } catch (error) {
-        const message = "NativeBridge.getDeviceId failed:"
-        logger.error(message, { error })
     }
+
+    logger.error("[VWR:MobileDeviceId] phoneDeviceId not found", {
+        iosAppContext: !!(window as MobileExtendedWindow).iosAppContext,
+        androidAppContext: !!androidContext,
+    })
     return null
 }
 
@@ -202,45 +220,4 @@ async function getLGDeviceId(logger: Logger): Promise<string | null> {
     })
 }
 
-// Type definitions for LG Luna service response
-interface LGDeviceIdResponse {
-    idList?: Array<{
-        idValue?: string
-    }>
-}
-
-// Type augmentation for platform-specific APIs
-// Note: Capacitor types are declared in getShellVersion.ts with index signatures
-// to allow extensibility. Additional methods used here are accessed via
-// the index signatures [key: string]: any
-declare global {
-    interface Window {
-        DeviceInfo?: {
-            getAndroidId: () => Promise<{ androidId: string }>
-        }
-        NativeBridge?: {
-            getDeviceId: () => Promise<string>
-        }
-        webapis?: {
-            productinfo?: {
-                getDuid: () => string
-            }
-        }
-        webOS?: {
-            service?: {
-                request: (
-                    uri: string,
-                    options: {
-                        method?: string
-                        parameters?: Record<string, unknown>
-                        onSuccess?: (response: LGDeviceIdResponse) => void
-                        onFailure?: (error: { errorText?: string }) => void
-                        subscribe?: boolean
-                    }
-                ) => {
-                    cancel: () => void
-                }
-            }
-        }
-    }
-}
+// Types imported from ./types.ts