missing blobs and better upload status

index.html

···
     </form>
     <div x-show="askForPlcToken" class="section">
         <form @submit.prevent="await signPlcOperation()">
-            <h2>Please enter your PLCToken you received in an email</h2>
+            <h2>Please enter your PLC Token you received in an email</h2>
             <div class="form-group">
-                <label for="plc-token">PLCToken:</label>
+                <label for="plc-token">PLC Token:</label>
                 <input type="text" id="plc-token" name="plc-token" x-model="plcToken" required>
             </div>
             <div x-show="error" x-text="error" class="error-message"></div>

src/pdsmoover.js

···
   constructor() {
     this.oldAgent = null;
     this.newAgent = null;
+    this.missingBlobs = [];
   }
 
   /**
···
       await oldAgent.login({identifier: oldHandle, password: password, authFactorToken: twoFactorCode});
     }
 
-    safeStatusUpdate(statusUpdateHandler, 'Checking that the new PDS is an actual PDS');
+    safeStatusUpdate(statusUpdateHandler, 'Checking that the new PDS is an actual PDS (if the url is wrong this takes a while to error out)');
     const newAgent = new AtpAgent({service: newPdsUrl});
     const newHostDesc = await newAgent.com.atproto.server.describeServer();
     const newHostWebDid = newHostDesc.data.did;
···
 
     await newAgent.login({
       identifier: usersDid,
-      password,
+      password: password,
     });
 
     safeStatusUpdate(statusUpdateHandler, 'Migrating your repo');
···
       encoding: 'application/vnd.ipld.car',
     });
 
+    let newAccountStatus = await newAgent.com.atproto.server.checkAccountStatus();
     safeStatusUpdate(statusUpdateHandler, 'Migrating your blobs');
 
     let blobCursor = undefined;
     let uploadedBlobs = 0;
     do {
-      safeStatusUpdate(statusUpdateHandler, `Migrating blobs, ${uploadedBlobs}/${uploadedBlobs + 100}`);
-      uploadedBlobs += 100;
+      safeStatusUpdate(statusUpdateHandler, `Migrating blobs: ${uploadedBlobs}/${newAccountStatus.data.expectedBlobs}`);
+
       const listedBlobs = await oldAgent.com.atproto.sync.listBlobs({
         did: usersDid,
         cursor: blobCursor,
         limit: 100,
       });
+
       for (const cid of listedBlobs.data.cids) {
         try {
           //TODO may move the status update here but would have it only update like every 10
···
           await newAgent.com.atproto.repo.uploadBlob(blobRes.data, {
             encoding: blobRes.headers['content-type'],
           });
+          uploadedBlobs++;
+          if (uploadedBlobs % 10 === 0) {
+            safeStatusUpdate(statusUpdateHandler, `Migrating blobs: ${uploadedBlobs}/${newAccountStatus.data.expectedBlobs}`);
+          }
         } catch (error) {
           //TODO silently logging for now will do a missing blobs later
           console.error(error);
···
       blobCursor = listedBlobs.data.cursor;
     } while (blobCursor);
 
-    //TODO NEED to do some checking on the missing blobs here
+    newAccountStatus = await newAgent.com.atproto.server.checkAccountStatus();
+    if (newAccountStatus.data.expectedBlobs !== uploadedBlobs) {
+      let totalMissingBlobs = newAccountStatus.data.expectedBlobs - uploadedBlobs;
+      safeStatusUpdate(statusUpdateHandler, 'Looks like there are some missing blobs. Going to try and upload them now.');
+      //Probably should be shared between main blob uploader, but eh
+      let missingBlobCursor = undefined;
+      let missingUploadedBlobs = 0;
+      do {
+        safeStatusUpdate(statusUpdateHandler, `Migrating blobs: ${missingUploadedBlobs}/${totalMissingBlobs}`);
+
+        const missingBlobs = await oldAgent.com.atproto.repo.listMissingBlobs({
+          did: usersDid,
+          cursor: missingBlobCursor,
+          limit: 100,
+        });
+
+        for (const cid of missingBlobs.data.cids) {
+          try {
+            //TODO may move the status update here but would have it only update like every 10
+            const blobRes = await oldAgent.com.atproto.sync.getBlob({
+              cid,
+            });
+            await newAgent.com.atproto.repo.uploadBlob(blobRes.data, {
+              encoding: blobRes.headers['content-type'],
+            });
+            if (uploadedBlobs % 10 === 0) {
+              safeStatusUpdate(statusUpdateHandler, `Migrating blobs: ${uploadedBlobs}/${uploadedBlobs}`);
+            }
+            uploadedBlobs++;
+          } catch (error) {
+            //TODO silently logging for now will do a missing blobs later
+            console.error(error);
+            this.missingBlobs.push(cid);
+          }
+        }
+        missingBlobCursor = missingBlobs.data.cursor;
+      } while (missingBlobCursor);
+
+    }
 
     const prefs = await oldAgent.app.bsky.actor.getPreferences();
     await newAgent.app.bsky.actor.putPreferences(prefs.data);