@atproto/identity 0.1.0 → 0.2.0

package/dist/did/atproto-data.d.ts

@@ -4,5 +4,6 @@ export declare const getKey: (doc: DidDocument) => string | undefined;
 export declare const getHandle: (doc: DidDocument) => string | undefined;
 export declare const getPds: (doc: DidDocument) => string | undefined;
 export declare const getFeedGen: (doc: DidDocument) => string | undefined;
+export declare const getNotif: (doc: DidDocument) => string | undefined;
 export declare const parseToAtprotoDocument: (doc: DidDocument) => Partial<AtprotoData>;
 export declare const ensureAtpDocument: (doc: DidDocument) => AtprotoData;

package/dist/index.js

@@ -21279,6 +21279,7 @@ __export(src_exports3, {
   getFeedGen: () => getFeedGen,
   getHandle: () => getHandle,
   getKey: () => getKey,
+  getNotif: () => getNotif,
   getPds: () => getPds,
   parseToAtprotoDocument: () => parseToAtprotoDocument,
   service: () => service,
@@ -21292,7 +21293,8 @@ var import_axios = __toESM(require_axios2());
 // ../crypto/src/const.ts
 var P256_DID_PREFIX = new Uint8Array([128, 36]);
 var SECP256K1_DID_PREFIX = new Uint8Array([231, 1]);
-var BASE58_DID_PREFIX = "did:key:z";
+var BASE58_MULTIBASE_PREFIX = "z";
+var DID_KEY_PREFIX = "did:key:";
 var P256_JWT_ALG = "ES256";
 var SECP256K1_JWT_ALG = "ES256K";
 
@@ -24326,12 +24328,12 @@ var plugins = [plugin_default, plugin_default2];
 var plugins_default = plugins;
 
 // ../crypto/src/did.ts
-var parseDidKey = (did) => {
-  if (!did.startsWith(BASE58_DID_PREFIX)) {
-    throw new Error(`Incorrect prefix for did:key: ${did}`);
+var parseMultikey = (multikey) => {
+  if (!multikey.startsWith(BASE58_MULTIBASE_PREFIX)) {
+    throw new Error(`Incorrect prefix for multikey: ${multikey}`);
   }
   const prefixedBytes = fromString2(
-    did.slice(BASE58_DID_PREFIX.length),
+    multikey.slice(BASE58_MULTIBASE_PREFIX.length),
     "base58btc"
   );
   const plugin = plugins_default.find((p) => hasPrefix(prefixedBytes, p.prefix));
@@ -24349,7 +24351,7 @@ var parseDidKey = (did) => {
     keyBytes
   };
 };
-var formatDidKey = (jwtAlg, keyBytes) => {
+var formatMultikey = (jwtAlg, keyBytes) => {
   const plugin = plugins_default.find((p) => p.jwtAlg === jwtAlg);
   if (!plugin) {
     throw new Error("Unsupported key type");
@@ -24360,7 +24362,16 @@ var formatDidKey = (jwtAlg, keyBytes) => {
     keyBytes = compressPubkey2(keyBytes);
   }
   const prefixedBytes = concat([plugin.prefix, keyBytes]);
-  return BASE58_DID_PREFIX + toString2(prefixedBytes, "base58btc");
+  return BASE58_MULTIBASE_PREFIX + toString2(prefixedBytes, "base58btc");
+};
+var parseDidKey = (did) => {
+  if (!did.startsWith(DID_KEY_PREFIX)) {
+    throw new Error(`Incorrect prefix for did:key: ${did}`);
+  }
+  return parseMultikey(did.slice(DID_KEY_PREFIX.length));
+};
+var formatDidKey = (jwtAlg, keyBytes) => {
+  return DID_KEY_PREFIX + formatMultikey(jwtAlg, keyBytes);
 };
 var hasPrefix = (bytes2, prefix) => {
   return equals(prefix, bytes2.subarray(0, prefix.byteLength));
@@ -28080,6 +28091,7 @@ var getDid = (doc) => {
   return id;
 };
 var getKey = (doc) => {
+  const did = getDid(doc);
   let keys = doc.verificationMethod;
   if (!keys)
     return void 0;
@@ -28088,7 +28100,9 @@ var getKey = (doc) => {
   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 void 0;
   if (!found.publicKeyMultibase)
@@ -28099,6 +28113,9 @@ var getKey = (doc) => {
     didKey = formatDidKey(P256_JWT_ALG, keyBytes);
   } else if (found.type === "EcdsaSecp256k1VerificationKey2019") {
     didKey = formatDidKey(SECP256K1_JWT_ALG, keyBytes);
+  } else if (found.type === "Multikey") {
+    const parsed = parseMultikey(found.publicKeyMultibase);
+    didKey = formatDidKey(parsed.jwtAlg, parsed.keyBytes);
   }
   return didKey;
 };
@@ -28112,46 +28129,22 @@ var getHandle = (doc) => {
   return found.slice(5);
 };
 var getPds = (doc) => {
-  let services = doc.service;
-  if (!services)
-    return void 0;
-  if (typeof services !== "object")
-    return void 0;
-  if (!Array.isArray(services)) {
-    services = [services];
-  }
-  const found = services.find((service2) => service2.id === "#atproto_pds");
-  if (!found)
-    return void 0;
-  if (found.type !== "AtprotoPersonalDataServer") {
-    return void 0;
-  }
-  if (typeof found.serviceEndpoint !== "string") {
-    return void 0;
-  }
-  validateUrl(found.serviceEndpoint);
-  return found.serviceEndpoint;
+  return getServiceEndpoint(doc, {
+    id: "#atproto_pds",
+    type: "AtprotoPersonalDataServer"
+  });
 };
 var getFeedGen = (doc) => {
-  let services = doc.service;
-  if (!services)
-    return void 0;
-  if (typeof services !== "object")
-    return void 0;
-  if (!Array.isArray(services)) {
-    services = [services];
-  }
-  const found = services.find((service2) => service2.id === "#bsky_fg");
-  if (!found)
-    return void 0;
-  if (found.type !== "BskyFeedGenerator") {
-    return void 0;
-  }
-  if (typeof found.serviceEndpoint !== "string") {
-    return void 0;
-  }
-  validateUrl(found.serviceEndpoint);
-  return found.serviceEndpoint;
+  return getServiceEndpoint(doc, {
+    id: "#bsky_fg",
+    type: "BskyFeedGenerator"
+  });
+};
+var getNotif = (doc) => {
+  return getServiceEndpoint(doc, {
+    id: "#bsky_notif",
+    type: "BskyNotificationService"
+  });
 };
 var parseToAtprotoDocument = (doc) => {
   const did = getDid(doc);
@@ -28187,6 +28180,30 @@ var validateUrl = (url) => {
     throw new Error("Invalid pds hostname");
   }
 };
+var getServiceEndpoint = (doc, opts) => {
+  const did = getDid(doc);
+  let services = doc.service;
+  if (!services)
+    return void 0;
+  if (typeof services !== "object")
+    return void 0;
+  if (!Array.isArray(services)) {
+    services = [services];
+  }
+  const found = services.find(
+    (service2) => service2.id === opts.id || service2.id === `${did}${opts.id}`
+  );
+  if (!found)
+    return void 0;
+  if (found.type !== opts.type) {
+    return void 0;
+  }
+  if (typeof found.serviceEndpoint !== "string") {
+    return void 0;
+  }
+  validateUrl(found.serviceEndpoint);
+  return found.serviceEndpoint;
+};
 
 // src/errors.ts
 var DidNotFoundError = class extends Error {
@@ -28532,6 +28549,7 @@ var IdResolver = class {
   getFeedGen,
   getHandle,
   getKey,
+  getNotif,
   getPds,
   parseToAtprotoDocument,
   service,