@ibgib/core-gib 0.1.28 → 0.1.30

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

@@ -4,30 +4,22 @@
 
 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';
-import { isDna } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../../../core-constants.mjs';
 import { IbGibSpaceAny } from '../../../witness/space/space-base-v1.mjs';
 import { SyncPeer_V1 } from '../sync-peer-v1.mjs';
-import { getFromSpace, putInSpace, registerNewIbGib } from '../../../witness/space/space-helper.mjs';
+import { putInSpace, registerNewIbGib } from '../../../witness/space/space-helper.mjs';
 import { SyncSagaContextIbGib_V1, } from '../../sync-saga-context/sync-saga-context-types.mjs';
 import { SyncPeerInnerspaceData_V1, SyncPeerInnerspaceIbGib_V1, SyncPeerInnerspaceOptions, SyncPeerInnerspaceRel8ns_V1 } from './sync-peer-innerspace-types.mjs';
 import { MetaspaceService } from '../../../witness/space/metaspace/metaspace-types.mjs';
 import { SyncSagaCoordinator } from '../../sync-saga-coordinator.mjs';
-import { IbGibSpaceResultData } from '../../../witness/space/space-types.mjs';
 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 { getExecutionContext, getSyncSagaFrameDependencyGraph, putInSpace_dnasThenNonDnas } from '../../sync-helpers.mjs';
-import { splitPerTjpAndOrDna, toDto } from '../../../common/other/ibgib-helper.mjs';
-import { SyncExecutionContext } from '../../sync-types.mjs';
+import { getSyncSagaFrameDependencyGraph, putInSpace_dnasThenNonDnas } from '../../sync-helpers.mjs';
+import { toDto } from '../../../common/other/ibgib-helper.mjs';
 
 
-const logalot = GLOBAL_LOG_A_LOT || true;
-const logalotControlDomain = true;
+const logalot = GLOBAL_LOG_A_LOT;
+const logalotControlDomain = false;
 const lcControlDomain = '[ControlDomain]';
 
 /**
@@ -112,6 +104,8 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
     protected async sendContextRequest(context: SyncSagaContextIbGib_V1): Promise<SyncSagaContextIbGib_V1 | undefined> {
         const lc = `${this.lc}[${this.sendContextRequest.name}]`;
         try {
+            if (logalot) { console.log(`${lc} starting... (I: bab87f15dea77cd4892bd8a8d2e65826)`); }
+
             if (!this.opts) { throw new Error(`(UNEXPECTED) this.opts falsy? (E: d8b1348e3233810128999596b1fa5826)`); }
 
             const {
@@ -141,7 +135,7 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             // let localTempSpace: IbGibSpaceAny;
             // let remoteSpace: IbGibSpaceAny;
             // let remoteTempSpace: IbGibSpaceAny;
-            // if (getExecutionContext({ sagaFrame: context.sagaFrame }) === SyncExecutionContext.sender) {
+            // if (getSyncSagaFrameOrigin({ sagaFrame: context.sagaFrame }) === SyncSagaFrameOrigin.sender) {
             //     localSpace = senderSpace;
             //     localTempSpace = senderTempSpace;
             //     remoteSpace = receiverSpace;
@@ -173,6 +167,7 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             const payloadIbGibsControl = [
                 ...identities, msg, sagaFrame, context
             ].map(x => toDto({ ibGib: x }));
+            if (logalot) { console.log(`${lc} putting into receiverSpace: ${receiverSpace.ib} (I: 1ba18b14a26bdd0e7800da4812898826)`); }
             await putInSpace({
                 ibGibs: payloadIbGibsControl,
                 space: receiverSpace,
@@ -187,6 +182,7 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             }
 
             if (context.payloadIbGibsDomain && context.payloadIbGibsDomain.length > 0) {
+                if (logalot) { console.log(`${lc} putting into receiverTempSpace: ${receiverTempSpace.ib} (I: d0cea920b818393d68118bc8a1515526)`); }
                 await putInSpace_dnasThenNonDnas({
                     ibGibs: context.payloadIbGibsDomain,
                     space: receiverTempSpace,
@@ -249,6 +245,17 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             }
 
             // spin off the payloads, as that may take a long time
+            if (responseCtx.payloadIbGibsDomain?.length ?? 0 > 0) {
+                // i guess this only will hit once we have conflicts, because
+                // it's the return trip, i.e., from the receiver. The initial
+                // ack frame does it through push offers?
+                await delay(2000);
+                console.warn(`${lc} this delay does hit (W: 3940d47d2a7433833837af4cef171126)`)
+                for (let i = 0; i < 100; i++) {
+                    const element = 100;
+                    console.log(`THIS HITS`)
+                }
+            }
             const payloadIbGibsDomain_response = responseCtx.payloadIbGibsDomain;
             if (payloadIbGibsDomain_response) {
                 new Promise<void>(async (resolve, reject) => {
@@ -257,13 +264,12 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
                         if (logalot) { console.log(`${lcPut} starting... (I: 4133e736b4c80d2cf94448b87b206826)`); }
 
                         // 2 seconds...i want to see huge blocks of logs entries for this to see this happening
-                        const delayMs = 200;
+                        const delayMs = 2000;
                         for (let i = 0; i < 10; i++) {
                             console.warn(`${lc} ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)`)
                             await delay(delayMs);
                         }
 
-
                         await putInSpace_dnasThenNonDnas({
                             ibGibs: payloadIbGibsDomain_response,
                             space: senderTempSpace,
@@ -289,52 +295,9 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
         } catch (error) {
             console.error(`${lc} ${extractErrorMsg(error)}`);
             throw error;
-        }
-    }
-
-    /**
-     * Helper to copy single ibgib from A to B.
-     */
-    protected async transfer({
-        addrs,
-        from,
-        to
-    }: {
-        addrs: IbGibAddr[],
-        from: IbGibSpaceAny,
-        to: IbGibSpaceAny
-    }): Promise<void> {
-        const lc = `${this.lc}[${this.transfer.name}]`;
-        try {
-            if (logalot) { console.log(`${lc} starting... (I: f1145dc75a461afc885efe984f08d426)`); }
-
-            console.error(`${lc} NAG ERROR (DOES NOT THROW): This needs to be adapted to be able to pull from multiple spaces. IOW, the 'from' param should be an array of spaces. This is because we need to be checking both durable and temp spaces when querying. (E: 823f3856b8b82ece080868e85ded0826)`)
-
-            // 1. Get from Source
-            const resGet = await getFromSpace({ space: from, addrs });
-            if (!resGet.success || !resGet.ibGibs || resGet.ibGibs.length !== addrs.length) {
-                if (!resGet.rawResultIbGib) { throw new Error(`(UNEXPECTED) resGet.rawResultIbGib falsy? (E: b829f827a378890bcf7dc3d41c908826)`); }
-                if (!resGet.rawResultIbGib.data) { throw new Error(`(UNEXPECTED) resGet.rawResultIbGib.data falsy? (E: 8d15341d8fa8fc96297425e3c6e39226)`); }
-                const data = resGet.rawResultIbGib.data as IbGibSpaceResultData;
-
-                throw new Error(`${lc} Failed to get all ${addrs} from source space ${from.ib}. resGet.errorMsg: ${resGet.errorMsg}. failed info: ${JSON.stringify(data)} (E: 4ed3383573382920c80054d7c1024626)`);
-            }
-            const ibGibs = resGet.ibGibs.concat();
-
-            // 2. Put in Dest
-            // Note: putInSpace handles existence check usually, or we can check.
-            const resPut = await putInSpace({ space: to, ibGibs });
-            if (resPut.success) {
-                console.error(`${lc} NAG ERROR: (SORT OF AN ERROR, DID NOT THROW): is the sync peer responsible for calling registerNewIbGib?? I'm not sure at this point if that is true, rather, I think that it probably is NOT responsible for this. But I'm putting this error msg as a nag message until this is resolved. (E: 00086833e294ee834800046801c47826) `);
-            } else {
-                throw new Error(`ERROR: successfully got addrs (${addrs}) from space (${from.ib}), BUT failed to put into space (${to.ib}). resPut.errorMsg: ${resPut.errorMsg}. timedOut: ${resPut.timedOut}. (E: c1044e14cc1db72d28a2240819dab826)`);
-            }
-        } catch (error) {
-            console.error(`${lc} ${extractErrorMsg(error)}`);
-            throw error;
         } finally {
             if (logalot) { console.log(`${lc} complete.`); }
         }
-
     }
+
 }

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

@@ -21,8 +21,8 @@ import { newupSubject } from '../../common/pubsub/subject/subject-helper.mjs';
 import { authenticateContext, authorizeContext, validateContextAndSagaFrame } from '../sync-saga-context/sync-saga-context-helpers.mjs';
 import { getFromSpace } from '../../witness/space/space-helper.mjs';
 
-const logalot = GLOBAL_LOG_A_LOT || true;
-const logalotControlDomain = true;
+const logalot = GLOBAL_LOG_A_LOT;
+const logalotControlDomain = false;
 const lcControlDomain = '[ControlDomain]';
 
 /**