@ibgib/core-gib 0.1.42 → 0.1.44
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/dist/keystone/kdf/kdf-constants.d.mts +25 -0
- package/dist/keystone/kdf/kdf-constants.d.mts.map +1 -0
- package/dist/keystone/kdf/kdf-constants.mjs +28 -0
- package/dist/keystone/kdf/kdf-constants.mjs.map +1 -0
- package/dist/keystone/kdf/kdf-helpers.d.mts +45 -0
- package/dist/keystone/kdf/kdf-helpers.d.mts.map +1 -0
- package/dist/keystone/kdf/kdf-helpers.mjs +94 -0
- package/dist/keystone/kdf/kdf-helpers.mjs.map +1 -0
- package/dist/keystone/kdf/kdf-types.d.mts +49 -0
- package/dist/keystone/kdf/kdf-types.d.mts.map +1 -0
- package/dist/keystone/kdf/kdf-types.mjs +2 -0
- package/dist/keystone/kdf/kdf-types.mjs.map +1 -0
- package/dist/keystone/keystone-config-builder.d.mts +65 -12
- package/dist/keystone/keystone-config-builder.d.mts.map +1 -1
- package/dist/keystone/keystone-config-builder.mjs +138 -46
- package/dist/keystone/keystone-config-builder.mjs.map +1 -1
- package/dist/keystone/keystone-config-builder.respec.mjs +21 -13
- package/dist/keystone/keystone-config-builder.respec.mjs.map +1 -1
- package/dist/keystone/keystone-constants.d.mts +15 -0
- package/dist/keystone/keystone-constants.d.mts.map +1 -1
- package/dist/keystone/keystone-constants.mjs +16 -0
- package/dist/keystone/keystone-constants.mjs.map +1 -1
- package/dist/keystone/keystone-helpers.d.mts +4 -4
- package/dist/keystone/keystone-helpers.d.mts.map +1 -1
- package/dist/keystone/keystone-helpers.mjs +8 -5
- package/dist/keystone/keystone-helpers.mjs.map +1 -1
- package/dist/keystone/keystone-service-v1.d.mts +1 -1
- package/dist/keystone/keystone-service-v1.d.mts.map +1 -1
- package/dist/keystone/keystone-service-v1.mjs +6 -5
- package/dist/keystone/keystone-service-v1.mjs.map +1 -1
- package/dist/keystone/keystone-service-v1.respec.mjs +72 -45
- package/dist/keystone/keystone-service-v1.respec.mjs.map +1 -1
- package/dist/keystone/keystone-types.d.mts +28 -18
- package/dist/keystone/keystone-types.d.mts.map +1 -1
- package/dist/keystone/keystone-types.mjs +26 -15
- package/dist/keystone/keystone-types.mjs.map +1 -1
- package/dist/keystone/strategy/hash-reveal-v1/hash-reveal-v1.d.mts.map +1 -1
- package/dist/keystone/strategy/hash-reveal-v1/hash-reveal-v1.mjs +7 -10
- package/dist/keystone/strategy/hash-reveal-v1/hash-reveal-v1.mjs.map +1 -1
- package/dist/sync/sync-conflict-text-merge.respec.mjs +26 -26
- package/dist/sync/sync-conflict-text-merge.respec.mjs.map +1 -1
- package/dist/sync/sync-constants.d.mts +9 -0
- package/dist/sync/sync-constants.d.mts.map +1 -1
- package/dist/sync/sync-constants.mjs +10 -0
- package/dist/sync/sync-constants.mjs.map +1 -1
- package/dist/sync/sync-innerspace-dest-ahead-withid.respec.d.mts +7 -0
- package/dist/sync/sync-innerspace-dest-ahead-withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-innerspace-dest-ahead-withid.respec.mjs +282 -0
- package/dist/sync/sync-innerspace-dest-ahead-withid.respec.mjs.map +1 -0
- package/dist/sync/sync-saga-coordinator.d.mts +22 -11
- package/dist/sync/sync-saga-coordinator.d.mts.map +1 -1
- package/dist/sync/sync-saga-coordinator.mjs +120 -27
- package/dist/sync/sync-saga-coordinator.mjs.map +1 -1
- package/dist/sync/sync-saga-message/sync-saga-message-types.d.mts +1 -7
- package/dist/sync/sync-saga-message/sync-saga-message-types.d.mts.map +1 -1
- package/dist/sync/sync-types.d.mts +11 -0
- package/dist/sync/sync-types.d.mts.map +1 -1
- package/dist/sync/sync-types.mjs.map +1 -1
- package/dist/test/mock-space.d.mts +1 -38
- package/dist/test/mock-space.d.mts.map +1 -1
- package/dist/test/mock-space.mjs +73 -78
- package/dist/test/mock-space.mjs.map +1 -1
- package/package.json +1 -1
- package/src/keystone/README.md +119 -0
- package/src/keystone/docs/architecture.md +32 -1
- package/src/keystone/kdf/kdf-constants.mts +34 -0
- package/src/keystone/kdf/kdf-helpers.mts +105 -0
- package/src/keystone/kdf/kdf-types.mts +58 -0
- package/src/keystone/keystone-config-builder.mts +170 -47
- package/src/keystone/keystone-config-builder.respec.mts +21 -14
- package/src/keystone/keystone-constants.mts +21 -2
- package/src/keystone/keystone-helpers.mts +19 -14
- package/src/keystone/keystone-service-v1.mts +23 -22
- package/src/keystone/keystone-service-v1.respec.mts +71 -44
- package/src/keystone/keystone-types.mts +37 -23
- package/src/keystone/strategy/hash-reveal-v1/hash-reveal-v1.mts +9 -13
- package/src/sync/README.md +122 -5
- package/src/sync/docs/architecture.md +2 -2
- package/src/sync/{SYNC_TESTING.md → docs/testing.md} +113 -28
- package/src/sync/sync-conflict-text-merge.respec.mts +25 -25
- package/src/sync/sync-constants.mts +12 -0
- package/src/sync/sync-innerspace-dest-ahead-withid.respec.mts +349 -0
- package/src/sync/sync-saga-coordinator.mts +158 -33
- package/src/sync/sync-saga-message/sync-saga-message-types.mts +1 -7
- package/src/sync/sync-types.mts +12 -0
- package/src/test/mock-space.mts +72 -72
- package/tmp.md +0 -274
- package/src/sync/docs/verification.md +0 -43
|
@@ -1,50 +1,61 @@
|
|
|
1
|
+
// #region KeystoneChallengeType
|
|
2
|
+
export const KEYSTONE_CHALLENGE_TYPE_HASH_REVEAL_V1 = 'hash-reveal-v1';
|
|
3
|
+
export const KeystoneChallengeType = {
|
|
4
|
+
hash_reveal_v1: KEYSTONE_CHALLENGE_TYPE_HASH_REVEAL_V1,
|
|
5
|
+
};
|
|
6
|
+
export const KEYSTONE_CHALLENGE_TYPE_VALID_VALUES = Object.values(KeystoneChallengeType);
|
|
7
|
+
export function isValidKeystoneChallengeType(x) {
|
|
8
|
+
return typeof x === 'string' && KEYSTONE_CHALLENGE_TYPE_VALID_VALUES.includes(x);
|
|
9
|
+
}
|
|
10
|
+
// #endregion KeystoneChallengeType
|
|
1
11
|
// ===========================================================================
|
|
2
12
|
// CONFIGURATION
|
|
3
13
|
// ===========================================================================
|
|
4
14
|
// #region KeystoneReplenishStrategy
|
|
5
15
|
/**
|
|
6
|
-
*
|
|
16
|
+
* @see {@link KeystoneReplenishStrategy.topUp}
|
|
7
17
|
*/
|
|
8
18
|
export const KEYSTONE_REPLENISH_STRATEGY_TOP_UP = 'top-up';
|
|
9
19
|
/**
|
|
10
|
-
*
|
|
20
|
+
* @see {@link KeystoneReplenishStrategy.replaceAll}
|
|
11
21
|
*/
|
|
12
22
|
export const KEYSTONE_REPLENISH_STRATEGY_REPLACE_ALL = 'replace-all';
|
|
13
23
|
/**
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
* ## intent
|
|
17
|
-
* adding this for revocation
|
|
24
|
+
* @see {@link KeystoneReplenishStrategy.consume}
|
|
18
25
|
*/
|
|
19
26
|
export const KEYSTONE_REPLENISH_STRATEGY_CONSUME = 'consume';
|
|
20
27
|
/**
|
|
21
|
-
*
|
|
22
|
-
* The "Nuclear Option" for revocation.
|
|
28
|
+
* @see {@link KeystoneReplenishStrategy.deleteAll}
|
|
23
29
|
*/
|
|
24
|
-
export const
|
|
30
|
+
export const KEYSTONE_REPLENISH_STRATEGY_DELETE_ALL = 'delete-all';
|
|
25
31
|
/**
|
|
26
32
|
* @see {@link KeystonePoolBehavior.replenish}
|
|
27
33
|
*/
|
|
28
34
|
export const KeystoneReplenishStrategy = {
|
|
29
35
|
/**
|
|
30
|
-
*
|
|
36
|
+
* replaces each used challenge, "topping up" the pool to the pool's size
|
|
31
37
|
*/
|
|
32
38
|
topUp: KEYSTONE_REPLENISH_STRATEGY_TOP_UP,
|
|
33
39
|
/**
|
|
34
|
-
*
|
|
40
|
+
* replaces the entire pool with the new challenges
|
|
35
41
|
*/
|
|
36
42
|
replaceAll: KEYSTONE_REPLENISH_STRATEGY_REPLACE_ALL,
|
|
37
43
|
/**
|
|
38
|
-
*
|
|
44
|
+
* do not replenish, only consume
|
|
45
|
+
*
|
|
46
|
+
* ## intent
|
|
47
|
+
* adding this for revocation, though we have added deleteAll for this now.
|
|
48
|
+
* Leaving it in.
|
|
39
49
|
*/
|
|
40
50
|
consume: KEYSTONE_REPLENISH_STRATEGY_CONSUME,
|
|
41
51
|
/**
|
|
42
|
-
*
|
|
52
|
+
* Deletes ALL challenges in the pool, regardless of how many were used.
|
|
53
|
+
* The "Nuclear Option" for revocation.
|
|
43
54
|
*/
|
|
44
|
-
|
|
55
|
+
deleteAll: KEYSTONE_REPLENISH_STRATEGY_DELETE_ALL,
|
|
45
56
|
};
|
|
46
57
|
export const KEYSTONE_REPLENISH_STRATEGY_VALID_VALUES = Object.values(KeystoneReplenishStrategy);
|
|
47
58
|
export function isKeystoneReplenishStrategy(x) {
|
|
48
|
-
return KEYSTONE_REPLENISH_STRATEGY_VALID_VALUES.includes(x);
|
|
59
|
+
return typeof x === 'string' && KEYSTONE_REPLENISH_STRATEGY_VALID_VALUES.includes(x);
|
|
49
60
|
}
|
|
50
61
|
//# sourceMappingURL=keystone-types.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keystone-types.mjs","sourceRoot":"","sources":["../../src/keystone/keystone-types.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"keystone-types.mjs","sourceRoot":"","sources":["../../src/keystone/keystone-types.mts"],"names":[],"mappings":"AAIA,gCAAgC;AAChC,MAAM,CAAC,MAAM,sCAAsC,GAAG,gBAAgB,CAAC;AAUvE,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACjC,cAAc,EAAE,sCAAsC;CACN,CAAC;AACrD,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;AACzF,MAAM,UAAU,4BAA4B,CAAC,CAAM;IAC/C,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,oCAAoC,CAAC,QAAQ,CAAC,CAAQ,CAAC,CAAC;AAC5F,CAAC;AACD,mCAAmC;AAEnC,8EAA8E;AAC9E,gBAAgB;AAChB,8EAA8E;AAE9E,oCAAoC;AACpC;;GAEG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,QAAQ,CAAC;AAC3D;;GAEG;AACH,MAAM,CAAC,MAAM,uCAAuC,GAAG,aAAa,CAAC;AACrE;;GAEG;AACH,MAAM,CAAC,MAAM,mCAAmC,GAAG,SAAS,CAAC;AAC7D;;GAEG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,YAAY,CAAC;AAOnE;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACrC;;OAEG;IACH,KAAK,EAAE,kCAAkC;IACzC;;OAEG;IACH,UAAU,EAAE,uCAAuC;IACnD;;;;;;OAMG;IACH,OAAO,EAAE,mCAAmC;IAC5C;;;OAGG;IACH,SAAS,EAAE,sCAAsC;CACG,CAAC;AACzD,MAAM,CAAC,MAAM,wCAAwC,GAAG,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;AACjG,MAAM,UAAU,2BAA2B,CAAC,CAAM;IAC9C,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,wCAAwC,CAAC,QAAQ,CAAC,CAAQ,CAAC,CAAC;AAChG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-reveal-v1.d.mts","sourceRoot":"","sources":["../../../../src/keystone/strategy/hash-reveal-v1/hash-reveal-v1.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hash-reveal-v1.d.mts","sourceRoot":"","sources":["../../../../src/keystone/strategy/hash-reveal-v1/hash-reveal-v1.mts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACH,yBAAyB,EAAE,wBAAwB,EAAE,uBAAuB,EAC/E,MAAM,0BAA0B,CAAC;AAGlC;;GAEG;AACH,qBAAa,6BAA8B,SAAQ,gBAAgB,CAC/D,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,CAC1B;IAEG;;OAEG;IACY,gBAAgB,CAAC,EAC5B,YAAY,EACf,EAAE;QACC,YAAY,EAAE,MAAM,CAAA;KACvB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBnB;;OAEG;IACY,gBAAgB,CAAC,EAC5B,UAAU,EACV,MAAM,EACN,WAAW,GACd,EAAE;QACC,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;KACvB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IA4BpC;;OAEG;IACY,iBAAiB,CAAC,EAC7B,QAAQ,GACX,EAAE;QACC,QAAQ,EAAE,uBAAuB,CAAC;KACrC,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA0BrC;;OAEG;IACY,gBAAgB,CAAC,EAC5B,QAAQ,EACR,SAAS,GACZ,EAAE;QACC,QAAQ,EAAE,uBAAuB,CAAC;QAClC,SAAS,EAAE,wBAAwB,CAAC;KACvC,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBvB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { hash } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
2
2
|
import { KeystoneStrategy } from '../keystone-strategy.mjs';
|
|
3
|
+
import { kdf_recursiveSaltWrap } from '../../kdf/kdf-helpers.mjs';
|
|
3
4
|
/**
|
|
4
5
|
* The concrete implementation of the "Salted Wrap" Hash Reveal strategy.
|
|
5
6
|
*/
|
|
@@ -11,16 +12,12 @@ export class KeystoneStrategy_HashRevealV1 extends KeystoneStrategy {
|
|
|
11
12
|
const lc = `[${KeystoneStrategy_HashRevealV1.name}.${this.derivePoolSecret.name}]`;
|
|
12
13
|
try {
|
|
13
14
|
const { salt, rounds, algo } = this.config;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
algorithm: algo
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
|
-
return current;
|
|
15
|
+
return await kdf_recursiveSaltWrap({
|
|
16
|
+
masterSecret,
|
|
17
|
+
salt,
|
|
18
|
+
rounds,
|
|
19
|
+
algorithm: algo
|
|
20
|
+
});
|
|
24
21
|
}
|
|
25
22
|
catch (error) {
|
|
26
23
|
console.error(`${lc} Error deriving pool secret: ${error.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-reveal-v1.mjs","sourceRoot":"","sources":["../../../../src/keystone/strategy/hash-reveal-v1/hash-reveal-v1.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"hash-reveal-v1.mjs","sourceRoot":"","sources":["../../../../src/keystone/strategy/hash-reveal-v1/hash-reveal-v1.mts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* optimistic merging. This should trigger the automatic text merging which is
|
|
8
8
|
* different than the replay of dna for other types of conflict grafts.
|
|
9
9
|
*/
|
|
10
|
-
import { respecfully,
|
|
10
|
+
import { respecfully, ifWe, iReckon } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
|
|
11
11
|
const maam = `[${import.meta.url}]`, sir = maam;
|
|
12
12
|
import { clone, delay, extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
13
13
|
import { GLOBAL_LOG_A_LOT } from '../core-constants.mjs';
|
|
@@ -120,7 +120,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
120
120
|
});
|
|
121
121
|
const r1_alpha_source_tipAddr = r1_alpha_sourceKV[alpha_tjpAddr];
|
|
122
122
|
if (!r1_alpha_source_tipAddr) {
|
|
123
|
-
|
|
123
|
+
ifWe(sir, 'r1_alpha_source_tipAddr is falsy?', async () => {
|
|
124
124
|
iReckon(sir, true).asTo('fail').isGonnaBeFalse();
|
|
125
125
|
});
|
|
126
126
|
return; /* <<<< returns early */
|
|
@@ -132,15 +132,15 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
132
132
|
});
|
|
133
133
|
const r1_alpha_dest_tipAddr = r1_alpha_destKV[alpha_tjpAddr];
|
|
134
134
|
if (!r1_alpha_dest_tipAddr) {
|
|
135
|
-
|
|
135
|
+
ifWe(sir, 'r1_alpha_dest_tipAddr is falsy?', async () => {
|
|
136
136
|
iReckon(sir, true).asTo('fail').isGonnaBeFalse();
|
|
137
137
|
});
|
|
138
138
|
return; /* <<<< returns early */
|
|
139
139
|
}
|
|
140
|
-
await
|
|
140
|
+
await ifWe(sir, 'r1 tip addrs match', async () => {
|
|
141
141
|
iReckon(sir, r1_alpha_source_tipAddr).asTo('R1 source/dest have same tip').isGonnaBe(r1_alpha_dest_tipAddr);
|
|
142
142
|
});
|
|
143
|
-
await
|
|
143
|
+
await ifWe(sir, 'r1 text synced correctly', async () => {
|
|
144
144
|
if (!r1_alpha_dest_tipAddr) {
|
|
145
145
|
throw new Error(`r1_dest_tipAddr is null/undefined (E: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
|
|
146
146
|
}
|
|
@@ -148,7 +148,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
148
148
|
const destTipIbGib = resGet_destTip.ibGibs[0];
|
|
149
149
|
iReckon(sir, destTipIbGib.data.text).asTo('Dest has initial text').isGonnaBe(INITIAL_TEXT);
|
|
150
150
|
});
|
|
151
|
-
await
|
|
151
|
+
await ifWe(sir, 'r1 dep graphs synced', async () => {
|
|
152
152
|
const [r1_alpha_source_tip] = await getIbGibsFromCache_fallbackToSpaces({
|
|
153
153
|
addrs: [r1_alpha_source_tipAddr],
|
|
154
154
|
space: sourceSpace,
|
|
@@ -218,7 +218,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
218
218
|
});
|
|
219
219
|
// #endregion r2 dest edits
|
|
220
220
|
await respecfully(sir, `r2 verify pre`, async () => {
|
|
221
|
-
await
|
|
221
|
+
await ifWe(sir, 'texts as expected', async () => {
|
|
222
222
|
// before the sync, each side only has their edit. after the sync,
|
|
223
223
|
// both sides should have both prepended and appended text
|
|
224
224
|
iReckon(sir, r2_alpha_v1_source_appendedText.ibGib.data?.text.includes(INITIAL_TEXT)).asTo('alpha source has initial text').isGonnaBeTrue();
|
|
@@ -254,14 +254,14 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
254
254
|
const kv_dest = await senderCoordinator.getKnowledgeMap({ space: destSpace, metaspace, domainIbGibs: [r1_alpha_v0_source.ibGib] });
|
|
255
255
|
const r2_alpha_source_tipAddr = kv_source[alpha_tjpAddr];
|
|
256
256
|
if (!r2_alpha_source_tipAddr) {
|
|
257
|
-
await
|
|
257
|
+
await ifWe(sir, 'r2_alpha_source_tipAddr falsy?', async () => {
|
|
258
258
|
iReckon(sir, true).asTo('fails').isGonnaBe(false);
|
|
259
259
|
});
|
|
260
260
|
return; /* <<<< returns early */
|
|
261
261
|
}
|
|
262
262
|
const r2_alpha_dest_tipAddr = kv_dest[alpha_tjpAddr];
|
|
263
263
|
if (!r2_alpha_dest_tipAddr) {
|
|
264
|
-
await
|
|
264
|
+
await ifWe(sir, 'r2_alpha_dest_tipAddr falsy?', async () => {
|
|
265
265
|
iReckon(sir, true).asTo('fails').isGonnaBe(false);
|
|
266
266
|
});
|
|
267
267
|
return; /* <<<< returns early */
|
|
@@ -274,10 +274,10 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
274
274
|
addrs: [r2_alpha_dest_tipAddr],
|
|
275
275
|
space: sourceSpace,
|
|
276
276
|
});
|
|
277
|
-
await
|
|
277
|
+
await ifWe(sir, 'r2 tip addrs match', async () => {
|
|
278
278
|
iReckon(sir, r2_alpha_source_tipAddr).asTo('alpha').isGonnaBe(r2_alpha_dest_tipAddr);
|
|
279
279
|
});
|
|
280
|
-
await
|
|
280
|
+
await ifWe(sir, 'r2 text merged correctly', async () => {
|
|
281
281
|
// before the sync, each side only has their edit. after the sync,
|
|
282
282
|
// both sides should have both prepended and appended text
|
|
283
283
|
iReckon(sir, r2_alpha_v1_source_appendedText.ibGib.data?.text.includes(INITIAL_TEXT)).asTo('alpha source has initial text').isGonnaBeTrue();
|
|
@@ -292,7 +292,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
292
292
|
// we'll go one step further and assume the final output is exactly this
|
|
293
293
|
iReckon(sir, text).asTo('R2 has both prepend and append').isGonnaBe(DEST_PREPEND + INITIAL_TEXT + SOURCE_APPEND);
|
|
294
294
|
});
|
|
295
|
-
await
|
|
295
|
+
await ifWe(sir, 'r2 dep graphs synced', async () => {
|
|
296
296
|
// alpha's full dep graph should exist on dest
|
|
297
297
|
const depGraph_alpha_source = await getDependencyGraph({
|
|
298
298
|
ibGib: r2_alpha_source_tip,
|
|
@@ -350,7 +350,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
350
350
|
// });
|
|
351
351
|
// // #endregion r3 dest edits
|
|
352
352
|
// await respecfully(sir, `r3 verify pre`, async () => {
|
|
353
|
-
// await
|
|
353
|
+
// await ifWe(sir, 'dest has alpha after R2 graft', async () => {
|
|
354
354
|
// const kv = await receiverCoordinator.getKnowledgeMap({ space: destSpace, metaspace, domainIbGibs: [r3_v0_graft_fromDest] });
|
|
355
355
|
// iReckon(sir, !!kv[alpha_tjpAddr]).asTo('dest has tip').isGonnaBeTrue();
|
|
356
356
|
// });
|
|
@@ -377,10 +377,10 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
377
377
|
// const kv_d = await senderCoordinator.getKnowledgeMap({ space: destSpace, metaspace, domainIbGibs: [r1_alpha_v0_source.ibGib] });
|
|
378
378
|
// const r3_tip_s = kv_s[alpha_tjpAddr];
|
|
379
379
|
// const r3_tip_d = kv_d[alpha_tjpAddr];
|
|
380
|
-
// await
|
|
380
|
+
// await ifWe(sir, 'r3 tip addrs match', async () => {
|
|
381
381
|
// iReckon(sir, r3_tip_s).asTo('R3 tips match').isGonnaBe(r3_tip_d);
|
|
382
382
|
// });
|
|
383
|
-
// await
|
|
383
|
+
// await ifWe(sir, 'r3 both paragraph edits merged', async () => {
|
|
384
384
|
// const res = await getFromSpace({ space: sourceSpace, addr: r3_tip_s! });
|
|
385
385
|
// const tip = res.ibGibs![0] as IbGib_V1<TestData>;
|
|
386
386
|
// const mergedText = tip.data!.text!;
|
|
@@ -396,7 +396,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
396
396
|
// .asTo('middle line preserved')
|
|
397
397
|
// .isGonnaBeTrue();
|
|
398
398
|
// });
|
|
399
|
-
// await
|
|
399
|
+
// await ifWe(sir, 'r3 dep graphs synced', async () => {
|
|
400
400
|
// const [d] = await getIbGibsFromCache_fallbackToSpaces({ addrs: [r3_tip_s!], space: destSpace });
|
|
401
401
|
// iReckon(sir, d).asTo('exists dest').isGonnaBeTruthy();
|
|
402
402
|
// });
|
|
@@ -418,21 +418,21 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
418
418
|
// // TODO: Mutate - edit different words in same paragraph
|
|
419
419
|
// // #endregion r4 dest edits
|
|
420
420
|
// await respecfully(sir, `r4 verify pre`, async () => {
|
|
421
|
-
// await
|
|
421
|
+
// await ifWe(sir, 'dest has alpha after R3 graft', async () => {
|
|
422
422
|
// // TODO: Verify pre-sync state
|
|
423
423
|
// });
|
|
424
424
|
// });
|
|
425
425
|
// if (logalot) { console.log(`${lc} Running r4 Sync (same paragraph conflict)...`); }
|
|
426
426
|
// // TODO: Add sync operation
|
|
427
427
|
// await respecfully(sir, `r4 verify post`, async () => {
|
|
428
|
-
// await
|
|
428
|
+
// await ifWe(sir, 'r4 tip addrs match', async () => {
|
|
429
429
|
// // TODO: Verify tips match
|
|
430
430
|
// });
|
|
431
|
-
// await
|
|
431
|
+
// await ifWe(sir, 'r4 LCS merged both word changes', async () => {
|
|
432
432
|
// // TODO: Verify text has both source and dest word changes
|
|
433
433
|
// // TODO: Verify LCS algorithm preserved both edits correctly
|
|
434
434
|
// });
|
|
435
|
-
// await
|
|
435
|
+
// await ifWe(sir, 'r4 dep graphs synced', async () => {
|
|
436
436
|
// // TODO: Verify dep graphs
|
|
437
437
|
// });
|
|
438
438
|
// });
|
|
@@ -455,27 +455,27 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
|
|
|
455
455
|
// // TODO: Mutate description field (different changes)
|
|
456
456
|
// // #endregion r5 dest edits
|
|
457
457
|
// await respecfully(sir, `r5 verify pre`, async () => {
|
|
458
|
-
// await
|
|
458
|
+
// await ifWe(sir, 'dest has alpha after R4 graft', async () => {
|
|
459
459
|
// // TODO: Verify pre-sync state
|
|
460
460
|
// });
|
|
461
461
|
// });
|
|
462
462
|
// if (logalot) { console.log(`${lc} Running r5 Sync (multi-field text merge)...`); }
|
|
463
463
|
// // TODO: Add sync operation
|
|
464
464
|
// await respecfully(sir, `r5 verify post`, async () => {
|
|
465
|
-
// await
|
|
465
|
+
// await ifWe(sir, 'r5 tip addrs match', async () => {
|
|
466
466
|
// // TODO: Verify tips match
|
|
467
467
|
// });
|
|
468
|
-
// await
|
|
468
|
+
// await ifWe(sir, 'r5 text field merged', async () => {
|
|
469
469
|
// // TODO: Verify text field has both source and dest changes
|
|
470
470
|
// });
|
|
471
|
-
// await
|
|
471
|
+
// await ifWe(sir, 'r5 description field merged', async () => {
|
|
472
472
|
// // TODO: Verify description field has both source and dest changes
|
|
473
473
|
// });
|
|
474
|
-
// await
|
|
474
|
+
// await ifWe(sir, 'r5 both fields independently LCS-merged', async () => {
|
|
475
475
|
// // TODO: Verify each field was merged independently
|
|
476
476
|
// // TODO: Ensure one field's merge didn't affect the other
|
|
477
477
|
// });
|
|
478
|
-
// await
|
|
478
|
+
// await ifWe(sir, 'r5 dep graphs synced', async () => {
|
|
479
479
|
// // TODO: Verify dep graphs
|
|
480
480
|
// });
|
|
481
481
|
// });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-conflict-text-merge.respec.mjs","sourceRoot":"","sources":["../../src/sync/sync-conflict-text-merge.respec.mts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sync-conflict-text-merge.respec.mjs","sourceRoot":"","sources":["../../src/sync/sync-conflict-text-merge.respec.mts"],"names":[],"mappings":"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"}
|
|
@@ -54,4 +54,13 @@ export declare const SyncConflictStrategy: {
|
|
|
54
54
|
};
|
|
55
55
|
export declare const SYNC_CONFLICT_STRATEGY_VALID_VALUES: ("abort" | "optimistic-graft-longest-common-subsequence")[];
|
|
56
56
|
export declare function isValidSyncConflictStrategy(strategy: string): strategy is SyncConflictStrategy;
|
|
57
|
+
/**
|
|
58
|
+
* When synchronizing, the plan for identity integration is to create a session
|
|
59
|
+
* keystone. This keystone will have a primary pool, driven by the sender's
|
|
60
|
+
* secret, and a secondary delegated pool for use by the receiver. Initially,
|
|
61
|
+
* this will have a known, weak "secret" and it is the job of the receiver to
|
|
62
|
+
* use this to then change the keystone to use a secret chosen by the
|
|
63
|
+
* receiver's end.
|
|
64
|
+
*/
|
|
65
|
+
export declare const DEFAULT_SESSION_IDENTITY_INITIAL_DELEGATE_SECRET = "ib^gib";
|
|
57
66
|
//# sourceMappingURL=sync-constants.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-constants.d.mts","sourceRoot":"","sources":["../../src/sync/sync-constants.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sync-constants.d.mts","sourceRoot":"","sources":["../../src/sync/sync-constants.mts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C;;;GAGG;AACH,eAAO,MAAM,8BAA8B,wBAAwB,CAAC;AAGpE,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,gBAAgB,UAAU,CAAC;AACxC,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAE1C,MAAM,MAAM,SAAS,GACf,OAAO,eAAe,GACtB,OAAO,cAAc,GACrB,OAAO,gBAAgB,GACvB,OAAO,iBAAiB,CAAC;AAE/B,eAAO,MAAM,SAAS;IAClB;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;CAEiC,CAAC;AACzC,eAAO,MAAM,uBAAuB,yCAA2B,CAAC;AAIhE,eAAO,MAAM,4BAA4B,UAAU,CAAC;AACpD,eAAO,MAAM,2CAA2C,gDAAgD,CAAC;AAEzG,MAAM,MAAM,oBAAoB,GAC1B,OAAO,4BAA4B,GACnC,OAAO,2CAA2C,CAEnD;AACL;;GAEG;AACH,eAAO,MAAM,oBAAoB;IAC7B;;OAEG;;IAEH;;;;;;;;;OASG;;CAG4C,CAAC;AACpD,eAAO,MAAM,mCAAmC,6DAAsC,CAAC;AACvF,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,IAAI,oBAAoB,CAE9F;AAGD;;;;;;;GAOG;AACH,eAAO,MAAM,gDAAgD,WAAY,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ROOT_ADDR } from "@ibgib/ts-gib/dist/V1/constants.mjs";
|
|
1
2
|
export const SYNC_ATOM = "sync";
|
|
2
3
|
export const SYNC_MSG_REL8N_NAME = "syncmsg";
|
|
3
4
|
/**
|
|
@@ -59,4 +60,13 @@ export function isValidSyncConflictStrategy(strategy) {
|
|
|
59
60
|
return SYNC_CONFLICT_STRATEGY_VALID_VALUES.includes(strategy);
|
|
60
61
|
}
|
|
61
62
|
// #endregion SyncConflictStrategy
|
|
63
|
+
/**
|
|
64
|
+
* When synchronizing, the plan for identity integration is to create a session
|
|
65
|
+
* keystone. This keystone will have a primary pool, driven by the sender's
|
|
66
|
+
* secret, and a secondary delegated pool for use by the receiver. Initially,
|
|
67
|
+
* this will have a known, weak "secret" and it is the job of the receiver to
|
|
68
|
+
* use this to then change the keystone to use a secret chosen by the
|
|
69
|
+
* receiver's end.
|
|
70
|
+
*/
|
|
71
|
+
export const DEFAULT_SESSION_IDENTITY_INITIAL_DELEGATE_SECRET = ROOT_ADDR;
|
|
62
72
|
//# sourceMappingURL=sync-constants.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-constants.mjs","sourceRoot":"","sources":["../../src/sync/sync-constants.mts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC;AAEhC,MAAM,CAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;AAC7C;;;GAGG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,qBAAqB,CAAC;AAEpE,oBAAoB;AACpB,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,CAAC;AACpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC;AACxC,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAQ1C,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB;;OAEG;IACH,IAAI,EAAE,eAAe;IACrB;;OAEG;IACH,GAAG,EAAE,cAAc;IACnB;;OAEG;IACH,KAAK,EAAE,gBAAgB;IACvB;;OAEG;IACH,MAAM,EAAE,iBAAiB;CACW,CAAC;AACzC,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAChE,uBAAuB;AAEvB,+BAA+B;AAC/B,MAAM,CAAC,MAAM,4BAA4B,GAAG,OAAO,CAAC;AACpD,MAAM,CAAC,MAAM,2CAA2C,GAAG,6CAA6C,CAAC;AAOzG;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAChC;;OAEG;IACH,KAAK,EAAE,4BAA4B;IACnC;;;;;;;;;OASG;IACH,iBAAiB,EAAE,2CAA2C;IAC9D,gEAAgE;CACjB,CAAC;AACpD,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;AACvF,MAAM,UAAU,2BAA2B,CAAC,QAAgB;IACxD,OAAO,mCAAmC,CAAC,QAAQ,CAAC,QAAgC,CAAC,CAAC;AAC1F,CAAC;AACD,kCAAkC"}
|
|
1
|
+
{"version":3,"file":"sync-constants.mjs","sourceRoot":"","sources":["../../src/sync/sync-constants.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC;AAEhC,MAAM,CAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;AAC7C;;;GAGG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,qBAAqB,CAAC;AAEpE,oBAAoB;AACpB,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,CAAC;AACpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC;AACxC,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAQ1C,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB;;OAEG;IACH,IAAI,EAAE,eAAe;IACrB;;OAEG;IACH,GAAG,EAAE,cAAc;IACnB;;OAEG;IACH,KAAK,EAAE,gBAAgB;IACvB;;OAEG;IACH,MAAM,EAAE,iBAAiB;CACW,CAAC;AACzC,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAChE,uBAAuB;AAEvB,+BAA+B;AAC/B,MAAM,CAAC,MAAM,4BAA4B,GAAG,OAAO,CAAC;AACpD,MAAM,CAAC,MAAM,2CAA2C,GAAG,6CAA6C,CAAC;AAOzG;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAChC;;OAEG;IACH,KAAK,EAAE,4BAA4B;IACnC;;;;;;;;;OASG;IACH,iBAAiB,EAAE,2CAA2C;IAC9D,gEAAgE;CACjB,CAAC;AACpD,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;AACvF,MAAM,UAAU,2BAA2B,CAAC,QAAgB;IACxD,OAAO,mCAAmC,CAAC,QAAQ,CAAC,QAAgC,CAAC,CAAC;AAC1F,CAAC;AACD,kCAAkC;AAElC;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gDAAgD,GAAG,SAAS,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-innerspace-dest-ahead-withid.respec.d.mts","sourceRoot":"","sources":["../../src/sync/sync-innerspace-dest-ahead-withid.respec.mts"],"names":[],"mappings":"AAAA;;;;GAIG"}
|