@automerge/automerge-repo 2.5.0-alpha.0 → 2.5.0-alpha.1
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/synchronizer/DocSynchronizer.d.ts.map +1 -1
- package/dist/synchronizer/DocSynchronizer.js +2 -0
- package/dist/synchronizer/Synchronizer.d.ts +2 -0
- package/dist/synchronizer/Synchronizer.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/synchronizer/DocSynchronizer.ts +2 -0
- package/src/synchronizer/Synchronizer.ts +2 -0
- package/test/Repo.test.ts +4 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/DocSynchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,MAAM,2BAA2B,CAAA;AAGrD,OAAO,EACL,SAAS,EAKV,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAEL,gBAAgB,EAEhB,WAAW,EACX,cAAc,EACd,WAAW,EAEZ,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGhD,KAAK,kBAAkB,GAAG,SAAS,GAAG,KAAK,GAAG,aAAa,GAAG,OAAO,CAAA;AAOrE,UAAU,qBAAqB;IAC7B,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,CAAA;CACvE;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,YAAY;;IAE/C,gBAAgB,SAAM;gBAyBV,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,qBAAqB;IAyBtE,IAAI,UAAU,uCAEb;IAED,IAAI,UAAU,qCAEb;
|
|
1
|
+
{"version":3,"file":"DocSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/DocSynchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,MAAM,2BAA2B,CAAA;AAGrD,OAAO,EACL,SAAS,EAKV,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAEL,gBAAgB,EAEhB,WAAW,EACX,cAAc,EACd,WAAW,EAEZ,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGhD,KAAK,kBAAkB,GAAG,SAAS,GAAG,KAAK,GAAG,aAAa,GAAG,OAAO,CAAA;AAOrE,UAAU,qBAAqB;IAC7B,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,CAAA;CACvE;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,YAAY;;IAE/C,gBAAgB,SAAM;gBAyBV,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,qBAAqB;IAyBtE,IAAI,UAAU,uCAEb;IAED,IAAI,UAAU,qCAEb;IA8ID,OAAO,CAAC,MAAM,EAAE,MAAM;IAIhB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE;IA8DjC,OAAO,CAAC,MAAM,EAAE,MAAM;IAOtB,cAAc,CAAC,OAAO,EAAE,WAAW;IAkBnC,uBAAuB,CAAC,OAAO,EAAE,gBAAgB;IAuBjD,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc;IA4FxD,OAAO,IAAI;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;CAM7E"}
|
|
@@ -128,6 +128,7 @@ export class DocSynchronizer extends Synchronizer {
|
|
|
128
128
|
type: "generate-sync-message",
|
|
129
129
|
documentId: this.#handle.documentId,
|
|
130
130
|
durationMillis: end - start,
|
|
131
|
+
forPeer: peerId,
|
|
131
132
|
});
|
|
132
133
|
if (message) {
|
|
133
134
|
this.#setSyncState(peerId, newSyncState);
|
|
@@ -284,6 +285,7 @@ export class DocSynchronizer extends Synchronizer {
|
|
|
284
285
|
type: "receive-sync-message",
|
|
285
286
|
documentId: this.#handle.documentId,
|
|
286
287
|
durationMillis: end - start,
|
|
288
|
+
fromPeer: message.senderId,
|
|
287
289
|
...A.stats(doc),
|
|
288
290
|
});
|
|
289
291
|
this.#setSyncState(message.senderId, newSyncState);
|
|
@@ -23,10 +23,12 @@ export type DocSyncMetrics = {
|
|
|
23
23
|
durationMillis: number;
|
|
24
24
|
numOps: number;
|
|
25
25
|
numChanges: number;
|
|
26
|
+
fromPeer: PeerId;
|
|
26
27
|
} | {
|
|
27
28
|
type: "generate-sync-message";
|
|
28
29
|
documentId: DocumentId;
|
|
29
30
|
durationMillis: number;
|
|
31
|
+
forPeer: PeerId;
|
|
30
32
|
} | {
|
|
31
33
|
type: "doc-denied";
|
|
32
34
|
documentId: DocumentId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/Synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EACL,eAAe,EACf,cAAc,EACd,WAAW,EACZ,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAEhD,8BAAsB,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IACzE,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CACpD;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;IAC3C,YAAY,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAA;IACjD,UAAU,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;IACzC,OAAO,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;CACvC;AAED,uDAAuD;AACvD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;CACrB;AAED,MAAM,MAAM,cAAc,GACtB;IACE,IAAI,EAAE,sBAAsB,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"Synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/Synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EACL,eAAe,EACf,cAAc,EACd,WAAW,EACZ,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAEhD,8BAAsB,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IACzE,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CACpD;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;IAC3C,YAAY,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAA;IACjD,UAAU,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;IACzC,OAAO,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;CACvC;AAED,uDAAuD;AACvD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;CACrB;AAED,MAAM,MAAM,cAAc,GACtB;IACE,IAAI,EAAE,sBAAsB,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;CACjB,GACD;IACE,IAAI,EAAE,uBAAuB,CAAA;IAC7B,UAAU,EAAE,UAAU,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAChB,GACD;IACE,IAAI,EAAE,YAAY,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@automerge/automerge-repo",
|
|
3
|
-
"version": "2.5.0-alpha.
|
|
3
|
+
"version": "2.5.0-alpha.1",
|
|
4
4
|
"description": "A repository object to manage a collection of automerge documents",
|
|
5
5
|
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo",
|
|
6
6
|
"author": "Peter van Hardenberg <pvh@pvh.ca>",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"publishConfig": {
|
|
60
60
|
"access": "public"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "6865d2fca3f7fb1ebaf155aa858f4be3b65bbbef"
|
|
63
63
|
}
|
|
@@ -198,6 +198,7 @@ export class DocSynchronizer extends Synchronizer {
|
|
|
198
198
|
type: "generate-sync-message",
|
|
199
199
|
documentId: this.#handle.documentId,
|
|
200
200
|
durationMillis: end - start,
|
|
201
|
+
forPeer: peerId,
|
|
201
202
|
})
|
|
202
203
|
|
|
203
204
|
if (message) {
|
|
@@ -391,6 +392,7 @@ export class DocSynchronizer extends Synchronizer {
|
|
|
391
392
|
type: "receive-sync-message",
|
|
392
393
|
documentId: this.#handle.documentId,
|
|
393
394
|
durationMillis: end - start,
|
|
395
|
+
fromPeer: message.senderId,
|
|
394
396
|
...A.stats(doc),
|
|
395
397
|
})
|
|
396
398
|
|
|
@@ -32,11 +32,13 @@ export type DocSyncMetrics =
|
|
|
32
32
|
durationMillis: number
|
|
33
33
|
numOps: number
|
|
34
34
|
numChanges: number
|
|
35
|
+
fromPeer: PeerId
|
|
35
36
|
}
|
|
36
37
|
| {
|
|
37
38
|
type: "generate-sync-message"
|
|
38
39
|
documentId: DocumentId
|
|
39
40
|
durationMillis: number
|
|
41
|
+
forPeer: PeerId
|
|
40
42
|
}
|
|
41
43
|
| {
|
|
42
44
|
type: "doc-denied"
|
package/test/Repo.test.ts
CHANGED
|
@@ -2119,7 +2119,8 @@ describe("Repo.find() abort behavior", () => {
|
|
|
2119
2119
|
e =>
|
|
2120
2120
|
e.type === "receive-sync-message" &&
|
|
2121
2121
|
e.documentId == handle.documentId &&
|
|
2122
|
-
e.durationMillis > 0
|
|
2122
|
+
e.durationMillis > 0 &&
|
|
2123
|
+
e.fromPeer == ("alice" as PeerId)
|
|
2123
2124
|
)
|
|
2124
2125
|
)
|
|
2125
2126
|
|
|
@@ -2145,7 +2146,8 @@ describe("Repo.find() abort behavior", () => {
|
|
|
2145
2146
|
e =>
|
|
2146
2147
|
e.type === "generate-sync-message" &&
|
|
2147
2148
|
e.documentId == handle.documentId &&
|
|
2148
|
-
e.durationMillis > 0
|
|
2149
|
+
e.durationMillis > 0 &&
|
|
2150
|
+
e.forPeer == ("alice" as PeerId)
|
|
2149
2151
|
)
|
|
2150
2152
|
)
|
|
2151
2153
|
|