@atproto/bsky 0.0.206 → 0.0.208

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.206",
+  "version": "0.0.208",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -53,8 +53,8 @@
     "zod": "3.23.8",
     "@atproto-labs/fetch-node": "0.2.0",
     "@atproto-labs/xrpc-utils": "0.0.24",
-    "@atproto/api": "^0.18.11",
-    "@atproto/common": "^0.5.6",
+    "@atproto/api": "^0.18.12",
+    "@atproto/common": "^0.5.7",
     "@atproto/crypto": "^0.4.5",
     "@atproto/did": "^0.2.4",
     "@atproto/identity": "^0.4.10",
@@ -62,7 +62,7 @@
     "@atproto/repo": "^0.8.12",
     "@atproto/sync": "^0.1.39",
     "@atproto/syntax": "^0.4.2",
-    "@atproto/xrpc-server": "^0.10.7"
+    "@atproto/xrpc-server": "^0.10.8"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -78,9 +78,9 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.18.11",
+    "@atproto/api": "^0.18.12",
     "@atproto/lex-cli": "^0.9.8",
-    "@atproto/pds": "^0.4.202",
+    "@atproto/pds": "^0.4.203",
     "@atproto/xrpc": "^0.7.7"
   },
   "scripts": {

package/src/api/well-known.ts

@@ -1,13 +1,13 @@
 import { Router } from 'express'
+import { didWebToUrl, isDidWeb } from '@atproto/did'
 import { AppContext } from '../context'
 
 export const createRouter = (ctx: AppContext): Router => {
   const router = Router()
 
   const did = ctx.cfg.serverDid
-  if (did.startsWith('did:web:')) {
-    const hostname = did.slice('did:web:'.length)
-    const serviceEndpoint = `https://${hostname}`
+  if (isDidWeb(did)) {
+    const serviceEndpoint = didWebToUrl(did).origin
 
     router.get('/.well-known/did.json', (_req, res) => {
       res.json({

package/src/lexicon/lexicons.ts

@@ -812,6 +812,14 @@ export const schemaDict = {
         type: 'object',
         required: ['status', 'record'],
         properties: {
+          uri: {
+            type: 'string',
+            format: 'at-uri',
+          },
+          cid: {
+            type: 'string',
+            format: 'cid',
+          },
           status: {
             type: 'string',
             description: 'The status for the account.',

package/src/lexicon/types/app/bsky/actor/defs.ts

@@ -652,6 +652,8 @@ export function validatePostInteractionSettingsPref<V>(v: V) {
 
 export interface StatusView {
   $type?: 'app.bsky.actor.defs#statusView'
+  uri?: string
+  cid?: string
   /** The status for the account. */
   status: 'app.bsky.actor.status#live' | (string & {})
   record: { [_ in string]: unknown }

package/src/views/index.ts

@@ -545,7 +545,8 @@ export class Views {
     if (!actor?.status) return
 
     const { status } = actor
-    const { record, sortedAt } = status
+    const { record, sortedAt, cid } = status
+    const uri = AtUri.make(did, ids.AppBskyActorStatus, 'self').toString()
 
     const minDuration = 5 * MINUTE
     const maxDuration = 4 * HOUR
@@ -564,6 +565,8 @@ export class Views {
     const isActive = expiresAtMs ? expiresAtMs > Date.now() : undefined
 
     return {
+      uri,
+      cid,
       record: record,
       status: record.status,
       embed: isExternalEmbed(record.embed)

package/tests/views/__snapshots__/profile.test.ts.snap

@@ -703,6 +703,7 @@ Object {
 
 exports[`pds profile views status returns active status when within the duration 1`] = `
 Object {
+  "cid": "cids(0)",
   "embed": Object {
     "$type": "app.bsky.embed.external#view",
     "external": Object {
@@ -728,11 +729,13 @@ Object {
     "status": "app.bsky.actor.status#live",
   },
   "status": "app.bsky.actor.status#live",
+  "uri": "record(0)",
 }
 `;
 
 exports[`pds profile views status when outside the duration returns inactive status 1`] = `
 Object {
+  "cid": "cids(0)",
   "embed": Object {
     "$type": "app.bsky.embed.external#view",
     "external": Object {
@@ -741,11 +744,11 @@ Object {
       "uri": "https://example.com",
     },
   },
-  "expiresAt": "2021-01-01T01:10:00.000Z",
+  "expiresAt": "1970-01-01T00:00:00.000Z",
   "isActive": false,
   "record": Object {
     "$type": "app.bsky.actor.status",
-    "createdAt": "2021-01-01T01:00:00.000Z",
+    "createdAt": "1970-01-01T00:00:00.000Z",
     "durationMinutes": 10,
     "embed": Object {
       "$type": "app.bsky.embed.external",
@@ -758,5 +761,6 @@ Object {
     "status": "app.bsky.actor.status#live",
   },
   "status": "app.bsky.actor.status#live",
+  "uri": "record(0)",
 }
 `;

package/tests/views/profile.test.ts

@@ -490,7 +490,7 @@ describe('pds profile views', () => {
         )
 
         // Doesn't need `forSnapshot` because the dates are already mocked.
-        expect(data.status).toMatchSnapshot()
+        expect(forSnapshot(data.status)).toMatchSnapshot()
       })
     })
 
@@ -530,7 +530,7 @@ describe('pds profile views', () => {
           },
         )
 
-        expect(data.status).toBeUndefined()
+        expect(forSnapshot(data.status)).toBeUndefined()
       })
     })
   })