js: transfer encoding changes

--

* Uint8Arrays are not supported for now there are unsolved issues in
  conversion, and they are lower priority

* encrypt gains a new option to indicate that input values are base64
  encoded
* as decrypted values are always base64 encoded, the option base64 will
  not try to decode the result into utf, but leave it as it is

3 files changed, 121 insertions, 64 deletions

diff --git a/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js b/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
index 5c534039..2fe955e6 100644
--- a/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
+++ b/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
@@ -1,3 +1,4 @@
+
 /* gpgme.js - Javascript integration for gpgme
  * Copyright (C) 2018 Bundesamt für Sicherheit in der Informationstechnik
  *
@@ -39,6 +40,22 @@ describe('Encryption and Decryption', function () {
                 });
         });
     });
+
+    it('Decrypt simple non-ascii', function (done) {
+        let prm = Gpgmejs.init();
+        prm.then(function (context) {
+            let data = encryptedData;
+            context.decrypt(data).then(
+                function (result) {
+                    expect(result).to.not.be.empty;
+                    expect(result.data).to.be.a('string');
+                    expect(result.data).to.equal(
+                        '¡Äußerste µ€ før ñoquis@hóme! Добрый день\n');
+                    done();
+            });
+        });
+    }).timeout(3000);
+
     it('Roundtrip does not destroy trailing whitespace',
         function (done) {
             let prm = Gpgmejs.init();
@@ -64,7 +81,7 @@ describe('Encryption and Decryption', function () {
                             });
                     });
             });
-        }).timeout(5000);
+    }).timeout(5000);
 
     for (let j = 0; j < inputvalues.encrypt.good.data_nonascii_32.length; j++){
         it('Roundtrip with >1MB non-ascii input meeting default chunksize (' + (j + 1) + '/' + inputvalues.encrypt.good.data_nonascii_32.length + ')',
@@ -96,21 +113,113 @@ describe('Encryption and Decryption', function () {
                                 });
                         });
                 });
-        }).timeout(5000);
+        }).timeout(3000);
     };
 
-    it('Decrypt simple non-ascii', function (done) {
+    it('Random data, as string', function (done) {
+        let data = bigString(1000);
         let prm = Gpgmejs.init();
         prm.then(function (context) {
-            data = encryptedData;
-            context.decrypt(data).then(
-                function (result) {
-                    expect(result).to.not.be.empty;
-                    expect(result.data).to.be.a('string');
-                    expect(result.data).to.equal(
-                        '¡Äußerste µ€ før ñoquis@hóme! Добрый день\n');
-                    done();
-            });
+            context.encrypt(data,
+                inputvalues.encrypt.good.fingerprint).then(
+                function (answer) {
+                    expect(answer).to.not.be.empty;
+                    expect(answer.data).to.be.a("string");
+                    expect(answer.data).to.include(
+                        'BEGIN PGP MESSAGE');
+                    expect(answer.data).to.include(
+                        'END PGP MESSAGE');
+                    context.decrypt(answer.data).then(
+                        function (result) {
+                            expect(result).to.not.be.empty;
+                            expect(result.data).to.be.a('string');
+                            expect(result.data).to.equal(data);
+                            context.connection.disconnect();
+                            done();
+                        });
+                });
         });
     }).timeout(3000);
+
+    it('Data, input as base64', function (done) {
+        let data = inputvalues.encrypt.good.data;
+        let b64data = btoa(data);
+        let prm = Gpgmejs.init();
+        prm.then(function (context) {
+            context.encrypt(b64data,
+                inputvalues.encrypt.good.fingerprint,).then(
+                function (answer) {
+                    expect(answer).to.not.be.empty;
+                    expect(answer.data).to.be.a("string");
+                    expect(answer.data).to.include(
+                        'BEGIN PGP MESSAGE');
+                    expect(answer.data).to.include(
+                        'END PGP MESSAGE');
+                    context.decrypt(answer.data).then(
+                        function (result) {
+                            expect(result).to.not.be.empty;
+                            expect(result.data).to.be.a('string');
+                            expect(data).to.equal(data);
+                            context.connection.disconnect();
+                            done();
+                        });
+                });
+        });
+    }).timeout(3000);
+
+    it('Random data, input as base64', function (done) {
+        //TODO fails. The result is
+        let data = bigBoringString(0.001);
+        let b64data = btoa(data);
+        let prm = Gpgmejs.init();
+        prm.then(function (context) {
+            context.encrypt(b64data,
+                inputvalues.encrypt.good.fingerprint, true).then(
+                function (answer) {
+                    expect(answer).to.not.be.empty;
+                    expect(answer.data).to.be.a("string");
+                    expect(answer.data).to.include(
+                        'BEGIN PGP MESSAGE');
+                    expect(answer.data).to.include(
+                        'END PGP MESSAGE');
+                    context.decrypt(answer.data).then(
+                        function (result) {
+                            expect(result).to.not.be.empty;
+                            expect(result.data).to.be.a('string');
+                            expect(result.data).to.equal(data);
+                            context.connection.disconnect();
+                            done();
+                        });
+                });
+        });
+    }).timeout(3000);
+
+    it('Random data, input and output as base64', function (done) {
+        let data = bigBoringString(0.0001);
+        let b64data = btoa(data);
+        let prm = Gpgmejs.init();
+        prm.then(function (context) {
+            context.encrypt(b64data,
+                inputvalues.encrypt.good.fingerprint).then(
+                function (answer) {
+                    expect(answer).to.not.be.empty;
+                    expect(answer.data).to.be.a("string");
+
+                    expect(answer.data).to.include(
+                        'BEGIN PGP MESSAGE');
+                    expect(answer.data).to.include(
+                        'END PGP MESSAGE');
+                    context.decrypt(answer.data, true).then(
+                        function (result) {
+                            expect(result).to.not.be.empty;
+                            expect(result.data).to.be.a('string');
+                            expect(result.data).to.equal(b64data);
+                            context.connection.disconnect();
+                            done();
+                        });
+                });
+        });
+    }).timeout(3000);
+
+
 });
diff --git a/lang/js/BrowserTestExtension/tests/longRunningTests.js b/lang/js/BrowserTestExtension/tests/longRunningTests.js
index c95bebda..4e55fd26 100644
--- a/lang/js/BrowserTestExtension/tests/longRunningTests.js
+++ b/lang/js/BrowserTestExtension/tests/longRunningTests.js
@@ -37,29 +37,4 @@ describe('Long running Encryption/Decryption', function () {
         }).timeout(8000);
     };
 
-    it('Successful encrypt 1 MB Uint8Array', function (done) {
-        //TODO: this succeeds, but result may be bogus (String with byte values as numbers)
-        let prm = Gpgmejs.init();
-        let data = bigUint8(1);
-        prm.then(function (context) {
-                context.encrypt(data,
-                    inputvalues.encrypt.good.fingerprint).then(
-                        function (answer){
-                            expect(answer).to.not.be.empty;
-                            expect(answer.data).to.be.a("string");
-                            expect(answer.data).to.include(
-                                'BEGIN PGP MESSAGE');
-                            expect(answer.data).to.include(
-                                'END PGP MESSAGE');
-                            context.decrypt(answer.data).then(
-                                function(result){
-                                    expect(result).to.not.be.empty;
-                                    expect(result.data).to.be.a('string');
-                                    expect(result.data).to.equal(data);
-                                    done();
-                            });
-                    });
-            });
-    }).timeout(5000);
-
 });
diff --git a/lang/js/BrowserTestExtension/tests/openpgpModeTest.js b/lang/js/BrowserTestExtension/tests/openpgpModeTest.js
index 98b6e1d8..cccaf604 100644
--- a/lang/js/BrowserTestExtension/tests/openpgpModeTest.js
+++ b/lang/js/BrowserTestExtension/tests/openpgpModeTest.js
@@ -41,33 +41,6 @@ describe('Encrypting-Decrypting in openpgp mode, using a Message object', functi
                 });
         });
     });
-    it('Encrypt-Decrypt, sending Uint8Array as data', function (done) {
-        //TODO! fails. Reason is that atob<->btoa destroys the uint8Array,
-        // resulting in a string of constituyent numbers
-        // (error already occurs in encryption)
-
-        let prm = Gpgmejs.init({api_style: 'gpgme_openpgpjs'});
-        prm.then(function (context) {
-            let input = bigUint8(0.3);
-            expect(input).to.be.an.instanceof(Uint8Array);
-            context.encrypt({
-                data: input,
-                publicKeys: inputvalues.encrypt.good.fingerprint}
-            ).then(function (answer) {
-                expect(answer).to.not.be.empty;
-                expect(answer.data).to.be.a("string");
-                expect(answer.data).to.include('BEGIN PGP MESSAGE');
-                expect(answer.data).to.include('END PGP MESSAGE');
-                context.decrypt({message:answer.data}).then(function (result) {
-                    expect(result).to.not.be.empty;
-                    expect(result.data).to.be.an.instanceof(Uint8Array);
-                    expect(result.data).to.equal(input);
-                    context._GpgME.connection.disconnect();
-                    done();
-                });
-            });
-        });
-    });
     it('Keys as Fingerprints', function(done){
         let prm = Gpgmejs.init({api_style: 'gpgme_openpgpjs'});
             let input = inputvalues.encrypt.good.data_nonascii;