Ticket #2018: html5-send-binary.patch

html5/js/lib/bencode.js

@@ -26 +26 @@
         throw "invalid: cannot encode null";
     }
     switch(btypeof(obj)) {
+        case "binary":     return bbinary(obj);
         case "string":     return bstring(obj);
         case "number":     return bint(obj);
         case "list":       return blist(obj);
@@ -145 +146 @@
 
 // returns the bencoding type of the given object
 function btypeof(obj) {
+        try {
+                if (obj instanceof Uint8Array) {
+                        return "binary";
+                }
+        }
+        catch {}
     var type = typeof obj;
     if(type === 'object') {
         if(typeof obj.length === 'undefined') {
@@ -160 +167 @@
     return (str.length + ":" + str);
 }
 
+function bbinary(u8a) {
+        const CHUNK_SZ = 0x8000;
+        const c = [
+                ""+u8a.length,
+                ":"
+                ];
+        for (let i=0; i < u8a.length; i+=CHUNK_SZ) {
+                c.push(String.fromCharCode.apply(null, u8a.subarray(i, i+CHUNK_SZ)));
+        }
+        return c.join("");
+}
+
 // bencode an integer
 function bint(num) {
     return "i" + num + "e";

html5/index.html

@@ -946 +946 @@
                                         const fileReader = new FileReader();
                                         fileReader.onloadend = function (evt) {
                                                 const u8a = new Uint8Array(evt.target.result);
-                                                const buf = Utilities.Uint8ToString(u8a);
-                                                client.send_file(f.name, f.type, f.size, buf);
+                                                //const buf = Utilities.Uint8ToString(u8a);
+                                                //clog("buf("+evt.target.result+")="+buf.length);
+                                                client.send_file(f.name, f.type, f.size, u8a);
                                         };
                                         fileReader.readAsArrayBuffer(f);
                                 }