···11-/*
22- * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
33- */
44-55-export * from './resolveMiniDoc.defs.js'
66-export * as $defs from './resolveMiniDoc.defs.js'
+17-15
packages/moover/lib/pdsmoover.js
···11-import { docResolver, cleanHandle, handleResolver } from './atprotoUtils.js'
11+import { docResolver, cleanHandle, handleResolver, handleAndPDSResolver } from './atprotoUtils.js'
22import { AtpAgent } from '@atproto/api'
3344function safeStatusUpdate(statusUpdateHandler, status) {
···7979 } else {
8080 //Resolves the did and finds the did document for the old PDS
8181 safeStatusUpdate(statusUpdateHandler, 'Resolving old PDS')
8282- usersDid = await handleResolver.resolve(oldHandle)
8383- const didDoc = await docResolver.resolve(usersDid)
8484- safeStatusUpdate(
8585- statusUpdateHandler,
8686- 'Resolving did document and finding your current PDS URL',
8787- )
8282+ let { usersDid: didFromLookUp, pds: oldPds } = await handleAndPDSResolver(oldHandle)
8383+ usersDid = didFromLookUp
8484+ // usersDid = await handleResolver.resolve(oldHandle)
8585+ // const didDoc = await docResolver.resolve(usersDid)
8686+ // safeStatusUpdate(
8787+ // statusUpdateHandler,
8888+ // 'Resolving did document and finding your current PDS URL',
8989+ // )
88908989- let oldPds
9090- try {
9191- oldPds = didDoc.service.filter(s => s.type === 'AtprotoPersonalDataServer')[0]
9292- .serviceEndpoint
9393- } catch (error) {
9494- console.error(error)
9595- throw new Error('Could not find a PDS in the DID document.')
9696- }
9191+ // let oldPds
9292+ // try {
9393+ // oldPds = didDoc.service.filter(s => s.type === 'AtprotoPersonalDataServer')[0]
9494+ // .serviceEndpoint
9595+ // } catch (error) {
9696+ // console.error(error)
9797+ // throw new Error('Could not find a PDS in the DID document.')
9898+ // }
979998100 oldAgent = new AtpAgent({
99101 service: oldPds,