@volley/vwr-loader 1.0.5 → 1.1.0

package/src/getShellVersion.ts

@@ -1,4 +1,5 @@
 import { defaultLogger, type Logger } from "./logger"
+import type { MobileExtendedWindow } from "./types"
 
 /**
  * Retrieve shell app version for different platforms.
@@ -7,10 +8,10 @@ import { defaultLogger, type Logger } from "./logger"
  * - SAMSUNG_TV: Tizen Application API `tizen.application.getAppInfo().version`
  * - LG_TV: webOS Application API `webOS.fetchAppInfo()`
  * - FIRE_TV: Native bridge via Capacitor DeviceInfo plugin
- * - MOBILE: Native bridge (future implementation)
+ * - ANDROID_MOBILE/IOS_MOBILE: Native app context `window.iosAppContext.appVersion` / `window.androidAppContext.appVersion`
  * - WEB/Unknown: Returns 'unknown'
  *
- * @param platform - Platform identifier (SAMSUNG_TV, LG_TV, FIRE_TV, MOBILE, WEB)
+ * @param platform - Platform identifier (SAMSUNG_TV, LG_TV, FIRE_TV, ANDROID_MOBILE, IOS_MOBILE, WEB)
  * @param logger - Optional logger for warning reporting. Defaults to defaultLogger.
  * @returns Shell version string or 'unknown' if not available
  */
@@ -65,10 +66,12 @@ export async function getShellVersion(
             return "unknown"
         }
 
-        // Mobile: Future implementation via native bridge
-        if (normalizedPlatform === "MOBILE") {
-            // TODO: Implement native bridge version retrieval when available
-            return "unknown"
+        // Mobile: Get version from native app context
+        if (
+            normalizedPlatform === "ANDROID_MOBILE" ||
+            normalizedPlatform === "IOS_MOBILE"
+        ) {
+            return getMobileAppVersion(logger)
         }
 
         // Web platform: Check for injected version at build time
@@ -90,21 +93,43 @@ export async function getShellVersion(
     }
 }
 
-// Global type declarations for platform APIs
-declare global {
-    interface Window {
-        Capacitor?: {
-            Plugins?: {
-                DeviceInfo?: {
-                    getDeviceInfo(): Promise<{
-                        versionName?: string
-                        [key: string]: any
-                    }>
-                    [key: string]: any
-                }
-                [key: string]: any
-            }
-            [key: string]: any
+/**
+ * Get app version from mobile native app context (iOS/Android)
+ *
+ * iOS exposes appVersion via window.iosAppContext
+ * Android exposes appVersion via window.androidAppContext (also check window.top for iframes)
+ */
+function getMobileAppVersion(logger: Logger): string {
+    // Try iOS first
+    const iosVersion = (window as MobileExtendedWindow).iosAppContext
+        ?.appVersion
+    if (iosVersion && iosVersion.trim()) {
+        return iosVersion
+    }
+
+    // Try Android (check both window and window.top for iframe scenarios)
+    const androidContext = (window as MobileExtendedWindow).androidAppContext
+    try {
+        const androidVersion =
+            androidContext?.appVersion ??
+            (window.top as MobileExtendedWindow | null)?.androidAppContext
+                ?.appVersion
+        if (androidVersion && androidVersion.trim()) {
+            return androidVersion
+        }
+    } catch {
+        // window.top access can throw if cross-origin
+        const androidVersion = androidContext?.appVersion
+        if (androidVersion && androidVersion.trim()) {
+            return androidVersion
         }
     }
+
+    logger.warn("[VWR:MobileAppVersion] appVersion not found", {
+        iosAppContext: !!(window as MobileExtendedWindow).iosAppContext,
+        androidAppContext: !!androidContext,
+    })
+    return "unknown"
 }
+
+// Types imported from ./types.ts

package/src/loadVwr.ts

@@ -1,3 +1,5 @@
+import type * as VWR from "@volley/vwr"
+
 import { fetchAmplitudeFlags } from "./amplitudeFlagFetcher"
 import { ENV_DEFAULTS } from "./envDefaults"
 import { getDeviceId } from "./getDeviceId"
@@ -83,7 +85,8 @@ export const loadVwr = async (logger: Logger = defaultLogger) => {
             apiKey: amplitudeKey,
             timeout: 2000,
         },
-        shellVersion
+        shellVersion,
+        logger
     )
 
     logger.info("[Shell] Flags fetched", { flags })
@@ -115,7 +118,10 @@ export const loadVwr = async (logger: Logger = defaultLogger) => {
         vwrUrl: vwrConfig.vwrUrl,
     })
     try {
-        const vwr = await import(/* @vite-ignore */ vwrConfig.vwrUrl)
+        const vwr = (await import(
+            /* @vite-ignore */ vwrConfig.vwrUrl
+        )) as typeof VWR
+
         logger.info("[Shell] VWR module loaded successfully")
 
         if (typeof vwr.init !== "function") {
@@ -124,11 +130,12 @@ export const loadVwr = async (logger: Logger = defaultLogger) => {
 
         await vwr.init({
             hubUrl: vwrConfig.hubUrl,
-            launchUrl: vwrConfig.launchUrl,
             platform: PLATFORM,
-            deviceId,
-            environment: ENVIRONMENT,
-            trustedDomains: vwrConfig.trustedDomains,
+            stage: ENVIRONMENT,
+            appVersion: shellVersion,
+            platformApiUrl: vwrConfig.platformApiUrl,
+            platformAuthApiUrl: vwrConfig.platformAuthApiUrl,
+            trustedOrigins: new Set(vwrConfig.trustedDomains),
             nativeShellVersion: shellVersion,
         })
         logger.info("[Shell] VWR initialized successfully")

package/src/main.ts

@@ -18,7 +18,9 @@ async function init() {
             }
         } finally {
             //Fallback, can't trust config exists
-            window.location.href = HUB_URL
+            const fallbackUrl = new URL(HUB_URL)
+            fallbackUrl.searchParams.set("volley_platform", PLATFORM)
+            window.location.href = fallbackUrl.toString()
         }
     }
 }

package/src/types.ts

@@ -0,0 +1,88 @@
+/**
+ * Shared type definitions for vwr-loader platform APIs
+ */
+
+/**
+ * Extended window interface for mobile app context.
+ * Matches the types from @volley/sdk ExtendedWindow.ts
+ */
+export interface MobileExtendedWindow extends Window {
+    iosAppContext?: {
+        appVersion: string
+        environment?: string
+        phoneDeviceId?: string
+    }
+    androidAppContext?: {
+        appVersion: string
+        environment?: string
+        phoneDeviceId?: string
+    }
+}
+
+/**
+ * Global type declarations for platform APIs
+ */
+declare global {
+    interface Window {
+        Capacitor?: {
+            Plugins?: {
+                DeviceInfo?: {
+                    getDeviceInfo(): Promise<{
+                        versionName?: string
+                        [key: string]: any
+                    }>
+                    getAndroidId(): Promise<{
+                        androidId?: string
+                        [key: string]: any
+                    }>
+                    getNativeShellAppEnvironment(): Promise<{
+                        environment?: string
+                    }>
+                    [key: string]: any
+                }
+                [key: string]: any
+            }
+            [key: string]: any
+        }
+        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
+                }
+            }
+            fetchAppInfo?: (
+                callback: (appInfo?: { version?: string }) => void
+            ) => void
+        }
+        tizen?: {
+            application?: {
+                getAppInfo: () => { version?: string }
+            }
+        }
+    }
+}
+
+/**
+ * LG Luna service response for device ID
+ */
+export interface LGDeviceIdResponse {
+    idList?: Array<{
+        idType?: string
+        idValue?: string
+    }>
+    returnValue?: boolean
+}

package/src/vite-env.d.ts

@@ -8,6 +8,9 @@ interface ImportMetaEnv {
     readonly VITE_SHELL_VERSION: string
     readonly VITE_CONFIG_URL: string
     readonly VITE_CONFIG_FILE: string
+    readonly VITE_PLATFORM_API_URL: string
+    readonly VITE_PLATFORM_AUTH_API_URL: string
+    readonly VITE_TRUSTED_ORIGINS: string
 }
 
 interface ImportMeta {

package/src/vwrConfig.test.ts

@@ -90,8 +90,8 @@ describe("vwrConfig", async () => {
             expect(config.hubUrl).toBe("https://game-clients.volley.tv/hub")
             expect(config.launchUrl).toBeUndefined() // Optional, not set by default
             expect(config.trustedDomains).toEqual([
-                "https://game-clients.volley.tv/hub",
-                "https://vwr.volley.tv/v1/latest/vwr.js",
+                "https://game-clients.volley.tv",
+                "https://vwr.volley.tv",
             ])
         })