@volley/vwr-loader 1.0.4 → 1.0.6

package/src/amplitudeFlagFetcher.test.ts

@@ -1,35 +1,20 @@
 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()
     })
 
     it("fetches flags successfully from Amplitude with context", async () => {
-        // Mock getShellVersion to return expected version for SAMSUNG_TV
-        vi.spyOn(getShellVersionModule, "getShellVersion").mockResolvedValue(
-            "1.0.0"
-        )
-
         mockFetch.mockResolvedValueOnce({
             ok: true,
             json: async () => ({
@@ -41,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,
@@ -103,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,
@@ -154,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,
@@ -166,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,
@@ -181,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,
@@ -198,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

@@ -61,4 +61,14 @@ export const ENV_DEFAULTS: Record<string, EnvConfig> = {
     },
     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.ts

@@ -66,22 +66,20 @@ function getLocalStorageDeviceId(): string {
  */
 async function getFireTVDeviceId(logger: Logger): Promise<string | null> {
     try {
-        // Access via Capacitor.Plugins (standard Capacitor plugin access)
-        const Capacitor = (window as any).Capacitor
-        const DeviceInfo = Capacitor?.Plugins?.DeviceInfo
-
-        if (!DeviceInfo?.getAndroidId) {
+        if (!window.Capacitor?.Plugins?.DeviceInfo?.getAndroidId) {
             return null
         }
 
-        const result = await DeviceInfo.getAndroidId()
+        const result = await window.Capacitor.Plugins.DeviceInfo.getAndroidId()
         if (result?.androidId && result.androidId.trim()) {
             return result.androidId
         } else {
-            logger.error("DeviceInfo.getAndroidId returned empty")
+            logger.error(
+                "Capacitor.Plugins.DeviceInfo.getAndroidId returned empty"
+            )
         }
     } catch (error) {
-        const message = "DeviceInfo.getAndroidId failed:"
+        const message = "Capacitor.Plugins.DeviceInfo.getAndroidId failed:"
         logger.error(message, { error })
     }
     return null
@@ -243,7 +241,9 @@ interface ExtendedWindow extends Window {
 }
 
 // Type augmentation for platform-specific APIs
-// Note: Capacitor types are declared in getShellVersion.ts with flexible index signatures
+// 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 {
         webapis?: {