[keyserver] Log uploaded backup progress

Test Plan: Test on prod

Subscribers: tomek

Differential Revision: https://phab.comm.dev/D15618

Author: Ashoat

keyserver/src/backups/backup-runner.js

@@ -113,18 +113,21 @@ async function trySaveBackup(
   writeBackup: WriteBackup,
 ): Promise<void> {
   const timeoutObject: { timeout: ?TimeoutID } = { timeout: null };
+  const writeStream = await storageAdapter.createWriteStream(filename);
   const setBackupTimeout = (alreadyWaited: number) => {
     timeoutObject.timeout = setTimeout(() => {
       const nowWaited = alreadyWaited + backupWatchFrequency;
+      const uploadedByteCount = writeStream.getUploadedByteCount();
+      const uploadedMiB = Math.floor(uploadedByteCount / (1024 * 1024));
       console.log(
-        `writing backup for ${filename} has taken ${nowWaited}ms so far`,
+        `writing backup for ${filename} has taken ${nowWaited}ms, ` +
+          `uploaded ${uploadedMiB}MiB so far`,
       );
       setBackupTimeout(nowWaited);
     }, backupWatchFrequency);
   };
   setBackupTimeout(0);
 
-  const writeStream = await storageAdapter.createWriteStream(filename);
   writeStream.on('error', (error: Error) => {
     console.warn(`write stream emitted error for ${filename}`, error);
   });

keyserver/src/backups/backup-storage.js

@@ -33,7 +33,11 @@ class BackupStorageSpaceExceededError extends Error {
 export interface BackupStorageAdapter {
   listFiles(): Promise<$ReadOnlyArray<StoredFileInfo>>;
   deleteFile(filename: string): Promise<void>;
-  createWriteStream(filename: string): Promise<stream$Writable>;
+  createWriteStream(filename: string): Promise<BackupWriteStream>;
+}
+
+export interface BackupWriteStream extends stream$Writable {
+  getUploadedByteCount(): number;
 }
 
 function createBackupStorageAdapter(

keyserver/src/backups/dropbox-backup-storage-adapter.js

@@ -6,6 +6,7 @@ import { Writable } from 'stream';
 
 import {
   BackupStorageSpaceExceededError,
+  type BackupWriteStream,
   type DropboxStorageConfig,
   type StoredFileInfo,
 } from './backup-storage.js';
@@ -82,7 +83,7 @@ class DropboxBackupStorageAdapter {
     }
   }
 
-  async createWriteStream(filename: string): Promise<stream$Writable> {
+  async createWriteStream(filename: string): Promise<BackupWriteStream> {
     const accessToken = await this.refreshAccessToken();
     return new DropboxUploadWriteStream(this, accessToken, filename);
   }
@@ -310,6 +311,10 @@ class DropboxUploadWriteStream extends Writable {
     );
     this.bufferedChunk = Buffer.alloc(0);
   }
+
+  getUploadedByteCount(): number {
+    return this.offset;
+  }
 }
 
 function verifyBufferEncoding(encoding: string): buffer$Encoding {

keyserver/src/backups/local-backup-storage-adapter.js

@@ -7,6 +7,7 @@ import { promisify } from 'util';
 
 import {
   BackupStorageSpaceExceededError,
+  type BackupWriteStream,
   type LocalStorageConfig,
   type StoredFileInfo,
 } from './backup-storage.js';
@@ -50,8 +51,8 @@ class LocalBackupStorageAdapter {
     }
   }
 
-  async createWriteStream(filename: string): Promise<stream$Writable> {
-    const writeStream = new PassThrough();
+  async createWriteStream(filename: string): Promise<BackupWriteStream> {
+    const writeStream = new LocalBackupWriteStream();
     const fileWriteStream = fs.createWriteStream(
       path.join(this.directory, filename),
     );
@@ -67,4 +68,20 @@ class LocalBackupStorageAdapter {
   }
 }
 
+class LocalBackupWriteStream extends PassThrough {
+  uploadedByteCount: number;
+
+  constructor() {
+    super();
+    this.uploadedByteCount = 0;
+    this.on('data', chunk => {
+      this.uploadedByteCount += chunk.length;
+    });
+  }
+
+  getUploadedByteCount(): number {
+    return this.uploadedByteCount;
+  }
+}
+
 export { LocalBackupStorageAdapter };