@blueid/access-cli 0.19.0 → 0.22.0

package/lib/shared/outputBuffer.js

@@ -1,6 +1,9 @@
 import path from 'path'
 import fs from 'fs'
 
+import binaryToIntelHex from './binaryToIntelHex.js'
+import crc16 from './crc16.js'
+
 const bufferToCArray = (buffer) => {
     const hexString = buffer.toString('hex')
     const hexArray = hexString.match(/.{1,2}/g)
@@ -13,9 +16,41 @@ const bufferToProtoArray = (buffer) => {
     return hexArray.map((hex) => `\\x${hex}`).join('')
 }
 
+const bufferToIntelHex = (buffer, hexStartAddress, hexSize, hexCrc16, hexCrc16Magic) => {
+    if (typeof hexStartAddress !== 'number') {
+        throw new Error('Invalid hexStartAddress')
+    }
+
+    if (typeof hexSize !== 'number') {
+        throw new Error('Invalid hexSize')
+    }
+
+    if (typeof hexCrc16 !== 'boolean') {
+        throw new Error('Invalid hexCrc16')
+    }
+
+    if (typeof hexCrc16Magic !== 'boolean') {
+        throw new Error('Invalid hexCrc16Magic')
+    }
+
+    const binaryBuffer = Buffer.alloc(hexSize)
+
+    if (hexCrc16) {
+        buffer.copy(binaryBuffer, 2, 0)
+        const crc16_ = crc16(binaryBuffer, 2, hexCrc16Magic)
+        binaryBuffer.writeUInt16LE(crc16_, 0)
+        console.log(`Intel Hex, startAddress=${hexStartAddress}, size=${hexSize}, crc16=${crc16_}`)
+    } else {
+        buffer.copy(binaryBuffer, 0, 0)
+        console.log(`Intel Hex, startAddress=${hexStartAddress}, size=${hexSize}`)
+    }
+
+    return binaryToIntelHex(hexStartAddress, true, binaryBuffer)
+}
+
 export const outputFormats = ['hex', 'cpphex', 'protohex', 'base64']
 
-export default (buffer, format, filename) => {
+export default (buffer, format, filename, settings = {}) => {
     let result = null
 
     switch (format) {
@@ -31,13 +66,34 @@ export default (buffer, format, filename) => {
         case 'base64':
             result = buffer.toString('base64')
             break
-        default:
+        case 'file':
             {
                 const filepath = path.resolve(filename)
                 fs.writeFileSync(filepath, buffer)
                 result = `Written to file <${filepath}>`
             }
             break
+        case 'file_hex':
+            {
+                const [startAddress, filename_] = filename.split(':')
+
+                const startAddressNo = Number.parseInt(startAddress)
+                if (Number.isNaN(startAddressNo)) {
+                    throw new Error(`Invalid startAddress ${startAddress}`)
+                }
+
+                const { fileHexSize, fileHexCrc16, fileHexCrc16Magic } = settings
+
+                const hexData = bufferToIntelHex(buffer, startAddressNo, fileHexSize, fileHexCrc16, fileHexCrc16Magic)
+
+                const filepath = path.resolve(filename_)
+                fs.writeFileSync(filepath, hexData)
+
+                result = `Written to file <${filepath}>`
+            }
+            break
+        default:
+            throw new Error(`Unknown format ${format}`)
     }
 
     console.log(`(${format} with ${buffer.length.toString()} bytes)\n`)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@blueid/access-cli",
-    "version": "0.19.0",
+    "version": "0.22.0",
     "description": "BlueID Access CLI",
     "type": "module",
     "main": "./index.js",
@@ -14,7 +14,7 @@
         "package.json"
     ],
     "scripts": {
-        "sync-proto": "sh syncproto.sh",
+        "sync-proto": "sh syncproto.sh || exit 0",
         "preinstall": "npm run sync-proto",
         "prepack": "npm run sync-proto"
     },