@wrenautomation/aerie 0.7.0 → 0.7.1

package/dist/bin.js

@@ -8801,7 +8801,9 @@ var init_schema2 = __esm({
         /** taken from the queue: where release(queue) puts it back */
         queued: boolean4().notNull().default(false),
         lane: text2(),
-        pin: text2()
+        pin: text2(),
+        /** the take's own key: a replayed take with it gets this lease back, not the next row */
+        takeKey: text2("take_key")
       },
       (t) => [primaryKey({ columns: [t.ns, t.taskId, t.holder], name: "pk_coord_lease" })]
     );
@@ -10262,6 +10264,7 @@ var init_pglite = __esm({
 // src/coord/postgres.ts
 var postgres_exports = {};
 __export(postgres_exports, {
+  COORD_CHANNEL: () => COORD_CHANNEL,
   pgCoord: () => pgCoord
 });
 async function rows2(q, query) {
@@ -10296,7 +10299,7 @@ function pgCoord(o) {
     if (!hit[0] || hit[0].status === name) return;
     await aerieStore({ db: tx }).edit(id, { status: name }, by);
   };
-  const lease = async (tx, id, holder, leaseMs, queued) => {
+  const lease = async (tx, id, holder, leaseMs, queued, key) => {
     const t = clock();
     const others = await rows2(
       tx,
@@ -10309,9 +10312,10 @@ function pgCoord(o) {
     );
     const gen = num(g?.gen);
     await tx.execute(sql`
-      insert into ${L} (ns, task_id, holder, gen, expires, queued, lane, pin)
-      values (${ns}, ${id}, ${holder}, ${gen}, ${plus(t, leaseMs)}, ${!!queued}, ${queued?.lane ?? null}, ${queued?.pin ?? null})
+      insert into ${L} (ns, task_id, holder, gen, expires, queued, lane, pin, take_key)
+      values (${ns}, ${id}, ${holder}, ${gen}, ${plus(t, leaseMs)}, ${!!queued}, ${queued?.lane ?? null}, ${queued?.pin ?? null}, ${key ?? null})
       on conflict (ns, task_id, holder) do update set gen = excluded.gen, expires = excluded.expires,
+        take_key = coalesce(excluded.take_key, ${L}.take_key),
         queued = excluded.queued or ${L}.queued,
         lane = case when excluded.queued then excluded.lane else ${L}.lane end,
         pin = case when excluded.queued then excluded.pin else ${L}.pin end`);
@@ -10363,7 +10367,9 @@ function pgCoord(o) {
   };
   const queueRows = (q) => rows2(
     q,
-    sql`select task_id as id, lane, pin, pos from ${Q} where ns = ${ns} order by pos, task_id`
+    sql`select q.task_id as id, q.lane, q.pin, q.pos, k.title from ${Q} q
+          left join ${task} k on k.id = upper(q.task_id)
+          where q.ns = ${ns} order by q.pos, q.task_id`
   );
   const store = {
     name: "aerie",
@@ -10498,10 +10504,24 @@ function pgCoord(o) {
       await tx.execute(sql`delete from ${Q} where ns = ${ns} and task_id = any(${textArr(ids)})`);
     }),
     queueList: async () => (await queueRows(db)).map(
-      (i, pos) => ({ id: i.id, lane: i.lane, pin: i.pin, pos })
+      (i, pos) => ({
+        id: i.id,
+        lane: i.lane,
+        pin: i.pin,
+        pos,
+        ...i.title ? { title: i.title } : {}
+      })
     ),
     queueTake: (x, holder, leaseMs) => atomic(db, async (tx) => {
       await lockQueue(tx);
+      if (x.key) {
+        const [had] = await rows2(
+          tx,
+          sql`select task_id as id, gen::float8 as gen from ${L} where ns = ${ns} and holder = ${holder}
+                and take_key = ${x.key} and expires >= ${clock()}`
+        );
+        if (had) return { id: had.id, gen: num(had.gen) };
+      }
       if (x.pin?.startsWith("run:")) {
         const t = clock();
         const lapsed = await rows2(
@@ -10544,7 +10564,14 @@ function pgCoord(o) {
       if (!item) return null;
       await lockTasks(tx, [item.id]);
       await tx.execute(sql`delete from ${Q} where ns = ${ns} and task_id = ${item.id}`);
-      const r = await lease(tx, item.id, holder, leaseMs, { lane: item.lane, pin: item.pin });
+      const r = await lease(
+        tx,
+        item.id,
+        holder,
+        leaseMs,
+        { lane: item.lane, pin: item.pin },
+        x.key
+      );
       return { id: item.id, gen: r.gen };
     }),
     fence: async (id, holder, gen) => (await rows2(
@@ -10556,9 +10583,18 @@ function pgCoord(o) {
       await o.end?.();
     }
   };
+  const sub = o.subscribe;
+  if (sub)
+    store.listen = async (onChange) => {
+      const stop = await sub(COORD_CHANNEL, (payload) => {
+        const [what, ...rest] = payload.split(":");
+        if (rest.join(":") === ns && (what === "queue" || what === "lease")) onChange(what);
+      });
+      return { end: stop };
+    };
   return store;
 }
-var ms, at2, num, textArr;
+var COORD_CHANNEL, ms, at2, num, textArr;
 var init_postgres = __esm({
   "src/coord/postgres.ts"() {
     "use strict";
@@ -10566,6 +10602,7 @@ var init_postgres = __esm({
     init_db2();
     init_schema2();
     init_store();
+    COORD_CHANNEL = "aerie_coord";
     ms = (v) => sql`(extract(epoch from ${v}) * 1000)::float8`;
     at2 = (v) => sql`to_timestamp(${v}::float8 / 1000)`;
     num = (v) => Math.round(Number(v));