@atproto/common-web 0.2.3 → 0.2.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atproto/common-web
 
+## 0.2.4
+
+### Patch Changes
+
+- [#2302](https://github.com/bluesky-social/atproto/pull/2302) [`4eaadc0ac`](https://github.com/bluesky-social/atproto/commit/4eaadc0acb6b73b9745dd7a2b929d02e58083ab0) Thanks [@dholms](https://github.com/dholms)! - Added methods for parsing labeler verification methods and services in DID Documents
+
 ## 0.2.3
 
 ### Patch Changes

package/LICENSE.txt

@@ -1,6 +1,6 @@
 Dual MIT/Apache-2.0 License
 
-Copyright (c) 2022-2023 Bluesky PBC, and Contributors
+Copyright (c) 2022-2024 Bluesky PBC, and Contributors
 
 Except as otherwise noted in individual files, this software is licensed under the MIT license (<http://opensource.org/licenses/MIT>), or the Apache License, Version 2.0 (<http://www.apache.org/licenses/LICENSE-2.0>).
 

package/dist/arrays.d.ts

@@ -1 +1,2 @@
+export declare const keyBy: <T>(arr: T[], key: string) => Record<string, T>;
 export declare const mapDefined: <T, S>(arr: T[], fn: (obj: T) => S | undefined) => S[];

package/dist/async.d.ts

@@ -1,5 +1,5 @@
 export declare const readFromGenerator: <T>(gen: AsyncGenerator<T, any, unknown>, isDone: (last?: T | undefined) => Promise<boolean> | boolean, waitFor?: Promise<unknown>, maxLength?: number) => Promise<T[]>;
-export declare type Deferrable = {
+export type Deferrable = {
     resolve: () => void;
     complete: Promise<void>;
 };
@@ -11,13 +11,18 @@ export declare class AsyncBuffer<T> {
     private buffer;
     private promise;
     private resolve;
+    private closed;
+    private toThrow;
     constructor(maxSize?: number | undefined);
     get curr(): T[];
     get size(): number;
+    get isClosed(): boolean;
     resetPromise(): void;
     push(item: T): void;
     pushMany(items: T[]): void;
     events(): AsyncGenerator<T>;
+    throw(err: unknown): void;
+    close(): void;
 }
 export declare class AsyncBufferFullError extends Error {
     constructor(maxSize: number);

package/dist/did-doc.d.ts

@@ -20,12 +20,17 @@ export declare const getSigningKey: (doc: DidDocument) => {
     type: string;
     publicKeyMultibase: string;
 } | undefined;
+export declare const getVerificationMaterial: (doc: DidDocument, keyId: string) => {
+    type: string;
+    publicKeyMultibase: string;
+} | undefined;
+export declare const getSigningDidKey: (doc: DidDocument) => string | undefined;
 export declare const getPdsEndpoint: (doc: DidDocument) => string | undefined;
 export declare const getFeedGenEndpoint: (doc: DidDocument) => string | undefined;
 export declare const getNotifEndpoint: (doc: DidDocument) => string | undefined;
 export declare const getServiceEndpoint: (doc: DidDocument, opts: {
     id: string;
-    type: string;
+    type?: string;
 }) => string | undefined;
 export declare const didDocument: z.ZodObject<{
     id: z.ZodString;
@@ -88,4 +93,4 @@ export declare const didDocument: z.ZodObject<{
         serviceEndpoint: (string | Record<string, unknown>) & (string | Record<string, unknown> | undefined);
     }[] | undefined;
 }>;
-export declare type DidDocument = z.infer<typeof didDocument>;
+export type DidDocument = z.infer<typeof didDocument>;

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export * from './async';
 export * from './util';
 export * from './tid';
 export * from './ipld';
+export * from './retry';
 export * from './types';
 export * from './times';
 export * from './strings';

package/dist/index.js

@@ -8827,9 +8827,11 @@ __export(src_exports2, {
   MINUTE: () => MINUTE,
   SECOND: () => SECOND,
   TID: () => TID,
+  addHoursToDate: () => addHoursToDate,
   allComplete: () => allComplete,
   asyncFilter: () => asyncFilter,
   b64UrlToUtf8: () => b64UrlToUtf8,
+  backoffMs: () => backoffMs,
   bailableWait: () => bailableWait,
   check: () => check_exports,
   chunkArray: () => chunkArray,
@@ -8846,7 +8848,9 @@ __export(src_exports2, {
   getNotifEndpoint: () => getNotifEndpoint,
   getPdsEndpoint: () => getPdsEndpoint,
   getServiceEndpoint: () => getServiceEndpoint,
+  getSigningDidKey: () => getSigningDidKey,
   getSigningKey: () => getSigningKey,
+  getVerificationMaterial: () => getVerificationMaterial,
   graphemeLen: () => graphemeLen,
   handleAllSettledErrors: () => handleAllSettledErrors,
   ipldEquals: () => ipldEquals,
@@ -8855,6 +8859,7 @@ __export(src_exports2, {
   isValidDidDoc: () => isValidDidDoc,
   jitter: () => jitter,
   jsonToIpld: () => jsonToIpld,
+  keyBy: () => keyBy,
   lessThanAgoMs: () => lessThanAgoMs,
   mapDefined: () => mapDefined,
   noUndefinedVals: () => noUndefinedVals,
@@ -8862,6 +8867,7 @@ __export(src_exports2, {
   parseLanguage: () => parseLanguage,
   range: () => range,
   readFromGenerator: () => readFromGenerator,
+  retry: () => retry,
   s32decode: () => s32decode,
   s32encode: () => s32encode,
   schema: () => schema,
@@ -9007,6 +9013,12 @@ var parseIntWithFallback = (value, fallback) => {
 };
 
 // src/arrays.ts
+var keyBy = (arr, key) => {
+  return arr.reduce((acc, cur) => {
+    acc[cur[key]] = cur;
+    return acc;
+  }, {});
+};
 var mapDefined = (arr, fn) => {
   const output = [];
   for (const item of arr) {
@@ -9076,6 +9088,7 @@ var AsyncBuffer = class {
   constructor(maxSize) {
     this.maxSize = maxSize;
     this.buffer = [];
+    this.closed = false;
     this.promise = Promise.resolve();
     this.resolve = () => null;
     this.resetPromise();
@@ -9086,6 +9099,9 @@ var AsyncBuffer = class {
   get size() {
     return this.buffer.length;
   }
+  get isClosed() {
+    return this.closed;
+  }
   resetPromise() {
     this.promise = new Promise((r) => this.resolve = r);
   }
@@ -9099,7 +9115,17 @@ var AsyncBuffer = class {
   }
   async *events() {
     while (true) {
+      if (this.closed && this.buffer.length === 0) {
+        if (this.toThrow) {
+          throw this.toThrow;
+        } else {
+          return;
+        }
+      }
       await this.promise;
+      if (this.toThrow) {
+        throw this.toThrow;
+      }
       if (this.maxSize && this.size > this.maxSize) {
         throw new AsyncBufferFullError(this.maxSize);
       }
@@ -9112,6 +9138,15 @@ var AsyncBuffer = class {
       }
     }
   }
+  throw(err) {
+    this.toThrow = err;
+    this.closed = true;
+    this.resolve();
+  }
+  close() {
+    this.closed = true;
+    this.resolve();
+  }
 };
 var AsyncBufferFullError = class extends Error {
   constructor(maxSize) {
@@ -10415,6 +10450,43 @@ var ipldEquals = (a, b) => {
   return a === b;
 };
 
+// src/retry.ts
+async function retry(fn, opts = {}) {
+  const { maxRetries = 3, retryable = () => true, getWaitMs = backoffMs } = opts;
+  let retries = 0;
+  let doneError;
+  while (!doneError) {
+    try {
+      return await fn();
+    } catch (err) {
+      const waitMs = getWaitMs(retries);
+      const willRetry = retries < maxRetries && waitMs !== null && retryable(err);
+      if (willRetry) {
+        retries += 1;
+        if (waitMs !== 0) {
+          await wait(waitMs);
+        }
+      } else {
+        doneError = err;
+      }
+    }
+  }
+  throw doneError;
+}
+function backoffMs(n, multiplier = 100, max = 1e3) {
+  const exponentialMs = Math.pow(2, n) * multiplier;
+  const ms = Math.min(exponentialMs, max);
+  return jitter2(ms);
+}
+function jitter2(value) {
+  const delta = value * 0.15;
+  return value + randomRange(-delta, delta);
+}
+function randomRange(from3, to) {
+  const rand = Math.random() * (to - from3);
+  return rand + from3;
+}
+
 // ../../node_modules/.pnpm/zod@3.21.4/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
@@ -14042,6 +14114,11 @@ var DAY = HOUR * 24;
 var lessThanAgoMs = (time, range2) => {
   return Date.now() < time.getTime() + range2;
 };
+var addHoursToDate = (hours, startingDate) => {
+  const currentDate = startingDate ? new Date(startingDate) : new Date();
+  currentDate.setHours(currentDate.getHours() + hours);
+  return currentDate;
+};
 
 // src/strings.ts
 var import_graphemer = __toESM(require_lib());
@@ -14100,6 +14177,9 @@ var getHandle = (doc) => {
   return found.slice(5);
 };
 var getSigningKey = (doc) => {
+  return getVerificationMaterial(doc, "atproto");
+};
+var getVerificationMaterial = (doc, keyId) => {
   const did = getDid(doc);
   let keys = doc.verificationMethod;
   if (!keys)
@@ -14109,7 +14189,7 @@ var getSigningKey = (doc) => {
   if (!Array.isArray(keys)) {
     keys = [keys];
   }
-  const found = keys.find((key) => key.id === "#atproto" || key.id === `${did}#atproto`);
+  const found = keys.find((key) => key.id === `#${keyId}` || key.id === `${did}#${keyId}`);
   if (!found?.publicKeyMultibase)
     return void 0;
   return {
@@ -14117,6 +14197,12 @@ var getSigningKey = (doc) => {
     publicKeyMultibase: found.publicKeyMultibase
   };
 };
+var getSigningDidKey = (doc) => {
+  const parsed = getSigningKey(doc);
+  if (!parsed)
+    return;
+  return `did:key:${parsed.publicKeyMultibase}`;
+};
 var getPdsEndpoint = (doc) => {
   return getServiceEndpoint(doc, {
     id: "#atproto_pds",
@@ -14148,7 +14234,7 @@ var getServiceEndpoint = (doc, opts) => {
   const found = services.find((service2) => service2.id === opts.id || service2.id === `${did}${opts.id}`);
   if (!found)
     return void 0;
-  if (found.type !== opts.type) {
+  if (opts.type && found.type !== opts.type) {
     return void 0;
   }
   if (typeof found.serviceEndpoint !== "string") {