From 9c3aea52a06f5cd92808ffd6942aa72fb912cb1c Mon Sep 17 00:00:00 2001
From: yongjun21 <yjthong.2009@smu.edu.sg>
Date: Wed, 6 Jul 2022 09:32:30 +0800
Subject: [PATCH] Fix Buffer undefined reference error

---
 modules/io/src/common/loaders.js   | 8 ++++++--
 modules/io/src/common/xviz-data.js | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/io/src/common/loaders.js b/modules/io/src/common/loaders.js
index 0fd7ab167..51d24087e 100644
--- a/modules/io/src/common/loaders.js
+++ b/modules/io/src/common/loaders.js
@@ -39,7 +39,11 @@ export function getDataContainer(data) {
     return null;
   }
 
-  if (data instanceof Buffer || data instanceof ArrayBuffer || ArrayBuffer.isView(data)) {
+  if (
+    (typeof Buffer !== 'undefined' && data instanceof Buffer) ||
+    data instanceof ArrayBuffer ||
+    ArrayBuffer.isView(data)
+  ) {
     return 'binary';
   }
 
@@ -329,7 +333,7 @@ function isJSONStringTypeArray(arr) {
 
   // Buffer.slice() does not make a copy, but we need one since
   // we call reverse()
-  if (lastChars instanceof Buffer) {
+  if (typeof Buffer !== 'undefined' && lastChars instanceof Buffer) {
     lastChars = Buffer.from(lastChars);
   }
 
diff --git a/modules/io/src/common/xviz-data.js b/modules/io/src/common/xviz-data.js
index d7cd1e8e4..007efed94 100644
--- a/modules/io/src/common/xviz-data.js
+++ b/modules/io/src/common/xviz-data.js
@@ -100,20 +100,20 @@ export class XVIZData {
     let data = this._data;
     switch (this._dataFormat) {
       case XVIZ_FORMAT.BINARY_GLB:
-        if (data instanceof Buffer) {
+        if (typeof Buffer !== 'undefined' && data instanceof Buffer) {
           data = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
         }
         msg = parseBinaryXVIZ(data);
         break;
       case XVIZ_FORMAT.BINARY_PBE:
-        if (data instanceof Buffer) {
+        if (typeof Buffer !== 'undefined' && data instanceof Buffer) {
           data = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
         }
         msg = parseBinaryXVIZ(data, this._opts);
         break;
       case XVIZ_FORMAT.JSON_BUFFER:
         let jsonString = null;
-        if (data instanceof Buffer) {
+        if (typeof Buffer !== 'undefined' && data instanceof Buffer) {
           // Default to utf8 encoding
           jsonString = data.toString();
         } else if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) {
@@ -154,7 +154,7 @@ export class XVIZData {
     let data = this._data;
     switch (getDataContainer(data)) {
       case 'binary':
-        if (data instanceof Buffer) {
+        if (typeof Buffer !== 'undefined' && data instanceof Buffer) {
           data = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
         }