feat: [email protected] and @zwave-js/[email protected] (#3960)

Co-authored-by: Daniel Lando <[email protected]>
zwave-js · Nov 12, 2024 · b2c0372 · b2c0372
1 parent 4d68323
commit b2c0372
Show file tree

Hide file tree

Showing 6 changed files with 4,337 additions and 4,211 deletions.
diff --git a/api/lib/ZnifferManager.ts b/api/lib/ZnifferManager.ts
@@ -144,7 +144,7 @@ export default class ZnifferManager extends TypedEventEmitter<ZnifferManagerEven
 
 	private parseFrame(
 		frame: Frame | CorruptedFrame,
-		rawData: Buffer,
+		rawData: Uint8Array,
 		timestamp = Date.now(),
 	): SocketFrame {
 		const socketFrame: SocketFrame = {
@@ -196,7 +196,7 @@ export default class ZnifferManager extends TypedEventEmitter<ZnifferManagerEven
 		return this.zniffer.capturedFrames.map((frame) => {
 			return this.parseFrame(
 				frame.parsedFrame,
-				frame.frameData,
+				Buffer.from(frame.frameData),
 				frame.timestamp.getTime(),
 			)
 		})

diff --git a/api/lib/ZwaveClient.ts b/api/lib/ZwaveClient.ts
@@ -124,6 +124,7 @@ import { ConfigManager, DeviceConfig } from '@zwave-js/config'
 import { readFile } from 'fs/promises'
 import backupManager, { NVM_BACKUP_PREFIX } from './BackupManager'
 import { socketEvents } from './SocketEvents'
+import { isUint8Array } from 'util/types'
 
 export const deviceConfigPriorityDir = storeDir + '/config'
 
@@ -4912,7 +4913,7 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		logger.warn('Inclusion aborted')
 	}
 
-	async backupNVMRaw() {
+	async backupNVMRaw(): Promise<{ data: Buffer; fileName: string }> {
 		if (!this.driverReady) {
 			throw new DriverNotReadyError()
 		}
@@ -4931,7 +4932,7 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 
 		await writeFile(utils.joinPath(nvmBackupsDir, fileName + '.bin'), data)
 
-		return { data, fileName }
+		return { data: Buffer.from(data.buffer), fileName }
 	}
 
 	private _onBackupNVMProgress(bytesRead: number, totalBytes: number) {
@@ -5621,7 +5622,7 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 	private _onNodeNotification: ZWaveNotificationCallback = (...parms) => {
 		const [endpoint, ccId, args] = parms
 
-		const zwaveNode = endpoint.getNodeUnsafe()
+		const zwaveNode = endpoint.tryGetNode()
 
 		if (!zwaveNode) {
 			this.logNode(
@@ -6420,13 +6421,13 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 			}
 
 			let newValue = args.newValue
-			if (Buffer.isBuffer(newValue)) {
+			if (isUint8Array(newValue)) {
 				// encode Buffers as HEX strings
 				newValue = utils.buffer2hex(newValue)
 			}
 
 			let prevValue = args.prevValue
-			if (Buffer.isBuffer(prevValue)) {
+			if (isUint8Array(prevValue)) {
 				// encode Buffers as HEX strings
 				prevValue = utils.buffer2hex(prevValue)
 			}
@@ -6489,8 +6490,8 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 	// ------- Utils ------------------------
 
 	private _parseNotification(parameters) {
-		if (Buffer.isBuffer(parameters)) {
-			return parameters.toString('hex')
+		if (isUint8Array(parameters)) {
+			return Buffer.from(parameters.buffer).toString('hex')
 		} else if (parameters instanceof Duration) {
 			return parameters.toMilliseconds()
 		} else {

diff --git a/api/lib/utils.ts b/api/lib/utils.ts
@@ -281,9 +281,9 @@ export function bufferFromHex(hex: string): Buffer {
 /**
  * Converts a buffer to an hex string
  */
-export function buffer2hex(buffer: Buffer): string {
+export function buffer2hex(buffer: Uint8Array): string {
 	if (buffer.length === 0) return ''
-	return `0x${buffer.toString('hex')}`
+	return `0x${Buffer.from(buffer.buffer).toString('hex')}`
 }
 
 export function allSettled(promises: Promise<any>[]): Promise<any> {

diff --git a/esbuild.js b/esbuild.js
@@ -115,19 +115,10 @@ async function main() {
 	console.log(`Build took ${Date.now() - start}ms`)
 	await printSize(outfile)
 
-	const content = (await readFile(outfile, 'utf-8'))
-		.replace(
-			/__dirname, "\.\.\/"/g,
-			'__dirname, "./node_modules/@serialport/bindings-cpp"',
-		)
-		.replace(
-			`__dirname, "../package.json"`,
-			`__dirname, "./node_modules/@zwave-js/config/package.json"`,
-		)
-		.replace(
-			`__dirname, "../config"`,
-			`__dirname, "./node_modules/@zwave-js/config/config"`,
-		)
+	const content = (await readFile(outfile, 'utf-8')).replace(
+		/__dirname, "\.\.\/"/g,
+		'__dirname, "./node_modules/@serialport/bindings-cpp"',
+	)
 
 	await writeFile(outfile, content)