@ibgib/core-gib 0.1.60 → 0.1.62
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/CHANGELOG.md +16 -0
- package/dist/common/other/graph-helper.d.mts.map +1 -1
- package/dist/common/other/graph-helper.mjs +7 -6
- package/dist/common/other/graph-helper.mjs.map +1 -1
- package/dist/keystone/keystone-config-builder.d.mts +1 -2
- package/dist/keystone/keystone-config-builder.d.mts.map +1 -1
- package/dist/keystone/keystone-config-builder.mjs +4 -19
- package/dist/keystone/keystone-config-builder.mjs.map +1 -1
- package/dist/keystone/keystone-constants.d.mts +2 -1
- package/dist/keystone/keystone-constants.d.mts.map +1 -1
- package/dist/keystone/keystone-constants.mjs +2 -1
- package/dist/keystone/keystone-constants.mjs.map +1 -1
- package/dist/keystone/keystone-helpers.d.mts +28 -16
- package/dist/keystone/keystone-helpers.d.mts.map +1 -1
- package/dist/keystone/keystone-helpers.mjs +155 -76
- package/dist/keystone/keystone-helpers.mjs.map +1 -1
- package/dist/keystone/keystone-policy-types.d.mts +6 -4
- package/dist/keystone/keystone-policy-types.d.mts.map +1 -1
- package/dist/keystone/keystone-service-v1.d.mts +38 -2
- package/dist/keystone/keystone-service-v1.d.mts.map +1 -1
- package/dist/keystone/keystone-service-v1.mjs +177 -11
- package/dist/keystone/keystone-service-v1.mjs.map +1 -1
- package/dist/keystone/keystone-service-v1.respec.mjs +527 -41
- package/dist/keystone/keystone-service-v1.respec.mjs.map +1 -1
- package/dist/keystone/keystone-types.d.mts +53 -11
- package/dist/keystone/keystone-types.d.mts.map +1 -1
- package/dist/keystone/policy/keystone-profile-builder.d.mts +25 -0
- package/dist/keystone/policy/keystone-profile-builder.d.mts.map +1 -0
- package/dist/keystone/policy/keystone-profile-builder.mjs +117 -0
- package/dist/keystone/policy/keystone-profile-builder.mjs.map +1 -0
- package/dist/keystone/policy/profiles/profile-high.json +84 -0
- package/dist/keystone/policy/profiles/profile-low.json +84 -0
- package/dist/keystone/policy/profiles/profile-medium.json +84 -0
- package/dist/keystone/policy/profiles/profile-session.json +84 -0
- package/dist/keystone/policy/profiles/profile-test.json +84 -0
- package/dist/keystone/policy/schemas/connect-pool.high.schema.json +23 -0
- package/dist/keystone/policy/schemas/connect-pool.low.schema.json +23 -0
- package/dist/keystone/policy/schemas/connect-pool.medium.schema.json +23 -0
- package/dist/keystone/policy/schemas/keystone.high.schema.json +26 -0
- package/dist/keystone/policy/schemas/keystone.low.schema.json +26 -0
- package/dist/keystone/policy/schemas/keystone.medium.schema.json +26 -0
- package/dist/keystone/policy/schemas/manage-pool.high.schema.json +23 -0
- package/dist/keystone/policy/schemas/manage-pool.low.schema.json +23 -0
- package/dist/keystone/policy/schemas/manage-pool.medium.schema.json +23 -0
- package/dist/keystone/policy/schemas/revoke-pool.high.schema.json +23 -0
- package/dist/keystone/policy/schemas/revoke-pool.low.schema.json +23 -0
- package/dist/keystone/policy/schemas/revoke-pool.medium.schema.json +23 -0
- package/dist/keystone/policy/schemas/sign-pool.high.schema.json +23 -0
- package/dist/keystone/policy/schemas/sign-pool.low.schema.json +23 -0
- package/dist/keystone/policy/schemas/sign-pool.medium.schema.json +23 -0
- package/dist/keystone/policy/schemas/sync-pool.high.schema.json +23 -0
- package/dist/keystone/policy/schemas/sync-pool.low.schema.json +23 -0
- package/dist/keystone/policy/schemas/sync-pool.medium.schema.json +23 -0
- package/dist/sync/sync-conflict-adv-multitimelines.withid.respec.d.mts +8 -0
- package/dist/sync/sync-conflict-adv-multitimelines.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-conflict-adv-multitimelines.withid.respec.mjs +582 -0
- package/dist/sync/sync-conflict-adv-multitimelines.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-conflict-basic-divergence.withid.respec.d.mts +7 -0
- package/dist/sync/sync-conflict-basic-divergence.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-conflict-basic-divergence.withid.respec.mjs +274 -0
- package/dist/sync/sync-conflict-basic-divergence.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-conflict-basic-multitimelines.withid.respec.d.mts +8 -0
- package/dist/sync/sync-conflict-basic-multitimelines.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-conflict-basic-multitimelines.withid.respec.mjs +322 -0
- package/dist/sync/sync-conflict-basic-multitimelines.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-conflict-text-merge.withid.respec.d.mts +7 -0
- package/dist/sync/sync-conflict-text-merge.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-conflict-text-merge.withid.respec.mjs +307 -0
- package/dist/sync/sync-conflict-text-merge.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-innerspace-constants.withid.respec.d.mts +8 -0
- package/dist/sync/sync-innerspace-constants.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-innerspace-constants.withid.respec.mjs +233 -0
- package/dist/sync/sync-innerspace-constants.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-innerspace-deep-updates.withid.respec.d.mts +7 -0
- package/dist/sync/sync-innerspace-deep-updates.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-innerspace-deep-updates.withid.respec.mjs +233 -0
- package/dist/sync/sync-innerspace-deep-updates.withid.respec.mjs.map +1 -0
- 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 +225 -0
- package/dist/sync/sync-innerspace-dest-ahead.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-innerspace-multiple-timelines.respec.mjs.map +1 -1
- package/dist/sync/sync-innerspace-multiple-timelines.withid.respec.d.mts +7 -0
- package/dist/sync/sync-innerspace-multiple-timelines.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-innerspace-multiple-timelines.withid.respec.mjs +235 -0
- package/dist/sync/sync-innerspace-multiple-timelines.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-innerspace-partial-update.withid.respec.d.mts +7 -0
- package/dist/sync/sync-innerspace-partial-update.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-innerspace-partial-update.withid.respec.mjs +211 -0
- package/dist/sync/sync-innerspace-partial-update.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-innerspace.withid.respec.d.mts +8 -0
- package/dist/sync/sync-innerspace.withid.respec.d.mts.map +1 -0
- package/dist/sync/sync-innerspace.withid.respec.mjs +260 -0
- package/dist/sync/sync-innerspace.withid.respec.mjs.map +1 -0
- package/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-peer-websocket-receiver-v1.d.mts +1 -0
- package/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-peer-websocket-receiver-v1.d.mts.map +1 -1
- package/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-peer-websocket-receiver-v1.mjs +13 -4
- package/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-peer-websocket-receiver-v1.mjs.map +1 -1
- package/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-websocket-peer-helpers.d.mts +1 -1
- package/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-websocket-peer-helpers.d.mts.map +1 -1
- package/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-websocket-peer-helpers.mjs +5 -3
- package/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-websocket-peer-helpers.mjs.map +1 -1
- package/dist/sync/sync-saga-coordinator.d.mts.map +1 -1
- package/dist/sync/sync-saga-coordinator.mjs +165 -145
- package/dist/sync/sync-saga-coordinator.mjs.map +1 -1
- package/dist/sync/sync-withid.pingpong.respec.mjs +8 -8
- package/dist/sync/sync-withid.pingpong.respec.mjs.map +1 -1
- package/dist/timeline/timeline-api.d.mts.map +1 -1
- package/dist/timeline/timeline-api.mjs +1 -14
- package/dist/timeline/timeline-api.mjs.map +1 -1
- package/dist/witness/space/reconciliation-space/reconciliation-space-base.d.mts.map +1 -1
- package/dist/witness/space/reconciliation-space/reconciliation-space-base.mjs +0 -40
- package/dist/witness/space/reconciliation-space/reconciliation-space-base.mjs.map +1 -1
- package/dist/witness/space/reconciliation-space/reconciliation-space-helper.d.mts.map +1 -1
- package/dist/witness/space/reconciliation-space/reconciliation-space-helper.mjs +6 -6
- package/dist/witness/space/reconciliation-space/reconciliation-space-helper.mjs.map +1 -1
- package/ibgib-foundations.md +2 -1
- package/package.json +1 -1
- package/src/common/other/graph-helper.mts +7 -6
- package/src/keystone/README.md +34 -17
- package/src/keystone/docs/CRYPTANALYSIS.md +185 -0
- package/src/keystone/docs/architecture.md +45 -3
- package/src/keystone/docs/delegation.md +57 -0
- package/src/keystone/docs/profiles.md +124 -0
- package/src/keystone/keystone-config-builder.mts +3 -21
- package/src/keystone/keystone-constants.mts +2 -1
- package/src/keystone/keystone-helpers.mts +204 -81
- package/src/keystone/keystone-policy-types.mts +6 -4
- package/src/keystone/keystone-service-v1.mts +223 -11
- package/src/keystone/keystone-service-v1.respec.mts +596 -39
- package/src/keystone/keystone-types.mts +55 -9
- package/src/keystone/policy/IMPLEMENTATION.md +60 -0
- package/src/keystone/policy/README.md +94 -0
- package/src/keystone/policy/keystone-profile-builder.mts +131 -0
- package/src/keystone/policy/profiles/profile-high.json +84 -0
- package/src/keystone/policy/profiles/profile-low.json +84 -0
- package/src/keystone/policy/profiles/profile-medium.json +84 -0
- package/src/keystone/policy/profiles/profile-session.json +84 -0
- package/src/keystone/policy/profiles/profile-test.json +84 -0
- package/src/keystone/policy/schemas/connect-pool.high.schema.json +23 -0
- package/src/keystone/policy/schemas/connect-pool.low.schema.json +23 -0
- package/src/keystone/policy/schemas/connect-pool.medium.schema.json +23 -0
- package/src/keystone/policy/schemas/keystone.high.schema.json +26 -0
- package/src/keystone/policy/schemas/keystone.low.schema.json +26 -0
- package/src/keystone/policy/schemas/keystone.medium.schema.json +26 -0
- package/src/keystone/policy/schemas/manage-pool.high.schema.json +23 -0
- package/src/keystone/policy/schemas/manage-pool.low.schema.json +23 -0
- package/src/keystone/policy/schemas/manage-pool.medium.schema.json +23 -0
- package/src/keystone/policy/schemas/revoke-pool.high.schema.json +23 -0
- package/src/keystone/policy/schemas/revoke-pool.low.schema.json +23 -0
- package/src/keystone/policy/schemas/revoke-pool.medium.schema.json +23 -0
- package/src/keystone/policy/schemas/sign-pool.high.schema.json +23 -0
- package/src/keystone/policy/schemas/sign-pool.low.schema.json +23 -0
- package/src/keystone/policy/schemas/sign-pool.medium.schema.json +23 -0
- package/src/keystone/policy/schemas/sync-pool.high.schema.json +23 -0
- package/src/keystone/policy/schemas/sync-pool.low.schema.json +23 -0
- package/src/keystone/policy/schemas/sync-pool.medium.schema.json +23 -0
- package/src/sync/docs/security.md +54 -21
- package/src/sync/sync-conflict-adv-multitimelines.withid.respec.mts +706 -0
- package/src/sync/sync-conflict-basic-divergence.withid.respec.mts +321 -0
- package/src/sync/sync-conflict-basic-multitimelines.withid.respec.mts +374 -0
- package/src/sync/sync-conflict-text-merge.withid.respec.mts +347 -0
- package/src/sync/sync-innerspace-constants.withid.respec.mts +264 -0
- package/src/sync/sync-innerspace-deep-updates.withid.respec.mts +272 -0
- package/src/sync/sync-innerspace-dest-ahead.withid.respec.mts +266 -0
- package/src/sync/sync-innerspace-multiple-timelines.respec.mts +0 -1
- package/src/sync/sync-innerspace-multiple-timelines.withid.respec.mts +273 -0
- package/src/sync/sync-innerspace-partial-update.withid.respec.mts +249 -0
- package/src/sync/sync-innerspace.withid.respec.mts +265 -0
- package/src/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-peer-websocket-receiver-v1.mts +12 -4
- package/src/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-receiver/sync-websocket-peer-helpers.mts +5 -3
- package/src/sync/sync-saga-coordinator.mts +159 -143
- package/src/sync/sync-withid.pingpong.respec.mts +8 -8
- package/src/timeline/timeline-api.mts +1 -15
- package/src/timeline/timeline-api.respec.mts +3 -3
- package/src/witness/space/reconciliation-space/reconciliation-space-base.mts +0 -46
- package/src/witness/space/reconciliation-space/reconciliation-space-helper.mts +6 -5
- package/tsconfig.json +6 -1
- package/src/keystone/keystone-policy.schema.json +0 -51
- package/src/witness/space/reconciliation-space/reconciliation-space-base.mts.OLD.md +0 -884
- package/src/witness/space/reconciliation-space/reconciliation-space-helper.mts.OLD.md +0 -125
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module sync-conflict-basic-multitimelines.withid.respec
|
|
3
|
+
*
|
|
4
|
+
* Verifies Divergence Conflict Resolution (optimistic merge / grafting) with Identity
|
|
5
|
+
* when multiple related timelines are involved.
|
|
6
|
+
*/
|
|
7
|
+
import { respecfully, iReckon, ifWe } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
|
|
8
|
+
const maam = `[${import.meta.url}]`, sir = maam;
|
|
9
|
+
import { clone, delay } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
10
|
+
import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
|
|
11
|
+
import { GLOBAL_LOG_A_LOT } from '../core-constants.mjs';
|
|
12
|
+
import { SyncSagaCoordinator } from './sync-saga-coordinator.mjs';
|
|
13
|
+
import { getFromSpace } from '../witness/space/space-helper.mjs';
|
|
14
|
+
import { Metaspace_Innerspace } from '../witness/space/metaspace/metaspace-innerspace/metaspace-innerspace.mjs';
|
|
15
|
+
import { InnerSpace_V1 } from '../witness/space/inner-space/inner-space-v1.mjs';
|
|
16
|
+
import { createTimelineRootTestHelper } from '../test-helpers.mjs';
|
|
17
|
+
import { appendToTimeline, mut8Timeline } from '../timeline/timeline-api.mjs';
|
|
18
|
+
import { SyncPeerInnerspace_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mjs';
|
|
19
|
+
import { DEFAULT_INNER_SPACE_DATA_V1 } from '../witness/space/inner-space/inner-space-types.mjs';
|
|
20
|
+
import { getIbGibsFromCache_fallbackToSpaces, getTjpAddr } from '../common/other/ibgib-helper.mjs';
|
|
21
|
+
import { getDependencyGraph, graphsAreEquivalent } from '../common/other/graph-helper.mjs';
|
|
22
|
+
import { SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-constants.mjs';
|
|
23
|
+
import { SyncConflictStrategy } from './sync-constants.mjs';
|
|
24
|
+
import { GRAFT_BASE_REL8N_NAME, GRAFT_ORPHAN_REL8N_NAME, GRAFT_INFO_REL8N_NAME } from './graft-info/graft-info-constants.mjs';
|
|
25
|
+
import { KeystoneService_V1 } from '../keystone/keystone-service-v1.mjs';
|
|
26
|
+
import { KEYSTONE_VERB_SYNC, POOL_ID_SYNC, } from '../keystone/keystone-constants.mjs';
|
|
27
|
+
import { createStandardPoolConfig } from '../keystone/keystone-config-builder.mjs';
|
|
28
|
+
import { KeystoneReplenishStrategy } from '../keystone/keystone-types.mjs';
|
|
29
|
+
const logalot = GLOBAL_LOG_A_LOT || false;
|
|
30
|
+
const lc = `[sync-conflict-basic-multitimelines.withid.respec]`;
|
|
31
|
+
const SENDER_SECRET = 'test-sender-secret-conflict-basic-multitimelines-withid';
|
|
32
|
+
const SENDER_IDENTITY_SYNC_POOL_CONFIG = createStandardPoolConfig({
|
|
33
|
+
id: POOL_ID_SYNC,
|
|
34
|
+
salt: 'senderidentitysyncsaltconflictbasicmultitimelineswithid',
|
|
35
|
+
verbs: [KEYSTONE_VERB_SYNC],
|
|
36
|
+
size: 200,
|
|
37
|
+
sequential: 1,
|
|
38
|
+
random: 1,
|
|
39
|
+
targetBinding: 2,
|
|
40
|
+
replenishStrategy: KeystoneReplenishStrategy.topUp,
|
|
41
|
+
});
|
|
42
|
+
const TEST_REL8N_NAME = 'testrel8n';
|
|
43
|
+
await respecfully(sir, `Sync Conflict Basic Multitimelines with Identity`, async () => {
|
|
44
|
+
for (let i = 0; i <= 1; i++) {
|
|
45
|
+
const srcMakesFirstDivergentEdit = i === 0;
|
|
46
|
+
await respecfully(sir, `srcMakesFirstDivergentEdit: ${srcMakesFirstDivergentEdit}`, async () => {
|
|
47
|
+
// 1. Setup Spaces
|
|
48
|
+
const metaspace = new Metaspace_Innerspace(undefined);
|
|
49
|
+
await metaspace.initialize({
|
|
50
|
+
getFnAlert: () => async ({ title, msg }) => { console.log(`[Alert] ${title}: ${msg}`); },
|
|
51
|
+
getFnPrompt: () => async ({ title, msg }) => { console.log(`[Prompt] ${title}: ${msg}`); return ''; },
|
|
52
|
+
getFnPromptPassword: () => async (title, msg) => { console.log(`[PromptPwd] ${title}: ${msg}`); return null; },
|
|
53
|
+
});
|
|
54
|
+
while (!metaspace.initialized) {
|
|
55
|
+
await delay(10);
|
|
56
|
+
}
|
|
57
|
+
const defaultLocalUserSpace = await metaspace.getLocalUserSpace({ lock: false });
|
|
58
|
+
await defaultLocalUserSpace.initialized;
|
|
59
|
+
const sourceSpace = new InnerSpace_V1({
|
|
60
|
+
...DEFAULT_INNER_SPACE_DATA_V1,
|
|
61
|
+
name: 'source',
|
|
62
|
+
uuid: 'source_uuid',
|
|
63
|
+
description: 'source test space',
|
|
64
|
+
});
|
|
65
|
+
await sourceSpace.initialized;
|
|
66
|
+
const destSpace = new InnerSpace_V1({
|
|
67
|
+
...DEFAULT_INNER_SPACE_DATA_V1,
|
|
68
|
+
name: 'dest',
|
|
69
|
+
uuid: 'dest_uuid',
|
|
70
|
+
description: 'dest test space',
|
|
71
|
+
});
|
|
72
|
+
await destSpace.initialized;
|
|
73
|
+
// 2. Setup Identities
|
|
74
|
+
const keystoneSvc = new KeystoneService_V1();
|
|
75
|
+
const r1_senderIdentity_v0_source = await keystoneSvc.genesis({
|
|
76
|
+
masterSecret: SENDER_SECRET,
|
|
77
|
+
configs: [SENDER_IDENTITY_SYNC_POOL_CONFIG],
|
|
78
|
+
metaspace,
|
|
79
|
+
space: sourceSpace,
|
|
80
|
+
});
|
|
81
|
+
// Register identity in both spaces
|
|
82
|
+
await metaspace.put({ ibGib: r1_senderIdentity_v0_source, space: destSpace });
|
|
83
|
+
await metaspace.registerNewIbGib({ ibGib: r1_senderIdentity_v0_source, space: destSpace });
|
|
84
|
+
// 3. Seed Common History (V0 -> V1)
|
|
85
|
+
const alpha_v0 = await createTimelineRootTestHelper({
|
|
86
|
+
ib: 'alpha_multitimelines_withid',
|
|
87
|
+
data: { type: 'alpha', },
|
|
88
|
+
space: sourceSpace,
|
|
89
|
+
});
|
|
90
|
+
const tjpAddr = getTjpAddr({ ibGib: alpha_v0, defaultIfNone: 'incomingAddr' }) ?? getIbGibAddr({ ibGib: alpha_v0 });
|
|
91
|
+
// Create v1 (common)
|
|
92
|
+
const alpha_v1_common_onSource = await mut8Timeline({
|
|
93
|
+
timeline: alpha_v0,
|
|
94
|
+
mut8Opts: {
|
|
95
|
+
mut8Ib: alpha_v0.ib + '_common',
|
|
96
|
+
dataToAddOrPatch: { commonField: 'common yo' }
|
|
97
|
+
},
|
|
98
|
+
metaspace,
|
|
99
|
+
space: sourceSpace,
|
|
100
|
+
});
|
|
101
|
+
// Sync alpha to dest immediately
|
|
102
|
+
const depGraph_alpha_v1Andcommon = await getDependencyGraph({
|
|
103
|
+
ibGibAddrs: [tjpAddr],
|
|
104
|
+
space: sourceSpace,
|
|
105
|
+
live: true,
|
|
106
|
+
}) ?? {};
|
|
107
|
+
await metaspace.put({ ibGibs: Object.values(depGraph_alpha_v1Andcommon), space: destSpace });
|
|
108
|
+
await metaspace.registerNewIbGib({ ibGib: alpha_v0, space: destSpace });
|
|
109
|
+
const resGetDest = await getFromSpace({ space: destSpace, addr: getIbGibAddr({ ibGib: alpha_v1_common_onSource }) });
|
|
110
|
+
if (!resGetDest.success || !resGetDest.ibGibs || resGetDest.ibGibs.length === 0) {
|
|
111
|
+
throw new Error("Failed to copy V1 to Dest");
|
|
112
|
+
}
|
|
113
|
+
const alpha_v1_common_onDest = resGetDest.ibGibs[0];
|
|
114
|
+
await metaspace.registerNewIbGib({ ibGib: alpha_v1_common_onDest, space: destSpace });
|
|
115
|
+
// 4. Create Divergences (V2a vs V2b)
|
|
116
|
+
let alpha_v3_source_rel8beta;
|
|
117
|
+
let alpha_v2_dest;
|
|
118
|
+
let baseAddr;
|
|
119
|
+
let orphanAddr;
|
|
120
|
+
let beta_v0_source;
|
|
121
|
+
let betaAddr_v0;
|
|
122
|
+
// Beta is created on source
|
|
123
|
+
beta_v0_source = await createTimelineRootTestHelper({
|
|
124
|
+
ib: 'beta_multitimelines_withid',
|
|
125
|
+
data: {
|
|
126
|
+
fieldA: 'beta field A created on source',
|
|
127
|
+
},
|
|
128
|
+
space: sourceSpace,
|
|
129
|
+
});
|
|
130
|
+
betaAddr_v0 = getIbGibAddr({ ibGib: beta_v0_source });
|
|
131
|
+
if (srcMakesFirstDivergentEdit) {
|
|
132
|
+
// Source: V1 -> V2a (Edit Field A + Rel8 Beta)
|
|
133
|
+
const alpha_v2_source_sansBeta = await mut8Timeline({
|
|
134
|
+
timeline: alpha_v1_common_onSource,
|
|
135
|
+
mut8Opts: {
|
|
136
|
+
mut8Ib: alpha_v0.ib + '_v2source',
|
|
137
|
+
dataToAddOrPatch: { fieldA: 'source_edit' }
|
|
138
|
+
},
|
|
139
|
+
metaspace,
|
|
140
|
+
space: sourceSpace,
|
|
141
|
+
});
|
|
142
|
+
alpha_v3_source_rel8beta = await appendToTimeline({
|
|
143
|
+
timeline: alpha_v2_source_sansBeta,
|
|
144
|
+
metaspace,
|
|
145
|
+
space: sourceSpace,
|
|
146
|
+
rel8nInfos: [
|
|
147
|
+
{ rel8nName: TEST_REL8N_NAME, ibGibs: [beta_v0_source] }
|
|
148
|
+
],
|
|
149
|
+
});
|
|
150
|
+
baseAddr = getIbGibAddr({ ibGib: alpha_v3_source_rel8beta });
|
|
151
|
+
await delay(16);
|
|
152
|
+
// Dest: V1 -> V2b (Edit Field B)
|
|
153
|
+
alpha_v2_dest = await mut8Timeline({
|
|
154
|
+
timeline: alpha_v1_common_onDest,
|
|
155
|
+
mut8Opts: {
|
|
156
|
+
mut8Ib: alpha_v0.ib + '_v2dest',
|
|
157
|
+
dataToAddOrPatch: { fieldB: 'dest_edit' }
|
|
158
|
+
},
|
|
159
|
+
metaspace,
|
|
160
|
+
space: destSpace,
|
|
161
|
+
});
|
|
162
|
+
orphanAddr = getIbGibAddr({ ibGib: alpha_v2_dest });
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
165
|
+
// Dest: V1 -> V2b (Edit Field B)
|
|
166
|
+
alpha_v2_dest = await mut8Timeline({
|
|
167
|
+
timeline: alpha_v1_common_onDest,
|
|
168
|
+
mut8Opts: {
|
|
169
|
+
mut8Ib: alpha_v0.ib + '_v2dest',
|
|
170
|
+
dataToAddOrPatch: { fieldB: 'dest_edit' }
|
|
171
|
+
},
|
|
172
|
+
metaspace,
|
|
173
|
+
space: destSpace,
|
|
174
|
+
});
|
|
175
|
+
baseAddr = getIbGibAddr({ ibGib: alpha_v2_dest });
|
|
176
|
+
await delay(16);
|
|
177
|
+
// Source: V1 -> V2a (Edit Field A + Rel8 Beta)
|
|
178
|
+
const alpha_v2_source_sansBeta = await mut8Timeline({
|
|
179
|
+
timeline: alpha_v1_common_onSource,
|
|
180
|
+
mut8Opts: {
|
|
181
|
+
mut8Ib: alpha_v0.ib + '_v2source',
|
|
182
|
+
dataToAddOrPatch: { fieldA: 'source_edit' }
|
|
183
|
+
},
|
|
184
|
+
metaspace,
|
|
185
|
+
space: sourceSpace,
|
|
186
|
+
});
|
|
187
|
+
alpha_v3_source_rel8beta = await appendToTimeline({
|
|
188
|
+
timeline: alpha_v2_source_sansBeta,
|
|
189
|
+
metaspace,
|
|
190
|
+
space: sourceSpace,
|
|
191
|
+
rel8nInfos: [
|
|
192
|
+
{ rel8nName: TEST_REL8N_NAME, ibGibs: [beta_v0_source] }
|
|
193
|
+
],
|
|
194
|
+
});
|
|
195
|
+
orphanAddr = getIbGibAddr({ ibGib: alpha_v3_source_rel8beta });
|
|
196
|
+
}
|
|
197
|
+
// 5. Setup Coordinators
|
|
198
|
+
const senderCoordinator = new SyncSagaCoordinator();
|
|
199
|
+
const receiverCoordinator = new SyncSagaCoordinator();
|
|
200
|
+
const peer = new SyncPeerInnerspace_V1(clone(SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1));
|
|
201
|
+
await peer.initialized;
|
|
202
|
+
await peer.initializeOpts({
|
|
203
|
+
localMetaspace: metaspace,
|
|
204
|
+
localSpace: sourceSpace,
|
|
205
|
+
receiverSpace: destSpace,
|
|
206
|
+
receiverCoordinator,
|
|
207
|
+
receiverMetaspace: metaspace,
|
|
208
|
+
});
|
|
209
|
+
// 6. Run Sync with Identity
|
|
210
|
+
console.log(`${lc} Running Sync...`);
|
|
211
|
+
const resSync = await senderCoordinator.sync({
|
|
212
|
+
peer,
|
|
213
|
+
localSpace: sourceSpace,
|
|
214
|
+
metaspace,
|
|
215
|
+
domainIbGibs: [alpha_v3_source_rel8beta],
|
|
216
|
+
conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
|
|
217
|
+
senderIdentity: r1_senderIdentity_v0_source,
|
|
218
|
+
fnSenderSecret: async () => SENDER_SECRET,
|
|
219
|
+
});
|
|
220
|
+
await resSync.done;
|
|
221
|
+
console.log(`${lc} Sync finished.`);
|
|
222
|
+
// 7. Verify merge & related timelines
|
|
223
|
+
await respecfully(sir, `verify merge and related timelines`, async () => {
|
|
224
|
+
await ifWe(sir, `verify graft/merge tip contains both edits and graft relations`, async () => {
|
|
225
|
+
const sourceKV = await senderCoordinator.getKnowledgeMap({
|
|
226
|
+
space: sourceSpace,
|
|
227
|
+
metaspace,
|
|
228
|
+
domainIbGibs: [alpha_v0]
|
|
229
|
+
});
|
|
230
|
+
const sourceTipAddr = sourceKV[tjpAddr];
|
|
231
|
+
iReckon(sir, sourceTipAddr).asTo('Source tip exists').isGonnaBeTruthy();
|
|
232
|
+
if (sourceTipAddr) {
|
|
233
|
+
iReckon(sir, sourceTipAddr).asTo('Tip should not be baseAddr').not.isGonnaBe(baseAddr);
|
|
234
|
+
iReckon(sir, sourceTipAddr).asTo('Tip should not be orphanAddr').not.isGonnaBe(orphanAddr);
|
|
235
|
+
const resTip = await getFromSpace({ space: sourceSpace, addr: sourceTipAddr });
|
|
236
|
+
const newTip = resTip.ibGibs[0];
|
|
237
|
+
iReckon(sir, newTip.data.fieldA).asTo('Merged fieldA').isGonnaBe('source_edit');
|
|
238
|
+
iReckon(sir, newTip.data.fieldB).asTo('Merged fieldB').isGonnaBe('dest_edit');
|
|
239
|
+
const graftInfoRel = newTip.rel8ns?.[GRAFT_INFO_REL8N_NAME];
|
|
240
|
+
iReckon(sir, graftInfoRel).asTo('New Tip has graftinfo rel8n').isGonnaBeTruthy();
|
|
241
|
+
if (graftInfoRel?.[0]) {
|
|
242
|
+
const resGraft = await getFromSpace({ space: sourceSpace, addr: graftInfoRel[0] });
|
|
243
|
+
const graftInfo = resGraft.ibGibs[0];
|
|
244
|
+
const baseRel = graftInfo.rel8ns?.[GRAFT_BASE_REL8N_NAME];
|
|
245
|
+
const orphanRel = graftInfo.rel8ns?.[GRAFT_ORPHAN_REL8N_NAME];
|
|
246
|
+
iReckon(sir, baseRel).asTo('Graft Base exists').isGonnaBeTruthy();
|
|
247
|
+
iReckon(sir, orphanRel).asTo('Graft Orphan exists').isGonnaBeTruthy();
|
|
248
|
+
iReckon(sir, baseRel.at(-1)).asTo('base rel8ns final addr will be baseAddr').isGonnaBe(baseAddr);
|
|
249
|
+
iReckon(sir, orphanRel.at(-1)).asTo('orphan rel8ns final addr will be orphanAddr').isGonnaBe(orphanAddr);
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
});
|
|
253
|
+
await ifWe(sir, 'related timeline beta is synced to destSpace and graphs match', async () => {
|
|
254
|
+
const [beta_dest] = await getIbGibsFromCache_fallbackToSpaces({
|
|
255
|
+
addrs: [betaAddr_v0],
|
|
256
|
+
space: destSpace,
|
|
257
|
+
});
|
|
258
|
+
iReckon(sir, beta_dest).asTo('beta exists in dest').isGonnaBeTruthy();
|
|
259
|
+
if (beta_dest) {
|
|
260
|
+
const depGraph_beta_source = await getDependencyGraph({ ibGib: beta_v0_source, space: sourceSpace });
|
|
261
|
+
const depGraph_beta_dest = await getDependencyGraph({ ibGib: beta_dest, space: destSpace });
|
|
262
|
+
const betaDepsAreEqual = graphsAreEquivalent({
|
|
263
|
+
graphA: depGraph_beta_source,
|
|
264
|
+
graphB: depGraph_beta_dest,
|
|
265
|
+
slowButThorough: true,
|
|
266
|
+
});
|
|
267
|
+
iReckon(sir, betaDepsAreEqual).asTo('beta dependencies are fully synced').isGonnaBeTrue();
|
|
268
|
+
}
|
|
269
|
+
});
|
|
270
|
+
await ifWe(sir, 'sessionIdentity evolved the expected number of times', async () => {
|
|
271
|
+
const latestS = peer.currentSessionIdentity;
|
|
272
|
+
iReckon(sir, latestS).asTo('latest session identity exists').isGonnaBeTruthy();
|
|
273
|
+
if (latestS) {
|
|
274
|
+
console.log("ACTUAL SESSION IDENTITY N:", latestS.data?.n);
|
|
275
|
+
iReckon(sir, latestS.data?.n).asTo('session identity data.n').isGonnaBe(3);
|
|
276
|
+
}
|
|
277
|
+
});
|
|
278
|
+
await ifWe(sir, 'sender durable space has I (evolved frame)', async () => {
|
|
279
|
+
const latestSenderIdentityAddr = await metaspace.getLatestAddr({
|
|
280
|
+
addr: getIbGibAddr({ ibGib: r1_senderIdentity_v0_source }),
|
|
281
|
+
space: sourceSpace,
|
|
282
|
+
});
|
|
283
|
+
iReckon(sir, latestSenderIdentityAddr).asTo('latestSenderIdentityAddr exists').isGonnaBeTruthy();
|
|
284
|
+
if (latestSenderIdentityAddr) {
|
|
285
|
+
const resGetSourceI = await getFromSpace({ space: sourceSpace, addr: latestSenderIdentityAddr });
|
|
286
|
+
iReckon(sir, resGetSourceI.success && resGetSourceI.ibGibs?.length === 1).asTo('evolved I exists in sourceSpace').isGonnaBeTrue();
|
|
287
|
+
if (resGetSourceI.success && resGetSourceI.ibGibs?.[0]) {
|
|
288
|
+
const evolvedI = resGetSourceI.ibGibs[0];
|
|
289
|
+
iReckon(sir, evolvedI.data?.n).asTo('evolved I data.n').isGonnaBe(1);
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
});
|
|
293
|
+
await ifWe(sir, 'receiver durable space has I (evolved frame)', async () => {
|
|
294
|
+
const latestSenderIdentityAddr = await metaspace.getLatestAddr({
|
|
295
|
+
addr: getIbGibAddr({ ibGib: r1_senderIdentity_v0_source }),
|
|
296
|
+
space: sourceSpace,
|
|
297
|
+
});
|
|
298
|
+
iReckon(sir, latestSenderIdentityAddr).asTo('latestSenderIdentityAddr exists').isGonnaBeTruthy();
|
|
299
|
+
if (latestSenderIdentityAddr) {
|
|
300
|
+
const resGetDestI = await getFromSpace({ space: destSpace, addr: latestSenderIdentityAddr });
|
|
301
|
+
iReckon(sir, resGetDestI.success && resGetDestI.ibGibs?.length === 1).asTo('evolved I exists in destSpace').isGonnaBeTrue();
|
|
302
|
+
if (resGetDestI.success && resGetDestI.ibGibs?.[0]) {
|
|
303
|
+
const evolvedI = resGetDestI.ibGibs[0];
|
|
304
|
+
iReckon(sir, evolvedI.data?.n).asTo('evolved I data.n').isGonnaBe(1);
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
});
|
|
308
|
+
await ifWe(sir, 'session keystone dependency graphs are equivalent on source and dest', async () => {
|
|
309
|
+
const latestS = peer.currentSessionIdentity;
|
|
310
|
+
iReckon(sir, latestS).asTo('latestS exists').isGonnaBeTruthy();
|
|
311
|
+
if (latestS) {
|
|
312
|
+
const depGraphSource = await getDependencyGraph({ ibGib: latestS, space: sourceSpace });
|
|
313
|
+
const depGraphDest = await getDependencyGraph({ ibGib: latestS, space: destSpace });
|
|
314
|
+
const equal = graphsAreEquivalent({ graphA: depGraphSource, graphB: depGraphDest });
|
|
315
|
+
iReckon(sir, equal).asTo('session graphs are equivalent').isGonnaBeTrue();
|
|
316
|
+
}
|
|
317
|
+
});
|
|
318
|
+
});
|
|
319
|
+
});
|
|
320
|
+
}
|
|
321
|
+
});
|
|
322
|
+
//# sourceMappingURL=sync-conflict-basic-multitimelines.withid.respec.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-conflict-basic-multitimelines.withid.respec.mjs","sourceRoot":"","sources":["../../src/sync/sync-conflict-basic-multitimelines.withid.respec.mts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-conflict-text-merge.withid.respec.d.mts","sourceRoot":"","sources":["../../src/sync/sync-conflict-text-merge.withid.respec.mts"],"names":[],"mappings":"AAAA;;;;GAIG"}
|