@requence/task 1.0.0-alpha.47 → 1.0.0-alpha.49

package/build/index.js

@@ -1,11 +1,12 @@
 import {
   deobfuscate
-} from "./chunk-y4v98p2s.js";
+} from "./chunk-b4h2we9a.js";
 
 // ../helpers/src/utils/callbackToAsyncIterator.ts
 function callbackToAsyncIterator(subscribe) {
   const pullQueue = [];
   const pushQueue = [];
+  let done = false;
   const pushValue = (value) => {
     if (pullQueue.length !== 0) {
       const resolver = pullQueue.shift();
@@ -21,23 +22,47 @@ function callbackToAsyncIterator(subscribe) {
       pullQueue.push(resolve);
     }
   });
-  subscribe((value) => {
-    pushValue({ value });
+  const cleanup = subscribe((value) => {
+    if (!done) {
+      pushValue({ value });
+    }
   }, (error) => {
-    pushValue({ error });
+    if (!done) {
+      pushValue({ error });
+    }
   }, () => {
-    pushValue({ done: true });
+    if (!done) {
+      pushValue({ done: true });
+    }
   });
   return {
     async next() {
+      if (done) {
+        return { value: undefined, done: true };
+      }
       const value = await pullValue();
       if (value.done) {
+        done = true;
         return { value: undefined, done: true };
       }
       if (value.error) {
+        done = true;
         throw value.error;
       }
       return { value: value.value, done: false };
+    },
+    async return() {
+      if (!done) {
+        done = true;
+        if (typeof cleanup === "function") {
+          cleanup();
+        }
+        while (pullQueue.length > 0) {
+          const resolver = pullQueue.shift();
+          resolver({ done: true });
+        }
+      }
+      return { value: undefined, done: true };
     }
   };
 }
@@ -485,6 +510,20 @@ async function abortTask(options) {
   }
 }
 
+// src/ackTask.ts
+async function ackTask(options) {
+  const { apiBaseUrl, token } = getAccessToken(options.accessToken);
+  const response = await fetch(`${apiBaseUrl}/task/ack/${options.taskId}`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`
+    }
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to acknowledge task delivery: ${await response.text()}`);
+  }
+}
+
 // src/protectTask.ts
 class TaskProtectError extends Error {
   taskId;
@@ -527,16 +566,19 @@ var taskStartUpdateSchema = baseUpdate.extend({
 });
 var taskErrorUpdateSchema = baseUpdate.extend({
   type: z5.literal("taskError"),
-  reason: z5.string().optional()
+  reason: z5.string().optional(),
+  requireAck: z5.boolean().optional()
 });
 var taskAbortUpdateSchema = baseUpdate.extend({
   type: z5.literal("taskAborted"),
-  reason: z5.string().optional()
+  reason: z5.string().optional(),
+  requireAck: z5.boolean().optional()
 });
 var taskEndUpdateSchema = baseUpdate.extend({
   type: z5.literal("taskEnd"),
   result: z5.record(z5.string(), z5.any()),
-  exit: z5.string().nullable()
+  exit: z5.string().nullable(),
+  requireAck: z5.boolean().optional()
 });
 var nodeStartUpdateSchema = baseUpdate.extend({
   type: z5.literal("nodeStart"),
@@ -624,6 +666,7 @@ function createTask(options, onUpdate) {
     }
     const taskStorage = { input: null, data: {}, errors: {}, result: null };
     let since = null;
+    let lastPosition = null;
     let lastResponse;
     const customFetch = async (url, init) => {
       const response = await fetch(url, init);
@@ -639,17 +682,25 @@ function createTask(options, onUpdate) {
         "Content-Type": "application/json"
       },
       get body() {
-        return JSON.stringify({ since: since ? since.toISOString() : null });
+        return JSON.stringify({
+          since: since ? since.toISOString() : null,
+          lastPosition
+        });
       },
       onScheduleReconnect() {
-        since = new Date;
+        if (lastPosition === null) {
+          since = new Date;
+        }
       },
       async onDisconnect() {
         if (lastResponse.status === 200) {
           eventSource.close();
         }
       },
-      onMessage({ event, data }) {
+      onMessage({ id, event, data }) {
+        if (id) {
+          lastPosition = Number(id);
+        }
         const updateResult = eventSchema.safeParse({ event, data });
         if (!updateResult.success) {
           eventSource.close();
@@ -679,11 +730,23 @@ function createTask(options, onUpdate) {
           case "taskEnd": {
             taskStorage.result = resolveRequenceTypes(update.result);
             eventSource.close();
+            if (update.requireAck) {
+              ackTask({
+                taskId: payload.taskId,
+                accessToken: options.accessToken
+              }).catch(() => {});
+            }
             break;
           }
           case "taskError":
           case "taskAborted": {
             eventSource.close();
+            if (update.requireAck) {
+              ackTask({
+                taskId: payload.taskId,
+                accessToken: options.accessToken
+              }).catch(() => {});
+            }
             break;
           }
         }
@@ -718,6 +781,8 @@ function createTask(options, onUpdate) {
   const taskIdPromiseWithResolvers = Promise.withResolvers();
   const taskUrlPromiseWithResolvers = Promise.withResolvers();
   const resultPromiseWithResolvers = Promise.withResolvers();
+  const finalizedPromiseWithResolvers = Promise.withResolvers();
+  finalizedPromiseWithResolvers.promise.catch(() => {});
   let rejectTaskIdPromise = false;
   let rejectTaskUrlPromise = false;
   (async () => {
@@ -729,6 +794,7 @@ function createTask(options, onUpdate) {
     });
     if (!prepareResponse.ok) {
       const error = new TaskPrepareError(await prepareResponse.text(), options.taskTemplate);
+      finalizedPromiseWithResolvers.reject(error);
       if (rejectTaskIdPromise) {
         taskIdPromiseWithResolvers.reject(error);
       }
@@ -749,7 +815,8 @@ function createTask(options, onUpdate) {
       value: {
         name: options.name,
         input: options.input,
-        priority
+        priority,
+        requireAck: options.requireAck ?? false
       },
       options: {
         uploadUrl: prepareData.fileUrls?.uploadUrl,
@@ -766,6 +833,7 @@ function createTask(options, onUpdate) {
     });
     if (!finalizeResponse.ok) {
       const error = new TaskError(await finalizeResponse.text(), options.taskTemplate, prepareData.taskId);
+      finalizedPromiseWithResolvers.reject(error);
       if (rejectTaskUrlPromise) {
         taskUrlPromiseWithResolvers.reject(error);
       }
@@ -775,6 +843,7 @@ function createTask(options, onUpdate) {
       return;
     }
     const payload = await finalizeResponse.json();
+    finalizedPromiseWithResolvers.resolve(prepareData.taskId);
     taskUrlPromiseWithResolvers.resolve(payload.urls?.show ?? null);
     payloadPromiseWithResolvers.resolve(payload);
     if (onUpdate) {
@@ -783,14 +852,18 @@ function createTask(options, onUpdate) {
     }
   })();
   const asyncIterable = callbackToAsyncIterable((push, _fail, done) => {
-    taskUpdateHandlers.add(function handleUpdate(update) {
+    const handleUpdate = (update) => {
       push(update);
       if (update.type === "taskEnd" || update.type === "taskError" || update.type === "taskAborted") {
         done();
         taskUpdateHandlers.delete(handleUpdate);
       }
-    });
+    };
+    taskUpdateHandlers.add(handleUpdate);
     startMonitoring();
+    return () => {
+      taskUpdateHandlers.delete(handleUpdate);
+    };
   });
   const methods = {
     get catch() {
@@ -827,6 +900,9 @@ function createTask(options, onUpdate) {
         taskId,
         accessToken: options.accessToken
       });
+    },
+    async finalized() {
+      return finalizedPromiseWithResolvers.promise;
     }
   };
   return Object.defineProperties(asyncIterable, Object.getOwnPropertyDescriptors(methods));
@@ -841,6 +917,7 @@ function watchTasks(options) {
   }
   const taskStorage = new Map;
   let startDate = options.since;
+  let lastPosition = null;
   let lastResponse;
   const customFetch = async (url, init) => {
     const response = await fetch(url, init);
@@ -857,12 +934,15 @@ function watchTasks(options) {
     get body() {
       return JSON.stringify({
         since: startDate.toISOString(),
+        lastPosition,
         filter: options.filter
       });
     },
     method: "POST",
     onScheduleReconnect() {
-      startDate = new Date;
+      if (lastPosition === null) {
+        startDate = new Date;
+      }
       options.onReconnecting?.();
     },
     onConnect() {
@@ -874,6 +954,9 @@ function watchTasks(options) {
       }
     },
     onMessage({ id, event, data }) {
+      if (id) {
+        lastPosition = Number(id);
+      }
       const updateResult = eventSchema.safeParse({ event, data });
       if (!updateResult.success) {
         eventSource.close();
@@ -915,10 +998,23 @@ function watchTasks(options) {
         case "taskEnd": {
           storageEntry.result = resolveRequenceTypes(update.result);
           taskStorage.delete(update.taskId);
+          if (update.requireAck) {
+            ackTask({
+              taskId: update.taskId,
+              accessToken: options.accessToken
+            }).catch(() => {});
+          }
           break;
         }
-        case "taskError": {
+        case "taskError":
+        case "taskAborted": {
           taskStorage.delete(update.taskId);
+          if (update.requireAck) {
+            ackTask({
+              taskId: update.taskId,
+              accessToken: options.accessToken
+            }).catch(() => {});
+          }
           break;
         }
       }
@@ -945,6 +1041,9 @@ function watchTasks(options) {
   });
   const asyncIterable = callbackToAsyncIterable((push) => {
     taskUpdateHandlers.add(push);
+    return () => {
+      taskUpdateHandlers.delete(push);
+    };
   });
   const stopWatching = () => {
     eventSource.close();
@@ -960,7 +1059,8 @@ var taskSchema = z6.object({
     "IDLE",
     "PENDING",
     "RUNNING",
-    "STOPPED"
+    "STOPPED",
+    "AWAITING_DELIVERY"
   ]),
   statusText: z6.string().nullable(),
   input: z6.unknown(),
@@ -1028,5 +1128,5 @@ export {
   RequenceFile
 };
 
-//# debugId=F51ECB56265D093964756E2164756E21
+//# debugId=8AA062A0F475E65964756E2164756E21
 //# sourceMappingURL=index.js.map