@volley/vwr-loader 1.0.5 → 1.1.0

package/dist/vwrConfig.js

@@ -18,131 +18,154 @@ const buildUrl = (path, base) => {
     const normalizedBase = base.endsWith("/") ? base : `${base}/`;
     return new URL(path, normalizedBase);
 };
-export const getVWRConfig = async (request, logger = defaultLogger) => {
-    var _a;
-    const timeout = (_a = request.timeout) !== null && _a !== void 0 ? _a : DEFAULT_CONFIG_TIMEOUT;
-    logger.info("[VWR Config] Fetching config with priority: local → device → shellVersion → environment → defaults");
-    // Fetch all configs in parallel for performance
-    const [localConfig, deviceConfig, shellVersionConfig, environmentConfig] = await Promise.all([
-        tryGetLocalConfig(request.configFile, timeout, logger),
-        tryGetDeviceConfig(request.configUrl, request.configFile, request.platform, request.deviceId, timeout, logger),
-        tryGetShellVersionConfig(request.configUrl, request.configFile, request.environment, request.platform, request.shellVersion, timeout, logger),
-        tryGetEnvironmentConfig(request.configUrl, request.configFile, request.environment, timeout, logger),
-    ]);
-    // Return first successful config in priority order
-    if (localConfig !== null) {
-        logger.info("[VWR Config] ✓ Using config from: local", localConfig);
-        return localConfig;
-    }
-    if (deviceConfig !== null) {
-        logger.info("[VWR Config] ✓ Using config from: device", deviceConfig);
-        return deviceConfig;
-    }
-    if (shellVersionConfig !== null) {
-        logger.info("[VWR Config] ✓ Using config from: shellVersion", shellVersionConfig);
-        return shellVersionConfig;
-    }
-    if (environmentConfig !== null) {
-        logger.info("[VWR Config] ✓ Using config from: environment", environmentConfig);
-        return environmentConfig;
-    }
-    // All fetches failed, use defaults
-    logger.warn("[VWR Config] All config fetches failed, using built-in defaults");
-    const defaultConfig = getDefaultConfig();
-    return defaultConfig;
-};
-const tryGetLocalConfig = async (configFile, timeout, logger) => {
-    var _a, _b;
-    try {
-        const url = buildUrl(configFile, (_b = (_a = ENV_DEFAULTS["local"]) === null || _a === void 0 ? void 0 : _a.configUrl) !== null && _b !== void 0 ? _b : "");
-        logger.info(`[VWR Config] Trying local: ${url}`);
-        return tryGetVWRConfig(url, timeout);
-    }
-    catch (error) {
-        logger.error(`[VWR Config] URL construction failed for local config: ${error}`);
-        return null;
-    }
-};
-const tryGetDeviceConfig = async (configUrl, configFile, platform, deviceId, timeout, logger) => {
-    try {
-        const url = buildUrl(`device/${platform}/${deviceId}/${configFile}`, configUrl);
-        logger.info(`[VWR Config] Trying device: ${url}`);
-        return tryGetVWRConfig(url, timeout);
-    }
-    catch (error) {
-        logger.error(`[VWR Config] URL construction failed for device config: ${error}`);
-        return null;
-    }
-};
-const tryGetEnvironmentConfig = async (configUrl, configFile, environment, timeout, logger) => {
-    try {
-        const url = buildUrl(`environments/${environment}/${configFile}`, configUrl);
-        logger.info(`[VWR Config] Trying environment: ${url}`);
-        return tryGetVWRConfig(url, timeout);
+class VWRConfigFetcher {
+    constructor(request, logger) {
+        var _a;
+        this.defaults = getDefaultConfig(request.environment);
+        this.timeout = (_a = request.timeout) !== null && _a !== void 0 ? _a : DEFAULT_CONFIG_TIMEOUT;
+        this.logger = logger;
+        this.configUrl = request.configUrl;
+        this.configFile = request.configFile;
+        this.platform = request.platform;
+        this.deviceId = request.deviceId;
+        this.environment = request.environment;
+        this.shellVersion = request.shellVersion;
+    }
+    async fetch() {
+        this.logger.info("[VWR Config] Fetching config with priority: local → device → shellVersion → environment → defaults");
+        // Fetch all configs in parallel for performance
+        const [localConfig, deviceConfig, shellVersionConfig, environmentConfig,] = await Promise.all([
+            this.tryGetLocalConfig(),
+            this.tryGetDeviceConfig(),
+            this.tryGetShellVersionConfig(),
+            this.tryGetEnvironmentConfig(),
+        ]);
+        // Return first successful config in priority order
+        if (localConfig !== null) {
+            this.logger.info("[VWR Config] ✓ Using config from: local", localConfig);
+            return localConfig;
+        }
+        if (deviceConfig !== null) {
+            this.logger.info("[VWR Config] ✓ Using config from: device", deviceConfig);
+            return deviceConfig;
+        }
+        if (shellVersionConfig !== null) {
+            this.logger.info("[VWR Config] ✓ Using config from: shellVersion", shellVersionConfig);
+            return shellVersionConfig;
+        }
+        if (environmentConfig !== null) {
+            this.logger.info("[VWR Config] ✓ Using config from: environment", environmentConfig);
+            return environmentConfig;
+        }
+        // All fetches failed, use defaults
+        this.logger.warn("[VWR Config] All config fetches failed, using built-in defaults");
+        return this.defaults;
+    }
+    async tryGetLocalConfig() {
+        var _a, _b;
+        try {
+            const url = buildUrl(this.configFile, (_b = (_a = ENV_DEFAULTS["local"]) === null || _a === void 0 ? void 0 : _a.configUrl) !== null && _b !== void 0 ? _b : "");
+            this.logger.info(`[VWR Config] Trying local: ${url}`);
+            return this.tryFetchConfig(url);
+        }
+        catch (error) {
+            this.logger.error(`[VWR Config] URL construction failed for local config: ${error}`);
+            return null;
+        }
     }
-    catch (error) {
-        logger.error(`[VWR Config] URL construction failed for environment config: ${error}`);
-        return null;
+    async tryGetDeviceConfig() {
+        try {
+            const url = buildUrl(`device/${this.platform}/${this.deviceId}/${this.configFile}`, this.configUrl);
+            this.logger.info(`[VWR Config] Trying device: ${url}`);
+            return this.tryFetchConfig(url);
+        }
+        catch (error) {
+            this.logger.error(`[VWR Config] URL construction failed for device config: ${error}`);
+            return null;
+        }
     }
-};
-const tryGetShellVersionConfig = async (configUrl, configFile, environment, platform, shellVersion, timeout, logger) => {
-    try {
-        const url = buildUrl(`shellVersion/${environment}/${platform}/${shellVersion}/${configFile}`, configUrl);
-        logger.info(`[VWR Config] Trying shellVersion: ${url}`);
-        return tryGetVWRConfig(url, timeout);
+    async tryGetEnvironmentConfig() {
+        try {
+            const url = buildUrl(`environments/${this.environment}/${this.configFile}`, this.configUrl);
+            this.logger.info(`[VWR Config] Trying environment: ${url}`);
+            return this.tryFetchConfig(url);
+        }
+        catch (error) {
+            this.logger.error(`[VWR Config] URL construction failed for environment config: ${error}`);
+            return null;
+        }
     }
-    catch (error) {
-        logger.error(`[VWR Config] URL construction failed for shellVersion config: ${error}`);
-        return null;
+    async tryGetShellVersionConfig() {
+        try {
+            const url = buildUrl(`shellVersion/${this.environment}/${this.platform}/${this.shellVersion}/${this.configFile}`, this.configUrl);
+            this.logger.info(`[VWR Config] Trying shellVersion: ${url}`);
+            return this.tryFetchConfig(url);
+        }
+        catch (error) {
+            this.logger.error(`[VWR Config] URL construction failed for shellVersion config: ${error}`);
+            return null;
+        }
     }
-};
-const tryGetVWRConfig = async (url, timeout) => {
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), timeout);
-    try {
-        const response = await fetch(new Request(url, {
-            headers: {
-                "Content-Type": "application/json",
-            },
-            signal: controller.signal,
-        }));
-        if (!response.ok) {
+    async tryFetchConfig(url) {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+        try {
+            const response = await fetch(new Request(url, {
+                headers: { "Content-Type": "application/json" },
+                signal: controller.signal,
+            }));
+            if (!response.ok) {
+                clearTimeout(timeoutId);
+                return null;
+            }
+            const config = await response.json();
+            clearTimeout(timeoutId);
+            return this.parseConfig(config);
+        }
+        catch (_a) {
             clearTimeout(timeoutId);
             return null;
         }
-        let config = await response.json();
-        config = parseConfig(config);
-        clearTimeout(timeoutId);
-        return config;
-    }
-    catch (_a) {
-        clearTimeout(timeoutId);
-        return null;
-    }
-};
-const parseConfig = (config) => {
-    const defaultConfig = getDefaultConfig();
-    if (!Array.isArray(config.trustedDomains) ||
-        config.trustedDomains.length === 0) {
-        config.trustedDomains = defaultConfig.trustedDomains;
     }
-    if (!config.vwrUrl) {
-        config.vwrUrl = defaultConfig.vwrUrl;
-        if (!config.trustedDomains.includes(defaultConfig.vwrUrl)) {
-            config.trustedDomains.push(defaultConfig.vwrUrl);
+    parseConfig(config) {
+        const result = {
+            hubUrl: config.hubUrl || this.defaults.hubUrl,
+            vwrUrl: config.vwrUrl || this.defaults.vwrUrl,
+            launchUrl: config.launchUrl,
+            platformApiUrl: config.platformApiUrl || this.defaults.platformApiUrl,
+            platformAuthApiUrl: config.platformAuthApiUrl || this.defaults.platformAuthApiUrl,
+            trustedDomains: Array.isArray(config.trustedDomains) &&
+                config.trustedDomains.length > 0
+                ? [...config.trustedDomains]
+                : [...this.defaults.trustedDomains],
+        };
+        // Ensure vwrUrl origin is in trustedDomains
+        const vwrUrlOrigin = new URL(result.vwrUrl).origin;
+        if (!result.trustedDomains.includes(vwrUrlOrigin)) {
+            result.trustedDomains.push(vwrUrlOrigin);
         }
-    }
-    if (!config.hubUrl) {
-        config.hubUrl = defaultConfig.hubUrl;
-        if (!config.trustedDomains.includes(defaultConfig.hubUrl)) {
-            config.trustedDomains.push(defaultConfig.hubUrl);
+        // Ensure hubUrl origin is in trustedDomains
+        const hubUrlOrigin = new URL(result.hubUrl).origin;
+        if (!result.trustedDomains.includes(hubUrlOrigin)) {
+            result.trustedDomains.push(hubUrlOrigin);
         }
+        // launchUrl is optional - only add to trustedDomains if explicitly set
+        if (result.launchUrl) {
+            try {
+                const launchUrlOrigin = new URL(result.launchUrl).origin;
+                if (!result.trustedDomains.includes(launchUrlOrigin)) {
+                    result.trustedDomains.push(launchUrlOrigin);
+                }
+            }
+            catch (_a) {
+                // Invalid launchUrl - skip adding to trustedDomains
+            }
+        }
+        return result;
     }
-    // launchUrl is optional - only add to trustedDomains if explicitly set
-    if (config.launchUrl && !config.trustedDomains.includes(config.launchUrl)) {
-        config.trustedDomains.push(config.launchUrl);
-    }
-    return config;
+}
+export const getVWRConfig = async (request, logger = defaultLogger) => {
+    return new VWRConfigFetcher(request, logger).fetch();
 };
 export const validateConfig = (config) => {
     if (!config.vwrUrl)
@@ -156,17 +179,23 @@ export const validateConfig = (config) => {
         return false;
     return true;
 };
-const getDefaultConfig = () => {
-    const ENVIRONMENT = import.meta.env.VITE_ENVIRONMENT || "dev";
-    const defaults = ENV_DEFAULTS[ENVIRONMENT];
+const getDefaultConfig = (environment) => {
+    var _a;
+    const defaults = ENV_DEFAULTS[environment];
     if (!defaults) {
-        throw new Error(`[VWR Config] Unknown environment: ${ENVIRONMENT}. Valid: local, dev, staging, prod`);
+        throw new Error(`[VWR Config] Unknown environment: ${environment}. Valid: local, dev, staging, prod`);
     }
     return {
         hubUrl: defaults.hubUrl,
         vwrUrl: defaults.vwrUrl,
         launchUrl: undefined,
-        trustedDomains: [defaults.hubUrl, defaults.vwrUrl],
+        platformApiUrl: defaults.platformApiUrl,
+        platformAuthApiUrl: defaults.platformAuthApiUrl,
+        trustedDomains: [
+            new URL(defaults.hubUrl).origin,
+            new URL(defaults.vwrUrl).origin,
+            ...((_a = defaults.trustedOrigins) !== null && _a !== void 0 ? _a : []),
+        ],
     };
 };
 //# sourceMappingURL=vwrConfig.js.map

package/dist/vwrConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"vwrConfig.js","sourceRoot":"","sources":["../src/vwrConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vwrConfig.js","sourceRoot":"","sources":["../src/vwrConfig.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volley/vwr-loader",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "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 {