@atproto/identity 0.0.1 → 0.2.0

package/dist/types.d.ts

@@ -3,9 +3,11 @@ export declare type IdentityResolverOpts = {
     timeout?: number;
     plcUrl?: string;
     didCache?: DidCache;
+    backupNameservers?: string[];
 };
 export declare type HandleResolverOpts = {
     timeout?: number;
+    backupNameservers?: string[];
 };
 export declare type DidResolverOpts = {
     timeout?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/identity",
-  "version": "0.0.1",
+  "version": "0.2.0",
   "main": "dist/index.js",
   "license": "MIT",
   "repository": {

package/src/did/atproto-data.ts

@@ -10,13 +10,16 @@ export const getDid = (doc: DidDocument): string => {
 }
 
 export const getKey = (doc: DidDocument): string | undefined => {
+  const did = getDid(doc)
   let keys = doc.verificationMethod
   if (!keys) return undefined
   if (typeof keys !== 'object') return undefined
   if (!Array.isArray(keys)) {
     keys = [keys]
   }
-  const found = keys.find((key) => key.id === '#atproto')
+  const found = keys.find(
+    (key) => key.id === '#atproto' || key.id === `${did}#atproto`,
+  )
   if (!found) return undefined
 
   // @TODO support jwk
@@ -28,6 +31,9 @@ export const getKey = (doc: DidDocument): string | undefined => {
     didKey = crypto.formatDidKey(crypto.P256_JWT_ALG, keyBytes)
   } else if (found.type === 'EcdsaSecp256k1VerificationKey2019') {
     didKey = crypto.formatDidKey(crypto.SECP256K1_JWT_ALG, keyBytes)
+  } else if (found.type === 'Multikey') {
+    const parsed = crypto.parseMultikey(found.publicKeyMultibase)
+    didKey = crypto.formatDidKey(parsed.jwtAlg, parsed.keyBytes)
   }
   return didKey
 }
@@ -42,41 +48,24 @@ export const getHandle = (doc: DidDocument): string | undefined => {
 }
 
 export const getPds = (doc: DidDocument): string | undefined => {
-  let services = doc.service
-  if (!services) return undefined
-  if (typeof services !== 'object') return undefined
-  if (!Array.isArray(services)) {
-    services = [services]
-  }
-  const found = services.find((service) => service.id === '#atproto_pds')
-  if (!found) return undefined
-  if (found.type !== 'AtprotoPersonalDataServer') {
-    return undefined
-  }
-  if (typeof found.serviceEndpoint !== 'string') {
-    return undefined
-  }
-  validateUrl(found.serviceEndpoint)
-  return found.serviceEndpoint
+  return getServiceEndpoint(doc, {
+    id: '#atproto_pds',
+    type: 'AtprotoPersonalDataServer',
+  })
 }
 
 export const getFeedGen = (doc: DidDocument): string | undefined => {
-  let services = doc.service
-  if (!services) return undefined
-  if (typeof services !== 'object') return undefined
-  if (!Array.isArray(services)) {
-    services = [services]
-  }
-  const found = services.find((service) => service.id === '#bsky_fg')
-  if (!found) return undefined
-  if (found.type !== 'BskyFeedGenerator') {
-    return undefined
-  }
-  if (typeof found.serviceEndpoint !== 'string') {
-    return undefined
-  }
-  validateUrl(found.serviceEndpoint)
-  return found.serviceEndpoint
+  return getServiceEndpoint(doc, {
+    id: '#bsky_fg',
+    type: 'BskyFeedGenerator',
+  })
+}
+
+export const getNotif = (doc: DidDocument): string | undefined => {
+  return getServiceEndpoint(doc, {
+    id: '#bsky_notif',
+    type: 'BskyNotificationService',
+  })
 }
 
 export const parseToAtprotoDocument = (
@@ -118,3 +107,28 @@ const validateUrl = (url: string) => {
     throw new Error('Invalid pds hostname')
   }
 }
+
+const getServiceEndpoint = (
+  doc: DidDocument,
+  opts: { id: string; type: string },
+) => {
+  const did = getDid(doc)
+  let services = doc.service
+  if (!services) return undefined
+  if (typeof services !== 'object') return undefined
+  if (!Array.isArray(services)) {
+    services = [services]
+  }
+  const found = services.find(
+    (service) => service.id === opts.id || service.id === `${did}${opts.id}`,
+  )
+  if (!found) return undefined
+  if (found.type !== opts.type) {
+    return undefined
+  }
+  if (typeof found.serviceEndpoint !== 'string') {
+    return undefined
+  }
+  validateUrl(found.serviceEndpoint)
+  return found.serviceEndpoint
+}

package/src/handle/index.ts

@@ -6,9 +6,12 @@ const PREFIX = 'did='
 
 export class HandleResolver {
   public timeout: number
+  private backupNameservers: string[] | undefined
+  private backupNameserverIps: string[] | undefined
 
   constructor(opts: HandleResolverOpts = {}) {
     this.timeout = opts.timeout ?? 3000
+    this.backupNameservers = opts.backupNameservers
   }
 
   async resolve(handle: string): Promise<string | undefined> {
@@ -23,7 +26,11 @@ export class HandleResolver {
       httpAbort.abort()
       return dnsRes
     }
-    return httpPromise
+    const res = await httpPromise
+    if (res) {
+      return res
+    }
+    return this.resolveDnsBackup(handle)
   }
 
   async resolveDns(handle: string): Promise<string | undefined> {
@@ -33,12 +40,7 @@ export class HandleResolver {
     } catch (err) {
       return undefined
     }
-    const results = chunkedResults.map((chunks) => chunks.join(''))
-    const found = results.filter((i) => i.startsWith(PREFIX))
-    if (found.length !== 1) {
-      return undefined
-    }
-    return found[0].slice(PREFIX.length)
+    return this.parseDnsResult(chunkedResults)
   }
 
   async resolveHttp(
@@ -57,4 +59,44 @@ export class HandleResolver {
       return undefined
     }
   }
+
+  async resolveDnsBackup(handle: string): Promise<string | undefined> {
+    let chunkedResults: string[][]
+    try {
+      const backupIps = await this.getBackupNameserverIps()
+      if (!backupIps || backupIps.length < 1) return undefined
+      const resolver = new dns.Resolver()
+      resolver.setServers(backupIps)
+      chunkedResults = await resolver.resolveTxt(`${SUBDOMAIN}.${handle}`)
+    } catch (err) {
+      return undefined
+    }
+    return this.parseDnsResult(chunkedResults)
+  }
+
+  parseDnsResult(chunkedResults: string[][]): string | undefined {
+    const results = chunkedResults.map((chunks) => chunks.join(''))
+    const found = results.filter((i) => i.startsWith(PREFIX))
+    if (found.length !== 1) {
+      return undefined
+    }
+    return found[0].slice(PREFIX.length)
+  }
+
+  private async getBackupNameserverIps(): Promise<string[] | undefined> {
+    if (!this.backupNameservers) {
+      return undefined
+    } else if (!this.backupNameserverIps) {
+      const responses = await Promise.allSettled(
+        this.backupNameservers.map((h) => dns.lookup(h)),
+      )
+      for (const res of responses) {
+        if (res.status === 'fulfilled') {
+          this.backupNameserverIps ??= []
+          this.backupNameserverIps.push(res.value.address)
+        }
+      }
+    }
+    return this.backupNameserverIps
+  }
 }

package/src/id-resolver.ts

@@ -8,7 +8,10 @@ export class IdResolver {
 
   constructor(opts: IdentityResolverOpts = {}) {
     const { timeout = 3000, plcUrl, didCache } = opts
-    this.handle = new HandleResolver({ timeout })
+    this.handle = new HandleResolver({
+      timeout,
+      backupNameservers: opts.backupNameservers,
+    })
     this.did = new DidResolver({ timeout, plcUrl, didCache })
   }
 }

package/src/types.ts

@@ -4,10 +4,12 @@ export type IdentityResolverOpts = {
   timeout?: number
   plcUrl?: string
   didCache?: DidCache
+  backupNameservers?: string[]
 }
 
 export type HandleResolverOpts = {
   timeout?: number
+  backupNameservers?: string[]
 }
 
 export type DidResolverOpts = {

package/test.log

@@ -4814,3 +4814,18 @@
 {"level":30,"time":1684278727274,"pid":65486,"hostname":"Daniels-MBP.attlocal.net","req":{"id":5,"method":"GET","url":"/did%3Aplc%3Aasdf","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:51012","connection":"close"},"remoteAddress":"::1","remotePort":51026},"res":{"statusCode":404,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/json; charset=utf-8","content-length":"46","etag":"W/\"2e-ouyx9dlGpAF6gs2puC1AAUwbx84\""}},"responseTime":321,"msg":"request completed"}
 {"level":30,"time":1684278727276,"pid":65486,"hostname":"Daniels-MBP.attlocal.net","req":{"id":6,"method":"GET","url":"/did%3Aplc","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:51012","connection":"close"},"remoteAddress":"::1","remotePort":51027},"err":{"type":"ServerError","message":"DID not registered: did:plc","stack":"Error: DID not registered: did:plc\n    at /Users/dholms/Projects/bluesky/did-method-plc/packages/server/dist/index.js:63293:13\n    at processTicksAndRejections (node:internal/process/task_queues:95:5)","status":404},"msg":"handled server error"}
 {"level":30,"time":1684278727276,"pid":65486,"hostname":"Daniels-MBP.attlocal.net","req":{"id":6,"method":"GET","url":"/did%3Aplc","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:51012","connection":"close"},"remoteAddress":"::1","remotePort":51027},"res":{"statusCode":404,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/json; charset=utf-8","content-length":"41","etag":"W/\"29-pS6VolLLFKlzTQkRVMexS+2oUm8\""}},"responseTime":0,"msg":"request completed"}
+{"level":30,"time":1692316309954,"pid":36904,"hostname":"Daniels-MBP.attlocal.net","req":{"id":1,"method":"POST","url":"/did%3Aplc%3A4jfkmzpiy76fnm2sqnr6ou5n","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","content-type":"application/json","user-agent":"axios/1.3.4","content-length":"433","accept-encoding":"gzip, compress, deflate, br","host":"localhost:64197","connection":"close"},"remoteAddress":"::1","remotePort":64198},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"text/plain; charset=utf-8","content-length":"2","etag":"W/\"2-nOO9QiTIwXgNtWtBJezz8kv3SLc\""}},"responseTime":27,"msg":"request completed"}
+{"level":30,"time":1692316309975,"pid":36904,"hostname":"Daniels-MBP.attlocal.net","req":{"id":2,"method":"GET","url":"/did%3Aplc%3A4jfkmzpiy76fnm2sqnr6ou5n","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64197","connection":"close"},"remoteAddress":"::1","remotePort":64199},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"526","etag":"W/\"20e-Bz5tHB3Hmhzr3BdJmjjW66tBssI\""}},"responseTime":2,"msg":"request completed"}
+{"level":30,"time":1692316309982,"pid":36904,"hostname":"Daniels-MBP.attlocal.net","req":{"id":3,"method":"GET","url":"/did%3Aplc%3A4jfkmzpiy76fnm2sqnr6ou5n","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64197","connection":"close"},"remoteAddress":"::1","remotePort":64200},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"526","etag":"W/\"20e-Bz5tHB3Hmhzr3BdJmjjW66tBssI\""}},"responseTime":1,"msg":"request completed"}
+{"level":30,"time":1692316309983,"pid":36904,"hostname":"Daniels-MBP.attlocal.net","req":{"id":4,"method":"GET","url":"/did%3Aplc%3A4jfkmzpiy76fnm2sqnr6ou5n","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64197","connection":"close"},"remoteAddress":"::1","remotePort":64201},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"526","etag":"W/\"20e-Bz5tHB3Hmhzr3BdJmjjW66tBssI\""}},"responseTime":0,"msg":"request completed"}
+{"level":30,"time":1692316309991,"pid":36904,"hostname":"Daniels-MBP.attlocal.net","req":{"id":5,"method":"GET","url":"/did%3Aplc%3A4jfkmzpiy76fnm2sqnr6ou5n","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64197","connection":"close"},"remoteAddress":"::1","remotePort":64202},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"526","etag":"W/\"20e-Bz5tHB3Hmhzr3BdJmjjW66tBssI\""}},"responseTime":0,"msg":"request completed"}
+{"level":30,"time":1692316309994,"pid":36904,"hostname":"Daniels-MBP.attlocal.net","req":{"id":6,"method":"GET","url":"/did%3Aplc%3A4jfkmzpiy76fnm2sqnr6ou5n","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64197","connection":"close"},"remoteAddress":"::1","remotePort":64203},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"526","etag":"W/\"20e-Bz5tHB3Hmhzr3BdJmjjW66tBssI\""}},"responseTime":1,"msg":"request completed"}
+{"level":30,"time":1692316310002,"pid":36904,"hostname":"Daniels-MBP.attlocal.net","req":{"id":7,"method":"GET","url":"/did%3Aplc%3A4jfkmzpiy76fnm2sqnr6ou5n","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64197","connection":"close"},"remoteAddress":"::1","remotePort":64204},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"526","etag":"W/\"20e-Bz5tHB3Hmhzr3BdJmjjW66tBssI\""}},"responseTime":1,"msg":"request completed"}
+{"level":30,"time":1692316310138,"pid":36903,"hostname":"Daniels-MBP.attlocal.net","req":{"id":1,"method":"POST","url":"/did%3Aplc%3Aaqvw54euhbiaqangapth7iiq","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","content-type":"application/json","user-agent":"axios/1.3.4","content-length":"434","accept-encoding":"gzip, compress, deflate, br","host":"localhost:64206","connection":"close"},"remoteAddress":"::1","remotePort":64207},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"text/plain; charset=utf-8","content-length":"2","etag":"W/\"2-nOO9QiTIwXgNtWtBJezz8kv3SLc\""}},"responseTime":23,"msg":"request completed"}
+{"level":30,"time":1692316310148,"pid":36903,"hostname":"Daniels-MBP.attlocal.net","req":{"id":2,"method":"GET","url":"/did%3Aplc%3Aaqvw54euhbiaqangapth7iiq","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/1.3.4","accept-encoding":"gzip, compress, deflate, br","host":"localhost:64206","connection":"close"},"remoteAddress":"::1","remotePort":64208},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"527","etag":"W/\"20f-nrk1WS+r5hYW1H3OJW80loBMcdw\""}},"responseTime":1,"msg":"request completed"}
+{"level":30,"time":1692316313207,"pid":36903,"hostname":"Daniels-MBP.attlocal.net","req":{"id":3,"method":"GET","url":"/did%3Aplc%3Aaqvw54euhbiaqangapth7iiq","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64206","connection":"close"},"remoteAddress":"::1","remotePort":64212},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"527","etag":"W/\"20f-nrk1WS+r5hYW1H3OJW80loBMcdw\""}},"responseTime":1,"msg":"request completed"}
+{"level":30,"time":1692316313212,"pid":36903,"hostname":"Daniels-MBP.attlocal.net","req":{"id":4,"method":"GET","url":"/did%3Aplc%3Aaqvw54euhbiaqangapth7iiq","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64206","connection":"close"},"remoteAddress":"::1","remotePort":64213},"res":{"statusCode":200,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/did+ld+json; charset=utf-8","content-length":"527","etag":"W/\"20f-nrk1WS+r5hYW1H3OJW80loBMcdw\""}},"responseTime":1,"msg":"request completed"}
+{"level":30,"time":1692316313215,"pid":36903,"hostname":"Daniels-MBP.attlocal.net","req":{"id":5,"method":"GET","url":"/did%3Aplc%3Aasdf","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64206","connection":"close"},"remoteAddress":"::1","remotePort":64214},"err":{"type":"ServerError","message":"DID not registered: did:plc:asdf","stack":"Error: DID not registered: did:plc:asdf\n    at /Users/dholms/projects/bluesky/did-method-plc/packages/server/dist/index.js:63293:13\n    at processTicksAndRejections (node:internal/process/task_queues:95:5)","status":404},"msg":"handled server error"}
+{"level":30,"time":1692316313509,"pid":36903,"hostname":"Daniels-MBP.attlocal.net","req":{"id":5,"method":"GET","url":"/did%3Aplc%3Aasdf","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64206","connection":"close"},"remoteAddress":"::1","remotePort":64214},"res":{"statusCode":404,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/json; charset=utf-8","content-length":"46","etag":"W/\"2e-ouyx9dlGpAF6gs2puC1AAUwbx84\""}},"responseTime":294,"msg":"request completed"}
+{"level":30,"time":1692316313512,"pid":36903,"hostname":"Daniels-MBP.attlocal.net","req":{"id":6,"method":"GET","url":"/did%3Aplc","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64206","connection":"close"},"remoteAddress":"::1","remotePort":64215},"err":{"type":"ServerError","message":"DID not registered: did:plc","stack":"Error: DID not registered: did:plc\n    at /Users/dholms/projects/bluesky/did-method-plc/packages/server/dist/index.js:63293:13\n    at processTicksAndRejections (node:internal/process/task_queues:95:5)","status":404},"msg":"handled server error"}
+{"level":30,"time":1692316313512,"pid":36903,"hostname":"Daniels-MBP.attlocal.net","req":{"id":6,"method":"GET","url":"/did%3Aplc","query":{},"params":{},"headers":{"accept":"application/json, text/plain, */*","user-agent":"axios/0.27.2","host":"localhost:64206","connection":"close"},"remoteAddress":"::1","remotePort":64215},"res":{"statusCode":404,"headers":{"x-powered-by":"Express","access-control-allow-origin":"*","content-type":"application/json; charset=utf-8","content-length":"41","etag":"W/\"29-pS6VolLLFKlzTQkRVMexS+2oUm8\""}},"responseTime":0,"msg":"request completed"}

package/tests/did-document.test.ts

@@ -0,0 +1,103 @@
+import { DidResolver, ensureAtpDocument } from '../src'
+
+describe('did parsing', () => {
+  it('throws on bad DID document', async () => {
+    const did = 'did:plc:yk4dd2qkboz2yv6tpubpc6co'
+    const docJson = `{
+  "ideep": "did:plc:yk4dd2qkboz2yv6tpubpc6co",
+  "blah": [
+    "https://dholms.xyz"
+  ],
+  "zoot": [
+    {
+      "id": "#elsewhere",
+      "type": "EcdsaSecp256k1VerificationKey2019",
+      "controller": "did:plc:yk4dd2qkboz2yv6tpubpc6co",
+      "publicKeyMultibase": "zQYEBzXeuTM9UR3rfvNag6L3RNAs5pQZyYPsomTsgQhsxLdEgCrPTLgFna8yqCnxPpNT7DBk6Ym3dgPKNu86vt9GR"
+    }
+  ],
+  "yarg": [ ]
+}`
+    const resolver = new DidResolver({})
+    expect(() => {
+      resolver.validateDidDoc(did, JSON.parse(docJson))
+    }).toThrow()
+  })
+
+  it('parses legacy DID format, extracts atpData', async () => {
+    const did = 'did:plc:yk4dd2qkboz2yv6tpubpc6co'
+    const docJson = `{
+  "@context": [
+    "https://www.w3.org/ns/did/v1",
+    "https://w3id.org/security/suites/secp256k1-2019/v1"
+  ],
+  "id": "did:plc:yk4dd2qkboz2yv6tpubpc6co",
+  "alsoKnownAs": [
+    "at://dholms.xyz"
+  ],
+  "verificationMethod": [
+    {
+      "id": "#atproto",
+      "type": "EcdsaSecp256k1VerificationKey2019",
+      "controller": "did:plc:yk4dd2qkboz2yv6tpubpc6co",
+      "publicKeyMultibase": "zQYEBzXeuTM9UR3rfvNag6L3RNAs5pQZyYPsomTsgQhsxLdEgCrPTLgFna8yqCnxPpNT7DBk6Ym3dgPKNu86vt9GR"
+    }
+  ],
+  "service": [
+    {
+      "id": "#atproto_pds",
+      "type": "AtprotoPersonalDataServer",
+      "serviceEndpoint": "https://bsky.social"
+    }
+  ]
+}`
+    const resolver = new DidResolver({})
+    const doc = resolver.validateDidDoc(did, JSON.parse(docJson))
+    const atpData = ensureAtpDocument(doc)
+    expect(atpData.did).toEqual(did)
+    expect(atpData.handle).toEqual('dholms.xyz')
+    expect(atpData.pds).toEqual('https://bsky.social')
+    expect(atpData.signingKey).toEqual(
+      'did:key:zQ3shXjHeiBuRCKmM36cuYnm7YEMzhGnCmCyW92sRJ9pribSF',
+    )
+  })
+
+  it('parses newer Multikey DID format, extracts atpData', async () => {
+    const did = 'did:plc:yk4dd2qkboz2yv6tpubpc6co'
+    const docJson = `{
+  "@context": [
+    "https://www.w3.org/ns/did/v1",
+    "https://w3id.org/security/multikey/v1",
+    "https://w3id.org/security/suites/secp256k1-2019/v1"
+  ],
+  "id": "did:plc:yk4dd2qkboz2yv6tpubpc6co",
+  "alsoKnownAs": [
+    "at://dholms.xyz"
+  ],
+  "verificationMethod": [
+    {
+      "id": "did:plc:yk4dd2qkboz2yv6tpubpc6co#atproto",
+      "type": "Multikey",
+      "controller": "did:plc:yk4dd2qkboz2yv6tpubpc6co",
+      "publicKeyMultibase": "zQ3shXjHeiBuRCKmM36cuYnm7YEMzhGnCmCyW92sRJ9pribSF"
+    }
+  ],
+  "service": [
+    {
+      "id": "#atproto_pds",
+      "type": "AtprotoPersonalDataServer",
+      "serviceEndpoint": "https://bsky.social"
+    }
+  ]
+}`
+    const resolver = new DidResolver({})
+    const doc = resolver.validateDidDoc(did, JSON.parse(docJson))
+    const atpData = ensureAtpDocument(doc)
+    expect(atpData.did).toEqual(did)
+    expect(atpData.handle).toEqual('dholms.xyz')
+    expect(atpData.pds).toEqual('https://bsky.social')
+    expect(atpData.signingKey).toEqual(
+      'did:key:zQ3shXjHeiBuRCKmM36cuYnm7YEMzhGnCmCyW92sRJ9pribSF',
+    )
+  })
+})