Moves libtextsecure to Typescript

* Starting to work through lint errors

* libsignal-protocol: Update changes for primary repo compatibility

* Step 1: task_with_timeout rename

* Step 2: Apply the changes to TaskWithTimeout.ts

* Step 1: All to-be-converted libtextsecure/*.js files moved

* Step 2: No Typescript errors!

* Get libtextsecure tests passing again

* TSLint errors down to 1

* Compilation succeeds, no lint errors or test failures

* WebSocketResources - update import for case-sensitive filesystems

* Fixes for lint-deps

* Remove unnecessary @ts-ignore

* Fix inability to message your own contact after link

* Add log message for the end of migration 20

* lint fix

libtextsecure/test/contacts_parser_test.js

@@ -1,5 +1,3 @@
-/* global ContactBuffer, GroupBuffer, textsecure */
-
 describe('ContactBuffer', () => {
   function getTestBuffer() {
     const buffer = new dcodeIO.ByteBuffer();
@@ -10,7 +8,7 @@ describe('ContactBuffer', () => {
     }
     avatarBuffer.limit = avatarBuffer.offset;
     avatarBuffer.offset = 0;
-    const contactInfo = new textsecure.protobuf.ContactDetails({
+    const contactInfo = new window.textsecure.protobuf.ContactDetails({
       name: 'Zero Cool',
       number: '+10000000000',
       uuid: '7198E1BD-1293-452A-A098-F982FF201902',
@@ -31,7 +29,7 @@ describe('ContactBuffer', () => {
 
   it('parses an array buffer of contacts', () => {
     const arrayBuffer = getTestBuffer();
-    const contactBuffer = new ContactBuffer(arrayBuffer);
+    const contactBuffer = new window.textsecure.ContactBuffer(arrayBuffer);
     let contact = contactBuffer.next();
     let count = 0;
     while (contact !== undefined) {
@@ -62,7 +60,7 @@ describe('GroupBuffer', () => {
     }
     avatarBuffer.limit = avatarBuffer.offset;
     avatarBuffer.offset = 0;
-    const groupInfo = new textsecure.protobuf.GroupDetails({
+    const groupInfo = new window.textsecure.protobuf.GroupDetails({
       id: new Uint8Array([1, 3, 3, 7]).buffer,
       name: 'Hackers',
       membersE164: ['cereal', 'burn', 'phreak', 'joey'],
@@ -89,7 +87,7 @@ describe('GroupBuffer', () => {
 
   it('parses an array buffer of groups', () => {
     const arrayBuffer = getTestBuffer();
-    const groupBuffer = new GroupBuffer(arrayBuffer);
+    const groupBuffer = new window.textsecure.GroupBuffer(arrayBuffer);
     let group = groupBuffer.next();
     let count = 0;
     while (group !== undefined) {

libtextsecure/test/helpers_test.js

@@ -6,7 +6,7 @@ describe('Helpers', () => {
       a[0] = 0;
       a[1] = 255;
       a[2] = 128;
-      assert.equal(getString(b), '\x00\xff\x80');
+      assert.equal(window.textsecure.utils.getString(b), '\x00\xff\x80');
     });
   });
 
@@ -15,13 +15,16 @@ describe('Helpers', () => {
       const anArrayBuffer = new ArrayBuffer(1);
       const typedArray = new Uint8Array(anArrayBuffer);
       typedArray[0] = 'a'.charCodeAt(0);
-      assertEqualArrayBuffers(stringToArrayBuffer('a'), anArrayBuffer);
+      assertEqualArrayBuffers(
+        window.textsecure.utils.stringToArrayBuffer('a'),
+        anArrayBuffer
+      );
     });
     it('throws an error when passed a non string', () => {
       const notStringable = [{}, undefined, null, new ArrayBuffer()];
       notStringable.forEach(notString => {
         assert.throw(() => {
-          stringToArrayBuffer(notString);
+          window.textsecure.utils.stringToArrayBuffer(notString);
         }, Error);
       });
     });

libtextsecure/test/index.html

@@ -19,23 +19,10 @@
 
   <script type="text/javascript" src="../components.js"></script>
   <script type="text/javascript" src="../libsignal-protocol.js"></script>
-  <script type="text/javascript" src="../crypto.js"></script>
   <script type="text/javascript" src="../protobufs.js" data-cover></script>
-  <script type="text/javascript" src="../errors.js" data-cover></script>
-  <script type="text/javascript" src="../storage.js" data-cover></script>
-
-  <script type="text/javascript" src="../event_target.js" data-cover></script>
-  <script type="text/javascript" src="../websocket-resources.js" data-cover></script>
-  <script type="text/javascript" src="../helpers.js" data-cover></script>
-  <script type="text/javascript" src="../stringview.js" data-cover></script>
-  <script type="text/javascript" src="../api.js"></script>
-  <script type="text/javascript" src="../sendmessage.js" data-cover></script>
-  <script type="text/javascript" src="../account_manager.js" data-cover></script>
-  <script type="text/javascript" src="../contacts_parser.js" data-cover></script>
-  <script type="text/javascript" src="../task_with_timeout.js" data-cover></script>
   <script type="text/javascript" src="../storage/user.js" data-cover></script>
-
   <script type="text/javascript" src="../protocol_wrapper.js" data-cover></script>
+
   <script type="text/javascript" src="../../js/libphonenumber-util.js"></script>
   <script type="text/javascript" src="../../js/components.js" data-cover></script>
   <script type="text/javascript" src="../../js/signal_protocol_store.js" data-cover></script>

libtextsecure/test/websocket-resources_test.js

@@ -1,5 +1,3 @@
-/* global textsecure, WebSocketResource */
-
 describe('WebSocket-Resource', () => {
   describe('requests and responses', () => {
     it('receives requests and sends responses', done => {
@@ -7,10 +5,12 @@ describe('WebSocket-Resource', () => {
       const requestId = '1';
       const socket = {
         send(data) {
-          const message = textsecure.protobuf.WebSocketMessage.decode(data);
+          const message = window.textsecure.protobuf.WebSocketMessage.decode(
+            data
+          );
           assert.strictEqual(
             message.type,
-            textsecure.protobuf.WebSocketMessage.Type.RESPONSE
+            window.textsecure.protobuf.WebSocketMessage.Type.RESPONSE
           );
           assert.strictEqual(message.response.message, 'OK');
           assert.strictEqual(message.response.status, 200);
@@ -21,7 +21,7 @@ describe('WebSocket-Resource', () => {
       };
 
       // actual test
-      this.resource = new WebSocketResource(socket, {
+      this.resource = new window.textsecure.WebSocketResource(socket, {
         handleRequest(request) {
           assert.strictEqual(request.verb, 'PUT');
           assert.strictEqual(request.path, '/some/path');
@@ -36,8 +36,8 @@ describe('WebSocket-Resource', () => {
       // mock socket request
       socket.onmessage({
         data: new Blob([
-          new textsecure.protobuf.WebSocketMessage({
-            type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
+          new window.textsecure.protobuf.WebSocketMessage({
+            type: window.textsecure.protobuf.WebSocketMessage.Type.REQUEST,
             request: {
               id: requestId,
               verb: 'PUT',
@@ -56,10 +56,12 @@ describe('WebSocket-Resource', () => {
       let requestId;
       const socket = {
         send(data) {
-          const message = textsecure.protobuf.WebSocketMessage.decode(data);
+          const message = window.textsecure.protobuf.WebSocketMessage.decode(
+            data
+          );
           assert.strictEqual(
             message.type,
-            textsecure.protobuf.WebSocketMessage.Type.REQUEST
+            window.textsecure.protobuf.WebSocketMessage.Type.REQUEST
           );
           assert.strictEqual(message.request.verb, 'PUT');
           assert.strictEqual(message.request.path, '/some/path');
@@ -73,7 +75,7 @@ describe('WebSocket-Resource', () => {
       };
 
       // actual test
-      const resource = new WebSocketResource(socket);
+      const resource = new window.textsecure.WebSocketResource(socket);
       resource.sendRequest({
         verb: 'PUT',
         path: '/some/path',
@@ -89,8 +91,8 @@ describe('WebSocket-Resource', () => {
       // mock socket response
       socket.onmessage({
         data: new Blob([
-          new textsecure.protobuf.WebSocketMessage({
-            type: textsecure.protobuf.WebSocketMessage.Type.RESPONSE,
+          new window.textsecure.protobuf.WebSocketMessage({
+            type: window.textsecure.protobuf.WebSocketMessage.Type.RESPONSE,
             response: { id: requestId, message: 'OK', status: 200 },
           })
             .encode()
@@ -112,7 +114,7 @@ describe('WebSocket-Resource', () => {
       mockServer.on('connection', server => {
         server.on('close', done);
       });
-      const resource = new WebSocketResource(
+      const resource = new window.textsecure.WebSocketResource(
         new WebSocket('ws://localhost:8081')
       );
       resource.close();
@@ -131,10 +133,12 @@ describe('WebSocket-Resource', () => {
       const mockServer = new MockServer('ws://localhost:8081');
       mockServer.on('connection', server => {
         server.on('message', data => {
-          const message = textsecure.protobuf.WebSocketMessage.decode(data);
+          const message = window.textsecure.protobuf.WebSocketMessage.decode(
+            data
+          );
           assert.strictEqual(
             message.type,
-            textsecure.protobuf.WebSocketMessage.Type.REQUEST
+            window.textsecure.protobuf.WebSocketMessage.Type.REQUEST
           );
           assert.strictEqual(message.request.verb, 'GET');
           assert.strictEqual(message.request.path, '/v1/keepalive');
@@ -142,7 +146,7 @@ describe('WebSocket-Resource', () => {
           done();
         });
       });
-      this.resource = new WebSocketResource(
+      this.resource = new window.textsecure.WebSocketResource(
         new WebSocket('ws://loc1alhost:8081'),
         {
           keepalive: { path: '/v1/keepalive' },
@@ -154,10 +158,12 @@ describe('WebSocket-Resource', () => {
       const mockServer = new MockServer('ws://localhost:8081');
       mockServer.on('connection', server => {
         server.on('message', data => {
-          const message = textsecure.protobuf.WebSocketMessage.decode(data);
+          const message = window.textsecure.protobuf.WebSocketMessage.decode(
+            data
+          );
           assert.strictEqual(
             message.type,
-            textsecure.protobuf.WebSocketMessage.Type.REQUEST
+            window.textsecure.protobuf.WebSocketMessage.Type.REQUEST
           );
           assert.strictEqual(message.request.verb, 'GET');
           assert.strictEqual(message.request.path, '/');
@@ -165,7 +171,7 @@ describe('WebSocket-Resource', () => {
           done();
         });
       });
-      this.resource = new WebSocketResource(
+      this.resource = new window.textsecure.WebSocketResource(
         new WebSocket('ws://localhost:8081'),
         {
           keepalive: true,
@@ -180,7 +186,9 @@ describe('WebSocket-Resource', () => {
       mockServer.on('connection', server => {
         server.on('close', done);
       });
-      this.resource = new WebSocketResource(socket, { keepalive: true });
+      this.resource = new window.textsecure.WebSocketResource(socket, {
+        keepalive: true,
+      });
     });
 
     it('allows resetting the keepalive timer', function thisNeeded2(done) {
@@ -190,10 +198,12 @@ describe('WebSocket-Resource', () => {
       const startTime = Date.now();
       mockServer.on('connection', server => {
         server.on('message', data => {
-          const message = textsecure.protobuf.WebSocketMessage.decode(data);
+          const message = window.textsecure.protobuf.WebSocketMessage.decode(
+            data
+          );
           assert.strictEqual(
             message.type,
-            textsecure.protobuf.WebSocketMessage.Type.REQUEST
+            window.textsecure.protobuf.WebSocketMessage.Type.REQUEST
           );
           assert.strictEqual(message.request.verb, 'GET');
           assert.strictEqual(message.request.path, '/');
@@ -205,7 +215,9 @@ describe('WebSocket-Resource', () => {
           done();
         });
       });
-      const resource = new WebSocketResource(socket, { keepalive: true });
+      const resource = new window.textsecure.WebSocketResource(socket, {
+        keepalive: true,
+      });
       setTimeout(() => {
         resource.resetKeepAliveTimer();
       }, 5000);