fix: support https proxy

100mslive · May 16, 2024 · ca28beb · ca28beb
1 parent 87c5b8e
commit ca28beb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/packages/hms-video-store/src/analytics/HTTPAnalyticsTransport.ts b/packages/hms-video-store/src/analytics/HTTPAnalyticsTransport.ts
@@ -6,6 +6,7 @@ import {
   CLIENT_ANAYLTICS_QA_ENDPOINT,
   CLIENT_ANAYLTICS_STORAGE_LIMIT,
 } from '../utils/constants';
+import { getEndpointFromProxy } from '../utils/get-endpoint-from-proxy';
 import { LocalStorage } from '../utils/local-storage';
 import HMSLogger from '../utils/logger';
 import { ENV } from '../utils/support';
@@ -49,8 +50,6 @@ class ClientAnalyticsTransport implements IAnalyticsTransportProvider {
 
   setWebsocketEndpoint(ws: string, proxy?: HMSProxyConfig) {
     this.proxy = proxy;
-    console.log(this.proxy);
-    // proxy - ws
     this.websocketURL = ws;
   }
 
@@ -71,14 +70,20 @@ class ClientAnalyticsTransport implements IAnalyticsTransportProvider {
       },
     };
     const url = this.env === ENV.PROD ? CLIENT_ANAYLTICS_PROD_ENDPOINT : CLIENT_ANAYLTICS_QA_ENDPOINT;
-    // proxy - analytics
-    fetch(url, {
+
+    const proxyUrl = getEndpointFromProxy(this.proxy);
+    const headers = {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${event.metadata.token}`,
+      user_agent_v2: event.metadata.userAgent,
+      'Target-URL': url,
+    };
+    if (proxyUrl) {
+      headers['Target-URL'] = url;
+    }
+    fetch(proxyUrl || url, {
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${event.metadata.token}`,
-        user_agent_v2: event.metadata.userAgent,
-      },
+      headers,
       body: JSON.stringify(requestBody),
     })
       .then(response => {

diff --git a/packages/hms-video-store/src/interfaces/config.ts b/packages/hms-video-store/src/interfaces/config.ts
@@ -13,7 +13,7 @@ export type HMSICEServer = {
 };
 
 enum HMSProxyType {
-  Socks5 = 0,
+  HTTPS = 0,
 }
 
 export type HMSProxyConfig = {

diff --git a/packages/hms-video-store/src/signal/init/index.ts b/packages/hms-video-store/src/signal/init/index.ts
@@ -2,6 +2,7 @@ import { InitConfig } from './models';
 import { ErrorFactory } from '../../error/ErrorFactory';
 import { HMSAction } from '../../error/HMSAction';
 import { HMSICEServer, HMSProxyConfig } from '../../interfaces';
+import { getEndpointFromProxy } from '../../utils/get-endpoint-from-proxy';
 import { transformIceServerConfig } from '../../utils/ice-server-config';
 import HMSLogger from '../../utils/logger';
 
@@ -42,12 +43,13 @@ export default class InitService {
     HMSLogger.d(TAG, `fetchInitConfig: initEndpoint=${initEndpoint} token=${token} peerId=${peerId} region=${region} `);
     const url = getUrl(initEndpoint, peerId, userAgent, region);
     try {
-      // proxy - init
-      console.log(proxy);
-      const response = await fetch(url, {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
+      const proxyUrl = getEndpointFromProxy(proxy);
+      const headers: Record<string, string> = { Authorization: `Bearer ${token}` };
+      if (proxyUrl) {
+        headers['Target-URL'] = url;
+      }
+      const response = await fetch(proxyUrl || url, {
+        headers,
       });
       try {
         const config = await response.clone().json();

diff --git a/packages/hms-video-store/src/utils/get-endpoint-from-proxy.ts b/packages/hms-video-store/src/utils/get-endpoint-from-proxy.ts
@@ -7,10 +7,10 @@ export const getEndpointFromProxy = (proxy?: HMSProxyConfig) => {
   let endpoint = `://${proxy.host}:${proxy.port}`;
   switch (proxy.type) {
     case 0:
-      endpoint = `socks5${endpoint}`;
+      endpoint = `https${endpoint}`;
       break;
     default:
-      endpoint = `socks5${endpoint}`;
+      endpoint = `https${endpoint}`;
   }
   return endpoint;
 };