Improve url handling

Author: vikrantpuppala

lib/connection/connections/HttpConnection.ts

@@ -98,7 +98,7 @@ export default class HttpConnection implements IConnectionProvider {
 
       this.connection = new ThriftHttpConnection(
         {
-          url: `${options.https ? 'https' : 'http'}://${options.host}:${options.port}${options.path ?? '/'}`,
+          url: `${options.https ? 'https' : 'http'}://${options.host.replace(/\/+$/, '')}:${options.port}${options.path ? ('/' + options.path.replace(/^\/+|\/+$/g, '')) : '/'}`,
           transport: thrift.TBufferedTransport,
           protocol: thrift.TBinaryProtocol,
           getRetryPolicy: () => this.getRetryPolicy(),

package.json

@@ -50,8 +50,8 @@
     "@types/chai": "^4.3.14",
     "@types/http-proxy": "^1.17.14",
     "@types/lz4": "^0.6.4",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^18.11.9",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^18.19.84",
     "@types/node-fetch": "^2.6.4",
     "@types/node-int64": "^0.4.29",
     "@types/sinon": "^17.0.3",

tests/unit/connection/connections/HttpConnection.test.ts

@@ -2,7 +2,7 @@ import http from 'http';
 import { expect } from 'chai';
 import HttpConnection from '../../../../lib/connection/connections/HttpConnection';
 import ThriftHttpConnection from '../../../../lib/connection/connections/ThriftHttpConnection';
-
+import IConnectionOptions from '../../../../lib/connection/contracts/IConnectionOptions';
 import ClientContextStub from '../../.stubs/ClientContextStub';
 
 describe('HttpConnection.connect', () => {
@@ -127,4 +127,50 @@ describe('HttpConnection.connect', () => {
       ...extraHeaders,
     });
   });
+
+  it('should handle trailing slashes in host and path correctly', async () => {
+    interface TestCase {
+      input: {
+        host: string;
+        path?: string;
+      };
+      expected: string;
+    }
+
+    const testCases: TestCase[] = [
+      {
+        input: { host: 'xyz.com/', path: '/sql/v1/' },
+        expected: 'https://xyz.com:443/sql/v1'
+      },
+      {
+        input: { host: 'xyz.com', path: 'sql/v1' },
+        expected: 'https://xyz.com:443/sql/v1'
+      },
+      {
+        input: { host: 'xyz.com/', path: 'sql/v1' },
+        expected: 'https://xyz.com:443/sql/v1'
+      },
+      {
+        input: { host: 'xyz.com//', path: '//sql/v1//' },
+        expected: 'https://xyz.com:443/sql/v1'
+      },
+      {
+        input: { host: 'xyz.com', path: undefined },
+        expected: 'https://xyz.com:443/'
+      }
+    ];
+
+    for (const testCase of testCases) {
+      const options: IConnectionOptions = {
+        host: testCase.input.host,
+        port: 443,
+        path: testCase.input.path,
+        https: true,
+      };
+
+      const connection = new HttpConnection(options, new ClientContextStub());
+      const thriftConnection = await connection.getThriftConnection();
+      expect(thriftConnection.url).to.be.equal(testCase.expected);
+    }
+  });
 });