Copy buffers to JS memory and free

Signed-off-by: jamshale <jamiehalebc@gmail.com>

Author: jamshale

wrappers/javascript/packages/aries-askar-nodejs/src/NodeJSAriesAskar.ts

@@ -321,9 +321,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.askar_entry_list_get_value(entryListHandle, index, ret)
     this.handleError(errorCode)
-
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(byteBuffer))
+    const view = secretBufferToBuffer(byteBuffer)
+    const result = Buffer.from(view)
+    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+
+    return new Uint8Array(result)
   }
 
   public keyAeadDecrypt(options: KeyAeadDecryptOptions): Uint8Array {
@@ -332,9 +335,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.askar_key_aead_decrypt(localKeyHandle, ciphertext, nonce, tag, aad, ret)
     this.handleError(errorCode)
-
     const byteBuffer = handleReturnPointer<ByteBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(byteBuffer))
+    const view = secretBufferToBuffer(byteBuffer)
+    const result = Buffer.from(view)
+    this.nativeAriesAskar.askar_buffer_free(byteBuffer)
+
+    return new Uint8Array(result)
   }
 
   public keyAeadEncrypt(options: KeyAeadEncryptOptions): EncryptedBuffer {
@@ -343,9 +349,11 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.askar_key_aead_encrypt(localKeyHandle, message, nonce, aad, ret)
     this.handleError(errorCode)
-
     const encryptedBuffer = handleReturnPointer<EncryptedBufferType>(ret)
-    return encryptedBufferStructToClass(encryptedBuffer)
+    const view = encryptedBufferStructToClass(encryptedBuffer)
+    this.nativeAriesAskar.askar_buffer_free(encryptedBuffer.secretBuffer)
+
+    return view
   }
 
   public keyAeadGetPadding(options: KeyAeadGetPaddingOptions): number {
@@ -374,9 +382,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyConvert(options: KeyConvertOptions): LocalKeyHandle {
@@ -396,9 +407,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyCryptoBoxOpen(options: KeyCryptoBoxOpenOptions): Uint8Array {
@@ -407,19 +421,25 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyCryptoBoxRandomNonce(): Uint8Array {
     const ret = allocateSecretBuffer()
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyCryptoBoxSeal(options: KeyCryptoBoxSealOptions): Uint8Array {
@@ -428,9 +448,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyCryptoBoxSealOpen(options: KeyCryptoBoxSealOpenOptions): Uint8Array {
@@ -439,9 +462,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyDeriveEcdh1pu(options: KeyDeriveEcdh1puOptions): LocalKeyHandle {
@@ -663,9 +689,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyGetJwkThumbprint(options: KeyGetJwkThumbprintOptions): string {
@@ -684,9 +713,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyGetSecretBytes(options: KeyGetSecretBytesOptions): Uint8Array {
@@ -695,9 +727,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keySignMessage(options: KeySignMessageOptions): Uint8Array {
@@ -706,9 +741,12 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.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 secretBuffer = handleReturnPointer<SecretBufferType>(ret)
-    return new Uint8Array(secretBufferToBuffer(secretBuffer))
+    return new Uint8Array(result)
   }
 
   public keyUnwrapKey(options: KeyUnwrapKeyOptions): LocalKeyHandle {
@@ -738,9 +776,11 @@ export class NodeJSAriesAskar implements AriesAskar {
 
     const errorCode = this.nativeAriesAskar.askar_key_wrap_key(localKeyHandle, other, nonce, ret)
     this.handleError(errorCode)
-
     const encryptedBuffer = handleReturnPointer<EncryptedBufferType>(ret)
-    return encryptedBufferStructToClass(encryptedBuffer)
+    const view = encryptedBufferStructToClass(encryptedBuffer)
+    this.nativeAriesAskar.askar_buffer_free(encryptedBuffer.secretBuffer)
+
+    return view
   }
 
   public keyGetSupportedBackends(): string[] {