@activeledger/activesync 5.1.5 → 5.1.7

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/es/spi.d.ts CHANGED
@@ -9,7 +9,27 @@ export declare function spiConsensus(networkStreams: any[], consensusReached: nu
9
9
  abstained: {
10
10
  [id: string]: string;
11
11
  };
12
+ forks: {
13
+ [id: string]: SpiFork;
14
+ };
12
15
  };
16
+ export interface SpiFork {
17
+ revisions: Array<{
18
+ rev: string;
19
+ position: number;
20
+ votes: number;
21
+ nodes: number[];
22
+ }>;
23
+ silent: number;
24
+ consensusReached: number;
25
+ }
26
+ export declare const SPI_FORK_TAG = "SPI_FORK";
27
+ export declare function describeFork(streamId: string, fork: SpiFork, opts?: {
28
+ umid?: string;
29
+ nodeNames?: (index: number) => string | undefined;
30
+ seen?: number;
31
+ firstSeen?: string;
32
+ }): string;
13
33
  export declare function bulkWriteFailed(response: any): boolean;
14
34
  export declare function shouldTriggerSpiLookup(errors: string[] | undefined, selfError?: string): boolean;
15
35
  export declare function previousUmidFor(umidDoc: any, streamId: string): string | undefined;
package/es/spi.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spi.d.ts","sourceRoot":"","sources":["../src/spi.ts"],"names":[],"mappings":"AA2IA,wBAAgB,YAAY,CAC1B,cAAc,EAAE,GAAG,EAAE,EACrB,gBAAgB,EAAE,MAAM,GACvB;IACD,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,GAAG,CAAA;SAAE,CAAA;KAAE,CAAC;IACpE,SAAS,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACrC,CAuJA;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAMtD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAC5B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAaT;AAYD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAcpB;AAMD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG/C"}
1
+ {"version":3,"file":"spi.d.ts","sourceRoot":"","sources":["../src/spi.ts"],"names":[],"mappings":"AA6IA,wBAAgB,YAAY,CAC1B,cAAc,EAAE,GAAG,EAAE,EACrB,gBAAgB,EAAE,MAAM,GACvB;IACD,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,GAAG,CAAA;SAAE,CAAA;KAAE,CAAC;IACpE,SAAS,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpC,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAClC,CAuLA;AAMD,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,KAAK,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAMD,eAAO,MAAM,YAAY,aAAa,CAAC;AAgBvC,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,GAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACf,GACL,MAAM,CAkDR;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAMtD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAC5B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAaT;AAYD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAgBpB;AAMD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG/C"}
package/es/spi.js CHANGED
@@ -26,16 +26,22 @@ export function spiConsensus(networkStreams, consensusReached) {
26
26
  if (!tally[streamDoc._id]) {
27
27
  tally[streamDoc._id] = {};
28
28
  }
29
- tally[streamDoc._id][streamDoc._rev]
30
- ? tally[streamDoc._id][streamDoc._rev].votes++
31
- : (tally[streamDoc._id][streamDoc._rev] = {
29
+ if (tally[streamDoc._id][streamDoc._rev]) {
30
+ tally[streamDoc._id][streamDoc._rev].votes++;
31
+ tally[streamDoc._id][streamDoc._rev].nodes.push(i);
32
+ }
33
+ else {
34
+ tally[streamDoc._id][streamDoc._rev] = {
32
35
  votes: 1,
33
36
  doc: streamDoc,
34
- });
37
+ nodes: [i],
38
+ };
39
+ }
35
40
  }
36
41
  }
37
42
  const winners = {};
38
43
  const abstained = {};
44
+ const forks = {};
39
45
  const ids = Object.keys(tally);
40
46
  const lockedIds = Object.keys(unreported);
41
47
  for (let i = lockedIds.length; i--;) {
@@ -50,29 +56,38 @@ export function spiConsensus(networkStreams, consensusReached) {
50
56
  let winner = "";
51
57
  let max = 0;
52
58
  let forked = false;
53
- const candidates = Object.keys(revisions);
54
- for (let x = candidates.length; x--;) {
55
- const rev = candidates[x];
56
- if (revisions[rev].votes < consensusReached) {
57
- continue;
58
- }
59
- if (revisions[rev].votes > max) {
60
- max = revisions[rev].votes;
61
- winner = rev;
62
- }
63
- else if (revisions[rev].votes === max) {
64
- if (revPosition(rev) > revPosition(winner)) {
65
- winner = rev;
66
- }
67
- else if (revPosition(rev) === revPosition(winner) &&
68
- rev !== winner) {
69
- forked = true;
70
- }
59
+ const candidates = Object.keys(revisions).filter((rev) => revisions[rev].votes >= consensusReached);
60
+ for (const rev of candidates) {
61
+ max = Math.max(max, revisions[rev].votes);
62
+ }
63
+ const tied = candidates.filter((rev) => revisions[rev].votes === max);
64
+ const positions = new Set();
65
+ for (const rev of tied) {
66
+ const position = revPosition(rev);
67
+ if (positions.has(position)) {
68
+ forked = true;
71
69
  }
70
+ positions.add(position);
71
+ }
72
+ if (!forked && tied.length) {
73
+ winner = tied.reduce((best, rev) => revPosition(rev) > revPosition(best) ? rev : best);
72
74
  }
73
75
  if (forked) {
74
76
  abstained[id] =
75
77
  "forked - two revisions at the same position, needs a human";
78
+ forks[id] = {
79
+ revisions: candidates
80
+ .filter((rev) => revisions[rev].votes >= consensusReached)
81
+ .map((rev) => ({
82
+ rev,
83
+ position: revPosition(rev),
84
+ votes: revisions[rev].votes,
85
+ nodes: revisions[rev].nodes.slice().sort((a, b) => a - b),
86
+ }))
87
+ .sort((a, b) => b.votes - a.votes || a.rev.localeCompare(b.rev)),
88
+ silent,
89
+ consensusReached,
90
+ };
76
91
  }
77
92
  else if (winner && max <= silent) {
78
93
  abstained[id] = `inconclusive - ${max} agreed on ${winner} but ${silent} node(s) could not report`;
@@ -87,7 +102,39 @@ export function spiConsensus(networkStreams, consensusReached) {
87
102
  abstained[id] = "no revision reached consensus";
88
103
  }
89
104
  }
90
- return { winners, abstained };
105
+ return { winners, abstained, forks };
106
+ }
107
+ export const SPI_FORK_TAG = "SPI_FORK";
108
+ export function describeFork(streamId, fork, opts = {}) {
109
+ const named = (i) => {
110
+ const name = opts.nodeNames ? opts.nodeNames(i) : undefined;
111
+ return name ? `${name} (#${i})` : `#${i}`;
112
+ };
113
+ const mapped = !!opts.nodeNames;
114
+ const lines = [
115
+ `SPI FORK - stream ${streamId} has diverged and needs a human`,
116
+ ` Exposed by transaction (umid): ${opts.umid || "unknown"}`,
117
+ ];
118
+ if (opts.seen && opts.seen > 1) {
119
+ lines.push(` Seen ${opts.seen} times since first logged${opts.firstSeen ? ` at ${opts.firstSeen}` : ""}`);
120
+ }
121
+ lines.push(` Competing revisions (each needed at least ${fork.consensusReached} votes; the tied ones are the fork):`);
122
+ for (const r of fork.revisions) {
123
+ lines.push(` - ${r.rev} position ${r.position} ${r.votes} vote(s) nodes: ${r.nodes.map(named).join(", ") || "none"}`);
124
+ }
125
+ lines.push(mapped
126
+ ? " Node numbers are positions in the list of nodes this node asked."
127
+ : " Node numbers are positions in the list of nodes this node asked (this node's neighbour list order, this node included); no name mapping was available here.");
128
+ lines.push(` Silent nodes (could not report, stream locked or unreachable): ${fork.silent}`, " This node took NO action: it rewrote nothing, forced no revision and changed no data.", " Next steps:", ` 1. Fetch the stream from each listed node (POST /a/stream with {"$streams":["${streamId}"]}) and compare the revisions and the transactions that produced them.`, " 2. Decide which revision is correct. Nothing in Activeledger decides this for you: both revisions committed a transaction the other did not, so one of them will be lost.", " 3. Bring the nodes holding the other revision to the chosen one in their data store, then run activerestore (see docs/guide/operate/restore.md) to confirm and fill any gaps. Restore also leaves a fork alone, so it cannot do step 3 for you.", ` ${SPI_FORK_TAG} ${JSON.stringify({
129
+ stream: streamId,
130
+ umid: opts.umid || null,
131
+ seen: opts.seen || 1,
132
+ revisions: fork.revisions,
133
+ silent: fork.silent,
134
+ consensusReached: fork.consensusReached,
135
+ action: "none",
136
+ })}`);
137
+ return lines.join("\n");
91
138
  }
92
139
  export function bulkWriteFailed(response) {
93
140
  return response?.ok !== true;
@@ -109,6 +156,8 @@ export function previousUmidFor(umidDoc, streamId) {
109
156
  if (!entry)
110
157
  continue;
111
158
  const id = entry.id || "";
159
+ if (!id)
160
+ continue;
112
161
  if (id === streamId || id.endsWith(streamId) || streamId.endsWith(id)) {
113
162
  return entry.prev || undefined;
114
163
  }
package/es/spi.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spi.js","sourceRoot":"","sources":["../src/spi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spi.js","sourceRoot":"","sources":["../src/spi.ts"],"names":[],"mappings":"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"}
package/lib/spi.d.ts CHANGED
@@ -9,7 +9,27 @@ export declare function spiConsensus(networkStreams: any[], consensusReached: nu
9
9
  abstained: {
10
10
  [id: string]: string;
11
11
  };
12
+ forks: {
13
+ [id: string]: SpiFork;
14
+ };
12
15
  };
16
+ export interface SpiFork {
17
+ revisions: Array<{
18
+ rev: string;
19
+ position: number;
20
+ votes: number;
21
+ nodes: number[];
22
+ }>;
23
+ silent: number;
24
+ consensusReached: number;
25
+ }
26
+ export declare const SPI_FORK_TAG = "SPI_FORK";
27
+ export declare function describeFork(streamId: string, fork: SpiFork, opts?: {
28
+ umid?: string;
29
+ nodeNames?: (index: number) => string | undefined;
30
+ seen?: number;
31
+ firstSeen?: string;
32
+ }): string;
13
33
  export declare function bulkWriteFailed(response: any): boolean;
14
34
  export declare function shouldTriggerSpiLookup(errors: string[] | undefined, selfError?: string): boolean;
15
35
  export declare function previousUmidFor(umidDoc: any, streamId: string): string | undefined;
package/lib/spi.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spi.d.ts","sourceRoot":"","sources":["../src/spi.ts"],"names":[],"mappings":"AA2IA,wBAAgB,YAAY,CAC1B,cAAc,EAAE,GAAG,EAAE,EACrB,gBAAgB,EAAE,MAAM,GACvB;IACD,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,GAAG,CAAA;SAAE,CAAA;KAAE,CAAC;IACpE,SAAS,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACrC,CAuJA;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAMtD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAC5B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAaT;AAYD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAcpB;AAMD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG/C"}
1
+ {"version":3,"file":"spi.d.ts","sourceRoot":"","sources":["../src/spi.ts"],"names":[],"mappings":"AA6IA,wBAAgB,YAAY,CAC1B,cAAc,EAAE,GAAG,EAAE,EACrB,gBAAgB,EAAE,MAAM,GACvB;IACD,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,GAAG,CAAA;SAAE,CAAA;KAAE,CAAC;IACpE,SAAS,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpC,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAClC,CAuLA;AAMD,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,KAAK,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAMD,eAAO,MAAM,YAAY,aAAa,CAAC;AAgBvC,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,GAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACf,GACL,MAAM,CAkDR;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAMtD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAC5B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAaT;AAYD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAgBpB;AAMD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG/C"}
package/lib/spi.js CHANGED
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.SPI_FORK_TAG = void 0;
3
4
  exports.spiConsensus = spiConsensus;
5
+ exports.describeFork = describeFork;
4
6
  exports.bulkWriteFailed = bulkWriteFailed;
5
7
  exports.shouldTriggerSpiLookup = shouldTriggerSpiLookup;
6
8
  exports.previousUmidFor = previousUmidFor;
@@ -33,16 +35,22 @@ function spiConsensus(networkStreams, consensusReached) {
33
35
  if (!tally[streamDoc._id]) {
34
36
  tally[streamDoc._id] = {};
35
37
  }
36
- tally[streamDoc._id][streamDoc._rev]
37
- ? tally[streamDoc._id][streamDoc._rev].votes++
38
- : (tally[streamDoc._id][streamDoc._rev] = {
38
+ if (tally[streamDoc._id][streamDoc._rev]) {
39
+ tally[streamDoc._id][streamDoc._rev].votes++;
40
+ tally[streamDoc._id][streamDoc._rev].nodes.push(i);
41
+ }
42
+ else {
43
+ tally[streamDoc._id][streamDoc._rev] = {
39
44
  votes: 1,
40
45
  doc: streamDoc,
41
- });
46
+ nodes: [i],
47
+ };
48
+ }
42
49
  }
43
50
  }
44
51
  const winners = {};
45
52
  const abstained = {};
53
+ const forks = {};
46
54
  const ids = Object.keys(tally);
47
55
  const lockedIds = Object.keys(unreported);
48
56
  for (let i = lockedIds.length; i--;) {
@@ -57,29 +65,38 @@ function spiConsensus(networkStreams, consensusReached) {
57
65
  let winner = "";
58
66
  let max = 0;
59
67
  let forked = false;
60
- const candidates = Object.keys(revisions);
61
- for (let x = candidates.length; x--;) {
62
- const rev = candidates[x];
63
- if (revisions[rev].votes < consensusReached) {
64
- continue;
65
- }
66
- if (revisions[rev].votes > max) {
67
- max = revisions[rev].votes;
68
- winner = rev;
69
- }
70
- else if (revisions[rev].votes === max) {
71
- if (revPosition(rev) > revPosition(winner)) {
72
- winner = rev;
73
- }
74
- else if (revPosition(rev) === revPosition(winner) &&
75
- rev !== winner) {
76
- forked = true;
77
- }
68
+ const candidates = Object.keys(revisions).filter((rev) => revisions[rev].votes >= consensusReached);
69
+ for (const rev of candidates) {
70
+ max = Math.max(max, revisions[rev].votes);
71
+ }
72
+ const tied = candidates.filter((rev) => revisions[rev].votes === max);
73
+ const positions = new Set();
74
+ for (const rev of tied) {
75
+ const position = revPosition(rev);
76
+ if (positions.has(position)) {
77
+ forked = true;
78
78
  }
79
+ positions.add(position);
80
+ }
81
+ if (!forked && tied.length) {
82
+ winner = tied.reduce((best, rev) => revPosition(rev) > revPosition(best) ? rev : best);
79
83
  }
80
84
  if (forked) {
81
85
  abstained[id] =
82
86
  "forked - two revisions at the same position, needs a human";
87
+ forks[id] = {
88
+ revisions: candidates
89
+ .filter((rev) => revisions[rev].votes >= consensusReached)
90
+ .map((rev) => ({
91
+ rev,
92
+ position: revPosition(rev),
93
+ votes: revisions[rev].votes,
94
+ nodes: revisions[rev].nodes.slice().sort((a, b) => a - b),
95
+ }))
96
+ .sort((a, b) => b.votes - a.votes || a.rev.localeCompare(b.rev)),
97
+ silent,
98
+ consensusReached,
99
+ };
83
100
  }
84
101
  else if (winner && max <= silent) {
85
102
  abstained[id] = `inconclusive - ${max} agreed on ${winner} but ${silent} node(s) could not report`;
@@ -94,7 +111,39 @@ function spiConsensus(networkStreams, consensusReached) {
94
111
  abstained[id] = "no revision reached consensus";
95
112
  }
96
113
  }
97
- return { winners, abstained };
114
+ return { winners, abstained, forks };
115
+ }
116
+ exports.SPI_FORK_TAG = "SPI_FORK";
117
+ function describeFork(streamId, fork, opts = {}) {
118
+ const named = (i) => {
119
+ const name = opts.nodeNames ? opts.nodeNames(i) : undefined;
120
+ return name ? `${name} (#${i})` : `#${i}`;
121
+ };
122
+ const mapped = !!opts.nodeNames;
123
+ const lines = [
124
+ `SPI FORK - stream ${streamId} has diverged and needs a human`,
125
+ ` Exposed by transaction (umid): ${opts.umid || "unknown"}`,
126
+ ];
127
+ if (opts.seen && opts.seen > 1) {
128
+ lines.push(` Seen ${opts.seen} times since first logged${opts.firstSeen ? ` at ${opts.firstSeen}` : ""}`);
129
+ }
130
+ lines.push(` Competing revisions (each needed at least ${fork.consensusReached} votes; the tied ones are the fork):`);
131
+ for (const r of fork.revisions) {
132
+ lines.push(` - ${r.rev} position ${r.position} ${r.votes} vote(s) nodes: ${r.nodes.map(named).join(", ") || "none"}`);
133
+ }
134
+ lines.push(mapped
135
+ ? " Node numbers are positions in the list of nodes this node asked."
136
+ : " Node numbers are positions in the list of nodes this node asked (this node's neighbour list order, this node included); no name mapping was available here.");
137
+ lines.push(` Silent nodes (could not report, stream locked or unreachable): ${fork.silent}`, " This node took NO action: it rewrote nothing, forced no revision and changed no data.", " Next steps:", ` 1. Fetch the stream from each listed node (POST /a/stream with {"$streams":["${streamId}"]}) and compare the revisions and the transactions that produced them.`, " 2. Decide which revision is correct. Nothing in Activeledger decides this for you: both revisions committed a transaction the other did not, so one of them will be lost.", " 3. Bring the nodes holding the other revision to the chosen one in their data store, then run activerestore (see docs/guide/operate/restore.md) to confirm and fill any gaps. Restore also leaves a fork alone, so it cannot do step 3 for you.", ` ${exports.SPI_FORK_TAG} ${JSON.stringify({
138
+ stream: streamId,
139
+ umid: opts.umid || null,
140
+ seen: opts.seen || 1,
141
+ revisions: fork.revisions,
142
+ silent: fork.silent,
143
+ consensusReached: fork.consensusReached,
144
+ action: "none",
145
+ })}`);
146
+ return lines.join("\n");
98
147
  }
99
148
  function bulkWriteFailed(response) {
100
149
  return response?.ok !== true;
@@ -116,6 +165,8 @@ function previousUmidFor(umidDoc, streamId) {
116
165
  if (!entry)
117
166
  continue;
118
167
  const id = entry.id || "";
168
+ if (!id)
169
+ continue;
119
170
  if (id === streamId || id.endsWith(streamId) || streamId.endsWith(id)) {
120
171
  return entry.prev || undefined;
121
172
  }
package/lib/spi.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spi.js","sourceRoot":"","sources":["../src/spi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spi.js","sourceRoot":"","sources":["../src/spi.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@activeledger/activesync",
3
- "version": "5.1.5",
3
+ "version": "5.1.7",
4
4
  "engines": {
5
5
  "node": ">=24.0.0"
6
6
  },
@@ -36,8 +36,8 @@
36
36
  "author": "Activeledger",
37
37
  "license": "MIT",
38
38
  "devDependencies": {
39
- "@activeledger/activedefinitions": "5.1.5",
40
- "@types/node": "24.10.1",
39
+ "@activeledger/activedefinitions": "5.1.7",
40
+ "@types/node": "24.19.2",
41
41
  "typescript": "7.0.2"
42
42
  },
43
43
  "files": [
@@ -48,7 +48,7 @@
48
48
  "jsnext:main": "./es/index.js",
49
49
  "module": "./es/index.js",
50
50
  "dependencies": {
51
- "@activeledger/activecrypto": "5.1.5",
52
- "@activeledger/activelogger": "5.1.5"
51
+ "@activeledger/activecrypto": "5.1.7",
52
+ "@activeledger/activelogger": "5.1.7"
53
53
  }
54
54
  }