@omegup/msync 0.1.23 → 0.1.25

package/index.esm.js

@@ -2002,20 +2002,20 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
                 whenMatched: link().with($replaceWith_(ite(eq(root().of('before').expr())(ctx()('new').of('after').expr()), root().expr(), mergeObjects(root().expr(), ctx()('new').expr())))).stages,
                 whenNotMatched: 'insert',
             })).stages;
+            const stream = await makeStream();
             const r = await aggregate(pdb, streamName, c => c({ coll: collection, input: cloneIntoNew }));
             const start = Date.now();
             const res = await snapshotCollection.deleteMany({ updated: true, after: null, before: null });
             log('deleting from cloned into new collection', Date.now() - start, res, `db['${snapshotCollection.collectionName}'].deleteMany({ updated: true, after: null, before: null })`);
-            return next(step4({ result: r, ts: lastTS?.ts }), 'run the aggregation');
+            return next(step4({ result: r, ts: lastTS?.ts, stream }), 'run the aggregation');
         };
         const makeStream = () => makeWatchStream(view, streamName);
-        const step4 = ({ result, ts }) => async () => {
+        const step4 = ({ result, ts, stream }) => async () => {
             const start = Date.now();
             log('snapshot', streamName, 'ensure before null', Date.now() - start);
             const first = ts === undefined;
             const stages = finalInput.raw(first);
             await last.updateOne({ _id: streamName }, { $set: { job: 1 } }, { upsert: true });
-            const stream = await makeStream();
             const nextRes = stream.tryNext();
             const aggResult = await aggregate(pdb, streamName, c => c({
                 coll: snapshotCollection,
@@ -2154,13 +2154,11 @@ const executes$1 = (view, input, streamName, needs) => {
                 partialFilterExpression: { deletedAt: { $eq: null } },
                 name: 'touchedAt_' + new UUID().toString('base64'),
             });
-            log('start stream', { streamName, data });
-            await last.findOne();
-            console.log('got last update');
-            const p = last.findOne({ _id: streamName, data });
-            await p;
             log('stream started', { streamName, data });
-            const ts = await Promise.all([p, last.findOne({ _id: streamName })]);
+            const ts = await Promise.all([
+                last.findOne({ _id: streamName, data }),
+                last.findOne({ _id: streamName }),
+            ]);
             log('got last update', { streamName, ts });
             return next(step2_5(ts), 'handle teardown');
         };
@@ -2194,11 +2192,11 @@ const executes$1 = (view, input, streamName, needs) => {
         const step4 = (lastTS) => async () => {
             const raw = stages(lastTS).with(finalInput.raw(lastTS === null)).stages;
             const stream = await makeStream();
+            const nextRes = stream.tryNext();
             const aggResult = await aggregate(pdb, streamName, c => c({
                 coll: collection,
                 input: raw,
             }));
-            const nextRes = stream.tryNext();
             return next(step7({ aggResult, ts: aggResult.cursor.atClusterTime, stream, nextRes }), 'update __last', () => stream.close());
         };
         const step7 = (l) => async () => {

package/index.js

@@ -2004,20 +2004,20 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
                 whenMatched: link().with($replaceWith_(ite(eq(root().of('before').expr())(ctx()('new').of('after').expr()), root().expr(), mergeObjects(root().expr(), ctx()('new').expr())))).stages,
                 whenNotMatched: 'insert',
             })).stages;
+            const stream = await makeStream();
             const r = await aggregate(pdb, streamName, c => c({ coll: collection, input: cloneIntoNew }));
             const start = Date.now();
             const res = await snapshotCollection.deleteMany({ updated: true, after: null, before: null });
             log('deleting from cloned into new collection', Date.now() - start, res, `db['${snapshotCollection.collectionName}'].deleteMany({ updated: true, after: null, before: null })`);
-            return next(step4({ result: r, ts: lastTS?.ts }), 'run the aggregation');
+            return next(step4({ result: r, ts: lastTS?.ts, stream }), 'run the aggregation');
         };
         const makeStream = () => makeWatchStream(view, streamName);
-        const step4 = ({ result, ts }) => async () => {
+        const step4 = ({ result, ts, stream }) => async () => {
             const start = Date.now();
             log('snapshot', streamName, 'ensure before null', Date.now() - start);
             const first = ts === undefined;
             const stages = finalInput.raw(first);
             await last.updateOne({ _id: streamName }, { $set: { job: 1 } }, { upsert: true });
-            const stream = await makeStream();
             const nextRes = stream.tryNext();
             const aggResult = await aggregate(pdb, streamName, c => c({
                 coll: snapshotCollection,
@@ -2156,13 +2156,11 @@ const executes$1 = (view, input, streamName, needs) => {
                 partialFilterExpression: { deletedAt: { $eq: null } },
                 name: 'touchedAt_' + new mongodb.UUID().toString('base64'),
             });
-            log('start stream', { streamName, data });
-            await last.findOne();
-            console.log('got last update');
-            const p = last.findOne({ _id: streamName, data });
-            await p;
             log('stream started', { streamName, data });
-            const ts = await Promise.all([p, last.findOne({ _id: streamName })]);
+            const ts = await Promise.all([
+                last.findOne({ _id: streamName, data }),
+                last.findOne({ _id: streamName }),
+            ]);
             log('got last update', { streamName, ts });
             return next(step2_5(ts), 'handle teardown');
         };
@@ -2196,11 +2194,11 @@ const executes$1 = (view, input, streamName, needs) => {
         const step4 = (lastTS) => async () => {
             const raw = stages(lastTS).with(finalInput.raw(lastTS === null)).stages;
             const stream = await makeStream();
+            const nextRes = stream.tryNext();
             const aggResult = await aggregate(pdb, streamName, c => c({
                 coll: collection,
                 input: raw,
             }));
-            const nextRes = stream.tryNext();
             return next(step7({ aggResult, ts: aggResult.cursor.atClusterTime, stream, nextRes }), 'update __last', () => stream.close());
         };
         const step7 = (l) => async () => {

package/package.json

@@ -3,7 +3,7 @@
     "module": "index.esm.js",
     "typings": "index.d.ts",
     "name": "@omegup/msync",
-    "version": "0.1.23",
+    "version": "0.1.25",
     "dependencies": {
         "dayjs": "^1.11.9",
         "dotenv": "^16.3.1",