@ibgib/core-gib 0.1.27 → 0.1.28

package/src/sync/sync-saga-message/sync-saga-message-types.mts

@@ -6,6 +6,7 @@ import { SyncStage } from "../sync-constants.mjs";
 import { SyncMode, SyncConflictStrategy, } from "../sync-types.mjs";
 import { SYNC_SAGA_MSG_ATOM } from "./sync-saga-message-constants.mjs";
 import type { getDeltaDependencyGraph } from '../../common/other/graph-helper.mjs';
+import type { SyncSagaContextIbGib_V1, SyncSagaContextData_V1 } from '../sync-saga-context/sync-saga-context-types.mjs';
 
 export interface SyncSagaMessageIb_V1 {
     atom: typeof SYNC_SAGA_MSG_ATOM;
@@ -145,28 +146,16 @@ export interface SyncSagaConflictInfo {
 export interface SyncSagaMessageAckData_V1 extends SyncSagaMessageData_V1 {
     stage: typeof SyncStage.ack;
     deltaRequestAddrInfos: SyncSagaRequestAddrInfo[];
-    pushOfferInfos: SyncSagaPushOfferInfo[];
     /**
-     * Map of group keys (TJP addr/constant addr) to list of known addresses
-     * in that timeline.
-     *
-     * This will be used by Sender to calculate differential payloads. So
-     * when the sender goes to get the dependency graph of its tip ibgib,
-     * it can skip all of the addrs in this.
-     *
-     * For example, say sender has A^5 and receiver only has A^3. Sender
-     * will see in this map { [A^0]: [A^0, A^1, A^2, A^3] } and know that
-     * it needs all of the dependencies of A^5 (including A^4), but it does
-     * NOT need to send A^0-A^3 (and dependencies) because receiver already has
-     * these.
+     * Infos regarding ibgibs that the receiver (generator of this ack)
+     * knows/believes that the sender does NOT have (after looking at knowledge
+     * vector of sender).
      *
-     * ## notes
+     * This includes addrs that will correspond to the context.payloadAddrsDomain
      *
-     * I dislike this name in my rewrite/cleanup of this algorithm. However, I'm
-     * keeping it and am using it right now in handleInitFrame for including
-     * the receiver's latest addr/tip for the deltaReqAddrs. But really, I should
+     * ## note
      */
-    // knowledgeVector?: { [tjpAddr: string]: string[] };
+    pushOfferInfos: SyncSagaPushOfferInfo[];
     /**
      * List of identified conflicts.
      *
@@ -194,6 +183,12 @@ export interface SyncSagaMessageDeltaData_V1 extends SyncSagaMessageData_V1 {
     /**
      * Domain ibgib addresses (actual user data being synced).
      * These go to tempSpace ONLY until final commit.
+     *
+     * NOTE: There is also a payloadAddrsDomain on the actual context itself on
+     * {@link SyncSagaContextData_V1}.
+     * NOTE: There is also payload info in {@link SyncSagaMessageAckData_V1}
+     * in {@link SyncSagaMessageAckData_V1.pushOfferInfos}. Not quite as elegant
+     * as I want it to be but there ya go.
      */
     payloadAddrsDomain?: string[];
 }

package/src/sync/sync-types.mts

@@ -9,7 +9,7 @@ import { IbGibSpaceAny } from "../witness/space/space-base-v1.mjs";
 import { MetaspaceService } from "../witness/space/metaspace/metaspace-types.mjs";
 import { SyncPeerWitness } from "./sync-peer/sync-peer-types.mjs";
 import { FlatIbGibGraph } from "../common/other/graph-types.mjs";
-import { SyncSagaConflictInfo } from "./sync-saga-message/sync-saga-message-types.mjs";
+import { SyncSagaConflictInfo, SyncSagaMessageIbGib_V1 } from "./sync-saga-message/sync-saga-message-types.mjs";
 
 
 // #region SyncMode
@@ -94,14 +94,13 @@ export function isValidSyncExecutionContext(executionContext: string): execution
 export interface NextSagaFrameInfo_Frame {
     frame: SyncIbGib_V1;
     payloadIbGibsDomain?: IbGib_V1[];
-    // conflictInfos?: SyncSagaConflictInfo;
-    responseWasNull?: undefined;
+    sagaComplete?: undefined;
 }
-export interface NextSagaFrameInfo_Null {
+export interface NextSagaFrameInfo_SagaComplete {
     frame?: never;
     payloadIbGibsDomain?: never;
     conflictInfos?: never;
-    responseWasNull: true;
+    sagaComplete: true;
 }
 /**
  * Result of handling a saga frame.
@@ -112,7 +111,7 @@ export interface NextSagaFrameInfo_Null {
  * defined, thus the discriminated union type.
  */
 export type NextSagaFrameInfo =
-    NextSagaFrameInfo_Frame | NextSagaFrameInfo_Null;
+    NextSagaFrameInfo_Frame | NextSagaFrameInfo_SagaComplete;
 
 
 export interface HandleSagaResponseContextResult_Base {
@@ -207,7 +206,8 @@ export interface SyncSagaInfo {
 
 export interface SyncSagaFrameDependencyGraph {
     sagaIbGib: SyncIbGib_V1;
-    msgStones: IbGib_V1[];
+    // msgStones: IbGib_V1[];
+    msgStones: SyncSagaMessageIbGib_V1[];
     identities: KeystoneIbGib_V1[];
 }