@activeledger/activesync 5.1.0 → 5.1.2
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/umid.d.ts +2 -0
- package/es/umid.d.ts.map +1 -1
- package/es/umid.js +24 -2
- package/es/umid.js.map +1 -1
- package/lib/umid.d.ts +2 -0
- package/lib/umid.d.ts.map +1 -1
- package/lib/umid.js +24 -2
- package/lib/umid.js.map +1 -1
- package/package.json +4 -4
package/es/umid.d.ts
CHANGED
package/es/umid.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"umid.d.ts","sourceRoot":"","sources":["../src/umid.ts"],"names":[],"mappings":"AA+BA,MAAM,WAAW,UAAU;IAEzB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CACpC;AAGD,MAAM,WAAW,SAAS;IACxB,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3F;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,SAAS,CAAC;IAEjB,MAAM,EAAE;QAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;IACzC,KAAK,EAAE,UAAU,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"umid.d.ts","sourceRoot":"","sources":["../src/umid.ts"],"names":[],"mappings":"AA+BA,MAAM,WAAW,UAAU;IAEzB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CACpC;AAGD,MAAM,WAAW,SAAS;IACxB,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3F;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,SAAS,CAAC;IAEjB,MAAM,EAAE;QAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;IACzC,KAAK,EAAE,UAAU,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAC;IAOpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAO3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,eAAe,MAAM,CAAC;AACnC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAiCzC,wBAAsB,YAAY,CAChC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CA6FlB;AAiBD,wBAAsB,eAAe,CACnC,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,IAAI,CAAC,CAqBf;AAkCD,wBAAsB,eAAe,CACnC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IACT,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAQlB,QAAQ,EAAE,OAAO,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC,CAmFD"}
|
package/es/umid.js
CHANGED
|
@@ -27,7 +27,9 @@ export async function backfillUmid(ctx, umid) {
|
|
|
27
27
|
const grouped = {};
|
|
28
28
|
for (let i = responses.length; i--;) {
|
|
29
29
|
const response = responses[i];
|
|
30
|
-
if (!response?.umid?.$umid
|
|
30
|
+
if (!response?.umid?.$umid ||
|
|
31
|
+
response.umid.$umid !== umid ||
|
|
32
|
+
response._id !== `${umid}:umid`) {
|
|
31
33
|
continue;
|
|
32
34
|
}
|
|
33
35
|
const hash = ActiveCrypto.Hash.getHash(JSON.stringify(response));
|
|
@@ -40,7 +42,16 @@ export async function backfillUmid(ctx, umid) {
|
|
|
40
42
|
ActiveLogger.warn(`SPI UMID ${umid} - no node could supply it`);
|
|
41
43
|
return false;
|
|
42
44
|
}
|
|
43
|
-
const
|
|
45
|
+
const best = grouped[hashes.sort((a, b) => grouped[b].count - grouped[a].count)[0]];
|
|
46
|
+
const winner = best.doc;
|
|
47
|
+
const needed = Math.max(1, ctx.minAgree ?? 1);
|
|
48
|
+
if (best.count < needed) {
|
|
49
|
+
ActiveLogger.warn(`SPI UMID ${umid} - only ${best.count} node(s) gave the same document, ${needed} needed`);
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
if (best.count === 1 && responses.length > 1) {
|
|
53
|
+
ActiveLogger.warn(`SPI UMID ${umid} - adopted on the word of a single node`);
|
|
54
|
+
}
|
|
44
55
|
try {
|
|
45
56
|
const written = await ctx.store.bulkDocs([winner], {
|
|
46
57
|
new_edits: false,
|
|
@@ -96,6 +107,17 @@ export async function walkUmidHistory(ctx, streamId, fromUmid) {
|
|
|
96
107
|
catch {
|
|
97
108
|
held = false;
|
|
98
109
|
}
|
|
110
|
+
if (held && ctx.continuePastHeld) {
|
|
111
|
+
let local;
|
|
112
|
+
try {
|
|
113
|
+
local = await ctx.store.get(`${cursor}:umid`);
|
|
114
|
+
}
|
|
115
|
+
catch {
|
|
116
|
+
return { recovered, stoppedAt: "held umid could not be read", complete: false, frontier: cursor };
|
|
117
|
+
}
|
|
118
|
+
cursor = previousUmidFor(local, streamId);
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
99
121
|
const ok = await backfillUmid(ctx, cursor);
|
|
100
122
|
if (!ok) {
|
|
101
123
|
return { recovered, stoppedAt: `could not recover ${cursor}`, complete: false, frontier: cursor };
|
package/es/umid.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"umid.js","sourceRoot":"","sources":["../src/umid.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"umid.js","sourceRoot":"","sources":["../src/umid.ts"],"names":[],"mappings":"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"}
|
package/lib/umid.d.ts
CHANGED
package/lib/umid.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"umid.d.ts","sourceRoot":"","sources":["../src/umid.ts"],"names":[],"mappings":"AA+BA,MAAM,WAAW,UAAU;IAEzB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CACpC;AAGD,MAAM,WAAW,SAAS;IACxB,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3F;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,SAAS,CAAC;IAEjB,MAAM,EAAE;QAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;IACzC,KAAK,EAAE,UAAU,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"umid.d.ts","sourceRoot":"","sources":["../src/umid.ts"],"names":[],"mappings":"AA+BA,MAAM,WAAW,UAAU;IAEzB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CACpC;AAGD,MAAM,WAAW,SAAS;IACxB,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3F;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,SAAS,CAAC;IAEjB,MAAM,EAAE;QAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;IACzC,KAAK,EAAE,UAAU,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAC;IAOpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAO3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,eAAe,MAAM,CAAC;AACnC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAiCzC,wBAAsB,YAAY,CAChC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CA6FlB;AAiBD,wBAAsB,eAAe,CACnC,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,IAAI,CAAC,CAqBf;AAkCD,wBAAsB,eAAe,CACnC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IACT,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAQlB,QAAQ,EAAE,OAAO,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC,CAmFD"}
|
package/lib/umid.js
CHANGED
|
@@ -33,7 +33,9 @@ async function backfillUmid(ctx, umid) {
|
|
|
33
33
|
const grouped = {};
|
|
34
34
|
for (let i = responses.length; i--;) {
|
|
35
35
|
const response = responses[i];
|
|
36
|
-
if (!response?.umid?.$umid
|
|
36
|
+
if (!response?.umid?.$umid ||
|
|
37
|
+
response.umid.$umid !== umid ||
|
|
38
|
+
response._id !== `${umid}:umid`) {
|
|
37
39
|
continue;
|
|
38
40
|
}
|
|
39
41
|
const hash = activecrypto_1.ActiveCrypto.Hash.getHash(JSON.stringify(response));
|
|
@@ -46,7 +48,16 @@ async function backfillUmid(ctx, umid) {
|
|
|
46
48
|
activelogger_1.ActiveLogger.warn(`SPI UMID ${umid} - no node could supply it`);
|
|
47
49
|
return false;
|
|
48
50
|
}
|
|
49
|
-
const
|
|
51
|
+
const best = grouped[hashes.sort((a, b) => grouped[b].count - grouped[a].count)[0]];
|
|
52
|
+
const winner = best.doc;
|
|
53
|
+
const needed = Math.max(1, ctx.minAgree ?? 1);
|
|
54
|
+
if (best.count < needed) {
|
|
55
|
+
activelogger_1.ActiveLogger.warn(`SPI UMID ${umid} - only ${best.count} node(s) gave the same document, ${needed} needed`);
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
if (best.count === 1 && responses.length > 1) {
|
|
59
|
+
activelogger_1.ActiveLogger.warn(`SPI UMID ${umid} - adopted on the word of a single node`);
|
|
60
|
+
}
|
|
50
61
|
try {
|
|
51
62
|
const written = await ctx.store.bulkDocs([winner], {
|
|
52
63
|
new_edits: false,
|
|
@@ -102,6 +113,17 @@ async function walkUmidHistory(ctx, streamId, fromUmid) {
|
|
|
102
113
|
catch {
|
|
103
114
|
held = false;
|
|
104
115
|
}
|
|
116
|
+
if (held && ctx.continuePastHeld) {
|
|
117
|
+
let local;
|
|
118
|
+
try {
|
|
119
|
+
local = await ctx.store.get(`${cursor}:umid`);
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
return { recovered, stoppedAt: "held umid could not be read", complete: false, frontier: cursor };
|
|
123
|
+
}
|
|
124
|
+
cursor = (0, spi_1.previousUmidFor)(local, streamId);
|
|
125
|
+
continue;
|
|
126
|
+
}
|
|
105
127
|
const ok = await backfillUmid(ctx, cursor);
|
|
106
128
|
if (!ok) {
|
|
107
129
|
return { recovered, stoppedAt: `could not recover ${cursor}`, complete: false, frontier: cursor };
|
package/lib/umid.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"umid.js","sourceRoot":"","sources":["../src/umid.ts"],"names":[],"mappings":";;;;;;AAuBA,6DAA0D;AAC1D,6DAA0D;AAC1D,+BAAyD;
|
|
1
|
+
{"version":3,"file":"umid.js","sourceRoot":"","sources":["../src/umid.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.
|
|
3
|
+
"version": "5.1.2",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=24.0.0"
|
|
6
6
|
},
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"author": "Activeledger",
|
|
37
37
|
"license": "MIT",
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@activeledger/activedefinitions": "5.1.
|
|
39
|
+
"@activeledger/activedefinitions": "5.1.2",
|
|
40
40
|
"@types/node": "24.10.1",
|
|
41
41
|
"typescript": "7.0.2"
|
|
42
42
|
},
|
|
@@ -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.
|
|
52
|
-
"@activeledger/activelogger": "5.1.
|
|
51
|
+
"@activeledger/activecrypto": "5.1.2",
|
|
52
|
+
"@activeledger/activelogger": "5.1.2"
|
|
53
53
|
}
|
|
54
54
|
}
|