Merge pull request #50 from nkzawa/patch-5

Fix encoding blob as base64
socketio · Nov 22, 2015 · 44b7d3e · 44b7d3e
2 parents 410d108 + 685cb71
commit 44b7d3e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/browser.js b/lib/browser.js
@@ -185,7 +185,7 @@ function encodeBlob(packet, supportsBinary, callback) {
 
 exports.encodeBase64Packet = function(packet, callback) {
   var message = 'b' + exports.packets[packet.type];
-  if (Blob && packet.data instanceof Blob) {
+  if (Blob && packet.data instanceof global.Blob) {
     var fr = new FileReader();
     fr.onload = function() {
       var b64 = fr.result.split(',')[1];

diff --git a/test/browser/blob.js b/test/browser/blob.js
@@ -5,6 +5,7 @@
 
 var parser = require('../../lib/browser.js');
 var expect = require('expect.js');
+var Blob = require('blob');
 
 /**
  * Shortcuts
@@ -71,4 +72,21 @@ describe('parser', function() {
       fr.readAsArrayBuffer(data);
     });
   });
+
+  it('should encode blob as base64', function(done) {
+    var buf = new Uint8Array(5);
+    for (var i = 0; i < buf.length; i++) buf[i] = i;
+
+    encode({ type: 'message', data: new Blob([buf.buffer]) }, false, function(data) {
+      var packet = decode(data, 'blob');
+      expect(packet.type).to.eql('message');
+      expect(packet.data).to.be.a(global.Blob);
+      var fr = new FileReader();
+      fr.onload = function() {
+        expect(new Uint8Array(fr.result)).to.eql(buf);
+        done();
+      };
+      fr.readAsArrayBuffer(packet.data);
+    });
+  });
 });