@dxos/client-services 0.8.4-main.03d5cd7b56 → 0.8.4-main.05e74ebcff

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 (34) hide show
  1. package/LICENSE +102 -5
  2. package/README.md +1 -1
  3. package/dist/lib/browser/{chunk-LWIXGESH.mjs → chunk-U2YFOK57.mjs} +129 -110
  4. package/dist/lib/browser/chunk-U2YFOK57.mjs.map +7 -0
  5. package/dist/lib/browser/index.mjs +1 -1
  6. package/dist/lib/browser/index.mjs.map +2 -2
  7. package/dist/lib/browser/meta.json +1 -1
  8. package/dist/lib/browser/packlets/locks/browser.mjs.map +1 -1
  9. package/dist/lib/browser/testing/index.mjs +1 -1
  10. package/dist/lib/node-esm/{chunk-LOVO5YB5.mjs → chunk-OMK2O7UD.mjs} +129 -110
  11. package/dist/lib/node-esm/chunk-OMK2O7UD.mjs.map +7 -0
  12. package/dist/lib/node-esm/index.mjs +1 -1
  13. package/dist/lib/node-esm/index.mjs.map +2 -2
  14. package/dist/lib/node-esm/meta.json +1 -1
  15. package/dist/lib/node-esm/packlets/locks/browser.mjs.map +1 -1
  16. package/dist/lib/node-esm/testing/index.mjs +1 -1
  17. package/dist/types/src/packlets/services/service-context.d.ts.map +1 -1
  18. package/dist/types/src/packlets/spaces/data-space-manager.d.ts +2 -2
  19. package/dist/types/src/packlets/spaces/data-space-manager.d.ts.map +1 -1
  20. package/dist/types/src/packlets/spaces/data-space.d.ts.map +1 -1
  21. package/dist/types/src/packlets/spaces/epoch-migrations.d.ts.map +1 -1
  22. package/dist/types/src/packlets/spaces/spaces-service.d.ts.map +1 -1
  23. package/dist/types/src/version.d.ts +1 -1
  24. package/dist/types/tsconfig.tsbuildinfo +1 -1
  25. package/package.json +40 -40
  26. package/src/packlets/services/service-context.ts +15 -6
  27. package/src/packlets/space-export/serialized-space-writer.ts +9 -9
  28. package/src/packlets/spaces/data-space-manager.ts +5 -4
  29. package/src/packlets/spaces/data-space.ts +6 -2
  30. package/src/packlets/spaces/epoch-migrations.ts +1 -0
  31. package/src/packlets/spaces/spaces-service.ts +3 -1
  32. package/src/version.ts +1 -1
  33. package/dist/lib/browser/chunk-LWIXGESH.mjs.map +0 -7
  34. package/dist/lib/node-esm/chunk-LOVO5YB5.mjs.map +0 -7
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/client-services",
3
- "version": "0.8.4-main.03d5cd7b56",
3
+ "version": "0.8.4-main.05e74ebcff",
4
4
  "description": "DXOS client services implementation",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
8
8
  "type": "git",
9
9
  "url": "https://github.com/dxos/dxos"
10
10
  },
11
- "license": "MIT",
11
+ "license": "FSL-1.1-Apache-2.0",
12
12
  "author": "DXOS.org",
13
13
  "sideEffects": false,
14
14
  "type": "module",
@@ -61,49 +61,49 @@
61
61
  "cbor-x": "^1.5.4",
62
62
  "effect": "3.20.0",
63
63
  "platform": "^1.3.6",
64
- "@dxos/async": "0.8.4-main.03d5cd7b56",
65
- "@dxos/client-protocol": "0.8.4-main.03d5cd7b56",
66
- "@dxos/codec-protobuf": "0.8.4-main.03d5cd7b56",
67
- "@dxos/config": "0.8.4-main.03d5cd7b56",
68
- "@dxos/context": "0.8.4-main.03d5cd7b56",
69
- "@dxos/crypto": "0.8.4-main.03d5cd7b56",
70
- "@dxos/credentials": "0.8.4-main.03d5cd7b56",
71
- "@dxos/echo": "0.8.4-main.03d5cd7b56",
72
- "@dxos/debug": "0.8.4-main.03d5cd7b56",
73
- "@dxos/echo-db": "0.8.4-main.03d5cd7b56",
74
- "@dxos/echo-pipeline": "0.8.4-main.03d5cd7b56",
75
- "@dxos/echo-protocol": "0.8.4-main.03d5cd7b56",
76
- "@dxos/edge-client": "0.8.4-main.03d5cd7b56",
77
- "@dxos/feed": "0.8.4-main.03d5cd7b56",
78
- "@dxos/effect": "0.8.4-main.03d5cd7b56",
79
- "@dxos/feed-store": "0.8.4-main.03d5cd7b56",
80
- "@dxos/invariant": "0.8.4-main.03d5cd7b56",
81
- "@dxos/keyring": "0.8.4-main.03d5cd7b56",
82
- "@dxos/keys": "0.8.4-main.03d5cd7b56",
83
- "@dxos/kv-store": "0.8.4-main.03d5cd7b56",
84
- "@dxos/log": "0.8.4-main.03d5cd7b56",
85
- "@dxos/lock-file": "0.8.4-main.03d5cd7b56",
86
- "@dxos/messaging": "0.8.4-main.03d5cd7b56",
87
- "@dxos/network-manager": "0.8.4-main.03d5cd7b56",
88
- "@dxos/protocols": "0.8.4-main.03d5cd7b56",
89
- "@dxos/rpc": "0.8.4-main.03d5cd7b56",
90
- "@dxos/random-access-storage": "0.8.4-main.03d5cd7b56",
91
- "@dxos/node-std": "0.8.4-main.03d5cd7b56",
92
- "@dxos/sql-sqlite": "0.8.4-main.03d5cd7b56",
93
- "@dxos/teleport": "0.8.4-main.03d5cd7b56",
94
- "@dxos/teleport-extension-object-sync": "0.8.4-main.03d5cd7b56",
95
- "@dxos/teleport-extension-gossip": "0.8.4-main.03d5cd7b56",
96
- "@dxos/timeframe": "0.8.4-main.03d5cd7b56",
97
- "@dxos/tracing": "0.8.4-main.03d5cd7b56",
98
- "@dxos/websocket-rpc": "0.8.4-main.03d5cd7b56",
99
- "@dxos/util": "0.8.4-main.03d5cd7b56"
64
+ "@dxos/codec-protobuf": "0.8.4-main.05e74ebcff",
65
+ "@dxos/async": "0.8.4-main.05e74ebcff",
66
+ "@dxos/client-protocol": "0.8.4-main.05e74ebcff",
67
+ "@dxos/config": "0.8.4-main.05e74ebcff",
68
+ "@dxos/credentials": "0.8.4-main.05e74ebcff",
69
+ "@dxos/crypto": "0.8.4-main.05e74ebcff",
70
+ "@dxos/context": "0.8.4-main.05e74ebcff",
71
+ "@dxos/debug": "0.8.4-main.05e74ebcff",
72
+ "@dxos/echo-db": "0.8.4-main.05e74ebcff",
73
+ "@dxos/echo-pipeline": "0.8.4-main.05e74ebcff",
74
+ "@dxos/echo": "0.8.4-main.05e74ebcff",
75
+ "@dxos/effect": "0.8.4-main.05e74ebcff",
76
+ "@dxos/feed-store": "0.8.4-main.05e74ebcff",
77
+ "@dxos/feed": "0.8.4-main.05e74ebcff",
78
+ "@dxos/edge-client": "0.8.4-main.05e74ebcff",
79
+ "@dxos/echo-protocol": "0.8.4-main.05e74ebcff",
80
+ "@dxos/keyring": "0.8.4-main.05e74ebcff",
81
+ "@dxos/kv-store": "0.8.4-main.05e74ebcff",
82
+ "@dxos/invariant": "0.8.4-main.05e74ebcff",
83
+ "@dxos/log": "0.8.4-main.05e74ebcff",
84
+ "@dxos/lock-file": "0.8.4-main.05e74ebcff",
85
+ "@dxos/keys": "0.8.4-main.05e74ebcff",
86
+ "@dxos/messaging": "0.8.4-main.05e74ebcff",
87
+ "@dxos/network-manager": "0.8.4-main.05e74ebcff",
88
+ "@dxos/node-std": "0.8.4-main.05e74ebcff",
89
+ "@dxos/protocols": "0.8.4-main.05e74ebcff",
90
+ "@dxos/random-access-storage": "0.8.4-main.05e74ebcff",
91
+ "@dxos/rpc": "0.8.4-main.05e74ebcff",
92
+ "@dxos/teleport": "0.8.4-main.05e74ebcff",
93
+ "@dxos/sql-sqlite": "0.8.4-main.05e74ebcff",
94
+ "@dxos/teleport-extension-gossip": "0.8.4-main.05e74ebcff",
95
+ "@dxos/teleport-extension-object-sync": "0.8.4-main.05e74ebcff",
96
+ "@dxos/timeframe": "0.8.4-main.05e74ebcff",
97
+ "@dxos/tracing": "0.8.4-main.05e74ebcff",
98
+ "@dxos/util": "0.8.4-main.05e74ebcff",
99
+ "@dxos/websocket-rpc": "0.8.4-main.05e74ebcff"
100
100
  },
101
101
  "devDependencies": {
102
102
  "@types/platform": "^1.3.4",
103
103
  "@types/readable-stream": "^2.3.9",
104
104
  "get-port-please": "^3.1.1",
105
- "@dxos/test-utils": "0.8.4-main.03d5cd7b56",
106
- "@dxos/signal": "0.8.4-main.03d5cd7b56"
105
+ "@dxos/signal": "0.8.4-main.05e74ebcff",
106
+ "@dxos/test-utils": "0.8.4-main.05e74ebcff"
107
107
  },
108
108
  "publishConfig": {
109
109
  "access": "public"
@@ -10,7 +10,9 @@ import { type CredentialProcessor, getCredentialAssertion } from '@dxos/credenti
10
10
  import { failUndefined, warnAfterTimeout } from '@dxos/debug';
11
11
  import {
12
12
  EchoEdgeReplicator,
13
+ EchoEdgeSubductionReplicator,
13
14
  EchoHost,
15
+ type EdgeAutomergeReplicator,
14
16
  MeshEchoReplicator,
15
17
  MetadataStore,
16
18
  SpaceManager,
@@ -90,7 +92,7 @@ export class ServiceContext extends Resource {
90
92
  public readonly invitationsManager: InvitationsManager;
91
93
  public readonly echoHost: EchoHost;
92
94
  private readonly _meshReplicator?: MeshEchoReplicator = undefined;
93
- private readonly _echoEdgeReplicator?: EchoEdgeReplicator = undefined;
95
+ private readonly _echoEdgeReplicator?: EdgeAutomergeReplicator = undefined;
94
96
  private readonly _feedSyncer?: FeedSyncer = undefined;
95
97
 
96
98
  // Initialized after identity is initialized.
@@ -204,11 +206,18 @@ export class ServiceContext extends Resource {
204
206
  if (!this._runtimeProps?.disableP2pReplication) {
205
207
  this._meshReplicator = new MeshEchoReplicator();
206
208
  }
207
- if (this._edgeConnection && this._edgeFeatures?.echoReplicator && this._edgeHttpClient) {
208
- this._echoEdgeReplicator = new EchoEdgeReplicator({
209
- edgeConnection: this._edgeConnection,
210
- edgeHttpClient: this._edgeHttpClient,
211
- });
209
+ if (this._edgeConnection && this._edgeHttpClient) {
210
+ if (this._edgeFeatures?.subductionReplicator) {
211
+ this._echoEdgeReplicator = new EchoEdgeSubductionReplicator({
212
+ edgeConnection: this._edgeConnection,
213
+ edgeHttpClient: this._edgeHttpClient,
214
+ });
215
+ } else if (this._edgeFeatures?.echoReplicator) {
216
+ this._echoEdgeReplicator = new EchoEdgeReplicator({
217
+ edgeConnection: this._edgeConnection,
218
+ edgeHttpClient: this._edgeHttpClient,
219
+ });
220
+ }
212
221
  }
213
222
 
214
223
  if (this.echoHost.feedStore && this._edgeConnection) {
@@ -105,11 +105,11 @@ export const writeSerializedSpaceArchive = async (
105
105
 
106
106
  for (const linkedUrl of databaseRoot.getAllLinkedDocuments()) {
107
107
  const handle = await echoHost.loadDoc<DatabaseDirectory>(Context.default(), linkedUrl as AutomergeUrl);
108
- const doc = handle.doc();
109
- if (!doc) {
110
- log.warn('linked document did not load; skipping', { url: linkedUrl });
108
+ if (!handle) {
109
+ log.warn('linked document handle not available; skipping', { url: linkedUrl });
111
110
  continue;
112
111
  }
112
+ const doc = handle.doc();
113
113
  collectObjectsFromDoc(doc, objects);
114
114
  }
115
115
 
@@ -186,16 +186,16 @@ const exportFeedData = async (space: DataSpace, echoHost: EchoHost, objects: Obj
186
186
  continue;
187
187
  }
188
188
 
189
- const typeDxn = DXN.tryParse(obj[ATTR_TYPE] as string);
190
- if (typeDxn?.asTypeDXN()?.type !== FEED_TYPENAME) {
189
+ const typeDXN = DXN.tryParse(obj[ATTR_TYPE] as string);
190
+ if (typeDXN?.asTypeDXN()?.type !== FEED_TYPENAME) {
191
191
  continue;
192
192
  }
193
193
 
194
194
  const namespace = (obj as any).namespace === 'trace' ? 'trace' : 'data';
195
- const queueDxn = new DXN(DXN.kind.QUEUE, [namespace, spaceId, obj.id]);
195
+ const queueDXN = new DXN(DXN.kind.QUEUE, [namespace, spaceId, obj.id]);
196
196
 
197
197
  try {
198
- const messages = await collectQueueMessages(echoHost, queueDxn);
198
+ const messages = await collectQueueMessages(echoHost, queueDXN);
199
199
  if (messages.length > 0) {
200
200
  feeds.push({
201
201
  feedObjectId: obj.id,
@@ -211,8 +211,8 @@ const exportFeedData = async (space: DataSpace, echoHost: EchoHost, objects: Obj
211
211
  return feeds;
212
212
  };
213
213
 
214
- const collectQueueMessages = async (echoHost: EchoHost, queueDxn: DXN): Promise<Obj.JSON[]> => {
215
- const parts = queueDxn.asQueueDXN();
214
+ const collectQueueMessages = async (echoHost: EchoHost, queueDXN: DXN): Promise<Obj.JSON[]> => {
215
+ const parts = queueDXN.asQueueDXN();
216
216
  invariant(parts, 'Expected a queue DXN');
217
217
 
218
218
  const namespace =
@@ -20,8 +20,8 @@ import {
20
20
  AuthStatus,
21
21
  CredentialServerExtension,
22
22
  DatabaseRoot,
23
- type EchoEdgeReplicator,
24
23
  type EchoHost,
24
+ type EdgeAutomergeReplicator,
25
25
  type MeshEchoReplicator,
26
26
  type MetadataStore,
27
27
  type Space,
@@ -113,7 +113,7 @@ export type DataSpaceManagerProps = {
113
113
  edgeConnection?: EdgeConnection;
114
114
  edgeHttpClient?: EdgeHttpClient;
115
115
  meshReplicator?: MeshEchoReplicator;
116
- echoEdgeReplicator?: EchoEdgeReplicator;
116
+ echoEdgeReplicator?: EdgeAutomergeReplicator;
117
117
  runtimeProps?: DataSpaceManagerRuntimeProps;
118
118
  edgeFeatures?: Runtime.Client.EdgeFeatures;
119
119
  };
@@ -155,7 +155,7 @@ export class DataSpaceManager extends Resource {
155
155
  private readonly _edgeHttpClient?: EdgeHttpClient = undefined;
156
156
  private readonly _edgeFeatures?: Runtime.Client.EdgeFeatures = undefined;
157
157
  private readonly _meshReplicator?: MeshEchoReplicator = undefined;
158
- private readonly _echoEdgeReplicator?: EchoEdgeReplicator = undefined;
158
+ private readonly _echoEdgeReplicator?: EdgeAutomergeReplicator = undefined;
159
159
  private readonly _runtimeProps?: DataSpaceManagerRuntimeProps = undefined;
160
160
 
161
161
  constructor(params: DataSpaceManagerProps) {
@@ -320,6 +320,7 @@ export class DataSpaceManager extends Resource {
320
320
  if (options.rootUrl) {
321
321
  const newRootDocId = documentIdMapping[interpretAsDocumentId(options.rootUrl)] ?? failedInvariant();
322
322
  const rootDocHandle = await this._echoHost.loadDoc<DatabaseDirectory>(ctx, newRootDocId);
323
+ invariant(rootDocHandle, 'Root document must be available after import.');
323
324
  DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
324
325
 
325
326
  root = await this._echoHost.openSpaceRoot(ctx, spaceId, `automerge:${newRootDocId}` as AutomergeUrl);
@@ -577,7 +578,7 @@ export class DataSpaceManager extends Resource {
577
578
  // Use lifecycle ctx: the caller ctx from _constructSpace may be disposed by the time postOpen fires.
578
579
  await this._echoEdgeReplicator?.connectToSpace(this._ctx, dataSpace.id);
579
580
  } else if (this._echoEdgeReplicator) {
580
- log('not connecting EchoEdgeReplicator because of EdgeReplicationSetting', { spaceId: dataSpace.id });
581
+ log('not connecting edge replicator because of EdgeReplicationSetting', { spaceId: dataSpace.id });
581
582
  }
582
583
  });
583
584
  dataSpace.preClose.append(async () => {
@@ -487,7 +487,7 @@ export class DataSpace {
487
487
  private _onNewAutomergeRoot(rootUrl: string): void {
488
488
  log('loading automerge root doc for space', { space: this.key, rootUrl });
489
489
 
490
- let handle: DocHandle<DatabaseDirectory>;
490
+ let handle: DocHandle<DatabaseDirectory> | null = null;
491
491
 
492
492
  // TODO(dmaretskyi): Make this single-threaded (but doc loading should still be parallel to not block epoch processing).
493
493
  queueMicrotask(async () => {
@@ -503,12 +503,16 @@ export class DataSpace {
503
503
  if (this._ctx.disposed) {
504
504
  return;
505
505
  }
506
+ if (!handle) {
507
+ log.warn('automerge root doc not available yet', { space: this.key, rootUrl });
508
+ return;
509
+ }
506
510
 
507
511
  // Ensure only one root is processed at a time.
508
512
  using _guard = await this._epochProcessingMutex.acquire();
509
513
 
510
514
  // Attaching space keys to legacy documents.
511
- const doc = handle.doc() ?? failedInvariant();
515
+ const doc = handle.doc();
512
516
  if (!doc.access?.spaceKey) {
513
517
  handle.change((doc: any) => {
514
518
  doc.access = { spaceKey: this.key.toHex() };
@@ -47,6 +47,7 @@ export const runEpochMigration = async (ctx: Context, context: MigrationContext)
47
47
  const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot as AutomergeUrl, {
48
48
  timeout: LOAD_DOC_TIMEOUT,
49
49
  });
50
+ invariant(rootHandle, 'Automerge root document must load for history prune migration.');
50
51
 
51
52
  const newRoot = await context.echoHost.createDoc(rootHandle.doc());
52
53
  await context.echoHost.flush(ctx);
@@ -334,7 +334,7 @@ export class SpacesServiceImpl implements SpacesService {
334
334
  const format = request.archive.format ?? detectSpaceArchiveFormat(request.archive);
335
335
  if (format === SpaceArchive.Format.JSON) {
336
336
  const serialized = readSerializedSpaceArchive(request.archive);
337
- const space = await dataSpaceManager.createSpace(ctx);
337
+ const space = await dataSpaceManager.createSpace(ctx, { tags: request.tags });
338
338
  await this._hydrateSpaceFromSerialized(space, serialized);
339
339
  await this._updateMetrics();
340
340
  return { newSpaceId: space.id };
@@ -345,6 +345,7 @@ export class SpacesServiceImpl implements SpacesService {
345
345
  const space = await dataSpaceManager.createSpace(ctx, {
346
346
  documents: extracted.documents,
347
347
  rootUrl: extracted.metadata.echo?.currentRootUrl as AutomergeUrl,
348
+ tags: request.tags,
348
349
  });
349
350
  await this._updateMetrics();
350
351
  return { newSpaceId: space.id };
@@ -377,6 +378,7 @@ export class SpacesServiceImpl implements SpacesService {
377
378
  if (feed.messages.length === 0) {
378
379
  continue;
379
380
  }
381
+
380
382
  const namespace =
381
383
  feed.namespace === 'trace' ? FeedProtocol.WellKnownNamespaces.trace : FeedProtocol.WellKnownNamespaces.data;
382
384
  try {
package/src/version.ts CHANGED
@@ -1 +1 @@
1
- export const DXOS_VERSION = "0.8.4-main.03d5cd7b56";
1
+ export const DXOS_VERSION = "0.8.4-main.05e74ebcff";