@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.
- package/dist/lib/browser/{chunk-32WDI3LB.mjs → chunk-TPEBUDNJ.mjs} +9 -9
- package/dist/lib/browser/{chunk-32WDI3LB.mjs.map → chunk-TPEBUDNJ.mjs.map} +3 -3
- package/dist/lib/browser/index.mjs +148 -148
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +11 -12
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/node/{chunk-TC2PRBEU.cjs → chunk-QD3U65NM.cjs} +12 -12
- package/dist/lib/node/{chunk-TC2PRBEU.cjs.map → chunk-QD3U65NM.cjs.map} +2 -2
- package/dist/lib/node/index.cjs +173 -172
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/testing/index.cjs +20 -21
- package/dist/lib/node/testing/index.cjs.map +3 -3
- package/dist/lib/node-esm/{chunk-UKOLB3LW.mjs → chunk-S5YERQ4D.mjs} +9 -9
- package/dist/lib/node-esm/{chunk-UKOLB3LW.mjs.map → chunk-S5YERQ4D.mjs.map} +3 -3
- package/dist/lib/node-esm/index.mjs +148 -148
- package/dist/lib/node-esm/index.mjs.map +3 -3
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/testing/index.mjs +11 -12
- package/dist/lib/node-esm/testing/index.mjs.map +3 -3
- package/dist/types/src/automerge/automerge-host.d.ts +5 -2
- package/dist/types/src/automerge/automerge-host.d.ts.map +1 -1
- package/dist/types/src/automerge/collection-synchronizer.d.ts +1 -1
- package/dist/types/src/automerge/collection-synchronizer.d.ts.map +1 -1
- package/dist/types/src/automerge/echo-data-monitor.d.ts +6 -6
- package/dist/types/src/automerge/echo-data-monitor.d.ts.map +1 -1
- package/dist/types/src/automerge/echo-network-adapter.d.ts +4 -1
- package/dist/types/src/automerge/echo-network-adapter.d.ts.map +1 -1
- package/dist/types/src/automerge/heads-store.d.ts +2 -2
- package/dist/types/src/automerge/heads-store.d.ts.map +1 -1
- package/dist/types/src/automerge/leveldb-storage-adapter.d.ts +1 -1
- package/dist/types/src/automerge/leveldb-storage-adapter.d.ts.map +1 -1
- package/dist/types/src/automerge/mesh-echo-replicator-connection.d.ts.map +1 -1
- package/dist/types/src/automerge/network-protocol.d.ts +1 -1
- package/dist/types/src/automerge/network-protocol.d.ts.map +1 -1
- package/dist/types/src/automerge/space-collection.d.ts +1 -1
- package/dist/types/src/automerge/space-collection.d.ts.map +1 -1
- package/dist/types/src/common/feeds.d.ts.map +1 -1
- package/dist/types/src/common/space-id.d.ts.map +1 -1
- package/dist/types/src/db-host/automerge-metrics.d.ts +1 -1
- package/dist/types/src/db-host/automerge-metrics.d.ts.map +1 -1
- package/dist/types/src/db-host/data-service.d.ts.map +1 -1
- package/dist/types/src/db-host/database-root.d.ts +3 -3
- package/dist/types/src/db-host/database-root.d.ts.map +1 -1
- package/dist/types/src/db-host/documents-iterator.d.ts.map +1 -1
- package/dist/types/src/db-host/documents-synchronizer.d.ts +2 -2
- package/dist/types/src/db-host/documents-synchronizer.d.ts.map +1 -1
- package/dist/types/src/db-host/echo-host.d.ts +1 -1
- package/dist/types/src/db-host/echo-host.d.ts.map +1 -1
- package/dist/types/src/db-host/query-service.d.ts.map +1 -1
- package/dist/types/src/db-host/query-state.d.ts.map +1 -1
- package/dist/types/src/db-host/space-state-manager.d.ts +1 -1
- package/dist/types/src/db-host/space-state-manager.d.ts.map +1 -1
- package/dist/types/src/edge/echo-edge-replicator.d.ts.map +1 -1
- package/dist/types/src/metadata/metadata-store.d.ts.map +1 -1
- package/dist/types/src/pipeline/message-selector.d.ts.map +1 -1
- package/dist/types/src/pipeline/timeframe-clock.d.ts.map +1 -1
- package/dist/types/src/space/space-manager.d.ts.map +1 -1
- package/dist/types/src/testing/change-metadata.d.ts.map +1 -1
- package/dist/types/src/testing/test-agent-builder.d.ts.map +1 -1
- package/dist/types/src/testing/test-network-adapter.d.ts +3 -2
- package/dist/types/src/testing/test-network-adapter.d.ts.map +1 -1
- package/dist/types/src/util.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +35 -34
- package/src/automerge/automerge-host.test.ts +7 -7
- package/src/automerge/automerge-host.ts +30 -23
- package/src/automerge/automerge-repo.test.ts +65 -65
- package/src/automerge/collection-synchronizer.test.ts +1 -1
- package/src/automerge/collection-synchronizer.ts +3 -2
- package/src/automerge/echo-data-monitor.ts +9 -8
- package/src/automerge/echo-network-adapter.test.ts +1 -1
- package/src/automerge/echo-network-adapter.ts +13 -6
- package/src/automerge/heads-store.ts +3 -2
- package/src/automerge/leveldb-storage-adapter.ts +1 -1
- package/src/automerge/mesh-echo-replicator-connection.ts +3 -2
- package/src/automerge/network-protocol.ts +2 -1
- package/src/automerge/space-collection.ts +2 -1
- package/src/db-host/automerge-metrics.ts +2 -1
- package/src/db-host/data-service.ts +2 -1
- package/src/db-host/database-root.ts +12 -16
- package/src/db-host/documents-iterator.ts +4 -3
- package/src/db-host/documents-synchronizer.test.ts +2 -2
- package/src/db-host/documents-synchronizer.ts +11 -9
- package/src/db-host/echo-host.ts +5 -2
- package/src/db-host/query-service.ts +5 -4
- package/src/db-host/query-state.ts +11 -3
- package/src/db-host/space-state-manager.ts +1 -1
- package/src/edge/echo-edge-replicator.test.ts +1 -1
- package/src/edge/echo-edge-replicator.ts +2 -1
- package/src/space/space-manager.ts +2 -1
- package/src/testing/test-network-adapter.ts +8 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"space-manager.d.ts","sourceRoot":"","sources":["../../../../src/space/space-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"space-manager.d.ts","sourceRoot":"","sources":["../../../../src/space/space-manager.ts"],"names":[],"mappings":"AAOA,OAAO,EAA0B,KAAK,4BAA4B,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/G,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGxC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAClC,cAAc,EAAE,mBAAmB,CAAC;IACpC,aAAa,EAAE,aAAa,CAAC;IAE7B,SAAS,EAAE,SAAS,CAAC;IAErB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB;;OAEG;IACH,sBAAsB,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpD,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC;IAC5C,iCAAiC,EAAE,CAAC,UAAU,EAAE,4BAA4B,EAAE,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClH,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,QAAQ,EAAE,SAAS,CAAC;IACpB,WAAW,EAAE,SAAS,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,qBACa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoD;IAC5E,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsB;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;IAC1D,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAU;gBAErC,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,qBAAqB,EAAE,EAAE,kBAAkB;IAU9G,IAAI,MAAM,iCAET;IAGK,IAAI;IAGJ,KAAK;IAIL,cAAc,CAAC,EACnB,QAAQ,EACR,aAAa,EACb,sBAAsB,EACtB,aAAa,EACb,iCAAiC,EACjC,oBAAoB,EACpB,SAAS,GACV,EAAE,oBAAoB;IAoCV,+BAA+B,CAAC,MAAM,EAAE,qCAAqC,GAAG,OAAO,CAAC,UAAU,CAAC;IAqCzG,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS;CAcxE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-metadata.d.ts","sourceRoot":"","sources":["../../../../src/testing/change-metadata.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAM3D;;;;GAIG;AACH,eAAO,MAAM,8BAA8B,
|
|
1
|
+
{"version":3,"file":"change-metadata.d.ts","sourceRoot":"","sources":["../../../../src/testing/change-metadata.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAM3D;;;;GAIG;AACH,eAAO,MAAM,8BAA8B,GAAU,SAAS,OAAO,EAAE,SAAS,MAAM,kBASrF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-agent-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-agent-builder.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAuB,0BAA0B,EAA0B,MAAM,iBAAiB,CAAC;AAC1G,OAAO,EAA0B,mBAAmB,EAA6B,MAAM,uBAAuB,CAAC;AAC/G,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGxE,OAAO,EAA8B,KAAK,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAA0C,YAAY,EAAE,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AAE3G,MAAM,MAAM,sBAAsB,GAAG,MAAM,mBAAmB,CAAC;AAE/D,eAAO,MAAM,4BAA4B,
|
|
1
|
+
{"version":3,"file":"test-agent-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-agent-builder.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAuB,0BAA0B,EAA0B,MAAM,iBAAiB,CAAC;AAC1G,OAAO,EAA0B,mBAAmB,EAA6B,MAAM,uBAAuB,CAAC;AAC/G,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGxE,OAAO,EAA8B,KAAK,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAA0C,YAAY,EAAE,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AAE3G,MAAM,MAAM,sBAAsB,GAAG,MAAM,mBAAmB,CAAC;AAE/D,eAAO,MAAM,4BAA4B,GACtC,eAAe,0BAA0B,KAAG,sBAKzC,CAAC;AAEP,eAAO,MAAM,+BAA+B,GACzC,WAAW,MAAM,KAAG,sBAKjB,CAAC;AAEP,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,CAAC;AAEF;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwD;IAChF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAyB;gBAErD,EAAE,OAAO,EAAE,sBAAsB,EAAE,GAAE,uBAA4B;IAMvE,KAAK;IAIX,IAAI,MAAM,gBAET;IAED,QAAQ,CAAC,SAAS,EAAE,SAAS;IAIvB,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC;CAYvC;AAED;;GAEG;AACH,qBAAa,SAAS;IAkBlB,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,YAAY;aACb,WAAW,EAAE,SAAS;aACtB,SAAS,EAAE,SAAS;IApBtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoD;IAE5E,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,SAAgB,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAElD,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,IAAI,aAAa,kBAEhB;IAED,OAAO,CAAC,UAAU,CAAC,CAAY;IAC/B,IAAI,SAAS,cAEZ;gBAGkB,uBAAuB,EAAE,sBAAsB,EAC/C,YAAY,EAAE,eAAe,EAC9B,WAAW,EAAE,SAAS,EACtB,SAAS,EAAE,SAAS;IAOhC,KAAK;IAIX,IAAI,MAAM,YAET;IAED,QAAQ,CAAC,QAAQ,EAAE,SAAS;IAI5B,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,IAAI,cAAc,wBASjB;IAED,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,IAAI,YAAY,iBAOf;IAEK,WAAW,CACf,WAAW,GAAE,SAA4B,EACzC,QAAQ,CAAC,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,SAAS,EACtB,OAAO,CAAC,EAAE,SAAS,EACnB,YAAY,UAAQ,GACnB,OAAO,CAAC,KAAK,CAAC;IAqDjB,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM;IAoBrD,YAAY;IAMZ,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM;IASxB,YAAY,CAAC,KAAK,EAAE,KAAK;CAchC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { type Message, NetworkAdapter, type PeerId } from '@automerge/automerge-repo';
|
|
1
2
|
import { Trigger } from '@dxos/async';
|
|
2
|
-
import { type Message, NetworkAdapter, type PeerId } from '@dxos/automerge/automerge-repo';
|
|
3
3
|
export type TestConnectionStateProvider = () => 'on' | 'off';
|
|
4
4
|
export declare class TestAdapter extends NetworkAdapter {
|
|
5
5
|
private readonly _params;
|
|
@@ -8,7 +8,8 @@ export declare class TestAdapter extends NetworkAdapter {
|
|
|
8
8
|
constructor(_params: {
|
|
9
9
|
send: (message: Message) => void;
|
|
10
10
|
});
|
|
11
|
-
|
|
11
|
+
isReady(): boolean;
|
|
12
|
+
whenReady(): Promise<void>;
|
|
12
13
|
connect(peerId: PeerId): void;
|
|
13
14
|
peerCandidate(peerId: PeerId): void;
|
|
14
15
|
peerDisconnected(peerId: PeerId): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-network-adapter.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-network-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"test-network-adapter.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-network-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAE,cAAc,EAAE,KAAK,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAEtF,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,MAAM,MAAM,2BAA2B,GAAG,MAAM,IAAI,GAAG,KAAK,CAAC;AAE7D,qBAAa,WAAY,SAAQ,cAAc;IAcjC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAbpC,MAAM,CAAC,UAAU,CAAC,uBAAuB,GAAE,2BAAwC;IAW5E,SAAS,gBAAiB;gBAEJ,OAAO,EAAE;QAAE,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;KAAE;IAIjE,OAAO,IAAI,OAAO;IAIlB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1B,OAAO,CAAC,MAAM,EAAE,MAAM;IAK/B,aAAa,CAAC,MAAM,EAAE,MAAM;IAK5B,gBAAgB,CAAC,MAAM,EAAE,MAAM;IAKtB,IAAI,CAAC,OAAO,EAAE,OAAO;IAKrB,UAAU;IAInB,OAAO,CAAC,OAAO,EAAE,OAAO;CAIzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE3F;;GAEG;AACH,eAAO,MAAM,sBAAsB,
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE3F;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,UAAU,QAAQ,EAAE,UAAU,MAAM,KAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,SASzG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"5.
|
|
1
|
+
{"version":"5.8.3"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/echo-pipeline",
|
|
3
|
-
"version": "0.8.2-main.
|
|
3
|
+
"version": "0.8.2-main.fbd8ed0",
|
|
4
4
|
"description": "ECHO database.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -35,47 +35,48 @@
|
|
|
35
35
|
"src"
|
|
36
36
|
],
|
|
37
37
|
"dependencies": {
|
|
38
|
+
"@automerge/automerge": "3.0.0-beta.0",
|
|
39
|
+
"@automerge/automerge-repo": "2.0.0",
|
|
38
40
|
"crc-32": "^1.2.2",
|
|
39
41
|
"level-transcoder": "^1.0.1",
|
|
40
42
|
"lodash.isequal": "^4.5.0",
|
|
41
|
-
"@dxos/
|
|
42
|
-
"@dxos/
|
|
43
|
-
"@dxos/
|
|
44
|
-
"@dxos/
|
|
45
|
-
"@dxos/
|
|
46
|
-
"@dxos/
|
|
47
|
-
"@dxos/
|
|
48
|
-
"@dxos/echo-
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/invariant": "0.8.2-main.
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/
|
|
59
|
-
"@dxos/
|
|
60
|
-
"@dxos/
|
|
61
|
-
"@dxos/
|
|
62
|
-
"@dxos/
|
|
63
|
-
"@dxos/teleport": "0.8.2-main.
|
|
64
|
-
"@dxos/teleport
|
|
65
|
-
"@dxos/
|
|
66
|
-
"@dxos/teleport-extension-
|
|
67
|
-
"@dxos/teleport-extension-
|
|
68
|
-
"@dxos/
|
|
69
|
-
"@dxos/timeframe": "0.8.2-main.
|
|
70
|
-
"@dxos/
|
|
71
|
-
"@dxos/
|
|
72
|
-
"@dxos/util": "0.8.2-main.f11618f"
|
|
43
|
+
"@dxos/codec-protobuf": "0.8.2-main.fbd8ed0",
|
|
44
|
+
"@dxos/context": "0.8.2-main.fbd8ed0",
|
|
45
|
+
"@dxos/credentials": "0.8.2-main.fbd8ed0",
|
|
46
|
+
"@dxos/crypto": "0.8.2-main.fbd8ed0",
|
|
47
|
+
"@dxos/async": "0.8.2-main.fbd8ed0",
|
|
48
|
+
"@dxos/debug": "0.8.2-main.fbd8ed0",
|
|
49
|
+
"@dxos/echo-protocol": "0.8.2-main.fbd8ed0",
|
|
50
|
+
"@dxos/echo-schema": "0.8.2-main.fbd8ed0",
|
|
51
|
+
"@dxos/feed-store": "0.8.2-main.fbd8ed0",
|
|
52
|
+
"@dxos/edge-client": "0.8.2-main.fbd8ed0",
|
|
53
|
+
"@dxos/hypercore": "0.8.2-main.fbd8ed0",
|
|
54
|
+
"@dxos/indexing": "0.8.2-main.fbd8ed0",
|
|
55
|
+
"@dxos/invariant": "0.8.2-main.fbd8ed0",
|
|
56
|
+
"@dxos/keys": "0.8.2-main.fbd8ed0",
|
|
57
|
+
"@dxos/kv-store": "0.8.2-main.fbd8ed0",
|
|
58
|
+
"@dxos/keyring": "0.8.2-main.fbd8ed0",
|
|
59
|
+
"@dxos/messaging": "0.8.2-main.fbd8ed0",
|
|
60
|
+
"@dxos/network-manager": "0.8.2-main.fbd8ed0",
|
|
61
|
+
"@dxos/log": "0.8.2-main.fbd8ed0",
|
|
62
|
+
"@dxos/protocols": "0.8.2-main.fbd8ed0",
|
|
63
|
+
"@dxos/random-access-storage": "0.8.2-main.fbd8ed0",
|
|
64
|
+
"@dxos/node-std": "0.8.2-main.fbd8ed0",
|
|
65
|
+
"@dxos/teleport-extension-automerge-replicator": "0.8.2-main.fbd8ed0",
|
|
66
|
+
"@dxos/teleport": "0.8.2-main.fbd8ed0",
|
|
67
|
+
"@dxos/teleport-extension-object-sync": "0.8.2-main.fbd8ed0",
|
|
68
|
+
"@dxos/teleport-extension-replicator": "0.8.2-main.fbd8ed0",
|
|
69
|
+
"@dxos/teleport-extension-gossip": "0.8.2-main.fbd8ed0",
|
|
70
|
+
"@dxos/tracing": "0.8.2-main.fbd8ed0",
|
|
71
|
+
"@dxos/timeframe": "0.8.2-main.fbd8ed0",
|
|
72
|
+
"@dxos/typings": "0.8.2-main.fbd8ed0",
|
|
73
|
+
"@dxos/util": "0.8.2-main.fbd8ed0"
|
|
73
74
|
},
|
|
74
75
|
"devDependencies": {
|
|
75
76
|
"@types/lodash.isequal": "^4.5.0",
|
|
76
77
|
"fast-check": "^3.19.0",
|
|
77
78
|
"get-port-please": "^3.1.1",
|
|
78
|
-
"@dxos/test-utils": "0.8.2-main.
|
|
79
|
+
"@dxos/test-utils": "0.8.2-main.fbd8ed0"
|
|
79
80
|
},
|
|
80
81
|
"publishConfig": {
|
|
81
82
|
"access": "public"
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
+
import { getHeads } from '@automerge/automerge';
|
|
6
|
+
import type { DocumentId, Heads } from '@automerge/automerge-repo';
|
|
5
7
|
import { onTestFinished, describe, expect, test } from 'vitest';
|
|
6
8
|
|
|
7
|
-
import { getHeads } from '@dxos/automerge/automerge';
|
|
8
|
-
import type { DocumentId, Heads } from '@dxos/automerge/automerge-repo';
|
|
9
9
|
import { IndexMetadataStore } from '@dxos/indexing';
|
|
10
10
|
import type { LevelDB } from '@dxos/kv-store';
|
|
11
11
|
import { createTestLevel } from '@dxos/kv-store/testing';
|
|
@@ -24,7 +24,7 @@ describe('AutomergeHost', () => {
|
|
|
24
24
|
doc.text = 'Hello world';
|
|
25
25
|
});
|
|
26
26
|
await host.repo.flush();
|
|
27
|
-
expect(handle.
|
|
27
|
+
expect(handle.doc()!.text).toEqual('Hello world');
|
|
28
28
|
});
|
|
29
29
|
|
|
30
30
|
test('changes are preserved in storage', async () => {
|
|
@@ -41,9 +41,9 @@ describe('AutomergeHost', () => {
|
|
|
41
41
|
await host.close();
|
|
42
42
|
|
|
43
43
|
const host2 = await setupAutomergeHost({ level });
|
|
44
|
-
const handle2 = host2.repo.find<any>(url);
|
|
44
|
+
const handle2 = await host2.repo.find<any>(url);
|
|
45
45
|
await handle2.whenReady();
|
|
46
|
-
expect(handle2.
|
|
46
|
+
expect(handle2.doc()!.text).toEqual('Hello world');
|
|
47
47
|
await host2.repo.flush();
|
|
48
48
|
});
|
|
49
49
|
|
|
@@ -52,7 +52,7 @@ describe('AutomergeHost', () => {
|
|
|
52
52
|
|
|
53
53
|
const host = await setupAutomergeHost({ level });
|
|
54
54
|
const handle = host.createDoc({ text: 'Hello world' });
|
|
55
|
-
const expectedHeads = getHeads(handle.
|
|
55
|
+
const expectedHeads = getHeads(handle.doc()!);
|
|
56
56
|
await host.flush();
|
|
57
57
|
|
|
58
58
|
expect(await host.getHeads([handle.documentId])).toEqual([expectedHeads]);
|
|
@@ -69,7 +69,7 @@ describe('AutomergeHost', () => {
|
|
|
69
69
|
|
|
70
70
|
const host = await setupAutomergeHost({ level });
|
|
71
71
|
const handles = range(2, () => host.createDoc({ text: 'Hello world' }));
|
|
72
|
-
const expectedHeads: (Heads | undefined)[] = handles.map((handle) => getHeads(handle.
|
|
72
|
+
const expectedHeads: (Heads | undefined)[] = handles.map((handle) => getHeads(handle.doc()!));
|
|
73
73
|
await host.flush();
|
|
74
74
|
|
|
75
75
|
const ids = handles.map((handle) => handle.documentId);
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { Event, asyncTimeout } from '@dxos/async';
|
|
6
5
|
import {
|
|
7
6
|
getBackend,
|
|
8
7
|
getHeads,
|
|
@@ -11,7 +10,7 @@ import {
|
|
|
11
10
|
save,
|
|
12
11
|
type Doc,
|
|
13
12
|
type Heads,
|
|
14
|
-
} from '@
|
|
13
|
+
} from '@automerge/automerge';
|
|
15
14
|
import {
|
|
16
15
|
type DocHandleChangePayload,
|
|
17
16
|
Repo,
|
|
@@ -24,7 +23,10 @@ import {
|
|
|
24
23
|
type StorageAdapterInterface,
|
|
25
24
|
type StorageKey,
|
|
26
25
|
interpretAsDocumentId,
|
|
27
|
-
|
|
26
|
+
type HandleState,
|
|
27
|
+
} from '@automerge/automerge-repo';
|
|
28
|
+
|
|
29
|
+
import { Event, asyncTimeout } from '@dxos/async';
|
|
28
30
|
import { Context, Resource, cancelWithContext, type Lifecycle } from '@dxos/context';
|
|
29
31
|
import { type CollectionId, type SpaceDoc } from '@dxos/echo-protocol';
|
|
30
32
|
import { type IndexMetadataStore } from '@dxos/indexing';
|
|
@@ -72,6 +74,10 @@ export type CreateDocOptions = {
|
|
|
72
74
|
preserveHistory?: boolean;
|
|
73
75
|
};
|
|
74
76
|
|
|
77
|
+
export const FIND_PARAMS = {
|
|
78
|
+
allowableStates: ['ready', 'requesting'] satisfies HandleState[],
|
|
79
|
+
};
|
|
80
|
+
|
|
75
81
|
/**
|
|
76
82
|
* Abstracts over the AutomergeRepo.
|
|
77
83
|
*/
|
|
@@ -215,7 +221,7 @@ export class AutomergeHost extends Resource {
|
|
|
215
221
|
handle = this._repo.handles[documentId as DocumentId];
|
|
216
222
|
}
|
|
217
223
|
if (!handle) {
|
|
218
|
-
handle = this._repo.find(documentId as DocumentId);
|
|
224
|
+
handle = await this._repo.find(documentId as DocumentId, FIND_PARAMS);
|
|
219
225
|
}
|
|
220
226
|
|
|
221
227
|
// `whenReady` creates a timeout so we guard it with an if to skip it if the handle is already ready.
|
|
@@ -286,23 +292,21 @@ export class AutomergeHost extends Resource {
|
|
|
286
292
|
}
|
|
287
293
|
|
|
288
294
|
// Flush to disk handles loaded to memory also so that the indexer can pick up the changes.
|
|
289
|
-
await this._repo.flush(
|
|
295
|
+
await this._repo.flush(
|
|
296
|
+
documentIds.filter((documentId) => this._repo.handles[documentId] && this._repo.handles[documentId].isReady()),
|
|
297
|
+
);
|
|
290
298
|
}
|
|
291
299
|
|
|
292
300
|
async reIndexHeads(documentIds: DocumentId[]) {
|
|
293
301
|
for (const documentId of documentIds) {
|
|
294
302
|
log.info('re-indexing heads for document', { documentId });
|
|
295
|
-
const handle = this._repo.find(documentId);
|
|
296
|
-
|
|
297
|
-
if (handle.inState(['requesting'])) {
|
|
303
|
+
const handle = await this._repo.find(documentId, FIND_PARAMS);
|
|
304
|
+
if (!handle.isReady()) {
|
|
298
305
|
log.warn('document is not available locally, skipping', { documentId });
|
|
299
306
|
continue; // Handle not available locally.
|
|
300
307
|
}
|
|
301
308
|
|
|
302
|
-
const
|
|
303
|
-
invariant(doc);
|
|
304
|
-
|
|
305
|
-
const heads = getHeads(doc);
|
|
309
|
+
const heads = handle.heads();
|
|
306
310
|
const batch = this._db.batch();
|
|
307
311
|
this._headsStore.setHeads(documentId, heads, batch);
|
|
308
312
|
await batch.write();
|
|
@@ -333,10 +337,10 @@ export class AutomergeHost extends Resource {
|
|
|
333
337
|
|
|
334
338
|
private async _beforeSave({ path, batch }: BeforeSaveParams) {
|
|
335
339
|
const handle = this._repo.handles[path[0] as DocumentId];
|
|
336
|
-
if (!handle) {
|
|
340
|
+
if (!handle || !handle.isReady()) {
|
|
337
341
|
return;
|
|
338
342
|
}
|
|
339
|
-
const doc = handle.
|
|
343
|
+
const doc = handle.doc();
|
|
340
344
|
if (!doc) {
|
|
341
345
|
return;
|
|
342
346
|
}
|
|
@@ -369,7 +373,7 @@ export class AutomergeHost extends Resource {
|
|
|
369
373
|
this._indexMetadataStore.notifyMarkedDirty();
|
|
370
374
|
|
|
371
375
|
const documentId = path[0] as DocumentId;
|
|
372
|
-
const document = this._repo.handles[documentId]?.
|
|
376
|
+
const document = this._repo.handles[documentId]?.doc();
|
|
373
377
|
if (document) {
|
|
374
378
|
const heads = getHeads(document);
|
|
375
379
|
this._onHeadsChanged(documentId, heads);
|
|
@@ -393,9 +397,12 @@ export class AutomergeHost extends Resource {
|
|
|
393
397
|
}
|
|
394
398
|
|
|
395
399
|
private async _getContainingSpaceForDocument(documentId: string): Promise<PublicKey | null> {
|
|
396
|
-
const
|
|
397
|
-
if (
|
|
398
|
-
|
|
400
|
+
const handle = this._repo.handles[documentId as any];
|
|
401
|
+
if (handle.state === 'loading') {
|
|
402
|
+
await handle.whenReady();
|
|
403
|
+
}
|
|
404
|
+
if (handle && handle.isReady() && handle.doc()) {
|
|
405
|
+
const spaceKeyHex = getSpaceKeyFromDoc(handle.doc());
|
|
399
406
|
if (spaceKeyHex) {
|
|
400
407
|
return PublicKey.from(spaceKeyHex);
|
|
401
408
|
}
|
|
@@ -431,9 +438,9 @@ export class AutomergeHost extends Resource {
|
|
|
431
438
|
const storeRequestIds: DocumentId[] = [];
|
|
432
439
|
const storeResultIndices: number[] = [];
|
|
433
440
|
for (const documentId of documentIds) {
|
|
434
|
-
const
|
|
435
|
-
if (doc) {
|
|
436
|
-
result.push(getHeads(doc));
|
|
441
|
+
const handle = this._repo.handles[documentId];
|
|
442
|
+
if (handle && handle.isReady() && handle.doc()) {
|
|
443
|
+
result.push(getHeads(handle.doc()!));
|
|
437
444
|
} else {
|
|
438
445
|
storeRequestIds.push(documentId);
|
|
439
446
|
storeResultIndices.push(result.length);
|
|
@@ -555,7 +562,7 @@ export class AutomergeHost extends Resource {
|
|
|
555
562
|
|
|
556
563
|
// Load the documents so they will start syncing.
|
|
557
564
|
for (const documentId of toReplicate) {
|
|
558
|
-
this._repo.
|
|
565
|
+
this._repo.findWithProgress(documentId);
|
|
559
566
|
}
|
|
560
567
|
}
|
|
561
568
|
|
|
@@ -593,7 +600,7 @@ const waitForHeads = async (handle: DocHandle<SpaceDoc>, heads: Heads) => {
|
|
|
593
600
|
await Event.wrap<DocHandleChangePayload<SpaceDoc>>(handle, 'change').waitForCondition(() => {
|
|
594
601
|
// Check if unavailable heads became available.
|
|
595
602
|
for (const changeHash of unavailableHeads.values()) {
|
|
596
|
-
if (changeIsPresentInDoc(handle.
|
|
603
|
+
if (changeIsPresentInDoc(handle.doc()!, changeHash)) {
|
|
597
604
|
unavailableHeads.delete(changeHash);
|
|
598
605
|
}
|
|
599
606
|
}
|