@atproto/pds 0.4.217 → 0.4.218

package/dist/repo/prepare.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/repo/prepare.ts"],"names":[],"mappings":"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","sourcesContent":["import { TID } from '@atproto/common'\nimport { RecordSchema } from '@atproto/lex'\nimport { encode } from '@atproto/lex-cbor'\nimport {\n  BlobRef,\n  Cid,\n  LexMap,\n  TypedLexMap,\n  cidForCbor,\n  enumBlobRefs,\n  isLegacyBlobRef,\n} from '@atproto/lex-data'\nimport {\n  RecordCreateOp,\n  RecordDeleteOp,\n  RecordUpdateOp,\n  RecordWriteOp,\n  WriteOpAction,\n} from '@atproto/repo'\nimport {\n  AtUri,\n  DidString,\n  NsidString,\n  RecordKeyString,\n  isValidRecordKey,\n} from '@atproto/syntax'\nimport { hasExplicitSlur } from '../handle/explicit-slurs'\nimport { app, chat, com } from '../lexicons/index.js'\nimport {\n  InvalidRecordError,\n  PreparedCreate,\n  PreparedDelete,\n  PreparedUpdate,\n  PreparedWrite,\n  ValidationStatus,\n} from './types'\n\n// @TODO replace this with automatically fetched (& built) schemas\nconst knownSchemas = new Map<string, RecordSchema>(\n  [\n    app.bsky.actor.profile.main,\n    app.bsky.actor.status.main,\n    app.bsky.feed.generator.main,\n    app.bsky.feed.like.main,\n    app.bsky.feed.post.main,\n    app.bsky.feed.postgate.main,\n    app.bsky.feed.repost.main,\n    app.bsky.feed.threadgate.main,\n    app.bsky.graph.block.main,\n    app.bsky.graph.follow.main,\n    app.bsky.graph.list.main,\n    app.bsky.graph.listblock.main,\n    app.bsky.graph.listitem.main,\n    app.bsky.graph.starterpack.main,\n    app.bsky.graph.verification.main,\n    app.bsky.labeler.service.main,\n    app.bsky.notification.declaration.main,\n    chat.bsky.actor.declaration.main,\n    com.atproto.lexicon.schema.main,\n    com.germnetwork.declaration.main,\n  ].map((schema: RecordSchema) => [schema.$type, schema]),\n)\n\nconst validateRecord = (\n  record: TypedLexMap,\n  rkey: RecordKeyString,\n  opts: {\n    validate?: boolean\n    validationPath?: (string | number)[]\n  },\n): undefined | ValidationStatus => {\n  // If validation is explicitly disabled, skip it\n  if (opts.validate === false) {\n    return undefined\n  }\n\n  // @TODO add support for lexicon resolution to fetch the schema dynamically\n  const schema = knownSchemas.get(record.$type)\n  if (!schema) {\n    // If validation is explicitly requested, throw if unable to validate\n    if (opts.validate === true) {\n      throw new InvalidRecordError(`Unknown lexicon type: ${record.$type}`)\n    } else {\n      return 'unknown'\n    }\n  }\n\n  const rkeyResult = schema.keySchema.safeValidate(rkey)\n  if (!rkeyResult.success) {\n    throw new InvalidRecordError(\n      `Invalid record key for ${record.$type}: ${rkeyResult.reason.message}`,\n      { cause: rkeyResult.reason },\n    )\n  }\n\n  const recordResult = schema.safeValidate(record, {\n    path: opts.validationPath ?? ['record'],\n  })\n  if (!recordResult.success) {\n    throw new InvalidRecordError(\n      `Invalid ${record.$type} record: ${recordResult.reason.message}`,\n      { cause: recordResult.reason },\n    )\n  }\n\n  return 'valid'\n}\n\nexport const prepareCreate = async (opts: {\n  did: DidString\n  collection: NsidString\n  rkey?: RecordKeyString\n  swapCid?: Cid | null\n  record: LexMap\n  validate?: boolean\n  validationPath?: (string | number)[]\n}): Promise<PreparedCreate> => {\n  const { cid, uri, record, blobs, validationStatus } = await prepareWrite(opts)\n\n  return {\n    action: WriteOpAction.Create,\n    uri,\n    cid,\n    swapCid: opts.swapCid,\n    record,\n    blobs,\n    validationStatus,\n  }\n}\n\nexport const prepareUpdate = async (opts: {\n  did: DidString\n  collection: NsidString\n  rkey: RecordKeyString\n  swapCid?: Cid | null\n  record: LexMap\n  validate?: boolean\n  validationPath?: (string | number)[]\n}): Promise<PreparedUpdate> => {\n  const { cid, uri, record, blobs, validationStatus } = await prepareWrite(opts)\n\n  return {\n    action: WriteOpAction.Update,\n    uri,\n    cid,\n    swapCid: opts.swapCid,\n    record,\n    blobs,\n    validationStatus,\n  }\n}\n\nasync function prepareWrite(opts: {\n  did: string\n  collection: NsidString\n  rkey?: RecordKeyString\n  record: LexMap\n  validate?: boolean\n  validationPath?: (string | number)[]\n}): Promise<{\n  record: TypedLexMap\n  blobs: BlobRef[]\n  validationStatus?: ValidationStatus\n  uri: AtUri\n  cid: Cid\n}> {\n  const record: null | TypedLexMap =\n    opts.record.$type === undefined\n      ? { ...opts.record, $type: opts.collection }\n      : opts.record.$type === opts.collection\n        ? (opts.record as TypedLexMap)\n        : null\n\n  if (!record) {\n    throw new InvalidRecordError(\n      `Invalid $type: expected ${opts.collection}, got ${opts.record.$type}`,\n    )\n  }\n\n  // @NOTE the rkey will be validated against the schema later\n  if (opts.rkey != null) {\n    if (!isValidRecordKey(opts.rkey)) {\n      throw new InvalidRecordError(`Invalid record key: ${opts.rkey}`)\n    }\n    if (hasExplicitSlur(opts.rkey)) {\n      throw new InvalidRecordError('Unacceptable slur in record key')\n    }\n  }\n\n  const nextRkey = TID.next()\n  const rkey = opts.rkey || nextRkey.toString()\n\n  return {\n    record,\n    // @NOTE we validate before enumerating blobs, so that we can provide more\n    // accurate validations error (esp. in case of legacy blobs).\n    validationStatus: validateRecord(record, rkey, opts),\n    blobs: Array.from(\n      enumBlobRefs(record, { strict: false, allowLegacy: true }),\n      (blob) => {\n        // @NOTE as we migrated from legacy blobs to non legacy blobs, we wanted\n        // to prevent the creation of legacy blobs. Note that this prevents the\n        // creation of (legitimate) records that have the same shape as legacy\n        // blob refs ({ cid: \"<cid>\", mimeType: \"<mime-type>\" }), but this was\n        // deemed an acceptable tradeoff to prevent the creation of new legacy\n        // blobs. Since that migration happened a while ago, we can probably\n        // remove this check in the future, by removing the \"allowLegacy\" option.\n        if (isLegacyBlobRef(blob)) {\n          throw new InvalidRecordError(\n            `Legacy blobs are not allowed (${blob.cid})`,\n          )\n        }\n        return blob\n      },\n    ),\n    uri: AtUri.make(opts.did, opts.collection, rkey),\n    cid: await cidForCbor(encode(record)),\n  }\n}\n\nexport const prepareDelete = (opts: {\n  did: DidString\n  collection: NsidString\n  rkey: RecordKeyString\n  swapCid?: Cid | null\n}): PreparedDelete => {\n  const { did, collection, rkey, swapCid } = opts\n  return {\n    action: WriteOpAction.Delete,\n    uri: AtUri.make(did, collection, rkey),\n    swapCid,\n  }\n}\n\nexport const createWriteToOp = (write: PreparedCreate): RecordCreateOp => ({\n  action: WriteOpAction.Create,\n  collection: write.uri.collectionSafe,\n  rkey: write.uri.rkeySafe,\n  record: write.record,\n})\n\nexport const updateWriteToOp = (write: PreparedUpdate): RecordUpdateOp => ({\n  action: WriteOpAction.Update,\n  collection: write.uri.collectionSafe,\n  rkey: write.uri.rkeySafe,\n  record: write.record,\n})\n\nexport const deleteWriteToOp = (write: PreparedDelete): RecordDeleteOp => ({\n  action: WriteOpAction.Delete,\n  collection: write.uri.collectionSafe,\n  rkey: write.uri.rkeySafe,\n})\n\nexport const writeToOp = (write: PreparedWrite): RecordWriteOp => {\n  switch (write.action) {\n    case WriteOpAction.Create:\n      return createWriteToOp(write)\n    case WriteOpAction.Update:\n      return updateWriteToOp(write)\n    case WriteOpAction.Delete:\n      return deleteWriteToOp(write)\n    default:\n      throw new Error(`Unrecognized action: ${write}`)\n  }\n}\n"]}
+{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/repo/prepare.ts"],"names":[],"mappings":"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","sourcesContent":["import { TID } from '@atproto/common'\nimport { RecordSchema } from '@atproto/lex'\nimport { encode } from '@atproto/lex-cbor'\nimport {\n  Cid,\n  LexMap,\n  TypedBlobRef,\n  TypedLexMap,\n  cidForCbor,\n  enumBlobRefs,\n  isLegacyBlobRef,\n} from '@atproto/lex-data'\nimport {\n  RecordCreateOp,\n  RecordDeleteOp,\n  RecordUpdateOp,\n  RecordWriteOp,\n  WriteOpAction,\n} from '@atproto/repo'\nimport {\n  AtUri,\n  DidString,\n  NsidString,\n  RecordKeyString,\n  isValidRecordKey,\n} from '@atproto/syntax'\nimport { hasExplicitSlur } from '../handle/explicit-slurs'\nimport { app, chat, com } from '../lexicons/index.js'\nimport {\n  InvalidRecordError,\n  PreparedCreate,\n  PreparedDelete,\n  PreparedUpdate,\n  PreparedWrite,\n  ValidationStatus,\n} from './types'\n\n// @TODO replace this with automatically fetched (& built) schemas\nconst knownSchemas = new Map<string, RecordSchema>(\n  [\n    app.bsky.actor.profile.main,\n    app.bsky.actor.status.main,\n    app.bsky.feed.generator.main,\n    app.bsky.feed.like.main,\n    app.bsky.feed.post.main,\n    app.bsky.feed.postgate.main,\n    app.bsky.feed.repost.main,\n    app.bsky.feed.threadgate.main,\n    app.bsky.graph.block.main,\n    app.bsky.graph.follow.main,\n    app.bsky.graph.list.main,\n    app.bsky.graph.listblock.main,\n    app.bsky.graph.listitem.main,\n    app.bsky.graph.starterpack.main,\n    app.bsky.graph.verification.main,\n    app.bsky.labeler.service.main,\n    app.bsky.notification.declaration.main,\n    chat.bsky.actor.declaration.main,\n    com.atproto.lexicon.schema.main,\n    com.germnetwork.declaration.main,\n  ].map((schema: RecordSchema) => [schema.$type, schema]),\n)\n\nconst validateRecord = (\n  record: TypedLexMap,\n  rkey: RecordKeyString,\n  opts: {\n    validate?: boolean\n    validationPath?: (string | number)[]\n  },\n): undefined | ValidationStatus => {\n  // If validation is explicitly disabled, skip it\n  if (opts.validate === false) {\n    return undefined\n  }\n\n  // @TODO add support for lexicon resolution to fetch the schema dynamically\n  const schema = knownSchemas.get(record.$type)\n  if (!schema) {\n    // If validation is explicitly requested, throw if unable to validate\n    if (opts.validate === true) {\n      throw new InvalidRecordError(`Unknown lexicon type: ${record.$type}`)\n    } else {\n      return 'unknown'\n    }\n  }\n\n  const rkeyResult = schema.keySchema.safeValidate(rkey)\n  if (!rkeyResult.success) {\n    throw new InvalidRecordError(\n      `Invalid record key for ${record.$type}: ${rkeyResult.reason.message}`,\n      { cause: rkeyResult.reason },\n    )\n  }\n\n  const recordResult = schema.safeValidate(record, {\n    path: opts.validationPath ?? ['record'],\n  })\n  if (!recordResult.success) {\n    throw new InvalidRecordError(\n      `Invalid ${record.$type} record: ${recordResult.reason.message}`,\n      { cause: recordResult.reason },\n    )\n  }\n\n  return 'valid'\n}\n\nexport const prepareCreate = async (opts: {\n  did: DidString\n  collection: NsidString\n  rkey?: RecordKeyString\n  swapCid?: Cid | null\n  record: LexMap\n  validate?: boolean\n  validationPath?: (string | number)[]\n}): Promise<PreparedCreate> => {\n  const { cid, uri, record, blobs, validationStatus } = await prepareWrite(opts)\n\n  return {\n    action: WriteOpAction.Create,\n    uri,\n    cid,\n    swapCid: opts.swapCid,\n    record,\n    blobs,\n    validationStatus,\n  }\n}\n\nexport const prepareUpdate = async (opts: {\n  did: DidString\n  collection: NsidString\n  rkey: RecordKeyString\n  swapCid?: Cid | null\n  record: LexMap\n  validate?: boolean\n  validationPath?: (string | number)[]\n}): Promise<PreparedUpdate> => {\n  const { cid, uri, record, blobs, validationStatus } = await prepareWrite(opts)\n\n  return {\n    action: WriteOpAction.Update,\n    uri,\n    cid,\n    swapCid: opts.swapCid,\n    record,\n    blobs,\n    validationStatus,\n  }\n}\n\nasync function prepareWrite(opts: {\n  did: string\n  collection: NsidString\n  rkey?: RecordKeyString\n  record: LexMap\n  validate?: boolean\n  validationPath?: (string | number)[]\n}): Promise<{\n  record: TypedLexMap\n  blobs: TypedBlobRef[]\n  validationStatus?: ValidationStatus\n  uri: AtUri\n  cid: Cid\n}> {\n  const record: null | TypedLexMap =\n    opts.record.$type === undefined\n      ? { ...opts.record, $type: opts.collection }\n      : opts.record.$type === opts.collection\n        ? (opts.record as TypedLexMap)\n        : null\n\n  if (!record) {\n    throw new InvalidRecordError(\n      `Invalid $type: expected ${opts.collection}, got ${opts.record.$type}`,\n    )\n  }\n\n  // @NOTE the rkey will be validated against the schema later\n  if (opts.rkey != null) {\n    if (!isValidRecordKey(opts.rkey)) {\n      throw new InvalidRecordError(`Invalid record key: ${opts.rkey}`)\n    }\n    if (hasExplicitSlur(opts.rkey)) {\n      throw new InvalidRecordError('Unacceptable slur in record key')\n    }\n  }\n\n  const nextRkey = TID.next()\n  const rkey = opts.rkey || nextRkey.toString()\n\n  return {\n    record,\n    // @NOTE we validate before enumerating blobs, so that we can provide more\n    // accurate validations error (esp. in case of legacy blobs).\n    validationStatus: validateRecord(record, rkey, opts),\n    blobs: Array.from(\n      enumBlobRefs(record, { strict: false, allowLegacy: true }),\n      (blob) => {\n        // @NOTE as we migrated from legacy blobs to non legacy blobs, we wanted\n        // to prevent the creation of legacy blobs. Note that this prevents the\n        // creation of (legitimate) records that have the same shape as legacy\n        // blob refs ({ cid: \"<cid>\", mimeType: \"<mime-type>\" }), but this was\n        // deemed an acceptable tradeoff to prevent the creation of new legacy\n        // blobs. Since that migration happened a while ago, we can probably\n        // remove this check in the future, by removing the \"allowLegacy\" option.\n        if (isLegacyBlobRef(blob)) {\n          throw new InvalidRecordError(\n            `Legacy blobs are not allowed (${blob.cid})`,\n          )\n        }\n        return blob\n      },\n    ),\n    uri: AtUri.make(opts.did, opts.collection, rkey),\n    cid: await cidForCbor(encode(record)),\n  }\n}\n\nexport const prepareDelete = (opts: {\n  did: DidString\n  collection: NsidString\n  rkey: RecordKeyString\n  swapCid?: Cid | null\n}): PreparedDelete => {\n  const { did, collection, rkey, swapCid } = opts\n  return {\n    action: WriteOpAction.Delete,\n    uri: AtUri.make(did, collection, rkey),\n    swapCid,\n  }\n}\n\nexport const createWriteToOp = (write: PreparedCreate): RecordCreateOp => ({\n  action: WriteOpAction.Create,\n  collection: write.uri.collectionSafe,\n  rkey: write.uri.rkeySafe,\n  record: write.record,\n})\n\nexport const updateWriteToOp = (write: PreparedUpdate): RecordUpdateOp => ({\n  action: WriteOpAction.Update,\n  collection: write.uri.collectionSafe,\n  rkey: write.uri.rkeySafe,\n  record: write.record,\n})\n\nexport const deleteWriteToOp = (write: PreparedDelete): RecordDeleteOp => ({\n  action: WriteOpAction.Delete,\n  collection: write.uri.collectionSafe,\n  rkey: write.uri.rkeySafe,\n})\n\nexport const writeToOp = (write: PreparedWrite): RecordWriteOp => {\n  switch (write.action) {\n    case WriteOpAction.Create:\n      return createWriteToOp(write)\n    case WriteOpAction.Update:\n      return updateWriteToOp(write)\n    case WriteOpAction.Delete:\n      return deleteWriteToOp(write)\n    default:\n      throw new Error(`Unrecognized action: ${write}`)\n  }\n}\n"]}

package/dist/repo/types.d.ts

@@ -1,4 +1,4 @@
-import { BlobRef, Cid, LexMap } from '@atproto/lex-data';
+import { Cid, LexMap, TypedBlobRef } from '@atproto/lex-data';
 import { BlockMap, CommitData, WriteOpAction } from '@atproto/repo';
 import { AtUri } from '@atproto/syntax';
 export type ValidationStatus = 'valid' | 'unknown';
@@ -8,7 +8,7 @@ export type PreparedCreate = {
     cid: Cid;
     swapCid?: Cid | null;
     record: LexMap;
-    blobs: BlobRef[];
+    blobs: TypedBlobRef[];
     validationStatus?: ValidationStatus;
 };
 export type PreparedUpdate = {
@@ -17,7 +17,7 @@ export type PreparedUpdate = {
     cid: Cid;
     swapCid?: Cid | null;
     record: LexMap;
-    blobs: BlobRef[];
+    blobs: TypedBlobRef[];
     validationStatus?: ValidationStatus;
 };
 export type PreparedDelete = {

package/dist/repo/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/repo/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAEvC,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,SAAS,CAAA;AAElD,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,CAAA;IAC5B,GAAG,EAAE,KAAK,CAAA;IACV,GAAG,EAAE,GAAG,CAAA;IACR,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,OAAO,EAAE,CAAA;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,CAAA;IAC5B,GAAG,EAAE,KAAK,CAAA;IACV,GAAG,EAAE,GAAG,CAAA;IACR,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,OAAO,EAAE,CAAA;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,CAAA;IAC5B,GAAG,EAAE,KAAK,CAAA;IACV,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,GAAG,IAAI,CAAA;IACf,IAAI,CAAC,EAAE,GAAG,CAAA;CACX,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG;IAC3C,GAAG,EAAE,QAAQ,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,cAAc,GAAG,cAAc,CAAA;AAE5E,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAEhD,qBAAa,kBAAmB,SAAQ,KAAK;IACxB,GAAG,EAAE,GAAG;gBAAR,GAAG,EAAE,GAAG;CAG5B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IACxB,GAAG,EAAE,GAAG,GAAG,IAAI;gBAAf,GAAG,EAAE,GAAG,GAAG,IAAI;CAGnC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/repo/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAEvC,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,SAAS,CAAA;AAElD,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,CAAA;IAC5B,GAAG,EAAE,KAAK,CAAA;IACV,GAAG,EAAE,GAAG,CAAA;IACR,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,YAAY,EAAE,CAAA;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,CAAA;IAC5B,GAAG,EAAE,KAAK,CAAA;IACV,GAAG,EAAE,GAAG,CAAA;IACR,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,YAAY,EAAE,CAAA;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,CAAA;IAC5B,GAAG,EAAE,KAAK,CAAA;IACV,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,GAAG,IAAI,CAAA;IACf,IAAI,CAAC,EAAE,GAAG,CAAA;CACX,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG;IAC3C,GAAG,EAAE,QAAQ,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,cAAc,GAAG,cAAc,CAAA;AAE5E,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAEhD,qBAAa,kBAAmB,SAAQ,KAAK;IACxB,GAAG,EAAE,GAAG;gBAAR,GAAG,EAAE,GAAG;CAG5B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IACxB,GAAG,EAAE,GAAG,GAAG,IAAI;gBAAf,GAAG,EAAE,GAAG,GAAG,IAAI;CAGnC"}

package/dist/repo/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/repo/types.ts"],"names":[],"mappings":";;;AAoDA,MAAa,kBAAmB,SAAQ,KAAK;CAAG;AAAhD,gDAAgD;AAEhD,MAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAmB,GAAQ;QACzB,KAAK,CAAC,iBAAiB,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAD9B;;;;mBAAO,GAAG;WAAK;IAE3B,CAAC;CACF;AAJD,gDAIC;AAED,MAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAmB,GAAe;QAChC,KAAK,CAAC,iBAAiB,GAAG,EAAE,QAAQ,EAAE,IAAI,MAAM,EAAE,CAAC,CAAA;QADzC;;;;mBAAO,GAAG;WAAY;IAElC,CAAC;CACF;AAJD,gDAIC","sourcesContent":["import { BlobRef, Cid, LexMap } from '@atproto/lex-data'\nimport { BlockMap, CommitData, WriteOpAction } from '@atproto/repo'\nimport { AtUri } from '@atproto/syntax'\n\nexport type ValidationStatus = 'valid' | 'unknown'\n\nexport type PreparedCreate = {\n  action: WriteOpAction.Create\n  uri: AtUri\n  cid: Cid\n  swapCid?: Cid | null\n  record: LexMap\n  blobs: BlobRef[]\n  validationStatus?: ValidationStatus\n}\n\nexport type PreparedUpdate = {\n  action: WriteOpAction.Update\n  uri: AtUri\n  cid: Cid\n  swapCid?: Cid | null\n  record: LexMap\n  blobs: BlobRef[]\n  validationStatus?: ValidationStatus\n}\n\nexport type PreparedDelete = {\n  action: WriteOpAction.Delete\n  uri: AtUri\n  swapCid?: Cid | null\n}\n\nexport type CommitOp = {\n  action: 'create' | 'update' | 'delete'\n  path: string\n  cid: Cid | null\n  prev?: Cid\n}\n\nexport type CommitDataWithOps = CommitData & {\n  ops: CommitOp[]\n  prevData: Cid | null\n}\n\nexport type PreparedWrite = PreparedCreate | PreparedUpdate | PreparedDelete\n\nexport type SyncEvtData = {\n  cid: Cid\n  rev: string\n  blocks: BlockMap\n}\n\nexport class InvalidRecordError extends Error {}\n\nexport class BadCommitSwapError extends Error {\n  constructor(public cid: Cid) {\n    super(`Commit was at ${cid.toString()}`)\n  }\n}\n\nexport class BadRecordSwapError extends Error {\n  constructor(public cid: Cid | null) {\n    super(`Record was at ${cid?.toString() ?? 'null'}`)\n  }\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/repo/types.ts"],"names":[],"mappings":";;;AAoDA,MAAa,kBAAmB,SAAQ,KAAK;CAAG;AAAhD,gDAAgD;AAEhD,MAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAmB,GAAQ;QACzB,KAAK,CAAC,iBAAiB,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAD9B;;;;mBAAO,GAAG;WAAK;IAE3B,CAAC;CACF;AAJD,gDAIC;AAED,MAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAmB,GAAe;QAChC,KAAK,CAAC,iBAAiB,GAAG,EAAE,QAAQ,EAAE,IAAI,MAAM,EAAE,CAAC,CAAA;QADzC;;;;mBAAO,GAAG;WAAY;IAElC,CAAC;CACF;AAJD,gDAIC","sourcesContent":["import { Cid, LexMap, TypedBlobRef } from '@atproto/lex-data'\nimport { BlockMap, CommitData, WriteOpAction } from '@atproto/repo'\nimport { AtUri } from '@atproto/syntax'\n\nexport type ValidationStatus = 'valid' | 'unknown'\n\nexport type PreparedCreate = {\n  action: WriteOpAction.Create\n  uri: AtUri\n  cid: Cid\n  swapCid?: Cid | null\n  record: LexMap\n  blobs: TypedBlobRef[]\n  validationStatus?: ValidationStatus\n}\n\nexport type PreparedUpdate = {\n  action: WriteOpAction.Update\n  uri: AtUri\n  cid: Cid\n  swapCid?: Cid | null\n  record: LexMap\n  blobs: TypedBlobRef[]\n  validationStatus?: ValidationStatus\n}\n\nexport type PreparedDelete = {\n  action: WriteOpAction.Delete\n  uri: AtUri\n  swapCid?: Cid | null\n}\n\nexport type CommitOp = {\n  action: 'create' | 'update' | 'delete'\n  path: string\n  cid: Cid | null\n  prev?: Cid\n}\n\nexport type CommitDataWithOps = CommitData & {\n  ops: CommitOp[]\n  prevData: Cid | null\n}\n\nexport type PreparedWrite = PreparedCreate | PreparedUpdate | PreparedDelete\n\nexport type SyncEvtData = {\n  cid: Cid\n  rev: string\n  blocks: BlockMap\n}\n\nexport class InvalidRecordError extends Error {}\n\nexport class BadCommitSwapError extends Error {\n  constructor(public cid: Cid) {\n    super(`Commit was at ${cid.toString()}`)\n  }\n}\n\nexport class BadRecordSwapError extends Error {\n  constructor(public cid: Cid | null) {\n    super(`Record was at ${cid?.toString() ?? 'null'}`)\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.217",
+  "version": "0.4.218",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -50,19 +50,19 @@
     "@atproto-labs/simple-store-redis": "^0.0.1",
     "@atproto-labs/xrpc-utils": "^0.0.24",
     "@atproto/aws": "^0.2.32",
-    "@atproto/common": "^0.5.15",
+    "@atproto/common": "^0.5.16",
     "@atproto/crypto": "^0.4.5",
+    "@atproto/lex": "^0.0.24",
+    "@atproto/lex-cbor": "^0.0.16",
+    "@atproto/lex-data": "^0.0.15",
     "@atproto/identity": "^0.4.12",
-    "@atproto/lex": "^0.0.23",
-    "@atproto/lex-cbor": "^0.0.15",
-    "@atproto/lex-data": "^0.0.14",
-    "@atproto/lex-json": "^0.0.14",
-    "@atproto/oauth-provider": "^0.15.15",
+    "@atproto/oauth-provider": "^0.15.16",
     "@atproto/oauth-scopes": "^0.3.2",
-    "@atproto/repo": "^0.9.0",
-    "@atproto/syntax": "^0.5.2",
+    "@atproto/repo": "^0.9.1",
+    "@atproto/lex-json": "^0.0.15",
+    "@atproto/syntax": "^0.5.3",
     "@atproto/xrpc": "^0.7.7",
-    "@atproto/xrpc-server": "^0.10.18"
+    "@atproto/xrpc-server": "^0.10.19"
   },
   "devDependencies": {
     "@atproto/pds-entryway": "npm:@atproto/pds@0.3.0-entryway.3",
@@ -80,10 +80,10 @@
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.19.5",
-    "@atproto/bsky": "^0.0.222",
-    "@atproto/lex-document": "^0.0.18",
-    "@atproto/oauth-client-browser-example": "^0.0.10"
+    "@atproto/api": "^0.19.7",
+    "@atproto/lex-document": "^0.0.19",
+    "@atproto/oauth-client-browser-example": "^0.0.10",
+    "@atproto/bsky": "^0.0.225"
   },
   "scripts": {
     "codegen": "lex build --override --indexFile --lexicons ../../lexicons",

package/src/account-manager/oauth-store.ts

@@ -5,6 +5,7 @@ import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import {
   HandleString,
   asAtIdentifierString,
+  getBlobCidString,
   isDidString,
   isHandleString,
 } from '@atproto/lex'
@@ -633,7 +634,7 @@ export class OAuthStore
 
         account.name ||= displayName
         account.picture ||= avatar
-          ? this.imageUrlBuilder.build('avatar', did, avatar.ref.toString())
+          ? this.imageUrlBuilder.build('avatar', did, getBlobCidString(avatar))
           : undefined
       }
     }

package/src/actor-store/blob/transactor.ts

@@ -6,8 +6,9 @@ import { SECOND, cloneStream, streamSize } from '@atproto/common'
 import {
   BlobRef,
   Cid,
-  LegacyBlobRef,
+  TypedBlobRef,
   cidForRawHash,
+  getBlobCidString,
   parseCid,
 } from '@atproto/lex-data'
 import { BlobNotFoundError, BlobStore, WriteOpAction } from '@atproto/repo'
@@ -36,13 +37,10 @@ export class BlobTransactor extends BlobReader {
     super(db, blobstore)
   }
 
-  async insertBlobs(
-    recordUri: string,
-    blobs: Iterable<BlobRef | LegacyBlobRef>,
-  ) {
+  async insertBlobs(recordUri: string, blobs: Iterable<BlobRef>) {
     const values = Array.from(blobs, (blob) => ({
       recordUri,
-      blobCid: blobCid(blob).toString(),
+      blobCid: getBlobCidString(blob),
     }))
 
     if (values.length) {
@@ -73,7 +71,7 @@ export class BlobTransactor extends BlobReader {
     }
   }
 
-  async trackUntetheredBlob(metadata: BlobMetadata): Promise<BlobRef> {
+  async trackUntetheredBlob(metadata: BlobMetadata): Promise<TypedBlobRef> {
     const { tempKey, size, cid, mimeType } = metadata
     const cidStr = cid.toString()
 
@@ -244,7 +242,7 @@ export class BlobTransactor extends BlobReader {
   }
 
   async verifyBlobAndMakePermanent(
-    blob: BlobRef,
+    blob: TypedBlobRef,
     signal?: AbortSignal,
   ): Promise<void> {
     const found = await this.db.db
@@ -295,7 +293,7 @@ export class BlobTransactor extends BlobReader {
     }
   }
 
-  async insertBlobMetadata(blob: BlobRef): Promise<void> {
+  async insertBlobMetadata(blob: TypedBlobRef): Promise<void> {
     await this.db.db
       .insertInto('blob')
       .values({
@@ -308,7 +306,7 @@ export class BlobTransactor extends BlobReader {
       .execute()
   }
 
-  async associateBlob(blob: BlobRef, recordUri: AtUri): Promise<void> {
+  async associateBlob(blob: TypedBlobRef, recordUri: AtUri): Promise<void> {
     await this.db.db
       .insertInto('record_blob')
       .values({
@@ -354,7 +352,7 @@ async function mimeTypeFromStream(
  * Ensures that the blob referenced in the record matches the stored blob.
  */
 function verifyBlob(
-  blob: BlobRef,
+  blob: TypedBlobRef,
   found: Pick<BlobTable, 'size' | 'mimeType'>,
 ) {
   if (blob.mimeType !== found.mimeType) {
@@ -381,7 +379,3 @@ function isUpdate(write: PreparedWrite) {
 function isDelete(write: PreparedWrite) {
   return write.action === WriteOpAction.Delete
 }
-
-function blobCid(blob: BlobRef | LegacyBlobRef): Cid {
-  return '$type' in blob ? blob.ref : parseCid(blob.cid)
-}

package/src/api/com/atproto/repo/importRepo.ts

@@ -90,7 +90,7 @@ export default function (server: Server, ctx: AppContext) {
               now,
             )
             const recordBlobs = Array.from(
-              enumBlobRefs(parsedRecord, { allowLegacy: true }),
+              enumBlobRefs(parsedRecord, { allowLegacy: true, strict: false }),
             )
             await store.repo.blob.insertBlobs(uri.toString(), recordBlobs)
           }

package/src/api/com/atproto/repo/putRecord.ts

@@ -1,7 +1,7 @@
 import {
-  BlobRef,
   LegacyBlobRef,
   LexMap,
+  TypedBlobRef,
   isLegacyBlobRef,
   parseCid,
 } from '@atproto/lex-data'
@@ -196,7 +196,7 @@ async function updateProfileLegacyBlobRef(
 async function upgradeLegacyBlob(
   actorStore: ActorStoreTransactor,
   legacyBlob: LegacyBlobRef,
-): Promise<BlobRef> {
+): Promise<TypedBlobRef> {
   const ref = parseCid(legacyBlob.cid)
   const blob = await actorStore.repo.blob.getBlobMetadata(ref)
   return {

package/src/read-after-write/viewer.ts

@@ -1,4 +1,4 @@
-import { LexMap, UriString } from '@atproto/lex'
+import { LexMap, UriString, getBlobCidString } from '@atproto/lex'
 import { AtUri, DidString, HandleString, INVALID_HANDLE } from '@atproto/syntax'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { AccountManager } from '../account-manager/account-manager'
@@ -70,7 +70,7 @@ export class LocalViewer {
       handle: (accountRes.handle ?? INVALID_HANDLE) as HandleString,
       displayName: profileRes?.displayName,
       avatar: profileRes?.avatar
-        ? this.getImageUrl('avatar', profileRes.avatar.ref.toString())
+        ? this.getImageUrl('avatar', getBlobCidString(profileRes.avatar))
         : undefined,
     }
   }
@@ -142,8 +142,11 @@ export class LocalViewer {
   formatImageEmbed(embed: app.bsky.embed.images.Main) {
     const images = embed.images.map(
       (img): app.bsky.embed.images.ViewImage => ({
-        thumb: this.getImageUrl('feed_thumbnail', img.image.ref.toString()),
-        fullsize: this.getImageUrl('feed_fullsize', img.image.ref.toString()),
+        thumb: this.getImageUrl('feed_thumbnail', getBlobCidString(img.image)),
+        fullsize: this.getImageUrl(
+          'feed_fullsize',
+          getBlobCidString(img.image),
+        ),
         aspectRatio: img.aspectRatio,
         alt: img.alt,
       }),
@@ -159,7 +162,7 @@ export class LocalViewer {
         title,
         description,
         thumb: thumb
-          ? this.getImageUrl('feed_thumbnail', thumb.ref.toString())
+          ? this.getImageUrl('feed_thumbnail', getBlobCidString(thumb))
           : undefined,
       },
     })
@@ -256,7 +259,7 @@ export class LocalViewer {
       ...view,
       displayName: record.displayName,
       avatar: record.avatar
-        ? this.getImageUrl('avatar', record.avatar.ref.toString())
+        ? this.getImageUrl('avatar', getBlobCidString(record.avatar))
         : undefined,
     }
   }
@@ -280,7 +283,7 @@ export class LocalViewer {
     return {
       ...this.updateProfileView(view, record),
       banner: record.banner
-        ? this.getImageUrl('banner', record.banner.ref.toString())
+        ? this.getImageUrl('banner', getBlobCidString(record.banner))
         : undefined,
     }
   }

package/src/repo/prepare.ts

@@ -2,9 +2,9 @@ import { TID } from '@atproto/common'
 import { RecordSchema } from '@atproto/lex'
 import { encode } from '@atproto/lex-cbor'
 import {
-  BlobRef,
   Cid,
   LexMap,
+  TypedBlobRef,
   TypedLexMap,
   cidForCbor,
   enumBlobRefs,
@@ -159,7 +159,7 @@ async function prepareWrite(opts: {
   validationPath?: (string | number)[]
 }): Promise<{
   record: TypedLexMap
-  blobs: BlobRef[]
+  blobs: TypedBlobRef[]
   validationStatus?: ValidationStatus
   uri: AtUri
   cid: Cid

package/src/repo/types.ts

@@ -1,4 +1,4 @@
-import { BlobRef, Cid, LexMap } from '@atproto/lex-data'
+import { Cid, LexMap, TypedBlobRef } from '@atproto/lex-data'
 import { BlockMap, CommitData, WriteOpAction } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 
@@ -10,7 +10,7 @@ export type PreparedCreate = {
   cid: Cid
   swapCid?: Cid | null
   record: LexMap
-  blobs: BlobRef[]
+  blobs: TypedBlobRef[]
   validationStatus?: ValidationStatus
 }
 
@@ -20,7 +20,7 @@ export type PreparedUpdate = {
   cid: Cid
   swapCid?: Cid | null
   record: LexMap
-  blobs: BlobRef[]
+  blobs: TypedBlobRef[]
   validationStatus?: ValidationStatus
 }
 

package/tests/file-uploads.test.ts

@@ -1,10 +1,15 @@
+import assert from 'node:assert'
 import fs from 'node:fs/promises'
 import { gzipSync } from 'node:zlib'
 import * as uint8arrays from 'uint8arrays'
 import { randomBytes } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { Client, DidString } from '@atproto/lex'
-import { BlobRef } from '@atproto/lex-data'
+import {
+  TypedBlobRef,
+  getBlobCidString,
+  isTypedBlobRef,
+} from '@atproto/lex-data'
 import { AppContext } from '../src'
 import { ActorDb } from '../src/actor-store/db'
 import { DiskBlobStore } from '../src/disk-blobstore'
@@ -40,7 +45,7 @@ describe('file uploads', () => {
     await network.close()
   })
 
-  let smallBlob: BlobRef
+  let smallBlob: TypedBlobRef
   let smallFile: Uint8Array
 
   it('handles client abort', async () => {
@@ -78,6 +83,7 @@ describe('file uploads', () => {
       headers: sc.getHeaders(alice),
       encoding: 'image/jpeg',
     })
+    assert(isTypedBlobRef(res.body.blob))
     smallBlob = res.body.blob
 
     const found = await aliceDb.db
@@ -123,7 +129,7 @@ describe('file uploads', () => {
     expect(uint8arrays.equals(smallFile, body)).toBeTruthy()
   })
 
-  let largeBlob: BlobRef
+  let largeBlob: TypedBlobRef
   let largeFile: Uint8Array
 
   it('does not allow referencing a file that is outside blob constraints', async () => {
@@ -132,6 +138,7 @@ describe('file uploads', () => {
       headers: sc.getHeaders(alice),
       encoding: 'image/jpeg',
     })
+    assert(isTypedBlobRef(res.body.blob))
     largeBlob = res.body.blob
 
     const profilePromise = sc.updateProfile(alice, {
@@ -195,7 +202,7 @@ describe('file uploads', () => {
     const blob = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', uploadAfterPermanent.blob.ref.toString())
+      .where('cid', '=', getBlobCidString(uploadAfterPermanent.blob))
       .executeTakeFirstOrThrow()
     expect(blob.tempKey).toEqual(null)
   })
@@ -208,6 +215,7 @@ describe('file uploads', () => {
         'content-encoding': 'gzip',
       },
     })
+    assert(isTypedBlobRef(uploaded.blob))
     expect(uploaded.blob.ref.equals(smallBlob.ref)).toBeTruthy()
   })
 
@@ -221,7 +229,7 @@ describe('file uploads', () => {
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.body.blob.ref.toString())
+      .where('cid', '=', getBlobCidString(res.body.blob))
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('image/jpeg')
@@ -237,7 +245,7 @@ describe('file uploads', () => {
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.body.blob.ref.toString())
+      .where('cid', '=', getBlobCidString(res.body.blob))
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('image/png')
@@ -253,7 +261,7 @@ describe('file uploads', () => {
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.body.blob.ref.toString())
+      .where('cid', '=', getBlobCidString(res.body.blob))
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('test/fake')
@@ -269,7 +277,7 @@ describe('file uploads', () => {
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.body.blob.ref.toString())
+      .where('cid', '=', getBlobCidString(res.body.blob))
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('text/plain')
@@ -285,7 +293,7 @@ describe('file uploads', () => {
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.body.blob.ref.toString())
+      .where('cid', '=', getBlobCidString(res.body.blob))
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('application/json')