comparing cc94c8b0b651684774c5e434edcda96128e5ea6d and retry-verification on knotbin.com/airport

.DS_Store

This is a binary file and will not be displayed.

+2 -1

.env.example

···

       1
       1
        
       # generate with `openssl ecparam --name secp256k1 --genkey --noout --outform DER | tail --bytes=+8 | head --bytes=32 | xxd --plain --cols 32`

     

       2
       2
       -
       COOKIE_SECRET=my_secret
     

       2
       2
       +
       COOKIE_SECRET=my_secret

     

       3
       3
       +
       MIGRATION_STATE=up

.gitignore

···

       5
       5
        
       .env.production.local

     

       6
       6
        
       .env.local

     

       7
       7
        
       

     

       8
       8
       +
       .DS_Store

     

       9
       9
       +
       

     

       8
       10
        
       # Fresh build directory

     

       9
       11
        
       _fresh/

     

       10
       12
        
       # npm dependencies

+35 -9

.zed/settings.json

···

       1
       1
       +
       // Folder-specific settings

     

       2
       2
       +
       //

     

       3
       3
       +
       // For a full list of overridable settings, and general information on folder-specific settings,

     

       4
       4
       +
       // see the documentation: https://zed.dev/docs/configuring-zed#settings-files

     

       1
       5
        
       {

     

       6
       6
       +
         "lsp": {

     

       7
       7
       +
           "deno": {

     

       8
       8
       +
             "settings": {

     

       9
       9
       +
               "deno": {

     

       10
       10
       +
                 "enable": true,

     

       11
       11
       +
                 "cacheOnSave": true,

     

       12
       12
       +
                 "suggest": {

     

       13
       13
       +
                   "imports": {

     

       14
       14
       +
                     "autoDiscover": true

     

       15
       15
       +
                   }

     

       16
       16
       +
                 }

     

       17
       17
       +
               }

     

       18
       18
       +
             }

     

       19
       19
       +
           }

     

       20
       20
       +
         },

     

       2
       21
        
         "languages": {

     

       22
       22
       +
           "JavaScript": {

     

       23
       23
       +
             "language_servers": [

     

       24
       24
       +
               "deno",

     

       25
       25
       +
               "!vtsls",

     

       26
       26
       +
               "!eslint",

     

       27
       27
       +
               "..."

     

       28
       28
       +
             ]

     

       29
       29
       +
           },

     

       3
       30
        
           "TypeScript": {

     

       4
       31
        
             "language_servers": [

     

       5
       5
       -
               "wakatime",

     

       6
       32
        
               "deno",

     

       7
       33
        
               "!typescript-language-server",

     

       8
       34
        
               "!vtsls",

     

       9
       9
       -
               "!eslint"

     

       10
       10
       -
             ],

     

       11
       11
       -
             "formatter": "language_server"

     

       35
       35
       +
               "!eslint",

     

       36
       36
       +
               "..."

     

       37
       37
       +
             ]

     

       12
       38
        
           },

     

       13
       39
        
           "TSX": {

     

       14
       40
        
             "language_servers": [

     

       15
       15
       -
               "wakatime",

     

       16
       41
        
               "deno",

     

       17
       42
        
               "!typescript-language-server",

     

       18
       43
        
               "!vtsls",

     

       19
       19
       -
               "!eslint"

     

       20
       20
       -
             ],

     

       21
       21
       -
             "formatter": "language_server"

     

       44
       44
       +
               "!eslint",

     

       45
       45
       +
               "..."

     

       46
       46
       +
             ]

     

       22
       47
        
           }

     

       23
       23
       -
         }

     

       48
       48
       +
         },

     

       49
       49
       +
         "formatter": "language_server"

     

       24
       50
        
       }

+6 -15

README.md

···

       4
       4
        
       

     

       5
       5
        
       Airport is a web application built with Fresh and Deno that helps users safely migrate and backup their Bluesky PDS data. It provides a user-friendly interface for managing your AT Protocol data.

     

       6
       6
        
       

     

       7
       7
       -
       ⚠️ **Alpha Status**: Airport is currently in alpha. Please use migration tools at your own risk and avoid using with main accounts during this phase.

     

       8
       8
       -
       

     

       9
       7
        
       ## Features

     

       10
       8
        
       

     

       11
       9
        
       - PDS migration between servers

     
···

       13
       11
        
       - User-friendly interface

     

       14
       12
        
       - Coming soon: PLC Key retrieval, data backup

     

       15
       13
        
       

     

       16
       16
       -
       ## Technology Stack

     

       14
       14
       +
       ## Tech Stack

     

       17
       15
        
       

     

       18
       18
       -
       - [Fresh](https://fresh.deno.dev/) - The next-gen web framework

     

       19
       19
       -
       - [Deno](https://deno.com/) - A modern runtime for JavaScript and TypeScript

     

       20
       20
       -
       - [Tailwind CSS](https://tailwindcss.com/) - For styling

     

       21
       21
       -
       - AT Protocol Integration

     

       16
       16
       +
       - [Fresh](https://fresh.deno.dev/) - Web Framework

     

       17
       17
       +
       - [Deno](https://deno.com/) - Runtime

     

       18
       18
       +
       - [Tailwind](https://tailwindcss.com/) - Styling

     

       22
       19
        
       

     

       23
       23
       -
       ## Getting Started

     

       20
       20
       +
       ## Development

     

       24
       21
        
       

     

       25
       25
       -
       ### Prerequisites

     

       26
       26
       -
       

     

       27
       27
       -
       Make sure to install Deno:

     

       22
       22
       +
       Make sure you have Deno installed:

     

       28
       23
        
       https://docs.deno.com/runtime/getting_started/installation

     

       29
       29
       -
       

     

       30
       30
       -
       ### Development

     

       31
       24
        
       

     

       32
       25
        
       Start the project in development mode:

     

       33
       26
        
       

     

       34
       27
        
       ```shell

     

       35
       28
        
       deno task dev

     

       36
       29
        
       ```

     

       37
       37
       -
       

     

       38
       38
       -
       This will watch the project directory and restart as necessary.

     

       39
       30
        
       

     

       40
       31
        
       ## About

     

       41
       32

+35

islands/LoginButton.tsx

···

       1
       1
       +
       import { useEffect, useState } from "preact/hooks";

     

       2
       2
       +
       import { Button } from "../components/Button.tsx";

     

       3
       3
       +
       

     

       4
       4
       +
       export default function LoginButton() {

     

       5
       5
       +
         const [isMobile, setIsMobile] = useState(true); // Default to mobile for SSR

     

       6
       6
       +
       

     

       7
       7
       +
         useEffect(() => {

     

       8
       8
       +
           const checkMobile = () => {

     

       9
       9
       +
             setIsMobile(globalThis.innerWidth < 640);

     

       10
       10
       +
           };

     

       11
       11
       +
       

     

       12
       12
       +
           // Check on mount

     

       13
       13
       +
           checkMobile();

     

       14
       14
       +
       

     

       15
       15
       +
           // Listen for resize events

     

       16
       16
       +
           globalThis.addEventListener('resize', checkMobile);

     

       17
       17
       +
           return () => globalThis.removeEventListener('resize', checkMobile);

     

       18
       18
       +
         }, []);

     

       19
       19
       +
       

     

       20
       20
       +
         return (

     

       21
       21
       +
           <div class="mt-6 sm:mt-8 text-center w-fit mx-auto">

     

       22
       22
       +
             <Button

     

       23
       23
       +
               href={isMobile ? undefined : "/login"}

     

       24
       24
       +
               color="blue"

     

       25
       25
       +
               label={isMobile ? "MOBILE NOT SUPPORTED" : "GET STARTED"}

     

       26
       26
       +
               className={isMobile ? "opacity-50 cursor-not-allowed" : "opacity-100 cursor-pointer"}

     

       27
       27
       +
               onClick={(e: MouseEvent) => {

     

       28
       28
       +
                 if (isMobile) {

     

       29
       29
       +
                   e.preventDefault();

     

       30
       30
       +
                 }

     

       31
       31
       +
               }}

     

       32
       32
       +
             />

     

       33
       33
       +
           </div>

     

       34
       34
       +
         );

     

       35
       35
       +
       }

+536 -264

islands/MigrationProgress.tsx

···

       1
       1
        
       import { useEffect, useState } from "preact/hooks";

     

       2
       2
        
       

     

       3
       3
        
       /**

     

       4
       4
       +
        * The migration state info.

     

       5
       5
       +
        * @type {MigrationStateInfo}

     

       6
       6
       +
        */

     

       7
       7
       +
       interface MigrationStateInfo {

     

       8
       8
       +
         state: "up" | "issue" | "maintenance";

     

       9
       9
       +
         message: string;

     

       10
       10
       +
         allowMigration: boolean;

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       /**

     

       4
       14
        
        * The migration progress props.

     

       5
       15
        
        * @type {MigrationProgressProps}

     

       6
       16
        
        */

     
···

       20
       30
        
         name: string;

     

       21
       31
        
         status: "pending" | "in-progress" | "verifying" | "completed" | "error";

     

       22
       32
        
         error?: string;

     

       33
       33
       +
         isVerificationError?: boolean;

     

       23
       34
        
       }

     

       24
       35
        
       

     

       25
       36
        
       /**

     
···

       30
       41
        
        */

     

       31
       42
        
       export default function MigrationProgress(props: MigrationProgressProps) {

     

       32
       43
        
         const [token, setToken] = useState("");

     

       44
       44
       +
         const [migrationState, setMigrationState] = useState<

     

       45
       45
       +
           MigrationStateInfo | null

     

       46
       46
       +
         >(null);

     

       47
       47
       +
         const [retryAttempts, setRetryAttempts] = useState<Record<number, number>>(

     

       48
       48
       +
           {},

     

       49
       49
       +
         );

     

       50
       50
       +
         const [showContinueAnyway, setShowContinueAnyway] = useState<

     

       51
       51
       +
           Record<number, boolean>

     

       52
       52
       +
         >({});

     

       33
       53
        
       

     

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

     

       35
       55
        
           { name: "Create Account", status: "pending" },

     
···

       42
       62
        
           index: number,

     

       43
       63
        
           status: MigrationStep["status"],

     

       44
       64
        
           error?: string,

     

       65
       65
       +
           isVerificationError?: boolean,

     

       45
       66
        
         ) => {

     

       46
       67
        
           console.log(

     

       47
       68
        
             `Updating step ${index} to ${status}${

     
···

       51
       72
        
           setSteps((prevSteps) =>

     

       52
       73
        
             prevSteps.map((step, i) =>

     

       53
       74
        
               i === index

     

       54
       54
       -
                 ? { ...step, status, error }

     

       75
       75
       +
                 ? { ...step, status, error, isVerificationError }

     

       55
       76
        
                 : i > index

     

       56
       56
       -
                 ? { ...step, status: "pending", error: undefined }

     

       77
       77
       +
                 ? {

     

       78
       78
       +
                   ...step,

     

       79
       79
       +
                   status: "pending",

     

       80
       80
       +
                   error: undefined,

     

       81
       81
       +
                   isVerificationError: undefined,

     

       82
       82
       +
                 }

     

       57
       83
        
                 : step

     

       58
       84
        
             )

     

       59
       85
        
           );

     
···

       88
       114
        
             invite: props.invite,

     

       89
       115
        
           });

     

       90
       116
        
       

     

       91
       91
       -
           if (!validateParams()) {

     

       92
       92
       -
             console.log("Parameter validation failed");

     

       93
       93
       -
             return;

     

       94
       94
       -
           }

     

       117
       117
       +
           // Check migration state first

     

       118
       118
       +
           const checkMigrationState = async () => {

     

       119
       119
       +
             try {

     

       120
       120
       +
               const migrationResponse = await fetch("/api/migration-state");

     

       121
       121
       +
               if (migrationResponse.ok) {

     

       122
       122
       +
                 const migrationData = await migrationResponse.json();

     

       123
       123
       +
                 setMigrationState(migrationData);

     

       95
       124
        
       

     

       96
       96
       -
           startMigration().catch((error) => {

     

       97
       97
       -
             console.error("Unhandled migration error:", error);

     

       98
       98
       -
             updateStepStatus(

     

       99
       99
       -
               0,

     

       100
       100
       -
               "error",

     

       101
       101
       -
               error instanceof Error ? error.message : String(error),

     

       102
       102
       -
             );

     

       103
       103
       -
           });

     

       125
       125
       +
                 if (!migrationData.allowMigration) {

     

       126
       126
       +
                   updateStepStatus(0, "error", migrationData.message);

     

       127
       127
       +
                   return;

     

       128
       128
       +
                 }

     

       129
       129
       +
               }

     

       130
       130
       +
             } catch (error) {

     

       131
       131
       +
               console.error("Failed to check migration state:", error);

     

       132
       132
       +
               updateStepStatus(0, "error", "Unable to verify migration availability");

     

       133
       133
       +
               return;

     

       134
       134
       +
             }

     

       135
       135
       +
       

     

       136
       136
       +
             if (!validateParams()) {

     

       137
       137
       +
               console.log("Parameter validation failed");

     

       138
       138
       +
               return;

     

       139
       139
       +
             }

     

       140
       140
       +
       

     

       141
       141
       +
             startMigration().catch((error) => {

     

       142
       142
       +
               console.error("Unhandled migration error:", error);

     

       143
       143
       +
               updateStepStatus(

     

       144
       144
       +
                 0,

     

       145
       145
       +
                 "error",

     

       146
       146
       +
                 error.message || "Unknown error occurred",

     

       147
       147
       +
               );

     

       148
       148
       +
             });

     

       149
       149
       +
           };

     

       150
       150
       +
       

     

       151
       151
       +
           checkMigrationState();

     

       104
       152
        
         }, []);

     

       105
       153
        
       

     

       106
       154
        
         const getStepDisplayName = (step: MigrationStep, index: number) => {

     

       107
       155
        
           if (step.status === "completed") {

     

       108
       156
        
             switch (index) {

     

       109
       109
       -
               case 0: return "Account Created";

     

       110
       110
       -
               case 1: return "Data Migrated";

     

       111
       111
       -
               case 2: return "Identity Migrated";

     

       112
       112
       -
               case 3: return "Migration Finalized";

     

       157
       157
       +
               case 0:

     

       158
       158
       +
                 return "Account Created";

     

       159
       159
       +
               case 1:

     

       160
       160
       +
                 return "Data Migrated";

     

       161
       161
       +
               case 2:

     

       162
       162
       +
                 return "Identity Migrated";

     

       163
       163
       +
               case 3:

     

       164
       164
       +
                 return "Migration Finalized";

     

       113
       165
        
             }

     

       114
       166
        
           }

     

       115
       115
       -
           

     

       167
       167
       +
       

     

       116
       168
        
           if (step.status === "in-progress") {

     

       117
       169
        
             switch (index) {

     

       118
       118
       -
               case 0: return "Creating your new account...";

     

       119
       119
       -
               case 1: return "Migrating your data...";

     

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

     

       121
       121
       -
                 ? step.name 

     

       122
       122
       -
                 : "Migrating your identity...";

     

       123
       123
       -
               case 3: return "Finalizing migration...";

     

       170
       170
       +
               case 0:

     

       171
       171
       +
                 return "Creating your new account...";

     

       172
       172
       +
               case 1:

     

       173
       173
       +
                 return "Migrating your data...";

     

       174
       174
       +
               case 2:

     

       175
       175
       +
                 return step.name ===

     

       176
       176
       +
                     "Enter the token sent to your email to complete identity migration"

     

       177
       177
       +
                   ? step.name

     

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

     

       179
       179
       +
               case 3:

     

       180
       180
       +
                 return "Finalizing migration...";

     

       124
       181
        
             }

     

       125
       182
        
           }

     

       126
       183
        
       

     

       127
       184
        
           if (step.status === "verifying") {

     

       128
       185
        
             switch (index) {

     

       129
       129
       -
               case 0: return "Verifying account creation...";

     

       130
       130
       -
               case 1: return "Verifying data migration...";

     

       131
       131
       -
               case 2: return "Verifying identity migration...";

     

       132
       132
       -
               case 3: return "Verifying migration completion...";

     

       186
       186
       +
               case 0:

     

       187
       187
       +
                 return "Verifying account creation...";

     

       188
       188
       +
               case 1:

     

       189
       189
       +
                 return "Verifying data migration...";

     

       190
       190
       +
               case 2:

     

       191
       191
       +
                 return "Verifying identity migration...";

     

       192
       192
       +
               case 3:

     

       193
       193
       +
                 return "Verifying migration completion...";

     

       133
       194
        
             }

     

       134
       195
        
           }

     

       135
       135
       -
           

     

       196
       196
       +
       

     

       136
       197
        
           return step.name;

     

       137
       198
        
         };

     

       138
       199
        
       

     
···

       180
       241
        
               updateStepStatus(0, "verifying");

     

       181
       242
        
               const verified = await verifyStep(0);

     

       182
       243
        
               if (!verified) {

     

       183
       183
       -
                 throw new Error("Account creation verification failed");

     

       184
       184
       -
               }

     

       185
       185
       -
             } catch (error) {

     

       186
       186
       -
               updateStepStatus(

     

       187
       187
       -
                 0,

     

       188
       188
       -
                 "error",

     

       189
       189
       -
                 error instanceof Error ? error.message : String(error),

     

       190
       190
       -
               );

     

       191
       191
       -
               throw error;

     

       192
       192
       -
             }

     

       193
       193
       -
       

     

       194
       194
       -
             // Step 2: Migrate Data

     

       195
       195
       -
             updateStepStatus(1, "in-progress");

     

       196
       196
       -
             console.log("Starting data migration...");

     

       197
       197
       -
       

     

       198
       198
       -
             try {

     

       199
       199
       -
               // Step 2.1: Migrate Repo

     

       200
       200
       -
               console.log("Data migration: Starting repo migration");

     

       201
       201
       -
               const repoRes = await fetch("/api/migrate/data/repo", {

     

       202
       202
       -
                 method: "POST",

     

       203
       203
       -
                 headers: { "Content-Type": "application/json" },

     

       204
       204
       -
               });

     

       205
       205
       -
       

     

       206
       206
       -
               console.log("Repo migration: Response status:", repoRes.status);

     

       207
       207
       -
               const repoText = await repoRes.text();

     

       208
       208
       -
               console.log("Repo migration: Raw response:", repoText);

     

       209
       209
       -
       

     

       210
       210
       -
               if (!repoRes.ok) {

     

       211
       211
       -
                 try {

     

       212
       212
       -
                   const json = JSON.parse(repoText);

     

       213
       213
       -
                   console.error("Repo migration: Error response:", json);

     

       214
       214
       -
                   throw new Error(json.message || "Failed to migrate repo");

     

       215
       215
       -
                 } catch {

     

       216
       216
       -
                   console.error("Repo migration: Non-JSON error response:", repoText);

     

       217
       217
       -
                   throw new Error(repoText || "Failed to migrate repo");

     

       218
       218
       -
                 }

     

       219
       219
       -
               }

     

       220
       220
       -
       

     

       221
       221
       -
               // Step 2.2: Migrate Blobs

     

       222
       222
       -
               console.log("Data migration: Starting blob migration");

     

       223
       223
       -
               const blobsRes = await fetch("/api/migrate/data/blobs", {

     

       224
       224
       -
                 method: "POST",

     

       225
       225
       -
                 headers: { "Content-Type": "application/json" },

     

       226
       226
       -
               });

     

       227
       227
       -
       

     

       228
       228
       -
               console.log("Blob migration: Response status:", blobsRes.status);

     

       229
       229
       -
               const blobsText = await blobsRes.text();

     

       230
       230
       -
               console.log("Blob migration: Raw response:", blobsText);

     

       231
       231
       -
       

     

       232
       232
       -
               if (!blobsRes.ok) {

     

       233
       233
       -
                 try {

     

       234
       234
       -
                   const json = JSON.parse(blobsText);

     

       235
       235
       -
                   console.error("Blob migration: Error response:", json);

     

       236
       236
       -
                   throw new Error(json.message || "Failed to migrate blobs");

     

       237
       237
       -
                 } catch {

     

       238
       238
       -
                   console.error("Blob migration: Non-JSON error response:", blobsText);

     

       239
       239
       -
                   throw new Error(blobsText || "Failed to migrate blobs");

     

       240
       240
       -
                 }

     

       241
       241
       -
               }

     

       242
       242
       -
       

     

       243
       243
       -
               // Step 2.3: Migrate Preferences

     

       244
       244
       -
               console.log("Data migration: Starting preferences migration");

     

       245
       245
       -
               const prefsRes = await fetch("/api/migrate/data/prefs", {

     

       246
       246
       -
                 method: "POST",

     

       247
       247
       -
                 headers: { "Content-Type": "application/json" },

     

       248
       248
       -
               });

     

       249
       249
       -
       

     

       250
       250
       -
               console.log("Preferences migration: Response status:", prefsRes.status);

     

       251
       251
       -
               const prefsText = await prefsRes.text();

     

       252
       252
       -
               console.log("Preferences migration: Raw response:", prefsText);

     

       253
       253
       -
       

     

       254
       254
       -
               if (!prefsRes.ok) {

     

       255
       255
       -
                 try {

     

       256
       256
       -
                   const json = JSON.parse(prefsText);

     

       257
       257
       -
                   console.error("Preferences migration: Error response:", json);

     

       258
       258
       -
                   throw new Error(json.message || "Failed to migrate preferences");

     

       259
       259
       -
                 } catch {

     

       260
       260
       -
                   console.error("Preferences migration: Non-JSON error response:", prefsText);

     

       261
       261
       -
                   throw new Error(prefsText || "Failed to migrate preferences");

     

       262
       262
       -
                 }

     

       263
       263
       -
               }

     

       264
       264
       -
       

     

       265
       265
       -
               console.log("Data migration: Starting verification");

     

       266
       266
       -
               updateStepStatus(1, "verifying");

     

       267
       267
       -
               const verified = await verifyStep(1);

     

       268
       268
       -
               console.log("Data migration: Verification result:", verified);

     

       269
       269
       -
               if (!verified) {

     

       270
       270
       -
                 throw new Error("Data migration verification failed");

     

       271
       271
       -
               }

     

       272
       272
       -
             } catch (error) {

     

       273
       273
       -
               console.error("Data migration: Error caught:", error);

     

       274
       274
       -
               updateStepStatus(

     

       275
       275
       -
                 1,

     

       276
       276
       -
                 "error",

     

       277
       277
       -
                 error instanceof Error ? error.message : String(error),

     

       278
       278
       -
               );

     

       279
       279
       -
               throw error;

     

       280
       280
       -
             }

     

       281
       281
       -
       

     

       282
       282
       -
             // Step 3: Request Identity Migration

     

       283
       283
       -
             updateStepStatus(2, "in-progress");

     

       284
       284
       -
             console.log("Requesting identity migration...");

     

       285
       285
       -
       

     

       286
       286
       -
             try {

     

       287
       287
       -
               const requestRes = await fetch("/api/migrate/identity/request", {

     

       288
       288
       -
                 method: "POST",

     

       289
       289
       -
                 headers: { "Content-Type": "application/json" },

     

       290
       290
       -
               });

     

       291
       291
       -
       

     

       292
       292
       -
               console.log("Identity request response status:", requestRes.status);

     

       293
       293
       -
               const requestText = await requestRes.text();

     

       294
       294
       -
               console.log("Identity request response:", requestText);

     

       295
       295
       -
       

     

       296
       296
       -
               if (!requestRes.ok) {

     

       297
       297
       -
                 try {

     

       298
       298
       -
                   const json = JSON.parse(requestText);

     

       299
       299
       -
                   throw new Error(json.message || "Failed to request identity migration");

     

       300
       300
       -
                 } catch {

     

       301
       301
       -
                   throw new Error(requestText || "Failed to request identity migration");

     

       302
       302
       -
                 }

     

       303
       303
       -
               }

     

       304
       304
       -
       

     

       305
       305
       -
               try {

     

       306
       306
       -
                 const jsonData = JSON.parse(requestText);

     

       307
       307
       -
                 if (!jsonData.success) {

     

       308
       308
       -
                   throw new Error(

     

       309
       309
       -
                     jsonData.message || "Identity migration request failed",

     

       310
       310
       -
                   );

     

       311
       311
       -
                 }

     

       312
       312
       -
                 console.log("Identity migration requested successfully");

     

       313
       313
       -
                 

     

       314
       314
       -
                 // Update step name to prompt for token

     

       315
       315
       -
                 setSteps(prevSteps =>

     

       316
       316
       -
                   prevSteps.map((step, i) =>

     

       317
       317
       -
                     i === 2

     

       318
       318
       -
                       ? { ...step, name: "Enter the token sent to your email to complete identity migration" }

     

       319
       319
       -
                       : step

     

       320
       320
       -
                   )

     

       244
       244
       +
                 console.log(

     

       245
       245
       +
                   "Account creation: Verification failed, waiting for user action",

     

       321
       246
        
                 );

     

       322
       322
       -
                 // Don't continue with migration - wait for token input

     

       323
       247
        
                 return;

     

       324
       324
       -
               } catch (e) {

     

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

     

       326
       326
       -
                 throw new Error(

     

       327
       327
       -
                   "Invalid response from server during identity request",

     

       328
       328
       -
                 );

     

       329
       248
        
               }

     

       249
       249
       +
       

     

       250
       250
       +
               // If verification succeeds, continue to data migration

     

       251
       251
       +
               await startDataMigration();

     

       330
       252
        
             } catch (error) {

     

       331
       253
        
               updateStepStatus(

     

       332
       332
       -
                 2,

     

       254
       254
       +
                 0,

     

       333
       255
        
                 "error",

     

       334
       256
        
                 error instanceof Error ? error.message : String(error),

     

       335
       257
        
               );

     
···

       356
       278
        
             if (!identityRes.ok) {

     

       357
       279
        
               try {

     

       358
       280
        
                 const json = JSON.parse(identityData);

     

       359
       359
       -
                 throw new Error(json.message || "Failed to complete identity migration");

     

       281
       281
       +
                 throw new Error(

     

       282
       282
       +
                   json.message || "Failed to complete identity migration",

     

       283
       283
       +
                 );

     

       360
       284
        
               } catch {

     

       361
       361
       -
                 throw new Error(identityData || "Failed to complete identity migration");

     

       285
       285
       +
                 throw new Error(

     

       286
       286
       +
                   identityData || "Failed to complete identity migration",

     

       287
       287
       +
                 );

     

       362
       288
        
               }

     

       363
       289
        
             }

     

       364
       290
        
       

     
···

       372
       298
        
               throw new Error("Invalid response from server");

     

       373
       299
        
             }

     

       374
       300
        
       

     

       375
       375
       -
       

     

       376
       301
        
             updateStepStatus(2, "verifying");

     

       377
       302
        
             const verified = await verifyStep(2);

     

       378
       303
        
             if (!verified) {

     

       379
       379
       -
               throw new Error("Identity migration verification failed");

     

       380
       380
       -
             }

     

       381
       381
       -
       

     

       382
       382
       -
             // Step 4: Finalize Migration

     

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

     

       384
       384
       -
             try {

     

       385
       385
       -
               const finalizeRes = await fetch("/api/migrate/finalize", {

     

       386
       386
       -
                 method: "POST",

     

       387
       387
       -
                 headers: { "Content-Type": "application/json" },

     

       388
       388
       -
               });

     

       389
       389
       -
       

     

       390
       390
       -
               const finalizeData = await finalizeRes.text();

     

       391
       391
       -
               if (!finalizeRes.ok) {

     

       392
       392
       -
                 try {

     

       393
       393
       -
                   const json = JSON.parse(finalizeData);

     

       394
       394
       -
                   throw new Error(json.message || "Failed to finalize migration");

     

       395
       395
       -
                 } catch {

     

       396
       396
       -
                   throw new Error(finalizeData || "Failed to finalize migration");

     

       397
       397
       -
                 }

     

       398
       398
       -
               }

     

       399
       399
       -
       

     

       400
       400
       -
               try {

     

       401
       401
       -
                 const jsonData = JSON.parse(finalizeData);

     

       402
       402
       -
                 if (!jsonData.success) {

     

       403
       403
       -
                   throw new Error(jsonData.message || "Finalization failed");

     

       404
       404
       -
                 }

     

       405
       405
       -
               } catch {

     

       406
       406
       -
                 throw new Error("Invalid response from server during finalization");

     

       407
       407
       -
               }

     

       408
       408
       -
       

     

       409
       409
       -
               updateStepStatus(3, "verifying");

     

       410
       410
       -
               const verified = await verifyStep(3);

     

       411
       411
       -
               if (!verified) {

     

       412
       412
       -
                 throw new Error("Migration finalization verification failed");

     

       413
       413
       -
               }

     

       414
       414
       -
             } catch (error) {

     

       415
       415
       -
               updateStepStatus(

     

       416
       416
       -
                 3,

     

       417
       417
       -
                 "error",

     

       418
       418
       -
                 error instanceof Error ? error.message : String(error),

     

       304
       304
       +
               console.log(

     

       305
       305
       +
                 "Identity migration: Verification failed, waiting for user action",

     

       419
       306
        
               );

     

       420
       420
       -
               throw error;

     

       307
       307
       +
               return;

     

       421
       308
        
             }

     

       309
       309
       +
       

     

       310
       310
       +
             // If verification succeeds, continue to finalization

     

       311
       311
       +
             await startFinalization();

     

       422
       312
        
           } catch (error) {

     

       423
       313
        
             console.error("Identity migration error:", error);

     

       424
       314
        
             updateStepStatus(

     
···

       515
       405
        
             console.log(`Verification: Status response status:`, res.status);

     

       516
       406
        
             const data = await res.json();

     

       517
       407
        
             console.log(`Verification: Status data for step ${stepNum + 1}:`, data);

     

       518
       518
       -
             

     

       408
       408
       +
       

     

       519
       409
        
             if (data.ready) {

     

       520
       410
        
               console.log(`Verification: Step ${stepNum + 1} is ready`);

     

       521
       411
        
               updateStepStatus(stepNum, "completed");

     

       412
       412
       +
               // Reset retry state on success

     

       413
       413
       +
               setRetryAttempts((prev) => ({ ...prev, [stepNum]: 0 }));

     

       414
       414
       +
               setShowContinueAnyway((prev) => ({ ...prev, [stepNum]: false }));

     

       415
       415
       +
       

     

       416
       416
       +
               // Continue to next step if not the last one

     

       417
       417
       +
               if (stepNum < 3) {

     

       418
       418
       +
                 setTimeout(() => continueToNextStep(stepNum + 1), 500);

     

       419
       419
       +
               }

     

       420
       420
       +
       

     

       522
       421
        
               return true;

     

       523
       422
        
             } else {

     

       524
       524
       -
               console.log(`Verification: Step ${stepNum + 1} is not ready:`, data.reason);

     

       423
       423
       +
               console.log(

     

       424
       424
       +
                 `Verification: Step ${stepNum + 1} is not ready:`,

     

       425
       425
       +
                 data.reason,

     

       426
       426
       +
               );

     

       525
       427
        
               const statusDetails = {

     

       526
       428
        
                 activated: data.activated,

     

       527
       429
        
                 validDid: data.validDid,

     
···

       532
       434
        
                 indexedRecords: data.indexedRecords,

     

       533
       435
        
                 privateStateValues: data.privateStateValues,

     

       534
       436
        
                 expectedBlobs: data.expectedBlobs,

     

       535
       535
       -
                 importedBlobs: data.importedBlobs

     

       437
       437
       +
                 importedBlobs: data.importedBlobs,

     

       536
       438
        
               };

     

       537
       537
       -
               console.log(`Verification: Step ${stepNum + 1} status details:`, statusDetails);

     

       538
       538
       -
               const errorMessage = `${data.reason || "Verification failed"}\nStatus details: ${JSON.stringify(statusDetails, null, 2)}`;

     

       539
       539
       -
               updateStepStatus(stepNum, "error", errorMessage);

     

       439
       439
       +
               console.log(

     

       440
       440
       +
                 `Verification: Step ${stepNum + 1} status details:`,

     

       441
       441
       +
                 statusDetails,

     

       442
       442
       +
               );

     

       443
       443
       +
               const errorMessage = `${

     

       444
       444
       +
                 data.reason || "Verification failed"

     

       445
       445
       +
               }\nStatus details: ${JSON.stringify(statusDetails, null, 2)}`;

     

       446
       446
       +
       

     

       447
       447
       +
               // Track retry attempts

     

       448
       448
       +
               const currentAttempts = retryAttempts[stepNum] || 0;

     

       449
       449
       +
               setRetryAttempts((prev) => ({

     

       450
       450
       +
                 ...prev,

     

       451
       451
       +
                 [stepNum]: currentAttempts + 1,

     

       452
       452
       +
               }));

     

       453
       453
       +
       

     

       454
       454
       +
               // Show continue anyway option if this is the second failure

     

       455
       455
       +
               if (currentAttempts >= 1) {

     

       456
       456
       +
                 setShowContinueAnyway((prev) => ({ ...prev, [stepNum]: true }));

     

       457
       457
       +
               }

     

       458
       458
       +
       

     

       459
       459
       +
               updateStepStatus(stepNum, "error", errorMessage, true);

     

       540
       460
        
               return false;

     

       541
       461
        
             }

     

       542
       462
        
           } catch (e) {

     

       543
       463
        
             console.error(`Verification: Error in step ${stepNum + 1}:`, e);

     

       544
       544
       -
             updateStepStatus(stepNum, "error", e instanceof Error ? e.message : String(e));

     

       464
       464
       +
             const currentAttempts = retryAttempts[stepNum] || 0;

     

       465
       465
       +
             setRetryAttempts((prev) => ({ ...prev, [stepNum]: currentAttempts + 1 }));

     

       466
       466
       +
       

     

       467
       467
       +
             // Show continue anyway option if this is the second failure

     

       468
       468
       +
             if (currentAttempts >= 1) {

     

       469
       469
       +
               setShowContinueAnyway((prev) => ({ ...prev, [stepNum]: true }));

     

       470
       470
       +
             }

     

       471
       471
       +
       

     

       472
       472
       +
             updateStepStatus(

     

       473
       473
       +
               stepNum,

     

       474
       474
       +
               "error",

     

       475
       475
       +
               e instanceof Error ? e.message : String(e),

     

       476
       476
       +
               true,

     

       477
       477
       +
             );

     

       545
       478
        
             return false;

     

       546
       479
        
           }

     

       547
       480
        
         };

     

       548
       481
        
       

     

       482
       482
       +
         const retryVerification = async (stepNum: number) => {

     

       483
       483
       +
           console.log(`Retrying verification for step ${stepNum + 1}`);

     

       484
       484
       +
           await verifyStep(stepNum);

     

       485
       485
       +
         };

     

       486
       486
       +
       

     

       487
       487
       +
         const continueAnyway = (stepNum: number) => {

     

       488
       488
       +
           console.log(`Continuing anyway for step ${stepNum + 1}`);

     

       489
       489
       +
           updateStepStatus(stepNum, "completed");

     

       490
       490
       +
           setShowContinueAnyway((prev) => ({ ...prev, [stepNum]: false }));

     

       491
       491
       +
       

     

       492
       492
       +
           // Continue with next step if not the last one

     

       493
       493
       +
           if (stepNum < 3) {

     

       494
       494
       +
             continueToNextStep(stepNum + 1);

     

       495
       495
       +
           }

     

       496
       496
       +
         };

     

       497
       497
       +
       

     

       498
       498
       +
         const continueToNextStep = async (stepNum: number) => {

     

       499
       499
       +
           switch (stepNum) {

     

       500
       500
       +
             case 1:

     

       501
       501
       +
               // Continue to data migration

     

       502
       502
       +
               await startDataMigration();

     

       503
       503
       +
               break;

     

       504
       504
       +
             case 2:

     

       505
       505
       +
               // Continue to identity migration

     

       506
       506
       +
               await startIdentityMigration();

     

       507
       507
       +
               break;

     

       508
       508
       +
             case 3:

     

       509
       509
       +
               // Continue to finalization

     

       510
       510
       +
               await startFinalization();

     

       511
       511
       +
               break;

     

       512
       512
       +
           }

     

       513
       513
       +
         };

     

       514
       514
       +
       

     

       515
       515
       +
         const startDataMigration = async () => {

     

       516
       516
       +
           // Step 2: Migrate Data

     

       517
       517
       +
           updateStepStatus(1, "in-progress");

     

       518
       518
       +
           console.log("Starting data migration...");

     

       519
       519
       +
       

     

       520
       520
       +
           try {

     

       521
       521
       +
             // Step 2.1: Migrate Repo

     

       522
       522
       +
             console.log("Data migration: Starting repo migration");

     

       523
       523
       +
             const repoRes = await fetch("/api/migrate/data/repo", {

     

       524
       524
       +
               method: "POST",

     

       525
       525
       +
               headers: { "Content-Type": "application/json" },

     

       526
       526
       +
             });

     

       527
       527
       +
       

     

       528
       528
       +
             console.log("Repo migration: Response status:", repoRes.status);

     

       529
       529
       +
             const repoText = await repoRes.text();

     

       530
       530
       +
             console.log("Repo migration: Raw response:", repoText);

     

       531
       531
       +
       

     

       532
       532
       +
             if (!repoRes.ok) {

     

       533
       533
       +
               try {

     

       534
       534
       +
                 const json = JSON.parse(repoText);

     

       535
       535
       +
                 console.error("Repo migration: Error response:", json);

     

       536
       536
       +
                 throw new Error(json.message || "Failed to migrate repo");

     

       537
       537
       +
               } catch {

     

       538
       538
       +
                 console.error("Repo migration: Non-JSON error response:", repoText);

     

       539
       539
       +
                 throw new Error(repoText || "Failed to migrate repo");

     

       540
       540
       +
               }

     

       541
       541
       +
             }

     

       542
       542
       +
       

     

       543
       543
       +
             // Step 2.2: Migrate Blobs

     

       544
       544
       +
             console.log("Data migration: Starting blob migration");

     

       545
       545
       +
             const blobsRes = await fetch("/api/migrate/data/blobs", {

     

       546
       546
       +
               method: "POST",

     

       547
       547
       +
               headers: { "Content-Type": "application/json" },

     

       548
       548
       +
             });

     

       549
       549
       +
       

     

       550
       550
       +
             console.log("Blob migration: Response status:", blobsRes.status);

     

       551
       551
       +
             const blobsText = await blobsRes.text();

     

       552
       552
       +
             console.log("Blob migration: Raw response:", blobsText);

     

       553
       553
       +
       

     

       554
       554
       +
             if (!blobsRes.ok) {

     

       555
       555
       +
               try {

     

       556
       556
       +
                 const json = JSON.parse(blobsText);

     

       557
       557
       +
                 console.error("Blob migration: Error response:", json);

     

       558
       558
       +
                 throw new Error(json.message || "Failed to migrate blobs");

     

       559
       559
       +
               } catch {

     

       560
       560
       +
                 console.error(

     

       561
       561
       +
                   "Blob migration: Non-JSON error response:",

     

       562
       562
       +
                   blobsText,

     

       563
       563
       +
                 );

     

       564
       564
       +
                 throw new Error(blobsText || "Failed to migrate blobs");

     

       565
       565
       +
               }

     

       566
       566
       +
             }

     

       567
       567
       +
       

     

       568
       568
       +
             // Step 2.3: Migrate Preferences

     

       569
       569
       +
             console.log("Data migration: Starting preferences migration");

     

       570
       570
       +
             const prefsRes = await fetch("/api/migrate/data/prefs", {

     

       571
       571
       +
               method: "POST",

     

       572
       572
       +
               headers: { "Content-Type": "application/json" },

     

       573
       573
       +
             });

     

       574
       574
       +
       

     

       575
       575
       +
             console.log("Preferences migration: Response status:", prefsRes.status);

     

       576
       576
       +
             const prefsText = await prefsRes.text();

     

       577
       577
       +
             console.log("Preferences migration: Raw response:", prefsText);

     

       578
       578
       +
       

     

       579
       579
       +
             if (!prefsRes.ok) {

     

       580
       580
       +
               try {

     

       581
       581
       +
                 const json = JSON.parse(prefsText);

     

       582
       582
       +
                 console.error("Preferences migration: Error response:", json);

     

       583
       583
       +
                 throw new Error(json.message || "Failed to migrate preferences");

     

       584
       584
       +
               } catch {

     

       585
       585
       +
                 console.error(

     

       586
       586
       +
                   "Preferences migration: Non-JSON error response:",

     

       587
       587
       +
                   prefsText,

     

       588
       588
       +
                 );

     

       589
       589
       +
                 throw new Error(prefsText || "Failed to migrate preferences");

     

       590
       590
       +
               }

     

       591
       591
       +
             }

     

       592
       592
       +
       

     

       593
       593
       +
             console.log("Data migration: Starting verification");

     

       594
       594
       +
             updateStepStatus(1, "verifying");

     

       595
       595
       +
             const verified = await verifyStep(1);

     

       596
       596
       +
             console.log("Data migration: Verification result:", verified);

     

       597
       597
       +
             if (!verified) {

     

       598
       598
       +
               console.log(

     

       599
       599
       +
                 "Data migration: Verification failed, waiting for user action",

     

       600
       600
       +
               );

     

       601
       601
       +
               return;

     

       602
       602
       +
             }

     

       603
       603
       +
       

     

       604
       604
       +
             // If verification succeeds, continue to next step

     

       605
       605
       +
             await startIdentityMigration();

     

       606
       606
       +
           } catch (error) {

     

       607
       607
       +
             console.error("Data migration: Error caught:", error);

     

       608
       608
       +
             updateStepStatus(

     

       609
       609
       +
               1,

     

       610
       610
       +
               "error",

     

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

     

       612
       612
       +
             );

     

       613
       613
       +
             throw error;

     

       614
       614
       +
           }

     

       615
       615
       +
         };

     

       616
       616
       +
       

     

       617
       617
       +
         const startIdentityMigration = async () => {

     

       618
       618
       +
           // Step 3: Request Identity Migration

     

       619
       619
       +
           updateStepStatus(2, "in-progress");

     

       620
       620
       +
           console.log("Requesting identity migration...");

     

       621
       621
       +
       

     

       622
       622
       +
           try {

     

       623
       623
       +
             const requestRes = await fetch("/api/migrate/identity/request", {

     

       624
       624
       +
               method: "POST",

     

       625
       625
       +
               headers: { "Content-Type": "application/json" },

     

       626
       626
       +
             });

     

       627
       627
       +
       

     

       628
       628
       +
             console.log("Identity request response status:", requestRes.status);

     

       629
       629
       +
             const requestText = await requestRes.text();

     

       630
       630
       +
             console.log("Identity request response:", requestText);

     

       631
       631
       +
       

     

       632
       632
       +
             if (!requestRes.ok) {

     

       633
       633
       +
               try {

     

       634
       634
       +
                 const json = JSON.parse(requestText);

     

       635
       635
       +
                 throw new Error(

     

       636
       636
       +
                   json.message || "Failed to request identity migration",

     

       637
       637
       +
                 );

     

       638
       638
       +
               } catch {

     

       639
       639
       +
                 throw new Error(

     

       640
       640
       +
                   requestText || "Failed to request identity migration",

     

       641
       641
       +
                 );

     

       642
       642
       +
               }

     

       643
       643
       +
             }

     

       644
       644
       +
       

     

       645
       645
       +
             try {

     

       646
       646
       +
               const jsonData = JSON.parse(requestText);

     

       647
       647
       +
               if (!jsonData.success) {

     

       648
       648
       +
                 throw new Error(

     

       649
       649
       +
                   jsonData.message || "Identity migration request failed",

     

       650
       650
       +
                 );

     

       651
       651
       +
               }

     

       652
       652
       +
               console.log("Identity migration requested successfully");

     

       653
       653
       +
       

     

       654
       654
       +
               // Update step name to prompt for token

     

       655
       655
       +
               setSteps((prevSteps) =>

     

       656
       656
       +
                 prevSteps.map((step, i) =>

     

       657
       657
       +
                   i === 2

     

       658
       658
       +
                     ? {

     

       659
       659
       +
                       ...step,

     

       660
       660
       +
                       name:

     

       661
       661
       +
                         "Enter the token sent to your email to complete identity migration",

     

       662
       662
       +
                     }

     

       663
       663
       +
                     : step

     

       664
       664
       +
                 )

     

       665
       665
       +
               );

     

       666
       666
       +
               // Don't continue with migration - wait for token input

     

       667
       667
       +
               return;

     

       668
       668
       +
             } catch (e) {

     

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

     

       670
       670
       +
               throw new Error(

     

       671
       671
       +
                 "Invalid response from server during identity request",

     

       672
       672
       +
               );

     

       673
       673
       +
             }

     

       674
       674
       +
           } catch (error) {

     

       675
       675
       +
             updateStepStatus(

     

       676
       676
       +
               2,

     

       677
       677
       +
               "error",

     

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

     

       679
       679
       +
             );

     

       680
       680
       +
             throw error;

     

       681
       681
       +
           }

     

       682
       682
       +
         };

     

       683
       683
       +
       

     

       684
       684
       +
         const startFinalization = async () => {

     

       685
       685
       +
           // Step 4: Finalize Migration

     

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

     

       687
       687
       +
           try {

     

       688
       688
       +
             const finalizeRes = await fetch("/api/migrate/finalize", {

     

       689
       689
       +
               method: "POST",

     

       690
       690
       +
               headers: { "Content-Type": "application/json" },

     

       691
       691
       +
             });

     

       692
       692
       +
       

     

       693
       693
       +
             const finalizeData = await finalizeRes.text();

     

       694
       694
       +
             if (!finalizeRes.ok) {

     

       695
       695
       +
               try {

     

       696
       696
       +
                 const json = JSON.parse(finalizeData);

     

       697
       697
       +
                 throw new Error(json.message || "Failed to finalize migration");

     

       698
       698
       +
               } catch {

     

       699
       699
       +
                 throw new Error(finalizeData || "Failed to finalize migration");

     

       700
       700
       +
               }

     

       701
       701
       +
             }

     

       702
       702
       +
       

     

       703
       703
       +
             try {

     

       704
       704
       +
               const jsonData = JSON.parse(finalizeData);

     

       705
       705
       +
               if (!jsonData.success) {

     

       706
       706
       +
                 throw new Error(jsonData.message || "Finalization failed");

     

       707
       707
       +
               }

     

       708
       708
       +
             } catch {

     

       709
       709
       +
               throw new Error("Invalid response from server during finalization");

     

       710
       710
       +
             }

     

       711
       711
       +
       

     

       712
       712
       +
             updateStepStatus(3, "verifying");

     

       713
       713
       +
             const verified = await verifyStep(3);

     

       714
       714
       +
             if (!verified) {

     

       715
       715
       +
               console.log(

     

       716
       716
       +
                 "Finalization: Verification failed, waiting for user action",

     

       717
       717
       +
               );

     

       718
       718
       +
               return;

     

       719
       719
       +
             }

     

       720
       720
       +
           } catch (error) {

     

       721
       721
       +
             updateStepStatus(

     

       722
       722
       +
               3,

     

       723
       723
       +
               "error",

     

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

     

       725
       725
       +
             );

     

       726
       726
       +
             throw error;

     

       727
       727
       +
           }

     

       728
       728
       +
         };

     

       729
       729
       +
       

     

       549
       730
        
         return (

     

       550
       731
        
           <div class="space-y-8">

     

       732
       732
       +
             {/* Migration state alert */}

     

       733
       733
       +
             {migrationState && !migrationState.allowMigration && (

     

       734
       734
       +
               <div

     

       735
       735
       +
                 class={`p-4 rounded-lg border ${

     

       736
       736
       +
                   migrationState.state === "maintenance"

     

       737
       737
       +
                     ? "bg-yellow-50 border-yellow-200 text-yellow-800 dark:bg-yellow-900/20 dark:border-yellow-800 dark:text-yellow-200"

     

       738
       738
       +
                     : "bg-red-50 border-red-200 text-red-800 dark:bg-red-900/20 dark:border-red-800 dark:text-red-200"

     

       739
       739
       +
                 }`}

     

       740
       740
       +
               >

     

       741
       741
       +
                 <div class="flex items-center">

     

       742
       742
       +
                   <div

     

       743
       743
       +
                     class={`mr-3 ${

     

       744
       744
       +
                       migrationState.state === "maintenance"

     

       745
       745
       +
                         ? "text-yellow-600 dark:text-yellow-400"

     

       746
       746
       +
                         : "text-red-600 dark:text-red-400"

     

       747
       747
       +
                     }`}

     

       748
       748
       +
                   >

     

       749
       749
       +
                     {migrationState.state === "maintenance" ? "⚠️" : "🚫"}

     

       750
       750
       +
                   </div>

     

       751
       751
       +
                   <div>

     

       752
       752
       +
                     <h3 class="font-semibold mb-1">

     

       753
       753
       +
                       {migrationState.state === "maintenance"

     

       754
       754
       +
                         ? "Maintenance Mode"

     

       755
       755
       +
                         : "Service Unavailable"}

     

       756
       756
       +
                     </h3>

     

       757
       757
       +
                     <p class="text-sm">{migrationState.message}</p>

     

       758
       758
       +
                   </div>

     

       759
       759
       +
                 </div>

     

       760
       760
       +
               </div>

     

       761
       761
       +
             )}

     

       762
       762
       +
       

     

       551
       763
        
             <div class="space-y-4">

     

       552
       764
        
               {steps.map((step, index) => (

     

       553
       765
        
                 <div key={step.name} class={getStepClasses(step.status)}>

     
···

       567
       779
        
                       {getStepDisplayName(step, index)}

     

       568
       780
        
                     </p>

     

       569
       781
        
                     {step.error && (

     

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

     

       571
       571
       -
                         {(() => {

     

       572
       572
       -
                           try {

     

       573
       573
       -
                             const err = JSON.parse(step.error);

     

       574
       574
       -
                             return err.message || step.error;

     

       575
       575
       -
                           } catch {

     

       576
       576
       -
                             return step.error;

     

       577
       577
       -
                           }

     

       578
       578
       -
                         })()}

     

       579
       579
       -
                       </p>

     

       782
       782
       +
                       <div class="mt-1">

     

       783
       783
       +
                         <p class="text-sm text-red-600 dark:text-red-400">

     

       784
       784
       +
                           {(() => {

     

       785
       785
       +
                             try {

     

       786
       786
       +
                               const err = JSON.parse(step.error);

     

       787
       787
       +
                               return err.message || step.error;

     

       788
       788
       +
                             } catch {

     

       789
       789
       +
                               return step.error;

     

       790
       790
       +
                             }

     

       791
       791
       +
                           })()}

     

       792
       792
       +
                         </p>

     

       793
       793
       +
                         {step.isVerificationError && (

     

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

     

       795
       795
       +
                             <button

     

       796
       796
       +
                               type="button"

     

       797
       797
       +
                               onClick={() => retryVerification(index)}

     

       798
       798
       +
                               class="px-3 py-1 text-xs bg-blue-600 hover:bg-blue-700 text-white rounded transition-colors duration-200 dark:bg-blue-500 dark:hover:bg-blue-400"

     

       799
       799
       +
                             >

     

       800
       800
       +
                               Retry Verification

     

       801
       801
       +
                             </button>

     

       802
       802
       +
                             {showContinueAnyway[index] && (

     

       803
       803
       +
                               <button

     

       804
       804
       +
                                 type="button"

     

       805
       805
       +
                                 onClick={() => continueAnyway(index)}

     

       806
       806
       +
                                 class="px-3 py-1 text-xs bg-white border border-gray-300 text-gray-700 hover:bg-gray-100 rounded transition-colors duration-200

     

       807
       807
       +
                                        dark:bg-gray-800 dark:border-gray-600 dark:text-gray-200 dark:hover:bg-gray-700"

     

       808
       808
       +
                               >

     

       809
       809
       +
                                 Continue Anyway

     

       810
       810
       +
                               </button>

     

       811
       811
       +
                             )}

     

       812
       812
       +
                           </div>

     

       813
       813
       +
                         )}

     

       814
       814
       +
                       </div>

     

       580
       815
        
                     )}

     

       581
       816
        
                     {index === 2 && step.status === "in-progress" &&

     

       582
       582
       -
                       step.name === "Enter the token sent to your email to complete identity migration" && (

     

       817
       817
       +
                       step.name ===

     

       818
       818
       +
                         "Enter the token sent to your email to complete identity migration" &&

     

       819
       819
       +
                       (

     

       583
       820
        
                         <div class="mt-4 space-y-4">

     

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

     

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

     

       822
       822
       +
                             Please check your email for the migration token and enter

     

       823
       823
       +
                             it below:

     

       586
       824
        
                           </p>

     

       587
       825
        
                           <div class="flex space-x-2">

     

       588
       826
        
                             <input

     
···

       601
       839
        
                             </button>

     

       602
       840
        
                           </div>

     

       603
       841
        
                         </div>

     

       604
       604
       -
                       )

     

       605
       605
       -
                     }

     

       842
       842
       +
                       )}

     

       606
       843
        
                   </div>

     

       607
       844
        
                 </div>

     

       608
       845
        
               ))}

     
···

       610
       847
        
       

     

       611
       848
        
             {steps[3].status === "completed" && (

     

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

     

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

     

       614
       614
       -
                   Migration completed successfully! You can now close this page.

     

       850
       850
       +
                 <p class="text-sm text-green-800 dark:text-green-200 pb-2">

     

       851
       851
       +
                   Migration completed successfully! Sign out to finish the process and

     

       852
       852
       +
                   return home.<br />

     

       853
       853
       +
                   Please consider donating to Airport to support server and

     

       854
       854
       +
                   development costs.

     

       615
       855
        
                 </p>

     

       616
       616
       -
                 <button

     

       617
       617
       -
                   type="button"

     

       618
       618
       -
                   onClick={async () => {

     

       619
       619
       -
                     try {

     

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

     

       621
       621
       -
                         method: "POST",

     

       622
       622
       -
                         credentials: "include",

     

       623
       623
       -
                       });

     

       624
       624
       -
                       if (!response.ok) {

     

       625
       625
       -
                         throw new Error("Logout failed");

     

       856
       856
       +
                 <div class="flex space-x-4">

     

       857
       857
       +
                   <button

     

       858
       858
       +
                     type="button"

     

       859
       859
       +
                     onClick={async () => {

     

       860
       860
       +
                       try {

     

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

     

       862
       862
       +
                           method: "POST",

     

       863
       863
       +
                           credentials: "include",

     

       864
       864
       +
                         });

     

       865
       865
       +
                         if (!response.ok) {

     

       866
       866
       +
                           throw new Error("Logout failed");

     

       867
       867
       +
                         }

     

       868
       868
       +
                         globalThis.location.href = "/";

     

       869
       869
       +
                       } catch (error) {

     

       870
       870
       +
                         console.error("Failed to logout:", error);

     

       626
       871
        
                       }

     

       627
       627
       -
                       globalThis.location.href = "/";

     

       628
       628
       -
                     } catch (error) {

     

       629
       629
       -
                       console.error("Failed to logout:", error);

     

       630
       630
       -
                     }

     

       631
       631
       -
                   }}

     

       632
       632
       -
                   class="mt-4 mr-4 px-4 py-2 bg-green-600 hover:bg-green-700 text-white rounded-md transition-colors duration-200"

     

       633
       633
       -
                 >

     

       634
       634
       -
                   Sign Out

     

       635
       635
       -
                 </button>

     

       636
       636
       -
                 <a href="https://ko-fi.com/knotbin" target="_blank" class="mt-4 px-4 py-2 bg-green-600 hover:bg-green-700 text-white rounded-md transition-colors duration-200">

     

       637
       637
       -
                   Donate

     

       638
       638
       -
                 </a>

     

       872
       872
       +
                     }}

     

       873
       873
       +
                     class="px-4 py-2 bg-green-600 hover:bg-green-700 text-white rounded-md transition-colors duration-200 flex items-center space-x-2"

     

       874
       874
       +
                   >

     

       875
       875
       +
                     <svg

     

       876
       876
       +
                       class="w-5 h-5"

     

       877
       877
       +
                       fill="none"

     

       878
       878
       +
                       stroke="currentColor"

     

       879
       879
       +
                       viewBox="0 0 24 24"

     

       880
       880
       +
                     >

     

       881
       881
       +
                       <path

     

       882
       882
       +
                         stroke-linecap="round"

     

       883
       883
       +
                         stroke-linejoin="round"

     

       884
       884
       +
                         stroke-width="2"

     

       885
       885
       +
                         d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"

     

       886
       886
       +
                       />

     

       887
       887
       +
                     </svg>

     

       888
       888
       +
                     <span>Sign Out</span>

     

       889
       889
       +
                   </button>

     

       890
       890
       +
                   <a

     

       891
       891
       +
                     href="https://ko-fi.com/knotbin"

     

       892
       892
       +
                     target="_blank"

     

       893
       893
       +
                     class="px-4 py-2 bg-green-600 hover:bg-green-700 text-white rounded-md transition-colors duration-200 flex items-center space-x-2"

     

       894
       894
       +
                   >

     

       895
       895
       +
                     <svg

     

       896
       896
       +
                       class="w-5 h-5"

     

       897
       897
       +
                       fill="none"

     

       898
       898
       +
                       stroke="currentColor"

     

       899
       899
       +
                       viewBox="0 0 24 24"

     

       900
       900
       +
                     >

     

       901
       901
       +
                       <path

     

       902
       902
       +
                         stroke-linecap="round"

     

       903
       903
       +
                         stroke-linejoin="round"

     

       904
       904
       +
                         stroke-width="2"

     

       905
       905
       +
                         d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"

     

       906
       906
       +
                       />

     

       907
       907
       +
                     </svg>

     

       908
       908
       +
                     <span>Support Us</span>

     

       909
       909
       +
                   </a>

     

       910
       910
       +
                 </div>

     

       639
       911
        
               </div>

     

       640
       912
        
             )}

     

       641
       913
        
           </div>

+61 -7

islands/MigrationSetup.tsx

···

       33
       33
        
       }

     

       34
       34
        
       

     

       35
       35
        
       /**

     

       36
       36
       +
        * The migration state info.

     

       37
       37
       +
        * @type {MigrationStateInfo}

     

       38
       38
       +
        */

     

       39
       39
       +
       interface MigrationStateInfo {

     

       40
       40
       +
         state: "up" | "issue" | "maintenance";

     

       41
       41
       +
         message: string;

     

       42
       42
       +
         allowMigration: boolean;

     

       43
       43
       +
       }

     

       44
       44
       +
       

     

       45
       45
       +
       /**

     

       36
       46
        
        * The migration setup component.

     

       37
       47
        
        * @param props - The migration setup props

     

       38
       48
        
        * @returns The migration setup component

     
···

       54
       64
        
         const [showConfirmation, setShowConfirmation] = useState(false);

     

       55
       65
        
         const [confirmationText, setConfirmationText] = useState("");

     

       56
       66
        
         const [passport, setPassport] = useState<UserPassport | null>(null);

     

       67
       67
       +
         const [migrationState, setMigrationState] = useState<MigrationStateInfo | null>(null);

     

       57
       68
        
       

     

       58
       69
        
         const ensureServiceUrl = (url: string): string => {

     

       59
       70
        
           if (!url) return url;

     
···

       70
       81
        
         useEffect(() => {

     

       71
       82
        
           if (!IS_BROWSER) return;

     

       72
       83
        
       

     

       73
       73
       -
           const fetchPassport = async () => {

     

       84
       84
       +
           const fetchInitialData = async () => {

     

       74
       85
        
             try {

     

       86
       86
       +
               // Check migration state first

     

       87
       87
       +
               const migrationResponse = await fetch("/api/migration-state");

     

       88
       88
       +
               if (migrationResponse.ok) {

     

       89
       89
       +
                 const migrationData = await migrationResponse.json();

     

       90
       90
       +
                 setMigrationState(migrationData);

     

       91
       91
       +
               }

     

       92
       92
       +
       

     

       93
       93
       +
               // Fetch user passport

     

       75
       94
        
               const response = await fetch("/api/me", {

     

       76
       95
        
                 credentials: "include",

     

       77
       96
        
               });

     
···

       83
       102
        
                 // Get PDS URL from the current service

     

       84
       103
        
                 const pdsResponse = await fetch(`/api/resolve-pds?did=${userData.did}`);

     

       85
       104
        
                 const pdsData = await pdsResponse.json();

     

       86
       86
       -
                 

     

       105
       105
       +
       

     

       87
       106
        
                 setPassport({

     

       88
       107
        
                   did: userData.did,

     

       89
       108
        
                   handle: userData.handle,

     
···

       92
       111
        
                 });

     

       93
       112
        
               }

     

       94
       113
        
             } catch (error) {

     

       95
       95
       -
               console.error("Failed to fetch passport:", error);

     

       114
       114
       +
               console.error("Failed to fetch initial data:", error);

     

       96
       115
        
             }

     

       97
       116
        
           };

     

       98
       117
        
       

     

       99
       99
       -
           fetchPassport();

     

       118
       118
       +
           fetchInitialData();

     

       100
       119
        
         }, []);

     

       101
       120
        
       

     

       102
       121
        
         const checkServerDescription = async (serviceUrl: string) => {

     
···

       144
       163
        
         const handleSubmit = (e: Event) => {

     

       145
       164
        
           e.preventDefault();

     

       146
       165
        
       

     

       166
       166
       +
           // Check migration state first

     

       167
       167
       +
           if (migrationState && !migrationState.allowMigration) {

     

       168
       168
       +
             setError(migrationState.message);

     

       169
       169
       +
             return;

     

       170
       170
       +
           }

     

       171
       171
       +
       

     

       147
       172
        
           if (!service || !handlePrefix || !email || !password) {

     

       148
       173
        
             setError("Please fill in all required fields");

     

       149
       174
        
             return;

     
···

       158
       183
        
         };

     

       159
       184
        
       

     

       160
       185
        
         const handleConfirmation = () => {

     

       186
       186
       +
           // Double-check migration state before proceeding

     

       187
       187
       +
           if (migrationState && !migrationState.allowMigration) {

     

       188
       188
       +
             setError(migrationState.message);

     

       189
       189
       +
             return;

     

       190
       190
       +
           }

     

       191
       191
       +
       

     

       161
       192
        
           if (confirmationText !== "MIGRATE") {

     

       162
       193
        
             setError("Please type 'MIGRATE' to confirm");

     

       163
       194
        
             return;

     
···

       189
       220
        
             <div class="absolute top-2 left-4 text-blue-500 text-sm font-mono">TERMINAL 1</div>

     

       190
       221
        
             <div class="absolute top-2 right-4 text-blue-500 text-sm font-mono">GATE M1</div>

     

       191
       222
        
       

     

       223
       223
       +
             {/* Migration state alert */}

     

       224
       224
       +
             {migrationState && !migrationState.allowMigration && (

     

       225
       225
       +
               <div class={`mb-6 mt-4 p-4 rounded-lg border ${

     

       226
       226
       +
                 migrationState.state === "maintenance"

     

       227
       227
       +
                   ? "bg-yellow-50 border-yellow-200 text-yellow-800 dark:bg-yellow-900/20 dark:border-yellow-800 dark:text-yellow-200"

     

       228
       228
       +
                   : "bg-red-50 border-red-200 text-red-800 dark:bg-red-900/20 dark:border-red-800 dark:text-red-200"

     

       229
       229
       +
               }`}>

     

       230
       230
       +
                 <div class="flex items-center">

     

       231
       231
       +
                   <div class={`mr-3 ${

     

       232
       232
       +
                     migrationState.state === "maintenance" ? "text-yellow-600 dark:text-yellow-400" : "text-red-600 dark:text-red-400"

     

       233
       233
       +
                   }`}>

     

       234
       234
       +
                     {migrationState.state === "maintenance" ? "⚠️" : "🚫"}

     

       235
       235
       +
                   </div>

     

       236
       236
       +
                   <div>

     

       237
       237
       +
                     <h3 class="font-semibold mb-1">

     

       238
       238
       +
                       {migrationState.state === "maintenance" ? "Maintenance Mode" : "Service Unavailable"}

     

       239
       239
       +
                     </h3>

     

       240
       240
       +
                     <p class="text-sm">{migrationState.message}</p>

     

       241
       241
       +
                   </div>

     

       242
       242
       +
                 </div>

     

       243
       243
       +
               </div>

     

       244
       244
       +
             )}

     

       245
       245
       +
       

     

       192
       246
        
             <div class="text-center mb-8 relative">

     

       193
       247
        
               <p class="text-gray-600 dark:text-gray-400 mt-4">Please complete your migration check-in</p>

     

       194
       248
        
               <div class="mt-2 text-sm text-gray-500 dark:text-gray-400 font-mono">FLIGHT: MIG-2024</div>

     
···

       226
       280
        
       

     

       227
       281
        
             <form onSubmit={handleSubmit} class="space-y-6">

     

       228
       282
        
               {error && (

     

       229
       229
       -
                 <div class="bg-red-50 dark:bg-red-900 rounded-lg">

     

       283
       283
       +
                 <div class="bg-red-50 dark:bg-red-900 rounded-lg ">

     

       230
       284
        
                   <p class="text-red-800 dark:text-red-200 flex items-center">

     

       231
       285
        
                     <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">

     

       232
       286
        
                       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path>

     
···

       398
       452
        
       

     

       399
       453
        
               <button

     

       400
       454
        
                 type="submit"

     

       401
       401
       -
                 disabled={isLoading}

     

       455
       455
       +
                 disabled={isLoading || Boolean(migrationState && !migrationState.allowMigration)}

     

       402
       456
        
                 class="w-full flex justify-center items-center py-3 px-4 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 disabled:opacity-50 disabled:cursor-not-allowed"

     

       403
       457
        
               >

     

       404
       458
        
                 <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">

     
···

       424
       478
        
                   <div class="text-center mb-4 mt-6">

     

       425
       479
        
                     <h3 class="text-2xl font-bold text-red-600 mb-2 tracking-wide">Final Boarding Call</h3>

     

       426
       480
        
                     <p class="text-gray-700 dark:text-gray-300 mb-2 text-base">

     

       427
       427
       -
                       <span class="font-semibold text-red-500">Warning:</span> This migration process can be <strong>irreversible</strong>.<br />Airport is in <strong>alpha</strong> currently, and we don't recommend it for main accounts. Migrate at your own risk. We reccomend backing up your data before proceeding.

     

       481
       481
       +
                       <span class="font-semibold text-red-500">Warning:</span> This migration is <strong>irreversible</strong> if coming from Bluesky servers.<br />Bluesky does not recommend it for main accounts. Migrate at your own risk. We reccomend backing up your data before proceeding.

     

       428
       482
        
                     </p>

     

       429
       483
        
                     <p class="text-gray-700 dark:text-gray-300 mb-4 text-base">

     

       430
       484
        
                       Please type <span class="font-mono font-bold text-blue-600">MIGRATE</span> below to confirm and proceed.

lib/check-dids.ts

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       export async function checkDidsMatch(req: Request): Promise<boolean> {

     

       4
       4
       +
         const oldSession = await getSession(req, undefined, false);

     

       5
       5
       +
         const newSession = await getSession(req, undefined, true);

     

       6
       6
       +
         return oldSession.did === newSession.did;

     

       7
       7
       +
       }

+70

lib/migration-state.ts

···

       1
       1
       +
       /**

     

       2
       2
       +
        * Migration state types and utilities for controlling migration availability.

     

       3
       3
       +
        */

     

       4
       4
       +
       

     

       5
       5
       +
       export type MigrationState = "up" | "issue" | "maintenance";

     

       6
       6
       +
       

     

       7
       7
       +
       export interface MigrationStateInfo {

     

       8
       8
       +
         state: MigrationState;

     

       9
       9
       +
         message: string;

     

       10
       10
       +
         allowMigration: boolean;

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       /**

     

       14
       14
       +
        * Get the current migration state from environment variables.

     

       15
       15
       +
        * @returns The migration state information

     

       16
       16
       +
        */

     

       17
       17
       +
       export function getMigrationState(): MigrationStateInfo {

     

       18
       18
       +
         const state = (Deno.env.get("MIGRATION_STATE") || "up").toLowerCase() as MigrationState;

     

       19
       19
       +
       

     

       20
       20
       +
         switch (state) {

     

       21
       21
       +
           case "issue":

     

       22
       22
       +
             return {

     

       23
       23
       +
               state: "issue",

     

       24
       24
       +
               message: "Migration services are temporarily unavailable as we investigate an issue. Please try again later.",

     

       25
       25
       +
               allowMigration: false,

     

       26
       26
       +
             };

     

       27
       27
       +
       

     

       28
       28
       +
           case "maintenance":

     

       29
       29
       +
             return {

     

       30
       30
       +
               state: "maintenance",

     

       31
       31
       +
               message: "Migration services are temporarily unavailable for maintenance. Please try again later.",

     

       32
       32
       +
               allowMigration: false,

     

       33
       33
       +
             };

     

       34
       34
       +
       

     

       35
       35
       +
           case "up":

     

       36
       36
       +
           default:

     

       37
       37
       +
             return {

     

       38
       38
       +
               state: "up",

     

       39
       39
       +
               message: "Migration services are operational.",

     

       40
       40
       +
               allowMigration: true,

     

       41
       41
       +
             };

     

       42
       42
       +
         }

     

       43
       43
       +
       }

     

       44
       44
       +
       

     

       45
       45
       +
       /**

     

       46
       46
       +
        * Check if migrations are currently allowed.

     

       47
       47
       +
        * @returns True if migrations are allowed, false otherwise

     

       48
       48
       +
        */

     

       49
       49
       +
       export function isMigrationAllowed(): boolean {

     

       50
       50
       +
         return getMigrationState().allowMigration;

     

       51
       51
       +
       }

     

       52
       52
       +
       

     

       53
       53
       +
       /**

     

       54
       54
       +
        * Get a user-friendly message for the current migration state.

     

       55
       55
       +
        * @returns The message to display to users

     

       56
       56
       +
        */

     

       57
       57
       +
       export function getMigrationStateMessage(): string {

     

       58
       58
       +
         return getMigrationState().message;

     

       59
       59
       +
       }

     

       60
       60
       +
       

     

       61
       61
       +
       /**

     

       62
       62
       +
        * Throw an error if migrations are not allowed.

     

       63
       63
       +
        * Used in API endpoints to prevent migration operations when disabled.

     

       64
       64
       +
        */

     

       65
       65
       +
       export function assertMigrationAllowed(): void {

     

       66
       66
       +
         const stateInfo = getMigrationState();

     

       67
       67
       +
         if (!stateInfo.allowMigration) {

     

       68
       68
       +
           throw new Error(stateInfo.message);

     

       69
       69
       +
         }

     

       70
       70
       +
       }

+31 -10

lib/sessions.ts

···

       1
       1
        
       import { Agent } from "npm:@atproto/api";

     

       2
       2
       -
       import { OauthSession, CredentialSession } from "./types.ts";

     

       3
       3
       -
       import { getCredentialSession, getCredentialSessionAgent } from "./cred/sessions.ts";

     

       2
       2
       +
       import { CredentialSession, OauthSession } from "./types.ts";

     

       3
       3
       +
       import {

     

       4
       4
       +
         getCredentialSession,

     

       5
       5
       +
         getCredentialSessionAgent,

     

       6
       6
       +
       } from "./cred/sessions.ts";

     

       4
       7
        
       import { getOauthSession, getOauthSessionAgent } from "./oauth/sessions.ts";

     

       5
       8
        
       import { IronSession } from "npm:iron-session";

     

       6
       9
        
       

     
···

       14
       17
        
       export async function getSession(

     

       15
       18
        
         req: Request,

     

       16
       19
        
         res: Response = new Response(),

     

       17
       17
       -
         isMigration: boolean = false

     

       20
       20
       +
         isMigration: boolean = false,

     

       18
       21
        
       ): Promise<IronSession<OauthSession | CredentialSession>> {

     

       19
       22
        
         if (isMigration) {

     

       20
       23
        
           return await getCredentialSession(req, res, true);

     
···

       23
       26
        
         const credentialSession = await getCredentialSession(req, res);

     

       24
       27
        
       

     

       25
       28
        
         if (oauthSession.did) {

     

       26
       26
       -
           console.log("Oauth session found")

     

       29
       29
       +
           console.log("Oauth session found");

     

       27
       30
        
           return oauthSession;

     

       28
       31
        
         }

     

       29
       32
        
         if (credentialSession.did) {

     
···

       43
       46
        
       export async function getSessionAgent(

     

       44
       47
        
         req: Request,

     

       45
       48
        
         res: Response = new Response(),

     

       46
       46
       -
         isMigration: boolean = false

     

       49
       49
       +
         isMigration: boolean = false,

     

       47
       50
        
       ): Promise<Agent | null> {

     

       48
       51
        
         if (isMigration) {

     

       49
       52
        
           return await getCredentialSessionAgent(req, res, isMigration);

     

       50
       53
        
         }

     

       51
       54
        
       

     

       52
       55
        
         const oauthAgent = await getOauthSessionAgent(req);

     

       53
       53
       -
         const credentialAgent = await getCredentialSessionAgent(req, res, isMigration);

     

       56
       56
       +
         const credentialAgent = await getCredentialSessionAgent(

     

       57
       57
       +
           req,

     

       58
       58
       +
           res,

     

       59
       59
       +
           isMigration,

     

       60
       60
       +
         );

     

       54
       61
        
       

     

       55
       62
        
         if (oauthAgent) {

     

       56
       63
        
           return oauthAgent;

     
···

       66
       73
        
       /**

     

       67
       74
        
        * Destroy all sessions for the given request.

     

       68
       75
        
        * @param req - The request object

     

       76
       76
       +
        * @param res - The response object

     

       69
       77
        
        */

     

       70
       70
       -
       export async function destroyAllSessions(req: Request) {

     

       71
       71
       -
         const oauthSession = await getOauthSession(req);

     

       72
       72
       -
         const credentialSession = await getCredentialSession(req);

     

       73
       73
       -
         const migrationSession = await getCredentialSession(req, new Response(), true);

     

       78
       78
       +
       export async function destroyAllSessions(

     

       79
       79
       +
         req: Request,

     

       80
       80
       +
         res?: Response,

     

       81
       81
       +
       ): Promise<Response> {

     

       82
       82
       +
         const response = res || new Response();

     

       83
       83
       +
         const oauthSession = await getOauthSession(req, response);

     

       84
       84
       +
         const credentialSession = await getCredentialSession(req, res);

     

       85
       85
       +
         const migrationSession = await getCredentialSession(

     

       86
       86
       +
           req,

     

       87
       87
       +
           res,

     

       88
       88
       +
           true,

     

       89
       89
       +
         );

     

       74
       90
        
       

     

       75
       91
        
         if (oauthSession.did) {

     

       76
       92
        
           oauthSession.destroy();

     
···

       79
       95
        
           credentialSession.destroy();

     

       80
       96
        
         }

     

       81
       97
        
         if (migrationSession.did) {

     

       98
       98
       +
           console.log("DESTROYING MIGRATION SESSION", migrationSession);

     

       82
       99
        
           migrationSession.destroy();

     

       100
       100
       +
         } else {

     

       101
       101
       +
           console.log("MIGRATION SESSION NOT FOUND", migrationSession);

     

       83
       102
        
         }

     

       103
       103
       +
       

     

       104
       104
       +
         return response;

     

       84
       105
        
       }

+1 -1

lib/storage.ts

···

       3
       3
        
         NodeSavedSessionStore,

     

       4
       4
        
         NodeSavedState,

     

       5
       5
        
         NodeSavedStateStore,

     

       6
       6
       -
       } from "jsr:@bigmoves/atproto-oauth-client";

     

       6
       6
       +
       } from "@bigmoves/atproto-oauth-client";

     

       7
       7
        
       

     

       8
       8
        
       /**

     

       9
       9
        
        * The state store for sessions.

routes/.DS_Store

This is a binary file and will not be displayed.

routes/api/.DS_Store

This is a binary file and will not be displayed.

+4 -4

routes/api/logout.ts

···

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

     

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

     

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

     

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

     

       4
       4
        
       

     
···

       13
       13
        
             if (session.did) {

     

       14
       14
        
               // Try to revoke both types of sessions - the one that doesn't exist will just no-op

     

       15
       15
        
               await Promise.all([

     

       16
       16
       -
                 oauthClient.revoke(session.did).catch(console.error)

     

       16
       16
       +
                 oauthClient.revoke(session.did).catch(console.error),

     

       17
       17
        
               ]);

     

       18
       18
        
               // Then destroy the iron session

     

       19
       19
        
               session.destroy();

     

       20
       20
        
             }

     

       21
       21
        
       

     

       22
       22
        
             // Destroy all sessions including migration session

     

       23
       23
       -
             await destroyAllSessions(req);

     

       23
       23
       +
             const result = await destroyAllSessions(req, response);

     

       24
       24
        
       

     

       25
       25
       -
             return response;

     

       25
       25
       +
             return result;

     

       26
       26
        
           } catch (error: unknown) {

     

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

     

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

+6 -2

routes/api/migrate/create.ts

···

       2
       2
        
       import { setCredentialSession } from "../../../lib/cred/sessions.ts";

     

       3
       3
        
       import { Agent } from "@atproto/api";

     

       4
       4
        
       import { define } from "../../../utils.ts";

     

       5
       5
       +
       import { assertMigrationAllowed } from "../../../lib/migration-state.ts";

     

       5
       6
        
       

     

       6
       7
        
       /**

     

       7
       8
        
        * Handle account creation

     
···

       19
       20
        
         async POST(ctx) {

     

       20
       21
        
           const res = new Response();

     

       21
       22
        
           try {

     

       23
       23
       +
             // Check if migrations are currently allowed

     

       24
       24
       +
             assertMigrationAllowed();

     

       25
       25
       +
       

     

       22
       26
        
             const body = await ctx.req.json();

     

       23
       27
        
             const serviceUrl = body.service;

     

       24
       28
        
             const newHandle = body.handle;

     
···

       41
       45
        
               return new Response("Could not create new agent", { status: 400 });

     

       42
       46
        
             }

     

       43
       47
        
       

     

       44
       44
       -
             console.log("getting did")

     

       48
       48
       +
             console.log("getting did");

     

       45
       49
        
             const session = await oldAgent.com.atproto.server.getSession();

     

       46
       50
        
             const accountDid = session.data.did;

     

       47
       47
       -
             console.log("got did")

     

       51
       51
       +
             console.log("got did");

     

       48
       52
        
             const describeRes = await newAgent.com.atproto.server.describeServer();

     

       49
       53
        
             const newServerDid = describeRes.data.did;

     

       50
       54
        
             const inviteRequired = describeRes.data.inviteCodeRequired ?? false;

+187 -49

routes/api/migrate/data/blobs.ts

···

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

     

       2
       2
       +
       import { checkDidsMatch } from "../../../../lib/check-dids.ts";

     

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

     

       4
       4
       +
       import { assertMigrationAllowed } from "../../../../lib/migration-state.ts";

     

       3
       5
        
       

     

       4
       6
        
       export const handler = define.handlers({

     

       5
       7
        
         async POST(ctx) {

     

       6
       8
        
           const res = new Response();

     

       7
       9
        
           try {

     

       10
       10
       +
             // Check if migrations are currently allowed

     

       11
       11
       +
             assertMigrationAllowed();

     

       12
       12
       +
       

     

       8
       13
        
             console.log("Blob migration: Starting session retrieval");

     

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

     

       10
       15
        
             console.log("Blob migration: Got old agent:", !!oldAgent);

     
···

       37
       42
        
               );

     

       38
       43
        
             }

     

       39
       44
        
       

     

       45
       45
       +
             // Verify DIDs match between sessions

     

       46
       46
       +
             const didsMatch = await checkDidsMatch(ctx.req);

     

       47
       47
       +
             if (!didsMatch) {

     

       48
       48
       +
               return new Response(

     

       49
       49
       +
                 JSON.stringify({

     

       50
       50
       +
                   success: false,

     

       51
       51
       +
                   message: "Invalid state, original and target DIDs do not match",

     

       52
       52
       +
                 }),

     

       53
       53
       +
                 {

     

       54
       54
       +
                   status: 400,

     

       55
       55
       +
                   headers: { "Content-Type": "application/json" },

     

       56
       56
       +
                 },

     

       57
       57
       +
               );

     

       58
       58
       +
             }

     

       59
       59
       +
       

     

       40
       60
        
             // Migrate blobs

     

       41
       61
        
             const migrationLogs: string[] = [];

     

       42
       62
        
             const migratedBlobs: string[] = [];

     
···

       48
       68
        
       

     

       49
       69
        
             const startTime = Date.now();

     

       50
       70
        
             console.log(`[${new Date().toISOString()}] Starting blob migration...`);

     

       51
       51
       -
             migrationLogs.push(`[${new Date().toISOString()}] Starting blob migration...`);

     

       71
       71
       +
             migrationLogs.push(

     

       72
       72
       +
               `[${new Date().toISOString()}] Starting blob migration...`,

     

       73
       73
       +
             );

     

       52
       74
        
       

     

       53
       75
        
             // First count total blobs

     

       54
       76
        
             console.log(`[${new Date().toISOString()}] Starting blob count...`);

     

       55
       55
       -
             migrationLogs.push(`[${new Date().toISOString()}] Starting blob count...`);

     

       77
       77
       +
             migrationLogs.push(

     

       78
       78
       +
               `[${new Date().toISOString()}] Starting blob count...`,

     

       79
       79
       +
             );

     

       56
       80
        
       

     

       57
       81
        
             const session = await oldAgent.com.atproto.server.getSession();

     

       58
       82
        
             const accountDid = session.data.did;

     

       59
       59
       -
             

     

       83
       83
       +
       

     

       60
       84
        
             do {

     

       61
       85
        
               const pageStartTime = Date.now();

     

       62
       62
       -
               console.log(`[${new Date().toISOString()}] Counting blobs on page ${pageCount + 1}...`);

     

       63
       63
       -
               migrationLogs.push(`[${new Date().toISOString()}] Counting blobs on page ${pageCount + 1}...`);

     

       86
       86
       +
               console.log(

     

       87
       87
       +
                 `[${new Date().toISOString()}] Counting blobs on page ${

     

       88
       88
       +
                   pageCount + 1

     

       89
       89
       +
                 }...`,

     

       90
       90
       +
               );

     

       91
       91
       +
               migrationLogs.push(

     

       92
       92
       +
                 `[${new Date().toISOString()}] Counting blobs on page ${

     

       93
       93
       +
                   pageCount + 1

     

       94
       94
       +
                 }...`,

     

       95
       95
       +
               );

     

       64
       96
        
               const listedBlobs = await oldAgent.com.atproto.sync.listBlobs({

     

       65
       97
        
                 did: accountDid,

     

       66
       98
        
                 cursor: blobCursor,

     
···

       69
       101
        
               const newBlobs = listedBlobs.data.cids.length;

     

       70
       102
        
               totalBlobs += newBlobs;

     

       71
       103
        
               const pageTime = Date.now() - pageStartTime;

     

       72
       72
       -
               

     

       73
       73
       -
               console.log(`[${new Date().toISOString()}] Found ${newBlobs} blobs on page ${pageCount + 1} in ${pageTime/1000} seconds, total so far: ${totalBlobs}`);

     

       74
       74
       -
               migrationLogs.push(`[${new Date().toISOString()}] Found ${newBlobs} blobs on page ${pageCount + 1} in ${pageTime/1000} seconds, total so far: ${totalBlobs}`);

     

       75
       75
       -
               

     

       104
       104
       +
       

     

       105
       105
       +
               console.log(

     

       106
       106
       +
                 `[${new Date().toISOString()}] Found ${newBlobs} blobs on page ${

     

       107
       107
       +
                   pageCount + 1

     

       108
       108
       +
                 } in ${pageTime / 1000} seconds, total so far: ${totalBlobs}`,

     

       109
       109
       +
               );

     

       110
       110
       +
               migrationLogs.push(

     

       111
       111
       +
                 `[${new Date().toISOString()}] Found ${newBlobs} blobs on page ${

     

       112
       112
       +
                   pageCount + 1

     

       113
       113
       +
                 } in ${pageTime / 1000} seconds, total so far: ${totalBlobs}`,

     

       114
       114
       +
               );

     

       115
       115
       +
       

     

       76
       116
        
               pageCount++;

     

       77
       117
        
               blobCursor = listedBlobs.data.cursor;

     

       78
       118
        
             } while (blobCursor);

     

       79
       119
        
       

     

       80
       80
       -
             console.log(`[${new Date().toISOString()}] Total blobs to migrate: ${totalBlobs}`);

     

       81
       81
       -
             migrationLogs.push(`[${new Date().toISOString()}] Total blobs to migrate: ${totalBlobs}`);

     

       120
       120
       +
             console.log(

     

       121
       121
       +
               `[${new Date().toISOString()}] Total blobs to migrate: ${totalBlobs}`,

     

       122
       122
       +
             );

     

       123
       123
       +
             migrationLogs.push(

     

       124
       124
       +
               `[${new Date().toISOString()}] Total blobs to migrate: ${totalBlobs}`,

     

       125
       125
       +
             );

     

       82
       126
        
       

     

       83
       127
        
             // Reset cursor for actual migration

     

       84
       128
        
             blobCursor = undefined;

     
···

       87
       131
        
       

     

       88
       132
        
             do {

     

       89
       133
        
               const pageStartTime = Date.now();

     

       90
       90
       -
               console.log(`[${new Date().toISOString()}] Fetching blob list page ${pageCount + 1}...`);

     

       91
       91
       -
               migrationLogs.push(`[${new Date().toISOString()}] Fetching blob list page ${pageCount + 1}...`);

     

       134
       134
       +
               console.log(

     

       135
       135
       +
                 `[${new Date().toISOString()}] Fetching blob list page ${

     

       136
       136
       +
                   pageCount + 1

     

       137
       137
       +
                 }...`,

     

       138
       138
       +
               );

     

       139
       139
       +
               migrationLogs.push(

     

       140
       140
       +
                 `[${new Date().toISOString()}] Fetching blob list page ${

     

       141
       141
       +
                   pageCount + 1

     

       142
       142
       +
                 }...`,

     

       143
       143
       +
               );

     

       92
       144
        
       

     

       93
       145
        
               const listedBlobs = await oldAgent.com.atproto.sync.listBlobs({

     

       94
       146
        
                 did: accountDid,

     
···

       96
       148
        
               });

     

       97
       149
        
       

     

       98
       150
        
               const pageTime = Date.now() - pageStartTime;

     

       99
       99
       -
               console.log(`[${new Date().toISOString()}] Found ${listedBlobs.data.cids.length} blobs on page ${pageCount + 1} in ${pageTime/1000} seconds`);

     

       100
       100
       -
               migrationLogs.push(`[${new Date().toISOString()}] Found ${listedBlobs.data.cids.length} blobs on page ${pageCount + 1} in ${pageTime/1000} seconds`);

     

       151
       151
       +
               console.log(

     

       152
       152
       +
                 `[${

     

       153
       153
       +
                   new Date().toISOString()

     

       154
       154
       +
                 }] Found ${listedBlobs.data.cids.length} blobs on page ${

     

       155
       155
       +
                   pageCount + 1

     

       156
       156
       +
                 } in ${pageTime / 1000} seconds`,

     

       157
       157
       +
               );

     

       158
       158
       +
               migrationLogs.push(

     

       159
       159
       +
                 `[${

     

       160
       160
       +
                   new Date().toISOString()

     

       161
       161
       +
                 }] Found ${listedBlobs.data.cids.length} blobs on page ${

     

       162
       162
       +
                   pageCount + 1

     

       163
       163
       +
                 } in ${pageTime / 1000} seconds`,

     

       164
       164
       +
               );

     

       101
       165
        
       

     

       102
       166
        
               blobCursor = listedBlobs.data.cursor;

     

       103
       167
        
       

     

       104
       168
        
               for (const cid of listedBlobs.data.cids) {

     

       105
       169
        
                 try {

     

       106
       170
        
                   const blobStartTime = Date.now();

     

       107
       107
       -
                   console.log(`[${new Date().toISOString()}] Starting migration for blob ${cid} (${processedBlobs + 1} of ${totalBlobs})...`);

     

       108
       108
       -
                   migrationLogs.push(`[${new Date().toISOString()}] Starting migration for blob ${cid} (${processedBlobs + 1} of ${totalBlobs})...`);

     

       171
       171
       +
                   console.log(

     

       172
       172
       +
                     `[${

     

       173
       173
       +
                       new Date().toISOString()

     

       174
       174
       +
                     }] Starting migration for blob ${cid} (${

     

       175
       175
       +
                       processedBlobs + 1

     

       176
       176
       +
                     } of ${totalBlobs})...`,

     

       177
       177
       +
                   );

     

       178
       178
       +
                   migrationLogs.push(

     

       179
       179
       +
                     `[${

     

       180
       180
       +
                       new Date().toISOString()

     

       181
       181
       +
                     }] Starting migration for blob ${cid} (${

     

       182
       182
       +
                       processedBlobs + 1

     

       183
       183
       +
                     } of ${totalBlobs})...`,

     

       184
       184
       +
                   );

     

       109
       185
        
       

     

       110
       186
        
                   const blobRes = await oldAgent.com.atproto.sync.getBlob({

     

       111
       187
        
                     did: accountDid,

     
···

       119
       195
        
       

     

       120
       196
        
                   const size = parseInt(contentLength, 10);

     

       121
       197
        
                   if (isNaN(size)) {

     

       122
       122
       -
                     throw new Error(`Blob ${cid} has invalid content length: ${contentLength}`);

     

       198
       198
       +
                     throw new Error(

     

       199
       199
       +
                       `Blob ${cid} has invalid content length: ${contentLength}`,

     

       200
       200
       +
                     );

     

       123
       201
        
                   }

     

       124
       202
        
       

     

       125
       203
        
                   const MAX_SIZE = 200 * 1024 * 1024; // 200MB

     

       126
       204
        
                   if (size > MAX_SIZE) {

     

       127
       127
       -
                     throw new Error(`Blob ${cid} exceeds maximum size limit (${size} bytes)`);

     

       205
       205
       +
                     throw new Error(

     

       206
       206
       +
                       `Blob ${cid} exceeds maximum size limit (${size} bytes)`,

     

       207
       207
       +
                     );

     

       128
       208
        
                   }

     

       129
       209
        
       

     

       130
       130
       -
                   console.log(`[${new Date().toISOString()}] Downloading blob ${cid} (${size} bytes)...`);

     

       131
       131
       -
                   migrationLogs.push(`[${new Date().toISOString()}] Downloading blob ${cid} (${size} bytes)...`);

     

       210
       210
       +
                   console.log(

     

       211
       211
       +
                     `[${

     

       212
       212
       +
                       new Date().toISOString()

     

       213
       213
       +
                     }] Downloading blob ${cid} (${size} bytes)...`,

     

       214
       214
       +
                   );

     

       215
       215
       +
                   migrationLogs.push(

     

       216
       216
       +
                     `[${

     

       217
       217
       +
                       new Date().toISOString()

     

       218
       218
       +
                     }] Downloading blob ${cid} (${size} bytes)...`,

     

       219
       219
       +
                   );

     

       132
       220
        
       

     

       133
       221
        
                   if (!blobRes.data) {

     

       134
       134
       -
                     throw new Error(`Failed to download blob ${cid}: No data received`);

     

       222
       222
       +
                     throw new Error(

     

       223
       223
       +
                       `Failed to download blob ${cid}: No data received`,

     

       224
       224
       +
                     );

     

       135
       225
        
                   }

     

       136
       226
        
       

     

       137
       137
       -
                   console.log(`[${new Date().toISOString()}] Uploading blob ${cid} to new account...`);

     

       138
       138
       -
                   migrationLogs.push(`[${new Date().toISOString()}] Uploading blob ${cid} to new account...`);

     

       227
       227
       +
                   console.log(

     

       228
       228
       +
                     `[${

     

       229
       229
       +
                       new Date().toISOString()

     

       230
       230
       +
                     }] Uploading blob ${cid} to new account...`,

     

       231
       231
       +
                   );

     

       232
       232
       +
                   migrationLogs.push(

     

       233
       233
       +
                     `[${

     

       234
       234
       +
                       new Date().toISOString()

     

       235
       235
       +
                     }] Uploading blob ${cid} to new account...`,

     

       236
       236
       +
                   );

     

       139
       237
        
       

     

       140
       238
        
                   try {

     

       141
       239
        
                     await newAgent.com.atproto.repo.uploadBlob(blobRes.data);

     

       142
       240
        
                     const blobTime = Date.now() - blobStartTime;

     

       143
       143
       -
                     console.log(`[${new Date().toISOString()}] Successfully migrated blob ${cid} in ${blobTime/1000} seconds`);

     

       144
       144
       -
                     migrationLogs.push(`[${new Date().toISOString()}] Successfully migrated blob ${cid} in ${blobTime/1000} seconds`);

     

       241
       241
       +
                     console.log(

     

       242
       242
       +
                       `[${

     

       243
       243
       +
                         new Date().toISOString()

     

       244
       244
       +
                       }] Successfully migrated blob ${cid} in ${

     

       245
       245
       +
                         blobTime / 1000

     

       246
       246
       +
                       } seconds`,

     

       247
       247
       +
                     );

     

       248
       248
       +
                     migrationLogs.push(

     

       249
       249
       +
                       `[${

     

       250
       250
       +
                         new Date().toISOString()

     

       251
       251
       +
                       }] Successfully migrated blob ${cid} in ${

     

       252
       252
       +
                         blobTime / 1000

     

       253
       253
       +
                       } seconds`,

     

       254
       254
       +
                     );

     

       145
       255
        
                     migratedBlobs.push(cid);

     

       146
       256
        
                   } catch (uploadError) {

     

       147
       147
       -
                     console.error(`[${new Date().toISOString()}] Failed to upload blob ${cid}:`, uploadError);

     

       148
       148
       -
                     throw new Error(`Upload failed: ${uploadError instanceof Error ? uploadError.message : String(uploadError)}`);

     

       257
       257
       +
                     console.error(

     

       258
       258
       +
                       `[${new Date().toISOString()}] Failed to upload blob ${cid}:`,

     

       259
       259
       +
                       uploadError,

     

       260
       260
       +
                     );

     

       261
       261
       +
                     throw new Error(

     

       262
       262
       +
                       `Upload failed: ${

     

       263
       263
       +
                         uploadError instanceof Error

     

       264
       264
       +
                           ? uploadError.message

     

       265
       265
       +
                           : String(uploadError)

     

       266
       266
       +
                       }`,

     

       267
       267
       +
                     );

     

       149
       268
        
                   }

     

       150
       269
        
                 } catch (error) {

     

       151
       151
       -
                   const errorMessage = error instanceof Error ? error.message : String(error);

     

       152
       152
       -
                   const detailedError = `[${new Date().toISOString()}] Failed to migrate blob ${cid}: ${errorMessage}`;

     

       270
       270
       +
                   const errorMessage = error instanceof Error

     

       271
       271
       +
                     ? error.message

     

       272
       272
       +
                     : String(error);

     

       273
       273
       +
                   const detailedError = `[${

     

       274
       274
       +
                     new Date().toISOString()

     

       275
       275
       +
                   }] Failed to migrate blob ${cid}: ${errorMessage}`;

     

       153
       276
        
                   console.error(detailedError);

     

       154
       154
       -
                   console.error('Full error details:', error);

     

       277
       277
       +
                   console.error("Full error details:", error);

     

       155
       278
        
                   migrationLogs.push(detailedError);

     

       156
       279
        
                   failedBlobs.push(cid);

     

       157
       280
        
                 }

     

       158
       281
        
       

     

       159
       282
        
                 processedBlobs++;

     

       160
       160
       -
                 const progressLog = `[${new Date().toISOString()}] Progress: ${processedBlobs}/${totalBlobs} blobs processed (${Math.round((processedBlobs/totalBlobs)*100)}%)`;

     

       283
       283
       +
                 const progressLog = `[${

     

       284
       284
       +
                   new Date().toISOString()

     

       285
       285
       +
                 }] Progress: ${processedBlobs}/${totalBlobs} blobs processed (${

     

       286
       286
       +
                   Math.round((processedBlobs / totalBlobs) * 100)

     

       287
       287
       +
                 }%)`;

     

       161
       288
        
                 console.log(progressLog);

     

       162
       289
        
                 migrationLogs.push(progressLog);

     

       163
       290
        
               }

     
···

       165
       292
        
             } while (blobCursor);

     

       166
       293
        
       

     

       167
       294
        
             const totalTime = Date.now() - startTime;

     

       168
       168
       -
             const completionMessage = `[${new Date().toISOString()}] Blob migration completed in ${totalTime/1000} seconds: ${migratedBlobs.length} blobs migrated${failedBlobs.length > 0 ? `, ${failedBlobs.length} failed` : ''} (${pageCount} pages processed)`;

     

       295
       295
       +
             const completionMessage = `[${

     

       296
       296
       +
               new Date().toISOString()

     

       297
       297
       +
             }] Blob migration completed in ${

     

       298
       298
       +
               totalTime / 1000

     

       299
       299
       +
             } seconds: ${migratedBlobs.length} blobs migrated${

     

       300
       300
       +
               failedBlobs.length > 0 ? `, ${failedBlobs.length} failed` : ""

     

       301
       301
       +
             } (${pageCount} pages processed)`;

     

       169
       302
        
             console.log(completionMessage);

     

       170
       303
        
             migrationLogs.push(completionMessage);

     

       171
       304
        
       

     

       172
       305
        
             return new Response(

     

       173
       306
        
               JSON.stringify({

     

       174
       307
        
                 success: true,

     

       175
       175
       -
                 message: failedBlobs.length > 0 

     

       308
       308
       +
                 message: failedBlobs.length > 0

     

       176
       309
        
                   ? `Blob migration completed with ${failedBlobs.length} failed blobs`

     

       177
       310
        
                   : "Blob migration completed successfully",

     

       178
       311
        
                 migratedBlobs,

     
···

       183
       316
        
                 totalBlobs,

     

       184
       317
        
                 logs: migrationLogs,

     

       185
       318
        
                 timing: {

     

       186
       186
       -
                   totalTime: totalTime/1000

     

       187
       187
       -
                 }

     

       319
       319
       +
                   totalTime: totalTime / 1000,

     

       320
       320
       +
                 },

     

       188
       321
        
               }),

     

       189
       322
        
               {

     

       190
       323
        
                 status: 200,

     

       191
       324
        
                 headers: {

     

       192
       325
        
                   "Content-Type": "application/json",

     

       193
       326
        
                   ...Object.fromEntries(res.headers),

     

       194
       194
       -
                 }

     

       195
       195
       -
               }

     

       327
       327
       +
                 },

     

       328
       328
       +
               },

     

       196
       329
        
             );

     

       197
       330
        
           } catch (error) {

     

       198
       331
        
             const message = error instanceof Error ? error.message : String(error);

     

       199
       199
       -
             console.error(`[${new Date().toISOString()}] Blob migration error:`, message);

     

       200
       200
       -
             console.error('Full error details:', error);

     

       332
       332
       +
             console.error(

     

       333
       333
       +
               `[${new Date().toISOString()}] Blob migration error:`,

     

       334
       334
       +
               message,

     

       335
       335
       +
             );

     

       336
       336
       +
             console.error("Full error details:", error);

     

       201
       337
        
             return new Response(

     

       202
       338
        
               JSON.stringify({

     

       203
       339
        
                 success: false,

     

       204
       340
        
                 message: `Blob migration failed: ${message}`,

     

       205
       205
       -
                 error: error instanceof Error ? {

     

       206
       206
       -
                   name: error.name,

     

       207
       207
       -
                   message: error.message,

     

       208
       208
       -
                   stack: error.stack,

     

       209
       209
       -
                 } : String(error)

     

       341
       341
       +
                 error: error instanceof Error

     

       342
       342
       +
                   ? {

     

       343
       343
       +
                     name: error.name,

     

       344
       344
       +
                     message: error.message,

     

       345
       345
       +
                     stack: error.stack,

     

       346
       346
       +
                   }

     

       347
       347
       +
                   : String(error),

     

       210
       348
        
               }),

     

       211
       349
        
               {

     

       212
       350
        
                 status: 500,

     

       213
       351
        
                 headers: {

     

       214
       352
        
                   "Content-Type": "application/json",

     

       215
       353
        
                   ...Object.fromEntries(res.headers),

     

       216
       216
       -
                 }

     

       217
       217
       -
               }

     

       354
       354
       +
                 },

     

       355
       355
       +
               },

     

       218
       356
        
             );

     

       219
       357
        
           }

     

       220
       220
       -
         }

     

       221
       221
       -
       }); 
     

       358
       358
       +
         },

     

       359
       359
       +
       });

+99 -37

routes/api/migrate/data/prefs.ts

···

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

     

       2
       2
       +
       import { checkDidsMatch } from "../../../../lib/check-dids.ts";

     

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

     

       4
       4
       +
       import { assertMigrationAllowed } from "../../../../lib/migration-state.ts";

     

       3
       5
        
       

     

       4
       6
        
       export const handler = define.handlers({

     

       5
       7
        
         async POST(ctx) {

     

       6
       8
        
           const res = new Response();

     

       7
       9
        
           try {

     

       10
       10
       +
             // Check if migrations are currently allowed

     

       11
       11
       +
             assertMigrationAllowed();

     

       12
       12
       +
       

     

       8
       13
        
             console.log("Preferences migration: Starting session retrieval");

     

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

     

       10
       15
        
             console.log("Preferences migration: Got old agent:", !!oldAgent);

     
···

       13
       18
        
             console.log("Preferences migration: Got new agent:", !!newAgent);

     

       14
       19
        
       

     

       15
       20
        
             if (!oldAgent || !newAgent) {

     

       16
       16
       -
               return new Response(JSON.stringify({

     

       17
       17
       -
                 success: false,

     

       18
       18
       -
                 message: "Not authenticated"

     

       19
       19
       -
               }), {

     

       20
       20
       -
                 status: 401,

     

       21
       21
       -
                 headers: { "Content-Type": "application/json" }

     

       22
       22
       -
               });

     

       21
       21
       +
               return new Response(

     

       22
       22
       +
                 JSON.stringify({

     

       23
       23
       +
                   success: false,

     

       24
       24
       +
                   message: "Not authenticated",

     

       25
       25
       +
                 }),

     

       26
       26
       +
                 {

     

       27
       27
       +
                   status: 401,

     

       28
       28
       +
                   headers: { "Content-Type": "application/json" },

     

       29
       29
       +
                 },

     

       30
       30
       +
               );

     

       31
       31
       +
             }

     

       32
       32
       +
       

     

       33
       33
       +
             // Verify DIDs match between sessions

     

       34
       34
       +
             const didsMatch = await checkDidsMatch(ctx.req);

     

       35
       35
       +
             if (!didsMatch) {

     

       36
       36
       +
               return new Response(

     

       37
       37
       +
                 JSON.stringify({

     

       38
       38
       +
                   success: false,

     

       39
       39
       +
                   message: "Invalid state, original and target DIDs do not match",

     

       40
       40
       +
                 }),

     

       41
       41
       +
                 {

     

       42
       42
       +
                   status: 400,

     

       43
       43
       +
                   headers: { "Content-Type": "application/json" },

     

       44
       44
       +
                 },

     

       45
       45
       +
               );

     

       23
       46
        
             }

     

       24
       47
        
       

     

       25
       48
        
             // Migrate preferences

     

       26
       49
        
             const migrationLogs: string[] = [];

     

       27
       50
        
             const startTime = Date.now();

     

       28
       28
       -
             console.log(`[${new Date().toISOString()}] Starting preferences migration...`);

     

       29
       29
       -
             migrationLogs.push(`[${new Date().toISOString()}] Starting preferences migration...`);

     

       51
       51
       +
             console.log(

     

       52
       52
       +
               `[${new Date().toISOString()}] Starting preferences migration...`,

     

       53
       53
       +
             );

     

       54
       54
       +
             migrationLogs.push(

     

       55
       55
       +
               `[${new Date().toISOString()}] Starting preferences migration...`,

     

       56
       56
       +
             );

     

       30
       57
        
       

     

       31
       58
        
             // Fetch preferences

     

       32
       32
       -
             console.log(`[${new Date().toISOString()}] Fetching preferences from old account...`);

     

       33
       33
       -
             migrationLogs.push(`[${new Date().toISOString()}] Fetching preferences from old account...`);

     

       34
       34
       -
             

     

       59
       59
       +
             console.log(

     

       60
       60
       +
               `[${

     

       61
       61
       +
                 new Date().toISOString()

     

       62
       62
       +
               }] Fetching preferences from old account...`,

     

       63
       63
       +
             );

     

       64
       64
       +
             migrationLogs.push(

     

       65
       65
       +
               `[${

     

       66
       66
       +
                 new Date().toISOString()

     

       67
       67
       +
               }] Fetching preferences from old account...`,

     

       68
       68
       +
             );

     

       69
       69
       +
       

     

       35
       70
        
             const fetchStartTime = Date.now();

     

       36
       71
        
             const prefs = await oldAgent.app.bsky.actor.getPreferences();

     

       37
       72
        
             const fetchTime = Date.now() - fetchStartTime;

     

       38
       38
       -
             

     

       39
       39
       -
             console.log(`[${new Date().toISOString()}] Preferences fetched in ${fetchTime/1000} seconds`);

     

       40
       40
       -
             migrationLogs.push(`[${new Date().toISOString()}] Preferences fetched in ${fetchTime/1000} seconds`);

     

       73
       73
       +
       

     

       74
       74
       +
             console.log(

     

       75
       75
       +
               `[${new Date().toISOString()}] Preferences fetched in ${

     

       76
       76
       +
                 fetchTime / 1000

     

       77
       77
       +
               } seconds`,

     

       78
       78
       +
             );

     

       79
       79
       +
             migrationLogs.push(

     

       80
       80
       +
               `[${new Date().toISOString()}] Preferences fetched in ${

     

       81
       81
       +
                 fetchTime / 1000

     

       82
       82
       +
               } seconds`,

     

       83
       83
       +
             );

     

       41
       84
        
       

     

       42
       85
        
             // Update preferences

     

       43
       43
       -
             console.log(`[${new Date().toISOString()}] Updating preferences on new account...`);

     

       44
       44
       -
             migrationLogs.push(`[${new Date().toISOString()}] Updating preferences on new account...`);

     

       86
       86
       +
             console.log(

     

       87
       87
       +
               `[${new Date().toISOString()}] Updating preferences on new account...`,

     

       88
       88
       +
             );

     

       89
       89
       +
             migrationLogs.push(

     

       90
       90
       +
               `[${new Date().toISOString()}] Updating preferences on new account...`,

     

       91
       91
       +
             );

     

       45
       92
        
       

     

       46
       93
        
             const updateStartTime = Date.now();

     

       47
       94
        
             await newAgent.app.bsky.actor.putPreferences(prefs.data);

     

       48
       95
        
             const updateTime = Date.now() - updateStartTime;

     

       49
       96
        
       

     

       50
       50
       -
             console.log(`[${new Date().toISOString()}] Preferences updated in ${updateTime/1000} seconds`);

     

       51
       51
       -
             migrationLogs.push(`[${new Date().toISOString()}] Preferences updated in ${updateTime/1000} seconds`);

     

       97
       97
       +
             console.log(

     

       98
       98
       +
               `[${new Date().toISOString()}] Preferences updated in ${

     

       99
       99
       +
                 updateTime / 1000

     

       100
       100
       +
               } seconds`,

     

       101
       101
       +
             );

     

       102
       102
       +
             migrationLogs.push(

     

       103
       103
       +
               `[${new Date().toISOString()}] Preferences updated in ${

     

       104
       104
       +
                 updateTime / 1000

     

       105
       105
       +
               } seconds`,

     

       106
       106
       +
             );

     

       52
       107
        
       

     

       53
       108
        
             const totalTime = Date.now() - startTime;

     

       54
       54
       -
             const completionMessage = `[${new Date().toISOString()}] Preferences migration completed in ${totalTime/1000} seconds total`;

     

       109
       109
       +
             const completionMessage = `[${

     

       110
       110
       +
               new Date().toISOString()

     

       111
       111
       +
             }] Preferences migration completed in ${totalTime / 1000} seconds total`;

     

       55
       112
        
             console.log(completionMessage);

     

       56
       113
        
             migrationLogs.push(completionMessage);

     

       57
       114
        
       

     
···

       61
       118
        
                 message: "Preferences migration completed successfully",

     

       62
       119
        
                 logs: migrationLogs,

     

       63
       120
        
                 timing: {

     

       64
       64
       -
                   fetchTime: fetchTime/1000,

     

       65
       65
       -
                   updateTime: updateTime/1000,

     

       66
       66
       -
                   totalTime: totalTime/1000

     

       67
       67
       -
                 }

     

       121
       121
       +
                   fetchTime: fetchTime / 1000,

     

       122
       122
       +
                   updateTime: updateTime / 1000,

     

       123
       123
       +
                   totalTime: totalTime / 1000,

     

       124
       124
       +
                 },

     

       68
       125
        
               }),

     

       69
       126
        
               {

     

       70
       127
        
                 status: 200,

     

       71
       128
        
                 headers: {

     

       72
       129
        
                   "Content-Type": "application/json",

     

       73
       130
        
                   ...Object.fromEntries(res.headers),

     

       74
       74
       -
                 }

     

       75
       75
       -
               }

     

       131
       131
       +
                 },

     

       132
       132
       +
               },

     

       76
       133
        
             );

     

       77
       134
        
           } catch (error) {

     

       78
       135
        
             const message = error instanceof Error ? error.message : String(error);

     

       79
       79
       -
             console.error(`[${new Date().toISOString()}] Preferences migration error:`, message);

     

       80
       80
       -
             console.error('Full error details:', error);

     

       136
       136
       +
             console.error(

     

       137
       137
       +
               `[${new Date().toISOString()}] Preferences migration error:`,

     

       138
       138
       +
               message,

     

       139
       139
       +
             );

     

       140
       140
       +
             console.error("Full error details:", error);

     

       81
       141
        
             return new Response(

     

       82
       142
        
               JSON.stringify({

     

       83
       143
        
                 success: false,

     

       84
       144
        
                 message: `Preferences migration failed: ${message}`,

     

       85
       85
       -
                 error: error instanceof Error ? {

     

       86
       86
       -
                   name: error.name,

     

       87
       87
       -
                   message: error.message,

     

       88
       88
       -
                   stack: error.stack,

     

       89
       89
       -
                 } : String(error)

     

       145
       145
       +
                 error: error instanceof Error

     

       146
       146
       +
                   ? {

     

       147
       147
       +
                     name: error.name,

     

       148
       148
       +
                     message: error.message,

     

       149
       149
       +
                     stack: error.stack,

     

       150
       150
       +
                   }

     

       151
       151
       +
                   : String(error),

     

       90
       152
        
               }),

     

       91
       153
        
               {

     

       92
       154
        
                 status: 500,

     

       93
       155
        
                 headers: {

     

       94
       156
        
                   "Content-Type": "application/json",

     

       95
       157
        
                   ...Object.fromEntries(res.headers),

     

       96
       96
       -
                 }

     

       97
       97
       -
               }

     

       158
       158
       +
                 },

     

       159
       159
       +
               },

     

       98
       160
        
             );

     

       99
       161
        
           }

     

       100
       100
       -
         }

     

       101
       101
       -
       }); 
     

       162
       162
       +
         },

     

       163
       163
       +
       });

+93 -38

routes/api/migrate/data/repo.ts

···

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

     

       2
       2
       +
       import { checkDidsMatch } from "../../../../lib/check-dids.ts";

     

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

     

       4
       4
       +
       import { assertMigrationAllowed } from "../../../../lib/migration-state.ts";

     

       3
       5
        
       

     

       4
       6
        
       export const handler = define.handlers({

     

       5
       7
        
         async POST(ctx) {

     

       6
       8
        
           const res = new Response();

     

       7
       9
        
           try {

     

       10
       10
       +
             // Check if migrations are currently allowed

     

       11
       11
       +
             assertMigrationAllowed();

     

       12
       12
       +
       

     

       8
       13
        
             console.log("Repo migration: Starting session retrieval");

     

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

     

       10
       15
        
             console.log("Repo migration: Got old agent:", !!oldAgent);

     

       11
       16
        
       

     

       12
       12
       -
       

     

       13
       17
        
             const newAgent = await getSessionAgent(ctx.req, res, true);

     

       14
       18
        
             console.log("Repo migration: Got new agent:", !!newAgent);

     

       15
       19
        
       

     

       16
       20
        
             if (!oldAgent || !newAgent) {

     

       17
       17
       -
               return new Response(JSON.stringify({

     

       18
       18
       -
                 success: false,

     

       19
       19
       -
                 message: "Not authenticated"

     

       20
       20
       -
               }), {

     

       21
       21
       -
                 status: 401,

     

       22
       22
       -
                 headers: { "Content-Type": "application/json" }

     

       23
       23
       -
               });

     

       21
       21
       +
               return new Response(

     

       22
       22
       +
                 JSON.stringify({

     

       23
       23
       +
                   success: false,

     

       24
       24
       +
                   message: "Not authenticated",

     

       25
       25
       +
                 }),

     

       26
       26
       +
                 {

     

       27
       27
       +
                   status: 401,

     

       28
       28
       +
                   headers: { "Content-Type": "application/json" },

     

       29
       29
       +
                 },

     

       30
       30
       +
               );

     

       31
       31
       +
             }

     

       32
       32
       +
       

     

       33
       33
       +
             // Verify DIDs match between sessions

     

       34
       34
       +
             const didsMatch = await checkDidsMatch(ctx.req);

     

       35
       35
       +
             if (!didsMatch) {

     

       36
       36
       +
               return new Response(

     

       37
       37
       +
                 JSON.stringify({

     

       38
       38
       +
                   success: false,

     

       39
       39
       +
                   message: "Invalid state, original and target DIDs do not match",

     

       40
       40
       +
                 }),

     

       41
       41
       +
                 {

     

       42
       42
       +
                   status: 400,

     

       43
       43
       +
                   headers: { "Content-Type": "application/json" },

     

       44
       44
       +
                 },

     

       45
       45
       +
               );

     

       24
       46
        
             }

     

       25
       47
        
       

     

       26
       48
        
             const session = await oldAgent.com.atproto.server.getSession();

     
···

       29
       51
        
             const migrationLogs: string[] = [];

     

       30
       52
        
             const startTime = Date.now();

     

       31
       53
        
             console.log(`[${new Date().toISOString()}] Starting repo migration...`);

     

       32
       32
       -
             migrationLogs.push(`[${new Date().toISOString()}] Starting repo migration...`);

     

       54
       54
       +
             migrationLogs.push(

     

       55
       55
       +
               `[${new Date().toISOString()}] Starting repo migration...`,

     

       56
       56
       +
             );

     

       33
       57
        
       

     

       34
       58
        
             // Get repo data from old account

     

       35
       35
       -
             console.log(`[${new Date().toISOString()}] Fetching repo data from old account...`);

     

       36
       36
       -
             migrationLogs.push(`[${new Date().toISOString()}] Fetching repo data from old account...`);

     

       37
       37
       -
             

     

       59
       59
       +
             console.log(

     

       60
       60
       +
               `[${new Date().toISOString()}] Fetching repo data from old account...`,

     

       61
       61
       +
             );

     

       62
       62
       +
             migrationLogs.push(

     

       63
       63
       +
               `[${new Date().toISOString()}] Fetching repo data from old account...`,

     

       64
       64
       +
             );

     

       65
       65
       +
       

     

       38
       66
        
             const fetchStartTime = Date.now();

     

       39
       67
        
             const repoData = await oldAgent.com.atproto.sync.getRepo({

     

       40
       68
        
               did: accountDid,

     

       41
       69
        
             });

     

       42
       70
        
             const fetchTime = Date.now() - fetchStartTime;

     

       43
       43
       -
             

     

       44
       44
       -
             console.log(`[${new Date().toISOString()}] Repo data fetched in ${fetchTime/1000} seconds`);

     

       45
       45
       -
             migrationLogs.push(`[${new Date().toISOString()}] Repo data fetched in ${fetchTime/1000} seconds`);

     

       71
       71
       +
       

     

       72
       72
       +
             console.log(

     

       73
       73
       +
               `[${new Date().toISOString()}] Repo data fetched in ${

     

       74
       74
       +
                 fetchTime / 1000

     

       75
       75
       +
               } seconds`,

     

       76
       76
       +
             );

     

       77
       77
       +
             migrationLogs.push(

     

       78
       78
       +
               `[${new Date().toISOString()}] Repo data fetched in ${

     

       79
       79
       +
                 fetchTime / 1000

     

       80
       80
       +
               } seconds`,

     

       81
       81
       +
             );

     

       46
       82
        
       

     

       47
       47
       -
             console.log(`[${new Date().toISOString()}] Importing repo data to new account...`);

     

       48
       48
       -
             migrationLogs.push(`[${new Date().toISOString()}] Importing repo data to new account...`);

     

       83
       83
       +
             console.log(

     

       84
       84
       +
               `[${new Date().toISOString()}] Importing repo data to new account...`,

     

       85
       85
       +
             );

     

       86
       86
       +
             migrationLogs.push(

     

       87
       87
       +
               `[${new Date().toISOString()}] Importing repo data to new account...`,

     

       88
       88
       +
             );

     

       49
       89
        
       

     

       50
       90
        
             // Import repo data to new account

     

       51
       91
        
             const importStartTime = Date.now();

     

       52
       92
        
             await newAgent.com.atproto.repo.importRepo(repoData.data, {

     

       53
       53
       -
               encoding: "application/vnd.ipld.car"

     

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

     

       54
       94
        
             });

     

       55
       95
        
             const importTime = Date.now() - importStartTime;

     

       56
       96
        
       

     

       57
       57
       -
             console.log(`[${new Date().toISOString()}] Repo data imported in ${importTime/1000} seconds`);

     

       58
       58
       -
             migrationLogs.push(`[${new Date().toISOString()}] Repo data imported in ${importTime/1000} seconds`);

     

       97
       97
       +
             console.log(

     

       98
       98
       +
               `[${new Date().toISOString()}] Repo data imported in ${

     

       99
       99
       +
                 importTime / 1000

     

       100
       100
       +
               } seconds`,

     

       101
       101
       +
             );

     

       102
       102
       +
             migrationLogs.push(

     

       103
       103
       +
               `[${new Date().toISOString()}] Repo data imported in ${

     

       104
       104
       +
                 importTime / 1000

     

       105
       105
       +
               } seconds`,

     

       106
       106
       +
             );

     

       59
       107
        
       

     

       60
       108
        
             const totalTime = Date.now() - startTime;

     

       61
       61
       -
             const completionMessage = `[${new Date().toISOString()}] Repo migration completed in ${totalTime/1000} seconds total`;

     

       109
       109
       +
             const completionMessage = `[${

     

       110
       110
       +
               new Date().toISOString()

     

       111
       111
       +
             }] Repo migration completed in ${totalTime / 1000} seconds total`;

     

       62
       112
        
             console.log(completionMessage);

     

       63
       113
        
             migrationLogs.push(completionMessage);

     

       64
       114
        
       

     
···

       68
       118
        
                 message: "Repo migration completed successfully",

     

       69
       119
        
                 logs: migrationLogs,

     

       70
       120
        
                 timing: {

     

       71
       71
       -
                   fetchTime: fetchTime/1000,

     

       72
       72
       -
                   importTime: importTime/1000,

     

       73
       73
       -
                   totalTime: totalTime/1000

     

       74
       74
       -
                 }

     

       121
       121
       +
                   fetchTime: fetchTime / 1000,

     

       122
       122
       +
                   importTime: importTime / 1000,

     

       123
       123
       +
                   totalTime: totalTime / 1000,

     

       124
       124
       +
                 },

     

       75
       125
        
               }),

     

       76
       126
        
               {

     

       77
       127
        
                 status: 200,

     

       78
       128
        
                 headers: {

     

       79
       129
        
                   "Content-Type": "application/json",

     

       80
       130
        
                   ...Object.fromEntries(res.headers),

     

       81
       81
       -
                 }

     

       82
       82
       -
               }

     

       131
       131
       +
                 },

     

       132
       132
       +
               },

     

       83
       133
        
             );

     

       84
       134
        
           } catch (error) {

     

       85
       135
        
             const message = error instanceof Error ? error.message : String(error);

     

       86
       86
       -
             console.error(`[${new Date().toISOString()}] Repo migration error:`, message);

     

       87
       87
       -
             console.error('Full error details:', error);

     

       136
       136
       +
             console.error(

     

       137
       137
       +
               `[${new Date().toISOString()}] Repo migration error:`,

     

       138
       138
       +
               message,

     

       139
       139
       +
             );

     

       140
       140
       +
             console.error("Full error details:", error);

     

       88
       141
        
             return new Response(

     

       89
       142
        
               JSON.stringify({

     

       90
       143
        
                 success: false,

     

       91
       144
        
                 message: `Repo migration failed: ${message}`,

     

       92
       92
       -
                 error: error instanceof Error ? {

     

       93
       93
       -
                   name: error.name,

     

       94
       94
       -
                   message: error.message,

     

       95
       95
       -
                   stack: error.stack,

     

       96
       96
       -
                 } : String(error)

     

       145
       145
       +
                 error: error instanceof Error

     

       146
       146
       +
                   ? {

     

       147
       147
       +
                     name: error.name,

     

       148
       148
       +
                     message: error.message,

     

       149
       149
       +
                     stack: error.stack,

     

       150
       150
       +
                   }

     

       151
       151
       +
                   : String(error),

     

       97
       152
        
               }),

     

       98
       153
        
               {

     

       99
       154
        
                 status: 500,

     

       100
       155
        
                 headers: {

     

       101
       156
        
                   "Content-Type": "application/json",

     

       102
       157
        
                   ...Object.fromEntries(res.headers),

     

       103
       103
       -
                 }

     

       104
       104
       -
               }

     

       158
       158
       +
                 },

     

       159
       159
       +
               },

     

       105
       160
        
             );

     

       106
       161
        
           }

     

       107
       107
       -
         }

     

       108
       108
       -
       }); 
     

       162
       162
       +
         },

     

       163
       163
       +
       });

+17

routes/api/migrate/finalize.ts

···

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

     

       2
       2
       +
       import { checkDidsMatch } from "../../../lib/check-dids.ts";

     

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

     

       4
       4
       +
       import { assertMigrationAllowed } from "../../../lib/migration-state.ts";

     

       3
       5
        
       

     

       4
       6
        
       export const handler = define.handlers({

     

       5
       7
        
         async POST(ctx) {

     

       6
       8
        
           const res = new Response();

     

       7
       9
        
           try {

     

       10
       10
       +
             // Check if migrations are currently allowed

     

       11
       11
       +
             assertMigrationAllowed();

     

       12
       12
       +
       

     

       8
       13
        
             const oldAgent = await getSessionAgent(ctx.req);

     

       9
       14
        
             const newAgent = await getSessionAgent(ctx.req, res, true);

     

       10
       15
        
       

     
···

       13
       18
        
               return new Response("Migration session not found or invalid", {

     

       14
       19
        
                 status: 400,

     

       15
       20
        
               });

     

       21
       21
       +
             }

     

       22
       22
       +
       

     

       23
       23
       +
             // Verify DIDs match between sessions

     

       24
       24
       +
             const didsMatch = await checkDidsMatch(ctx.req);

     

       25
       25
       +
             if (!didsMatch) {

     

       26
       26
       +
               return new Response(

     

       27
       27
       +
                 JSON.stringify({

     

       28
       28
       +
                   success: false,

     

       29
       29
       +
                   message: "Invalid state, original and target DIDs do not match",

     

       30
       30
       +
                 }),

     

       31
       31
       +
                 { status: 400, headers: { "Content-Type": "application/json" } },

     

       32
       32
       +
               );

     

       16
       33
        
             }

     

       17
       34
        
       

     

       18
       35
        
             // Activate new account and deactivate old account

+22 -4

routes/api/migrate/identity/request.ts

···

       1
       1
       -
       import {

     

       2
       2
       -
         getSessionAgent,

     

       3
       3
       -
       } from "../../../../lib/sessions.ts";

     

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

     

       2
       2
       +
       import { checkDidsMatch } from "../../../../lib/check-dids.ts";

     

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

     

       4
       4
       +
       import { assertMigrationAllowed } from "../../../../lib/migration-state.ts";

     

       5
       5
        
       

     

       6
       6
        
       /**

     

       7
       7
        
        * Handle identity migration request

     
···

       14
       14
        
         async POST(ctx) {

     

       15
       15
        
           const res = new Response();

     

       16
       16
        
           try {

     

       17
       17
       +
             // Check if migrations are currently allowed

     

       18
       18
       +
             assertMigrationAllowed();

     

       19
       19
       +
       

     

       17
       20
        
             console.log("Starting identity migration request...");

     

       18
       21
        
             const oldAgent = await getSessionAgent(ctx.req);

     

       19
       22
        
             console.log("Got old agent:", {

     
···

       52
       55
        
               );

     

       53
       56
        
             }

     

       54
       57
        
       

     

       58
       58
       +
             // Verify DIDs match between sessions

     

       59
       59
       +
             const didsMatch = await checkDidsMatch(ctx.req);

     

       60
       60
       +
             if (!didsMatch) {

     

       61
       61
       +
               return new Response(

     

       62
       62
       +
                 JSON.stringify({

     

       63
       63
       +
                   success: false,

     

       64
       64
       +
                   message: "Invalid state, original and target DIDs do not match",

     

       65
       65
       +
                 }),

     

       66
       66
       +
                 {

     

       67
       67
       +
                   status: 400,

     

       68
       68
       +
                   headers: { "Content-Type": "application/json" },

     

       69
       69
       +
                 },

     

       70
       70
       +
               );

     

       71
       71
       +
             }

     

       72
       72
       +
       

     

       55
       73
        
             // Request the signature

     

       56
       74
        
             console.log("Requesting PLC operation signature...");

     

       57
       75
        
             try {

     
···

       61
       79
        
               console.error("Error requesting PLC operation signature:", {

     

       62
       80
        
                 name: error instanceof Error ? error.name : "Unknown",

     

       63
       81
        
                 message: error instanceof Error ? error.message : String(error),

     

       64
       64
       -
                 status: 400

     

       82
       82
       +
                 status: 400,

     

       65
       83
        
               });

     

       66
       84
        
               throw error;

     

       67
       85
        
             }

+20 -3

routes/api/migrate/identity/sign.ts

···

       1
       1
       -
       import {

     

       2
       2
       -
         getSessionAgent,

     

       3
       3
       -
       } from "../../../../lib/sessions.ts";

     

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

     

       2
       2
       +
       import { checkDidsMatch } from "../../../../lib/check-dids.ts";

     

       4
       3
        
       import { Secp256k1Keypair } from "npm:@atproto/crypto";

     

       5
       4
        
       import * as ui8 from "npm:uint8arrays";

     

       6
       5
        
       import { define } from "../../../../utils.ts";

     

       6
       6
       +
       import { assertMigrationAllowed } from "../../../../lib/migration-state.ts";

     

       7
       7
        
       

     

       8
       8
        
       /**

     

       9
       9
        
        * Handle identity migration sign

     
···

       16
       16
        
         async POST(ctx) {

     

       17
       17
        
           const res = new Response();

     

       18
       18
        
           try {

     

       19
       19
       +
             // Check if migrations are currently allowed

     

       20
       20
       +
             assertMigrationAllowed();

     

       19
       21
        
             const url = new URL(ctx.req.url);

     

       20
       22
        
             const token = url.searchParams.get("token");

     

       21
       23
        
       

     
···

       52
       54
        
                 JSON.stringify({

     

       53
       55
        
                   success: false,

     

       54
       56
        
                   message: "Migration session not found or invalid",

     

       57
       57
       +
                 }),

     

       58
       58
       +
                 {

     

       59
       59
       +
                   status: 400,

     

       60
       60
       +
                   headers: { "Content-Type": "application/json" },

     

       61
       61
       +
                 },

     

       62
       62
       +
               );

     

       63
       63
       +
             }

     

       64
       64
       +
       

     

       65
       65
       +
             // Verify DIDs match between sessions

     

       66
       66
       +
             const didsMatch = await checkDidsMatch(ctx.req);

     

       67
       67
       +
             if (!didsMatch) {

     

       68
       68
       +
               return new Response(

     

       69
       69
       +
                 JSON.stringify({

     

       70
       70
       +
                   success: false,

     

       71
       71
       +
                   message: "Invalid state, original and target DIDs do not match",

     

       55
       72
        
                 }),

     

       56
       73
        
                 {

     

       57
       74
        
                   status: 400,

+2 -2

routes/api/migrate/next-step.ts

···

       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 && 

     

       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 &&

     
···

       42
       42
        
                   }

     

       43
       43
        
               });

     

       44
       44
        
           }

     

       45
       45
       -
       }) 
     

       45
       45
       +
       })

+130 -104

routes/api/migrate/status.ts

···

       1
       1
       +
       import { checkDidsMatch } from "../../../lib/check-dids.ts";

     

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

     

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

     

       3
       4
        
       

     

       4
       5
        
       export const handler = define.handlers({

     

       5
       5
       -
           async GET(ctx) {

     

       6
       6
       -
               console.log("Status check: Starting");

     

       7
       7
       -
               const url = new URL(ctx.req.url);

     

       8
       8
       -
               const params = new URLSearchParams(url.search);

     

       9
       9
       -
               const step = params.get("step");

     

       10
       10
       -
               console.log("Status check: Step", step);

     

       6
       6
       +
         async GET(ctx) {

     

       7
       7
       +
           console.log("Status check: Starting");

     

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

     

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

     

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

     

       11
       11
       +
           console.log("Status check: Step", step);

     

       11
       12
        
       

     

       12
       12
       -
               console.log("Status check: Getting agents");

     

       13
       13
       -
               const oldAgent = await getSessionAgent(ctx.req);

     

       14
       14
       -
               const newAgent = await getSessionAgent(ctx.req, new Response(), true);

     

       15
       15
       -
               

     

       16
       16
       -
               if (!oldAgent || !newAgent) {

     

       17
       17
       -
                   console.log("Status check: Unauthorized - missing agents", {

     

       18
       18
       -
                       hasOldAgent: !!oldAgent,

     

       19
       19
       -
                       hasNewAgent: !!newAgent

     

       20
       20
       -
                   });

     

       21
       21
       -
                   return new Response("Unauthorized", { status: 401 });

     

       22
       22
       -
               }

     

       13
       13
       +
           console.log("Status check: Getting agents");

     

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

     

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

     

       23
       16
        
       

     

       24
       24
       -
               console.log("Status check: Fetching account statuses");

     

       25
       25
       -
               const oldStatus = await oldAgent.com.atproto.server.checkAccountStatus();

     

       26
       26
       -
               const newStatus = await newAgent.com.atproto.server.checkAccountStatus();

     

       27
       27
       -
               

     

       28
       28
       -
               if (!oldStatus.data || !newStatus.data) {

     

       29
       29
       -
                   console.error("Status check: Failed to verify status", {

     

       30
       30
       -
                       hasOldStatus: !!oldStatus.data,

     

       31
       31
       -
                       hasNewStatus: !!newStatus.data

     

       32
       32
       -
                   });

     

       33
       33
       -
                   return new Response("Could not verify status", { status: 500 });

     

       34
       34
       -
               }

     

       17
       17
       +
           if (!oldAgent || !newAgent) {

     

       18
       18
       +
             console.log("Status check: Unauthorized - missing agents", {

     

       19
       19
       +
               hasOldAgent: !!oldAgent,

     

       20
       20
       +
               hasNewAgent: !!newAgent,

     

       21
       21
       +
             });

     

       22
       22
       +
             return new Response("Unauthorized", { status: 401 });

     

       23
       23
       +
           }

     

       35
       24
        
       

     

       36
       36
       -
               console.log("Status check: Account statuses", {

     

       37
       37
       -
                   old: oldStatus.data,

     

       38
       38
       -
                   new: newStatus.data

     

       39
       39
       -
               });

     

       25
       25
       +
           const didsMatch = await checkDidsMatch(ctx.req);

     

       40
       26
        
       

     

       41
       41
       -
               const readyToContinue = () => {

     

       42
       42
       -
                   if (step) {

     

       43
       43
       -
                       console.log("Status check: Evaluating step", step);

     

       44
       44
       -
                       switch (step) {

     

       45
       45
       -
                           case "1": {

     

       46
       46
       -
                               if (newStatus.data) {

     

       47
       47
       -
                                   console.log("Status check: Step 1 ready");

     

       48
       48
       -
                                   return { ready: true };

     

       49
       49
       -
                               }

     

       50
       50
       -
                               console.log("Status check: Step 1 not ready - new account status not available");

     

       51
       51
       -
                               return { ready: false, reason: "New account status not available" };

     

       52
       52
       -
                           }

     

       53
       53
       -
                           case "2": {

     

       54
       54
       -
                               const isReady = newStatus.data.repoCommit && 

     

       55
       55
       -
                                   newStatus.data.indexedRecords === oldStatus.data.indexedRecords &&

     

       56
       56
       -
                                   newStatus.data.privateStateValues === oldStatus.data.privateStateValues &&

     

       57
       57
       -
                                   newStatus.data.expectedBlobs === newStatus.data.importedBlobs &&

     

       58
       58
       -
                                   newStatus.data.importedBlobs === oldStatus.data.importedBlobs;

     

       27
       27
       +
           console.log("Status check: Fetching account statuses");

     

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

     

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

     

       59
       30
        
       

     

       60
       60
       -
                               if (isReady) {

     

       61
       61
       -
                                   console.log("Status check: Step 2 ready");

     

       62
       62
       -
                                   return { ready: true };

     

       63
       63
       -
                               }

     

       31
       31
       +
           if (!oldStatus.data || !newStatus.data) {

     

       32
       32
       +
             console.error("Status check: Failed to verify status", {

     

       33
       33
       +
               hasOldStatus: !!oldStatus.data,

     

       34
       34
       +
               hasNewStatus: !!newStatus.data,

     

       35
       35
       +
             });

     

       36
       36
       +
             return new Response("Could not verify status", { status: 500 });

     

       37
       37
       +
           }

     

       64
       38
        
       

     

       65
       65
       -
                               const reasons = [];

     

       66
       66
       -
                               if (!newStatus.data.repoCommit) reasons.push("Repository not imported.");

     

       67
       67
       -
                               if (newStatus.data.indexedRecords < oldStatus.data.indexedRecords) 

     

       68
       68
       -
                                   reasons.push("Not all records imported.");

     

       69
       69
       -
                               if (newStatus.data.privateStateValues < oldStatus.data.privateStateValues)

     

       70
       70
       -
                                   reasons.push("Not all private state values imported.");

     

       71
       71
       -
                               if (newStatus.data.expectedBlobs !== newStatus.data.importedBlobs)

     

       72
       72
       -
                                   reasons.push("Expected blobs not fully imported.");

     

       73
       73
       -
                               if (newStatus.data.importedBlobs < oldStatus.data.importedBlobs)

     

       74
       74
       -
                                   reasons.push("Not all blobs imported.");

     

       39
       39
       +
           console.log("Status check: Account statuses", {

     

       40
       40
       +
             old: oldStatus.data,

     

       41
       41
       +
             new: newStatus.data,

     

       42
       42
       +
           });

     

       75
       43
        
       

     

       76
       76
       -
                               console.log("Status check: Step 2 not ready", { reasons });

     

       77
       77
       -
                               return { ready: false, reason: reasons.join(", ") };

     

       78
       78
       -
                           }

     

       79
       79
       -
                           case "3": {

     

       80
       80
       -
                               if (newStatus.data.validDid) {

     

       81
       81
       -
                                   console.log("Status check: Step 3 ready");

     

       82
       82
       -
                                   return { ready: true };

     

       83
       83
       -
                               }

     

       84
       84
       -
                               console.log("Status check: Step 3 not ready - DID not valid");

     

       85
       85
       -
                               return { ready: false, reason: "DID not valid" };

     

       86
       86
       -
                           }

     

       87
       87
       -
                           case "4": {

     

       88
       88
       -
                               if (newStatus.data.activated === true && oldStatus.data.activated === false) {

     

       89
       89
       -
                                   console.log("Status check: Step 4 ready");

     

       90
       90
       -
                                   return { ready: true };

     

       91
       91
       -
                               }

     

       92
       92
       -
                               console.log("Status check: Step 4 not ready - Account not activated");

     

       93
       93
       -
                               return { ready: false, reason: "Account not activated" };

     

       94
       94
       -
                           }

     

       95
       95
       -
                       }

     

       96
       96
       -
                   } else {

     

       97
       97
       -
                       console.log("Status check: No step specified, returning ready");

     

       98
       98
       -
                       return { ready: true };

     

       44
       44
       +
           const readyToContinue = () => {

     

       45
       45
       +
             if (!didsMatch) {

     

       46
       46
       +
               return {

     

       47
       47
       +
                 ready: false,

     

       48
       48
       +
                 reason: "Invalid state, original and target DIDs do not match",

     

       49
       49
       +
               };

     

       50
       50
       +
             }

     

       51
       51
       +
             if (step) {

     

       52
       52
       +
               console.log("Status check: Evaluating step", step);

     

       53
       53
       +
               switch (step) {

     

       54
       54
       +
                 case "1": {

     

       55
       55
       +
                   if (newStatus.data) {

     

       56
       56
       +
                     console.log("Status check: Step 1 ready");

     

       57
       57
       +
                     return { ready: true };

     

       58
       58
       +
                   }

     

       59
       59
       +
                   console.log(

     

       60
       60
       +
                     "Status check: Step 1 not ready - new account status not available",

     

       61
       61
       +
                   );

     

       62
       62
       +
                   return { ready: false, reason: "New account status not available" };

     

       63
       63
       +
                 }

     

       64
       64
       +
                 case "2": {

     

       65
       65
       +
                   const isReady = newStatus.data.repoCommit &&

     

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

     

       67
       67
       +
                     newStatus.data.privateStateValues ===

     

       68
       68
       +
                       oldStatus.data.privateStateValues &&

     

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

     

       70
       70
       +
                     newStatus.data.importedBlobs === oldStatus.data.importedBlobs;

     

       71
       71
       +
       

     

       72
       72
       +
                   if (isReady) {

     

       73
       73
       +
                     console.log("Status check: Step 2 ready");

     

       74
       74
       +
                     return { ready: true };

     

       75
       75
       +
                   }

     

       76
       76
       +
       

     

       77
       77
       +
                   const reasons = [];

     

       78
       78
       +
                   if (!newStatus.data.repoCommit) {

     

       79
       79
       +
                     reasons.push("Repository not imported.");

     

       80
       80
       +
                   }

     

       81
       81
       +
                   if (newStatus.data.indexedRecords < oldStatus.data.indexedRecords) {

     

       82
       82
       +
                     reasons.push("Not all records imported.");

     

       83
       83
       +
                   }

     

       84
       84
       +
                   if (

     

       85
       85
       +
                     newStatus.data.privateStateValues <

     

       86
       86
       +
                       oldStatus.data.privateStateValues

     

       87
       87
       +
                   ) {

     

       88
       88
       +
                     reasons.push("Not all private state values imported.");

     

       89
       89
       +
                   }

     

       90
       90
       +
                   if (newStatus.data.expectedBlobs !== newStatus.data.importedBlobs) {

     

       91
       91
       +
                     reasons.push("Expected blobs not fully imported.");

     

       92
       92
       +
                   }

     

       93
       93
       +
                   if (newStatus.data.importedBlobs < oldStatus.data.importedBlobs) {

     

       94
       94
       +
                     reasons.push("Not all blobs imported.");

     

       95
       95
       +
                   }

     

       96
       96
       +
       

     

       97
       97
       +
                   console.log("Status check: Step 2 not ready", { reasons });

     

       98
       98
       +
                   return { ready: false, reason: reasons.join(", ") };

     

       99
       99
       +
                 }

     

       100
       100
       +
                 case "3": {

     

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

     

       102
       102
       +
                     console.log("Status check: Step 3 ready");

     

       103
       103
       +
                     return { ready: true };

     

       104
       104
       +
                   }

     

       105
       105
       +
                   console.log("Status check: Step 3 not ready - DID not valid");

     

       106
       106
       +
                   return { ready: false, reason: "DID not valid" };

     

       107
       107
       +
                 }

     

       108
       108
       +
                 case "4": {

     

       109
       109
       +
                   if (

     

       110
       110
       +
                     newStatus.data.activated === true &&

     

       111
       111
       +
                     oldStatus.data.activated === false

     

       112
       112
       +
                   ) {

     

       113
       113
       +
                     console.log("Status check: Step 4 ready");

     

       114
       114
       +
                     return { ready: true };

     

       99
       115
        
                   }

     

       116
       116
       +
                   console.log(

     

       117
       117
       +
                     "Status check: Step 4 not ready - Account not activated",

     

       118
       118
       +
                   );

     

       119
       119
       +
                   return { ready: false, reason: "Account not activated" };

     

       120
       120
       +
                 }

     

       100
       121
        
               }

     

       122
       122
       +
             } else {

     

       123
       123
       +
               console.log("Status check: No step specified, returning ready");

     

       124
       124
       +
               return { ready: true };

     

       125
       125
       +
             }

     

       126
       126
       +
           };

     

       101
       127
        
       

     

       102
       102
       -
               const status = {

     

       103
       103
       -
                   activated: newStatus.data.activated,

     

       104
       104
       -
                   validDid: newStatus.data.validDid,

     

       105
       105
       -
                   repoCommit: newStatus.data.repoCommit,

     

       106
       106
       -
                   repoRev: newStatus.data.repoRev,

     

       107
       107
       -
                   repoBlocks: newStatus.data.repoBlocks,

     

       108
       108
       -
                   expectedRecords: oldStatus.data.indexedRecords,

     

       109
       109
       -
                   indexedRecords: newStatus.data.indexedRecords,

     

       110
       110
       -
                   privateStateValues: newStatus.data.privateStateValues,

     

       111
       111
       -
                   expectedBlobs: newStatus.data.expectedBlobs,

     

       112
       112
       -
                   importedBlobs: newStatus.data.importedBlobs,

     

       113
       113
       -
                   ...readyToContinue()

     

       114
       114
       -
               }

     

       128
       128
       +
           const status = {

     

       129
       129
       +
             activated: newStatus.data.activated,

     

       130
       130
       +
             validDid: newStatus.data.validDid,

     

       131
       131
       +
             repoCommit: newStatus.data.repoCommit,

     

       132
       132
       +
             repoRev: newStatus.data.repoRev,

     

       133
       133
       +
             repoBlocks: newStatus.data.repoBlocks,

     

       134
       134
       +
             expectedRecords: oldStatus.data.indexedRecords,

     

       135
       135
       +
             indexedRecords: newStatus.data.indexedRecords,

     

       136
       136
       +
             privateStateValues: newStatus.data.privateStateValues,

     

       137
       137
       +
             expectedBlobs: newStatus.data.expectedBlobs,

     

       138
       138
       +
             importedBlobs: newStatus.data.importedBlobs,

     

       139
       139
       +
             ...readyToContinue(),

     

       140
       140
       +
           };

     

       115
       141
        
       

     

       116
       116
       -
               console.log("Status check: Complete", status);

     

       117
       117
       -
               return Response.json(status);

     

       118
       118
       -
           }

     

       119
       119
       -
       })
     

       142
       142
       +
           console.log("Status check: Complete", status);

     

       143
       143
       +
           return Response.json(status);

     

       144
       144
       +
         },

     

       145
       145
       +
       });

+44

routes/api/migration-state.ts

···

       1
       1
       +
       import { getMigrationState } from "../../lib/migration-state.ts";

     

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

     

       3
       3
       +
       

     

       4
       4
       +
       /**

     

       5
       5
       +
        * API endpoint to check the current migration state.

     

       6
       6
       +
        * Returns the migration state information including whether migrations are allowed.

     

       7
       7
       +
        */

     

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

     

       9
       9
       +
         GET(_ctx) {

     

       10
       10
       +
           try {

     

       11
       11
       +
             const stateInfo = getMigrationState();

     

       12
       12
       +
       

     

       13
       13
       +
             return new Response(

     

       14
       14
       +
               JSON.stringify({

     

       15
       15
       +
                 state: stateInfo.state,

     

       16
       16
       +
                 message: stateInfo.message,

     

       17
       17
       +
                 allowMigration: stateInfo.allowMigration,

     

       18
       18
       +
               }),

     

       19
       19
       +
               {

     

       20
       20
       +
                 status: 200,

     

       21
       21
       +
                 headers: {

     

       22
       22
       +
                   "Content-Type": "application/json",

     

       23
       23
       +
                 },

     

       24
       24
       +
               }

     

       25
       25
       +
             );

     

       26
       26
       +
           } catch (error) {

     

       27
       27
       +
             console.error("Error checking migration state:", error);

     

       28
       28
       +
       

     

       29
       29
       +
             return new Response(

     

       30
       30
       +
               JSON.stringify({

     

       31
       31
       +
                 state: "issue",

     

       32
       32
       +
                 message: "Unable to determine migration state. Please try again later.",

     

       33
       33
       +
                 allowMigration: false,

     

       34
       34
       +
               }),

     

       35
       35
       +
               {

     

       36
       36
       +
                 status: 500,

     

       37
       37
       +
                 headers: {

     

       38
       38
       +
                   "Content-Type": "application/json",

     

       39
       39
       +
                 },

     

       40
       40
       +
               }

     

       41
       41
       +
             );

     

       42
       42
       +
           }

     

       43
       43
       +
         },

     

       44
       44
       +
       });

+2 -17

routes/index.tsx

···

       1
       1
        
       import Ticket from "../islands/Ticket.tsx";

     

       2
       2
        
       import AirportSign from "../components/AirportSign.tsx";

     

       3
       3
        
       import SocialLinks from "../islands/SocialLinks.tsx";

     

       4
       4
       -
       import { Button } from "../components/Button.tsx";

     

       4
       4
       +
       import LoginButton from "../islands/LoginButton.tsx";

     

       5
       5
        
       

     

       6
       6
        
       export default function Home() {

     

       7
       7
        
         return (

     
···

       14
       14
        
                   <p class="font-mono text-lg sm:text-xl font-bold mb-4 sm:mb-6 mt-0 text-center text-gray-600 dark:text-gray-300">

     

       15
       15
        
                     Your terminal for seamless AT Protocol PDS migration and backup.

     

       16
       16
        
                   </p>

     

       17
       17
       -
                   <p class="font-mono mb-4 sm:mb-6 mt-0 text-center text-gray-600 dark:text-gray-300">

     

       18
       18
       -
                     Airport is in <strong>alpha</strong> currently, and we don't recommend it for main accounts. <br/> Please use its migration tools at your own risk.

     

       19
       19
       -
                   </p>

     

       20
       17
        
       

     

       21
       18
        
                   <Ticket />

     

       22
       19
        
       

     

       23
       23
       -
                   <div class="mt-6 sm:mt-8 text-center w-fit mx-auto">

     

       24
       24
       -
                     <Button

     

       25
       25
       -
                       href="/login"

     

       26
       26
       -
                       color="blue"

     

       27
       27
       -
                       label="MOBILE NOT SUPPORTED"

     

       28
       28
       -
                       className="opacity-50 cursor-not-allowed sm:opacity-100 sm:cursor-pointer"

     

       29
       29
       -
                       onClick={(e: MouseEvent) => {

     

       30
       30
       -
                         if (globalThis.innerWidth < 640) {

     

       31
       31
       -
                           e.preventDefault();

     

       32
       32
       -
                         }

     

       33
       33
       -
                       }}

     

       34
       34
       -
                     />

     

       35
       35
       -
                   </div>

     

       20
       20
       +
                   <LoginButton />

     

       36
       21
        
                   <p class="font-mono text-lg sm:text-xl mb-4 mt-4 sm:mb-6 text-center text-gray-600 dark:text-gray-300">

     

       37
       22
        
                     Airport is made with love by <a class="text-blue-500 hover:underline" href="https://bsky.app/profile/knotbin.com">Roscoe</a> for <a class="text-blue-500 hover:underline" href="https://sprk.so">Spark</a>, a new short-video platform for AT Protocol.

     

       38
       23
        
                   </p>

+2 -2

routes/migrate/progress.tsx

···

       10
       10
        
       

     

       11
       11
        
         if (!service || !handle || !email || !password) {

     

       12
       12
        
           return (

     

       13
       13
       -
             <div class="min-h-screen bg-gray-50 dark:bg-gray-900 p-4">

     

       13
       13
       +
             <div class="bg-gray-50 dark:bg-gray-900 p-4">

     

       14
       14
        
               <div class="max-w-2xl mx-auto">

     

       15
       15
        
                 <div class="bg-red-50 dark:bg-red-900 p-4 rounded-lg">

     

       16
       16
        
                   <p class="text-red-800 dark:text-red-200">

     
···

       24
       24
        
         }

     

       25
       25
        
       

     

       26
       26
        
         return (

     

       27
       27
       -
           <div class="min-h-screen bg-gray-50 dark:bg-gray-900 p-4">

     

       27
       27
       +
           <div class="bg-gray-50 dark:bg-gray-900 p-4">

     

       28
       28
        
             <div class="max-w-2xl mx-auto">

     

       29
       29
        
               <h1 class="font-mono text-3xl font-bold text-gray-900 dark:text-white mb-8">

     

       30
       30
        
                 Migration Progress

Compare changes