@live-change/cron-service 0.9.166 → 0.9.167

package/interval.js

@@ -3,7 +3,10 @@ const app = App.app()
 
 import definition from './definition.js'
 import config from './config.js'
-import { triggerType, runTrigger, doRunTrigger, waitForTasks, RunState } from './run.js'
+import { triggerType, runTrigger, doRunTrigger, RunState } from './run.js'
+import createWaitingFunction from './waitForDone.js'
+
+const waitForTasks = createWaitingFunction(definition)
 
 export const Interval = definition.model({
   name: "Interval",
@@ -89,7 +92,7 @@ export const IntervalInfo = definition.model({
 
 async function processInterval({ id, interval, wait, trigger, firstRunDelay, isFirstRun }, { triggerService }) {
   //console.log("PROCESSING INTERVAL", id, interval, wait, trigger, firstRunDelay, isFirstRun)
-  if(wait) await waitForTasks('cron_Interval', id)
+  if(wait) await waitForTasks('cron_Interval', id, { triggerService })
   //console.log("WAIT FOR TASKS DONE", id)
   const nextTimestamp = Date.now() + (isFirstRun ? (firstRunDelay || 0) : interval)
   const nextTime = new Date(nextTimestamp)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/cron-service",
-  "version": "0.9.166",
+  "version": "0.9.167",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.166"
+    "@live-change/framework": "^0.9.167"
   },
-  "gitHead": "e99ff5ce503d5dc894d0cfe954a58397683d12e0"
+  "gitHead": "1051ad24a384d88af662d655f647349281fab23a"
 }

package/run.js

@@ -174,50 +174,3 @@ definition.trigger({
     return 'done'
   }
 })
-
-export async function waitForTasks(jobType, job) {
-  const runState = App.encodeIdentifier([jobType, job])
-  return new Promise((resolve, reject) => {    
-    let done = false    
-    const taskObservations = new Map()
-    function addTaskObservation(taskId) {
-      const observable = Task.observable(taskId)
-      if(!observable) return
-      const observer = {
-        set: (value) => {
-          if(!value) return updateTasks()
-          if(value.state === 'done' || value.state === 'failed') updateTasks()        
-        }
-      }
-      taskObservations.set(taskId, { observable, observer })
-      observable.observe(observer)
-    }
-    async function updateTasks() {
-      if(done) return
-      const runningTasks = taskObservations.values()
-        .filter(observation => observation.observable.getValue().state !== 'done' && observation.observable.getValue().state !== 'failed')
-      if(runningTasks.length === 0) {
-        await RunState.delete(runState) 
-        finish()
-      }
-    }
-    const runStateObservable = RunState.observable(runState)
-    const runStateObserver = {
-      set: (value) => {        
-        if(!value) finish()
-        if(value.tasks) {
-          for(const taskId of value.tasks) {
-            addTaskObservation(taskId)
-          }
-        }
-      }
-    }
-    runStateObservable.observe(runStateObserver)
-    function finish() {
-      if(done) return
-      done = true
-      runStateObservable.unobserve(runStateObserver)
-      resolve()
-    }
-  })
-}

package/schedule.js

@@ -3,7 +3,7 @@ const app = App.app()
 
 import definition from './definition.js'
 import config from './config.js'
-import { triggerType, runTrigger, doRunTrigger, waitForTasks } from './run.js'
+import { triggerType, runTrigger, doRunTrigger } from './run.js'
 
 export const Schedule = definition.model({
   name: "Schedule",

package/waitForDone.js

@@ -0,0 +1,62 @@
+import App from '@live-change/framework'
+const app = App.app()
+
+
+export default function createWaitingFunction(definition) {
+  const Task = definition.foreignModel('task', 'Task')
+  const RunState = definition.foreignModel('cron', 'RunState')
+
+  return async function waitForDone(jobType, job, {triggerService, trigger}) {
+    if(typeof job !== 'string') job = App.encodeIdentifier(job.ownerType, job.owner, job.topicType, job.topic)
+    const runState = App.encodeIdentifier([jobType, job])
+    return new Promise((resolve, reject) => {    
+      let done = false    
+      const taskObservations = new Map()
+      function addTaskObservation(taskId) {
+        const observable = Task.observable(taskId)
+        if(!observable) return
+        const observer = {
+          set: (value) => {
+            if(done) return
+            if(!value) return updateTasks()
+            if(value.state === 'done' || value.state === 'failed') updateTasks()        
+          }
+        }
+        taskObservations.set(taskId, { observable, observer })
+        observable.observe(observer)
+      }
+      async function updateTasks() {
+        if(done) return
+        const runningTasks = Array.from(taskObservations.values())
+          .filter(observation => observation.observable.getValue().state !== 'done' && observation.observable.getValue().state !== 'failed')
+        if(runningTasks.length === 0) {
+          //await RunState.delete(runState)
+          await triggerService({ service: 'cron', type: 'cron_deleteRunState' }, {
+            runState
+          })
+          if(done) return          
+          return finish()
+        }
+      }
+      const runStateObservable = RunState.observable(runState)
+      const runStateObserver = {
+        set: (value) => {        
+          if(done) return
+          if(!value) return finish()
+          if(value.tasks) {
+            for(const taskId of value.tasks) {
+              addTaskObservation(taskId)
+            }
+          }
+        }
+      }
+      runStateObservable.observe(runStateObserver)
+      function finish() {
+        if(done) return
+        done = true
+        runStateObservable.unobserve(runStateObserver)
+        resolve()
+      }
+    })
+  }
+}