unified-video-framework 1.4.413 → 1.4.415

package/packages/web/src/drm/utils/LicenseRequestHandler.ts

@@ -1,180 +1,180 @@
-/**
- * License Request Handler
- * Centralized HTTP request handling for license servers with retry logic
- */
-
-import { ExtendedDRMConfig, LicenseRequest, LicenseResponse, DRMErrorCode } from '../types/DRMTypes';
-
-export class LicenseRequestHandler {
-  private config: ExtendedDRMConfig;
-  private debug: boolean;
-
-  constructor(config: ExtendedDRMConfig, debug: boolean = false) {
-    this.config = config;
-    this.debug = debug;
-  }
-
-  /**
-   * Request license from server with retry logic
-   */
-  async requestLicense(request: LicenseRequest): Promise<LicenseResponse> {
-    const maxRetries = this.config.retryConfig?.maxRetries || 3;
-    const retryDelay = this.config.retryConfig?.retryDelay || 1000;
-
-    let lastError: any;
-
-    for (let attempt = 0; attempt <= maxRetries; attempt++) {
-      try {
-        if (attempt > 0) {
-          this.log(`Retry attempt ${attempt}/${maxRetries}`);
-          await this.delay(retryDelay * attempt); // Exponential backoff
-        }
-
-        const response = await this.makeRequest(request);
-        return response;
-      } catch (error: any) {
-        lastError = error;
-        this.log(`License request failed (attempt ${attempt + 1}/${maxRetries + 1}):`, error);
-
-        // Don't retry on certain errors
-        if (this.isFatalError(error)) {
-          throw error;
-        }
-      }
-    }
-
-    // All retries exhausted
-    throw this.createError(
-      DRMErrorCode.LICENSE_REQUEST_FAILED,
-      `Failed to request license after ${maxRetries + 1} attempts`,
-      lastError
-    );
-  }
-
-  /**
-   * Make HTTP request to license server
-   */
-  private async makeRequest(request: LicenseRequest): Promise<LicenseResponse> {
-    this.log('Requesting license from:', request.url);
-
-    try {
-      const response = await fetch(request.url, {
-        method: request.method,
-        headers: request.headers,
-        body: request.body,
-      });
-
-      if (!response.ok) {
-        throw this.createError(
-          DRMErrorCode.LICENSE_REQUEST_FAILED,
-          `License server returned ${response.status}: ${response.statusText}`,
-          { status: response.status, statusText: response.statusText }
-        );
-      }
-
-      // Parse response based on type
-      let license: ArrayBuffer;
-
-      if (request.responseType === 'arraybuffer') {
-        license = await response.arrayBuffer();
-      } else if (request.responseType === 'text') {
-        const text = await response.text();
-        license = this.textToArrayBuffer(text);
-      } else if (request.responseType === 'json') {
-        const json = await response.json();
-        // Assume license is in a 'license' field or is base64-encoded
-        if (json.license) {
-          license = this.base64ToArrayBuffer(json.license);
-        } else {
-          throw this.createError(
-            DRMErrorCode.LICENSE_INVALID,
-            'License response does not contain license field',
-            json
-          );
-        }
-      } else {
-        license = await response.arrayBuffer();
-      }
-
-      this.log('License received, size:', license.byteLength, 'bytes');
-
-      return {
-        license,
-        metadata: response.headers,
-      };
-    } catch (error: any) {
-      if (error.code && error.code.startsWith('DRM_')) {
-        throw error;
-      }
-
-      throw this.createError(
-        DRMErrorCode.NETWORK_ERROR,
-        `Network error requesting license: ${error.message}`,
-        error
-      );
-    }
-  }
-
-  /**
-   * Check if error is fatal (should not retry)
-   */
-  private isFatalError(error: any): boolean {
-    // Don't retry authentication errors (401, 403)
-    if (error.details?.status === 401 || error.details?.status === 403) {
-      return true;
-    }
-
-    // Don't retry invalid license errors
-    if (error.code === DRMErrorCode.LICENSE_INVALID) {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Convert text to ArrayBuffer
-   */
-  private textToArrayBuffer(text: string): ArrayBuffer {
-    const encoder = new TextEncoder();
-    return encoder.encode(text).buffer;
-  }
-
-  /**
-   * Convert base64 string to ArrayBuffer
-   */
-  private base64ToArrayBuffer(base64: string): ArrayBuffer {
-    const binaryString = atob(base64);
-    const bytes = new Uint8Array(binaryString.length);
-    for (let i = 0; i < binaryString.length; i++) {
-      bytes[i] = binaryString.charCodeAt(i);
-    }
-    return bytes.buffer;
-  }
-
-  /**
-   * Delay helper for retry logic
-   */
-  private delay(ms: number): Promise<void> {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }
-
-  /**
-   * Create standardized DRM error
-   */
-  private createError(code: DRMErrorCode, message: string, details?: any): any {
-    const error = new Error(message);
-    (error as any).code = code;
-    (error as any).details = details;
-    return error;
-  }
-
-  /**
-   * Debug logging
-   */
-  private log(...args: any[]): void {
-    if (this.debug) {
-      console.log('[LicenseRequestHandler]', ...args);
-    }
-  }
-}
+/**
+ * License Request Handler
+ * Centralized HTTP request handling for license servers with retry logic
+ */
+
+import { ExtendedDRMConfig, LicenseRequest, LicenseResponse, DRMErrorCode } from '../types/DRMTypes';
+
+export class LicenseRequestHandler {
+  private config: ExtendedDRMConfig;
+  private debug: boolean;
+
+  constructor(config: ExtendedDRMConfig, debug: boolean = false) {
+    this.config = config;
+    this.debug = debug;
+  }
+
+  /**
+   * Request license from server with retry logic
+   */
+  async requestLicense(request: LicenseRequest): Promise<LicenseResponse> {
+    const maxRetries = this.config.retryConfig?.maxRetries || 3;
+    const retryDelay = this.config.retryConfig?.retryDelay || 1000;
+
+    let lastError: any;
+
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        if (attempt > 0) {
+          this.log(`Retry attempt ${attempt}/${maxRetries}`);
+          await this.delay(retryDelay * attempt); // Exponential backoff
+        }
+
+        const response = await this.makeRequest(request);
+        return response;
+      } catch (error: any) {
+        lastError = error;
+        this.log(`License request failed (attempt ${attempt + 1}/${maxRetries + 1}):`, error);
+
+        // Don't retry on certain errors
+        if (this.isFatalError(error)) {
+          throw error;
+        }
+      }
+    }
+
+    // All retries exhausted
+    throw this.createError(
+      DRMErrorCode.LICENSE_REQUEST_FAILED,
+      `Failed to request license after ${maxRetries + 1} attempts`,
+      lastError
+    );
+  }
+
+  /**
+   * Make HTTP request to license server
+   */
+  private async makeRequest(request: LicenseRequest): Promise<LicenseResponse> {
+    this.log('Requesting license from:', request.url);
+
+    try {
+      const response = await fetch(request.url, {
+        method: request.method,
+        headers: request.headers,
+        body: request.body,
+      });
+
+      if (!response.ok) {
+        throw this.createError(
+          DRMErrorCode.LICENSE_REQUEST_FAILED,
+          `License server returned ${response.status}: ${response.statusText}`,
+          { status: response.status, statusText: response.statusText }
+        );
+      }
+
+      // Parse response based on type
+      let license: ArrayBuffer;
+
+      if (request.responseType === 'arraybuffer') {
+        license = await response.arrayBuffer();
+      } else if (request.responseType === 'text') {
+        const text = await response.text();
+        license = this.textToArrayBuffer(text);
+      } else if (request.responseType === 'json') {
+        const json = await response.json();
+        // Assume license is in a 'license' field or is base64-encoded
+        if (json.license) {
+          license = this.base64ToArrayBuffer(json.license);
+        } else {
+          throw this.createError(
+            DRMErrorCode.LICENSE_INVALID,
+            'License response does not contain license field',
+            json
+          );
+        }
+      } else {
+        license = await response.arrayBuffer();
+      }
+
+      this.log('License received, size:', license.byteLength, 'bytes');
+
+      return {
+        license,
+        metadata: response.headers,
+      };
+    } catch (error: any) {
+      if (error.code && error.code.startsWith('DRM_')) {
+        throw error;
+      }
+
+      throw this.createError(
+        DRMErrorCode.NETWORK_ERROR,
+        `Network error requesting license: ${error.message}`,
+        error
+      );
+    }
+  }
+
+  /**
+   * Check if error is fatal (should not retry)
+   */
+  private isFatalError(error: any): boolean {
+    // Don't retry authentication errors (401, 403)
+    if (error.details?.status === 401 || error.details?.status === 403) {
+      return true;
+    }
+
+    // Don't retry invalid license errors
+    if (error.code === DRMErrorCode.LICENSE_INVALID) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Convert text to ArrayBuffer
+   */
+  private textToArrayBuffer(text: string): ArrayBuffer {
+    const encoder = new TextEncoder();
+    return encoder.encode(text).buffer;
+  }
+
+  /**
+   * Convert base64 string to ArrayBuffer
+   */
+  private base64ToArrayBuffer(base64: string): ArrayBuffer {
+    const binaryString = atob(base64);
+    const bytes = new Uint8Array(binaryString.length);
+    for (let i = 0; i < binaryString.length; i++) {
+      bytes[i] = binaryString.charCodeAt(i);
+    }
+    return bytes.buffer;
+  }
+
+  /**
+   * Delay helper for retry logic
+   */
+  private delay(ms: number): Promise<void> {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+
+  /**
+   * Create standardized DRM error
+   */
+  private createError(code: DRMErrorCode, message: string, details?: any): any {
+    const error = new Error(message);
+    (error as any).code = code;
+    (error as any).details = details;
+    return error;
+  }
+
+  /**
+   * Debug logging
+   */
+  private log(...args: any[]): void {
+    if (this.debug) {
+      console.log('[LicenseRequestHandler]', ...args);
+    }
+  }
+}

package/scripts/fix-imports.js

@@ -10,24 +10,61 @@ const path = require('path');
 
 function fixImports(filePath) {
   let content = fs.readFileSync(filePath, 'utf8');
-  
+
   // Replace @unified-video/core imports with relative paths
   if (filePath.includes(path.join('packages', 'web', 'dist'))) {
+    // Calculate the correct relative path depth based on file location
+    const distPath = path.join('packages', 'web', 'dist');
+    const distIndex = filePath.indexOf(distPath);
+    const relativePath = filePath.substring(distIndex + distPath.length + 1);
+    const depth = relativePath.split(path.sep).length;
+    const upLevels = '../'.repeat(depth + 1); // +1 to get out of web/, then to packages/
+    const coreImportPath = `${upLevels}core/dist/index.js`;
+    const coreRequirePath = `${upLevels}core/dist`;
+
     // Fix CommonJS require statements
     content = content.replace(
       /require\(["']@unified-video\/core["']\)/g,
-      'require("../../core/dist")'
+      `require("${coreRequirePath}")`
     );
     // Fix ES module import statements
     content = content.replace(
       /from\s+["']@unified-video\/core["']/g,
-      'from "../../core/dist/index.js"'
+      `from "${coreImportPath}"`
     );
     content = content.replace(
       /import\s+["']@unified-video\/core["']/g,
-      'import "../../core/dist/index.js"'
+      `import "${coreImportPath}"`
     );
-    
+
+    // Fix any leftover old-style imports from core/src
+    content = content.replace(
+      /require\(['"]\.\.\/\.\.\/\.\.\/core\/src\/interfaces['"]\)/g,
+      `require("${coreRequirePath}")`
+    );
+    content = content.replace(
+      /from\s+['"]\.\.\/\.\.\/\.\.\/core\/src\/interfaces['"]/g,
+      `from "${coreImportPath}"`
+    );
+    content = content.replace(
+      /from\s+['"]\.\.\/\.\.\/core\/src\/interfaces['"]/g,
+      `from "${coreImportPath}"`
+    );
+
+    // Fix incorrect relative paths to core/dist (already converted by TypeScript)
+    content = content.replace(
+      /from\s+['"](\.\.\/)+core\/dist\/index\.js['"]/g,
+      `from "${coreImportPath}"`
+    );
+    content = content.replace(
+      /import\s+['"](\.\.\/)+core\/dist\/index\.js['"]/g,
+      `import "${coreImportPath}"`
+    );
+    content = content.replace(
+      /require\(['"](\.\.\/)+core\/dist['"]\)/g,
+      `require("${coreRequirePath}")`
+    );
+
     // Fix relative imports within the same package to include .js extension
     content = content.replace(
       /from\s+["']\.\/([^"']+)(?<!\.js)["']/g,
@@ -43,19 +80,28 @@ function fixImports(filePath) {
       }
     );
   } else if (filePath.includes(path.join('packages', 'react-native', 'dist'))) {
+    // Calculate the correct relative path depth based on file location
+    const distPath = path.join('packages', 'react-native', 'dist');
+    const distIndex = filePath.indexOf(distPath);
+    const relativePath = filePath.substring(distIndex + distPath.length + 1);
+    const depth = relativePath.split(path.sep).length;
+    const upLevels = '../'.repeat(depth + 1); // +1 to get out of react-native/, then to packages/
+    const coreImportPath = `${upLevels}core/dist/index.js`;
+    const coreRequirePath = `${upLevels}core/dist`;
+
     // Fix CommonJS require statements
     content = content.replace(
       /require\(["']@unified-video\/core["']\)/g,
-      'require("../../core/dist")'
+      `require("${coreRequirePath}")`
     );
     // Fix ES module import statements
     content = content.replace(
       /from\s+["']@unified-video\/core["']/g,
-      'from "../../core/dist/index.js"'
+      `from "${coreImportPath}"`
     );
     content = content.replace(
       /import\s+["']@unified-video\/core["']/g,
-      'import "../../core/dist/index.js"'
+      `import "${coreImportPath}"`
     );
     
     // Fix relative imports within the same package to include .js extension