From a538833d0335f13a6a81b812207437bccd4ab6dc Mon Sep 17 00:00:00 2001 From: Forzen FIsh <76603360+sudongyuer@users.noreply.github.com> Date: Sat, 4 Dec 2021 18:17:14 +0800 Subject: [PATCH] chore: remove hasBufferModule code remove hasBufferModule code that makes RSocket-js can't work in browser --- packages/rsocket-core/src/LiteBuffer.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/packages/rsocket-core/src/LiteBuffer.js b/packages/rsocket-core/src/LiteBuffer.js index f9cdc772..34d7745b 100644 --- a/packages/rsocket-core/src/LiteBuffer.js +++ b/packages/rsocket-core/src/LiteBuffer.js @@ -6,7 +6,7 @@ import ExistingBufferModule from 'buffer'; const hasGlobalBuffer = typeof global !== 'undefined' && global.hasOwnProperty('Buffer'); -const hasBufferModule = ExistingBufferModule.hasOwnProperty('Buffer'); + function notImplemented(msg?: string): void { const message = msg ? `Not implemented: ${msg}` : 'Not implemented'; @@ -605,10 +605,7 @@ export class Buffer extends Uint8Array { * Returns true if obj is a Buffer, false otherwise. */ static isBuffer(obj: any): boolean { - return ( - isInstance(obj, Buffer) || - (!hasGlobalBuffer && hasBufferModule && isInstance(obj, Uint8Array)) - ); + return isInstance(obj, Buffer); } static isEncoding(encoding: any): boolean { @@ -996,17 +993,6 @@ export class Buffer extends Uint8Array { } if (!hasGlobalBuffer) { - if (hasBufferModule) { - // ExistingBuffer is likely to be a polyfill, hence we can override it - // eslint-disable-next-line no-undef - // $FlowFixMe - Object.defineProperty(ExistingBufferModule, 'Buffer', { - configurable: true, - enumerable: false, - value: Buffer, - writable: true, - }); - } // eslint-disable-next-line no-undef Object.defineProperty(window, 'Buffer', { configurable: true,