Merge pull request #1805 from sidorares/bun-support

Bun support

Author: sidorares

.github/workflows/ci-bun.yml

@@ -0,0 +1,62 @@
+name: CI - Linux (bun)
+
+# this will be merged with ci-linux.yml
+
+on:
+  pull_request:
+  push:
+    branches: [ main ]
+
+  workflow_dispatch:
+
+env:
+  MYSQL_PORT: 3306
+  MYSQL_USER: root
+  MYSQL_DATABASE: test
+
+jobs:
+  tests-linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        bun-version: [0.5.1]
+        mysql-version: ["mysql:5.7", "mysql:8.0.18", "mysql:8.0.22"]
+        use-compression: [0]
+        use-tls: [0]
+
+    name: Bun ${{ matrix.bun-version }} - DB ${{ matrix.mysql-version }} - SSL=${{matrix.use-tls}} Compression=${{matrix.use-compression}}
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up MySQL
+        run: docker run -d -e MYSQL_ALLOW_EMPTY_PASSWORD=1 -e MYSQL_DATABASE=${{ env.MYSQL_DATABASE }} -v $PWD/mysqldata:/var/lib/mysql/ -v $PWD/examples/custom-conf:/etc/mysql/conf.d -v $PWD/examples/ssl/certs:/certs -p ${{ env.MYSQL_PORT }}:3306 ${{ matrix.mysql-version }}
+
+      - name: Set up Bun ${{ matrix.bun-version }}
+        uses: oven-sh/[email protected]
+        with:
+          bun-version: ${{ matrix.bun-version }}
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: npm-${{ hashFiles('package-lock.json') }}
+          restore-keys: npm-
+          
+      - name: Install npm dependencies
+        run: npm ci
+  
+      # - name: Install npm dependencies
+      #   run: bun install
+
+      - name: Wait mysql server is ready
+        run: node tools/wait-up.js
+
+      - name: Run tests
+        # todo: run full test suite once test createServer is implemented using Bun.listen
+        run: FILTER=test-select MYSQL_PORT=3306 bun run test

.github/workflows/ci-linux.yml

@@ -55,7 +55,7 @@ jobs:
             mysql-version: "mysql:5.7"
             use-compression: 0
             use-tls: 0
-          - filter: "5.1only"
+          - filter: "test-select-1"
             node-version: "16.x"
             mysql-version: "datagrip/mysql:5.1"
             use-compression: 0

lib/auth_41.js

@@ -41,16 +41,7 @@ function sha1(msg, msg1, msg2) {
 }
 
 function xor(a, b) {
-  if (!Buffer.isBuffer(a)) {
-    a = Buffer.from(a, 'binary');
-  }
-
-  if (!Buffer.isBuffer(b)) {
-    b = Buffer.from(b, 'binary');
-  }
-
   const result = Buffer.allocUnsafe(a.length);
-
   for (let i = 0; i < a.length; i++) {
     result[i] = a[i] ^ b[i];
   }
@@ -60,7 +51,6 @@ function xor(a, b) {
 exports.xor = xor;
 
 function token(password, scramble1, scramble2) {
-  // TODO: use buffers (not sure why strings here)
   if (!password) {
     return Buffer.alloc(0);
   }
@@ -94,14 +84,6 @@ exports.doubleSha1 = function(password) {
 };
 
 function xorRotating(a, seed) {
-  if (!Buffer.isBuffer(a)) {
-    a = Buffer.from(a, 'binary');
-  }
-
-  if (!Buffer.isBuffer(seed)) {
-    seed = Buffer.from(seed, 'binary');
-  }
-
   const result = Buffer.allocUnsafe(a.length);
   const seedLen = seed.length;
 

lib/auth_plugins/caching_sha2_password.js

@@ -17,24 +17,24 @@ const STATE_FINAL = -1;
 
 function sha256(msg) {
   const hash = crypto.createHash('sha256');
-  hash.update(msg, 'binary');
-  return hash.digest('binary');
+  hash.update(msg);
+  return hash.digest();
 }
 
 function calculateToken(password, scramble) {
   if (!password) {
     return Buffer.alloc(0);
   }
-  const stage1 = sha256(Buffer.from(password, 'utf8').toString('binary'));
+  const stage1 = sha256(Buffer.from(password));
   const stage2 = sha256(stage1);
-  const stage3 = sha256(stage2 + scramble.toString('binary'));
+  const stage3 = sha256(Buffer.concat([stage2, scramble]));
   return xor(stage1, stage3);
 }
 
 function encrypt(password, scramble, key) {
   const stage1 = xorRotating(
-    Buffer.from(`${password}\0`, 'utf8').toString('binary'),
-    scramble.toString('binary')
+    Buffer.from(`${password}\0`, 'utf8'),
+    scramble
   );
   return crypto.publicEncrypt(key, stage1);
 }
@@ -86,6 +86,7 @@ module.exports = (pluginOptions = {}) => ({ connection }) => {
           `Invalid AuthMoreData packet received by ${PLUGIN_NAME} plugin in STATE_TOKEN_SENT state.`
         );
       case STATE_WAIT_SERVER_KEY:
+        console.log('Server pub key:', data);
         if (pluginOptions.onServerPublicKey) {
           pluginOptions.onServerPublicKey(data);
         }

lib/auth_plugins/sha256_password.js

@@ -12,8 +12,8 @@ const STATE_FINAL = -1;
 
 function encrypt(password, scramble, key) {
   const stage1 = xorRotating(
-    Buffer.from(`${password}\0`, 'utf8').toString('binary'),
-    scramble.toString('binary')
+    Buffer.from(`${password}\0`, 'utf8'),
+    scramble
   );
   return crypto.publicEncrypt(key, stage1);
 }

lib/connection_config.js

@@ -91,7 +91,7 @@ class ConnectionConfig {
     this.isServer = options.isServer;
     this.stream = options.stream;
     this.host = options.host || 'localhost';
-    this.port = options.port || 3306;
+    this.port = (typeof options.port === 'string' ? parseInt(options.port, 10) : options.port)|| 3306;
     this.localAddress = options.localAddress;
     this.socketPath = options.socketPath;
     this.user = options.user || undefined;
@@ -254,7 +254,7 @@ class ConnectionConfig {
     const parsedUrl = new URL(url);
     const options = {
       host: parsedUrl.hostname,
-      port: parsedUrl.port,
+      port: parseInt(parsedUrl.port, 10),
       database: parsedUrl.pathname.slice(1),
       user: parsedUrl.username,
       password: parsedUrl.password

test/common.js

@@ -30,7 +30,7 @@ exports.config = config;
 exports.waitDatabaseReady = function(callback) {
   const start = Date.now();
   const tryConnect = function() {
-    const conn = exports.createConnection({ database: 'mysql' });
+    const conn = exports.createConnection({ database: 'mysql', password: process.env.MYSQL_PASSWORD });
     conn.once('error', err => {
       if (err.code !== 'PROTOCOL_CONNECTION_LOST' && err.code !== 'ETIMEDOUT') {
         console.log('Unexpected error waiting for connection', err);

test/integration/connection/test-select-1.js

@@ -1,22 +1,13 @@
 'use strict';
 
+const assert = require('assert');
 const common = require('../../common');
 const connection = common.createConnection();
-const assert = require('assert');
-
-let rows = undefined;
-let fields = undefined;
-connection.query('SELECT 1', (err, _rows, _fields) => {
-  if (err) {
-    throw err;
-  }
 
-  rows = _rows;
-  fields = _fields;
-  connection.end();
-});
-
-process.on('exit', () => {
+connection.query('SELECT 1', (err, rows, fields) => {
+  console.log('query callback', err, rows, fields);
+  assert.ifError(err);
   assert.deepEqual(rows, [{ 1: 1 }]);
   assert.equal(fields[0].name, '1');
-});
+  connection.end();
+});