Make attachments more resilient, decrease websocket keepalive

ts/messageModifiers/AttachmentDownloads.ts

@@ -333,6 +333,7 @@ async function _runJob(job?: AttachmentDownloadJobType): Promise<void> {
       Errors.toLogFormat(error)
     );
 
+    try {
       // Remove `pending` flag from the attachment.
       await _addAttachmentToMessage(
         message,
@@ -357,6 +358,10 @@ async function _runJob(job?: AttachmentDownloadJobType): Promise<void> {
       };
 
       await saveAttachmentDownloadJob(failedJob);
+    } finally {
+      delete _activeAttachmentDownloadJobs[id];
+      _maybeStartJob();
+    }
   }
 }
 

ts/services/profiles.ts

@@ -485,6 +485,9 @@ async function doGetProfile(c: ConversationModel): Promise<void> {
         );
         c.set({ profileKeyCredential, profileKeyCredentialExpiration });
       } else {
+        log.warn(
+          'getProfile: Included credential request, but got no credential. Clearing profileKeyCredential.'
+        );
         c.unset('profileKeyCredential');
       }
     }

ts/test-electron/WebsocketResources_test.ts

@@ -230,8 +230,8 @@ describe('WebSocket-Resource', () => {
         assert.strictEqual(message.request?.path, '/');
         assert.strictEqual(
           Date.now(),
-          startTime + 60000,
-          'keepalive time should be one minute'
+          startTime + 30000 + 5000,
+          'keepalive time should be 35s'
         );
         done();
       });

ts/textsecure/WebsocketResources.ts

@@ -386,8 +386,8 @@ export type KeepAliveOptionsType = {
   disconnect?: boolean;
 };
 
-const KEEPALIVE_INTERVAL_MS = 55000; // 55 seconds + 5 seconds for closing the
-// socket above.
+// 30 seconds + 5 seconds for closing the socket above.
+const KEEPALIVE_INTERVAL_MS = 30 * durations.SECOND;
 const MAX_KEEPALIVE_INTERVAL_MS = 5 * durations.MINUTE;
 
 class KeepAlive {