fix: Small refactor

Signed-off-by: jamshale <[email protected]>

Author: jamshale

packages/askar-nodejs/src/NodeJSAskar.ts

@@ -89,13 +89,6 @@ import {
   StoreHandle,
   handleInvalidNullResponse,
 } from '@openwallet-foundation/askar-shared'
-import type {
-  ByteBufferType,
-  EncryptedBufferType,
-  NativeCallback,
-  NativeCallbackWithResponse,
-  SecretBufferType,
-} from './ffi'
 import {
   FFI_ENTRY_LIST_HANDLE,
   FFI_INT8,
@@ -121,8 +114,12 @@ import {
   toNativeCallback,
   toNativeCallbackWithResponse,
   toNativeLogCallback,
+  NativeCallback,
+  NativeCallbackWithResponse,
+  ByteBufferType,
 } from './ffi'
 import { getNativeAskar } from './library'
+import { EncryptedBufferType } from './ffi/structures';
 
 function handleNullableReturnPointer<Return>(returnValue: Buffer): Return | null {
   if (returnValue.address() === 0) return null
@@ -318,11 +315,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_entry_list_get_value(entryListHandle, index, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyAeadDecrypt(options: KeyAeadDecryptOptions): Uint8Array {
@@ -332,11 +328,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_aead_decrypt(localKeyHandle, ciphertext, nonce, tag, aad, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyAeadEncrypt(options: KeyAeadEncryptOptions): EncryptedBuffer {
@@ -346,10 +341,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_aead_encrypt(localKeyHandle, message, nonce, aad, ret)
     this.handleError(errorCode)
     const encryptedBuffer = handleReturnPointer<EncryptedBufferType>(ret)
-    const view = encryptedBufferStructToClass(encryptedBuffer)
-    this.nativeAriesAskar.askar_buffer_free(encryptedBuffer.secretBuffer)
+    const encryptedBufferClass = encryptedBufferStructToClass(encryptedBuffer)
+    this.nativeAskar.askar_buffer_free(encryptedBuffer.secretBuffer as unknown as Buffer)
 
-    return view
+    return encryptedBufferClass
   }
 
   public keyAeadGetPadding(options: KeyAeadGetPaddingOptions): number {
@@ -379,11 +374,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_aead_random_nonce(localKeyHandle, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyConvert(options: KeyConvertOptions): LocalKeyHandle {
@@ -404,11 +398,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_crypto_box(recipientKey, senderKey, message, nonce, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyCryptoBoxOpen(options: KeyCryptoBoxOpenOptions): Uint8Array {
@@ -418,11 +411,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_crypto_box_open(recipientKey, senderKey, message, nonce, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyCryptoBoxRandomNonce(): Uint8Array {
@@ -431,11 +423,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_crypto_box_random_nonce(ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyCryptoBoxSeal(options: KeyCryptoBoxSealOptions): Uint8Array {
@@ -445,11 +436,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_crypto_box_seal(localKeyHandle, message, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyCryptoBoxSealOpen(options: KeyCryptoBoxSealOpenOptions): Uint8Array {
@@ -459,11 +449,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_crypto_box_seal_open(localKeyHandle, ciphertext, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyDeriveEcdh1pu(options: KeyDeriveEcdh1puOptions): LocalKeyHandle {
@@ -686,11 +675,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_get_jwk_secret(localKeyHandle, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyGetJwkThumbprint(options: KeyGetJwkThumbprintOptions): string {
@@ -710,11 +698,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_get_public_bytes(localKeyHandle, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyGetSecretBytes(options: KeyGetSecretBytesOptions): Uint8Array {
@@ -724,11 +711,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_get_secret_bytes(localKeyHandle, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keySignMessage(options: KeySignMessageOptions): Uint8Array {
@@ -738,11 +724,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_sign_message(localKeyHandle, message, sigType, ret)
     this.handleError(errorCode)
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    const view = secretBufferToBuffer(byteBuffer)
-    const result = Buffer.from(view)
-    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+    const bufferArray= new Uint8Array(Buffer.from(secretBufferToBuffer(byteBuffer)))
+    this.nativeAskar.askar_buffer_free(byteBuffer as unknown as Buffer)
 
-    return new Uint8Array(result)
+    return bufferArray
   }
 
   public keyUnwrapKey(options: KeyUnwrapKeyOptions): LocalKeyHandle {
@@ -773,10 +758,10 @@ export class NodeJSAskar implements Askar {
     const errorCode = this.nativeAskar.askar_key_wrap_key(localKeyHandle, other, nonce, ret)
     this.handleError(errorCode)
     const encryptedBuffer = handleReturnPointer<EncryptedBufferType>(ret)
-    const view = encryptedBufferStructToClass(encryptedBuffer)
-    this.nativeAriesAskar.askar_buffer_free(encryptedBuffer.secretBuffer)
+    const encryptedBufferClass = encryptedBufferStructToClass(encryptedBuffer)
+    this.nativeAskar.askar_buffer_free(encryptedBuffer.secretBuffer as unknown as Buffer)
 
-    return view
+    return encryptedBufferClass
   }
 
   public keyGetSupportedBackends(): string[] {