fix(blob): blob to be sent as binary

Daniele Briggi · Daniele Briggi · commit 85276be0a3f5 · 2025-05-07T14:18:49.000Z
diff --git a/.gitignore b/.gitignore
@@ -118,7 +118,7 @@ dist
 # Compiled code
 coverage/
 docs/
-lib/
+#lib/
 
 # Mac files
 .DS_Store
diff --git a/lib/drivers/connection.d.ts b/lib/drivers/connection.d.ts
@@ -1,7 +1,7 @@
 /**
  * connection.ts - base abstract class for sqlitecloud server connections
  */
-import { SQLiteCloudConfig, ErrorCallback, ResultsCallback, SQLiteCloudCommand } from './types';
+import { SQLiteCloudConfig, ErrorCallback, ResultsCallback, SQLiteCloudCommand, SQLiteCloudDataTypes } from './types';
 import { OperationsQueue } from './queue';
 /**
  * Base class for SQLiteCloudConnection handles basics and defines methods.
@@ -39,7 +39,7 @@ export declare abstract class SQLiteCloudConnection {
      * @returns An array of rows in case of selections or an object with
      * metadata in case of insert, update, delete.
      */
-    sql(sql: TemplateStringsArray | string | SQLiteCloudCommand, ...values: any[]): Promise<any>;
+    sql(sql: TemplateStringsArray | string | SQLiteCloudCommand, ...values: SQLiteCloudDataTypes[]): Promise<any>;
     /** Disconnect from server, release transport. */
     abstract close(): this;
 }
diff --git a/lib/drivers/database.d.ts b/lib/drivers/database.d.ts
@@ -1,7 +1,7 @@
 import EventEmitter from 'eventemitter3';
 import { PubSub } from './pubsub';
 import { Statement } from './statement';
-import { ErrorCallback as ConnectionCallback, ResultsCallback, RowCallback, RowCountCallback, RowsCallback, SQLiteCloudCommand, SQLiteCloudConfig } from './types';
+import { ErrorCallback as ConnectionCallback, ResultsCallback, RowCallback, RowCountCallback, RowsCallback, SQLiteCloudCommand, SQLiteCloudConfig, SQLiteCloudDataTypes } from './types';
 /**
  * Creating a Database object automatically opens a connection to the SQLite database.
  * When the connection is established the Database object emits an open event and calls
@@ -153,7 +153,7 @@ export declare class Database extends EventEmitter {
      * @returns An array of rows in case of selections or an object with
      * metadata in case of insert, update, delete.
      */
-    sql(sql: TemplateStringsArray | string | SQLiteCloudCommand, ...values: any[]): Promise<any>;
+    sql(sql: TemplateStringsArray | string | SQLiteCloudCommand, ...values: SQLiteCloudDataTypes[]): Promise<any>;
     /**
      * Returns true if the database connection is open.
      */
diff --git a/lib/drivers/protocol.js b/lib/drivers/protocol.js
@@ -322,6 +322,7 @@ function serializeCommand(data, zeroString = false) {
     }
     const bytesTotal = buffer_1.Buffer.byteLength(serializedData, 'utf-8');
     const header = `${exports.CMD_ARRAY}${bytesTotal} `;
+    console.log(`serializeCommand - ${header}${serializedData}`);
     return header + serializedData;
 }
 function serializeData(data, zeroString = false) {
@@ -343,8 +344,8 @@ function serializeData(data, zeroString = false) {
         }
     }
     if (buffer_1.Buffer.isBuffer(data)) {
-        const header = `${exports.CMD_BLOB}${data.length} `;
-        return header + data.toString('utf-8');
+        const header = `${exports.CMD_BLOB}${data.byteLength} `;
+        return header + data;
     }
     if (data === null || data === undefined) {
         return `${exports.CMD_NULL} `;
diff --git a/lib/sqlitecloud.drivers.dev.js b/lib/sqlitecloud.drivers.dev.js
diff --git a/lib/sqlitecloud.drivers.js b/lib/sqlitecloud.drivers.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sqlitecloud/drivers",
-  "version": "1.0.491",
+  "version": "1.0.492",
   "description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
diff --git a/src/drivers/connection.ts b/src/drivers/connection.ts
@@ -2,7 +2,7 @@
  * connection.ts - base abstract class for sqlitecloud server connections
  */
 
-import { SQLiteCloudConfig, SQLiteCloudError, ErrorCallback, ResultsCallback, SQLiteCloudCommand } from './types'
+import { SQLiteCloudConfig, SQLiteCloudError, ErrorCallback, ResultsCallback, SQLiteCloudCommand, SQLiteCloudDataTypes } from './types'
 import { validateConfiguration } from './utilities'
 import { OperationsQueue } from './queue'
 import { anonimizeCommand, getUpdateResults } from './utilities'
@@ -112,7 +112,7 @@ export abstract class SQLiteCloudConnection {
    * @returns An array of rows in case of selections or an object with
    * metadata in case of insert, update, delete.
    */
-  public async sql(sql: TemplateStringsArray | string | SQLiteCloudCommand, ...values: any[]): Promise<any> {
+  public async sql(sql: TemplateStringsArray | string | SQLiteCloudCommand, ...values: SQLiteCloudDataTypes[]): Promise<any> {
     let commands = { query: '' } as SQLiteCloudCommand
 
     // sql is a TemplateStringsArray, the 'raw' property is specific to TemplateStringsArray
diff --git a/src/drivers/database.ts b/src/drivers/database.ts
@@ -22,6 +22,7 @@ import {
   SQLiteCloudArrayType,
   SQLiteCloudCommand,
   SQLiteCloudConfig,
+  SQLiteCloudDataTypes,
   SQLiteCloudError
 } from './types'
 import { isBrowser, popCallback } from './utilities'
@@ -436,7 +437,7 @@ export class Database extends EventEmitter {
    * @returns An array of rows in case of selections or an object with
    * metadata in case of insert, update, delete.
    */
-  public async sql(sql: TemplateStringsArray | string | SQLiteCloudCommand, ...values: any[]): Promise<any> {
+  public async sql(sql: TemplateStringsArray | string | SQLiteCloudCommand, ...values: SQLiteCloudDataTypes[]): Promise<any> {
     let commands = { query: '' } as SQLiteCloudCommand
 
     // sql is a TemplateStringsArray, the 'raw' property is specific to TemplateStringsArray
diff --git a/src/drivers/protocol.ts b/src/drivers/protocol.ts
@@ -382,8 +382,8 @@ function serializeData(data: SQLiteCloudDataTypes, zeroString: boolean = false):
   }
 
   if (Buffer.isBuffer(data)) {
-    const header = `${CMD_BLOB}${data.length} `
-    return header + data.toString('utf-8')
+    const header = `${CMD_BLOB}${data.byteLength} `
+    return header + data
   }
 
   if (data === null || data === undefined) {
diff --git a/src/drivers/utilities.ts b/src/drivers/utilities.ts
@@ -82,7 +82,7 @@ export function getInitializationCommands(config: SQLiteCloudConfig): string {
     }
     commands += `USE DATABASE ${config.database};`
   }
-
+  
   return commands
 }
 
diff --git a/test/database.test.ts b/test/database.test.ts
@@ -6,6 +6,7 @@ import { describe, expect, it } from '@jest/globals'
 import { RowCountCallback } from '../src/drivers/types'
 import { Database, SQLiteCloudError, SQLiteCloudRow, SQLiteCloudRowset, sanitizeSQLiteIdentifier } from '../src/index'
 import { LONG_TIMEOUT, getChinookDatabase, getTestingDatabase, getTestingDatabaseAsync, removeDatabase, removeDatabaseAsync } from './shared'
+const crypto = require('crypto')
 
 //
 // utility methods to setup and destroy temporary test databases
@@ -604,6 +605,25 @@ describe('Database.sql (async)', () => {
       await removeDatabaseAsync(database)
     }
   })
+
+  it('binding should work with blob', async () => {
+    let database
+    try {
+      database = await getTestingDatabaseAsync()
+      const hash = crypto.createHash('sha256').update('my blob data').digest()
+
+      await database.sql('CREATE TABLE IF NOT EXISTS blobs (id INTEGER PRIMARY KEY, hash BLOB NOT NULL, myindex INTEGER NOT NULL);')
+      let results = await database.sql('INSERT INTO blobs (hash, myindex) VALUES (?, ?);', hash, 1)
+      expect(results.changes).toEqual(1)
+
+      results = await database.sql('SELECT * FROM blobs WHERE id = ? and hash = ?;', results.lastID, hash)
+
+      expect(results).toHaveLength(1)
+      expect(results[0].myindex).toEqual(1)
+    } finally {
+      await removeDatabaseAsync(database)
+    }
+  })
 })
 
 it('should be connected', async () => {

Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,7 @@ function serializeCommand(data, zeroString = false) {`
`322`	`322`	`}`
`323`	`323`	`const bytesTotal = buffer_1.Buffer.byteLength(serializedData, 'utf-8');`
`324`	`324`	const header = `${exports.CMD_ARRAY}${bytesTotal} `;
	`325`	+ console.log(`serializeCommand - ${header}${serializedData}`);
`325`	`326`	`return header + serializedData;`
`326`	`327`	`}`
`327`	`328`	`function serializeData(data, zeroString = false) {`
`@@ -343,8 +344,8 @@ function serializeData(data, zeroString = false) {`
`343`	`344`	`}`
`344`	`345`	`}`
`345`	`346`	`if (buffer_1.Buffer.isBuffer(data)) {`
`346`		- const header = `${exports.CMD_BLOB}${data.length} `;
`347`		`- return header + data.toString('utf-8');`
	`347`	+ const header = `${exports.CMD_BLOB}${data.byteLength} `;
	`348`	`+ return header + data;`
`348`	`349`	`}`
`349`	`350`	`if (data === null \|\| data === undefined) {`
`350`	`351`	return `${exports.CMD_NULL} `;
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sqlitecloud/drivers",`
`3`		`- "version": "1.0.491",`
	`3`	`+ "version": "1.0.492",`
`4`	`4`	`"description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",`
`5`	`5`	`"main": "./lib/index.js",`
`6`	`6`	`"types": "./lib/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -382,8 +382,8 @@ function serializeData(data: SQLiteCloudDataTypes, zeroString: boolean = false):`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`if (Buffer.isBuffer(data)) {`
`385`		- const header = `${CMD_BLOB}${data.length} `
`386`		`- return header + data.toString('utf-8')`
	`385`	+ const header = `${CMD_BLOB}${data.byteLength} `
	`386`	`+ return header + data`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`if (data === null \|\| data === undefined) {`