js: change chunksize handling and decoding

--

* the nativeApp now sends all data in one base64-encoded string, which
  needs reassembly, but in a much easier way now.

* there are some new performance problems now, especially with
  decrypting data

2 files changed, 22 insertions, 47 deletions

diff --git a/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js b/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
index a84be27c..bd72c1d2 100644
--- a/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
+++ b/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
@@ -152,7 +152,7 @@ describe('Encryption and Decryption', function () {
         let prm = Gpgmejs.init();
         prm.then(function (context) {
             context.encrypt(b64data,
-                inputvalues.encrypt.good.fingerprint).then(
+                inputvalues.encrypt.good.fingerprint, true).then(
                 function (answer) {
                     expect(answer).to.not.be.empty;
                     expect(answer.data).to.be.a('string');
@@ -185,33 +185,7 @@ describe('Encryption and Decryption', function () {
                         '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);
-                            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(
+                    context.decrypt(answer.data).then(
                         function (result) {
                             expect(result).to.not.be.empty;
                             expect(result.data).to.be.a('string');
@@ -222,5 +196,4 @@ describe('Encryption and Decryption', function () {
         });
     }).timeout(3000);
 
-
 });
diff --git a/lang/js/BrowserTestExtension/tests/longRunningTests.js b/lang/js/BrowserTestExtension/tests/longRunningTests.js
index eefe126d..e148d1cf 100644
--- a/lang/js/BrowserTestExtension/tests/longRunningTests.js
+++ b/lang/js/BrowserTestExtension/tests/longRunningTests.js
@@ -24,7 +24,7 @@
 /* global bigString, inputvalues */
 
 describe('Long running Encryption/Decryption', function () {
-    for (let i=0; i < 100; i++) {
+    for (let i=0; i < 101; i++) {
         it('Successful encrypt/decrypt completely random data ' +
             (i+1) + '/100', function (done) {
             let prm = Gpgmejs.init();
@@ -43,30 +43,32 @@ describe('Long running Encryption/Decryption', function () {
                             function(result){
                                 expect(result).to.not.be.empty;
                                 expect(result.data).to.be.a('string');
+                                /*
                                 if (result.data.length !== data.length) {
-                                    // console.log('diff: ' +
-                                    // (result.data.length - data.length));
+                                    console.log('diff: ' +
+                                    (result.data.length - data.length));
                                     for (let i=0; i < result.data.length; i++){
                                         if (result.data[i] !== data[i]){
-                                            // console.log('position: ' + i);
-                                            // console.log('result : ' +
-                                            // result.data.charCodeAt(i) +
-                                            // result.data[i-2] +
-                                            // result.data[i-1] +
-                                            // result.data[i] +
-                                            // result.data[i+1] +
-                                            // result.data[i+2]);
-                                            // console.log('original: ' +
-                                            // data.charCodeAt(i) +
-                                            // data[i-2] +
-                                            // data[i-1] +
-                                            // data[i] +
-                                            // data[i+1] +
-                                            // data[i+2]);
+                                            console.log('position: ' + i);
+                                            console.log('result : ' +
+                                            result.data.charCodeAt(i) +
+                                            result.data[i-2] +
+                                            result.data[i-1] +
+                                            result.data[i] +
+                                            result.data[i+1] +
+                                            result.data[i+2]);
+                                            console.log('original: ' +
+                                            data.charCodeAt(i) +
+                                            data[i-2] +
+                                            data[i-1] +
+                                            data[i] +
+                                            data[i+1] +
+                                            data[i+2]);
                                             break;
                                         }
                                     }
                                 }
+                                */
                                 expect(result.data).to.equal(data);
                                 done();
                             });