Config changes

Author: gionatamettifogo

src/connection.ts

@@ -3,21 +3,10 @@
  */
 
 import { SQLiteCloudConfig, SQLiteCloudError, ErrorCallback, ResultsCallback } from './types'
-import { parseConnectionString, parseBoolean } from './utilities'
-
-/** tls.TLSSocket is required to connect using TlsSocketTransport but is only supported in node.js environments  */
-let tlsSupported = false
-import('tls')
-  .then(() => {
-    tlsSupported = true
-  })
-  .catch(() => {
-    tlsSupported = false
-  })
+import { parseConnectionString, parseBoolean, isBrowser, isNode } from './utilities'
 
 /** Default timeout value for queries */
 export const DEFAULT_TIMEOUT = 300 * 1000
-
 /** Default tls connection port */
 export const DEFAULT_PORT = 9960
 
@@ -60,7 +49,7 @@ export class SQLiteCloudConnection {
   protected connect(callback?: ErrorCallback): this {
     this.operations.enqueue(done => {
       // connect using websocket if tls is not supported or if explicitly requested
-      if (!tlsSupported || this.config?.websocketOptions?.useWebsocket || this.config?.websocketOptions?.gatewayUrl) {
+      if (isBrowser || this.config?.useWebsocket || this.config?.gatewayUrl) {
         // socket.io transport works in both node.js and browser environments and connects via SQLite Cloud Gateway
         import('./transport-ws')
           .then(transport => {
@@ -127,6 +116,7 @@ export class SQLiteCloudConnection {
     config.sqliteMode = parseBoolean(config.sqliteMode)
 
     if (!config.username || !config.password || !config.host) {
+      console.error(`SQLiteCloudConnection.validateConfiguration - missing arguments`, config)
       throw new SQLiteCloudError('The user, password and host arguments must be specified.', { errorCode: 'ERR_MISSING_ARGS' })
     }
 

src/index.ts

@@ -8,3 +8,4 @@ export { SQLiteCloudConfig, SQLCloudRowsetMetadata, SQLiteCloudError, ErrorCallb
 export { SQLiteCloudRowset, SQLiteCloudRow } from './rowset'
 export { SQLiteCloudConnection } from './connection'
 export { escapeSqlParameter, prepareSql } from './utilities'
+export { WebSocketTransport } from './transport-ws'

test/connection-ws.test.ts

@@ -35,7 +35,7 @@ describe('connection-ws', () => {
 
     it('should connect with config object string', done => {
       const configObj = getChinookConfig()
-      configObj.websocketOptions = { useWebsocket: true }
+      configObj.useWebsocket = true
       const connection = new SQLiteCloudConnection(configObj)
       expect(connection).toBeDefined()
       connection.sendCommands('TEST STRING', (error, results) => {
@@ -49,7 +49,7 @@ describe('connection-ws', () => {
       const configObj = getChinookConfig()
       configObj.connectionString?.replace(configObj.password as string, 'wrongpassword')
       configObj.password = 'wrongpassword'
-      configObj.websocketOptions = { useWebsocket: true }
+      configObj.useWebsocket = true 
 
       // should attemp connection and return error
       const connection = new SQLiteCloudConnection(configObj)

test/shared.ts

@@ -94,10 +94,8 @@ export function getChinookWebsocketConnection(callback?: ResultsCallback, extraC
   let chinookConfig = getChinookConfig(CHINOOK_DATABASE_URL, extraConfig)
   chinookConfig = {
     ...chinookConfig,
-    websocketOptions: {
-      useWebsocket: true,
-      gatewayUrl: GATEWAY_URL
-    }
+    useWebsocket: true,
+    gatewayUrl: GATEWAY_URL
   }
   const chinookConnection = new SQLiteCloudConnection(chinookConfig, callback)
   return chinookConnection

test/utilities.test.ts

@@ -107,6 +107,29 @@ describe('parseConnectionString', () => {
     })
   })
 
+  it('should parse connection string without database or options', () => {
+    const connectionString = 'sqlitecloud://user:password@host:1234'
+    const config = parseConnectionString(connectionString)
+
+    expect(config).toEqual({
+      username: 'user',
+      password: 'password',
+      host: 'host',
+      port: 1234
+    })
+  })
+
+  it('should parse connection string without port', () => {
+    const connectionString = 'sqlitecloud://user:password@host'
+    const config = parseConnectionString(connectionString)
+
+    expect(config).toEqual({
+      username: 'user',
+      password: 'password',
+      host: 'host'
+    })
+  })
+
   it('should throw SQLiteCloudError if the connection string is invalid', () => {
     const connectionString = 'not a valid url'