capnweb 0.5.0 → 0.6.0

package/dist/index.cjs

@@ -26,6 +26,7 @@ var RpcTarget = workersModule ? workersModule.RpcTarget : class {
 };
 var AsyncFunction = (async function() {
 }).constructor;
+var BUFFER_PROTOTYPE = typeof Buffer !== "undefined" ? Buffer.prototype : void 0;
 function typeForRpc(value) {
   switch (typeof value) {
     case "boolean":
@@ -57,6 +58,7 @@ function typeForRpc(value) {
     case Date.prototype:
       return "date";
     case Uint8Array.prototype:
+    case BUFFER_PROTOTYPE:
       return "bytes";
     case WritableStream.prototype:
       return "writable";
@@ -1386,12 +1388,19 @@ var Devaluator = class _Devaluator {
         let bytes = value;
         if (bytes.toBase64) {
           return ["bytes", bytes.toBase64({ omitPadding: true })];
+        }
+        let b64;
+        if (typeof Buffer !== "undefined") {
+          let buf = bytes instanceof Buffer ? bytes : Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+          b64 = buf.toString("base64");
         } else {
-          return [
-            "bytes",
-            btoa(String.fromCharCode.apply(null, bytes).replace(/=*$/, ""))
-          ];
+          let binary = "";
+          for (let i = 0; i < bytes.length; i++) {
+            binary += String.fromCharCode(bytes[i]);
+          }
+          b64 = btoa(binary);
         }
+        return ["bytes", b64.replace(/=+$/, "")];
       }
       case "headers":
         return ["headers", [...value]];
@@ -1607,10 +1616,11 @@ var Evaluator = class _Evaluator {
           }
           break;
         case "bytes": {
-          let b64 = Uint8Array;
           if (typeof value[1] == "string") {
-            if (b64.fromBase64) {
-              return b64.fromBase64(value[1]);
+            if (typeof Buffer !== "undefined") {
+              return Buffer.from(value[1], "base64");
+            } else if (Uint8Array.fromBase64) {
+              return Uint8Array.fromBase64(value[1]);
             } else {
               let bs = atob(value[1]);
               let len = bs.length;