@omegup/msync 0.1.29 → 0.1.31

package/index.d.ts

@@ -327,7 +327,6 @@ type View<V extends Model, K extends StrKey<V>> = {
 };
 
 declare const val: <T extends rawItem>(val: T) => Expr<T, unknown>;
-declare const afterWriteTime: Expr<Timestamp, unknown>;
 declare const current: Expr<Timestamp, unknown>;
 declare const $let: <T, D, C, V extends RORec<string, jsonItem>>(vars: ExprsExact<V, D, C>, inExpr: Expr<T, D, C & V>) => Expr<T, D, C>;
 declare const nil: Expr<null, unknown>;
@@ -681,5 +680,5 @@ declare const enablePreAndPostImages: <T extends doc>(coll: Collection<T>) => Pr
 declare const prepare: (testName?: string) => Promise<MongoClient$1>;
 declare const makeCol: <T extends ID>(docs: readonly OptionalUnlessRequiredId<T>[], database: Db, name?: string) => Promise<Collection<T>>;
 
-export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $sum, $type, $unwind, $unwindDelta, Expr, Field, Machine, Type, add, afterWriteTime, and, anyElementTrue, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $sum, $type, $unwind, $unwindDelta, Expr, Field, Machine, Type, add, and, anyElementTrue, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
 export type { Accumulators, Arr, AsLiteral, Delta, DeltaAccumulator, DeltaAccumulators, ExactKeys, ExprHKT, Exprs, ExprsExact, ExprsExactHKT, ExprsPart, ID, Loose, Merge, MergeArgs, MergeInto, MergeMapOArgs, Model, MongoTypeNames, N, NoRaw, NullToOBJ, O, OPick, OPickD, Patch, RONoRaw, RORec, RawStages, Rec, Replace, SnapshotStreamExecutionResult, StrKey, Strict, TS, WriteonlyCollection, doc, jsonPrim, notArr };

package/index.esm.js

@@ -1,4 +1,4 @@
-import { Timestamp, UUID, MongoClient } from 'mongodb';
+import { UUID, Timestamp, MongoClient } from 'mongodb';
 import crypto$1 from 'crypto';
 import { canonicalize } from 'json-canonicalize';
 import { SynchronousPromise } from 'synchronous-promise';
@@ -81,9 +81,6 @@ const val = (val) => asExpr({
         ? { $literal: val }
         : val),
 });
-const afterWriteTime = asExpr({
-    raw: () => asExprRaw(new Timestamp(0xffffffffffffffffn)),
-});
 const current = asExpr({
     raw: () => asExprRaw('$$CLUSTER_TIME'),
 });
@@ -845,7 +842,7 @@ const $mergeX = (out, keys, f, map, ext) => {
     const setDeleted = out.whenNotMatched === 'discard';
     const replacer = map(field(omitPick().backward(spread(patch, {
         _id: ['_id', f.of('_id').expr()],
-        touchedAt: ['touchedAt', afterWriteTime],
+        touchedAt: ['touchedAt', current],
     }))));
     const sss = setDeleted
         ? link()
@@ -889,7 +886,7 @@ const $mergeId = () => (out, keys, id, ext) => {
     return $mergeX(out, keys, root().of('after'), or => {
         return ite(eqTyped(root().of('after').expr(), nil), field(omRORec.backward(spread(mapExact(keys, () => nil), {
             _id: ['_id', id],
-            touchedAt: ['touchedAt', afterWriteTime],
+            touchedAt: ['touchedAt', current],
         }))), or);
     }, ext);
 };
@@ -911,7 +908,7 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const mapId = (k, v) => map1(k, v);
     const F1 = {
         _id: ['_id', to(idPrefix ? concat$1(val(idPrefix), $rand) : $rand)],
-        touchedAt: ['touchedAt', to(afterWriteTime)],
+        touchedAt: ['touchedAt', to(current)],
     };
     const F2 = mapId(gid, to(gidPath));
     const addExtraAndMerge = {
@@ -922,7 +919,7 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const addTSAndExtra = {
         ...mapExact0(e, to),
         ...(out.whenNotMatched === 'insert' ? { deletedAt: ['deletedAt', to(nil)] } : {}),
-        touchedAt: ['touchedAt', to(afterWriteTime)],
+        touchedAt: ['touchedAt', to(current)],
     };
     const updater = set()(addTSAndExtra);
     const whenMatched = getWhenMatched(out.whenNotMatched);
@@ -1540,7 +1537,7 @@ const $insertX = (out, expr, map, ext, extExpr) => {
         raw: () => {
             const replacer = map(mergeObjects(expr, field(mergeExpr(extExpr, {
                 deletedAt: ['deletedAt', nil],
-                touchedAt: ['touchedAt', afterWriteTime],
+                touchedAt: ['touchedAt', current],
             }))));
             return link()
                 .with($replaceWith_(replacer))
@@ -1560,7 +1557,7 @@ const $insertPart = (out, ext) => {
     return $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field(mergeExpr(translateOmit().forward(extExpr), {
         deletedAt: ['deletedAt', current],
         _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
-        touchedAt: ['touchedAt', afterWriteTime],
+        touchedAt: ['touchedAt', current],
     })), x), ext, extExpr);
 };
 const $insert = (out) => $insertPart(out, {});
@@ -1610,7 +1607,6 @@ const addTeardown = (it, tr) => {
 
 const sleep = (ms) => new Promise(r => setTimeout(r, ms));
 const maxTimestamp = new Timestamp(0xffffffffffffffffn);
-const isMax = (x) => x instanceof Timestamp && x.equals(maxTimestamp);
 const getCurrentTimestamp = async (db) => {
     const adminDb = db.admin();
     const serverStatus = await adminDb.command({ serverStatus: 1 });
@@ -1633,53 +1629,65 @@ async function waitUntilStablePast(db, oplogTs, { pollMs = 0, timeoutMs = 10_000
         await sleep(pollMs);
     }
 }
-async function* tailOplog(db, opts) {
-    let lastTs = opts.since ?? (await getCurrentTimestamp(db));
-    const reopenDelayMs = opts.reopenDelayMs ?? 250;
+async function* tailOplog(db) {
+    let lastTs = await getCurrentTimestamp(db);
+    const reopenDelayMs = 250;
     const coll = db.client.db('local').collection('oplog.rs');
     while (true) {
         const cursor = coll.find({
             ts: { $gt: lastTs },
-            ns: RegExp(`^${db.namespace}\\.(?!tmp_)(?!__).*(?<!_snapshot)$`),
-            op: { $in: ['i', 'u'] },
+            $or: [
+                {
+                    ns: RegExp(`^${db.namespace}\\.(?!tmp_)(?!__).*(?<!_snapshot)$`),
+                    op: { $in: ['i', 'u'] },
+                },
+                {
+                    ns: 'admin.$cmd',
+                    op: 'c',
+                    'o.applyOps': {
+                        $elemMatch: {
+                            ns: RegExp(`^${db.namespace}\\.(?!tmp_)(?!__).*(?<!_snapshot)$`),
+                            op: { $in: ['i', 'u'] },
+                        },
+                    },
+                },
+            ],
         }, {
             tailable: true,
             awaitData: true,
             noCursorTimeout: true,
         });
         try {
-            for await (const doc of cursor) {
-                lastTs = doc.ts;
-                if (doc.op === 'i' || '_id' in doc.o) {
-                    const fields = new Set(Object.keys(doc.o));
-                    fields.delete('_id');
-                    yield { fields, doc, changeTouched: isMax(doc.o['touchedAt']) };
-                }
-                else {
-                    let changeTouched = false;
-                    if (doc.o['$v'] !== 2) {
-                        throw new Error(`Expected update with $v: 2, got ${JSON.stringify(doc)}`);
+            for await (const docs of cursor) {
+                for (const doc of docs.op === 'c' ? docs.o['applyOps'] : [docs]) {
+                    if (doc.op === 'i' || '_id' in doc.o) {
+                        const fields = new Set(Object.keys(doc.o));
+                        fields.delete('_id');
+                        yield { fields, doc };
                     }
-                    const updatedFields = [];
-                    const diff = doc.o['diff'];
-                    for (const updateOp in diff) {
-                        if (['u', 'i', 'd'].includes(updateOp)) {
-                            updatedFields.push(...Object.keys(diff[updateOp]));
-                            if (isMax(diff[updateOp]['touchedAt'])) {
-                                changeTouched = true;
-                            }
+                    else {
+                        if (doc.o['$v'] !== 2) {
+                            throw new Error(`Expected update with $v: 2, got ${JSON.stringify(doc)}`);
                         }
-                        else if (updateOp.startsWith('s')) {
-                            updatedFields.push(updateOp.slice(1));
+                        const updatedFields = [];
+                        const diff = doc.o['diff'];
+                        for (const updateOp in diff) {
+                            if (['u', 'i', 'd'].includes(updateOp)) {
+                                updatedFields.push(...Object.keys(diff[updateOp]));
+                            }
+                            else if (updateOp.startsWith('s')) {
+                                updatedFields.push(updateOp.slice(1));
+                            }
                         }
+                        yield { fields: new Set(updatedFields), doc };
                     }
-                    yield { fields: new Set(updatedFields), doc, changeTouched };
                 }
             }
         }
         catch (e) {
             log('oplog loop error, notifying watchers and reopening');
             console.error(e);
+            lastTs = await getCurrentTimestamp(db);
             yield null;
         }
         finally {
@@ -1701,7 +1709,7 @@ const loop = async (db) => {
     let notify = makePromise();
     let batch = [];
     const run = async () => {
-        for await (const event of tailOplog(db, {})) {
+        for await (const event of tailOplog(db)) {
             if (event?.fields.size === 0)
                 continue;
             batch = event && batch ? [...batch, event] : null;
@@ -1728,23 +1736,6 @@ const loop = async (db) => {
             }
             continue;
         }
-        const groups = Object.groupBy(events.filter(e => e.changeTouched), ev => ev.doc.ns);
-        for (const [ns, evs] of Object.entries(groups)) {
-            if (!evs)
-                continue;
-            const [dbName, collName] = ns.split('.');
-            if (dbName !== db.databaseName)
-                continue;
-            const coll = db.collection(collName);
-            coll
-                .bulkWrite(evs.map((e) => ({
-                updateOne: {
-                    filter: { _id: e.doc.o['_id'] ?? e.doc.o2?._id },
-                    update: { $set: { touchedAt: e.doc.ts } },
-                },
-            })))
-                .catch(() => { });
-        }
         for (const { fields, doc } of events) {
             const m = watchers.get(doc.ns);
             if (!m)
@@ -1812,6 +1803,7 @@ const actions = {
     ],
 };
 
+const previous = (ts) => new Timestamp({ t: ts.high - 60, i: 0 });
 const getFirstStages = (view, needs) => {
     const { projection, hardMatch: pre, match } = view;
     const projectInput = projection && $project_(spread(projection, {
@@ -1822,7 +1814,7 @@ const getFirstStages = (view, needs) => {
     const hardMatch = removeNotYetSynchronizedFields ? $and(pre, ...removeNotYetSynchronizedFields) : pre;
     const firstStages = (lastTS, keepNulls = false) => {
         const hardQuery = $and(lastTS
-            ? root().of('touchedAt').has($gtTs(lastTS.ts))
+            ? root().of('touchedAt').has($gtTs(previous(lastTS.ts)))
             : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), keepNulls ? pre : hardMatch);
         const ln = link()
             .with($match_(hardQuery));
@@ -2129,7 +2121,7 @@ const executes$1 = (view, input, streamName, needs) => {
         }));
     const notDeleted = root().of('deletedAt').has($eq(null));
     const stages = (lastTS) => {
-        const hardQuery = $and(lastTS && root().of('touchedAt').has($gteTs(lastTS.ts)), hardMatch, notDeleted, match && $expr(match));
+        const hardQuery = $and(lastTS && root().of('touchedAt').has($gteTs(previous(lastTS.ts))), hardMatch, notDeleted, match && $expr(match));
         const ln = link().with($match_(hardQuery));
         return (projectInput ? ln.with(projectInput) : ln).with(input);
     };
@@ -2250,4 +2242,4 @@ const executes = (view, input, needs) => {
 };
 const single = (view, needs = {}) => pipe(input => executes(view, input, needs), emptyDelta(), concatDelta, emptyDelta);
 
-export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, afterWriteTime, and, anyElementTrue, array, ceil, comp, concat$1 as concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first$1 as first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, and, anyElementTrue, array, ceil, comp, concat$1 as concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first$1 as first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };

package/index.js

@@ -83,9 +83,6 @@ const val = (val) => asExpr({
         ? { $literal: val }
         : val),
 });
-const afterWriteTime = asExpr({
-    raw: () => asExprRaw(new mongodb.Timestamp(0xffffffffffffffffn)),
-});
 const current = asExpr({
     raw: () => asExprRaw('$$CLUSTER_TIME'),
 });
@@ -847,7 +844,7 @@ const $mergeX = (out, keys, f, map, ext) => {
     const setDeleted = out.whenNotMatched === 'discard';
     const replacer = map(field(omitPick().backward(spread(patch, {
         _id: ['_id', f.of('_id').expr()],
-        touchedAt: ['touchedAt', afterWriteTime],
+        touchedAt: ['touchedAt', current],
     }))));
     const sss = setDeleted
         ? link()
@@ -891,7 +888,7 @@ const $mergeId = () => (out, keys, id, ext) => {
     return $mergeX(out, keys, root().of('after'), or => {
         return ite(eqTyped(root().of('after').expr(), nil), field(omRORec.backward(spread(mapExact(keys, () => nil), {
             _id: ['_id', id],
-            touchedAt: ['touchedAt', afterWriteTime],
+            touchedAt: ['touchedAt', current],
         }))), or);
     }, ext);
 };
@@ -913,7 +910,7 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const mapId = (k, v) => map1(k, v);
     const F1 = {
         _id: ['_id', to(idPrefix ? concat$1(val(idPrefix), $rand) : $rand)],
-        touchedAt: ['touchedAt', to(afterWriteTime)],
+        touchedAt: ['touchedAt', to(current)],
     };
     const F2 = mapId(gid, to(gidPath));
     const addExtraAndMerge = {
@@ -924,7 +921,7 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const addTSAndExtra = {
         ...mapExact0(e, to),
         ...(out.whenNotMatched === 'insert' ? { deletedAt: ['deletedAt', to(nil)] } : {}),
-        touchedAt: ['touchedAt', to(afterWriteTime)],
+        touchedAt: ['touchedAt', to(current)],
     };
     const updater = set()(addTSAndExtra);
     const whenMatched = getWhenMatched(out.whenNotMatched);
@@ -1542,7 +1539,7 @@ const $insertX = (out, expr, map, ext, extExpr) => {
         raw: () => {
             const replacer = map(mergeObjects(expr, field(mergeExpr(extExpr, {
                 deletedAt: ['deletedAt', nil],
-                touchedAt: ['touchedAt', afterWriteTime],
+                touchedAt: ['touchedAt', current],
             }))));
             return link()
                 .with($replaceWith_(replacer))
@@ -1562,7 +1559,7 @@ const $insertPart = (out, ext) => {
     return $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field(mergeExpr(translateOmit().forward(extExpr), {
         deletedAt: ['deletedAt', current],
         _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
-        touchedAt: ['touchedAt', afterWriteTime],
+        touchedAt: ['touchedAt', current],
     })), x), ext, extExpr);
 };
 const $insert = (out) => $insertPart(out, {});
@@ -1612,7 +1609,6 @@ const addTeardown = (it, tr) => {
 
 const sleep = (ms) => new Promise(r => setTimeout(r, ms));
 const maxTimestamp = new mongodb.Timestamp(0xffffffffffffffffn);
-const isMax = (x) => x instanceof mongodb.Timestamp && x.equals(maxTimestamp);
 const getCurrentTimestamp = async (db) => {
     const adminDb = db.admin();
     const serverStatus = await adminDb.command({ serverStatus: 1 });
@@ -1635,53 +1631,65 @@ async function waitUntilStablePast(db, oplogTs, { pollMs = 0, timeoutMs = 10_000
         await sleep(pollMs);
     }
 }
-async function* tailOplog(db, opts) {
-    let lastTs = opts.since ?? (await getCurrentTimestamp(db));
-    const reopenDelayMs = opts.reopenDelayMs ?? 250;
+async function* tailOplog(db) {
+    let lastTs = await getCurrentTimestamp(db);
+    const reopenDelayMs = 250;
     const coll = db.client.db('local').collection('oplog.rs');
     while (true) {
         const cursor = coll.find({
             ts: { $gt: lastTs },
-            ns: RegExp(`^${db.namespace}\\.(?!tmp_)(?!__).*(?<!_snapshot)$`),
-            op: { $in: ['i', 'u'] },
+            $or: [
+                {
+                    ns: RegExp(`^${db.namespace}\\.(?!tmp_)(?!__).*(?<!_snapshot)$`),
+                    op: { $in: ['i', 'u'] },
+                },
+                {
+                    ns: 'admin.$cmd',
+                    op: 'c',
+                    'o.applyOps': {
+                        $elemMatch: {
+                            ns: RegExp(`^${db.namespace}\\.(?!tmp_)(?!__).*(?<!_snapshot)$`),
+                            op: { $in: ['i', 'u'] },
+                        },
+                    },
+                },
+            ],
         }, {
             tailable: true,
             awaitData: true,
             noCursorTimeout: true,
         });
         try {
-            for await (const doc of cursor) {
-                lastTs = doc.ts;
-                if (doc.op === 'i' || '_id' in doc.o) {
-                    const fields = new Set(Object.keys(doc.o));
-                    fields.delete('_id');
-                    yield { fields, doc, changeTouched: isMax(doc.o['touchedAt']) };
-                }
-                else {
-                    let changeTouched = false;
-                    if (doc.o['$v'] !== 2) {
-                        throw new Error(`Expected update with $v: 2, got ${JSON.stringify(doc)}`);
+            for await (const docs of cursor) {
+                for (const doc of docs.op === 'c' ? docs.o['applyOps'] : [docs]) {
+                    if (doc.op === 'i' || '_id' in doc.o) {
+                        const fields = new Set(Object.keys(doc.o));
+                        fields.delete('_id');
+                        yield { fields, doc };
                     }
-                    const updatedFields = [];
-                    const diff = doc.o['diff'];
-                    for (const updateOp in diff) {
-                        if (['u', 'i', 'd'].includes(updateOp)) {
-                            updatedFields.push(...Object.keys(diff[updateOp]));
-                            if (isMax(diff[updateOp]['touchedAt'])) {
-                                changeTouched = true;
-                            }
+                    else {
+                        if (doc.o['$v'] !== 2) {
+                            throw new Error(`Expected update with $v: 2, got ${JSON.stringify(doc)}`);
                         }
-                        else if (updateOp.startsWith('s')) {
-                            updatedFields.push(updateOp.slice(1));
+                        const updatedFields = [];
+                        const diff = doc.o['diff'];
+                        for (const updateOp in diff) {
+                            if (['u', 'i', 'd'].includes(updateOp)) {
+                                updatedFields.push(...Object.keys(diff[updateOp]));
+                            }
+                            else if (updateOp.startsWith('s')) {
+                                updatedFields.push(updateOp.slice(1));
+                            }
                         }
+                        yield { fields: new Set(updatedFields), doc };
                     }
-                    yield { fields: new Set(updatedFields), doc, changeTouched };
                 }
             }
         }
         catch (e) {
             log('oplog loop error, notifying watchers and reopening');
             console.error(e);
+            lastTs = await getCurrentTimestamp(db);
             yield null;
         }
         finally {
@@ -1703,7 +1711,7 @@ const loop = async (db) => {
     let notify = makePromise();
     let batch = [];
     const run = async () => {
-        for await (const event of tailOplog(db, {})) {
+        for await (const event of tailOplog(db)) {
             if (event?.fields.size === 0)
                 continue;
             batch = event && batch ? [...batch, event] : null;
@@ -1730,23 +1738,6 @@ const loop = async (db) => {
             }
             continue;
         }
-        const groups = Object.groupBy(events.filter(e => e.changeTouched), ev => ev.doc.ns);
-        for (const [ns, evs] of Object.entries(groups)) {
-            if (!evs)
-                continue;
-            const [dbName, collName] = ns.split('.');
-            if (dbName !== db.databaseName)
-                continue;
-            const coll = db.collection(collName);
-            coll
-                .bulkWrite(evs.map((e) => ({
-                updateOne: {
-                    filter: { _id: e.doc.o['_id'] ?? e.doc.o2?._id },
-                    update: { $set: { touchedAt: e.doc.ts } },
-                },
-            })))
-                .catch(() => { });
-        }
         for (const { fields, doc } of events) {
             const m = watchers.get(doc.ns);
             if (!m)
@@ -1814,6 +1805,7 @@ const actions = {
     ],
 };
 
+const previous = (ts) => new mongodb.Timestamp({ t: ts.high - 60, i: 0 });
 const getFirstStages = (view, needs) => {
     const { projection, hardMatch: pre, match } = view;
     const projectInput = projection && $project_(spread(projection, {
@@ -1824,7 +1816,7 @@ const getFirstStages = (view, needs) => {
     const hardMatch = removeNotYetSynchronizedFields ? $and(pre, ...removeNotYetSynchronizedFields) : pre;
     const firstStages = (lastTS, keepNulls = false) => {
         const hardQuery = $and(lastTS
-            ? root().of('touchedAt').has($gtTs(lastTS.ts))
+            ? root().of('touchedAt').has($gtTs(previous(lastTS.ts)))
             : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), keepNulls ? pre : hardMatch);
         const ln = link()
             .with($match_(hardQuery));
@@ -2131,7 +2123,7 @@ const executes$1 = (view, input, streamName, needs) => {
         }));
     const notDeleted = root().of('deletedAt').has($eq(null));
     const stages = (lastTS) => {
-        const hardQuery = $and(lastTS && root().of('touchedAt').has($gteTs(lastTS.ts)), hardMatch, notDeleted, match && $expr(match));
+        const hardQuery = $and(lastTS && root().of('touchedAt').has($gteTs(previous(lastTS.ts))), hardMatch, notDeleted, match && $expr(match));
         const ln = link().with($match_(hardQuery));
         return (projectInput ? ln.with(projectInput) : ln).with(input);
     };
@@ -2308,7 +2300,6 @@ exports.$unwindDelta = $unwindDelta;
 exports.Field = Field;
 exports.Machine = Machine;
 exports.add = add;
-exports.afterWriteTime = afterWriteTime;
 exports.and = and;
 exports.anyElementTrue = anyElementTrue;
 exports.array = array;

package/package.json

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