fix web re-attach buffers

Picovoice · Aug 20, 2024 · 01ee8ed · 01ee8ed
1 parent 185d9c9
commit 01ee8ed
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/binding/web/src/orca.ts b/binding/web/src/orca.ts
@@ -589,8 +589,8 @@ export class Orca {
             throw new OrcaErrors.OrcaOutOfMemoryError('malloc failed: Cannot allocate memory');
           }
 
-          const memoryBufferView = new DataView(this._wasmMemory.buffer);
-          const memoryBufferUint8 = new Uint8Array(this._wasmMemory.buffer);
+          let memoryBufferView = new DataView(this._wasmMemory.buffer);
+          let memoryBufferUint8 = new Uint8Array(this._wasmMemory.buffer);
 
           const initStatus = await this._pvOrcaSynthesizeParamsInit(synthesizeParamsAddressAddress);
           if (initStatus !== PvStatus.SUCCESS) {
@@ -690,6 +690,9 @@ export class Orca {
           await this._pvFree(textAddress);
           await this._pvOrcaSynthesizeParamsDelete(synthesizeParamsAddress);
 
+          memoryBufferView = new DataView(this._wasmMemory.buffer);
+          memoryBufferUint8 = new Uint8Array(this._wasmMemory.buffer);
+
           if (synthesizeStatus !== PvStatus.SUCCESS) {
             const messageStack = await Orca.getMessageStack(
               this._pvGetErrorStack,
@@ -1017,17 +1020,17 @@ export class Orca {
       throw new OrcaErrors.OrcaOutOfMemoryError('malloc failed: Cannot allocate memory');
     }
 
-    let memoryBufferView: DataView;
-
     const initStatus = await pv_orca_init(
       accessKeyAddress,
       modelPathAddress,
       objectAddressAddress);
     await pv_free(accessKeyAddress);
     await pv_free(modelPathAddress);
+
+    const memoryBufferView = new DataView(memory.buffer);
+    memoryBufferUint8 = new Uint8Array(memory.buffer);
+
     if (initStatus !== PvStatus.SUCCESS) {
-      memoryBufferView = new DataView(memory.buffer);
-      memoryBufferUint8 = new Uint8Array(memory.buffer);
       const messageStack = await Orca.getMessageStack(
         pv_get_error_stack,
         pv_free_error_stack,
@@ -1040,7 +1043,6 @@ export class Orca {
       throw pvStatusToException(initStatus, 'Initialization failed', messageStack, pvError);
     }
 
-    memoryBufferView = new DataView(memory.buffer);
     const objectAddress = memoryBufferView.getInt32(objectAddressAddress, true);
     await pv_free(objectAddressAddress);
 
@@ -1053,7 +1055,6 @@ export class Orca {
     }
     const sampleRateStatus = await pv_orca_sample_rate(objectAddress, sampleRateAddress);
     if (sampleRateStatus !== PvStatus.SUCCESS) {
-      memoryBufferUint8 = new Uint8Array(memory.buffer);
       const messageStack = await Orca.getMessageStack(
         pv_get_error_stack,
         pv_free_error_stack,
@@ -1078,7 +1079,6 @@ export class Orca {
     }
     const maxCharacterLimitStatus = await pv_orca_max_character_limit(objectAddress, maxCharacterLimitAddress);
     if (maxCharacterLimitStatus !== PvStatus.SUCCESS) {
-      memoryBufferUint8 = new Uint8Array(memory.buffer);
       const messageStack = await Orca.getMessageStack(
         pv_get_error_stack,
         pv_free_error_stack,
@@ -1116,7 +1116,6 @@ export class Orca {
       validCharactersAddressAddressAddress,
     );
     if (validCharactersStatus !== PvStatus.SUCCESS) {
-      memoryBufferUint8 = new Uint8Array(memory.buffer);
       const messageStack = await Orca.getMessageStack(
         pv_get_error_stack,
         pv_free_error_stack,
@@ -1133,7 +1132,6 @@ export class Orca {
     const validCharactersAddressAddress = memoryBufferView.getInt32(validCharactersAddressAddressAddress, true);
 
     const validCharacters: string[] = [];
-    memoryBufferUint8 = new Uint8Array(memory.buffer);
     for (let i = 0; i < numCharacters; i++) {
       const charIndex = memoryBufferView.getInt32(validCharactersAddressAddress + i * Int32Array.BYTES_PER_ELEMENT, true);
       validCharacters.push(