@atproto/api 0.0.8 → 0.1.0

package/dist/index.js

@@ -120,12 +120,14 @@ __export(src_exports, {
   AppBskySystemDeclaration: () => declaration_exports,
   AppNS: () => AppNS,
   AssertionRecord: () => AssertionRecord,
+  AtpAgent: () => AtpAgent,
+  AtpBaseClient: () => AtpBaseClient,
+  AtpServiceClient: () => AtpServiceClient,
   AtprotoNS: () => AtprotoNS,
   BlobNS: () => BlobNS,
   BskyNS: () => BskyNS,
   COM_ATPROTO_ADMIN: () => COM_ATPROTO_ADMIN,
   COM_ATPROTO_REPORT: () => COM_ATPROTO_REPORT,
-  Client: () => Client2,
   ComAtprotoAccountCreate: () => create_exports,
   ComAtprotoAccountCreateInviteCode: () => createInviteCode_exports,
   ComAtprotoAccountDelete: () => delete_exports,
@@ -133,6 +135,7 @@ __export(src_exports, {
   ComAtprotoAccountRequestDelete: () => requestDelete_exports,
   ComAtprotoAccountRequestPasswordReset: () => requestPasswordReset_exports,
   ComAtprotoAccountResetPassword: () => resetPassword_exports,
+  ComAtprotoAdminBlob: () => blob_exports2,
   ComAtprotoAdminGetModerationAction: () => getModerationAction_exports,
   ComAtprotoAdminGetModerationActions: () => getModerationActions_exports,
   ComAtprotoAdminGetModerationReport: () => getModerationReport_exports,
@@ -187,17 +190,11 @@ __export(src_exports, {
   ReportNS: () => ReportNS,
   RepostRecord: () => RepostRecord,
   ServerNS: () => ServerNS,
-  ServiceClient: () => ServiceClient2,
-  SessionClient: () => SessionClient,
-  SessionManager: () => SessionManager,
   SessionNS: () => SessionNS,
-  SessionServiceClient: () => SessionServiceClient,
-  SessionXrpcServiceClient: () => SessionXrpcServiceClient,
   SyncNS: () => SyncNS,
   SystemNS: () => SystemNS,
   VoteRecord: () => VoteRecord,
-  default: () => client_default,
-  sessionClient: () => session_default
+  default: () => AtpAgent
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -4536,6 +4533,78 @@ var schemaDict = {
       }
     }
   },
+  ComAtprotoAdminBlob: {
+    lexicon: 1,
+    id: "com.atproto.admin.blob",
+    defs: {
+      view: {
+        type: "object",
+        required: ["cid", "mimeType", "size", "createdAt"],
+        properties: {
+          cid: {
+            type: "string"
+          },
+          mimeType: {
+            type: "string"
+          },
+          size: {
+            type: "integer"
+          },
+          createdAt: {
+            type: "datetime"
+          },
+          details: {
+            type: "union",
+            refs: [
+              "lex:com.atproto.admin.blob#imageDetails",
+              "lex:com.atproto.admin.blob#videoDetails"
+            ]
+          },
+          moderation: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.blob#moderation"
+          }
+        }
+      },
+      imageDetails: {
+        type: "object",
+        required: ["width", "height"],
+        properties: {
+          width: {
+            type: "integer"
+          },
+          height: {
+            type: "integer"
+          }
+        }
+      },
+      videoDetails: {
+        type: "object",
+        required: ["width", "height", "length"],
+        properties: {
+          width: {
+            type: "integer"
+          },
+          height: {
+            type: "integer"
+          },
+          length: {
+            type: "integer"
+          }
+        }
+      },
+      moderation: {
+        type: "object",
+        required: [],
+        properties: {
+          currentAction: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.moderationAction#viewCurrent"
+          }
+        }
+      }
+    }
+  },
   ComAtprotoAdminGetModerationAction: {
     lexicon: 1,
     id: "com.atproto.admin.getModerationAction",
@@ -4748,6 +4817,7 @@ var schemaDict = {
           "id",
           "action",
           "subject",
+          "subjectBlobCids",
           "reason",
           "createdBy",
           "createdAt",
@@ -4758,12 +4828,8 @@ var schemaDict = {
             type: "integer"
           },
           action: {
-            type: "string",
-            knownValues: [
-              "com.atproto.admin.moderationAction#takedown",
-              "com.atproto.admin.moderationAction#flag",
-              "com.atproto.admin.moderationAction#acknowledge"
-            ]
+            type: "ref",
+            ref: "lex:com.atproto.admin.moderationAction#actionType"
           },
           subject: {
             type: "union",
@@ -4772,6 +4838,12 @@ var schemaDict = {
               "lex:com.atproto.repo.strongRef"
             ]
           },
+          subjectBlobCids: {
+            type: "array",
+            items: {
+              type: "string"
+            }
+          },
           reason: {
             type: "string"
           },
@@ -4799,6 +4871,7 @@ var schemaDict = {
           "id",
           "action",
           "subject",
+          "subjectBlobs",
           "reason",
           "createdBy",
           "createdAt",
@@ -4809,12 +4882,8 @@ var schemaDict = {
             type: "integer"
           },
           action: {
-            type: "string",
-            knownValues: [
-              "com.atproto.admin.moderationAction#takedown",
-              "com.atproto.admin.moderationAction#flag",
-              "com.atproto.admin.moderationAction#acknowledge"
-            ]
+            type: "ref",
+            ref: "lex:com.atproto.admin.moderationAction#actionType"
           },
           subject: {
             type: "union",
@@ -4823,6 +4892,13 @@ var schemaDict = {
               "lex:com.atproto.admin.record#view"
             ]
           },
+          subjectBlobs: {
+            type: "array",
+            items: {
+              type: "ref",
+              ref: "lex:com.atproto.admin.blob#view"
+            }
+          },
           reason: {
             type: "string"
           },
@@ -4845,6 +4921,19 @@ var schemaDict = {
           }
         }
       },
+      viewCurrent: {
+        type: "object",
+        required: ["id", "action"],
+        properties: {
+          id: {
+            type: "integer"
+          },
+          action: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.moderationAction#actionType"
+          }
+        }
+      },
       reversal: {
         type: "object",
         required: ["reason", "createdBy", "createdAt"],
@@ -4860,6 +4949,14 @@ var schemaDict = {
           }
         }
       },
+      actionType: {
+        type: "string",
+        knownValues: [
+          "com.atproto.admin.moderationAction#takedown",
+          "com.atproto.admin.moderationAction#flag",
+          "com.atproto.admin.moderationAction#acknowledge"
+        ]
+      },
       takedown: {
         type: "token",
         description: "Moderation action type: Takedown. Indicates that content should not be served by the PDS."
@@ -4971,7 +5068,15 @@ var schemaDict = {
     defs: {
       view: {
         type: "object",
-        required: ["uri", "cid", "value", "indexedAt", "moderation", "repo"],
+        required: [
+          "uri",
+          "cid",
+          "value",
+          "blobCids",
+          "indexedAt",
+          "moderation",
+          "repo"
+        ],
         properties: {
           uri: {
             type: "string"
@@ -4982,6 +5087,12 @@ var schemaDict = {
           value: {
             type: "unknown"
           },
+          blobCids: {
+            type: "array",
+            items: {
+              type: "string"
+            }
+          },
           indexedAt: {
             type: "string"
           },
@@ -4997,7 +5108,15 @@ var schemaDict = {
       },
       viewDetail: {
         type: "object",
-        required: ["uri", "cid", "value", "indexedAt", "moderation", "repo"],
+        required: [
+          "uri",
+          "cid",
+          "value",
+          "blobs",
+          "indexedAt",
+          "moderation",
+          "repo"
+        ],
         properties: {
           uri: {
             type: "string"
@@ -5008,6 +5127,13 @@ var schemaDict = {
           value: {
             type: "unknown"
           },
+          blobs: {
+            type: "array",
+            items: {
+              type: "ref",
+              ref: "lex:com.atproto.admin.blob#view"
+            }
+          },
           indexedAt: {
             type: "string"
           },
@@ -5025,8 +5151,9 @@ var schemaDict = {
         type: "object",
         required: [],
         properties: {
-          takedownId: {
-            type: "integer"
+          currentAction: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.moderationAction#viewCurrent"
           }
         }
       },
@@ -5034,6 +5161,10 @@ var schemaDict = {
         type: "object",
         required: ["actions", "reports"],
         properties: {
+          currentAction: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.moderationAction#viewCurrent"
+          },
           actions: {
             type: "array",
             items: {
@@ -5047,9 +5178,6 @@ var schemaDict = {
               type: "ref",
               ref: "lex:com.atproto.admin.moderationReport#view"
             }
-          },
-          takedownId: {
-            type: "integer"
           }
         }
       }
@@ -5142,8 +5270,9 @@ var schemaDict = {
         type: "object",
         required: [],
         properties: {
-          takedownId: {
-            type: "integer"
+          currentAction: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.moderationAction#viewCurrent"
           }
         }
       },
@@ -5151,6 +5280,10 @@ var schemaDict = {
         type: "object",
         required: ["actions", "reports"],
         properties: {
+          currentAction: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.moderationAction#viewCurrent"
+          },
           actions: {
             type: "array",
             items: {
@@ -5164,9 +5297,6 @@ var schemaDict = {
               type: "ref",
               ref: "lex:com.atproto.admin.moderationReport#view"
             }
-          },
-          takedownId: {
-            type: "integer"
           }
         }
       }
@@ -5319,6 +5449,12 @@ var schemaDict = {
                   "lex:com.atproto.repo.recordRef"
                 ]
               },
+              subjectBlobCids: {
+                type: "array",
+                items: {
+                  type: "string"
+                }
+              },
               reason: {
                 type: "string"
               },
@@ -5334,7 +5470,12 @@ var schemaDict = {
             type: "ref",
             ref: "lex:com.atproto.admin.moderationAction#view"
           }
-        }
+        },
+        errors: [
+          {
+            name: "SubjectHasAction"
+          }
+        ]
       }
     }
   },
@@ -6482,18 +6623,6 @@ var schemaDict = {
           },
           indexedAt: {
             type: "datetime"
-          },
-          myState: {
-            type: "ref",
-            ref: "lex:app.bsky.actor.getSuggestions#myState"
-          }
-        }
-      },
-      myState: {
-        type: "object",
-        properties: {
-          follow: {
-            type: "string"
           }
         }
       }
@@ -8369,10 +8498,18 @@ function toKnownErr16(e) {
 // src/client/types/com/atproto/admin/takeModerationAction.ts
 var takeModerationAction_exports = {};
 __export(takeModerationAction_exports, {
+  SubjectHasActionError: () => SubjectHasActionError,
   toKnownErr: () => toKnownErr17
 });
+var SubjectHasActionError = class extends XRPCError {
+  constructor(src) {
+    super(src.status, src.error, src.message);
+  }
+};
 function toKnownErr17(e) {
   if (e instanceof XRPCError) {
+    if (e.error === "SubjectHasAction")
+      return new SubjectHasActionError(e);
   }
   return e;
 }
@@ -8686,10 +8823,8 @@ function validateMyState(v) {
 var getSuggestions_exports = {};
 __export(getSuggestions_exports, {
   isActor: () => isActor,
-  isMyState: () => isMyState2,
   toKnownErr: () => toKnownErr39,
-  validateActor: () => validateActor,
-  validateMyState: () => validateMyState2
+  validateActor: () => validateActor
 });
 function toKnownErr39(e) {
   if (e instanceof XRPCError) {
@@ -8702,12 +8837,6 @@ function isActor(v) {
 function validateActor(v) {
   return lexicons.validate("app.bsky.actor.getSuggestions#actor", v);
 }
-function isMyState2(v) {
-  return isObj2(v) && hasProp2(v, "$type") && v.$type === "app.bsky.actor.getSuggestions#myState";
-}
-function validateMyState2(v) {
-  return lexicons.validate("app.bsky.actor.getSuggestions#myState", v);
-}
 
 // src/client/types/app/bsky/actor/search.ts
 var search_exports = {};
@@ -9016,6 +9145,43 @@ function toKnownErr56(e) {
   return e;
 }
 
+// src/client/types/com/atproto/admin/blob.ts
+var blob_exports2 = {};
+__export(blob_exports2, {
+  isImageDetails: () => isImageDetails,
+  isModeration: () => isModeration,
+  isVideoDetails: () => isVideoDetails,
+  isView: () => isView,
+  validateImageDetails: () => validateImageDetails,
+  validateModeration: () => validateModeration,
+  validateVideoDetails: () => validateVideoDetails,
+  validateView: () => validateView
+});
+function isView(v) {
+  return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.blob#view";
+}
+function validateView(v) {
+  return lexicons.validate("com.atproto.admin.blob#view", v);
+}
+function isImageDetails(v) {
+  return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.blob#imageDetails";
+}
+function validateImageDetails(v) {
+  return lexicons.validate("com.atproto.admin.blob#imageDetails", v);
+}
+function isVideoDetails(v) {
+  return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.blob#videoDetails";
+}
+function validateVideoDetails(v) {
+  return lexicons.validate("com.atproto.admin.blob#videoDetails", v);
+}
+function isModeration(v) {
+  return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.blob#moderation";
+}
+function validateModeration(v) {
+  return lexicons.validate("com.atproto.admin.blob#moderation", v);
+}
+
 // src/client/types/com/atproto/admin/moderationAction.ts
 var moderationAction_exports = {};
 __export(moderationAction_exports, {
@@ -9023,16 +9189,18 @@ __export(moderationAction_exports, {
   FLAG: () => FLAG,
   TAKEDOWN: () => TAKEDOWN,
   isReversal: () => isReversal,
-  isView: () => isView,
+  isView: () => isView2,
+  isViewCurrent: () => isViewCurrent,
   isViewDetail: () => isViewDetail,
   validateReversal: () => validateReversal,
-  validateView: () => validateView,
+  validateView: () => validateView2,
+  validateViewCurrent: () => validateViewCurrent,
   validateViewDetail: () => validateViewDetail
 });
-function isView(v) {
+function isView2(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.moderationAction#view";
 }
-function validateView(v) {
+function validateView2(v) {
   return lexicons.validate("com.atproto.admin.moderationAction#view", v);
 }
 function isViewDetail(v) {
@@ -9041,6 +9209,12 @@ function isViewDetail(v) {
 function validateViewDetail(v) {
   return lexicons.validate("com.atproto.admin.moderationAction#viewDetail", v);
 }
+function isViewCurrent(v) {
+  return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.moderationAction#viewCurrent";
+}
+function validateViewCurrent(v) {
+  return lexicons.validate("com.atproto.admin.moderationAction#viewCurrent", v);
+}
 function isReversal(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.moderationAction#reversal";
 }
@@ -9054,15 +9228,15 @@ var ACKNOWLEDGE = "com.atproto.admin.moderationAction#acknowledge";
 // src/client/types/com/atproto/admin/moderationReport.ts
 var moderationReport_exports = {};
 __export(moderationReport_exports, {
-  isView: () => isView2,
+  isView: () => isView3,
   isViewDetail: () => isViewDetail2,
-  validateView: () => validateView2,
+  validateView: () => validateView3,
   validateViewDetail: () => validateViewDetail2
 });
-function isView2(v) {
+function isView3(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.moderationReport#view";
 }
-function validateView2(v) {
+function validateView3(v) {
   return lexicons.validate("com.atproto.admin.moderationReport#view", v);
 }
 function isViewDetail2(v) {
@@ -9075,19 +9249,19 @@ function validateViewDetail2(v) {
 // src/client/types/com/atproto/admin/record.ts
 var record_exports = {};
 __export(record_exports, {
-  isModeration: () => isModeration,
+  isModeration: () => isModeration2,
   isModerationDetail: () => isModerationDetail,
-  isView: () => isView3,
+  isView: () => isView4,
   isViewDetail: () => isViewDetail3,
-  validateModeration: () => validateModeration,
+  validateModeration: () => validateModeration2,
   validateModerationDetail: () => validateModerationDetail,
-  validateView: () => validateView3,
+  validateView: () => validateView4,
   validateViewDetail: () => validateViewDetail3
 });
-function isView3(v) {
+function isView4(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.record#view";
 }
-function validateView3(v) {
+function validateView4(v) {
   return lexicons.validate("com.atproto.admin.record#view", v);
 }
 function isViewDetail3(v) {
@@ -9096,10 +9270,10 @@ function isViewDetail3(v) {
 function validateViewDetail3(v) {
   return lexicons.validate("com.atproto.admin.record#viewDetail", v);
 }
-function isModeration(v) {
+function isModeration2(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.record#moderation";
 }
-function validateModeration(v) {
+function validateModeration2(v) {
   return lexicons.validate("com.atproto.admin.record#moderation", v);
 }
 function isModerationDetail(v) {
@@ -9113,20 +9287,20 @@ function validateModerationDetail(v) {
 var repo_exports = {};
 __export(repo_exports, {
   isAccount: () => isAccount,
-  isModeration: () => isModeration2,
+  isModeration: () => isModeration3,
   isModerationDetail: () => isModerationDetail2,
-  isView: () => isView4,
+  isView: () => isView5,
   isViewDetail: () => isViewDetail4,
   validateAccount: () => validateAccount,
-  validateModeration: () => validateModeration2,
+  validateModeration: () => validateModeration3,
   validateModerationDetail: () => validateModerationDetail2,
-  validateView: () => validateView4,
+  validateView: () => validateView5,
   validateViewDetail: () => validateViewDetail4
 });
-function isView4(v) {
+function isView5(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.repo#view";
 }
-function validateView4(v) {
+function validateView5(v) {
   return lexicons.validate("com.atproto.admin.repo#view", v);
 }
 function isViewDetail4(v) {
@@ -9141,10 +9315,10 @@ function isAccount(v) {
 function validateAccount(v) {
   return lexicons.validate("com.atproto.admin.repo#account", v);
 }
-function isModeration2(v) {
+function isModeration3(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.admin.repo#moderation";
 }
-function validateModeration2(v) {
+function validateModeration3(v) {
   return lexicons.validate("com.atproto.admin.repo#moderation", v);
 }
 function isModerationDetail2(v) {
@@ -9383,13 +9557,13 @@ __export(post_exports, {
   isRecord: () => isRecord4,
   isReplyRef: () => isReplyRef2,
   isTextSlice: () => isTextSlice,
-  isView: () => isView5,
+  isView: () => isView6,
   isViewerState: () => isViewerState2,
   validateEntity: () => validateEntity,
   validateRecord: () => validateRecord4,
   validateReplyRef: () => validateReplyRef2,
   validateTextSlice: () => validateTextSlice,
-  validateView: () => validateView5,
+  validateView: () => validateView6,
   validateViewerState: () => validateViewerState2
 });
 function isRecord4(v) {
@@ -9416,10 +9590,10 @@ function isTextSlice(v) {
 function validateTextSlice(v) {
   return lexicons.validate("app.bsky.feed.post#textSlice", v);
 }
-function isView5(v) {
+function isView6(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "app.bsky.feed.post#view";
 }
-function validateView5(v) {
+function validateView6(v) {
   return lexicons.validate("app.bsky.feed.post#view", v);
 }
 function isViewerState2(v) {
@@ -9558,18 +9732,16 @@ var APP_BSKY_GRAPH = {
 var APP_BSKY_SYSTEM = {
   ActorUser: "app.bsky.system.actorUser"
 };
-var Client2 = class {
+var AtpBaseClient = class {
   constructor() {
     this.xrpc = new Client();
     this.xrpc.addLexicons(schemas);
   }
   service(serviceUri) {
-    return new ServiceClient2(this, this.xrpc.service(serviceUri));
+    return new AtpServiceClient(this, this.xrpc.service(serviceUri));
   }
 };
-var defaultInst2 = new Client2();
-var client_default = defaultInst2;
-var ServiceClient2 = class {
+var AtpServiceClient = class {
   constructor(baseClient, xrpcService) {
     this._baseClient = baseClient;
     this.xrpc = xrpcService;
@@ -10277,129 +10449,189 @@ var DeclarationRecord = class {
   }
 };
 
-// src/session.ts
-var import_events = __toESM(require("events"));
-var CREATE_SESSION = "com.atproto.session.create";
+// src/agent.ts
 var REFRESH_SESSION = "com.atproto.session.refresh";
-var DELETE_SESSION = "com.atproto.session.delete";
-var CREATE_ACCOUNT = "com.atproto.account.create";
-var SessionClient = class extends Client2 {
-  service(serviceUri) {
-    const xrpcService = new SessionXrpcServiceClient(this.xrpc, serviceUri);
-    return new SessionServiceClient(this, xrpcService);
+var _AtpAgent = class {
+  static configure(opts) {
+    _AtpAgent.fetch = opts.fetch;
+  }
+  constructor(opts) {
+    this.service = opts.service instanceof URL ? opts.service : new URL(opts.service);
+    this._persistSession = opts.persistSession;
+    this._baseClient = new AtpBaseClient();
+    this._baseClient.xrpc.fetch = this._fetch.bind(this);
+    this.api = this._baseClient.service(opts.service);
+  }
+  get hasSession() {
+    return !!this.session;
   }
-};
-var defaultInst3 = new SessionClient();
-var session_default = defaultInst3;
-var SessionServiceClient = class extends ServiceClient2 {
-  constructor(baseClient, xrpcService) {
-    super(baseClient, xrpcService);
-    this.sessionManager = this.xrpc.sessionManager;
+  setPersistSessionHandler(handler) {
+    this._persistSession = handler;
   }
-};
-var SessionXrpcServiceClient = class extends ServiceClient {
-  constructor(baseClient, serviceUri) {
-    super(baseClient, serviceUri);
-    this.sessionManager = new SessionManager();
-    this.sessionManager.on("session", () => {
-      const accessHeaders = this.sessionManager.accessHeaders();
-      if (accessHeaders) {
-        this.setHeader("authorization", accessHeaders.authorization);
+  async createAccount(opts) {
+    try {
+      const res = await this.api.com.atproto.account.create({
+        handle: opts.handle,
+        password: opts.password,
+        email: opts.email,
+        inviteCode: opts.inviteCode
+      });
+      this.session = {
+        accessJwt: res.data.accessJwt,
+        refreshJwt: res.data.refreshJwt,
+        handle: res.data.handle,
+        did: res.data.did
+      };
+      return res;
+    } catch (e) {
+      this.session = void 0;
+      throw e;
+    } finally {
+      if (this.session) {
+        this._persistSession?.("create", this.session);
       } else {
-        this.unsetHeader("authorization");
+        this._persistSession?.("create-failed", void 0);
       }
-    });
-  }
-  async call(methodNsid, params2, data, opts) {
-    const original = (overrideOpts) => super.call(methodNsid, params2, data, overrideOpts ?? opts);
-    if (opts?.headers?.authorization) {
-      return await original();
-    }
-    if (methodNsid === REFRESH_SESSION) {
-      return await this.refresh(opts);
-    }
-    await this.refreshing;
-    if (methodNsid === CREATE_SESSION || methodNsid === CREATE_ACCOUNT) {
-      const result = await original();
-      const { accessJwt, refreshJwt } = result.data;
-      this.sessionManager.set({ accessJwt, refreshJwt });
-      return result;
-    }
-    if (methodNsid === DELETE_SESSION) {
-      const result = await original({
-        ...opts,
-        headers: {
-          ...opts?.headers,
-          ...this.sessionManager.refreshHeaders()
-        }
-      });
-      this.sessionManager.unset();
-      return result;
     }
+  }
+  async login(opts) {
     try {
-      return await original();
-    } catch (err) {
-      if (err instanceof XRPCError && err.status === 400 /* InvalidRequest */ && err.error === "ExpiredToken" && this.sessionManager.active()) {
-        await this.refresh(opts);
-        return await original();
+      const res = await this.api.com.atproto.session.create({
+        identifier: opts.identifier,
+        password: opts.password
+      });
+      this.session = {
+        accessJwt: res.data.accessJwt,
+        refreshJwt: res.data.refreshJwt,
+        handle: res.data.handle,
+        did: res.data.did
+      };
+      return res;
+    } catch (e) {
+      this.session = void 0;
+      throw e;
+    } finally {
+      if (this.session) {
+        this._persistSession?.("create", this.session);
+      } else {
+        this._persistSession?.("create-failed", void 0);
       }
-      throw err;
     }
   }
-  async refresh(opts) {
-    this.refreshing ?? (this.refreshing = this._refresh(opts));
+  async resumeSession(session) {
     try {
-      return await this.refreshing;
+      this.session = session;
+      const res = await this.api.com.atproto.session.get();
+      if (!res.success || res.data.did !== this.session.did) {
+        throw new Error("Invalid session");
+      }
+      return res;
+    } catch (e) {
+      this.session = void 0;
+      throw e;
     } finally {
-      this.refreshing = void 0;
+      if (this.session) {
+        this._persistSession?.("create", this.session);
+      } else {
+        this._persistSession?.("create-failed", void 0);
+      }
     }
   }
-  async _refresh(opts) {
-    try {
-      const result = await super.call(REFRESH_SESSION, void 0, void 0, {
-        ...opts,
-        headers: {
-          ...opts?.headers,
-          ...this.sessionManager.refreshHeaders()
-        }
-      });
-      const { accessJwt, refreshJwt } = result.data;
-      this.sessionManager.set({ accessJwt, refreshJwt });
-      return result;
-    } catch (err) {
-      if (err instanceof XRPCError && err.status === 400 /* InvalidRequest */ && (err.error === "ExpiredToken" || err.error === "InvalidToken")) {
-        this.sessionManager.unset();
-      }
-      throw err;
+  _addAuthHeader(reqHeaders) {
+    if (!reqHeaders.authorization && this.session?.accessJwt) {
+      return {
+        ...reqHeaders,
+        authorization: `Bearer ${this.session.accessJwt}`
+      };
     }
+    return reqHeaders;
   }
-};
-var SessionManager = class extends import_events.default {
-  get() {
-    return this.session;
+  async _fetch(reqUri, reqMethod, reqHeaders, reqBody) {
+    if (!_AtpAgent.fetch) {
+      throw new Error("AtpAgent fetch() method not configured");
+    }
+    await this._refreshSessionPromise;
+    let res = await _AtpAgent.fetch(
+      reqUri,
+      reqMethod,
+      this._addAuthHeader(reqHeaders),
+      reqBody
+    );
+    if (isErrorResponse(res, ["ExpiredToken"]) && this.session?.refreshJwt) {
+      await this._refreshSession();
+      res = await _AtpAgent.fetch(
+        reqUri,
+        reqMethod,
+        this._addAuthHeader(reqHeaders),
+        reqBody
+      );
+    }
+    return res;
   }
-  set(session) {
-    this.session = session;
-    this.emit("session", session);
+  async _refreshSession() {
+    if (this._refreshSessionPromise) {
+      return this._refreshSessionPromise;
+    }
+    this._refreshSessionPromise = this._refreshSessionInner();
+    try {
+      await this._refreshSessionPromise;
+    } finally {
+      this._refreshSessionPromise = void 0;
+    }
   }
-  unset() {
-    this.session = void 0;
-    this.emit("session", void 0);
+  async _refreshSessionInner() {
+    if (!_AtpAgent.fetch) {
+      throw new Error("AtpAgent fetch() method not configured");
+    }
+    if (!this.session?.refreshJwt) {
+      return;
+    }
+    const url = new URL(this.service.origin);
+    url.pathname = `/xrpc/${REFRESH_SESSION}`;
+    const res = await _AtpAgent.fetch(
+      url.toString(),
+      "POST",
+      {
+        authorization: `Bearer ${this.session.refreshJwt}`
+      },
+      void 0
+    );
+    if (isErrorResponse(res, ["ExpiredToken", "InvalidToken"])) {
+      this.session = void 0;
+      this._persistSession?.("expired", void 0);
+    } else if (isNewSessionObject(this._baseClient, res.body)) {
+      this.session = {
+        accessJwt: res.body.accessJwt,
+        refreshJwt: res.body.refreshJwt,
+        handle: res.body.handle,
+        did: res.body.did
+      };
+      this._persistSession?.("update", this.session);
+    }
   }
-  active() {
-    return !!this.session;
+};
+var AtpAgent = _AtpAgent;
+AtpAgent.fetch = defaultFetchHandler;
+function isErrorObject(v) {
+  return errorResponseBody.safeParse(v).success;
+}
+function isErrorResponse(res, errorNames) {
+  if (res.status !== 400) {
+    return false;
   }
-  accessHeaders() {
-    return this.session && {
-      authorization: `Bearer ${this.session.accessJwt}`
-    };
+  if (!isErrorObject(res.body)) {
+    return false;
   }
-  refreshHeaders() {
-    return this.session && {
-      authorization: `Bearer ${this.session.refreshJwt}`
-    };
+  return typeof res.body.error === "string" && errorNames.includes(res.body.error);
+}
+function isNewSessionObject(client, v) {
+  try {
+    client.xrpc.lex.assertValidXrpcOutput("com.atproto.session.refresh", v);
+    return true;
+  } catch {
+    return false;
   }
-};
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   APP_BSKY_GRAPH,
@@ -10444,12 +10676,14 @@ var SessionManager = class extends import_events.default {
   AppBskySystemDeclaration,
   AppNS,
   AssertionRecord,
+  AtpAgent,
+  AtpBaseClient,
+  AtpServiceClient,
   AtprotoNS,
   BlobNS,
   BskyNS,
   COM_ATPROTO_ADMIN,
   COM_ATPROTO_REPORT,
-  Client,
   ComAtprotoAccountCreate,
   ComAtprotoAccountCreateInviteCode,
   ComAtprotoAccountDelete,
@@ -10457,6 +10691,7 @@ var SessionManager = class extends import_events.default {
   ComAtprotoAccountRequestDelete,
   ComAtprotoAccountRequestPasswordReset,
   ComAtprotoAccountResetPassword,
+  ComAtprotoAdminBlob,
   ComAtprotoAdminGetModerationAction,
   ComAtprotoAdminGetModerationActions,
   ComAtprotoAdminGetModerationReport,
@@ -10511,15 +10746,9 @@ var SessionManager = class extends import_events.default {
   ReportNS,
   RepostRecord,
   ServerNS,
-  ServiceClient,
-  SessionClient,
-  SessionManager,
   SessionNS,
-  SessionServiceClient,
-  SessionXrpcServiceClient,
   SyncNS,
   SystemNS,
-  VoteRecord,
-  sessionClient
+  VoteRecord
 });
 //# sourceMappingURL=index.js.map