commit 68a480166183998719bc1f08cf17d33b091e7472 · knotbin.com/airport

.DS_Store

This is a binary file and will not be displayed.

+1 -1

islands/Header.tsx

···

       50
       50
        
       

     

       51
       51
        
         const handleLogout = async () => {

     

       52
       52
        
           try {

     

       53
       53
       -
             const response = await fetch("/api/oauth/logout", {

     

       53
       53
       +
             const response = await fetch("/api/logout", {

     

       54
       54
        
               method: "POST",

     

       55
       55
        
               credentials: "include",

     

       56
       56
        
             });

+63 -39

islands/MigrationProgress.tsx

···

       20
       20
        
         const [steps, setSteps] = useState<MigrationStep[]>([

     

       21
       21
        
           { name: "Create Account", status: "pending" },

     

       22
       22
        
           { name: "Migrate Data", status: "pending" },

     

       23
       23
       -
           { name: "Request Identity Migration", status: "pending" },

     

       24
       24
       -
           { name: "Complete Identity Migration", status: "pending" },

     

       23
       23
       +
           { name: "Migrate Identity", status: "pending" },

     

       25
       24
        
           { name: "Finalize Migration", status: "pending" },

     

       26
       25
        
         ]);

     

       27
       26
        
       

     
···

       90
       89
        
           });

     

       91
       90
        
         }, []);

     

       92
       91
        
       

     

       92
       92
       +
         const getStepDisplayName = (step: MigrationStep, index: number) => {

     

       93
       93
       +
           if (step.status === "completed") {

     

       94
       94
       +
             switch (index) {

     

       95
       95
       +
               case 0: return "Account Created";

     

       96
       96
       +
               case 1: return "Data Migrated";

     

       97
       97
       +
               case 2: return "Identity Migrated";

     

       98
       98
       +
               case 3: return "Migration Finalized";

     

       99
       99
       +
             }

     

       100
       100
       +
           }

     

       101
       101
       +
           

     

       102
       102
       +
           if (step.status === "in-progress") {

     

       103
       103
       +
             switch (index) {

     

       104
       104
       +
               case 0: return "Creating your new account...";

     

       105
       105
       +
               case 1: return "Migrating your data...";

     

       106
       106
       +
               case 2: return step.name === "Enter the token sent to your email to complete identity migration" 

     

       107
       107
       +
                 ? step.name 

     

       108
       108
       +
                 : "Migrating your identity...";

     

       109
       109
       +
               case 3: return "Finalizing migration...";

     

       110
       110
       +
             }

     

       111
       111
       +
           }

     

       112
       112
       +
           

     

       113
       113
       +
           return step.name;

     

       114
       114
       +
         };

     

       115
       115
       +
       

     

       93
       116
        
         const startMigration = async () => {

     

       94
       117
        
           try {

     

       95
       118
        
             // Step 1: Create Account

     
···

       203
       226
        
                   );

     

       204
       227
        
                 }

     

       205
       228
        
                 console.log("Identity migration requested successfully");

     

       229
       229
       +
                 

     

       230
       230
       +
                 // Don't mark step as completed yet since we need token input

     

       231
       231
       +
                 steps[2].name = "Enter the token sent to your email to complete identity migration";

     

       232
       232
       +
                 setSteps([...steps]);

     

       206
       233
        
               } catch (e) {

     

       207
       234
        
                 console.error("Failed to parse identity request response:", e);

     

       208
       235
        
                 throw new Error(

     

       209
       236
        
                   "Invalid response from server during identity request",

     

       210
       237
        
                 );

     

       211
       238
        
               }

     

       212
       212
       -
       

     

       213
       213
       -
               updateStepStatus(2, "completed");

     

       214
       214
       -
               // Move to token input step

     

       215
       215
       -
               updateStepStatus(3, "in-progress");

     

       216
       239
        
             } catch (error) {

     

       217
       240
        
               updateStepStatus(

     

       218
       241
        
                 2,

     
···

       256
       279
        
             }

     

       257
       280
        
       

     

       258
       281
        
             setRecoveryKey(data.recoveryKey);

     

       259
       259
       -
             updateStepStatus(3, "completed");

     

       282
       282
       +
             updateStepStatus(2, "completed");

     

       283
       283
       +
             steps[2].name = "Migrate Identity";  // Reset to default name after completion

     

       284
       284
       +
             setSteps([...steps]);

     

       260
       285
        
       

     

       261
       261
       -
             // Step 5: Finalize Migration

     

       262
       262
       -
             updateStepStatus(4, "in-progress");

     

       286
       286
       +
             // Step 4: Finalize Migration

     

       287
       287
       +
             updateStepStatus(3, "in-progress");

     

       263
       288
        
             try {

     

       264
       289
        
               const finalizeRes = await fetch("/api/migrate/finalize", {

     

       265
       290
        
                 method: "POST",

     
···

       280
       305
        
                 throw new Error("Invalid response from server during finalization");

     

       281
       306
        
               }

     

       282
       307
        
       

     

       283
       283
       -
               updateStepStatus(4, "completed");

     

       308
       308
       +
               updateStepStatus(3, "completed");

     

       284
       309
        
             } catch (error) {

     

       285
       310
        
               updateStepStatus(

     

       286
       286
       -
                 4,

     

       311
       311
       +
                 3,

     

       287
       312
        
                 "error",

     

       288
       313
        
                 error instanceof Error ? error.message : String(error),

     

       289
       314
        
               );

     
···

       292
       317
        
           } catch (error) {

     

       293
       318
        
             console.error("Identity migration error:", error);

     

       294
       319
        
             updateStepStatus(

     

       295
       295
       -
               3,

     

       320
       320
       +
               2,

     

       296
       321
        
               "error",

     

       297
       322
        
               error instanceof Error ? error.message : String(error),

     

       298
       323
        
             );

     
···

       370
       395
        
         return (

     

       371
       396
        
           <div class="space-y-8">

     

       372
       397
        
             <div class="space-y-4">

     

       373
       373
       -
               {steps.map((step) => (

     

       398
       398
       +
               {steps.map((step, index) => (

     

       374
       399
        
                 <div key={step.name} class={getStepClasses(step.status)}>

     

       375
       400
        
                   {getStepIcon(step.status)}

     

       376
       401
        
                   <div class="flex-1">

     
···

       385
       410
        
                           : "text-gray-900 dark:text-gray-200"

     

       386
       411
        
                       }`}

     

       387
       412
        
                     >

     

       388
       388
       -
                       {step.name}

     

       413
       413
       +
                       {getStepDisplayName(step, index)}

     

       389
       414
        
                     </p>

     

       390
       415
        
                     {step.error && (

     

       391
       416
        
                       <p class="text-sm text-red-600 dark:text-red-400 mt-1">

     

       392
       417
        
                         {step.error}

     

       393
       418
        
                       </p>

     

       394
       419
        
                     )}

     

       420
       420
       +
                     {index === 2 && step.status === "in-progress" && (

     

       421
       421
       +
                       <div class="mt-4 space-y-4">

     

       422
       422
       +
                         <p class="text-sm text-blue-800 dark:text-blue-200">

     

       423
       423
       +
                           Please check your email for the migration token and enter it below:

     

       424
       424
       +
                         </p>

     

       425
       425
       +
                         <div class="flex space-x-2">

     

       426
       426
       +
                           <input

     

       427
       427
       +
                             type="text"

     

       428
       428
       +
                             value={token}

     

       429
       429
       +
                             onChange={(e) => setToken(e.currentTarget.value)}

     

       430
       430
       +
                             placeholder="Enter token"

     

       431
       431
       +
                             class="flex-1 rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:focus:border-blue-400 dark:focus:ring-blue-400"

     

       432
       432
       +
                           />

     

       433
       433
       +
                           <button

     

       434
       434
       +
                             type="button"

     

       435
       435
       +
                             onClick={handleIdentityMigration}

     

       436
       436
       +
                             class="px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 transition-colors duration-200"

     

       437
       437
       +
                           >

     

       438
       438
       +
                             Submit Token

     

       439
       439
       +
                           </button>

     

       440
       440
       +
                         </div>

     

       441
       441
       +
                       </div>

     

       442
       442
       +
                     )}

     

       395
       443
        
                   </div>

     

       396
       444
        
                 </div>

     

       397
       445
        
               ))}

     

       398
       446
        
             </div>

     

       399
       447
        
       

     

       400
       400
       -
             {steps[3].status === "in-progress" && (

     

       401
       401
       -
               <div class="space-y-4 p-4 bg-blue-50 dark:bg-blue-900 rounded-lg border-2 border-blue-200 dark:border-blue-800">

     

       402
       402
       -
                 <p class="text-sm text-blue-800 dark:text-blue-200">

     

       403
       403
       -
                   Please check your email for the migration token and enter it below:

     

       404
       404
       -
                 </p>

     

       405
       405
       -
                 <div class="flex space-x-2">

     

       406
       406
       -
                   <input

     

       407
       407
       -
                     type="text"

     

       408
       408
       -
                     value={token}

     

       409
       409
       -
                     onChange={(e) => setToken(e.currentTarget.value)}

     

       410
       410
       -
                     placeholder="Enter token"

     

       411
       411
       -
                     class="flex-1 rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:focus:border-blue-400 dark:focus:ring-blue-400"

     

       412
       412
       -
                   />

     

       413
       413
       -
                   <button

     

       414
       414
       -
                     type="button"

     

       415
       415
       -
                     onClick={handleIdentityMigration}

     

       416
       416
       -
                     class="px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 transition-colors duration-200"

     

       417
       417
       -
                   >

     

       418
       418
       -
                     Submit Token

     

       419
       419
       -
                   </button>

     

       420
       420
       -
                 </div>

     

       421
       421
       -
               </div>

     

       422
       422
       -
             )}

     

       423
       423
       -
       

     

       424
       448
        
             {recoveryKey && (

     

       425
       449
        
               <div class="p-4 bg-yellow-50 dark:bg-yellow-900 rounded-lg border-2 border-yellow-200 dark:border-yellow-800">

     

       426
       450
        
                 <p class="text-sm font-medium text-yellow-800 dark:text-yellow-200">

     
···

       432
       456
        
               </div>

     

       433
       457
        
             )}

     

       434
       458
        
       

     

       435
       435
       -
             {steps[4].status === "completed" && (

     

       459
       459
       +
             {steps[3].status === "completed" && (

     

       436
       460
        
               <div class="p-4 bg-green-50 dark:bg-green-900 rounded-lg border-2 border-green-200 dark:border-green-800">

     

       437
       461
        
                 <p class="text-sm text-green-800 dark:text-green-200">

     

       438
       462
        
                   Migration completed successfully! You can now close this page.

+16

lib/sessions.ts

···

       55
       55
        
       

     

       56
       56
        
         return null;

     

       57
       57
        
       }

     

       58
       58
       +
       

     

       59
       59
       +
       export async function destroyAllSessions(req: Request) {

     

       60
       60
       +
         const oauthSession = await getOauthSession(req);

     

       61
       61
       +
         const credentialSession = await getCredentialSession(req);

     

       62
       62
       +
         const migrationSession = await getCredentialSession(req, new Response(), true);

     

       63
       63
       +
       

     

       64
       64
       +
         if (oauthSession.did) {

     

       65
       65
       +
           await oauthSession.destroy();

     

       66
       66
       +
         }

     

       67
       67
       +
         if (credentialSession.did) {

     

       68
       68
       +
           await credentialSession.destroy();

     

       69
       69
       +
         }

     

       70
       70
       +
         if (migrationSession.did) {

     

       71
       71
       +
           await migrationSession.destroy();

     

       72
       72
       +
         }

     

       73
       73
       +
       }

+1 -1

routes/api/cred/login.ts

···

       64
       64
        
                 password,

     

       65
       65
        
                 handle,

     

       66
       66
        
                 accessJwt: sessionRes.data.accessJwt

     

       67
       67
       -
               }, true);

     

       67
       67
       +
               });

     

       68
       68
        
       

     

       69
       69
        
               // Log the response headers

     

       70
       70
        
               console.log("Response headers:", {

+10

routes/api/logout.ts

···

       1
       1
       +
       import { destroyAllSessions } from "../../lib/sessions.ts";

     

       2
       2
       +
       import { define } from "../../utils.ts";

     

       3
       3
       +
       

     

       4
       4
       +
       export const handler = define.handlers({

     

       5
       5
       +
         async POST(ctx) {

     

       6
       6
       +
           await destroyAllSessions(ctx.req)

     

       7
       7
       +
       

     

       8
       8
       +
           return new Response("All Sessions Destroyed")

     

       9
       9
       +
         },

     

       10
       10
       +
       });

+188 -28

routes/api/migrate/data.ts

···

       2
       2
        
       import {

     

       3
       3
        
         getSessionAgent,

     

       4
       4
        
       } from "../../../lib/sessions.ts";

     

       5
       5
       +
       import { Agent, ComAtprotoSyncGetBlob } from "npm:@atproto/api";

     

       6
       6
       +
       

     

       7
       7
       +
       // Retry configuration

     

       8
       8
       +
       const MAX_RETRIES = 3;

     

       9
       9
       +
       const INITIAL_RETRY_DELAY = 1000; // 1 second

     

       10
       10
       +
       

     

       11
       11
       +
       interface RetryOptions {

     

       12
       12
       +
         maxRetries?: number;

     

       13
       13
       +
         initialDelay?: number;

     

       14
       14
       +
         onRetry?: (attempt: number, error: Error) => void;

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       async function withRetry<T>(

     

       18
       18
       +
         operation: () => Promise<T>,

     

       19
       19
       +
         options: RetryOptions = {},

     

       20
       20
       +
       ): Promise<T> {

     

       21
       21
       +
         const maxRetries = options.maxRetries ?? MAX_RETRIES;

     

       22
       22
       +
         const initialDelay = options.initialDelay ?? INITIAL_RETRY_DELAY;

     

       23
       23
       +
       

     

       24
       24
       +
         let lastError: Error | null = null;

     

       25
       25
       +
         for (let attempt = 0; attempt < maxRetries; attempt++) {

     

       26
       26
       +
           try {

     

       27
       27
       +
             return await operation();

     

       28
       28
       +
           } catch (error) {

     

       29
       29
       +
             lastError = error instanceof Error ? error : new Error(String(error));

     

       30
       30
       +
             

     

       31
       31
       +
             // Don't retry on certain errors

     

       32
       32
       +
             if (error instanceof Error) {

     

       33
       33
       +
               // Don't retry on permanent errors like authentication

     

       34
       34
       +
               if (error.message.includes("Unauthorized") || error.message.includes("Invalid token")) {

     

       35
       35
       +
                 throw error;

     

       36
       36
       +
               }

     

       37
       37
       +
             }

     

       38
       38
       +
       

     

       39
       39
       +
             if (attempt < maxRetries - 1) {

     

       40
       40
       +
               const delay = initialDelay * Math.pow(2, attempt);

     

       41
       41
       +
               console.log(`Retry attempt ${attempt + 1}/${maxRetries} after ${delay}ms:`, lastError.message);

     

       42
       42
       +
               if (options.onRetry) {

     

       43
       43
       +
                 options.onRetry(attempt + 1, lastError);

     

       44
       44
       +
               }

     

       45
       45
       +
               await new Promise(resolve => setTimeout(resolve, delay));

     

       46
       46
       +
             }

     

       47
       47
       +
           }

     

       48
       48
       +
         }

     

       49
       49
       +
         throw lastError ?? new Error("Operation failed after retries");

     

       50
       50
       +
       }

     

       51
       51
       +
       

     

       52
       52
       +
       async function handleBlobUpload(

     

       53
       53
       +
         newAgent: Agent,

     

       54
       54
       +
         blobRes: ComAtprotoSyncGetBlob.Response,

     

       55
       55
       +
         cid: string

     

       56
       56
       +
       ) {

     

       57
       57
       +
         try {

     

       58
       58
       +
           const contentLength = parseInt(blobRes.headers["content-length"] || "0", 10);

     

       59
       59
       +
           const contentType = blobRes.headers["content-type"];

     

       60
       60
       +
           

     

       61
       61
       +
           // Check file size before attempting upload

     

       62
       62
       +
           const MAX_SIZE = 95 * 1024 * 1024; // 95MB to be safe

     

       63
       63
       +
           if (contentLength > MAX_SIZE) {

     

       64
       64
       +
             throw new Error(`Blob ${cid} exceeds maximum size limit (${contentLength} bytes)`);

     

       65
       65
       +
           }

     

       66
       66
       +
       

     

       67
       67
       +
           await withRetry(

     

       68
       68
       +
             () => newAgent.com.atproto.repo.uploadBlob(blobRes.data, {

     

       69
       69
       +
               encoding: contentType,

     

       70
       70
       +
             }),

     

       71
       71
       +
             {

     

       72
       72
       +
               maxRetries: 5,

     

       73
       73
       +
               onRetry: (attempt, error) => {

     

       74
       74
       +
                 console.log(`Retrying blob upload for ${cid} (attempt ${attempt}):`, error.message);

     

       75
       75
       +
               },

     

       76
       76
       +
             }

     

       77
       77
       +
           );

     

       78
       78
       +
         } catch (error) {

     

       79
       79
       +
           console.error(`Failed to upload blob ${cid}:`, error);

     

       80
       80
       +
           throw error;

     

       81
       81
       +
         }

     

       82
       82
       +
       }

     

       5
       83
        
       

     

       6
       84
        
       export const handler = define.handlers({

     

       7
       85
        
         async POST(ctx) {

     
···

       47
       125
        
             const session = await oldAgent.com.atproto.server.getSession();

     

       48
       126
        
             const accountDid = session.data.did;

     

       49
       127
        
       

     

       50
       50
       -
             // Migrate repo data

     

       51
       51
       -
             const repoRes = await oldAgent.com.atproto.sync.getRepo({

     

       52
       52
       -
               did: accountDid,

     

       53
       53
       -
             });

     

       54
       54
       -
             await newAgent.com.atproto.repo.importRepo(repoRes.data, {

     

       55
       55
       -
               encoding: "application/vnd.ipld.car",

     

       56
       56
       -
             });

     

       128
       128
       +
             // Migrate repo data with retries

     

       129
       129
       +
             const repoRes = await withRetry(

     

       130
       130
       +
               () => oldAgent.com.atproto.sync.getRepo({

     

       131
       131
       +
                 did: accountDid,

     

       132
       132
       +
               }),

     

       133
       133
       +
               {

     

       134
       134
       +
                 maxRetries: 5,

     

       135
       135
       +
                 onRetry: (attempt, error) => {

     

       136
       136
       +
                   console.log(`Retrying repo fetch (attempt ${attempt}):`, error.message);

     

       137
       137
       +
                 },

     

       138
       138
       +
               }

     

       139
       139
       +
             );

     

       57
       140
        
       

     

       58
       58
       -
             // Migrate blobs

     

       141
       141
       +
             await withRetry(

     

       142
       142
       +
               () => newAgent.com.atproto.repo.importRepo(repoRes.data, {

     

       143
       143
       +
                 encoding: "application/vnd.ipld.car",

     

       144
       144
       +
               }),

     

       145
       145
       +
               {

     

       146
       146
       +
                 maxRetries: 5,

     

       147
       147
       +
                 onRetry: (attempt, error) => {

     

       148
       148
       +
                   console.log(`Retrying repo import (attempt ${attempt}):`, error.message);

     

       149
       149
       +
                 },

     

       150
       150
       +
               }

     

       151
       151
       +
             );

     

       152
       152
       +
       

     

       153
       153
       +
             // Migrate blobs with enhanced error handling

     

       59
       154
        
             let blobCursor: string | undefined = undefined;

     

       60
       155
        
             const migratedBlobs: string[] = [];

     

       156
       156
       +
             const failedBlobs: Array<{ cid: string; error: string }> = [];

     

       157
       157
       +
       

     

       61
       158
        
             do {

     

       62
       62
       -
               const listedBlobs = await oldAgent.com.atproto.sync.listBlobs({

     

       63
       63
       -
                 did: accountDid,

     

       64
       64
       -
                 cursor: blobCursor,

     

       65
       65
       -
               });

     

       66
       66
       -
               for (const cid of listedBlobs.data.cids) {

     

       67
       67
       -
                 const blobRes = await oldAgent.com.atproto.sync.getBlob({

     

       68
       68
       -
                   did: accountDid,

     

       69
       69
       -
                   cid,

     

       70
       70
       -
                 });

     

       71
       71
       -
                 await newAgent.com.atproto.repo.uploadBlob(blobRes.data, {

     

       72
       72
       -
                   encoding: blobRes.headers["content-type"],

     

       73
       73
       -
                 });

     

       74
       74
       -
                 migratedBlobs.push(cid);

     

       159
       159
       +
               try {

     

       160
       160
       +
                 const listedBlobs = await withRetry(

     

       161
       161
       +
                   () => oldAgent.com.atproto.sync.listBlobs({

     

       162
       162
       +
                     did: accountDid,

     

       163
       163
       +
                     cursor: blobCursor,

     

       164
       164
       +
                   }),

     

       165
       165
       +
                   {

     

       166
       166
       +
                     maxRetries: 5,

     

       167
       167
       +
                     onRetry: (attempt, error) => {

     

       168
       168
       +
                       console.log(`Retrying blob list fetch (attempt ${attempt}):`, error.message);

     

       169
       169
       +
                     },

     

       170
       170
       +
                   }

     

       171
       171
       +
                 );

     

       172
       172
       +
       

     

       173
       173
       +
                 for (const cid of listedBlobs.data.cids) {

     

       174
       174
       +
                   try {

     

       175
       175
       +
                     const blobRes = await withRetry(

     

       176
       176
       +
                       () => oldAgent.com.atproto.sync.getBlob({

     

       177
       177
       +
                         did: accountDid,

     

       178
       178
       +
                         cid,

     

       179
       179
       +
                       }),

     

       180
       180
       +
                       {

     

       181
       181
       +
                         maxRetries: 5,

     

       182
       182
       +
                         onRetry: (attempt, error) => {

     

       183
       183
       +
                           console.log(`Retrying blob download for ${cid} (attempt ${attempt}):`, error.message);

     

       184
       184
       +
                         },

     

       185
       185
       +
                       }

     

       186
       186
       +
                     );

     

       187
       187
       +
       

     

       188
       188
       +
                     await handleBlobUpload(newAgent, blobRes, cid);

     

       189
       189
       +
                     migratedBlobs.push(cid);

     

       190
       190
       +
                     console.log(`Successfully migrated blob: ${cid}`);

     

       191
       191
       +
                   } catch (error) {

     

       192
       192
       +
                     console.error(`Failed to migrate blob ${cid}:`, error);

     

       193
       193
       +
                     failedBlobs.push({

     

       194
       194
       +
                       cid,

     

       195
       195
       +
                       error: error instanceof Error ? error.message : String(error),

     

       196
       196
       +
                     });

     

       197
       197
       +
                   }

     

       198
       198
       +
                 }

     

       199
       199
       +
                 blobCursor = listedBlobs.data.cursor;

     

       200
       200
       +
               } catch (error) {

     

       201
       201
       +
                 console.error("Error during blob migration batch:", error);

     

       202
       202
       +
                 // If we hit a critical error during blob listing, break the loop

     

       203
       203
       +
                 if (error instanceof Error && 

     

       204
       204
       +
                    (error.message.includes("Unauthorized") || 

     

       205
       205
       +
                     error.message.includes("Invalid token"))) {

     

       206
       206
       +
                   throw error;

     

       207
       207
       +
                 }

     

       208
       208
       +
                 break;

     

       75
       209
        
               }

     

       76
       76
       -
               blobCursor = listedBlobs.data.cursor;

     

       77
       210
        
             } while (blobCursor);

     

       78
       211
        
       

     

       79
       79
       -
             // Migrate preferences

     

       80
       80
       -
             const prefs = await oldAgent.app.bsky.actor.getPreferences();

     

       81
       81
       -
             await newAgent.app.bsky.actor.putPreferences(prefs.data);

     

       212
       212
       +
             // Migrate preferences with retry

     

       213
       213
       +
             const prefs = await withRetry(

     

       214
       214
       +
               () => oldAgent.app.bsky.actor.getPreferences(),

     

       215
       215
       +
               {

     

       216
       216
       +
                 maxRetries: 3,

     

       217
       217
       +
                 onRetry: (attempt, error) => {

     

       218
       218
       +
                   console.log(`Retrying preferences fetch (attempt ${attempt}):`, error.message);

     

       219
       219
       +
                 },

     

       220
       220
       +
               }

     

       221
       221
       +
             );

     

       222
       222
       +
       

     

       223
       223
       +
             await withRetry(

     

       224
       224
       +
               () => newAgent.app.bsky.actor.putPreferences(prefs.data),

     

       225
       225
       +
               {

     

       226
       226
       +
                 maxRetries: 3,

     

       227
       227
       +
                 onRetry: (attempt, error) => {

     

       228
       228
       +
                   console.log(`Retrying preferences update (attempt ${attempt}):`, error.message);

     

       229
       229
       +
                 },

     

       230
       230
       +
               }

     

       231
       231
       +
             );

     

       82
       232
        
       

     

       83
       233
        
             return new Response(

     

       84
       234
        
               JSON.stringify({

     

       85
       235
        
                 success: true,

     

       86
       86
       -
                 message: "Data migration completed successfully",

     

       87
       87
       -
                 migratedBlobs: migratedBlobs,

     

       236
       236
       +
                 message: failedBlobs.length > 0 

     

       237
       237
       +
                   ? `Data migration completed with ${failedBlobs.length} failed blobs`

     

       238
       238
       +
                   : "Data migration completed successfully",

     

       239
       239
       +
                 migratedBlobs,

     

       240
       240
       +
                 failedBlobs,

     

       241
       241
       +
                 totalMigrated: migratedBlobs.length,

     

       242
       242
       +
                 totalFailed: failedBlobs.length,

     

       88
       243
        
               }),

     

       89
       244
        
               {

     

       90
       90
       -
                 status: 200,

     

       245
       245
       +
                 status: failedBlobs.length > 0 ? 207 : 200, // Use 207 Multi-Status if some blobs failed

     

       91
       246
        
                 headers: {

     

       92
       247
        
                   "Content-Type": "application/json",

     

       93
       248
        
                   ...Object.fromEntries(res.headers), // Include session cookie headers

     
···

       102
       257
        
                 message: error instanceof Error

     

       103
       258
        
                   ? error.message

     

       104
       259
        
                   : "Failed to migrate data",

     

       260
       260
       +
                 error: error instanceof Error ? {

     

       261
       261
       +
                   name: error.name,

     

       262
       262
       +
                   message: error.message,

     

       263
       263
       +
                   stack: error.stack,

     

       264
       264
       +
                 } : String(error),

     

       105
       265
        
               }),

     

       106
       266
        
               {

     

       107
       267
        
                 status: 400,

+45

routes/api/migrate/next-step.ts

···

       1
       1
       +
       import { getSessionAgent } from "../../../lib/sessions.ts";

     

       2
       2
       +
       import { define } from "../../../utils.ts";

     

       3
       3
       +
       

     

       4
       4
       +
       export const handler = define.handlers({

     

       5
       5
       +
           async GET(ctx) {

     

       6
       6
       +
               let nextStep = null;

     

       7
       7
       +
               const oldAgent = await getSessionAgent(ctx.req);

     

       8
       8
       +
               const newAgent = await getSessionAgent(ctx.req, new Response(), true);

     

       9
       9
       +
       

     

       10
       10
       +
               if (!newAgent) return Response.json({ nextStep: 1, completed: false });

     

       11
       11
       +
               if (!oldAgent) return new Response("Unauthorized", { status: 401 });

     

       12
       12
       +
       

     

       13
       13
       +
               const oldStatus = await oldAgent.com.atproto.server.checkAccountStatus();

     

       14
       14
       +
               const newStatus = await newAgent.com.atproto.server.checkAccountStatus();

     

       15
       15
       +
               if (!oldStatus.data || !newStatus.data) return new Response("Could not verify status", { status: 500 });

     

       16
       16
       +
       

     

       17
       17
       +
               // Check conditions in sequence to determine the next step

     

       18
       18
       +
               if (!newStatus.data) {

     

       19
       19
       +
                   nextStep = 1;

     

       20
       20
       +
               } else if (!(newStatus.data.repoCommit && 

     

       21
       21
       +
                          newStatus.data.indexedRecords === oldStatus.data.indexedRecords &&

     

       22
       22
       +
                          newStatus.data.privateStateValues === oldStatus.data.privateStateValues &&

     

       23
       23
       +
                          newStatus.data.expectedBlobs === newStatus.data.importedBlobs &&

     

       24
       24
       +
                          newStatus.data.importedBlobs === oldStatus.data.importedBlobs)) {

     

       25
       25
       +
                   nextStep = 2;

     

       26
       26
       +
               } else if (!newStatus.data.validDid) {

     

       27
       27
       +
                   nextStep = 3;

     

       28
       28
       +
               } else if (!(newStatus.data.activated === true && oldStatus.data.activated === false)) {

     

       29
       29
       +
                   nextStep = 4;

     

       30
       30
       +
               }

     

       31
       31
       +
       

     

       32
       32
       +
               return Response.json({

     

       33
       33
       +
                   nextStep,

     

       34
       34
       +
                   completed: nextStep === null,

     

       35
       35
       +
                   currentStatus: {

     

       36
       36
       +
                       activated: newStatus.data.activated,

     

       37
       37
       +
                       validDid: newStatus.data.validDid,

     

       38
       38
       +
                       repoCommit: newStatus.data.repoCommit,

     

       39
       39
       +
                       indexedRecords: newStatus.data.indexedRecords,

     

       40
       40
       +
                       privateStateValues: newStatus.data.privateStateValues,

     

       41
       41
       +
                       importedBlobs: newStatus.data.importedBlobs

     

       42
       42
       +
                   }

     

       43
       43
       +
               });

     

       44
       44
       +
           }

     

       45
       45
       +
       })

+68

routes/api/migrate/status.ts

···

       1
       1
       +
       import { getSessionAgent } from "../../../lib/sessions.ts";

     

       2
       2
       +
       import { define } from "../../../utils.ts";

     

       3
       3
       +
       

     

       4
       4
       +
       export const handler = define.handlers({

     

       5
       5
       +
           async GET(ctx) {

     

       6
       6
       +
               const url = new URL(ctx.req.url);

     

       7
       7
       +
               const params = new URLSearchParams(url.search);

     

       8
       8
       +
               const step = params.get("step");

     

       9
       9
       +
               const oldAgent = await getSessionAgent(ctx.req);

     

       10
       10
       +
               const newAgent = await getSessionAgent(ctx.req, new Response(), true);

     

       11
       11
       +
               

     

       12
       12
       +
       

     

       13
       13
       +
               if (!oldAgent || !newAgent) return new Response("Unauthorized", { status: 401 });

     

       14
       14
       +
       

     

       15
       15
       +
               const oldStatus = await oldAgent.com.atproto.server.checkAccountStatus();

     

       16
       16
       +
               const newStatus = await newAgent.com.atproto.server.checkAccountStatus();

     

       17
       17
       +
               if (!oldStatus.data || !newStatus.data) return new Response("Could not verify status", { status: 500 });

     

       18
       18
       +
       

     

       19
       19
       +
               const readyToContinue = () => {

     

       20
       20
       +
                   if (step) {

     

       21
       21
       +
                       switch (step) {

     

       22
       22
       +
                           case "1":

     

       23
       23
       +
                               if (newStatus.data) {

     

       24
       24
       +
                                   return true;

     

       25
       25
       +
                               }

     

       26
       26
       +
                               return false;

     

       27
       27
       +
                           case "2":

     

       28
       28
       +
                               if (newStatus.data.repoCommit && 

     

       29
       29
       +
                                   newStatus.data.indexedRecords === oldStatus.data.indexedRecords &&

     

       30
       30
       +
                                   newStatus.data.privateStateValues === oldStatus.data.privateStateValues &&

     

       31
       31
       +
                                   newStatus.data.expectedBlobs === newStatus.data.importedBlobs &&

     

       32
       32
       +
                                   newStatus.data.importedBlobs === oldStatus.data.importedBlobs) {

     

       33
       33
       +
                                   return true;

     

       34
       34
       +
                               }

     

       35
       35
       +
                               return false;

     

       36
       36
       +
                           case "3":

     

       37
       37
       +
                               if (newStatus.data.validDid) {

     

       38
       38
       +
                                   return true;

     

       39
       39
       +
                               }

     

       40
       40
       +
                               return false;

     

       41
       41
       +
                           case "4":

     

       42
       42
       +
                               if (newStatus.data.activated === true && oldStatus.data.activated === false) {

     

       43
       43
       +
                                   return true;

     

       44
       44
       +
                               }

     

       45
       45
       +
                               return false;

     

       46
       46
       +
                       }

     

       47
       47
       +
                   } else {

     

       48
       48
       +
                       return true;

     

       49
       49
       +
                   }

     

       50
       50
       +
               }

     

       51
       51
       +
       

     

       52
       52
       +
               const status = {

     

       53
       53
       +
                   activated: newStatus.data.activated,

     

       54
       54
       +
                   validDid: newStatus.data.validDid,

     

       55
       55
       +
                   repoCommit: newStatus.data.repoCommit,

     

       56
       56
       +
                   repoRev: newStatus.data.repoRev,

     

       57
       57
       +
                   repoBlocks: newStatus.data.repoBlocks,

     

       58
       58
       +
                   expectedRecords: oldStatus.data.indexedRecords,

     

       59
       59
       +
                   indexedRecords: newStatus.data.indexedRecords,

     

       60
       60
       +
                   privateStateValues: newStatus.data.privateStateValues,

     

       61
       61
       +
                   expectedBlobs: newStatus.data.expectedBlobs,

     

       62
       62
       +
                   importedBlobs: newStatus.data.importedBlobs,

     

       63
       63
       +
                   readyToContinue: readyToContinue()

     

       64
       64
       +
               }

     

       65
       65
       +
       

     

       66
       66
       +
               return Response.json(status);

     

       67
       67
       +
           }

     

       68
       68
       +
       })

-27

routes/api/oauth/logout.ts

···

       1
       1
       -
       import { getSession } from "../../../lib/sessions.ts";

     

       2
       2
       -
       import { oauthClient } from "../../../lib/oauth/client.ts";

     

       3
       3
       -
       import { define } from "../../../utils.ts";

     

       4
       4
       -
       

     

       5
       5
       -
       export const handler = define.handlers({

     

       6
       6
       -
         async POST(ctx) {

     

       7
       7
       -
           const req = ctx.req;

     

       8
       8
       -
       

     

       9
       9
       -
           try {

     

       10
       10
       -
             const response = new Response(null, { status: 200 });

     

       11
       11
       -
             const session = await getSession(req, response);

     

       12
       12
       -
       

     

       13
       13
       -
             if (session.did) {

     

       14
       14
       -
               // First destroy the oauth session

     

       15
       15
       -
               await oauthClient.revoke(session.did);

     

       16
       16
       -
               // Then destroy the iron session

     

       17
       17
       -
               session.destroy();

     

       18
       18
       -
             }

     

       19
       19
       -
       

     

       20
       20
       -
             return response;

     

       21
       21
       -
           } catch (error: unknown) {

     

       22
       22
       -
             const err = error instanceof Error ? error : new Error(String(error));

     

       23
       23
       -
             console.error("Logout failed:", err.message);

     

       24
       24
       -
             return new Response("Logout failed", { status: 500 });

     

       25
       25
       -
           }

     

       26
       26
       -
         },

     

       27
       27
       -
       });