Use web-encoding pkg instead of TextDecoder from utils

Plutonomicon · Feb 20, 2024 · c4dd41c · c4dd41c
1 parent a183bca
commit c4dd41c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 49 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,6 +49,7 @@
     "reconnecting-websocket": "4.4.0",
     "uniqid": "5.4.0",
     "utf-8-validate": "^5.0.10",
+    "web-encoding": "^1.1.5",
     "ws": "8.4.0",
     "xhr2": "0.2.1"
   },

diff --git a/src/Internal/Types/TokenName.js b/src/Internal/Types/TokenName.js
@@ -1,17 +1,8 @@
-/* global BROWSER_RUNTIME */
-
-// `TextDecoder` is not available in `node`, use polyfill in that case
-let OurTextDecoder;
-if (typeof BROWSER_RUNTIME == "undefined" || !BROWSER_RUNTIME) {
-  const util = await import("util");
-  OurTextDecoder = util.TextDecoder;
-} else {
-  OurTextDecoder = TextDecoder;
-}
+import { TextDecoder } from "web-encoding";
 
 export function _decodeUtf8(buffer) {
   return left => right => {
-    let decoder = new OurTextDecoder("utf-8", { fatal: true }); // Without fatal=true it never fails
+    let decoder = new TextDecoder("utf-8", { fatal: true }); // Without fatal=true it never fails
 
     try {
       return right(decoder.decode(buffer));