@dxos/echo-pipeline 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

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 (93) hide show
  1. package/dist/lib/browser/{chunk-32WDI3LB.mjs → chunk-TPEBUDNJ.mjs} +9 -9
  2. package/dist/lib/browser/{chunk-32WDI3LB.mjs.map → chunk-TPEBUDNJ.mjs.map} +3 -3
  3. package/dist/lib/browser/index.mjs +148 -148
  4. package/dist/lib/browser/index.mjs.map +3 -3
  5. package/dist/lib/browser/meta.json +1 -1
  6. package/dist/lib/browser/testing/index.mjs +11 -12
  7. package/dist/lib/browser/testing/index.mjs.map +3 -3
  8. package/dist/lib/node/{chunk-TC2PRBEU.cjs → chunk-QD3U65NM.cjs} +12 -12
  9. package/dist/lib/node/{chunk-TC2PRBEU.cjs.map → chunk-QD3U65NM.cjs.map} +2 -2
  10. package/dist/lib/node/index.cjs +173 -172
  11. package/dist/lib/node/index.cjs.map +3 -3
  12. package/dist/lib/node/meta.json +1 -1
  13. package/dist/lib/node/testing/index.cjs +20 -21
  14. package/dist/lib/node/testing/index.cjs.map +3 -3
  15. package/dist/lib/node-esm/{chunk-UKOLB3LW.mjs → chunk-S5YERQ4D.mjs} +9 -9
  16. package/dist/lib/node-esm/{chunk-UKOLB3LW.mjs.map → chunk-S5YERQ4D.mjs.map} +3 -3
  17. package/dist/lib/node-esm/index.mjs +148 -148
  18. package/dist/lib/node-esm/index.mjs.map +3 -3
  19. package/dist/lib/node-esm/meta.json +1 -1
  20. package/dist/lib/node-esm/testing/index.mjs +11 -12
  21. package/dist/lib/node-esm/testing/index.mjs.map +3 -3
  22. package/dist/types/src/automerge/automerge-host.d.ts +5 -2
  23. package/dist/types/src/automerge/automerge-host.d.ts.map +1 -1
  24. package/dist/types/src/automerge/collection-synchronizer.d.ts +1 -1
  25. package/dist/types/src/automerge/collection-synchronizer.d.ts.map +1 -1
  26. package/dist/types/src/automerge/echo-data-monitor.d.ts +6 -6
  27. package/dist/types/src/automerge/echo-data-monitor.d.ts.map +1 -1
  28. package/dist/types/src/automerge/echo-network-adapter.d.ts +4 -1
  29. package/dist/types/src/automerge/echo-network-adapter.d.ts.map +1 -1
  30. package/dist/types/src/automerge/heads-store.d.ts +2 -2
  31. package/dist/types/src/automerge/heads-store.d.ts.map +1 -1
  32. package/dist/types/src/automerge/leveldb-storage-adapter.d.ts +1 -1
  33. package/dist/types/src/automerge/leveldb-storage-adapter.d.ts.map +1 -1
  34. package/dist/types/src/automerge/mesh-echo-replicator-connection.d.ts.map +1 -1
  35. package/dist/types/src/automerge/network-protocol.d.ts +1 -1
  36. package/dist/types/src/automerge/network-protocol.d.ts.map +1 -1
  37. package/dist/types/src/automerge/space-collection.d.ts +1 -1
  38. package/dist/types/src/automerge/space-collection.d.ts.map +1 -1
  39. package/dist/types/src/common/feeds.d.ts.map +1 -1
  40. package/dist/types/src/common/space-id.d.ts.map +1 -1
  41. package/dist/types/src/db-host/automerge-metrics.d.ts +1 -1
  42. package/dist/types/src/db-host/automerge-metrics.d.ts.map +1 -1
  43. package/dist/types/src/db-host/data-service.d.ts.map +1 -1
  44. package/dist/types/src/db-host/database-root.d.ts +3 -3
  45. package/dist/types/src/db-host/database-root.d.ts.map +1 -1
  46. package/dist/types/src/db-host/documents-iterator.d.ts.map +1 -1
  47. package/dist/types/src/db-host/documents-synchronizer.d.ts +2 -2
  48. package/dist/types/src/db-host/documents-synchronizer.d.ts.map +1 -1
  49. package/dist/types/src/db-host/echo-host.d.ts +1 -1
  50. package/dist/types/src/db-host/echo-host.d.ts.map +1 -1
  51. package/dist/types/src/db-host/query-service.d.ts.map +1 -1
  52. package/dist/types/src/db-host/query-state.d.ts.map +1 -1
  53. package/dist/types/src/db-host/space-state-manager.d.ts +1 -1
  54. package/dist/types/src/db-host/space-state-manager.d.ts.map +1 -1
  55. package/dist/types/src/edge/echo-edge-replicator.d.ts.map +1 -1
  56. package/dist/types/src/metadata/metadata-store.d.ts.map +1 -1
  57. package/dist/types/src/pipeline/message-selector.d.ts.map +1 -1
  58. package/dist/types/src/pipeline/timeframe-clock.d.ts.map +1 -1
  59. package/dist/types/src/space/space-manager.d.ts.map +1 -1
  60. package/dist/types/src/testing/change-metadata.d.ts.map +1 -1
  61. package/dist/types/src/testing/test-agent-builder.d.ts.map +1 -1
  62. package/dist/types/src/testing/test-network-adapter.d.ts +3 -2
  63. package/dist/types/src/testing/test-network-adapter.d.ts.map +1 -1
  64. package/dist/types/src/util.d.ts.map +1 -1
  65. package/dist/types/tsconfig.tsbuildinfo +1 -1
  66. package/package.json +35 -34
  67. package/src/automerge/automerge-host.test.ts +7 -7
  68. package/src/automerge/automerge-host.ts +30 -23
  69. package/src/automerge/automerge-repo.test.ts +65 -65
  70. package/src/automerge/collection-synchronizer.test.ts +1 -1
  71. package/src/automerge/collection-synchronizer.ts +3 -2
  72. package/src/automerge/echo-data-monitor.ts +9 -8
  73. package/src/automerge/echo-network-adapter.test.ts +1 -1
  74. package/src/automerge/echo-network-adapter.ts +13 -6
  75. package/src/automerge/heads-store.ts +3 -2
  76. package/src/automerge/leveldb-storage-adapter.ts +1 -1
  77. package/src/automerge/mesh-echo-replicator-connection.ts +3 -2
  78. package/src/automerge/network-protocol.ts +2 -1
  79. package/src/automerge/space-collection.ts +2 -1
  80. package/src/db-host/automerge-metrics.ts +2 -1
  81. package/src/db-host/data-service.ts +2 -1
  82. package/src/db-host/database-root.ts +12 -16
  83. package/src/db-host/documents-iterator.ts +4 -3
  84. package/src/db-host/documents-synchronizer.test.ts +2 -2
  85. package/src/db-host/documents-synchronizer.ts +11 -9
  86. package/src/db-host/echo-host.ts +5 -2
  87. package/src/db-host/query-service.ts +5 -4
  88. package/src/db-host/query-state.ts +11 -3
  89. package/src/db-host/space-state-manager.ts +1 -1
  90. package/src/edge/echo-edge-replicator.test.ts +1 -1
  91. package/src/edge/echo-edge-replicator.ts +2 -1
  92. package/src/space/space-manager.ts +2 -1
  93. package/src/testing/test-network-adapter.ts +8 -5
@@ -2,13 +2,9 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import type * as A from '@dxos/automerge/automerge';
6
- import {
7
- interpretAsDocumentId,
8
- type AutomergeUrl,
9
- type DocHandle,
10
- type DocumentId,
11
- } from '@dxos/automerge/automerge-repo';
5
+ import type * as A from '@automerge/automerge';
6
+ import { interpretAsDocumentId, type AutomergeUrl, type DocHandle, type DocumentId } from '@automerge/automerge-repo';
7
+
12
8
  import { type SpaceDoc, SpaceDocVersion } from '@dxos/echo-protocol';
13
9
  import { invariant } from '@dxos/invariant';
14
10
 
@@ -41,19 +37,19 @@ export class DatabaseRoot {
41
37
  }
42
38
 
43
39
  get isLoaded(): boolean {
44
- return !!this._rootHandle.docSync();
40
+ return this._rootHandle.isReady();
45
41
  }
46
42
 
47
43
  get handle(): DocHandle<SpaceDoc> {
48
44
  return this._rootHandle;
49
45
  }
50
46
 
51
- docSync(): A.Doc<SpaceDoc> | null {
52
- return this._rootHandle.docSync() ?? null;
47
+ doc(): A.Doc<SpaceDoc> | null {
48
+ return this._rootHandle.isReady() ? this._rootHandle.doc() : null;
53
49
  }
54
50
 
55
51
  getVersion(): SpaceDocVersion | null {
56
- const doc = this.docSync();
52
+ const doc = this.doc();
57
53
  if (!doc) {
58
54
  return null;
59
55
  }
@@ -62,7 +58,7 @@ export class DatabaseRoot {
62
58
  }
63
59
 
64
60
  getSpaceKey(): string | null {
65
- const doc = this.docSync();
61
+ const doc = this.doc();
66
62
  if (!doc) {
67
63
  return null;
68
64
  }
@@ -71,7 +67,7 @@ export class DatabaseRoot {
71
67
  }
72
68
 
73
69
  getInlineObjectCount(): number | null {
74
- const doc = this.docSync();
70
+ const doc = this.doc();
75
71
  if (!doc) {
76
72
  return null;
77
73
  }
@@ -80,7 +76,7 @@ export class DatabaseRoot {
80
76
  }
81
77
 
82
78
  getLinkedObjectCount(): number | null {
83
- const doc = this.docSync();
79
+ const doc = this.doc();
84
80
  if (!doc) {
85
81
  return null;
86
82
  }
@@ -89,7 +85,7 @@ export class DatabaseRoot {
89
85
  }
90
86
 
91
87
  getAllLinkedDocuments(): AutomergeUrl[] {
92
- const doc = this.docSync();
88
+ const doc = this.doc();
93
89
  invariant(doc);
94
90
 
95
91
  // .toString() to handle RawString.
@@ -97,7 +93,7 @@ export class DatabaseRoot {
97
93
  }
98
94
 
99
95
  measureMetrics(): DocMetrics | null {
100
- const doc = this.docSync();
96
+ const doc = this.doc();
101
97
  if (!doc) {
102
98
  return null;
103
99
  }
@@ -2,8 +2,9 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import * as A from '@dxos/automerge/automerge';
6
- import { type DocumentId } from '@dxos/automerge/automerge-repo';
5
+ import * as A from '@automerge/automerge';
6
+ import { type DocumentId } from '@automerge/automerge-repo';
7
+
7
8
  import { Context } from '@dxos/context';
8
9
  import { SpaceDocVersion, type SpaceDoc } from '@dxos/echo-protocol';
9
10
  import { type ObjectSnapshot, type IdToHeads } from '@dxos/indexing';
@@ -29,7 +30,7 @@ export const createSelectedDocumentsIterator = (automergeHost: AutomergeHost) =>
29
30
  const { documentId, objectId } = objectPointerCodec.decode(id);
30
31
  const handle = await automergeHost.loadDoc<SpaceDoc>(Context.default(), documentId as DocumentId);
31
32
 
32
- let doc = handle.docSync();
33
+ let doc = handle.doc();
33
34
  invariant(doc);
34
35
 
35
36
  const currentHeads = A.getHeads(doc);
@@ -2,11 +2,11 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { next as A } from '@automerge/automerge';
6
+ import { generateAutomergeUrl, parseAutomergeUrl, Repo } from '@automerge/automerge-repo';
5
7
  import { describe, expect, test } from 'vitest';
6
8
 
7
9
  import { sleep } from '@dxos/async';
8
- import { next as A } from '@dxos/automerge/automerge';
9
- import { generateAutomergeUrl, parseAutomergeUrl, Repo } from '@dxos/automerge/automerge-repo';
10
10
  import { openAndClose } from '@dxos/test-utils';
11
11
 
12
12
  import { DocumentsSynchronizer } from './documents-synchronizer';
@@ -2,9 +2,10 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { next as A, type Heads } from '@automerge/automerge';
6
+ import { type Repo, type DocHandle, type DocumentId } from '@automerge/automerge-repo';
7
+
5
8
  import { UpdateScheduler } from '@dxos/async';
6
- import { next as A, type Heads } from '@dxos/automerge/automerge';
7
- import { type Repo, type DocHandle, type DocumentId } from '@dxos/automerge/automerge-repo';
8
9
  import { Resource } from '@dxos/context';
9
10
  import { type SpaceDoc } from '@dxos/echo-protocol';
10
11
  import { invariant } from '@dxos/invariant';
@@ -51,10 +52,10 @@ export class DocumentsSynchronizer extends Resource {
51
52
  }
52
53
 
53
54
  for (const documentId of documentIds) {
54
- const doc = this._params.repo.find<SpaceDoc>(documentId as DocumentId);
55
- doc
56
- .whenReady()
57
- .then(() => {
55
+ this._params.repo
56
+ .find<SpaceDoc>(documentId as DocumentId)
57
+ .then(async (doc) => {
58
+ await doc.whenReady();
58
59
  this._startSync(doc);
59
60
  this._pendingUpdates.add(doc.documentId);
60
61
  this._sendUpdatesJob!.trigger();
@@ -88,7 +89,7 @@ export class DocumentsSynchronizer extends Resource {
88
89
  update(updates: DocumentUpdate[]) {
89
90
  for (const { documentId, mutation, isNew } of updates) {
90
91
  if (isNew) {
91
- const doc = this._params.repo.find<SpaceDoc>(documentId as DocumentId);
92
+ const { handle: doc } = this._params.repo.findWithProgress<SpaceDoc>(documentId as DocumentId);
92
93
  doc.update((doc) => A.loadIncremental(doc, mutation));
93
94
  this._startSync(doc);
94
95
  } else {
@@ -141,10 +142,11 @@ export class DocumentsSynchronizer extends Resource {
141
142
  private _getPendingChanges(documentId: DocumentId): Uint8Array | void {
142
143
  const syncState = this._syncStates.get(documentId);
143
144
  invariant(syncState, 'Sync state for document not found');
144
- const doc = syncState.handle.docSync();
145
- if (!doc) {
145
+ const handle = syncState.handle;
146
+ if (!handle || !handle.isReady() || !handle.doc()) {
146
147
  return;
147
148
  }
149
+ const doc = handle.doc();
148
150
  const mutation = syncState.lastSentHead ? A.saveSince(doc, syncState.lastSentHead) : A.save(doc);
149
151
  if (mutation.length === 0) {
150
152
  return;
@@ -8,7 +8,8 @@ import {
8
8
  type DocHandle,
9
9
  type DocumentId,
10
10
  type Repo,
11
- } from '@dxos/automerge/automerge-repo';
11
+ } from '@automerge/automerge-repo';
12
+
12
13
  import { LifecycleState, Resource, type Context } from '@dxos/context';
13
14
  import { todo } from '@dxos/debug';
14
15
  import { createIdFromSpaceKey, SpaceDocVersion, type SpaceDoc } from '@dxos/echo-protocol';
@@ -26,6 +27,7 @@ import { QueryServiceImpl } from './query-service';
26
27
  import { SpaceStateManager } from './space-state-manager';
27
28
  import {
28
29
  AutomergeHost,
30
+ FIND_PARAMS,
29
31
  EchoDataMonitor,
30
32
  deriveCollectionIdFromSpaceId,
31
33
  type LoadDocOptions,
@@ -241,7 +243,8 @@ export class EchoHost extends Resource {
241
243
  // TODO(dmaretskyi): Change to document id.
242
244
  async openSpaceRoot(spaceId: SpaceId, automergeUrl: AutomergeUrl): Promise<DatabaseRoot> {
243
245
  invariant(this._lifecycleState === LifecycleState.OPEN);
244
- const handle = this._automergeHost.repo.find<SpaceDoc>(automergeUrl);
246
+ const handle = await this._automergeHost.repo.find<SpaceDoc>(automergeUrl, FIND_PARAMS);
247
+ await handle.whenReady();
245
248
 
246
249
  return this._spaceStateManager.assignRootToSpace(spaceId, handle);
247
250
  }
@@ -2,9 +2,10 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { getHeads } from '@automerge/automerge';
6
+ import { type DocHandle, type DocumentId } from '@automerge/automerge-repo';
7
+
5
8
  import { DeferredTask } from '@dxos/async';
6
- import { getHeads } from '@dxos/automerge/automerge';
7
- import { type DocHandle, type DocumentId } from '@dxos/automerge/automerge-repo';
8
9
  import { Stream } from '@dxos/codec-protobuf/stream';
9
10
  import { Context, Resource } from '@dxos/context';
10
11
  import { type SpaceDoc } from '@dxos/echo-protocol';
@@ -163,10 +164,10 @@ const createDocumentsIterator = (automergeHost: AutomergeHost) =>
163
164
  const visited = new Set<string>();
164
165
 
165
166
  async function* getObjectsFromHandle(handle: DocHandle<SpaceDoc>): AsyncGenerator<ObjectSnapshot[]> {
166
- if (visited.has(handle.documentId)) {
167
+ if (visited.has(handle.documentId) || !handle.isReady()) {
167
168
  return;
168
169
  }
169
- const doc = handle.docSync()!;
170
+ const doc = handle.doc()!;
170
171
 
171
172
  const spaceKey = getSpaceKeyFromDoc(doc) ?? undefined;
172
173
 
@@ -2,7 +2,8 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { type DocumentId } from '@dxos/automerge/automerge-repo';
5
+ import { type DocumentId } from '@automerge/automerge-repo';
6
+
6
7
  import { Context, LifecycleState, Resource } from '@dxos/context';
7
8
  import { createIdFromSpaceKey, type SpaceDoc } from '@dxos/echo-protocol';
8
9
  import { type Indexer, type IndexQuery } from '@dxos/indexing';
@@ -122,7 +123,7 @@ export class QueryState extends Resource {
122
123
  if (this._ctx.disposed) {
123
124
  return;
124
125
  }
125
- spaceKey = getSpaceKeyFromDoc(handle.docSync()!);
126
+ spaceKey = getSpaceKeyFromDoc(handle.doc()!);
126
127
  }
127
128
 
128
129
  if (!spaceKey) {
@@ -135,6 +136,13 @@ export class QueryState extends Resource {
135
136
  ) {
136
137
  return;
137
138
  }
139
+ const spaceId = await createIdFromSpaceKey(PublicKey.from(spaceKey));
140
+ if (
141
+ this._params.request.filter.options?.spaceIds?.length &&
142
+ !this._params.request.filter.options.spaceIds.includes(spaceId)
143
+ ) {
144
+ return;
145
+ }
138
146
 
139
147
  if (this._firstRun) {
140
148
  this.metrics.objectsReturned++;
@@ -143,7 +151,7 @@ export class QueryState extends Resource {
143
151
  return {
144
152
  id: objectId,
145
153
  documentId,
146
- spaceId: await createIdFromSpaceKey(PublicKey.from(spaceKey)),
154
+ spaceId,
147
155
  spaceKey: PublicKey.from(spaceKey),
148
156
  rank: result.rank,
149
157
  } satisfies QueryResult;
@@ -2,10 +2,10 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { interpretAsDocumentId, type DocHandle, type DocumentId } from '@automerge/automerge-repo';
5
6
  import isEqual from 'lodash.isequal';
6
7
 
7
8
  import { Event, UpdateScheduler } from '@dxos/async';
8
- import { interpretAsDocumentId, type DocHandle, type DocumentId } from '@dxos/automerge/automerge-repo';
9
9
  import { Resource, Context } from '@dxos/context';
10
10
  import { type SpaceDoc } from '@dxos/echo-protocol';
11
11
  import { type SpaceId } from '@dxos/keys';
@@ -2,11 +2,11 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { cbor } from '@automerge/automerge-repo';
5
6
  import { getRandomPort } from 'get-port-please';
6
7
  import { describe, expect, onTestFinished, test } from 'vitest';
7
8
 
8
9
  import { Event } from '@dxos/async';
9
- import { cbor } from '@dxos/automerge/automerge-repo';
10
10
  import { createEphemeralEdgeIdentity, EdgeClient, MessageSchema } from '@dxos/edge-client';
11
11
  import { createTestEdgeWsServer } from '@dxos/edge-client/testing';
12
12
  import { PublicKey, SpaceId } from '@dxos/keys';
@@ -2,8 +2,9 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { cbor } from '@automerge/automerge-repo';
6
+
5
7
  import { Mutex, scheduleTask, scheduleMicroTask } from '@dxos/async';
6
- import { cbor } from '@dxos/automerge/automerge-repo';
7
8
  import { Context, Resource } from '@dxos/context';
8
9
  import { randomUUID } from '@dxos/crypto';
9
10
  import type { CollectionId } from '@dxos/echo-protocol';
@@ -2,8 +2,9 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
+ import { type AutomergeUrl, parseAutomergeUrl } from '@automerge/automerge-repo';
6
+
5
7
  import { synchronized, trackLeaks, Trigger } from '@dxos/async';
6
- import { type AutomergeUrl, parseAutomergeUrl } from '@dxos/automerge/automerge-repo';
7
8
  import { getCredentialAssertion, type DelegateInvitationCredential, type MemberInfo } from '@dxos/credentials';
8
9
  import { failUndefined } from '@dxos/debug';
9
10
  import { type FeedStore } from '@dxos/feed-store';
@@ -2,8 +2,9 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { type Message, NetworkAdapter, type PeerId } from '@automerge/automerge-repo';
6
+
5
7
  import { Trigger, sleep } from '@dxos/async';
6
- import { type Message, NetworkAdapter, type PeerId } from '@dxos/automerge/automerge-repo';
7
8
  import { invariant } from '@dxos/invariant';
8
9
  import { log } from '@dxos/log';
9
10
 
@@ -27,10 +28,12 @@ export class TestAdapter extends NetworkAdapter {
27
28
  super();
28
29
  }
29
30
 
30
- // NOTE: Emitting `ready` event in NetworkAdapter`s constructor causes a race condition
31
- // because `Repo` waits for `ready` event (which it never receives) before it starts using the adapter.
32
- ready() {
33
- this.emit('ready', { network: this });
31
+ override isReady(): boolean {
32
+ return true;
33
+ }
34
+
35
+ override whenReady(): Promise<void> {
36
+ return Promise.resolve();
34
37
  }
35
38
 
36
39
  override connect(peerId: PeerId) {