fix: respect user specified Buffer (#118)

toyobayashi · May 14, 2024 · b3f71d2 · b3f71d2
1 parent 4304d7a
commit b3f71d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/emnapi/src/value-operation.ts b/packages/emnapi/src/value-operation.ts
@@ -221,7 +221,7 @@ export function napi_is_buffer (env: napi_env, value: napi_value, result: Pointe
   const h = emnapiCtx.handleStore.get(value)!
   from64('result')
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const r = h.isBuffer() ? 1 : 0
+  const r = h.isBuffer(emnapiCtx.feature.Buffer) ? 1 : 0
   makeSetValue('result', 0, 'r', 'i8')
   return envObject.clearLastError()
 }

diff --git a/packages/emnapi/src/value/convert2c.ts b/packages/emnapi/src/value/convert2c.ts
@@ -165,7 +165,7 @@ export function napi_get_buffer_info (
   const envObject: Env = $CHECK_ENV_NOT_IN_GC!(env)
   $CHECK_ARG!(envObject, buffer)
   const handle = emnapiCtx.handleStore.get(buffer)!
-  $RETURN_STATUS_IF_FALSE!(envObject, handle.isBuffer(), napi_status.napi_invalid_arg)
+  $RETURN_STATUS_IF_FALSE!(envObject, handle.isBuffer(emnapiCtx.feature.Buffer), napi_status.napi_invalid_arg)
   return napi_get_typedarray_info(env, buffer, 0, length, data, 0, 0)
 }
 

diff --git a/packages/runtime/src/Handle.ts b/packages/runtime/src/Handle.ts
@@ -47,8 +47,9 @@ export class Handle<S> {
     return (ArrayBuffer.isView(this.value)) && !(this.value instanceof DataView)
   }
 
-  public isBuffer (): boolean {
-    return typeof _Buffer === 'function' && _Buffer.isBuffer(this.value)
+  public isBuffer (BufferConstructor?: BufferCtor): boolean {
+    BufferConstructor ??= _Buffer
+    return typeof BufferConstructor === 'function' && BufferConstructor.isBuffer(this.value)
   }
 
   public isDataView (): boolean {