@volley/vwr-loader 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volley/vwr-loader",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "type": "module",
   "description": "Vite-based VWR loader for all Volley platforms",
   "main": "dist/index.js",
@@ -13,31 +13,42 @@
     "./envDefaults": "./dist/envDefaults.js"
   },
   "bin": {
-    "build-loader": "./scripts/build.js"
+    "build-loader": "./dist/cli.js"
   },
+  "files": [
+    "dist",
+    "src"
+  ],
   "scripts": {
-    "build": "tsc && vite build",
+    "build": "tsc && vite build && vite build -c vite.cli.config.ts && chmod +x dist/cli.js",
+    "build:cli": "vite build -c vite.cli.config.ts",
     "build:loader": "vite build",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest",
     "format": "eslint . --fix",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "semantic-release": "semantic-release"
   },
   "dependencies": {
     "commander": "^12.0.0",
     "dotenv": "^16.0.0",
     "fs-extra": "^11.0.0",
-    "tsx": "^4.7.0",
     "vite": "^5.0.0"
   },
   "devDependencies": {
+    "tsx": "^4.7.0",
     "@platform/eslint-config": "workspace:*",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/npm": "^12.0.1",
     "@types/fs-extra": "^11.0.0",
     "@types/node": "^20.0.0",
+    "@volley/vwr": "workspace:*",
     "eslint": "^9.25.1",
     "jsdom": "^24.1.3",
     "prettier": "~3.0.3",
+    "semantic-release": "^24.2.3",
+    "semantic-release-monorepo": "^8.0.2",
     "typescript": "^5.0.0",
     "vitest": "^1.0.0"
   }

package/src/amplitudeFlagFetcher.test.ts

@@ -1,26 +1,16 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
 
 import { fetchAmplitudeFlags } from "./amplitudeFlagFetcher"
-import * as getShellVersionModule from "./getShellVersion"
 
 describe("fetchAmplitudeFlags", () => {
     const mockFetch = vi.fn()
-    const originalLocation = window.location
 
     beforeEach(() => {
         global.fetch = mockFetch
         vi.clearAllMocks()
-
-        // Mock window.location for getShellVersion
-        delete (window as any).location
-        window.location = {
-            ...originalLocation,
-            href: "http://localhost:3000/?version=1.0.0",
-        } as Location
     })
 
     afterEach(() => {
-        window.location = originalLocation
         vi.restoreAllMocks()
     })
 
@@ -36,9 +26,12 @@ describe("fetchAmplitudeFlags", () => {
             }),
         })
 
-        const result = await fetchAmplitudeFlags("device-123", "SAMSUNG_TV", {
-            apiKey: "test-key",
-        })
+        const result = await fetchAmplitudeFlags(
+            "device-123",
+            "SAMSUNG_TV",
+            { apiKey: "test-key" },
+            "1.0.0"
+        )
 
         expect(result).toEqual({
             "vwr-enabled": true,
@@ -98,45 +91,17 @@ describe("fetchAmplitudeFlags", () => {
         })
     })
 
-    it("auto-fetches shell version when not provided", async () => {
-        const getShellVersionSpy = vi.spyOn(
-            getShellVersionModule,
-            "getShellVersion"
-        )
-
-        mockFetch.mockResolvedValueOnce({
-            ok: true,
-            json: async () => ({
-                "vwr-enabled": {
-                    payload: {
-                        "vwr-enabled": false,
-                    },
-                },
-            }),
-        })
-
-        await fetchAmplitudeFlags("device-456", "LG_TV", {
-            apiKey: "test-key",
-        })
-
-        expect(getShellVersionSpy).toHaveBeenCalledWith("LG_TV")
-
-        const callArgs = mockFetch.mock.calls[0]
-        const url = new URL(callArgs[0])
-        const context = JSON.parse(url.searchParams.get("context") || "{}")
-
-        expect(context.user_properties).toHaveProperty("nativeShellAppVersion")
-    })
-
     it("returns safe defaults on timeout", async () => {
         mockFetch.mockImplementationOnce(
             () => new Promise((resolve) => setTimeout(resolve, 3000))
         )
 
-        const result = await fetchAmplitudeFlags("device-123", "FIRE_TV", {
-            apiKey: "test-key",
-            timeout: 100,
-        })
+        const result = await fetchAmplitudeFlags(
+            "device-123",
+            "FIRE_TV",
+            { apiKey: "test-key", timeout: 100 },
+            "1.0.0"
+        )
 
         expect(result).toEqual({
             "vwr-enabled": false,
@@ -149,9 +114,12 @@ describe("fetchAmplitudeFlags", () => {
             status: 500,
         })
 
-        const result = await fetchAmplitudeFlags("device-123", "MOBILE", {
-            apiKey: "test-key",
-        })
+        const result = await fetchAmplitudeFlags(
+            "device-123",
+            "MOBILE",
+            { apiKey: "test-key" },
+            "1.0.0"
+        )
 
         expect(result).toEqual({
             "vwr-enabled": false,
@@ -161,9 +129,12 @@ describe("fetchAmplitudeFlags", () => {
     it("returns safe defaults on network error", async () => {
         mockFetch.mockRejectedValueOnce(new Error("Network error"))
 
-        const result = await fetchAmplitudeFlags("device-123", "MOBILE", {
-            apiKey: "test-key",
-        })
+        const result = await fetchAmplitudeFlags(
+            "device-123",
+            "MOBILE",
+            { apiKey: "test-key" },
+            "1.0.0"
+        )
 
         expect(result).toEqual({
             "vwr-enabled": false,
@@ -176,9 +147,12 @@ describe("fetchAmplitudeFlags", () => {
             json: async () => ({}),
         })
 
-        const result = await fetchAmplitudeFlags("device-123", "LG_TV", {
-            apiKey: "test-key",
-        })
+        const result = await fetchAmplitudeFlags(
+            "device-123",
+            "LG_TV",
+            { apiKey: "test-key" },
+            "1.0.0"
+        )
 
         expect(result).toEqual({
             "vwr-enabled": false,
@@ -193,9 +167,12 @@ describe("fetchAmplitudeFlags", () => {
             }),
         })
 
-        const result = await fetchAmplitudeFlags("device-123", "LG_TV", {
-            apiKey: "test-key",
-        })
+        const result = await fetchAmplitudeFlags(
+            "device-123",
+            "LG_TV",
+            { apiKey: "test-key" },
+            "1.0.0"
+        )
 
         expect(result).toEqual({
             "vwr-enabled": false,

package/src/amplitudeFlagFetcher.ts

@@ -1,4 +1,4 @@
-import { getShellVersion } from "./getShellVersion"
+import { defaultLogger, type Logger } from "./logger"
 
 export interface AmplitudeConfig {
     apiKey: string
@@ -20,14 +20,16 @@ export interface FlagResult {
  * @param deviceId - Unique device identifier
  * @param platform - Platform name (samsung, lg, firetv, ios, android)
  * @param config - Amplitude configuration
- * @param shellVersion - Optional shell version (if not provided, will be fetched automatically)
+ * @param shellVersion - Shell version for flag targeting
+ * @param logger - Optional logger, defaults to console
  * @returns Flag values with safe defaults on error
  */
 export async function fetchAmplitudeFlags(
     deviceId: string,
     platform: string,
     config: AmplitudeConfig,
-    shellVersion?: string
+    shellVersion: string,
+    logger: Logger = defaultLogger
 ): Promise<FlagResult> {
     const {
         apiKey,
@@ -35,28 +37,26 @@ export async function fetchAmplitudeFlags(
         timeout = 2000,
     } = config
 
+    // Build context with user_properties
+    const context = {
+        user_properties: {
+            platformEnum: platform,
+            nativeShellAppVersion: shellVersion,
+        },
+    }
+
+    // Build query parameters
+    const params = new URLSearchParams({
+        user_id: deviceId,
+        flag_keys: "vwr-enabled",
+        context: JSON.stringify(context),
+    })
+
+    // Start timeout immediately before the fetch call for accurate timing
     const controller = new AbortController()
     const timeoutId = setTimeout(() => controller.abort(), timeout)
 
     try {
-        // Get shell version if not provided
-        const version = shellVersion ?? (await getShellVersion(platform))
-
-        // Build context with user_properties
-        const context = {
-            user_properties: {
-                platformEnum: platform,
-                nativeShellAppVersion: version,
-            },
-        }
-
-        // Build query parameters
-        const params = new URLSearchParams({
-            user_id: deviceId,
-            flag_keys: "vwr-enabled",
-            context: JSON.stringify(context),
-        })
-
         const response = await fetch(`${apiUrl}?${params}`, {
             method: "GET",
             headers: {
@@ -78,7 +78,16 @@ export async function fetchAmplitudeFlags(
                 data["vwr-enabled"]?.payload?.["vwr-enabled"] ?? false,
         }
     } catch (error) {
-        console.error("[Shell] Amplitude flag fetch failed:", error)
+        clearTimeout(timeoutId)
+
+        // Provide clear warning message for abort vs other errors
+        if (error instanceof Error && error.name === "AbortError") {
+            logger.warn(
+                `[Shell] Amplitude flag fetch aborted because it took longer than ${timeout}ms`
+            )
+        } else {
+            logger.warn("[Shell] Amplitude flag fetch failed:", { error })
+        }
 
         // Return safe defaults - runs legacy path
         return {

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,8 +55,20 @@ 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,
     production: prodConfig, // Alias for prod
+    qa: {
+        // QA uses staging infrastructure
+        hubUrl: "https://game-clients-staging.volley.tv/hub",
+        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: "",
+    },
 }

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,
@@ -148,11 +166,25 @@ describe("getDeviceId", () => {
     })
 
     describe("MOBILE platform", () => {
-        it("returns device ID from NativeBridge when available", async () => {
-            const mockDeviceId = "native-device-123"
-            Object.defineProperty(window, "NativeBridge", {
+        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("MOBILE")
+            expect(result).toBe(mockDeviceId)
+        })
+
+        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,
@@ -162,12 +194,35 @@ describe("getDeviceId", () => {
             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: {
+                    phoneDeviceId: "android-id",
+                },
+                writable: true,
+                configurable: true,
+            })
+
+            const result = await getDeviceId("MOBILE")
+            expect(result).toBe("ios-id")
+        })
+
+        it("returns null when no app context is available", async () => {
+            const result = await getDeviceId("MOBILE")
+            expect(result).toBeNull()
+        })
+
+        it("returns null when phoneDeviceId is empty", async () => {
+            Object.defineProperty(window, "iosAppContext", {
                 value: {
-                    getDeviceId: vi
-                        .fn()
-                        .mockRejectedValue(new Error("Native error")),
+                    phoneDeviceId: "",
                 },
                 writable: true,
                 configurable: true,

package/src/getDeviceId.ts

@@ -7,12 +7,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 +36,9 @@ 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":
+        case "MOBILE": // Legacy/Generic
             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 ExtendedWindow).iosAppContext?.phoneDeviceId
+    if (iosId && iosId.trim()) {
+        return iosId
+    }
+
+    // Try Android (check both window and window.top for iframe scenarios)
+    const androidContext = (window as ExtendedWindow).androidAppContext
     try {
-        if (!window.NativeBridge?.getDeviceId) {
-            return null
+        const androidId =
+            androidContext?.phoneDeviceId ??
+            (window.top as ExtendedWindow | 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 ExtendedWindow).iosAppContext,
+        androidAppContext: !!androidContext,
+    })
     return null
 }
 
@@ -209,18 +227,25 @@ interface LGDeviceIdResponse {
     }>
 }
 
+/**
+ * Extended window interface for mobile app context
+ * Matches the types from @volley/sdk ExtendedWindow.ts
+ */
+interface ExtendedWindow extends Window {
+    iosAppContext?: {
+        phoneDeviceId: string
+    }
+    androidAppContext?: {
+        phoneDeviceId: 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