npm - @omegup/msync - Versions diffs - 0.0.53 → 0.0.55 - Mend

@omegup/msync 0.0.53 → 0.0.55

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.

Files changed (3) hide show

package/index.esm.js CHANGED Viewed

@@ -1113,7 +1113,7 @@ const createIndex = async (collection, indexSpec, options) => {
             await collection.createIndex(indexSpec, options);
         }
         catch (e) {
-            if (e.code == 85) {
+            if ([85, 276].includes(e.code)) {
                 break;
             }
             if (e.code == 12587) {
@@ -1392,8 +1392,9 @@ const aggregate = (streamName, input, snapshot = true, start = Date.now()) => in
     };
     log('exec', streamName, req);
     return coll.s.db.command(req).then(result => {
-        log('execed', streamName, req, result, 'took', Date.now() - start);
-        return result;
+        const r = result;
+        log('execed', streamName, (replace) => replace(JSON.stringify(req).replaceAll('$$CLUSTER_TIME', JSON.stringify(r.cursor.atClusterTime))), result, 'took', Date.now() - start);
+        return r;
     }, err => {
         log('err', req, err);
         throw new Error(err);
@@ -1444,23 +1445,21 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
         },
     });
     pipeline.push({
-        $replaceWith: {
-            _id: "$_id",
-            ts: {
-                $cond: {
-                    if: {
-                        $or: [
-                            { $ne: ['$fullDocument', '$fullDocumentBeforeChange'] },
-                            { $and: changeKeys.map(k => ({ $eq: [k, null] })) },
-                        ],
-                    },
-                    then: '$clusterTime',
-                    else: null,
-                },
-            },
+        $match: {
+            $or: [
+                { $expr: { $ne: ['$fullDocument', '$fullDocumentBeforeChange'] } },
+                Object.fromEntries(changeKeys.map(k => [k, null])),
+            ],
+        },
+    });
+    pipeline.push({
+        $project: {
+            _id: 1,
         },
     });
-    const stream = db.collection(collection.collectionName).watch(pipeline, {
+    const stream = db
+        .collection(collection.collectionName)
+        .watch(pipeline, {
         fullDocument: 'required',
         fullDocumentBeforeChange: 'required',
         startAtOperationTime: startAt,
@@ -1536,6 +1535,8 @@ const executes$1 = (view, input, streamName) => {
             input: input.delta,
             finalInputFirst: finalInput.raw(true),
             finalInput: finalInput.raw(false),
+            match: view.match?.raw(root()).get(),
+            project: projection,
             teardown: finalInput.teardown((x) => ({
                 collection: x.collection.collectionName,
                 method: x.method,
@@ -1571,13 +1572,17 @@ const executes$1 = (view, input, streamName) => {
                 await Promise.all([snapshotCollection.drop(), action]);
                 log('teardown done', `db['${snapshotCollection.collectionName}'].drop()`, ...out);
             };
-            if (exists && !same)
+            if (exists && !same) {
                 await handleTeardown(exists);
-            return next(step3(same), 'clone into new collection');
+            }
+            return nextData([])(async () => {
+                await new Promise(resolve => setTimeout(resolve, 1000));
+                return step3(same)();
+            }, 'clone into new collection');
         };
         const step3 = (lastTS) => async () => {
             const hardQuery = $and(lastTS
-                ? root().of('touchedAt').has($gteTs(lastTS.ts))
+                ? root().of('touchedAt').has($gtTs(lastTS.ts))
                 : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch);
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);
             const query = match ? and(notDeleted, match) : notDeleted;
@@ -1655,11 +1660,7 @@ const executes$1 = (view, input, streamName) => {
                 log('restarting', err);
                 return { ts: null };
             })
-                .then(doc => doc
-                ? doc.ts
-                    ? next(step7({ ...l, ts: doc.ts }), 'nothing changed')
-                    : next(step2, 'restart')
-                : step8(l)), 'wait for change');
+                .then(doc => (doc ? next(step3({ _id: streamName, ts: l.ts }), 'restart') : step8(l))), 'wait for change');
         };
         return stop;
     };
@@ -1684,7 +1685,9 @@ const executes = (view, input, streamName) => {
         streamNames[streamName] = hash;
     else if (streamNames[streamName] != hash)
         throw new Error('streamName already used');
-    const { collection, projection, hardMatch, match } = view;
+    const { collection, projection, hardMatch: pre, match } = view;
+    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
+    const hardMatch = $and(pre, ...removeNotYetSynchronizedFields);
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
     db.command({
@@ -1715,6 +1718,8 @@ const executes = (view, input, streamName) => {
             input: input,
             finalInputFirst: finalInput.raw(true),
             finalInput: finalInput.raw(false),
+            match: view.match?.raw(root()).get(),
+            project: projection,
             teardown: finalInput.teardown((x) => ({
                 collection: x.collection.collectionName,
                 method: x.method,
@@ -1744,7 +1749,14 @@ const executes = (view, input, streamName) => {
             };
             if (exists && !same)
                 await handleTeardown(exists);
-            return next(step4(same), 'clone into new collection');
+            return {
+                cont: withStop(async () => {
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                    return step4(same)();
+                }),
+                data: [],
+                info: { debug: 'clone into new collection', job: undefined },
+            };
         };
         const makeStream = (startAt) => makeWatchStream(db, view, startAt, streamName);
         const step4 = (lastTS) => async () => {
@@ -1770,11 +1782,7 @@ const executes = (view, input, streamName) => {
                 info: { job: undefined, debug: 'wait for change' },
                 cont: withStop(() => l.stream
                     .tryNext()
-                    .then(doc => doc
-                    ? doc.ts
-                        ? next(step7({ ...l, ts: doc.ts }), 'nothing changed')
-                        : next(step1, 'restart')
-                    : step8(l))),
+                    .then(doc => (doc ? next(step4({ _id: streamName, ts: l.ts }), 'restart') : step8(l)))),
             };
         };
         return stop;

package/index.js CHANGED Viewed

@@ -1115,7 +1115,7 @@ const createIndex = async (collection, indexSpec, options) => {
             await collection.createIndex(indexSpec, options);
         }
         catch (e) {
-            if (e.code == 85) {
+            if ([85, 276].includes(e.code)) {
                 break;
             }
             if (e.code == 12587) {
@@ -1394,8 +1394,9 @@ const aggregate = (streamName, input, snapshot = true, start = Date.now()) => in
     };
     log('exec', streamName, req);
     return coll.s.db.command(req).then(result => {
-        log('execed', streamName, req, result, 'took', Date.now() - start);
-        return result;
+        const r = result;
+        log('execed', streamName, (replace) => replace(JSON.stringify(req).replaceAll('$$CLUSTER_TIME', JSON.stringify(r.cursor.atClusterTime))), result, 'took', Date.now() - start);
+        return r;
     }, err => {
         log('err', req, err);
         throw new Error(err);
@@ -1446,23 +1447,21 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
         },
     });
     pipeline.push({
-        $replaceWith: {
-            _id: "$_id",
-            ts: {
-                $cond: {
-                    if: {
-                        $or: [
-                            { $ne: ['$fullDocument', '$fullDocumentBeforeChange'] },
-                            { $and: changeKeys.map(k => ({ $eq: [k, null] })) },
-                        ],
-                    },
-                    then: '$clusterTime',
-                    else: null,
-                },
-            },
+        $match: {
+            $or: [
+                { $expr: { $ne: ['$fullDocument', '$fullDocumentBeforeChange'] } },
+                Object.fromEntries(changeKeys.map(k => [k, null])),
+            ],
+        },
+    });
+    pipeline.push({
+        $project: {
+            _id: 1,
         },
     });
-    const stream = db.collection(collection.collectionName).watch(pipeline, {
+    const stream = db
+        .collection(collection.collectionName)
+        .watch(pipeline, {
         fullDocument: 'required',
         fullDocumentBeforeChange: 'required',
         startAtOperationTime: startAt,
@@ -1538,6 +1537,8 @@ const executes$1 = (view, input, streamName) => {
             input: input.delta,
             finalInputFirst: finalInput.raw(true),
             finalInput: finalInput.raw(false),
+            match: view.match?.raw(root()).get(),
+            project: projection,
             teardown: finalInput.teardown((x) => ({
                 collection: x.collection.collectionName,
                 method: x.method,
@@ -1573,13 +1574,17 @@ const executes$1 = (view, input, streamName) => {
                 await Promise.all([snapshotCollection.drop(), action]);
                 log('teardown done', `db['${snapshotCollection.collectionName}'].drop()`, ...out);
             };
-            if (exists && !same)
+            if (exists && !same) {
                 await handleTeardown(exists);
-            return next(step3(same), 'clone into new collection');
+            }
+            return nextData([])(async () => {
+                await new Promise(resolve => setTimeout(resolve, 1000));
+                return step3(same)();
+            }, 'clone into new collection');
         };
         const step3 = (lastTS) => async () => {
             const hardQuery = $and(lastTS
-                ? root().of('touchedAt').has($gteTs(lastTS.ts))
+                ? root().of('touchedAt').has($gtTs(lastTS.ts))
                 : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch);
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);
             const query = match ? and(notDeleted, match) : notDeleted;
@@ -1657,11 +1662,7 @@ const executes$1 = (view, input, streamName) => {
                 log('restarting', err);
                 return { ts: null };
             })
-                .then(doc => doc
-                ? doc.ts
-                    ? next(step7({ ...l, ts: doc.ts }), 'nothing changed')
-                    : next(step2, 'restart')
-                : step8(l)), 'wait for change');
+                .then(doc => (doc ? next(step3({ _id: streamName, ts: l.ts }), 'restart') : step8(l))), 'wait for change');
         };
         return stop;
     };
@@ -1686,7 +1687,9 @@ const executes = (view, input, streamName) => {
         streamNames[streamName] = hash;
     else if (streamNames[streamName] != hash)
         throw new Error('streamName already used');
-    const { collection, projection, hardMatch, match } = view;
+    const { collection, projection, hardMatch: pre, match } = view;
+    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
+    const hardMatch = $and(pre, ...removeNotYetSynchronizedFields);
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
     db.command({
@@ -1717,6 +1720,8 @@ const executes = (view, input, streamName) => {
             input: input,
             finalInputFirst: finalInput.raw(true),
             finalInput: finalInput.raw(false),
+            match: view.match?.raw(root()).get(),
+            project: projection,
             teardown: finalInput.teardown((x) => ({
                 collection: x.collection.collectionName,
                 method: x.method,
@@ -1746,7 +1751,14 @@ const executes = (view, input, streamName) => {
             };
             if (exists && !same)
                 await handleTeardown(exists);
-            return next(step4(same), 'clone into new collection');
+            return {
+                cont: withStop(async () => {
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                    return step4(same)();
+                }),
+                data: [],
+                info: { debug: 'clone into new collection', job: undefined },
+            };
         };
         const makeStream = (startAt) => makeWatchStream(db, view, startAt, streamName);
         const step4 = (lastTS) => async () => {
@@ -1772,11 +1784,7 @@ const executes = (view, input, streamName) => {
                 info: { job: undefined, debug: 'wait for change' },
                 cont: withStop(() => l.stream
                     .tryNext()
-                    .then(doc => doc
-                    ? doc.ts
-                        ? next(step7({ ...l, ts: doc.ts }), 'nothing changed')
-                        : next(step1, 'restart')
-                    : step8(l))),
+                    .then(doc => (doc ? next(step4({ _id: streamName, ts: l.ts }), 'restart') : step8(l)))),
             };
         };
         return stop;

package/package.json CHANGED Viewed

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