@atcute/car 2.0.2 → 2.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/atproto-repo.d.ts +34 -2
  2. package/dist/atproto-repo.js +52 -7
  3. package/dist/atproto-repo.js.map +1 -1
  4. package/lib/atproto-repo.ts +76 -12
  5. package/package.json +2 -2
package/dist/atproto-repo.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import * as CBOR from '@atcute/cbor';
1
2
  import * as CID from '@atcute/cid';
2
3
  export declare class RepoEntry {
3
4
  readonly collection: string;
@@ -9,5 +10,36 @@ export declare class RepoEntry {
9
10
  get record(): unknown;
10
11
  }
11
12
  export declare function iterateAtpRepo(buf: Uint8Array): Generator<RepoEntry>;
12
- type BlockMap = Map<string, Uint8Array>;
13
- export {};
13
+ export declare function walkMstEntries(map: BlockMap, pointer: CID.CidLink): Generator<NodeEntry>;
14
+ export type BlockMap = Map<string, Uint8Array>;
15
+ export interface Commit {
16
+ version: 3;
17
+ did: string;
18
+ data: CID.CidLink;
19
+ rev: string;
20
+ prev: CID.CidLink | null;
21
+ sig: CBOR.Bytes;
22
+ }
23
+ export declare const isCommit: (value: unknown) => value is Commit;
24
+ export interface TreeEntry {
25
+ /** count of bytes shared with previous TreeEntry in this Node (if any) */
26
+ p: number;
27
+ /** remainder of key for this TreeEntry, after "prefixlen" have been removed */
28
+ k: CBOR.Bytes;
29
+ /** link to a sub-tree Node at a lower level which has keys sorting after this TreeEntry's key (to the "right"), but before the next TreeEntry's key in this Node (if any) */
30
+ v: CID.CidLink;
31
+ /** next subtree (to the right of leaf) */
32
+ t: CID.CidLink | null;
33
+ }
34
+ export declare const isTreeEntry: (value: unknown) => value is TreeEntry;
35
+ export interface MstNode {
36
+ /** link to sub-tree Node on a lower level and with all keys sorting before keys at this node */
37
+ l: CID.CidLink | null;
38
+ /** ordered list of TreeEntry objects */
39
+ e: TreeEntry[];
40
+ }
41
+ export declare const isMstNode: (value: unknown) => value is MstNode;
42
+ export interface NodeEntry {
43
+ key: string;
44
+ cid: CID.CidLink;
45
+ }
package/dist/atproto-repo.js CHANGED
@@ -32,25 +32,26 @@ export function* iterateAtpRepo(buf) {
32
32
  blockmap.set(CID.toString(entry.cid), entry.bytes);
33
33
  }
34
34
  // Read the head, then walk through the MST tree from there.
35
- const commit = readObject(blockmap, roots[0]);
36
- for (const { key, cid } of walkEntries(blockmap, commit.data)) {
35
+ const commit = readObject(blockmap, roots[0], isCommit);
36
+ for (const { key, cid } of walkMstEntries(blockmap, commit.data)) {
37
37
  const [collection, rkey] = key.split('/');
38
38
  yield new RepoEntry(collection, rkey, cid, blockmap);
39
39
  }
40
40
  }
41
- function readObject(map, link) {
41
+ function readObject(map, link, validate) {
42
42
  const cid = link.$link;
43
43
  const bytes = map.get(cid);
44
44
  assert(bytes != null, `cid not found in blockmap; cid=${cid}`);
45
45
  const data = CBOR.decode(bytes);
46
+ assert(validate(data), `validation failed for cid=${cid}`);
46
47
  return data;
47
48
  }
48
- function* walkEntries(map, pointer) {
49
- const data = readObject(map, pointer);
49
+ export function* walkMstEntries(map, pointer) {
50
+ const data = readObject(map, pointer, isMstNode);
50
51
  const entries = data.e;
51
52
  let lastKey = '';
52
53
  if (data.l !== null) {
53
- yield* walkEntries(map, data.l);
54
+ yield* walkMstEntries(map, data.l);
54
55
  }
55
56
  for (let i = 0, il = entries.length; i < il; i++) {
56
57
  const entry = entries[i];
@@ -59,7 +60,7 @@ function* walkEntries(map, pointer) {
59
60
  lastKey = key;
60
61
  yield { key: key, cid: entry.v };
61
62
  if (entry.t !== null) {
62
- yield* walkEntries(map, entry.t);
63
+ yield* walkMstEntries(map, entry.t);
63
64
  }
64
65
  }
65
66
  }
@@ -68,4 +69,48 @@ function assert(condition, message) {
68
69
  throw new Error(message);
69
70
  }
70
71
  }
72
+ const isCidLink = (value) => {
73
+ if (value instanceof CID.CidLinkWrapper) {
74
+ return true;
75
+ }
76
+ if (value === null || typeof value !== 'object') {
77
+ return false;
78
+ }
79
+ return '$link' in value && typeof value.$link === 'string';
80
+ };
81
+ const isBytes = (value) => {
82
+ if (value instanceof CBOR.BytesWrapper) {
83
+ return true;
84
+ }
85
+ if (value === null || typeof value !== 'object') {
86
+ return false;
87
+ }
88
+ return '$bytes' in value && typeof value.$bytes === 'string';
89
+ };
90
+ export const isCommit = (value) => {
91
+ if (value === null || typeof value !== 'object') {
92
+ return false;
93
+ }
94
+ const obj = value;
95
+ return (obj.version === 3 &&
96
+ typeof obj.did === 'string' &&
97
+ isCidLink(obj.data) &&
98
+ typeof obj.rev === 'string' &&
99
+ (obj.prev === null || isCidLink(obj.prev)) &&
100
+ isBytes(obj.sig));
101
+ };
102
+ export const isTreeEntry = (value) => {
103
+ if (value === null || typeof value !== 'object') {
104
+ return false;
105
+ }
106
+ const obj = value;
107
+ return (typeof obj.p === 'number' && isBytes(obj.k) && isCidLink(obj.v) && (obj.t === null || isCidLink(obj.t)));
108
+ };
109
+ export const isMstNode = (value) => {
110
+ if (value === null || typeof value !== 'object') {
111
+ return false;
112
+ }
113
+ const obj = value;
114
+ return (obj.l === null || isCidLink(obj.l)) && Array.isArray(obj.e) && obj.e.every(isTreeEntry);
115
+ };
71
116
  //# sourceMappingURL=atproto-repo.js.map
package/dist/atproto-repo.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"atproto-repo.js","sourceRoot":"","sources":["../lib/atproto-repo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"atproto-repo.js","sourceRoot":"","sources":["../lib/atproto-repo.ts"],"names":[],"mappings":"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"}
package/lib/atproto-repo.ts CHANGED
@@ -38,33 +38,34 @@ export function* iterateAtpRepo(buf: Uint8Array): Generator<RepoEntry> {
38
38
  }
39
39
 
40
40
  // Read the head, then walk through the MST tree from there.
41
- const commit = readObject(blockmap, roots[0]) as Commit;
42
- for (const { key, cid } of walkEntries(blockmap, commit.data)) {
41
+ const commit = readObject(blockmap, roots[0], isCommit);
42
+ for (const { key, cid } of walkMstEntries(blockmap, commit.data)) {
43
43
  const [collection, rkey] = key.split('/');
44
44
 
45
45
  yield new RepoEntry(collection, rkey, cid, blockmap);
46
46
  }
47
47
  }
48
48
 
49
- function readObject(map: BlockMap, link: CID.CidLink): unknown {
49
+ function readObject<T>(map: BlockMap, link: CID.CidLink, validate: (value: unknown) => value is T): T {
50
50
  const cid = link.$link;
51
51
 
52
52
  const bytes = map.get(cid);
53
53
  assert(bytes != null, `cid not found in blockmap; cid=${cid}`);
54
54
 
55
55
  const data = CBOR.decode(bytes);
56
+ assert(validate(data), `validation failed for cid=${cid}`);
56
57
 
57
58
  return data;
58
59
  }
59
60
 
60
- function* walkEntries(map: BlockMap, pointer: CID.CidLink): Generator<NodeEntry> {
61
- const data = readObject(map, pointer) as MstNode;
61
+ export function* walkMstEntries(map: BlockMap, pointer: CID.CidLink): Generator<NodeEntry> {
62
+ const data = readObject(map, pointer, isMstNode);
62
63
  const entries = data.e;
63
64
 
64
65
  let lastKey = '';
65
66
 
66
67
  if (data.l !== null) {
67
- yield* walkEntries(map, data.l);
68
+ yield* walkMstEntries(map, data.l);
68
69
  }
69
70
 
70
71
  for (let i = 0, il = entries.length; i < il; i++) {
@@ -78,7 +79,7 @@ function* walkEntries(map: BlockMap, pointer: CID.CidLink): Generator<NodeEntry>
78
79
  yield { key: key, cid: entry.v };
79
80
 
80
81
  if (entry.t !== null) {
81
- yield* walkEntries(map, entry.t);
82
+ yield* walkMstEntries(map, entry.t);
82
83
  }
83
84
  }
84
85
  }
@@ -89,9 +90,33 @@ function assert(condition: boolean, message: string): asserts condition {
89
90
  }
90
91
  }
91
92
 
92
- type BlockMap = Map<string, Uint8Array>;
93
+ export type BlockMap = Map<string, Uint8Array>;
93
94
 
94
- interface Commit {
95
+ const isCidLink = (value: unknown): value is CID.CidLink => {
96
+ if (value instanceof CID.CidLinkWrapper) {
97
+ return true;
98
+ }
99
+
100
+ if (value === null || typeof value !== 'object') {
101
+ return false;
102
+ }
103
+
104
+ return '$link' in value && typeof value.$link === 'string';
105
+ };
106
+
107
+ const isBytes = (value: unknown): value is CBOR.Bytes => {
108
+ if (value instanceof CBOR.BytesWrapper) {
109
+ return true;
110
+ }
111
+
112
+ if (value === null || typeof value !== 'object') {
113
+ return false;
114
+ }
115
+
116
+ return '$bytes' in value && typeof value.$bytes === 'string';
117
+ };
118
+
119
+ export interface Commit {
95
120
  version: 3;
96
121
  did: string;
97
122
  data: CID.CidLink;
@@ -100,7 +125,24 @@ interface Commit {
100
125
  sig: CBOR.Bytes;
101
126
  }
102
127
 
103
- interface TreeEntry {
128
+ export const isCommit = (value: unknown): value is Commit => {
129
+ if (value === null || typeof value !== 'object') {
130
+ return false;
131
+ }
132
+
133
+ const obj = value as Record<string, unknown>;
134
+
135
+ return (
136
+ obj.version === 3 &&
137
+ typeof obj.did === 'string' &&
138
+ isCidLink(obj.data) &&
139
+ typeof obj.rev === 'string' &&
140
+ (obj.prev === null || isCidLink(obj.prev)) &&
141
+ isBytes(obj.sig)
142
+ );
143
+ };
144
+
145
+ export interface TreeEntry {
104
146
  /** count of bytes shared with previous TreeEntry in this Node (if any) */
105
147
  p: number;
106
148
  /** remainder of key for this TreeEntry, after "prefixlen" have been removed */
@@ -111,14 +153,36 @@ interface TreeEntry {
111
153
  t: CID.CidLink | null;
112
154
  }
113
155
 
114
- interface MstNode {
156
+ export const isTreeEntry = (value: unknown): value is TreeEntry => {
157
+ if (value === null || typeof value !== 'object') {
158
+ return false;
159
+ }
160
+
161
+ const obj = value as Record<string, unknown>;
162
+
163
+ return (
164
+ typeof obj.p === 'number' && isBytes(obj.k) && isCidLink(obj.v) && (obj.t === null || isCidLink(obj.t))
165
+ );
166
+ };
167
+
168
+ export interface MstNode {
115
169
  /** link to sub-tree Node on a lower level and with all keys sorting before keys at this node */
116
170
  l: CID.CidLink | null;
117
171
  /** ordered list of TreeEntry objects */
118
172
  e: TreeEntry[];
119
173
  }
120
174
 
121
- interface NodeEntry {
175
+ export const isMstNode = (value: unknown): value is MstNode => {
176
+ if (value === null || typeof value !== 'object') {
177
+ return false;
178
+ }
179
+
180
+ const obj = value as Record<string, unknown>;
181
+
182
+ return (obj.l === null || isCidLink(obj.l)) && Array.isArray(obj.e) && obj.e.every(isTreeEntry);
183
+ };
184
+
185
+ export interface NodeEntry {
122
186
  key: string;
123
187
  cid: CID.CidLink;
124
188
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "type": "module",
3
3
  "name": "@atcute/car",
4
- "version": "2.0.2",
4
+ "version": "2.0.3",
5
5
  "description": "lightweight DASL CAR and atproto repository decoder for AT Protocol.",
6
6
  "keywords": [
7
7
  "atproto",
@@ -28,8 +28,8 @@
28
28
  "@atcute/multibase": "^1.1.2"
29
29
  },
30
30
  "dependencies": {
31
+ "@atcute/cbor": "^2.1.3",
31
32
  "@atcute/varint": "^1.0.2",
32
- "@atcute/cbor": "^2.1.2",
33
33
  "@atcute/cid": "^2.1.0"
34
34
  },
35
35
  "scripts": {