@activeledger/activerestore 4.5.6 → 4.5.8

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.
Files changed (29) hide show
  1. package/es/interfaces/quick-restore.interface.d.ts +1 -0
  2. package/es/interfaces/quick-restore.interface.d.ts.map +1 -1
  3. package/es/modules/interagent/interagent.d.ts +1 -0
  4. package/es/modules/interagent/interagent.d.ts.map +1 -1
  5. package/es/modules/interagent/interagent.js +16 -2
  6. package/es/modules/interagent/interagent.js.map +1 -1
  7. package/es/modules/interagent/stream-resync.d.ts +15 -0
  8. package/es/modules/interagent/stream-resync.d.ts.map +1 -0
  9. package/es/modules/interagent/stream-resync.js +131 -0
  10. package/es/modules/interagent/stream-resync.js.map +1 -0
  11. package/es/modules/quick-restore/quick-restore.d.ts +1 -0
  12. package/es/modules/quick-restore/quick-restore.d.ts.map +1 -1
  13. package/es/modules/quick-restore/quick-restore.js +22 -4
  14. package/es/modules/quick-restore/quick-restore.js.map +1 -1
  15. package/lib/interfaces/quick-restore.interface.d.ts +1 -0
  16. package/lib/interfaces/quick-restore.interface.d.ts.map +1 -1
  17. package/lib/modules/interagent/interagent.d.ts +1 -0
  18. package/lib/modules/interagent/interagent.d.ts.map +1 -1
  19. package/lib/modules/interagent/interagent.js +16 -2
  20. package/lib/modules/interagent/interagent.js.map +1 -1
  21. package/lib/modules/interagent/stream-resync.d.ts +15 -0
  22. package/lib/modules/interagent/stream-resync.d.ts.map +1 -0
  23. package/lib/modules/interagent/stream-resync.js +135 -0
  24. package/lib/modules/interagent/stream-resync.js.map +1 -0
  25. package/lib/modules/quick-restore/quick-restore.d.ts +1 -0
  26. package/lib/modules/quick-restore/quick-restore.d.ts.map +1 -1
  27. package/lib/modules/quick-restore/quick-restore.js +22 -4
  28. package/lib/modules/quick-restore/quick-restore.js.map +1 -1
  29. package/package.json +6 -6
@@ -26,6 +26,7 @@ export interface IConsensusData {
26
26
  }
27
27
  export interface IBaseData {
28
28
  _id: string;
29
+ _rev?: string;
29
30
  error?: string | {};
30
31
  namespace?: string;
31
32
  contract?: [];
@@ -1 +1 @@
1
- {"version":3,"file":"quick-restore.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/quick-restore.interface.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,UAAU,sBAAsB;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,QAAQ,EAAE,MAAM,GAAG,sBAAsB,CAAC;CAC5C;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC;CAC9C"}
1
+ {"version":3,"file":"quick-restore.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/quick-restore.interface.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,UAAU,sBAAsB;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,QAAQ,EAAE,MAAM,GAAG,sBAAsB,CAAC;CAC5C;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC;CAC9C"}
@@ -5,6 +5,7 @@ export declare class Interagent {
5
5
  private skippedChecker;
6
6
  private hasErrorCode;
7
7
  private processDocument;
8
+ private resyncStreams;
8
9
  private verifyUmidNotFound;
9
10
  private insertUmid;
10
11
  private setProcessed;
@@ -1 +1 @@
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;YA0Ef,kBAAkB;IAwBhC,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,YAAY;YA6BN,OAAO;CAmBtB"}
1
+ {"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AA0CA,qBAAa,UAAU;IACrB,OAAO,CAAC,UAAU,CAWhB;IAEF,OAAO,CAAC,oBAAoB,CAAW;;YAgEzB,cAAc;IA4B5B,OAAO,CAAC,YAAY,CAC6B;YAOnC,eAAe;YAuFf,aAAa;YA4Bb,kBAAkB;IAwBhC,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,YAAY;YA6BN,OAAO;CAmBtB"}
@@ -2,6 +2,7 @@ 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";
5
6
  import { ActiveCrypto } from "@activeledger/activecrypto";
6
7
  const REMOVE_CACHE_TIMER = 5 * 60 * 1000;
7
8
  export class Interagent {
@@ -80,12 +81,12 @@ export class Interagent {
80
81
  }
81
82
  else {
82
83
  ActiveLogger.error(`UMID ${changeDoc.umid} not found`);
83
- return await this.setProcessed(changeDoc, false);
84
+ return await this.resyncStreams(changeDoc);
84
85
  }
85
86
  }
86
87
  else {
87
88
  ActiveLogger.error(`UMID ${changeDoc.umid} not found #2`);
88
- return await this.setProcessed(changeDoc, false);
89
+ return await this.resyncStreams(changeDoc);
89
90
  }
90
91
  }
91
92
  else {
@@ -94,6 +95,19 @@ export class Interagent {
94
95
  }
95
96
  return await this.setProcessed(changeDoc, false);
96
97
  }
98
+ async resyncStreams(changeDoc) {
99
+ try {
100
+ const rewrote = await StreamResync.resync(changeDoc.transaction);
101
+ if (rewrote) {
102
+ ActiveLogger.info(`Stream resync recovered ${rewrote} document(s) for umid ${changeDoc.umid}`);
103
+ return await this.setProcessed(changeDoc, true);
104
+ }
105
+ }
106
+ catch (error) {
107
+ ActiveLogger.error(error, `Stream resync failed for umid ${changeDoc.umid}`);
108
+ }
109
+ return await this.setProcessed(changeDoc, false);
110
+ }
97
111
  async verifyUmidNotFound(umid) {
98
112
  if (await Provider.database.exists(umid + ":umid")) {
99
113
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,15 @@
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<number>;
13
+ private static adopt;
14
+ }
15
+ //# sourceMappingURL=stream-resync.d.ts.map
@@ -0,0 +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;WAqEa,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;WAavB,MAAM,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;mBAyCxC,KAAK;CAkD3B"}
@@ -0,0 +1,131 @@
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
+ const revisions = Object.keys(tally[ids[i]]);
58
+ for (let r = revisions.length; r--;) {
59
+ const candidate = tally[ids[i]][revisions[r]];
60
+ if (!Helper.metConsensus(candidate.votes)) {
61
+ continue;
62
+ }
63
+ if (!winner ||
64
+ candidate.votes > winner.votes ||
65
+ (candidate.votes === winner.votes &&
66
+ StreamResync.position(candidate.doc._rev) >
67
+ StreamResync.position(winner.doc._rev))) {
68
+ winner = candidate;
69
+ }
70
+ }
71
+ if (winner) {
72
+ winners[ids[i]] = winner.doc;
73
+ }
74
+ }
75
+ return winners;
76
+ }
77
+ static position(rev) {
78
+ const position = parseInt((rev || "").split("-")[0], 10);
79
+ return isNaN(position) ? 0 : position;
80
+ }
81
+ static async resync(transaction) {
82
+ const streams = StreamResync.streamIdsFromTransaction(transaction);
83
+ if (!streams.length) {
84
+ Helper.output("Stream resync: transaction names no streams");
85
+ return 0;
86
+ }
87
+ const networkStreams = await Provider.network.neighbourhood.knockAll("stream", { $streams: streams }, true);
88
+ const winners = StreamResync.winningDocuments(networkStreams);
89
+ const ids = Object.keys(winners);
90
+ let rewrote = 0;
91
+ for (let i = ids.length; i--;) {
92
+ try {
93
+ if (await StreamResync.adopt(ids[i], winners[ids[i]])) {
94
+ rewrote++;
95
+ }
96
+ }
97
+ catch (error) {
98
+ ActiveLogger.error(error, `Stream resync failed for ${ids[i]}`);
99
+ }
100
+ }
101
+ return rewrote;
102
+ }
103
+ static async adopt(id, doc) {
104
+ let local = null;
105
+ try {
106
+ local = await Provider.database.get(id);
107
+ }
108
+ catch {
109
+ local = null;
110
+ }
111
+ if (local && local._rev === doc._rev) {
112
+ return false;
113
+ }
114
+ if (!local || !local._rev) {
115
+ ActiveLogger.warn(`Stream resync: creating ${id} @ ${doc._rev}`);
116
+ await Provider.database.bulkDocs([doc], { new_edits: false });
117
+ return true;
118
+ }
119
+ if (StreamResync.position(local._rev) >= StreamResync.position(doc._rev)) {
120
+ ActiveLogger.error(`Stream resync: refusing to move ${id} back from ${local._rev} to ${doc._rev}`);
121
+ return false;
122
+ }
123
+ ActiveLogger.warn(`Stream resync: ${id} local ${local._rev} -> network ${doc._rev}`);
124
+ await Provider.database.bulkDocs([doc], {
125
+ new_edits: true,
126
+ force_rev: doc._rev,
127
+ });
128
+ return true;
129
+ }
130
+ }
131
+ //# sourceMappingURL=stream-resync.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"stream-resync.js","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ export declare class QuickRestore {
3
3
  private isNotThisNode;
4
4
  private runQuickFullRestore;
5
5
  private fetchDocuments;
6
+ private static adoptDocument;
6
7
  private uploadData;
7
8
  private handleNetworkData;
8
9
  private checkConsensus;
@@ -1 +1 @@
1
- {"version":3,"file":"quick-restore.d.ts","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"AA6CA,qBAAa,YAAY;;IAavB,OAAO,CAAC,aAAa,CACmB;YAQ1B,mBAAmB;IAwCjC,OAAO,CAAC,cAAc;IAsCtB,OAAO,CAAC,UAAU;IA+ClB,OAAO,CAAC,iBAAiB;IA0CzB,OAAO,CAAC,cAAc;IA6CtB,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,CAAC,uBAAuB;IAuD/B,OAAO,CAAC,cAAc;CAoCvB"}
1
+ {"version":3,"file":"quick-restore.d.ts","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"AA6CA,qBAAa,YAAY;;IAavB,OAAO,CAAC,aAAa,CACmB;YAQ1B,mBAAmB;IAwCjC,OAAO,CAAC,cAAc;mBAgDD,aAAa;IAiClC,OAAO,CAAC,UAAU;IA2DlB,OAAO,CAAC,iBAAiB;IA0CzB,OAAO,CAAC,cAAc;IA6CtB,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,CAAC,uBAAuB;IAuD/B,OAAO,CAAC,cAAc;CAoCvB"}
@@ -48,15 +48,33 @@ export class QuickRestore {
48
48
  }
49
49
  });
50
50
  }
51
+ static async adoptDocument(doc) {
52
+ let local = null;
53
+ try {
54
+ local = await Provider.database.get(doc._id);
55
+ }
56
+ catch {
57
+ local = null;
58
+ }
59
+ if (!local || !local._rev) {
60
+ await Provider.database.bulkDocs([doc], { new_edits: false });
61
+ return;
62
+ }
63
+ if (local._rev !== doc._rev) {
64
+ ActiveLogger.warn(`[Diverged] ${doc._id} local ${local._rev} -> network ${doc._rev}`);
65
+ await Provider.database.bulkDocs([doc], {
66
+ new_edits: true,
67
+ force_rev: doc._rev
68
+ });
69
+ }
70
+ }
51
71
  uploadData(networkData) {
52
72
  return new Promise(async (resolve, reject) => {
53
73
  Helper.output("Processing Network Data", networkData);
54
74
  try {
55
- await Provider.database.bulkDocs(networkData.documents, {
56
- new_edits: false
57
- });
58
75
  for (let i = networkData.documents.length; i--;) {
59
76
  const doc = networkData.documents[i];
77
+ await QuickRestore.adoptDocument(doc);
60
78
  if (doc._id && doc._id.indexOf(":umid") !== -1) {
61
79
  await Helper.replayEvents(doc);
62
80
  }
@@ -64,7 +82,7 @@ export class QuickRestore {
64
82
  }
65
83
  catch (error) {
66
84
  ActiveLogger.error("Error occurred in processNetworkData: Uploading documents to database");
67
- reject(error);
85
+ return reject(error);
68
86
  }
69
87
  try {
70
88
  await Provider.database.bulkDocs(networkData.volatile, {
@@ -1 +1 @@
1
- {"version":3,"file":"quick-restore.js","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quick-restore.js","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"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"}
@@ -26,6 +26,7 @@ export interface IConsensusData {
26
26
  }
27
27
  export interface IBaseData {
28
28
  _id: string;
29
+ _rev?: string;
29
30
  error?: string | {};
30
31
  namespace?: string;
31
32
  contract?: [];
@@ -1 +1 @@
1
- {"version":3,"file":"quick-restore.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/quick-restore.interface.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,UAAU,sBAAsB;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,QAAQ,EAAE,MAAM,GAAG,sBAAsB,CAAC;CAC5C;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC;CAC9C"}
1
+ {"version":3,"file":"quick-restore.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/quick-restore.interface.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,UAAU,sBAAsB;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,QAAQ,EAAE,MAAM,GAAG,sBAAsB,CAAC;CAC5C;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC;CAC9C"}
@@ -5,6 +5,7 @@ export declare class Interagent {
5
5
  private skippedChecker;
6
6
  private hasErrorCode;
7
7
  private processDocument;
8
+ private resyncStreams;
8
9
  private verifyUmidNotFound;
9
10
  private insertUmid;
10
11
  private setProcessed;
@@ -1 +1 @@
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;YA0Ef,kBAAkB;IAwBhC,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,YAAY;YA6BN,OAAO;CAmBtB"}
1
+ {"version":3,"file":"interagent.d.ts","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"AA0CA,qBAAa,UAAU;IACrB,OAAO,CAAC,UAAU,CAWhB;IAEF,OAAO,CAAC,oBAAoB,CAAW;;YAgEzB,cAAc;IA4B5B,OAAO,CAAC,YAAY,CAC6B;YAOnC,eAAe;YAuFf,aAAa;YA4Bb,kBAAkB;IAwBhC,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,YAAY;YA6BN,OAAO;CAmBtB"}
@@ -5,6 +5,7 @@ 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");
8
9
  const activecrypto_1 = require("@activeledger/activecrypto");
9
10
  const REMOVE_CACHE_TIMER = 5 * 60 * 1000;
10
11
  class Interagent {
@@ -83,12 +84,12 @@ class Interagent {
83
84
  }
84
85
  else {
85
86
  activelogger_1.ActiveLogger.error(`UMID ${changeDoc.umid} not found`);
86
- return await this.setProcessed(changeDoc, false);
87
+ return await this.resyncStreams(changeDoc);
87
88
  }
88
89
  }
89
90
  else {
90
91
  activelogger_1.ActiveLogger.error(`UMID ${changeDoc.umid} not found #2`);
91
- return await this.setProcessed(changeDoc, false);
92
+ return await this.resyncStreams(changeDoc);
92
93
  }
93
94
  }
94
95
  else {
@@ -97,6 +98,19 @@ class Interagent {
97
98
  }
98
99
  return await this.setProcessed(changeDoc, false);
99
100
  }
101
+ async resyncStreams(changeDoc) {
102
+ try {
103
+ const rewrote = await stream_resync_1.StreamResync.resync(changeDoc.transaction);
104
+ if (rewrote) {
105
+ activelogger_1.ActiveLogger.info(`Stream resync recovered ${rewrote} document(s) for umid ${changeDoc.umid}`);
106
+ return await this.setProcessed(changeDoc, true);
107
+ }
108
+ }
109
+ catch (error) {
110
+ activelogger_1.ActiveLogger.error(error, `Stream resync failed for umid ${changeDoc.umid}`);
111
+ }
112
+ return await this.setProcessed(changeDoc, false);
113
+ }
100
114
  async verifyUmidNotFound(umid) {
101
115
  if (await provider_1.Provider.database.exists(umid + ":umid")) {
102
116
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"interagent.js","sourceRoot":"","sources":["../../../src/modules/interagent/interagent.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,15 @@
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<number>;
13
+ private static adopt;
14
+ }
15
+ //# sourceMappingURL=stream-resync.d.ts.map
@@ -0,0 +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;WAqEa,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;WAavB,MAAM,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;mBAyCxC,KAAK;CAkD3B"}
@@ -0,0 +1,135 @@
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
+ const revisions = Object.keys(tally[ids[i]]);
61
+ for (let r = revisions.length; r--;) {
62
+ const candidate = tally[ids[i]][revisions[r]];
63
+ if (!helper_1.Helper.metConsensus(candidate.votes)) {
64
+ continue;
65
+ }
66
+ if (!winner ||
67
+ candidate.votes > winner.votes ||
68
+ (candidate.votes === winner.votes &&
69
+ StreamResync.position(candidate.doc._rev) >
70
+ StreamResync.position(winner.doc._rev))) {
71
+ winner = candidate;
72
+ }
73
+ }
74
+ if (winner) {
75
+ winners[ids[i]] = winner.doc;
76
+ }
77
+ }
78
+ return winners;
79
+ }
80
+ static position(rev) {
81
+ const position = parseInt((rev || "").split("-")[0], 10);
82
+ return isNaN(position) ? 0 : position;
83
+ }
84
+ static async resync(transaction) {
85
+ const streams = StreamResync.streamIdsFromTransaction(transaction);
86
+ if (!streams.length) {
87
+ helper_1.Helper.output("Stream resync: transaction names no streams");
88
+ return 0;
89
+ }
90
+ const networkStreams = await provider_1.Provider.network.neighbourhood.knockAll("stream", { $streams: streams }, true);
91
+ const winners = StreamResync.winningDocuments(networkStreams);
92
+ const ids = Object.keys(winners);
93
+ let rewrote = 0;
94
+ for (let i = ids.length; i--;) {
95
+ try {
96
+ if (await StreamResync.adopt(ids[i], winners[ids[i]])) {
97
+ rewrote++;
98
+ }
99
+ }
100
+ catch (error) {
101
+ activelogger_1.ActiveLogger.error(error, `Stream resync failed for ${ids[i]}`);
102
+ }
103
+ }
104
+ return rewrote;
105
+ }
106
+ static async adopt(id, doc) {
107
+ let local = null;
108
+ try {
109
+ local = await provider_1.Provider.database.get(id);
110
+ }
111
+ catch {
112
+ local = null;
113
+ }
114
+ if (local && local._rev === doc._rev) {
115
+ return false;
116
+ }
117
+ if (!local || !local._rev) {
118
+ activelogger_1.ActiveLogger.warn(`Stream resync: creating ${id} @ ${doc._rev}`);
119
+ await provider_1.Provider.database.bulkDocs([doc], { new_edits: false });
120
+ return true;
121
+ }
122
+ if (StreamResync.position(local._rev) >= StreamResync.position(doc._rev)) {
123
+ activelogger_1.ActiveLogger.error(`Stream resync: refusing to move ${id} back from ${local._rev} to ${doc._rev}`);
124
+ return false;
125
+ }
126
+ activelogger_1.ActiveLogger.warn(`Stream resync: ${id} local ${local._rev} -> network ${doc._rev}`);
127
+ await provider_1.Provider.database.bulkDocs([doc], {
128
+ new_edits: true,
129
+ force_rev: doc._rev,
130
+ });
131
+ return true;
132
+ }
133
+ }
134
+ exports.StreamResync = StreamResync;
135
+ //# sourceMappingURL=stream-resync.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"stream-resync.js","sourceRoot":"","sources":["../../../src/modules/interagent/stream-resync.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ export declare class QuickRestore {
3
3
  private isNotThisNode;
4
4
  private runQuickFullRestore;
5
5
  private fetchDocuments;
6
+ private static adoptDocument;
6
7
  private uploadData;
7
8
  private handleNetworkData;
8
9
  private checkConsensus;
@@ -1 +1 @@
1
- {"version":3,"file":"quick-restore.d.ts","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"AA6CA,qBAAa,YAAY;;IAavB,OAAO,CAAC,aAAa,CACmB;YAQ1B,mBAAmB;IAwCjC,OAAO,CAAC,cAAc;IAsCtB,OAAO,CAAC,UAAU;IA+ClB,OAAO,CAAC,iBAAiB;IA0CzB,OAAO,CAAC,cAAc;IA6CtB,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,CAAC,uBAAuB;IAuD/B,OAAO,CAAC,cAAc;CAoCvB"}
1
+ {"version":3,"file":"quick-restore.d.ts","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"AA6CA,qBAAa,YAAY;;IAavB,OAAO,CAAC,aAAa,CACmB;YAQ1B,mBAAmB;IAwCjC,OAAO,CAAC,cAAc;mBAgDD,aAAa;IAiClC,OAAO,CAAC,UAAU;IA2DlB,OAAO,CAAC,iBAAiB;IA0CzB,OAAO,CAAC,cAAc;IA6CtB,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,CAAC,uBAAuB;IAuD/B,OAAO,CAAC,cAAc;CAoCvB"}
@@ -51,15 +51,33 @@ class QuickRestore {
51
51
  }
52
52
  });
53
53
  }
54
+ static async adoptDocument(doc) {
55
+ let local = null;
56
+ try {
57
+ local = await provider_1.Provider.database.get(doc._id);
58
+ }
59
+ catch {
60
+ local = null;
61
+ }
62
+ if (!local || !local._rev) {
63
+ await provider_1.Provider.database.bulkDocs([doc], { new_edits: false });
64
+ return;
65
+ }
66
+ if (local._rev !== doc._rev) {
67
+ activelogger_1.ActiveLogger.warn(`[Diverged] ${doc._id} local ${local._rev} -> network ${doc._rev}`);
68
+ await provider_1.Provider.database.bulkDocs([doc], {
69
+ new_edits: true,
70
+ force_rev: doc._rev
71
+ });
72
+ }
73
+ }
54
74
  uploadData(networkData) {
55
75
  return new Promise(async (resolve, reject) => {
56
76
  helper_1.Helper.output("Processing Network Data", networkData);
57
77
  try {
58
- await provider_1.Provider.database.bulkDocs(networkData.documents, {
59
- new_edits: false
60
- });
61
78
  for (let i = networkData.documents.length; i--;) {
62
79
  const doc = networkData.documents[i];
80
+ await QuickRestore.adoptDocument(doc);
63
81
  if (doc._id && doc._id.indexOf(":umid") !== -1) {
64
82
  await helper_1.Helper.replayEvents(doc);
65
83
  }
@@ -67,7 +85,7 @@ class QuickRestore {
67
85
  }
68
86
  catch (error) {
69
87
  activelogger_1.ActiveLogger.error("Error occurred in processNetworkData: Uploading documents to database");
70
- reject(error);
88
+ return reject(error);
71
89
  }
72
90
  try {
73
91
  await provider_1.Provider.database.bulkDocs(networkData.volatile, {
@@ -1 +1 @@
1
- {"version":3,"file":"quick-restore.js","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quick-restore.js","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.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.6",
3
+ "version": "4.5.8",
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.6",
49
- "@activeledger/activelogger": "^4.5.6",
50
- "@activeledger/activenetwork": "^4.5.6",
51
- "@activeledger/activeoptions": "^4.5.6",
48
+ "@activeledger/activecrypto": "4.5.8",
49
+ "@activeledger/activelogger": "4.5.8",
50
+ "@activeledger/activenetwork": "4.5.8",
51
+ "@activeledger/activeoptions": "4.5.8",
52
52
  "typescript": "4.7.3"
53
53
  },
54
- "gitHead": "5877478282025dfb3d297e2dda2d8f82bdabcca5"
54
+ "gitHead": "97d00fee97ee62c41fbaf08f167cbb3ff9157be6"
55
55
  }