WIP

Author: maneesht

packages/data-connect/src/api/DataConnect.ts

@@ -58,7 +58,6 @@ export interface ConnectorConfig {
 export interface TransportOptions {
   host: string;
   sslEnabled?: boolean;
-  port?: number;
 }
 
 const FIREBASE_DATA_CONNECT_EMULATOR_HOST_VAR =
@@ -71,11 +70,15 @@ const FIREBASE_DATA_CONNECT_EMULATOR_HOST_VAR =
  * @internal
  */
 export function parseOptions(fullHost: string): TransportOptions {
-  const [protocol, hostName] = fullHost.split('://');
-  const isSecure = protocol === 'https';
-  const [host, portAsString] = hostName.split(':');
-  const port = Number(portAsString);
-  return { host, port, sslEnabled: isSecure };
+  if (fullHost.startsWith('http://') || fullHost.startsWith('https://')) {
+    const [protocol, host] = fullHost.split('://');
+    const isSecure = protocol === 'https';
+    return { host, sslEnabled: isSecure };
+  }
+  return {
+    host: fullHost,
+    sslEnabled: false
+  };
 }
 /**
  * DataConnectOptions including project id
@@ -182,7 +185,6 @@ export class DataConnect {
     if (this._transportOptions) {
       this._transport.useEmulator(
         this._transportOptions.host,
-        this._transportOptions.port,
         this._transportOptions.sslEnabled
       );
     }
@@ -219,7 +221,6 @@ export function areTransportOptionsEqual(
 ): boolean {
   return (
     transportOptions1.host === transportOptions2.host &&
-    transportOptions1.port === transportOptions2.port &&
     transportOptions1.sslEnabled === transportOptions2.sslEnabled
   );
 }
@@ -237,7 +238,8 @@ export function connectDataConnectEmulator(
   port?: number,
   sslEnabled = false
 ): void {
-  dc.enableEmulator({ host, port, sslEnabled });
+  const hostWithPort = port ?  `${host}:${port}` : host;
+  dc.enableEmulator({ host: hostWithPort, sslEnabled });
 }
 
 /**

packages/data-connect/src/network/transport/index.ts

@@ -51,7 +51,7 @@ export interface DataConnectTransport {
     queryName: string,
     body?: U
   ): Promise<{ data: T; errors: Error[] }>;
-  useEmulator(host: string, port?: number, sslEnabled?: boolean): void;
+  useEmulator(host: string, sslEnabled?: boolean): void;
   onTokenChanged: (token: string | null) => void;
   _setCallerSdkType(callerSdkType: CallerSdkType): void;
 }

packages/data-connect/test/unit/dataconnect.test.ts

@@ -18,7 +18,7 @@
 import { deleteApp, initializeApp } from '@firebase/app';
 import { expect } from 'chai';
 
-import { getDataConnect } from '../../src';
+import { getDataConnect, parseOptions } from '../../src';
 
 describe('Data Connect Test', () => {
   beforeEach(() => {});
@@ -60,4 +60,22 @@ describe('Data Connect Test', () => {
     expect(dc.app.options.projectId).to.eq(projectId);
     await deleteApp(customApp);
   });
+  it('should parse env var correctly with http://', async () => {
+    const parsedHost = parseOptions('http://localhost');
+    expect(parsedHost.host).to.eq('localhost');
+    expect(parsedHost.port).to.be.undefined;
+    expect(parsedHost.sslEnabled).to.be.false;
+  });
+  it('should parse env var correctly with port', async () => {
+    const parsedHost = parseOptions('localhost:8080');
+    expect(parsedHost.host).to.eq('localhost');
+    expect(parsedHost.port).to.eq(8080);
+    expect(parsedHost.sslEnabled).to.be.false;
+  });
+it('should parse env var correctly with https://', async () => {
+    const parsedHost = parseOptions('https://localhost');
+    expect(parsedHost.host).to.eq('localhost');
+    expect(parsedHost.port).to.be.undefined;
+    expect(parsedHost.sslEnabled).to.be.true;
+  });
 });