@ibgib/core-gib 0.1.26 → 0.1.27

package/src/sync/sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mts

@@ -2,7 +2,7 @@
  * @module SyncPeerInnerspace_V1
  */
 
-import { delay, extractErrorMsg, unique } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { delay, extractErrorMsg, pretty, unique } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
 import { IbGib_V1, IbGibData_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
@@ -21,8 +21,9 @@ import { InitializeSyncPeerOpts } from '../sync-peer-types.mjs';
 import { getSyncSagaMessageFromFrame } from '../../sync-saga-message/sync-saga-message-helpers.mjs';
 import { SYNC_STAGE_VALID_VALUES, SyncStage } from '../../sync-constants.mjs';
 import { SyncSagaMessageAckData_V1, SyncSagaMessageCommitData_V1, SyncSagaMessageData_V1, SyncSagaMessageDeltaData_V1, SyncSagaMessageInitData_V1 } from '../../sync-saga-message/sync-saga-message-types.mjs';
-import { getSyncSagaFrameDependencyGraph, putInSpace_dnasThenNonDnas } from '../../sync-helpers.mjs';
+import { getExecutionContext, getSyncSagaFrameDependencyGraph, putInSpace_dnasThenNonDnas } from '../../sync-helpers.mjs';
 import { splitPerTjpAndOrDna, toDto } from '../../../common/other/ibgib-helper.mjs';
+import { SyncExecutionContext } from '../../sync-types.mjs';
 
 
 const logalot = GLOBAL_LOG_A_LOT || true;
@@ -133,8 +134,25 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             if (!sagaFrame.data) { throw new Error(`(UNEXPECTED) sagaFrame.data falsy? (E: f30e290a8b770e1b387377420ea73a26)`); }
             if (!sagaFrame.rel8ns) { throw new Error(`(UNEXPECTED) sagaFrame.rel8ns falsy? (E: f888caa698b8cf6b4893b7fd6df09726)`); }
             if (!receiverTempSpace) { throw new Error(`(UNEXPECTED) receiverTempSpace falsy? (E: 3b46d838f6fc645c58b29215bfddb826)`); }
+            if (!senderTempSpace) { throw new Error(`(UNEXPECTED) senderTempSpace falsy? (E: b187a8f913c2295ae90d7ae2b47b6a26)`); }
             // #endregion sanity validation assertions
 
+            // let localSpace: IbGibSpaceAny;
+            // let localTempSpace: IbGibSpaceAny;
+            // let remoteSpace: IbGibSpaceAny;
+            // let remoteTempSpace: IbGibSpaceAny;
+            // if (getExecutionContext({ sagaFrame: context.sagaFrame }) === SyncExecutionContext.sender) {
+            //     localSpace = senderSpace;
+            //     localTempSpace = senderTempSpace;
+            //     remoteSpace = receiverSpace;
+            //     remoteTempSpace = receiverTempSpace;
+            // } else {
+            //     localSpace = receiverSpace;
+            //     localTempSpace = receiverTempSpace;
+            //     remoteSpace = senderSpace;
+            //     remoteTempSpace = senderSpace;
+            // }
+
             const { sagaIbGib: _alreadyHave, msgStones, identities } = await getSyncSagaFrameDependencyGraph({
                 sagaIbGib: sagaFrame,
                 localSpace: senderSpace,
@@ -184,27 +202,31 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             // the payload ibgibs. so the receiver coordinator should be ready
             // to do its thing.
 
-            const responseCtx = await receiverCoordinator.receiverContinueSync({
+            const responseCtx = await receiverCoordinator.continueSync({
                 sagaContext: context,
                 metaspace: receiverMetaspace,
                 mySpace: receiverSpace,
                 myTempSpace: receiverTempSpace,
             });
 
+            if (logalot) { console.log(`${lc} receiverCoordinator.continueSync responseCtx: ${responseCtx ? pretty(responseCtx) : 'undefined'} (I: fb2831decde1f2b3589021f85ab19126)`); }
+
             if (!responseCtx) {
                 if (logalot) { console.log(`${lc} receiver produced undefined response context. (I: 2e1888ffc9e836689d5b171887c36d26)`); }
                 return undefined; /* <<<< returns early */
             }
 
             // at this point, we have received the full response from the
-            // receiver coordinator. Put the response's control ibgibs in the
-            // sender's durable space (but don't register them), spin off the
-            // process of any response payloads, and return the context.
+            // receiver coordinator. That coordinator has put the control ibgibs
+            // in its durable space. Now we need to put the response's control
+            // ibgibs in the sender's durable space (register them??), spin off
+            // the process of any response payloads, and return the context.
 
+            // get control ibgibs from the receiver space...
             const { msgStones: msgStonesResponse, identities: identitiesResponse } =
                 await getSyncSagaFrameDependencyGraph({
                     sagaIbGib: responseCtx.sagaFrame,
-                    localSpace: senderSpace,
+                    localSpace: receiverSpace,
                 });
             if (msgStonesResponse.length !== 1) { throw new Error(`(UNEXPECTED) msgStonesResponse.length !== 1? we're only geared for a single msg stone that is always present (not 0, not greater than 1) (E: 2d3138ed130f1aca116551889483e826)`); }
             const msgResponse = msgStonesResponse[0];
@@ -212,6 +234,7 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             const responsePayloadIbGibsControl = [
                 ...identities, msgResponse, responseCtx.sagaFrame, context
             ].map(x => toDto({ ibGib: x }));
+            // ...put into sender's durable space
             await putInSpace({
                 ibGibs: responsePayloadIbGibsControl,
                 space: senderSpace,
@@ -240,7 +263,6 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
                             await delay(delayMs);
                         }
 
-                        if (!senderTempSpace) { throw new Error(`(UNEXPECTED) senderTempSpace falsy? (E: b187a8f913c2295ae90d7ae2b47b6a26)`); }
 
                         await putInSpace_dnasThenNonDnas({
                             ibGibs: payloadIbGibsDomain_response,

package/src/sync/sync-peer/sync-peer-v1.mts

@@ -189,6 +189,8 @@ export abstract class SyncPeer_V1<TInitializeOpts extends InitializeSyncPeerOpts
 
             // at this point, we have a valid, authenticated, authorized context
 
+            await this.ensureReceiverTempSpace();
+
             // execute the transfer of control domain ibgibs & outgoing payload
             // ibgibs...
             const response = await this.sendContextRequest(context);

package/src/sync/sync-saga-context/sync-saga-context-helpers.mts

@@ -60,9 +60,10 @@ export async function getSyncSagaContextIb({
         if (!data) { throw new Error(`data required (E: 839d82138c234b3e89582855594191fe)`); }
 
         const payloadCount = data['@payloadAddrsDomain'] ? data['@payloadAddrsDomain'].length : 0;
-        // sync_sagacontext cmd
+
         const ib = [
             SYNC_SAGA_CONTEXT_ATOM,
+            data.sagaN,
             payloadCount,
         ].join(' ');
 
@@ -89,6 +90,7 @@ export async function parseSyncSagaContextIb({
         }
         const [
             atom,
+            sagaNStr,
             payloadCountStr,
         ] = parts;
 
@@ -96,13 +98,19 @@ export async function parseSyncSagaContextIb({
             throw new Error(`Atom mismatch. Expected ${SYNC_SAGA_CONTEXT_ATOM}. Got ${atom}. (E: 67d71fc0f8d04840b178652309f471f5)`);
         }
 
+        if (!sagaNStr) { throw new Error(`invalid ib. second piece should be sagaN but is falsy (E: 081ed475aeb8fe25a66f60466b2e5826)`); }
+        const sagaN = parseInt(sagaNStr);
+        if (isNaN(sagaN)) {
+            throw new Error(`sagaNStr is not a number. (E: 3d6b580d5a48c5e03ecec288896e2826)`);
+        }
+
         if (!payloadCountStr) { throw new Error(`invalid ib. second piece should be payloadCount but is falsy (E: 0bb7580793d800ca02227828a7294826)`); }
         const payloadCount = parseInt(payloadCountStr);
         if (isNaN(payloadCount)) {
             throw new Error(`payloadCountStr is not a number. (E: 49457814282a44069871630987588722)`);
         }
 
-        return { atom, payloadCount };
+        return { atom, sagaN, payloadCount };
     } catch (error) {
         console.error(`${lc} ${extractErrorMsg(error)}`);
         throw error;
@@ -130,6 +138,9 @@ export async function createSyncSagaContext({
     try {
         if (logalot) { console.log(`${lc} starting... (I: 6b87bee313e811d1d2fc90e87fbec826)`); }
 
+        if (!sagaFrame.data) { throw new Error(`(UNEXPECTED) sagaFrame.data falsy? (E: 04c49b4cccba6842a8b52e4c6f570726)`); }
+        if (!sagaFrame.data.n && sagaFrame.data.n !== 0) { throw new Error(`(UNEXPECTED) sagaFrame.data.n falsy and not 0? (E: 45b508da64a8b28428b11765d684b826)`); }
+
         const date = new Date();
         const timestamp = getTimestamp(date);
         const timestampMs = date.getMilliseconds();
@@ -137,6 +148,7 @@ export async function createSyncSagaContext({
         const data: SyncSagaContextData_V1 = {
             timestamp,
             timestampMs,
+            sagaN: sagaFrame.data.n,
         };
 
         // Domain Payloads

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

@@ -11,6 +11,10 @@ import { SYNC_SAGA_CONTEXT_ATOM } from './sync-saga-context-constants.mjs';
 
 export interface SyncSagaContextIb_V1 {
     atom: typeof SYNC_SAGA_CONTEXT_ATOM;
+    /**
+     * sagaFrame.data.n value
+     */
+    sagaN: number;
     /**
      * simple metadata count of data["@payloadAddrsDomain"]
      */
@@ -21,6 +25,10 @@ export interface SyncSagaContextIb_V1 {
  * Data payload for the Sync Saga Context.
  */
 export interface SyncSagaContextData_V1 extends IbGibData_V1 {
+    /**
+     * context's sagaFrame.data.n value
+     */
+    sagaN: number;
     /**
      * Payload data addresses for DOMAIN ibGibs (Timeline frames, user content).
      * Soft-linked via data property to avoid hard-linking graph dependencies.
@@ -35,7 +43,7 @@ export interface SyncSagaContextData_V1 extends IbGibData_V1 {
 export interface SyncSagaContextRel8ns_V1 extends IbGibRel8ns_V1 {
     /**
      * The primary Saga Frame being transported (Init, Ack, Delta, etc.).
-     * 
+     *
      * Should be a single addr.
      */
     sagaFrame: IbGibAddr[];
@@ -43,9 +51,9 @@ export interface SyncSagaContextRel8ns_V1 extends IbGibRel8ns_V1 {
     /**
      * The Ephemeral Session Keystone Identity used for this saga.
      * Required for validating the saga frame signature.
-     * 
+     *
      * ## notes
-     * 
+     *
      * This will be different for the sender and receiver, yes? hmm...
      * I think I need to put "sender" or "receiver" in the session keystone ib.
      */
@@ -59,7 +67,7 @@ export interface SyncSagaContextRel8ns_V1 extends IbGibRel8ns_V1 {
 export interface SyncSagaContextIbGib_V1 extends IbGib_V1<SyncSagaContextData_V1, SyncSagaContextRel8ns_V1> {
     /**
      * Domain ibgibs - OUTBOUND only.
-     * 
+     *
      * For inbound, the domain payload ibgibs are streamed via observable in the
      * peer.
      */
@@ -67,7 +75,7 @@ export interface SyncSagaContextIbGib_V1 extends IbGib_V1<SyncSagaContextData_V1
 
     /**
      * Reference to the actual sync saga frame that this context conveys.
-     * 
+     *
      * This frame's addr should be {@link SyncSagaContextRel8ns_V1.sagaFrame}.
      */
     sagaFrame: SyncIbGib_V1;