@atproto/xrpc-server 0.10.2 → 0.10.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atproto/xrpc-server
 
+## 0.10.4
+
+### Patch Changes
+
+- Updated dependencies [[`b4a76ba`](https://github.com/bluesky-social/atproto/commit/b4a76bae7bef1189302488d43ce49a03fd61f957)]:
+  - @atproto/ws-client@0.0.4
+
+## 0.10.3
+
+### Patch Changes
+
+- Updated dependencies [[`693784c`](https://github.com/bluesky-social/atproto/commit/693784c3a0dee4b6a29aa1e018fce682dcae148f), [`d551b0e`](https://github.com/bluesky-social/atproto/commit/d551b0e3527714c111c3ec6e4c90ad7f46369fab), [`7e1d458`](https://github.com/bluesky-social/atproto/commit/7e1d45877bca0f615e7b1313cfcc66823b3de758)]:
+  - @atproto/lex-data@0.0.3
+  - @atproto/lexicon@0.6.0
+  - @atproto/lex-cbor@0.0.3
+  - @atproto/common@0.5.3
+  - @atproto/xrpc@0.7.7
+
 ## 0.10.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc-server",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) server library",
   "keywords": [
@@ -25,13 +25,13 @@
     "rate-limiter-flexible": "^2.4.1",
     "ws": "^8.12.0",
     "zod": "^3.23.8",
-    "@atproto/common": "^0.5.2",
+    "@atproto/common": "^0.5.3",
     "@atproto/crypto": "^0.4.5",
-    "@atproto/lex-data": "0.0.2",
-    "@atproto/lexicon": "^0.5.2",
-    "@atproto/lex-cbor": "0.0.2",
-    "@atproto/ws-client": "^0.0.3",
-    "@atproto/xrpc": "^0.7.6"
+    "@atproto/lex-data": "0.0.3",
+    "@atproto/lex-cbor": "0.0.3",
+    "@atproto/lexicon": "^0.6.0",
+    "@atproto/xrpc": "^0.7.7",
+    "@atproto/ws-client": "^0.0.4"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",

package/tests/subscriptions.test.ts

@@ -27,13 +27,14 @@ const LEXICONS: LexiconDoc[] = [
           },
         },
         message: {
-          schema: {
-            type: 'object',
-            required: ['count'],
-            properties: { count: { type: 'integer' } },
-          },
+          schema: { type: 'union', refs: ['#countdownStatus'] },
         },
       },
+      countdownStatus: {
+        type: 'object',
+        required: ['count'],
+        properties: { count: { type: 'integer' } },
+      },
     },
   },
   {
@@ -74,6 +75,30 @@ const LEXICONS: LexiconDoc[] = [
     defs: {
       main: {
         type: 'subscription',
+        message: {
+          schema: { type: 'union', refs: ['#auth'] },
+        },
+      },
+      auth: {
+        type: 'object',
+        properties: {
+          credentials: { type: 'ref', ref: '#credentials' },
+          artifacts: { type: 'ref', ref: '#artifacts' },
+        },
+      },
+      credentials: {
+        type: 'object',
+        required: ['username'],
+        properties: {
+          username: { type: 'string' },
+        },
+      },
+      artifacts: {
+        type: 'object',
+        required: ['original'],
+        properties: {
+          original: { type: 'string' },
+        },
       },
     },
   },
@@ -89,7 +114,7 @@ describe('Subscriptions', () => {
     const countdown = Number(params.countdown ?? 0)
     for (let i = countdown; i >= 0; i--) {
       await wait(0)
-      yield { count: i }
+      yield { $type: '#countdownStatus', count: i }
     }
   })
 
@@ -110,7 +135,7 @@ describe('Subscriptions', () => {
   server.streamMethod('io.example.streamAuth', {
     auth: createBasicAuth({ username: 'admin', password: 'password' }),
     handler: async function* ({ auth }) {
-      yield auth
+      yield { ...auth, $type: 'io.example.streamAuth#auth' }
     },
   })
 
@@ -135,12 +160,12 @@ describe('Subscriptions', () => {
     }
 
     expect(frames).toEqual([
-      new MessageFrame({ count: 5 }),
-      new MessageFrame({ count: 4 }),
-      new MessageFrame({ count: 3 }),
-      new MessageFrame({ count: 2 }),
-      new MessageFrame({ count: 1 }),
-      new MessageFrame({ count: 0 }),
+      new MessageFrame({ count: 5 }, { type: '#countdownStatus' }),
+      new MessageFrame({ count: 4 }, { type: '#countdownStatus' }),
+      new MessageFrame({ count: 3 }, { type: '#countdownStatus' }),
+      new MessageFrame({ count: 2 }, { type: '#countdownStatus' }),
+      new MessageFrame({ count: 1 }, { type: '#countdownStatus' }),
+      new MessageFrame({ count: 0 }, { type: '#countdownStatus' }),
     ])
   })
 
@@ -182,14 +207,19 @@ describe('Subscriptions', () => {
     }
 
     expect(frames).toEqual([
-      new MessageFrame({
-        credentials: {
-          username: 'admin',
+      new MessageFrame(
+        {
+          credentials: {
+            username: 'admin',
+          },
+          artifacts: {
+            original: 'YWRtaW46cGFzc3dvcmQ=',
+          },
         },
-        artifacts: {
-          original: 'YWRtaW46cGFzc3dvcmQ=',
+        {
+          type: '#auth',
         },
-      }),
+      ),
     ])
   })
 
@@ -266,10 +296,10 @@ describe('Subscriptions', () => {
       }
 
       expect(messages).toEqual([
-        { count: 5 },
-        { count: 3 },
-        { count: 1 },
-        { count: 0 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 5 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 3 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 1 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 0 },
       ])
     })
 
@@ -338,11 +368,11 @@ describe('Subscriptions', () => {
 
       expect(error).toEqual(new Error('Oops!'))
       expect(messages).toEqual([
-        { count: 10 },
-        { count: 9 },
-        { count: 8 },
-        { count: 7 },
-        { count: 6 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 10 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 9 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 8 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 7 },
+        { $type: 'io.example.streamOne#countdownStatus', count: 6 },
       ])
     })
   })