@omegup/msync 0.0.39 → 0.0.41

package/index.esm.js

@@ -1,6 +1,7 @@
 import { UUID, MongoClient } from 'mongodb';
 import { SynchronousPromise } from 'synchronous-promise';
 import crypto$1 from 'crypto';
+import { log as log$1 } from 'console';
 import { writeFile } from 'fs/promises';
 
 const asExprRaw = (raw) => ({ get: () => raw });
@@ -1132,15 +1133,22 @@ const restart = (sources) => {
     return map(sources, x => x.stop());
 };
 const race = (sources) => {
-    const promises = Object.values(map(sources, ({ next }, key) => next.then(frame => ({ key, sources, frame }))));
-    return SynchronousPromise.any(promises);
+    const promises = Object.values(map(sources, ({ next }, key) => next.then(frame => ({ key, frame }), error => new Error(error))));
+    return SynchronousPromise.any(promises).then((result) => {
+        if (result instanceof Error) {
+            throw result;
+        }
+        else {
+            return result;
+        }
+    });
 };
 
 const nextWinner = (previousWinner, previousWinnerNextFrame, sources, interrupt) => {
     const { frame: previousFrame, key } = previousWinner;
     if (!interrupt?.(key) && previousFrame.info.job) {
-        return previousWinnerNextFrame.then((previousFrameSuccessor) => {
-            if (previousFrameSuccessor.info.job) {
+        return previousWinnerNextFrame.then(previousFrameSuccessor => {
+            if (previousFrame.info.job === previousFrameSuccessor.info.job) {
                 return { frame: previousFrameSuccessor, key };
             }
             return race(sources);
@@ -1206,7 +1214,7 @@ class Machine {
         return runCont(run, cb);
     }
 }
-const wrap = (root) => root;
+const wrap = (root) => new Machine(root.runner());
 const runCont = async (it, cb) => {
     const { next, stop, clear } = it();
     const res = await next.then(next => ({ ok: true, next }), err => ({ ok: false, err }));
@@ -1452,6 +1460,8 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
         const doc = await stream.tryNext();
         if (doc)
             await new Promise(resolve => setTimeout(resolve, 100));
+        if (doc)
+            log$1('detected', doc);
         return doc;
     };
     return { tryNext, close: () => stream.close() };
@@ -1626,7 +1636,7 @@ const executes$1 = (view, input, streamName) => {
         const step8 = (l) => {
             return nextData(l.aggResult.cursor.firstBatch)(() => l.stream
                 .tryNext()
-                .catch(_ => 1)
+                .catch(err => { log('restarting', err); return 1; })
                 .then(doc => (doc ? next(step2, 'restart') : step8(l))), 'wait for change');
         };
         return stop;

package/index.js

@@ -3,6 +3,7 @@
 var mongodb = require('mongodb');
 var synchronousPromise = require('synchronous-promise');
 var crypto$1 = require('crypto');
+var console$1 = require('console');
 var promises = require('fs/promises');
 
 const asExprRaw = (raw) => ({ get: () => raw });
@@ -1134,15 +1135,22 @@ const restart = (sources) => {
     return map(sources, x => x.stop());
 };
 const race = (sources) => {
-    const promises = Object.values(map(sources, ({ next }, key) => next.then(frame => ({ key, sources, frame }))));
-    return synchronousPromise.SynchronousPromise.any(promises);
+    const promises = Object.values(map(sources, ({ next }, key) => next.then(frame => ({ key, frame }), error => new Error(error))));
+    return synchronousPromise.SynchronousPromise.any(promises).then((result) => {
+        if (result instanceof Error) {
+            throw result;
+        }
+        else {
+            return result;
+        }
+    });
 };
 
 const nextWinner = (previousWinner, previousWinnerNextFrame, sources, interrupt) => {
     const { frame: previousFrame, key } = previousWinner;
     if (!interrupt?.(key) && previousFrame.info.job) {
-        return previousWinnerNextFrame.then((previousFrameSuccessor) => {
-            if (previousFrameSuccessor.info.job) {
+        return previousWinnerNextFrame.then(previousFrameSuccessor => {
+            if (previousFrame.info.job === previousFrameSuccessor.info.job) {
                 return { frame: previousFrameSuccessor, key };
             }
             return race(sources);
@@ -1208,7 +1216,7 @@ class Machine {
         return runCont(run, cb);
     }
 }
-const wrap = (root) => root;
+const wrap = (root) => new Machine(root.runner());
 const runCont = async (it, cb) => {
     const { next, stop, clear } = it();
     const res = await next.then(next => ({ ok: true, next }), err => ({ ok: false, err }));
@@ -1454,6 +1462,8 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
         const doc = await stream.tryNext();
         if (doc)
             await new Promise(resolve => setTimeout(resolve, 100));
+        if (doc)
+            console$1.log('detected', doc);
         return doc;
     };
     return { tryNext, close: () => stream.close() };
@@ -1628,7 +1638,7 @@ const executes$1 = (view, input, streamName) => {
         const step8 = (l) => {
             return nextData(l.aggResult.cursor.firstBatch)(() => l.stream
                 .tryNext()
-                .catch(_ => 1)
+                .catch(err => { log('restarting', err); return 1; })
                 .then(doc => (doc ? next(step2, 'restart') : step8(l))), 'wait for change');
         };
         return stop;

package/package.json

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