@activeledger/activerestore 4.5.9 → 4.5.11
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 +0 -3
- package/es/modules/interagent/interagent.d.ts.map +1 -1
- package/es/modules/interagent/interagent.js +4 -38
- package/es/modules/interagent/interagent.js.map +1 -1
- package/lib/index.js +0 -0
- package/lib/modules/interagent/interagent.d.ts +0 -3
- package/lib/modules/interagent/interagent.d.ts.map +1 -1
- package/lib/modules/interagent/interagent.js +4 -38
- package/lib/modules/interagent/interagent.js.map +1 -1
- package/package.json +6 -6
- package/es/modules/interagent/stream-resync.d.ts +0 -18
- package/es/modules/interagent/stream-resync.d.ts.map +0 -1
- package/es/modules/interagent/stream-resync.js +0 -150
- package/es/modules/interagent/stream-resync.js.map +0 -1
- package/lib/modules/interagent/stream-resync.d.ts +0 -18
- package/lib/modules/interagent/stream-resync.d.ts.map +0 -1
- package/lib/modules/interagent/stream-resync.js +0 -154
- package/lib/modules/interagent/stream-resync.js.map +0 -1
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
export declare class Interagent {
|
|
2
|
-
private static readonly MAX_RESYNC_ATTEMPTS;
|
|
3
2
|
private errorCodes;
|
|
4
3
|
private skippedErrorInterval;
|
|
5
4
|
constructor();
|
|
6
5
|
private skippedChecker;
|
|
7
6
|
private hasErrorCode;
|
|
8
7
|
private processDocument;
|
|
9
|
-
private resyncStreams;
|
|
10
|
-
private retryLater;
|
|
11
8
|
private verifyUmidNotFound;
|
|
12
9
|
private insertUmid;
|
|
13
10
|
private setProcessed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AAyCA,qBAAa,UAAU;IACrB,OAAO,CAAC,UAAU,CAWhB;IAEF,OAAO,CAAC,oBAAoB,CAAW;;YAgEzB,cAAc;IA4B5B,OAAO,CAAC,YAAY,CAC6B;YAOnC,eAAe;YAiGf,kBAAkB;IAwBhC,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,YAAY;YA6BN,OAAO;CAmBtB"}
|
|
@@ -2,14 +2,11 @@ import { Provider } from "../provider/provider";
|
|
|
2
2
|
import { Helper } from "../helper/helper";
|
|
3
3
|
import { ActiveLogger } from "@activeledger/activelogger";
|
|
4
4
|
import { ErrorCodes } from "./error-codes.enum";
|
|
5
|
-
import { StreamResync } from "./stream-resync";
|
|
6
5
|
import { ActiveCrypto } from "@activeledger/activecrypto";
|
|
7
6
|
const REMOVE_CACHE_TIMER = 5 * 60 * 1000;
|
|
8
7
|
export class Interagent {
|
|
9
|
-
static MAX_RESYNC_ATTEMPTS = 20;
|
|
10
8
|
errorCodes = [
|
|
11
9
|
ErrorCodes.StreamNotFound,
|
|
12
|
-
ErrorCodes.StreamPositionIncorrect,
|
|
13
10
|
];
|
|
14
11
|
skippedErrorInterval;
|
|
15
12
|
constructor() {
|
|
@@ -53,7 +50,8 @@ export class Interagent {
|
|
|
53
50
|
hasErrorCode = (changeDoc) => this.errorCodes.indexOf(changeDoc.code) !== -1;
|
|
54
51
|
async processDocument(changeDoc) {
|
|
55
52
|
if (changeDoc.code === ErrorCodes.StreamPositionIncorrect) {
|
|
56
|
-
|
|
53
|
+
ActiveLogger.warn(`Node holds ${changeDoc.umid}'s streams at a revision the network rejected - left for SPI`);
|
|
54
|
+
return await this.setProcessed(changeDoc, true);
|
|
57
55
|
}
|
|
58
56
|
if (this.hasErrorCode(changeDoc)) {
|
|
59
57
|
ActiveLogger.info(`Processing Error Document ${changeDoc._id} with umid ${changeDoc.umid}`);
|
|
@@ -86,12 +84,12 @@ export class Interagent {
|
|
|
86
84
|
}
|
|
87
85
|
else {
|
|
88
86
|
ActiveLogger.error(`UMID ${changeDoc.umid} not found`);
|
|
89
|
-
return await this.
|
|
87
|
+
return await this.setProcessed(changeDoc, false);
|
|
90
88
|
}
|
|
91
89
|
}
|
|
92
90
|
else {
|
|
93
91
|
ActiveLogger.error(`UMID ${changeDoc.umid} not found #2`);
|
|
94
|
-
return await this.
|
|
92
|
+
return await this.setProcessed(changeDoc, false);
|
|
95
93
|
}
|
|
96
94
|
}
|
|
97
95
|
else {
|
|
@@ -100,38 +98,6 @@ export class Interagent {
|
|
|
100
98
|
}
|
|
101
99
|
return await this.setProcessed(changeDoc, false);
|
|
102
100
|
}
|
|
103
|
-
async resyncStreams(changeDoc) {
|
|
104
|
-
try {
|
|
105
|
-
const { rewrote, incomplete } = await StreamResync.resync(changeDoc.transaction);
|
|
106
|
-
if (rewrote) {
|
|
107
|
-
ActiveLogger.info(`Stream resync recovered ${rewrote} document(s) for umid ${changeDoc.umid}`);
|
|
108
|
-
return await this.setProcessed(changeDoc, true);
|
|
109
|
-
}
|
|
110
|
-
if (incomplete) {
|
|
111
|
-
return await this.retryLater(changeDoc);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
catch (error) {
|
|
115
|
-
ActiveLogger.error(error, `Stream resync failed for umid ${changeDoc.umid}`);
|
|
116
|
-
return await this.retryLater(changeDoc);
|
|
117
|
-
}
|
|
118
|
-
return await this.setProcessed(changeDoc, false);
|
|
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
|
-
}
|
|
135
101
|
async verifyUmidNotFound(umid) {
|
|
136
102
|
if (await Provider.database.exists(umid + ":umid")) {
|
|
137
103
|
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,
|
|
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,4BAA4B,CAAC;AAE1D,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAQzC,MAAM,OAAO,UAAU;IACb,UAAU,GAAG;QACnB,UAAU,CAAC,cAAc;KAU1B,CAAC;IAEM,oBAAoB,CAAW;IAiBvC;QAEE,IAAI,CAAC,oBAAoB,GAAG,KAAK,IAAI,EAAE;YACrC,IAAI;gBACF,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;aAC7B;YAAC,OAAO,KAAK,EAAE;gBACd,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC;aACpD;oBAAS;gBACR,UAAU,CAAC,GAAG,EAAE;oBACd,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC9B,CAAC,EAAE,IAAI,CAAC,CAAC;aACV;QACH,CAAC,CAAC;QAEF,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAExC,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACvD,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAE9B,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IA0BO,KAAK,CAAC,cAAc;QAE1B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC;YAChD,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QAEH,IAAI,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;YACrB,YAAY,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,CAAC;YAEvE,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;gBACpC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEzB,IAAI,GAAG,CAAC,SAAS,EAAE;oBACjB,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iBACzB;qBAAM;oBACL,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;iBACjC;aACF;SAEF;IACH,CAAC;IAOO,YAAY,GAAG,CAAC,SAAc,EAAE,EAAE,CACxC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAOzC,KAAK,CAAC,eAAe,CAAC,SAAc;QAiB1C,IAAI,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC,uBAAuB,EAAE;YACzD,YAAY,CAAC,IAAI,CACf,cAAc,SAAS,CAAC,IAAI,8DAA8D,CAC3F,CAAC;YACF,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;SACjD;QAGD,IACE,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAG5B;YACA,YAAY,CAAC,IAAI,CACf,6BAA6B,SAAS,CAAC,GAAG,cAAc,SAAS,CAAC,IAAI,EAAE,CACzE,CAAC;YAGF,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBACjD,YAAY,CAAC,IAAI,CAAC,QAAQ,SAAS,CAAC,IAAI,0BAA0B,CAAC,CAAC;gBAGpE,MAAM,SAAS,GACb,MAAM,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAC3C,QAAQ,SAAS,CAAC,IAAI,EAAE,EACxB,IAAI,EACJ,IAAI,CACL,CAAC;gBAGJ,MAAM,KAAK,GAAQ,EAAE,CAAC;gBAEtB,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;oBACpC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAQ,CAAC;oBACrC,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE;wBACxB,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;wBACjE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;4BAChB,KAAK,CAAC,IAAI,CAAC,GAAG;gCACZ,KAAK,EAAE,CAAC;gCACR,GAAG,EAAE,QAAQ;6BACd,CAAC;yBACH;6BAAM;4BACL,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;yBACrB;qBACF;iBACF;gBAGD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpC,IAAI,QAAQ,CAAC,MAAM,EAAE;oBACnB,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAC5B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAC1C,CAAC;oBACF,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;oBAEvC,IAAI,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE;wBACvB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;wBAC/B,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;qBACjD;yBAAM;wBACL,YAAY,CAAC,KAAK,CAAC,QAAQ,SAAS,CAAC,IAAI,YAAY,CAAC,CAAC;wBACvD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;qBAClD;iBACF;qBAAM;oBACL,YAAY,CAAC,KAAK,CAAC,QAAQ,SAAS,CAAC,IAAI,eAAe,CAAC,CAAC;oBAC1D,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;iBAClD;aAEF;iBAAM;gBACL,YAAY,CAAC,IAAI,CAAC,QAAQ,SAAS,CAAC,IAAI,iBAAiB,CAAC,CAAC;aAC5D;SACF;QACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;IAQO,KAAK,CAAC,kBAAkB,CAAC,IAAS;QAGxC,IAAI,MAAM,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,EAAE;YAElD,IAAI;gBACF,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC;gBAC5C,OAAO,KAAK,CAAC;aACd;YAAC,MAAM;gBACN,OAAO,IAAI,CAAC;aACb;SACF;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IAGH,CAAC;IAQO,UAAU,CAAC,OAAY;QAC7B,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,OAAO,EAAE;gBAEX,MAAM,GAAG,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBAEjE,IAAI;oBAMF,MAAM,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBAClE,MAAM,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC;wBAChC,GAAG;qBACJ,CAAC;wBACA,YAAY,CAAC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;oBAMzC,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;oBAEnC,OAAO,EAAE,CAAC;iBACX;gBAAC,OAAO,KAAK,EAAE;oBACd,YAAY,CAAC,IAAI,CACf,KAAK,IAAI,OAAO,EAChB,sBAAsB,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,CAC7C,CAAC;oBACF,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;aACF;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IASO,YAAY,CAClB,QAAyB,EACzB,eAAwB,KAAK;QAE7B,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,YAAY,CAAC,IAAI,CAAC,8BAA8B,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;YAChE,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;YAC1B,QAAQ,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;YAElC,IAAI;gBAEF,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBAC3C,OAAO,EAAE,CAAC;aACX;YAAC,OAAO,KAAK,EAAE;gBACd,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,4BAA4B,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;gBAGtE,MAAM,CAAC,KAAK,CAAC,CAAC;aACf;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IASO,KAAK,CAAC,OAAO,CACnB,QAAyB,EACzB,YAAsB;QAEtB,MAAM,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,YAAY,CAAC,IAAI,CAAC,oBAAoB,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;QAGtD,IAAI,YAAY,EAAE;YAMhB,MAAM,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1C,YAAY,CAAC,IAAI,CAAC,qBAAqB,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;SACxD;IACH,CAAC;CACF"}
|
package/lib/index.js
CHANGED
|
File without changes
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
export declare class Interagent {
|
|
2
|
-
private static readonly MAX_RESYNC_ATTEMPTS;
|
|
3
2
|
private errorCodes;
|
|
4
3
|
private skippedErrorInterval;
|
|
5
4
|
constructor();
|
|
6
5
|
private skippedChecker;
|
|
7
6
|
private hasErrorCode;
|
|
8
7
|
private processDocument;
|
|
9
|
-
private resyncStreams;
|
|
10
|
-
private retryLater;
|
|
11
8
|
private verifyUmidNotFound;
|
|
12
9
|
private insertUmid;
|
|
13
10
|
private setProcessed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AAyCA,qBAAa,UAAU;IACrB,OAAO,CAAC,UAAU,CAWhB;IAEF,OAAO,CAAC,oBAAoB,CAAW;;YAgEzB,cAAc;IA4B5B,OAAO,CAAC,YAAY,CAC6B;YAOnC,eAAe;YAiGf,kBAAkB;IAwBhC,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,YAAY;YA6BN,OAAO;CAmBtB"}
|
|
@@ -5,14 +5,11 @@ const provider_1 = require("../provider/provider");
|
|
|
5
5
|
const helper_1 = require("../helper/helper");
|
|
6
6
|
const activelogger_1 = require("@activeledger/activelogger");
|
|
7
7
|
const error_codes_enum_1 = require("./error-codes.enum");
|
|
8
|
-
const stream_resync_1 = require("./stream-resync");
|
|
9
8
|
const activecrypto_1 = require("@activeledger/activecrypto");
|
|
10
9
|
const REMOVE_CACHE_TIMER = 5 * 60 * 1000;
|
|
11
10
|
class Interagent {
|
|
12
|
-
static MAX_RESYNC_ATTEMPTS = 20;
|
|
13
11
|
errorCodes = [
|
|
14
12
|
error_codes_enum_1.ErrorCodes.StreamNotFound,
|
|
15
|
-
error_codes_enum_1.ErrorCodes.StreamPositionIncorrect,
|
|
16
13
|
];
|
|
17
14
|
skippedErrorInterval;
|
|
18
15
|
constructor() {
|
|
@@ -56,7 +53,8 @@ class Interagent {
|
|
|
56
53
|
hasErrorCode = (changeDoc) => this.errorCodes.indexOf(changeDoc.code) !== -1;
|
|
57
54
|
async processDocument(changeDoc) {
|
|
58
55
|
if (changeDoc.code === error_codes_enum_1.ErrorCodes.StreamPositionIncorrect) {
|
|
59
|
-
|
|
56
|
+
activelogger_1.ActiveLogger.warn(`Node holds ${changeDoc.umid}'s streams at a revision the network rejected - left for SPI`);
|
|
57
|
+
return await this.setProcessed(changeDoc, true);
|
|
60
58
|
}
|
|
61
59
|
if (this.hasErrorCode(changeDoc)) {
|
|
62
60
|
activelogger_1.ActiveLogger.info(`Processing Error Document ${changeDoc._id} with umid ${changeDoc.umid}`);
|
|
@@ -89,12 +87,12 @@ class Interagent {
|
|
|
89
87
|
}
|
|
90
88
|
else {
|
|
91
89
|
activelogger_1.ActiveLogger.error(`UMID ${changeDoc.umid} not found`);
|
|
92
|
-
return await this.
|
|
90
|
+
return await this.setProcessed(changeDoc, false);
|
|
93
91
|
}
|
|
94
92
|
}
|
|
95
93
|
else {
|
|
96
94
|
activelogger_1.ActiveLogger.error(`UMID ${changeDoc.umid} not found #2`);
|
|
97
|
-
return await this.
|
|
95
|
+
return await this.setProcessed(changeDoc, false);
|
|
98
96
|
}
|
|
99
97
|
}
|
|
100
98
|
else {
|
|
@@ -103,38 +101,6 @@ class Interagent {
|
|
|
103
101
|
}
|
|
104
102
|
return await this.setProcessed(changeDoc, false);
|
|
105
103
|
}
|
|
106
|
-
async resyncStreams(changeDoc) {
|
|
107
|
-
try {
|
|
108
|
-
const { rewrote, incomplete } = await stream_resync_1.StreamResync.resync(changeDoc.transaction);
|
|
109
|
-
if (rewrote) {
|
|
110
|
-
activelogger_1.ActiveLogger.info(`Stream resync recovered ${rewrote} document(s) for umid ${changeDoc.umid}`);
|
|
111
|
-
return await this.setProcessed(changeDoc, true);
|
|
112
|
-
}
|
|
113
|
-
if (incomplete) {
|
|
114
|
-
return await this.retryLater(changeDoc);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
catch (error) {
|
|
118
|
-
activelogger_1.ActiveLogger.error(error, `Stream resync failed for umid ${changeDoc.umid}`);
|
|
119
|
-
return await this.retryLater(changeDoc);
|
|
120
|
-
}
|
|
121
|
-
return await this.setProcessed(changeDoc, false);
|
|
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
|
-
}
|
|
138
104
|
async verifyUmidNotFound(umid) {
|
|
139
105
|
if (await provider_1.Provider.database.exists(umid + ":umid")) {
|
|
140
106
|
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,
|
|
1
|
+
{"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.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.11",
|
|
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.11",
|
|
49
|
+
"@activeledger/activelogger": "4.5.11",
|
|
50
|
+
"@activeledger/activenetwork": "4.5.11",
|
|
51
|
+
"@activeledger/activeoptions": "4.5.11",
|
|
52
52
|
"typescript": "4.7.3"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "0e3737c01cf21565ceee635a5b912af3020a5fd6"
|
|
55
55
|
}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
export interface IResyncDocument {
|
|
2
|
-
_id: string;
|
|
3
|
-
_rev: string;
|
|
4
|
-
[key: string]: unknown;
|
|
5
|
-
}
|
|
6
|
-
export declare class StreamResync {
|
|
7
|
-
static streamIdsFromTransaction(transaction: any): string[];
|
|
8
|
-
static winningDocuments(networkStreams: unknown[]): {
|
|
9
|
-
[id: string]: IResyncDocument;
|
|
10
|
-
};
|
|
11
|
-
static position(rev: string): number;
|
|
12
|
-
static resync(transaction: any): Promise<{
|
|
13
|
-
rewrote: number;
|
|
14
|
-
incomplete: boolean;
|
|
15
|
-
}>;
|
|
16
|
-
private static adopt;
|
|
17
|
-
}
|
|
18
|
-
//# sourceMappingURL=stream-resync.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1,150 +0,0 @@
|
|
|
1
|
-
import { ActiveLogger } from "@activeledger/activelogger";
|
|
2
|
-
import { Provider } from "../provider/provider";
|
|
3
|
-
import { Helper } from "../helper/helper";
|
|
4
|
-
export class StreamResync {
|
|
5
|
-
static streamIdsFromTransaction(transaction) {
|
|
6
|
-
const seen = {};
|
|
7
|
-
const ids = [];
|
|
8
|
-
const add = (id) => {
|
|
9
|
-
if (!seen[id]) {
|
|
10
|
-
seen[id] = true;
|
|
11
|
-
ids.push(id);
|
|
12
|
-
}
|
|
13
|
-
};
|
|
14
|
-
const sides = [transaction?.$tx?.$i, transaction?.$tx?.$o];
|
|
15
|
-
for (let side = sides.length; side--;) {
|
|
16
|
-
const io = sides[side] || {};
|
|
17
|
-
const keys = Object.keys(io);
|
|
18
|
-
for (let i = keys.length; i--;) {
|
|
19
|
-
const entry = io[keys[i]];
|
|
20
|
-
const raw = (entry && typeof entry === "object" && entry.$stream) || keys[i];
|
|
21
|
-
if (typeof raw !== "string") {
|
|
22
|
-
continue;
|
|
23
|
-
}
|
|
24
|
-
const id = raw.length > 64 ? raw.slice(-64) : raw;
|
|
25
|
-
if (id.length === 64) {
|
|
26
|
-
add(id);
|
|
27
|
-
add(`${id}:stream`);
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
return ids;
|
|
32
|
-
}
|
|
33
|
-
static winningDocuments(networkStreams) {
|
|
34
|
-
const tally = {};
|
|
35
|
-
for (let i = networkStreams.length; i--;) {
|
|
36
|
-
const nodeStreams = networkStreams[i];
|
|
37
|
-
if (!Array.isArray(nodeStreams)) {
|
|
38
|
-
continue;
|
|
39
|
-
}
|
|
40
|
-
for (let ii = nodeStreams.length; ii--;) {
|
|
41
|
-
const doc = nodeStreams[ii];
|
|
42
|
-
if (!doc || !doc._id || !doc._rev) {
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
|
-
if (!tally[doc._id]) {
|
|
46
|
-
tally[doc._id] = {};
|
|
47
|
-
}
|
|
48
|
-
tally[doc._id][doc._rev]
|
|
49
|
-
? tally[doc._id][doc._rev].votes++
|
|
50
|
-
: (tally[doc._id][doc._rev] = { votes: 1, doc });
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
const winners = {};
|
|
54
|
-
const ids = Object.keys(tally);
|
|
55
|
-
for (let i = ids.length; i--;) {
|
|
56
|
-
let winner = null;
|
|
57
|
-
let forked = false;
|
|
58
|
-
const revisions = Object.keys(tally[ids[i]]);
|
|
59
|
-
for (let r = revisions.length; r--;) {
|
|
60
|
-
const candidate = tally[ids[i]][revisions[r]];
|
|
61
|
-
if (!Helper.metConsensus(candidate.votes)) {
|
|
62
|
-
continue;
|
|
63
|
-
}
|
|
64
|
-
if (!winner ||
|
|
65
|
-
candidate.votes > winner.votes ||
|
|
66
|
-
(candidate.votes === winner.votes &&
|
|
67
|
-
StreamResync.position(candidate.doc._rev) >
|
|
68
|
-
StreamResync.position(winner.doc._rev))) {
|
|
69
|
-
winner = candidate;
|
|
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.`);
|
|
81
|
-
}
|
|
82
|
-
else if (winner) {
|
|
83
|
-
winners[ids[i]] = winner.doc;
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
return winners;
|
|
87
|
-
}
|
|
88
|
-
static position(rev) {
|
|
89
|
-
const position = parseInt((rev || "").split("-")[0], 10);
|
|
90
|
-
return isNaN(position) ? 0 : position;
|
|
91
|
-
}
|
|
92
|
-
static async resync(transaction) {
|
|
93
|
-
const streams = StreamResync.streamIdsFromTransaction(transaction);
|
|
94
|
-
if (!streams.length) {
|
|
95
|
-
Helper.output("Stream resync: transaction names no streams");
|
|
96
|
-
return { rewrote: 0, incomplete: false };
|
|
97
|
-
}
|
|
98
|
-
const networkStreams = await Provider.network.neighbourhood.knockAll("stream", { $streams: streams }, true);
|
|
99
|
-
const winners = StreamResync.winningDocuments(networkStreams);
|
|
100
|
-
const ids = Object.keys(winners);
|
|
101
|
-
let rewrote = 0;
|
|
102
|
-
for (let i = ids.length; i--;) {
|
|
103
|
-
try {
|
|
104
|
-
if (await StreamResync.adopt(ids[i], winners[ids[i]])) {
|
|
105
|
-
rewrote++;
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
catch (error) {
|
|
109
|
-
ActiveLogger.error(error, `Stream resync failed for ${ids[i]}`);
|
|
110
|
-
}
|
|
111
|
-
}
|
|
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 };
|
|
121
|
-
}
|
|
122
|
-
static async adopt(id, doc) {
|
|
123
|
-
let local = null;
|
|
124
|
-
try {
|
|
125
|
-
local = await Provider.database.get(id);
|
|
126
|
-
}
|
|
127
|
-
catch {
|
|
128
|
-
local = null;
|
|
129
|
-
}
|
|
130
|
-
if (local && local._rev === doc._rev) {
|
|
131
|
-
return false;
|
|
132
|
-
}
|
|
133
|
-
if (!local || !local._rev) {
|
|
134
|
-
ActiveLogger.warn(`Stream resync: creating ${id} @ ${doc._rev}`);
|
|
135
|
-
await Provider.database.bulkDocs([doc], { new_edits: false });
|
|
136
|
-
return true;
|
|
137
|
-
}
|
|
138
|
-
if (StreamResync.position(local._rev) >= StreamResync.position(doc._rev)) {
|
|
139
|
-
ActiveLogger.error(`Stream resync: refusing to move ${id} back from ${local._rev} to ${doc._rev}`);
|
|
140
|
-
return false;
|
|
141
|
-
}
|
|
142
|
-
ActiveLogger.warn(`Stream resync: ${id} local ${local._rev} -> network ${doc._rev}`);
|
|
143
|
-
await Provider.database.bulkDocs([doc], {
|
|
144
|
-
new_edits: true,
|
|
145
|
-
force_rev: doc._rev,
|
|
146
|
-
});
|
|
147
|
-
return true;
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
//# sourceMappingURL=stream-resync.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"stream-resync.js","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
export interface IResyncDocument {
|
|
2
|
-
_id: string;
|
|
3
|
-
_rev: string;
|
|
4
|
-
[key: string]: unknown;
|
|
5
|
-
}
|
|
6
|
-
export declare class StreamResync {
|
|
7
|
-
static streamIdsFromTransaction(transaction: any): string[];
|
|
8
|
-
static winningDocuments(networkStreams: unknown[]): {
|
|
9
|
-
[id: string]: IResyncDocument;
|
|
10
|
-
};
|
|
11
|
-
static position(rev: string): number;
|
|
12
|
-
static resync(transaction: any): Promise<{
|
|
13
|
-
rewrote: number;
|
|
14
|
-
incomplete: boolean;
|
|
15
|
-
}>;
|
|
16
|
-
private static adopt;
|
|
17
|
-
}
|
|
18
|
-
//# sourceMappingURL=stream-resync.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1,154 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.StreamResync = void 0;
|
|
4
|
-
const activelogger_1 = require("@activeledger/activelogger");
|
|
5
|
-
const provider_1 = require("../provider/provider");
|
|
6
|
-
const helper_1 = require("../helper/helper");
|
|
7
|
-
class StreamResync {
|
|
8
|
-
static streamIdsFromTransaction(transaction) {
|
|
9
|
-
const seen = {};
|
|
10
|
-
const ids = [];
|
|
11
|
-
const add = (id) => {
|
|
12
|
-
if (!seen[id]) {
|
|
13
|
-
seen[id] = true;
|
|
14
|
-
ids.push(id);
|
|
15
|
-
}
|
|
16
|
-
};
|
|
17
|
-
const sides = [transaction?.$tx?.$i, transaction?.$tx?.$o];
|
|
18
|
-
for (let side = sides.length; side--;) {
|
|
19
|
-
const io = sides[side] || {};
|
|
20
|
-
const keys = Object.keys(io);
|
|
21
|
-
for (let i = keys.length; i--;) {
|
|
22
|
-
const entry = io[keys[i]];
|
|
23
|
-
const raw = (entry && typeof entry === "object" && entry.$stream) || keys[i];
|
|
24
|
-
if (typeof raw !== "string") {
|
|
25
|
-
continue;
|
|
26
|
-
}
|
|
27
|
-
const id = raw.length > 64 ? raw.slice(-64) : raw;
|
|
28
|
-
if (id.length === 64) {
|
|
29
|
-
add(id);
|
|
30
|
-
add(`${id}:stream`);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
return ids;
|
|
35
|
-
}
|
|
36
|
-
static winningDocuments(networkStreams) {
|
|
37
|
-
const tally = {};
|
|
38
|
-
for (let i = networkStreams.length; i--;) {
|
|
39
|
-
const nodeStreams = networkStreams[i];
|
|
40
|
-
if (!Array.isArray(nodeStreams)) {
|
|
41
|
-
continue;
|
|
42
|
-
}
|
|
43
|
-
for (let ii = nodeStreams.length; ii--;) {
|
|
44
|
-
const doc = nodeStreams[ii];
|
|
45
|
-
if (!doc || !doc._id || !doc._rev) {
|
|
46
|
-
continue;
|
|
47
|
-
}
|
|
48
|
-
if (!tally[doc._id]) {
|
|
49
|
-
tally[doc._id] = {};
|
|
50
|
-
}
|
|
51
|
-
tally[doc._id][doc._rev]
|
|
52
|
-
? tally[doc._id][doc._rev].votes++
|
|
53
|
-
: (tally[doc._id][doc._rev] = { votes: 1, doc });
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
const winners = {};
|
|
57
|
-
const ids = Object.keys(tally);
|
|
58
|
-
for (let i = ids.length; i--;) {
|
|
59
|
-
let winner = null;
|
|
60
|
-
let forked = false;
|
|
61
|
-
const revisions = Object.keys(tally[ids[i]]);
|
|
62
|
-
for (let r = revisions.length; r--;) {
|
|
63
|
-
const candidate = tally[ids[i]][revisions[r]];
|
|
64
|
-
if (!helper_1.Helper.metConsensus(candidate.votes)) {
|
|
65
|
-
continue;
|
|
66
|
-
}
|
|
67
|
-
if (!winner ||
|
|
68
|
-
candidate.votes > winner.votes ||
|
|
69
|
-
(candidate.votes === winner.votes &&
|
|
70
|
-
StreamResync.position(candidate.doc._rev) >
|
|
71
|
-
StreamResync.position(winner.doc._rev))) {
|
|
72
|
-
winner = candidate;
|
|
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.`);
|
|
84
|
-
}
|
|
85
|
-
else if (winner) {
|
|
86
|
-
winners[ids[i]] = winner.doc;
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
return winners;
|
|
90
|
-
}
|
|
91
|
-
static position(rev) {
|
|
92
|
-
const position = parseInt((rev || "").split("-")[0], 10);
|
|
93
|
-
return isNaN(position) ? 0 : position;
|
|
94
|
-
}
|
|
95
|
-
static async resync(transaction) {
|
|
96
|
-
const streams = StreamResync.streamIdsFromTransaction(transaction);
|
|
97
|
-
if (!streams.length) {
|
|
98
|
-
helper_1.Helper.output("Stream resync: transaction names no streams");
|
|
99
|
-
return { rewrote: 0, incomplete: false };
|
|
100
|
-
}
|
|
101
|
-
const networkStreams = await provider_1.Provider.network.neighbourhood.knockAll("stream", { $streams: streams }, true);
|
|
102
|
-
const winners = StreamResync.winningDocuments(networkStreams);
|
|
103
|
-
const ids = Object.keys(winners);
|
|
104
|
-
let rewrote = 0;
|
|
105
|
-
for (let i = ids.length; i--;) {
|
|
106
|
-
try {
|
|
107
|
-
if (await StreamResync.adopt(ids[i], winners[ids[i]])) {
|
|
108
|
-
rewrote++;
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
catch (error) {
|
|
112
|
-
activelogger_1.ActiveLogger.error(error, `Stream resync failed for ${ids[i]}`);
|
|
113
|
-
}
|
|
114
|
-
}
|
|
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 };
|
|
124
|
-
}
|
|
125
|
-
static async adopt(id, doc) {
|
|
126
|
-
let local = null;
|
|
127
|
-
try {
|
|
128
|
-
local = await provider_1.Provider.database.get(id);
|
|
129
|
-
}
|
|
130
|
-
catch {
|
|
131
|
-
local = null;
|
|
132
|
-
}
|
|
133
|
-
if (local && local._rev === doc._rev) {
|
|
134
|
-
return false;
|
|
135
|
-
}
|
|
136
|
-
if (!local || !local._rev) {
|
|
137
|
-
activelogger_1.ActiveLogger.warn(`Stream resync: creating ${id} @ ${doc._rev}`);
|
|
138
|
-
await provider_1.Provider.database.bulkDocs([doc], { new_edits: false });
|
|
139
|
-
return true;
|
|
140
|
-
}
|
|
141
|
-
if (StreamResync.position(local._rev) >= StreamResync.position(doc._rev)) {
|
|
142
|
-
activelogger_1.ActiveLogger.error(`Stream resync: refusing to move ${id} back from ${local._rev} to ${doc._rev}`);
|
|
143
|
-
return false;
|
|
144
|
-
}
|
|
145
|
-
activelogger_1.ActiveLogger.warn(`Stream resync: ${id} local ${local._rev} -> network ${doc._rev}`);
|
|
146
|
-
await provider_1.Provider.database.bulkDocs([doc], {
|
|
147
|
-
new_edits: true,
|
|
148
|
-
force_rev: doc._rev,
|
|
149
|
-
});
|
|
150
|
-
return true;
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
exports.StreamResync = StreamResync;
|
|
154
|
-
//# sourceMappingURL=stream-resync.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"stream-resync.js","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":";;;AAuBA,6DAA0D;AAC1D,mDAAgD;AAChD,6CAA0C;AAsC1C,MAAa,YAAY;IAWhB,MAAM,CAAC,wBAAwB,CAAC,WAAgB;QACrD,MAAM,IAAI,GAA8B,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAa,EAAE,CAAC;QAEzB,MAAM,GAAG,GAAG,CAAC,EAAU,EAAE,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACb,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;gBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACd;QACH,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3D,KAAK,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,GAAI;YACtC,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAE7B,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;gBAC/B,MAAM,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1B,MAAM,GAAG,GACP,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEnE,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;oBAC3B,SAAS;iBACV;gBAKD,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBAClD,IAAI,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE;oBACpB,GAAG,CAAC,EAAE,CAAC,CAAC;oBAGR,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;iBACrB;aACF;SACF;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAYM,MAAM,CAAC,gBAAgB,CAAC,cAAyB;QAGtD,MAAM,KAAK,GAEP,EAAE,CAAC;QAEP,KAAK,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;YACzC,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAGtC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC/B,SAAS;aACV;YAED,KAAK,IAAI,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,EAAE,EAAE,GAAI;gBACxC,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,CAAoB,CAAC;gBAC/C,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;oBACjC,SAAS;iBACV;gBAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACnB,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;iBACrB;gBAED,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;oBACtB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE;oBAClC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;aACpD;SACF;QAED,MAAM,OAAO,GAAsC,EAAE,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE/B,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;YAC9B,IAAI,MAAM,GAAmD,IAAI,CAAC;YAClE,IAAI,MAAM,GAAG,KAAK,CAAC;YAEnB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;gBACpC,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE9C,IAAI,CAAC,eAAM,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACzC,SAAS;iBACV;gBAED,IACE,CAAC,MAAM;oBACP,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK;oBAC9B,CAAC,SAAS,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK;wBAC/B,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;4BACvC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAC3C;oBACA,MAAM,GAAG,SAAS,CAAC;iBACpB;qBAAM,IACL,MAAM;oBACN,SAAS,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK;oBAChC,SAAS,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI;oBACtC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;wBACvC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EACxC;oBAMA,MAAM,GAAG,IAAI,CAAC;iBACf;aACF;YAED,IAAI,MAAM,EAAE;gBACV,2BAAY,CAAC,KAAK,CAChB,kBAAkB,GAAG,CAAC,CAAC,CAAC,mFAAmF,CAC5G,CAAC;aACH;iBAAM,IAAI,MAAM,EAAE;gBACjB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC;aAC9B;SACF;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IASM,MAAM,CAAC,QAAQ,CAAC,GAAW;QAChC,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxC,CAAC;IAgBM,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,WAAgB;QAEhB,MAAM,OAAO,GAAG,YAAY,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;QAEnE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,eAAM,CAAC,MAAM,CAAC,6CAA6C,CAAC,CAAC;YAC7D,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;SAC1C;QAED,MAAM,cAAc,GAAG,MAAM,mBAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAClE,QAAQ,EACR,EAAE,QAAQ,EAAE,OAAO,EAAE,EACrB,IAAI,CACL,CAAC;QAEF,MAAM,OAAO,GAAG,YAAY,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAC9D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;YAC9B,IAAI;gBACF,IAAI,MAAM,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;oBACrD,OAAO,EAAE,CAAC;iBACX;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,2BAAY,CAAC,KAAK,CAAC,KAAK,EAAE,4BAA4B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACjE;SACF;QAID,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;YAClC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;gBACxB,UAAU,GAAG,IAAI,CAAC;gBAClB,2BAAY,CAAC,IAAI,CACf,kCAAkC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAC/D,CAAC;gBACF,MAAM;aACP;SACF;QAED,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IACjC,CAAC;IAYO,MAAM,CAAC,KAAK,CAAC,KAAK,CACxB,EAAU,EACV,GAAoB;QAEpB,IAAI,KAAK,GAA6B,IAAI,CAAC;QAE3C,IAAI;YACF,KAAK,GAAG,MAAM,mBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACzC;QAAC,MAAM;YACN,KAAK,GAAG,IAAI,CAAC;SACd;QAGD,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,EAAE;YACpC,OAAO,KAAK,CAAC;SACd;QAKD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YACzB,2BAAY,CAAC,IAAI,CAAC,2BAA2B,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACjE,MAAM,mBAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;SACb;QAMD,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACxE,2BAAY,CAAC,KAAK,CAChB,mCAAmC,EAAE,cAAc,KAAK,CAAC,IAAI,OAAO,GAAG,CAAC,IAAI,EAAE,CAC/E,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAKD,2BAAY,CAAC,IAAI,CACf,kBAAkB,EAAE,UAAU,KAAK,CAAC,IAAI,eAAe,GAAG,CAAC,IAAI,EAAE,CAClE,CAAC;QACF,MAAM,mBAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE;YACtC,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,GAAG,CAAC,IAAI;SACpB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AApRD,oCAoRC"}
|