@atproto/xrpc-server 0.3.1 → 0.3.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atproto/xrpc-server
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto/common@0.3.2
+  - @atproto/lexicon@0.2.3
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto/common@0.3.1
+  - @atproto/lexicon@0.2.2
+
 ## 0.3.1
 
 ### Patch Changes

package/README.md

@@ -1,4 +1,9 @@
-# XRPC Server API
+# @atproto/xrpc-server: atproto HTTP API server library
+
+TypeScript library for implementing [atproto](https://atproto.com) HTTP API services, with Lexicon schema validation.
+
+[![NPM](https://img.shields.io/npm/v/@atproto/xrpc-server)](https://www.npmjs.com/package/@atproto/xrpc-server)
+[![Github CI Status](https://github.com/bluesky-social/atproto/actions/workflows/repo.yaml/badge.svg)](https://github.com/bluesky-social/atproto/actions/workflows/repo.yaml)
 
 ## Usage
 

package/dist/index.js

@@ -44909,6 +44909,25 @@ var validateLanguage = (langTag) => {
 };
 var bcp47Regexp = /^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-(?<extension>[0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(?<privateUseA>x(-[A-Za-z0-9]{1,8})+))?)|(?<privateUseB>x(-[A-Za-z0-9]{1,8})+))$/;
 
+// ../common-web/src/did-doc.ts
+var verificationMethod = z.object({
+  id: z.string(),
+  type: z.string(),
+  controller: z.string(),
+  publicKeyMultibase: z.string().optional()
+});
+var service = z.object({
+  id: z.string(),
+  type: z.string(),
+  serviceEndpoint: z.union([z.string(), z.record(z.unknown())])
+});
+var didDocument = z.object({
+  id: z.string(),
+  alsoKnownAs: z.array(z.string()).optional(),
+  verificationMethod: z.array(verificationMethod).optional(),
+  service: z.array(service).optional()
+});
+
 // ../lexicon/src/validators/formats.ts
 var import_iso_datestring_validator = __toESM(require_dist());
 function datetime(path, value) {
@@ -45621,7 +45640,7 @@ var lexObject = z.object({
   description: z.string().optional(),
   required: z.string().array().optional(),
   nullable: z.string().array().optional(),
-  properties: z.record(z.union([lexRefVariant, lexIpldType, lexArray, lexBlob, lexPrimitive])).optional()
+  properties: z.record(z.union([lexRefVariant, lexIpldType, lexArray, lexBlob, lexPrimitive]))
 }).strict().superRefine(requiredPropertiesRefinement);
 var lexXrpcParameters = z.object({
   type: z.literal("params"),
@@ -46316,7 +46335,7 @@ var XRPCError2 = class extends Error {
   }
 };
 function isHandlerError(v) {
-  return handlerError.safeParse(v).success;
+  return !!v && typeof v === "object" && typeof v["status"] === "number" && (v["error"] === void 0 || typeof v["error"] === "string") && (v["message"] === void 0 || typeof v["message"] === "string");
 }
 var InvalidRequestError = class extends XRPCError2 {
   constructor(errorMessage, customErrorName) {
@@ -46365,6 +46384,9 @@ var MethodNotImplementedError = class extends XRPCError2 {
   }
 };
 
+// ../common/src/dates.ts
+var import_iso_datestring_validator2 = __toESM(require_dist());
+
 // ../../node_modules/.pnpm/cborg@1.10.2/node_modules/cborg/esm/lib/is.js
 var typeofs = [
   "string",
@@ -52646,7 +52668,8 @@ var import_rate_limiter_flexible = __toESM(require_rate_limiter_flexible());
 var RateLimiter = class {
   constructor(limiter, opts) {
     this.limiter = limiter;
-    this.byPassSecret = opts.bypassSecret;
+    this.bypassSecret = opts.bypassSecret;
+    this.bypassIps = opts.bypassIps;
     this.calcKey = opts.calcKey ?? defaultKey;
     this.calcPoints = opts.calcPoints ?? defaultPoints;
   }
@@ -52668,7 +52691,10 @@ var RateLimiter = class {
     return new RateLimiter(limiter, opts);
   }
   async consume(ctx, opts) {
-    if (this.byPassSecret && ctx.req.header("x-ratelimit-bypass") === this.byPassSecret) {
+    if (this.bypassSecret && ctx.req.header("x-ratelimit-bypass") === this.bypassSecret) {
+      return null;
+    }
+    if (this.bypassIps && this.bypassIps.includes(ctx.req.ip)) {
       return null;
     }
     const key = opts?.calcKey ? opts.calcKey(ctx) : this.calcKey(ctx);
@@ -52989,7 +53015,8 @@ var Server = class {
     if (config2.rateLimit) {
       const limits = Array.isArray(config2.rateLimit) ? config2.rateLimit : [config2.rateLimit];
       this.routeRateLimiterFns[nsid2] = [];
-      for (const limit of limits) {
+      for (let i = 0; i < limits.length; i++) {
+        const limit = limits[i];
         const { calcKey, calcPoints } = limit;
         if (isShared(limit)) {
           const rateLimiter = this.sharedRateLimiters[limit.name];
@@ -53003,7 +53030,7 @@ var Server = class {
         } else {
           const { durationMs, points } = limit;
           const rateLimiter = this.options.rateLimits?.creator({
-            keyPrefix: nsid2,
+            keyPrefix: `nsid-${i}`,
             durationMs,
             points,
             calcKey,