feat(websocket): use new verision of endpoint

Author: Daniele Briggi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqlitecloud/drivers",
-  "version": "1.0.338",
+  "version": "1.0.339",
   "description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

src/drivers/connection-ws.ts

@@ -52,7 +52,7 @@ export class SQLiteCloudWebsocketConnection extends SQLiteCloudConnection {
       commands = { query: commands }
     }
 
-    this.socket.emit('v2/weblite/sql', { sql: commands.query, bind: commands.parameters, row: 'array' }, (response: any) => {
+    this.socket.emit('GET /v2/weblite/sql', { sql: commands.query, bind: commands.parameters, row: 'array' }, (response: any) => {
       if (response?.error) {
         const error = new SQLiteCloudError(response.error.detail, { ...response.error })
         callback?.call(this, error)

src/drivers/database.ts

@@ -204,7 +204,7 @@ export class Database extends EventEmitter {
   public run<T>(sql: string, params: any, callback?: ResultsCallback<T>): this
   public run(sql: string, ...params: any[]): this {
     const { args, callback } = popCallback<ResultsCallback>(params)
-    const command: SQLiteCloudCommand = { query: sql, parameters: args?.flat() }
+    const command: SQLiteCloudCommand = { query: sql, parameters: args }
     this.getConnection((error, connection) => {
       if (error || !connection) {
         this.handleError(null, error as Error, callback)
@@ -237,7 +237,7 @@ export class Database extends EventEmitter {
   public get<T>(sql: string, params: any, callback?: RowCallback<T>): this
   public get(sql: string, ...params: any[]): this {
     const { args, callback } = popCallback<RowCallback>(params)
-    const command: SQLiteCloudCommand = { query: sql, parameters: args?.flat() }
+    const command: SQLiteCloudCommand = { query: sql, parameters: args }
     this.getConnection((error, connection) => {
       if (error || !connection) {
         this.handleError(null, error as Error, callback)
@@ -275,7 +275,7 @@ export class Database extends EventEmitter {
   public all<T>(sql: string, params: any, callback?: RowsCallback<T>): this
   public all(sql: string, ...params: any[]): this {
     const { args, callback } = popCallback<RowsCallback>(params)
-    const command: SQLiteCloudCommand = { query: sql, parameters: args?.flat() }
+    const command: SQLiteCloudCommand = { query: sql, parameters: args }
     this.getConnection((error, connection) => {
       if (error || !connection) {
         this.handleError(null, error as Error, callback)
@@ -316,7 +316,7 @@ export class Database extends EventEmitter {
     // extract optional parameters and one or two callbacks
     const { args, callback, complete } = popCallback<RowCallback>(params)
 
-    const command: SQLiteCloudCommand = { query: sql, parameters: args?.flat() }
+    const command: SQLiteCloudCommand = { query: sql, parameters: args }
     this.getConnection((error, connection) => {
       if (error || !connection) {
         this.handleError(null, error as Error, callback)

src/drivers/statement.ts

@@ -64,12 +64,16 @@ export class Statement<T> {
     if (args?.length > 0) {
       // apply new bindings then execute
       this.bind(...args, () => {
-        this._database.run(this._preparedSql.query || '', this._preparedSql.parameters, callback)
+        const query = this._preparedSql.query || ''
+        const parametes: any = [...this._preparedSql.parameters ?? []]
+        this._database.run(query, ...parametes, callback)
       })
     } else {
       // execute prepared sql with same bindings
-      this._database.run(this._preparedSql.query || '', this._preparedSql.parameters, callback)
-    }
+      const query = this._preparedSql.query || ''
+      const parametes: any = [...this._preparedSql.parameters ?? []]
+      this._database.run(query, ...parametes, callback)
+  }
 
     return this
   }
@@ -89,12 +93,16 @@ export class Statement<T> {
     if (args?.length > 0) {
       // apply new bindings then execute
       this.bind(...args, () => {
-        this._database.get(this._preparedSql.query || '', this._preparedSql.parameters, callback)
+        const query = this._preparedSql.query || ''
+        const parametes: any = [...this._preparedSql.parameters ?? []]
+        this._database.get(query, ...parametes, callback)
       })
     } else {
       // execute prepared sql with same bindings
-      this._database.get(this._preparedSql.query || '', this._preparedSql.parameters, callback)
-    }
+      const query = this._preparedSql.query || ''
+      const parametes: any = [...this._preparedSql.parameters ?? []]
+      this._database.get(query, ...parametes, callback)
+  }
 
     return this
   }
@@ -111,12 +119,16 @@ export class Statement<T> {
     if (args?.length > 0) {
       // apply new bindings then execute
       this.bind(...args, () => {
-        this._database.all(this._preparedSql.query || '', this._preparedSql.parameters, callback)
+        const query = this._preparedSql.query || ''
+        const parametes: any = [...this._preparedSql.parameters ?? []]
+        this._database.all(query, ...parametes, callback)
       })
     } else {
       // execute prepared sql with same bindings
-      this._database.all(this._preparedSql.query || '', this._preparedSql.parameters, callback)
-    }
+      const query = this._preparedSql.query || ''
+      const parametes: any = [...this._preparedSql.parameters ?? []]
+      this._database.all(query, ...parametes, callback)
+  }
 
     return this
   }
@@ -133,12 +145,16 @@ export class Statement<T> {
     if (args?.length > 0) {
       // apply new bindings then execute
       this.bind(...args, () => {
-        this._database.each(this._preparedSql.query || '', this._preparedSql.parameters, callback, complete as RowCountCallback)
+        const query = this._preparedSql.query || ''
+        const parametes: any = [...this._preparedSql.parameters ?? [], ...[callback, complete as RowCountCallback]]
+        this._database.each(query, ...parametes)
       })
     } else {
       // execute prepared sql with same bindings
-      this._database.each(this._preparedSql.query || '', this._preparedSql.parameters, callback, complete as RowCountCallback)
-    }
+      const query = this._preparedSql.query || ''
+      const parametes: any = [...this._preparedSql.parameters ?? [], ...[callback, complete as RowCountCallback]]
+      this._database.each(query, ...parametes)
+  }
 
     return this
   }

test/connection-ws.test.ts

@@ -391,7 +391,7 @@ describe('connection-ws', () => {
         const command: SQLiteCloudCommand = { query: 'SELECT * FROM albums WHERE albumId = ?', parameters: [1] }
         chinook.sendCommands(command, (error, results) => {
           expect(error).toBeNull()
-          expect(results.numberOfColumns).toBe(1)
+          expect(results.numberOfColumns).toBe(3)
           done()
         })
       })