node-firebird 1.1.4 → 1.1.6

package/.github/workflows/codeql.yml

@@ -0,0 +1,76 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '26 2 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

package/.github/workflows/node.js.yml

@@ -4,75 +4,37 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
-      matrix:
-        os: [ubuntu-16.04, ubuntu-18.04, windows-2019, macos-10.15]
-        node-version: [10.x, 12.x, 14.x, 15.x]
+      matrix:        
+        node: [14, 16]
+        firebird-version: ['v3']
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 10
 
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+    - name: Setup FirebirdSQL container
+      uses: juarezr/firebirdsql-github-action@v1.2.0
       with:
-        node-version: ${{ matrix.node-version }}
+        version: ${{ matrix.firebird-version }}
+        isc_password: "masterkey"
+        enable_legacy_client_auth: "true"        
 
-    - name: Firebird install (Linux)
-      if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04'
-      run: |
-        if [ `lsb_release -rs` = '16.04' ]
-        then
-            sudo apt-get install libtommath0
-        else
-            sudo apt-get install libtommath1
-            sudo ln -s /usr/lib/x86_64-linux-gnu/libtommath.so.1 /usr/lib/x86_64-linux-gnu/libtommath.so.0
-        fi
-        wget -nv -O Firebird-3.0.7.33374-0.amd64.tar.gz "https://github.com/FirebirdSQL/firebird/releases/download/R3_0_7/Firebird-3.0.7.33374-0.amd64.tar.gz"
-        tar xzvf Firebird-3.0.7.33374-0.amd64.tar.gz
-        (cd Firebird-3.0.7.33374-0.amd64; sudo ./install.sh -silent)
-        sudo usermod -a -G firebird `whoami`
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node }}
 
-    - name: Firebird install (MacOS)
-      if: matrix.os == 'macos-10.15'
-      run: |
-        wget -nv -O Firebird-3.0.7-33374-x86_64.pkg "https://github.com/FirebirdSQL/firebird/releases/download/R3_0_7/Firebird-3.0.7-33374-x86_64.pkg"
-        sudo installer -verbose -pkg "Firebird-3.0.7-33374-x86_64.pkg" -target /
-        
-    - name: Firebird install (Windows)
-      if: matrix.os == 'windows-2019'
-      shell: cmd
-      run: |
-        set FB_ZIP=Firebird-3.0.7.33374-1_x64.zip
-        powershell Invoke-WebRequest "https://github.com/FirebirdSQL/firebird/releases/download/R3_0_7/$env:FB_ZIP" -OutFile "$env:FB_ZIP"
-        7z x -oC:\Firebird %FB_ZIP%
 
     - name: Build
       shell: bash
       run: |
         npm ci         
 
-    - name: Test (Linux)
-      if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04'
-      run: |
-        sg firebird -c "npx nyc npm test"
-
-    - name: Test (MacOS)
-      if: matrix.os == 'macos-10.15'
-      run: |
-        sudo mkdir `pwd`/tmp-node-fb
-        sudo chmod 777 `pwd`/tmp-node-fb
-        export ISC_USER=sysdba
-        export ISC_PASSWORD=masterkey
-        export NODE_FB_TEST_TMP_DIR=`pwd`/tmp-node-fb
-        npx nyc npm test
-
-    - name: Test (Windows)
-      if: matrix.os == 'windows-2019'
-      shell: cmd
+    - name: Test (Linux)      
       run: |
-        set PATH=C:\Firebird;%PATH%
-        call npx nyc npm test
+        export FIREBIRD_DATA=/firebird/data
+        npx nyc npm test

package/README.md

@@ -3,7 +3,6 @@
 ![Firebird Logo](https://firebirdsql.org/file/about/firebird-logo-90.png)
 
 [![NPM version][npm-version-image]][npm-url] [![NPM downloads][npm-downloads-image]][npm-url] [![Mozilla License][license-image]][license-url]
-[![Build Status](https://travis-ci.org/mariuz/node-firebird.svg?branch=master)](https://travis-ci.org/mariuz/node-firebird)
 
 [![NPM](https://nodei.co/npm/node-firebird.png?downloads=true&downloadRank=true)](https://nodei.co/npm/node-firebird/)
 
@@ -69,6 +68,7 @@ options.pageSize = 4096;        // default when creating database
 options.pageSize = 4096;        // default when creating database
 options.retryConnectionInterval = 1000; // reconnect interval in case of connection drop
 options.blobAsText = false; // set to true to get blob as text, only affects blob subtype 1
+options.encoding = 'UTF-8'; // default encoding for connection is UTF-8
 ```
 
 ### Classic

package/lib/index.d.ts

@@ -63,6 +63,7 @@ declare module 'node-firebird' {
         'DOS869' |
         'GB18030' |
         'GBK' |
+        'ISO8859_1' |
         'ISO8859_2' |
         'ISO8859_3' |
         'ISO8859_4' |
@@ -76,6 +77,10 @@ declare module 'node-firebird' {
         'KOI8U' |
         'TIS620' |
         'UTF8' |
+        'WIN1251' |
+        'WIN1252' |
+        'WIN1253' |
+        'WIN1254' |        
         'WIN1255' |
         'WIN1256' |
         'WIN1257' |

package/lib/index.js

@@ -2680,7 +2680,7 @@ ServiceManager.prototype.getFbserverInfos = function (infos, options, callback)
     // if infos is empty all options are asked to the service
 
     var tops = [], empty = isEmpty(infos);
-    for (popts in opts)
+    for (let popts in opts)
         if (empty || infos[popts])
             tops.push(opts[popts]);
 
@@ -3248,7 +3248,7 @@ function decodeResponse(data, callback, cnx, lowercase_keys, cb) {
                         data.readBuffer((4 - nullBitsLen) & 3, false); // Skip padding
                     }
 
-                    for (length = output.length; data.fcolumn < length; data.fcolumn++) {
+                    for (let length = output.length; data.fcolumn < length; data.fcolumn++) {
                         item = output[data.fcolumn];
                         
                         if (!lowerV13 && nullBitSet.get(data.fcolumn)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-firebird",
-    "version": "1.1.4",
+    "version": "1.1.6",
     "description": "Pure JavaScript and Asynchronous Firebird client for Node.js.",
     "keywords": [
         "firebird",
@@ -37,8 +37,8 @@
         "long": "^4.0.0"
     },
     "devDependencies": {
-        "coveralls": "^3.0.1",
-        "mocha": "^8.0.1",
+        "coveralls-next": "^4.2.0",
+        "mocha": "^10.2.0",
         "nyc": "^15.0.1"
     }
 }