@activeledger/activerestore 4.5.8 → 4.5.9
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/modules/interagent/interagent.d.ts +2 -0
- package/es/modules/interagent/interagent.d.ts.map +1 -1
- package/es/modules/interagent/interagent.js +25 -1
- package/es/modules/interagent/interagent.js.map +1 -1
- package/es/modules/interagent/stream-resync.d.ts +4 -1
- package/es/modules/interagent/stream-resync.d.ts.map +1 -1
- package/es/modules/interagent/stream-resync.js +22 -3
- package/es/modules/interagent/stream-resync.js.map +1 -1
- package/lib/modules/interagent/interagent.d.ts +2 -0
- package/lib/modules/interagent/interagent.d.ts.map +1 -1
- package/lib/modules/interagent/interagent.js +25 -1
- package/lib/modules/interagent/interagent.js.map +1 -1
- package/lib/modules/interagent/stream-resync.d.ts +4 -1
- package/lib/modules/interagent/stream-resync.d.ts.map +1 -1
- package/lib/modules/interagent/stream-resync.js +22 -3
- package/lib/modules/interagent/stream-resync.js.map +1 -1
- package/package.json +6 -6
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare class Interagent {
|
|
2
|
+
private static readonly MAX_RESYNC_ATTEMPTS;
|
|
2
3
|
private errorCodes;
|
|
3
4
|
private skippedErrorInterval;
|
|
4
5
|
constructor();
|
|
@@ -6,6 +7,7 @@ export declare class Interagent {
|
|
|
6
7
|
private hasErrorCode;
|
|
7
8
|
private processDocument;
|
|
8
9
|
private resyncStreams;
|
|
10
|
+
private retryLater;
|
|
9
11
|
private verifyUmidNotFound;
|
|
10
12
|
private insertUmid;
|
|
11
13
|
private setProcessed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AA0CA,qBAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AA0CA,qBAAa,UAAU;IAMrB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAM;IAEjD,OAAO,CAAC,UAAU,CAiBhB;IAEF,OAAO,CAAC,oBAAoB,CAAW;;YAgEzB,cAAc;IA4B5B,OAAO,CAAC,YAAY,CAC6B;YAOnC,eAAe;YA+Ff,aAAa;YA6Cb,UAAU;YAkCV,kBAAkB;IAwBhC,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,YAAY;YA6BN,OAAO;CAmBtB"}
|
|
@@ -6,8 +6,10 @@ import { StreamResync } from "./stream-resync";
|
|
|
6
6
|
import { ActiveCrypto } from "@activeledger/activecrypto";
|
|
7
7
|
const REMOVE_CACHE_TIMER = 5 * 60 * 1000;
|
|
8
8
|
export class Interagent {
|
|
9
|
+
static MAX_RESYNC_ATTEMPTS = 20;
|
|
9
10
|
errorCodes = [
|
|
10
11
|
ErrorCodes.StreamNotFound,
|
|
12
|
+
ErrorCodes.StreamPositionIncorrect,
|
|
11
13
|
];
|
|
12
14
|
skippedErrorInterval;
|
|
13
15
|
constructor() {
|
|
@@ -50,6 +52,9 @@ export class Interagent {
|
|
|
50
52
|
}
|
|
51
53
|
hasErrorCode = (changeDoc) => this.errorCodes.indexOf(changeDoc.code) !== -1;
|
|
52
54
|
async processDocument(changeDoc) {
|
|
55
|
+
if (changeDoc.code === ErrorCodes.StreamPositionIncorrect) {
|
|
56
|
+
return await this.resyncStreams(changeDoc);
|
|
57
|
+
}
|
|
53
58
|
if (this.hasErrorCode(changeDoc)) {
|
|
54
59
|
ActiveLogger.info(`Processing Error Document ${changeDoc._id} with umid ${changeDoc.umid}`);
|
|
55
60
|
if (await this.verifyUmidNotFound(changeDoc.umid)) {
|
|
@@ -97,17 +102,36 @@ export class Interagent {
|
|
|
97
102
|
}
|
|
98
103
|
async resyncStreams(changeDoc) {
|
|
99
104
|
try {
|
|
100
|
-
const rewrote = await StreamResync.resync(changeDoc.transaction);
|
|
105
|
+
const { rewrote, incomplete } = await StreamResync.resync(changeDoc.transaction);
|
|
101
106
|
if (rewrote) {
|
|
102
107
|
ActiveLogger.info(`Stream resync recovered ${rewrote} document(s) for umid ${changeDoc.umid}`);
|
|
103
108
|
return await this.setProcessed(changeDoc, true);
|
|
104
109
|
}
|
|
110
|
+
if (incomplete) {
|
|
111
|
+
return await this.retryLater(changeDoc);
|
|
112
|
+
}
|
|
105
113
|
}
|
|
106
114
|
catch (error) {
|
|
107
115
|
ActiveLogger.error(error, `Stream resync failed for umid ${changeDoc.umid}`);
|
|
116
|
+
return await this.retryLater(changeDoc);
|
|
108
117
|
}
|
|
109
118
|
return await this.setProcessed(changeDoc, false);
|
|
110
119
|
}
|
|
120
|
+
async retryLater(changeDoc) {
|
|
121
|
+
const attempts = (changeDoc.resyncAttempts || 0) + 1;
|
|
122
|
+
if (attempts >= Interagent.MAX_RESYNC_ATTEMPTS) {
|
|
123
|
+
ActiveLogger.error(`Stream resync gave up on umid ${changeDoc.umid} after ${attempts} attempts - this node may still be out of date`);
|
|
124
|
+
return await this.setProcessed(changeDoc, true);
|
|
125
|
+
}
|
|
126
|
+
changeDoc.resyncAttempts = attempts;
|
|
127
|
+
try {
|
|
128
|
+
await Provider.errorDatabase.put(changeDoc);
|
|
129
|
+
ActiveLogger.info(`Stream resync will retry umid ${changeDoc.umid} (attempt ${attempts})`);
|
|
130
|
+
}
|
|
131
|
+
catch (error) {
|
|
132
|
+
ActiveLogger.error(error, `Could not record resync attempt ${attempts} for umid ${changeDoc.umid}`);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
111
135
|
async verifyUmidNotFound(umid) {
|
|
112
136
|
if (await Provider.database.exists(umid + ":umid")) {
|
|
113
137
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAK1C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAQzC,MAAM,OAAO,UAAU;
|
|
1
|
+
{"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,10 @@ export declare class StreamResync {
|
|
|
9
9
|
[id: string]: IResyncDocument;
|
|
10
10
|
};
|
|
11
11
|
static position(rev: string): number;
|
|
12
|
-
static resync(transaction: any): Promise<
|
|
12
|
+
static resync(transaction: any): Promise<{
|
|
13
|
+
rewrote: number;
|
|
14
|
+
incomplete: boolean;
|
|
15
|
+
}>;
|
|
13
16
|
private static adopt;
|
|
14
17
|
}
|
|
15
18
|
//# sourceMappingURL=stream-resync.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-resync.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AA6BD,qBAAa,YAAY;WAWT,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,MAAM,EAAE;WAmDpD,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG;QACzD,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,CAAC;KAC/B;
|
|
1
|
+
{"version":3,"file":"stream-resync.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AA6BD,qBAAa,YAAY;WAWT,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,MAAM,EAAE;WAmDpD,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG;QACzD,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,CAAC;KAC/B;WAuFa,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;WAmBvB,MAAM,CACxB,WAAW,EAAE,GAAG,GACf,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;mBAsD/B,KAAK;CAkD3B"}
|
|
@@ -54,6 +54,7 @@ export class StreamResync {
|
|
|
54
54
|
const ids = Object.keys(tally);
|
|
55
55
|
for (let i = ids.length; i--;) {
|
|
56
56
|
let winner = null;
|
|
57
|
+
let forked = false;
|
|
57
58
|
const revisions = Object.keys(tally[ids[i]]);
|
|
58
59
|
for (let r = revisions.length; r--;) {
|
|
59
60
|
const candidate = tally[ids[i]][revisions[r]];
|
|
@@ -67,8 +68,18 @@ export class StreamResync {
|
|
|
67
68
|
StreamResync.position(winner.doc._rev))) {
|
|
68
69
|
winner = candidate;
|
|
69
70
|
}
|
|
71
|
+
else if (winner &&
|
|
72
|
+
candidate.votes === winner.votes &&
|
|
73
|
+
candidate.doc._rev !== winner.doc._rev &&
|
|
74
|
+
StreamResync.position(candidate.doc._rev) ===
|
|
75
|
+
StreamResync.position(winner.doc._rev)) {
|
|
76
|
+
forked = true;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
if (forked) {
|
|
80
|
+
ActiveLogger.error(`Stream resync: ${ids[i]} has forked - two revisions at the same position. This needs a human, not a vote.`);
|
|
70
81
|
}
|
|
71
|
-
if (winner) {
|
|
82
|
+
else if (winner) {
|
|
72
83
|
winners[ids[i]] = winner.doc;
|
|
73
84
|
}
|
|
74
85
|
}
|
|
@@ -82,7 +93,7 @@ export class StreamResync {
|
|
|
82
93
|
const streams = StreamResync.streamIdsFromTransaction(transaction);
|
|
83
94
|
if (!streams.length) {
|
|
84
95
|
Helper.output("Stream resync: transaction names no streams");
|
|
85
|
-
return 0;
|
|
96
|
+
return { rewrote: 0, incomplete: false };
|
|
86
97
|
}
|
|
87
98
|
const networkStreams = await Provider.network.neighbourhood.knockAll("stream", { $streams: streams }, true);
|
|
88
99
|
const winners = StreamResync.winningDocuments(networkStreams);
|
|
@@ -98,7 +109,15 @@ export class StreamResync {
|
|
|
98
109
|
ActiveLogger.error(error, `Stream resync failed for ${ids[i]}`);
|
|
99
110
|
}
|
|
100
111
|
}
|
|
101
|
-
|
|
112
|
+
let incomplete = false;
|
|
113
|
+
for (let i = streams.length; i--;) {
|
|
114
|
+
if (!winners[streams[i]]) {
|
|
115
|
+
incomplete = true;
|
|
116
|
+
ActiveLogger.warn(`Stream resync: no decision for ${streams[i]} yet, will retry`);
|
|
117
|
+
break;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
return { rewrote, incomplete };
|
|
102
121
|
}
|
|
103
122
|
static async adopt(id, doc) {
|
|
104
123
|
let local = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-resync.js","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stream-resync.js","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare class Interagent {
|
|
2
|
+
private static readonly MAX_RESYNC_ATTEMPTS;
|
|
2
3
|
private errorCodes;
|
|
3
4
|
private skippedErrorInterval;
|
|
4
5
|
constructor();
|
|
@@ -6,6 +7,7 @@ export declare class Interagent {
|
|
|
6
7
|
private hasErrorCode;
|
|
7
8
|
private processDocument;
|
|
8
9
|
private resyncStreams;
|
|
10
|
+
private retryLater;
|
|
9
11
|
private verifyUmidNotFound;
|
|
10
12
|
private insertUmid;
|
|
11
13
|
private setProcessed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AA0CA,qBAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AA0CA,qBAAa,UAAU;IAMrB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAM;IAEjD,OAAO,CAAC,UAAU,CAiBhB;IAEF,OAAO,CAAC,oBAAoB,CAAW;;YAgEzB,cAAc;IA4B5B,OAAO,CAAC,YAAY,CAC6B;YAOnC,eAAe;YA+Ff,aAAa;YA6Cb,UAAU;YAkCV,kBAAkB;IAwBhC,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,YAAY;YA6BN,OAAO;CAmBtB"}
|
|
@@ -9,8 +9,10 @@ const stream_resync_1 = require("./stream-resync");
|
|
|
9
9
|
const activecrypto_1 = require("@activeledger/activecrypto");
|
|
10
10
|
const REMOVE_CACHE_TIMER = 5 * 60 * 1000;
|
|
11
11
|
class Interagent {
|
|
12
|
+
static MAX_RESYNC_ATTEMPTS = 20;
|
|
12
13
|
errorCodes = [
|
|
13
14
|
error_codes_enum_1.ErrorCodes.StreamNotFound,
|
|
15
|
+
error_codes_enum_1.ErrorCodes.StreamPositionIncorrect,
|
|
14
16
|
];
|
|
15
17
|
skippedErrorInterval;
|
|
16
18
|
constructor() {
|
|
@@ -53,6 +55,9 @@ class Interagent {
|
|
|
53
55
|
}
|
|
54
56
|
hasErrorCode = (changeDoc) => this.errorCodes.indexOf(changeDoc.code) !== -1;
|
|
55
57
|
async processDocument(changeDoc) {
|
|
58
|
+
if (changeDoc.code === error_codes_enum_1.ErrorCodes.StreamPositionIncorrect) {
|
|
59
|
+
return await this.resyncStreams(changeDoc);
|
|
60
|
+
}
|
|
56
61
|
if (this.hasErrorCode(changeDoc)) {
|
|
57
62
|
activelogger_1.ActiveLogger.info(`Processing Error Document ${changeDoc._id} with umid ${changeDoc.umid}`);
|
|
58
63
|
if (await this.verifyUmidNotFound(changeDoc.umid)) {
|
|
@@ -100,17 +105,36 @@ class Interagent {
|
|
|
100
105
|
}
|
|
101
106
|
async resyncStreams(changeDoc) {
|
|
102
107
|
try {
|
|
103
|
-
const rewrote = await stream_resync_1.StreamResync.resync(changeDoc.transaction);
|
|
108
|
+
const { rewrote, incomplete } = await stream_resync_1.StreamResync.resync(changeDoc.transaction);
|
|
104
109
|
if (rewrote) {
|
|
105
110
|
activelogger_1.ActiveLogger.info(`Stream resync recovered ${rewrote} document(s) for umid ${changeDoc.umid}`);
|
|
106
111
|
return await this.setProcessed(changeDoc, true);
|
|
107
112
|
}
|
|
113
|
+
if (incomplete) {
|
|
114
|
+
return await this.retryLater(changeDoc);
|
|
115
|
+
}
|
|
108
116
|
}
|
|
109
117
|
catch (error) {
|
|
110
118
|
activelogger_1.ActiveLogger.error(error, `Stream resync failed for umid ${changeDoc.umid}`);
|
|
119
|
+
return await this.retryLater(changeDoc);
|
|
111
120
|
}
|
|
112
121
|
return await this.setProcessed(changeDoc, false);
|
|
113
122
|
}
|
|
123
|
+
async retryLater(changeDoc) {
|
|
124
|
+
const attempts = (changeDoc.resyncAttempts || 0) + 1;
|
|
125
|
+
if (attempts >= Interagent.MAX_RESYNC_ATTEMPTS) {
|
|
126
|
+
activelogger_1.ActiveLogger.error(`Stream resync gave up on umid ${changeDoc.umid} after ${attempts} attempts - this node may still be out of date`);
|
|
127
|
+
return await this.setProcessed(changeDoc, true);
|
|
128
|
+
}
|
|
129
|
+
changeDoc.resyncAttempts = attempts;
|
|
130
|
+
try {
|
|
131
|
+
await provider_1.Provider.errorDatabase.put(changeDoc);
|
|
132
|
+
activelogger_1.ActiveLogger.info(`Stream resync will retry umid ${changeDoc.umid} (attempt ${attempts})`);
|
|
133
|
+
}
|
|
134
|
+
catch (error) {
|
|
135
|
+
activelogger_1.ActiveLogger.error(error, `Could not record resync attempt ${attempts} for umid ${changeDoc.umid}`);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
114
138
|
async verifyUmidNotFound(umid) {
|
|
115
139
|
if (await provider_1.Provider.database.exists(umid + ":umid")) {
|
|
116
140
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":";;;AAuBA,mDAAgD;AAChD,6CAA0C;AAK1C,6DAA0D;AAC1D,yDAAgD;AAChD,mDAA+C;AAC/C,6DAA0D;AAE1D,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAQzC,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,10 @@ export declare class StreamResync {
|
|
|
9
9
|
[id: string]: IResyncDocument;
|
|
10
10
|
};
|
|
11
11
|
static position(rev: string): number;
|
|
12
|
-
static resync(transaction: any): Promise<
|
|
12
|
+
static resync(transaction: any): Promise<{
|
|
13
|
+
rewrote: number;
|
|
14
|
+
incomplete: boolean;
|
|
15
|
+
}>;
|
|
13
16
|
private static adopt;
|
|
14
17
|
}
|
|
15
18
|
//# sourceMappingURL=stream-resync.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-resync.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AA6BD,qBAAa,YAAY;WAWT,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,MAAM,EAAE;WAmDpD,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG;QACzD,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,CAAC;KAC/B;
|
|
1
|
+
{"version":3,"file":"stream-resync.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AA6BD,qBAAa,YAAY;WAWT,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,MAAM,EAAE;WAmDpD,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG;QACzD,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,CAAC;KAC/B;WAuFa,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;WAmBvB,MAAM,CACxB,WAAW,EAAE,GAAG,GACf,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;mBAsD/B,KAAK;CAkD3B"}
|
|
@@ -57,6 +57,7 @@ class StreamResync {
|
|
|
57
57
|
const ids = Object.keys(tally);
|
|
58
58
|
for (let i = ids.length; i--;) {
|
|
59
59
|
let winner = null;
|
|
60
|
+
let forked = false;
|
|
60
61
|
const revisions = Object.keys(tally[ids[i]]);
|
|
61
62
|
for (let r = revisions.length; r--;) {
|
|
62
63
|
const candidate = tally[ids[i]][revisions[r]];
|
|
@@ -70,8 +71,18 @@ class StreamResync {
|
|
|
70
71
|
StreamResync.position(winner.doc._rev))) {
|
|
71
72
|
winner = candidate;
|
|
72
73
|
}
|
|
74
|
+
else if (winner &&
|
|
75
|
+
candidate.votes === winner.votes &&
|
|
76
|
+
candidate.doc._rev !== winner.doc._rev &&
|
|
77
|
+
StreamResync.position(candidate.doc._rev) ===
|
|
78
|
+
StreamResync.position(winner.doc._rev)) {
|
|
79
|
+
forked = true;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
if (forked) {
|
|
83
|
+
activelogger_1.ActiveLogger.error(`Stream resync: ${ids[i]} has forked - two revisions at the same position. This needs a human, not a vote.`);
|
|
73
84
|
}
|
|
74
|
-
if (winner) {
|
|
85
|
+
else if (winner) {
|
|
75
86
|
winners[ids[i]] = winner.doc;
|
|
76
87
|
}
|
|
77
88
|
}
|
|
@@ -85,7 +96,7 @@ class StreamResync {
|
|
|
85
96
|
const streams = StreamResync.streamIdsFromTransaction(transaction);
|
|
86
97
|
if (!streams.length) {
|
|
87
98
|
helper_1.Helper.output("Stream resync: transaction names no streams");
|
|
88
|
-
return 0;
|
|
99
|
+
return { rewrote: 0, incomplete: false };
|
|
89
100
|
}
|
|
90
101
|
const networkStreams = await provider_1.Provider.network.neighbourhood.knockAll("stream", { $streams: streams }, true);
|
|
91
102
|
const winners = StreamResync.winningDocuments(networkStreams);
|
|
@@ -101,7 +112,15 @@ class StreamResync {
|
|
|
101
112
|
activelogger_1.ActiveLogger.error(error, `Stream resync failed for ${ids[i]}`);
|
|
102
113
|
}
|
|
103
114
|
}
|
|
104
|
-
|
|
115
|
+
let incomplete = false;
|
|
116
|
+
for (let i = streams.length; i--;) {
|
|
117
|
+
if (!winners[streams[i]]) {
|
|
118
|
+
incomplete = true;
|
|
119
|
+
activelogger_1.ActiveLogger.warn(`Stream resync: no decision for ${streams[i]} yet, will retry`);
|
|
120
|
+
break;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
return { rewrote, incomplete };
|
|
105
124
|
}
|
|
106
125
|
static async adopt(id, doc) {
|
|
107
126
|
let local = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-resync.js","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stream-resync.js","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@activeledger/activerestore",
|
|
3
|
-
"version": "4.5.
|
|
3
|
+
"version": "4.5.9",
|
|
4
4
|
"description": "This pakacage contains the application which handles the network healing and rebuilding from an empty Activeledger node.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"blockchain",
|
|
@@ -45,11 +45,11 @@
|
|
|
45
45
|
"jsnext:main": "./es/index.js",
|
|
46
46
|
"module": "./es/index.js",
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@activeledger/activecrypto": "4.5.
|
|
49
|
-
"@activeledger/activelogger": "4.5.
|
|
50
|
-
"@activeledger/activenetwork": "4.5.
|
|
51
|
-
"@activeledger/activeoptions": "4.5.
|
|
48
|
+
"@activeledger/activecrypto": "4.5.9",
|
|
49
|
+
"@activeledger/activelogger": "4.5.9",
|
|
50
|
+
"@activeledger/activenetwork": "4.5.9",
|
|
51
|
+
"@activeledger/activeoptions": "4.5.9",
|
|
52
52
|
"typescript": "4.7.3"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "456db4de1c63f404c33ec78d9c3573dac2d7adc9"
|
|
55
55
|
}
|