Fixed callbacks in tests, build scripts

Author: gionatamettifogo

.devcontainer/devcontainer.json

@@ -18,7 +18,7 @@
     "gateway-dev": "bun --watch ./src/gateway/gateway.ts",
     "gateway-start": "bun --smol run ./src/gateway/gateway.ts",
     "gateway-test": "bun test ./src/gateway/connection-bun.test.ts --watch --coverage",
-    "gateway-build": "bun build ./src/gateway/gateway.ts --compile --outfile ./lib/sqlitecloud-gateway.out"
+    "gateway-build": "./scripts/gateway-build.sh"
   },
   "repository": {
     "type": "git",

package.json

@@ -0,0 +1,15 @@
+#!/bin/bash
+# gateway-build.sh - build gateway as self contained executable for linux and macos
+# If you get an error executing this script run:
+# chmod u+x ./scripts/build.sh
+
+# navigate to the script's directory
+#cd "$(dirname "$0")"
+
+# build bun's one file binary
+mkdir -p ./lib/gateway/public
+bun build ./src/gateway/gateway.ts --compile --outfile ./lib/gateway/gateway.out
+
+# copy the public folder to the build folder
+cp -r ./public/* ./lib/gateway/public/
+cp ./package.json ./lib/gateway/

public/sqlitecloud.drivers.dev.js

@@ -0,0 +1,19 @@
+#
+# upgrade.sh - upload gateway builds to a couple of nodes used for development, restart gateway
+#
+
+# upload ./build/ to test nodes
+# frankfurt01, frankfurt02, ny01
+rsync -avz -e "ssh -i ~/.ssh/id_ed25519" ./build/ sqlitecloud@y8pbz99zp.sqlite.cloud:gateway
+rsync -avz -e "ssh -i ~/.ssh/id_ed25519" ./build/ sqlitecloud@oggdnp3zm.sqlite.cloud:gateway
+
+# connect to nodes using ssh key
+# ssh -i ~/.ssh/id_ed25519 sqlitecloud@y8pbz99zp.sqlite.cloud
+# ssh -i ~/.ssh/id_ed25519 sqlitecloud@og0wjec-m.sqlite.cloud
+
+# restart gateway (locally)
+# pkill gateway-linux-x; cd /home/sqlitecloud/gateway; nohup ./gateway-linux-x64.out
+
+# restart gateway (remotely)
+ssh -i ~/.ssh/id_ed25519 sqlitecloud@y8pbz99zp.sqlite.cloud 'pkill gateway-linux-x; cd /home/sqlitecloud/gateway; nohup ./gateway-linux-x64.out > /dev/null 2>&1 &'
+ssh -i ~/.ssh/id_ed25519 sqlitecloud@oggdnp3zm.sqlite.cloud 'pkill gateway-linux-x; cd /home/sqlitecloud/gateway; nohup ./gateway-linux-x64.out > /dev/null 2>&1 &'

public/sqlitecloud.drivers.js

@@ -4,7 +4,6 @@
 
 import { SQLiteCloudError, type SQLCloudRowsetMetadata, type SQLiteCloudDataTypes } from './types'
 import { SQLiteCloudRowset } from './rowset'
-import { debug } from 'console'
 
 const lz4 = require('lz4js')
 
@@ -222,7 +221,7 @@ export function parseRowsetChunks(buffers: Buffer[]): SQLiteCloudRowset {
   console.assert(dataType === CMD_ROWSET_CHUNK)
   buffer = buffer.subarray(buffer.indexOf(' ') + 1)
 
-  while (true) {
+  while (buffer.length > 0 && !bufferStartsWith(buffer, ROWSET_CHUNKS_END)) {
     // chunk header, eg: 0:VERS NROWS NCOLS
     const { index: chunkIndex, metadata: chunkMetadata, fwdBuffer } = parseRowsetHeader(buffer)
     buffer = fwdBuffer
@@ -241,11 +240,6 @@ export function parseRowsetChunks(buffers: Buffer[]): SQLiteCloudRowset {
       data.push(itemData)
       buffer = fwdBuffer
     }
-
-    // no more chunks?
-    if (bufferStartsWith(buffer, ROWSET_CHUNKS_END)) {
-      break
-    }
   }
 
   console.assert(data && data.length === metadata.numberOfRows * metadata.numberOfColumns, 'parseRowsetChunks - invalid rowset data')

scripts/gateway-build.sh

@@ -3,16 +3,14 @@
 //
 
 // MUST RUN USING BUN TEST RUNNER, EG:
-// bun test ./src/gateway/gateway.test.ts --watch
+// bun test connection-bun.test.ts --watch
 
 import { SQLiteCloudError } from '../drivers/types'
 import { SQLiteCloudBunConnection } from './connection-bun'
+import { expect, test, describe, beforeEach, afterEach } from 'bun:test'
 
 let CHINOOK_DATABASE_URL = process.env['CHINOOK_DATABASE_URL'] as string
 console.assert(CHINOOK_DATABASE_URL, 'CHINOOK_DATABASE_URL is required')
-CHINOOK_DATABASE_URL = 'sqlitecloud://admin:uN3ARhdcKQ@oggdnp3zm.sqlite.cloud:8860/chinook.db?verbose=true'
-
-import { expect, test, describe, beforeEach, afterEach } from 'bun:test'
 
 async function getConnection(): Promise<SQLiteCloudBunConnection> {
   return new Promise((resolve, reject) => {
@@ -39,8 +37,8 @@ async function sendCommands(connection: SQLiteCloudBunConnection, command: strin
 describe('SQLiteCloudBunConnection', () => {
   // test different ways to connect
   describe('connecting', () => {
-    test('can connect using bun socket', async done => {
-      const connection = new SQLiteCloudBunConnection(CHINOOK_DATABASE_URL, error => {
+    test('can connect using bun socket', done => {
+      new SQLiteCloudBunConnection(CHINOOK_DATABASE_URL, error => {
         if (error) {
           console.error('Error connecting to database', error)
         }
@@ -129,10 +127,11 @@ describe('SQLiteCloudBunConnection', () => {
       expect(bufferrowset.length).toBe(0)
     })
 
-    test('should test error', async done => {
+    test('should test error', done => {
       chinookConnection.sendCommands('TEST ERROR', (error, results) => {
         expect(error).toBeDefined()
         expect(error).toBeInstanceOf(SQLiteCloudError)
+        expect(results).toBeNull()
 
         const sqliteCloudError = error as SQLiteCloudError
         expect(sqliteCloudError.message).toBe('This is a test error message with a devil error code.')
@@ -144,10 +143,11 @@ describe('SQLiteCloudBunConnection', () => {
       })
     })
 
-    test('should test exterror', async done => {
+    test('should test exterror', done => {
       chinookConnection.sendCommands('TEST EXTERROR', (error, results) => {
         expect(error).toBeDefined()
         expect(error).toBeInstanceOf(SQLiteCloudError)
+        expect(results).toBeNull()
 
         const sqliteCloudError = error as SQLiteCloudError
         expect(sqliteCloudError.message).toBe('This is a test error message with an extcode and a devil error code.')
@@ -193,7 +193,7 @@ describe('SQLiteCloudBunConnection', () => {
 
   // various select statements
   describe('select', () => {
-    test('can run simple select', async done => {
+    test('can run simple select', done => {
       const connection = new SQLiteCloudBunConnection(CHINOOK_DATABASE_URL, error => {
         if (error) {
           done(error)
@@ -230,7 +230,8 @@ describe('SQLiteCloudBunConnection', () => {
       const connection = await getConnection()
 
       let sql = ''
-      for (var i = 0; i < 250; i++) {
+      let i = 0
+      for (; i < 250; i++) {
         sql += `SELECT ${i} AS counter; `
       }
 

scripts/gateway-upgrade.sh

@@ -33,12 +33,13 @@ export class SQLiteCloudBunConnection extends SQLiteCloudConnection {
   }
 
   /* Opens a connection with the server and sends the initialization commands. Will throw in case of errors. */
+  /* eslint-disable @typescript-eslint/no-unused-vars */
   connectTransport(config: SQLiteCloudConfig, callback?: ErrorCallback): this {
-    console.debug(`-> connecting ${config?.host}:${config?.port}`)
+    console.debug(`-> connecting ${config?.host as string}:${config?.port as number}`)
     console.assert(!this.connected, 'BunSocketTransport.connect - connection already established')
     this.config = config
 
-    Bun.connect<any>({
+    void Bun.connect<any>({
       hostname: config.host as string,
       port: config.port as number,
       tls: config.insecure ? false : true,
@@ -50,7 +51,8 @@ export class SQLiteCloudBunConnection extends SQLiteCloudConnection {
 
           // send initialization commands
           const commands = getInitializationCommands(config)
-          this.transportCommands(commands, (error, rowset) => {
+          this.transportCommands(commands, error => {
+            // any results are ignored
             if (error) {
               console.error('BunSocketTransport.connect - error initializing connection', error)
               callback?.call(this, error)
@@ -63,7 +65,7 @@ export class SQLiteCloudBunConnection extends SQLiteCloudConnection {
 
         // connection failed
         connectError: (socket, error) => {
-          console.error(`BunTransport.connect - connectError: ${error}`)
+          console.error('BunTransport.connect - connectError', error)
           this.close()
           callback?.call(this, error)
         },
@@ -106,7 +108,7 @@ export class SQLiteCloudBunConnection extends SQLiteCloudConnection {
       }
     })
       .catch(error => {
-        console.debug(`BunTransport.connect - error: ${error}`)
+        console.debug('BunTransport.connect - error', error)
         this.close()
         callback?.call(this, error)
       })