@decaf-ts/core 0.26.1 → 0.26.3

package/lib/cjs/utils/throttling.cjs

@@ -1,57 +1,107 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ThrottleMode = void 0;
+exports.splitByCount = splitByCount;
+exports.splitBySize = splitBySize;
 exports.throttle = throttle;
 const decoration_1 = require("@decaf-ts/decoration");
 const index_js_1 = require("./../persistence/index.cjs");
 const db_decorators_1 = require("@decaf-ts/db-decorators");
-function throttle(cfg = { count: 1 }, argIndex = 0) {
-    return function throttle(target, propertyKey, descriptor) {
+(function (ThrottleMode) {
+    ThrottleMode["BY_COUNT"] = "count";
+    ThrottleMode["BY_SIZE"] = "size";
+})(exports.ThrottleMode || (exports.ThrottleMode = {}));
+function splitByCount(count) {
+    if (count <= 0)
+        throw new db_decorators_1.InternalError("splitByCount: count must be greater than zero");
+    return (items) => {
+        const chunks = [];
+        for (let i = 0; i < items.length; i += count)
+            chunks.push(items.slice(i, i + count));
+        return chunks;
+    };
+}
+function splitBySize(maxBytes) {
+    if (maxBytes <= 0)
+        throw new db_decorators_1.InternalError("splitBySize: maxBytes must be greater than zero");
+    return (items) => {
+        const chunks = [];
+        let current = [];
+        let size = 0;
+        for (const item of items) {
+            const itemSize = safeByteLength(item);
+            if (current.length > 0 && size + itemSize > maxBytes) {
+                chunks.push(current);
+                current = [item];
+                size = itemSize;
+            }
+            else {
+                current.push(item);
+                size += itemSize;
+            }
+        }
+        if (current.length > 0)
+            chunks.push(current);
+        return chunks;
+    };
+}
+function throttle(value, modeOrOptions, maybeOptions) {
+    let splitter;
+    let options;
+    if (typeof value === "function") {
+        splitter = value;
+        options = modeOrOptions ?? {};
+    }
+    else {
+        const mode = typeof modeOrOptions === "string"
+            ? modeOrOptions
+            : exports.ThrottleMode.BY_COUNT;
+        options =
+            (typeof modeOrOptions === "object" && !Array.isArray(modeOrOptions)
+                ? modeOrOptions
+                : maybeOptions) ?? {};
+        splitter =
+            mode === exports.ThrottleMode.BY_SIZE ? splitBySize(value) : splitByCount(value);
+    }
+    const { delayMs, argIndex = 0 } = options;
+    return function throttleDecorator(target, propertyKey, descriptor) {
         function throttleDec(target, propertyKey, descriptor) {
             descriptor.value = new Proxy(descriptor.value, {
-                async apply(target, thisArg, args) {
+                async apply(originalFn, thisArg, args) {
                     const invocationArgs = args;
-                    const effectiveCfg = (() => {
-                        try {
-                            return typeof cfg === "function"
-                                ? cfg(...invocationArgs)
-                                : cfg;
-                        }
-                        catch (e) {
-                            throw new db_decorators_1.InternalError(`Failed to obtain throttling configuration from handler: ${e}`);
-                        }
-                    })();
-                    const { log, ctx } = (await thisArg["logCtx"](args, index_js_1.PersistenceKeys.THROTTLE, true)).for(throttle);
+                    const { log, ctx } = (await thisArg["logCtx"](args, originalFn.name, true)).for(throttle);
                     const normalizedIndices = normalizeArgIndex(argIndex);
-                    if (!normalizedIndices.length) {
-                        throw new db_decorators_1.InternalError("@throttling() expects at least one argument index to throttle");
-                    }
+                    if (!normalizedIndices.length)
+                        throw new db_decorators_1.InternalError("@throttle() expects at least one argument index to throttle");
                     normalizedIndices.forEach((index) => {
                         if (index >= invocationArgs.length)
-                            throw new db_decorators_1.InternalError(`@throttling() requires argument index ${index} but only ${invocationArgs.length} provided`);
+                            throw new db_decorators_1.InternalError(`@throttle() requires argument index ${index} but only ${invocationArgs.length} provided`);
                         if (!Array.isArray(invocationArgs[index]))
-                            throw new db_decorators_1.InternalError(`@throttling() expects argument at index ${index} to be an array`);
+                            throw new db_decorators_1.InternalError(`@throttle() expects argument at index ${index} to be an array`);
                     });
                     const arrays = normalizedIndices.map((idx) => invocationArgs[idx]);
                     const total = arrays[0].length;
-                    if (!arrays.every((arr) => arr.length === total)) {
-                        throw new db_decorators_1.InternalError("@throttling() requires all targeted arguments to have the same length");
-                    }
-                    if (total === 0) {
-                        return target.apply(thisArg, invocationArgs);
-                    }
-                    const chunkBounds = buildChunkBounds(total, arrays, effectiveCfg);
-                    const chunkArgsList = chunkBounds.map(({ start, end }) => invocationArgs.map((arg, idx) => {
-                        const targetIdx = normalizedIndices.indexOf(idx);
-                        if (targetIdx === -1)
-                            return arg;
-                        return arrays[targetIdx].slice(start, end);
-                    }));
-                    const breakOnSingleFailure = ctx.get("breakOnSingleFailureInBulk") ?? true;
+                    if (!arrays.every((arr) => arr.length === total))
+                        throw new db_decorators_1.InternalError("@throttle() requires all targeted arguments to have the same length");
+                    if (total === 0)
+                        return originalFn.apply(thisArg, invocationArgs);
+                    const primaryChunks = splitter(arrays[0]);
+                    const chunkArgsList = buildChunkArgsList(primaryChunks, arrays, normalizedIndices, invocationArgs);
+                    const breakOnSingleFailure = options.breakOnSingleFailure ??
+                        (() => {
+                            try {
+                                return ctx.get("breakOnSingleFailureInBulk");
+                            }
+                            catch {
+                                return undefined;
+                            }
+                        })() ??
+                        true;
                     const collectedResults = [];
                     const errors = [];
                     for (const chunkArgs of chunkArgsList) {
                         try {
-                            const chunkResult = await target.apply(thisArg, chunkArgs);
+                            const chunkResult = await originalFn.apply(thisArg, chunkArgs);
                             mergeResult(chunkResult, collectedResults);
                         }
                         catch (error) {
@@ -59,9 +109,8 @@ function throttle(cfg = { count: 1 }, argIndex = 0) {
                                 throw error;
                             errors.push(error);
                         }
-                        if (effectiveCfg.delayMs) {
-                            await new Promise((resolve) => setTimeout(resolve, effectiveCfg.delayMs));
-                        }
+                        if (delayMs)
+                            await new Promise((resolve) => setTimeout(resolve, delayMs));
                     }
                     if (errors.length) {
                         log.warn(`${String(propertyKey)} throttled execution continued with ${errors.length} failure(s)`);
@@ -73,56 +122,32 @@ function throttle(cfg = { count: 1 }, argIndex = 0) {
                 },
             });
         }
-        return (0, decoration_1.apply)((0, decoration_1.methodMetadata)(decoration_1.Metadata.key(index_js_1.PersistenceKeys.THROTTLE, propertyKey), cfg), throttleDec)(target, propertyKey, descriptor);
+        return (0, decoration_1.apply)((0, decoration_1.methodMetadata)(decoration_1.Metadata.key(index_js_1.PersistenceKeys.THROTTLE, propertyKey), options), throttleDec)(target, propertyKey, descriptor);
     };
 }
 function normalizeArgIndex(argIndex) {
     const entries = (Array.isArray(argIndex) ? argIndex : [argIndex]).map((idx) => {
         if (!Number.isFinite(idx) || idx < 0)
-            throw new db_decorators_1.InternalError("@throttling() argument indexes must be non-negative integers");
+            throw new db_decorators_1.InternalError("@throttle() argument indexes must be non-negative integers");
         return idx;
     });
     return Array.from(new Set(entries)).sort((a, b) => a - b);
 }
-function buildChunkBounds(total, arrays, cfg) {
-    if ("count" in cfg) {
-        if (cfg.count <= 0)
-            throw new db_decorators_1.InternalError("@throttling() configuration 'count' must be greater than zero");
-        const spans = [];
-        for (let start = 0; start < total; start += cfg.count) {
-            spans.push({
-                start,
-                end: Math.min(total, start + cfg.count),
-            });
-        }
-        return spans;
-    }
-    if ("bufferSize" in cfg) {
-        if (cfg.bufferSize <= 0)
-            throw new db_decorators_1.InternalError("@throttling() configuration 'bufferSize' must be greater than zero");
-        const spans = [];
-        let start = 0;
-        let size = 0;
-        for (let idx = 0; idx < total; idx++) {
-            const entrySize = estimateEntrySize(arrays, idx);
-            if (size > 0 && size + entrySize > cfg.bufferSize) {
-                spans.push({ start, end: idx });
-                start = idx;
-                size = entrySize;
-            }
-            else {
-                size += entrySize;
-            }
-        }
-        if (start < total || !spans.length) {
-            spans.push({ start, end: total });
-        }
-        return spans;
-    }
-    return [{ start: 0, end: total }];
-}
-function estimateEntrySize(arrays, index) {
-    return arrays.reduce((acc, array) => acc + safeByteLength(array[index]), 0);
+function buildChunkArgsList(primaryChunks, arrays, normalizedIndices, invocationArgs) {
+    let offset = 0;
+    return primaryChunks.map((chunk) => {
+        const chunkLen = chunk.length;
+        const args = invocationArgs.map((arg, idx) => {
+            const targetIdx = normalizedIndices.indexOf(idx);
+            if (targetIdx === -1)
+                return arg;
+            return targetIdx === 0
+                ? chunk
+                : arrays[targetIdx].slice(offset, offset + chunkLen);
+        });
+        offset += chunkLen;
+        return args;
+    });
 }
 function safeByteLength(value) {
     if (value === null || typeof value === "undefined")

package/lib/cjs/utils/throttling.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"throttling.js","sourceRoot":"","sources":["throttling.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"throttling.js","sourceRoot":"","sources":["throttling.js"],"names":[],"mappings":"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"}

package/lib/esm/index.js

@@ -33,21 +33,21 @@ export * from "./persistence/index.js";
  * @const VERSION
  * @memberOf module:core
  */
-export const VERSION = "0.26.0";
+export const VERSION = "0.26.2";
 /**
  * @description Represents the current commit hash of the module build.
  * @summary Stores the current git commit hash for the package. The build replaces
  * the placeholder with the actual commit hash at publish time.
  * @const COMMIT
  */
-export const COMMIT = "f4fed58";
+export const COMMIT = "3e8a41d";
 /**
  * @description Represents the full version string of the module.
  * @summary Stores the semver version and commit hash for the package.
  * The build replaces the placeholder with the actual `<version>-<commit>` value at publish time.
  * @const FULL_VERSION
  */
-export const FULL_VERSION = "0.26.0-f4fed58";
+export const FULL_VERSION = "0.26.2-3e8a41d";
 /**
  * @description Stores the current package version
  * @summary A constant representing the version of the core package

package/lib/esm/tasks/TaskContext.js

@@ -81,12 +81,19 @@ export class TaskContext extends Context {
     scheduleSteps(...steps) {
         const normalized = (steps ?? []).map((step) => step instanceof TaskStepSpecModel ? step : new TaskStepSpecModel(step));
         return {
-            afterCurrent: async () => {
+            afterCurrent: async (ctx) => {
                 const scheduler = this.getOrUndefined("scheduleCompositeSteps");
                 if (!scheduler) {
                     throw new InternalError("scheduleSteps().afterCurrent() is only available while running a composite task step");
                 }
-                await scheduler(normalized);
+                await scheduler(normalized, ctx);
+            },
+            atEnd: async (ctx) => {
+                const scheduler = this.getOrUndefined("scheduleCompositeStepsAtEnd");
+                if (!scheduler) {
+                    throw new InternalError("scheduleSteps().atEnd() is only available while running a composite task step");
+                }
+                await scheduler(normalized, ctx);
             },
         };
     }

package/lib/esm/tasks/TaskContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskContext.js","sourceRoot":"","sources":["../../../src/tasks/TaskContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TaskContext.js","sourceRoot":"","sources":["../../../src/tasks/TaskContext.ts"],"names":[],"mappings":"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"}

package/lib/esm/tasks/TaskEngine.js

@@ -708,7 +708,8 @@ export class TaskEngine extends AbsContextual {
                 totalSteps: steps.length,
             });
             const stepIndex = idx;
-            context.cache.put("scheduleCompositeSteps", async (newSteps) => {
+            context.cache.put("scheduleCompositeSteps", async (newSteps, ctx) => {
+                const log = ctx.logger.for("scheduleSteps.afterCurrent");
                 const normalizedNewSteps = this.normalizeSteps(newSteps);
                 if (!normalizedNewSteps.length)
                     return;
@@ -719,6 +720,31 @@ export class TaskEngine extends AbsContextual {
                 const persisted = await this.tasks.update(task, context);
                 Object.assign(task, persisted);
                 steps = this.normalizeSteps(task.steps);
+                log.verbose(`Inserted ${normalizedNewSteps.length} steps at index ${insertionIndex}`);
+                const updateEvent = await this.persistEvent(context, task.id, TaskEventType.UPDATE, {
+                    status: "update",
+                    currentStep: stepIndex,
+                    totalSteps: steps.length,
+                    output: {
+                        added: normalizedNewSteps.length,
+                        insertionIndex,
+                    },
+                });
+                this.bus.emit(updateEvent, context);
+            });
+            context.cache.put("scheduleCompositeStepsAtEnd", async (newSteps, ctx) => {
+                const log = ctx.logger.for("scheduleSteps.atEnd");
+                const normalizedNewSteps = this.normalizeSteps(newSteps);
+                if (!normalizedNewSteps.length)
+                    return;
+                const currentSteps = this.normalizeSteps(task.steps);
+                const insertionIndex = currentSteps.length;
+                currentSteps.push(...normalizedNewSteps);
+                task.steps = currentSteps;
+                const persisted = await this.tasks.update(task, context);
+                Object.assign(task, persisted);
+                steps = this.normalizeSteps(task.steps);
+                log.verbose(`Appended ${normalizedNewSteps.length} steps at tail (index ${insertionIndex})`);
                 const updateEvent = await this.persistEvent(context, task.id, TaskEventType.UPDATE, {
                     status: "update",
                     currentStep: stepIndex,
@@ -734,34 +760,53 @@ export class TaskEngine extends AbsContextual {
                 LogLevel.info,
                 `Composite step ${idx + 1}/${steps.length}: ${step.classification}`,
             ]);
-            try {
-                const out = await handler.run(step.input, context);
-                // Ensure step-tagged logs are flushed before advancing the step pointer.
-                await context.flush();
-                const now = new Date();
-                results[stepIndex] = new TaskStepResultModel({
-                    status: TaskStatus.SUCCEEDED,
-                    output: out,
-                    createdAt: now,
-                    updatedAt: now,
-                });
-                const cacheKey = `${task.id}:step:${stepIndex}`;
-                cacheResult(step.classification, out);
-                cacheResult(cacheKey, out);
-                idx = stepIndex + 1;
-                task.stepResults = results;
-                task.currentStep = idx;
-                const persisted = await this.tasks.update(task);
-                Object.assign(task, persisted);
-                await this.emitProgress(context, task.id, {
-                    currentStep: idx,
-                    totalSteps: steps.length,
-                    output: out,
-                });
+            const stepMaxAttempts = step.maxAttempts ?? 1;
+            let stepAttempt = 0;
+            let lastStepErr;
+            while (stepAttempt < stepMaxAttempts) {
+                try {
+                    const out = await handler.run(step.input, context);
+                    // Ensure step-tagged logs are flushed before advancing the step pointer.
+                    await context.flush();
+                    const now = new Date();
+                    results[stepIndex] = new TaskStepResultModel({
+                        status: TaskStatus.SUCCEEDED,
+                        output: out,
+                        attempt: stepAttempt + 1,
+                        createdAt: now,
+                        updatedAt: now,
+                    });
+                    const cacheKey = `${task.id}:step:${stepIndex}`;
+                    cacheResult(step.classification, out);
+                    cacheResult(cacheKey, out);
+                    idx = stepIndex + 1;
+                    task.stepResults = results;
+                    task.currentStep = idx;
+                    const persisted = await this.tasks.update(task);
+                    Object.assign(task, persisted);
+                    await this.emitProgress(context, task.id, {
+                        currentStep: idx,
+                        totalSteps: steps.length,
+                        output: out,
+                    });
+                    lastStepErr = undefined;
+                    break;
+                }
+                catch (err) {
+                    stepAttempt++;
+                    lastStepErr = err;
+                    if (stepAttempt < stepMaxAttempts) {
+                        const stepBackoff = this.normalizeBackoff(step.backoff ?? task.backoff);
+                        const delay = computeBackoffMs(stepAttempt, stepBackoff);
+                        await context.pipe(LogLevel.warn, `Composite step ${idx} attempt ${stepAttempt}/${stepMaxAttempts} failed, retrying in ${delay}ms`, { classification: step.classification, attempt: stepAttempt, delay });
+                        await sleep(delay);
+                        await context.heartbeat();
+                    }
+                }
             }
-            catch (err) {
+            if (lastStepErr) {
                 try {
-                    await handler.catch?.(step.input, err, context);
+                    await handler.catch?.(step.input, lastStepErr, context);
                 }
                 catch (catchErr) {
                     ctx.logger.warn("composite step catch() hook failed", {
@@ -771,17 +816,18 @@ export class TaskEngine extends AbsContextual {
                 const now = new Date();
                 results[idx] = new TaskStepResultModel({
                     status: TaskStatus.FAILED,
-                    error: serializeError(err),
+                    error: serializeError(lastStepErr),
+                    attempt: stepAttempt,
                     createdAt: now,
                     updatedAt: now,
                 });
                 task.stepResults = results;
                 task.currentStep = idx;
-                task.error = serializeError(err);
+                task.error = serializeError(lastStepErr);
                 // persist failure context before throwing (retry logic happens outside)
                 const persisted = await this.tasks.update(task);
                 Object.assign(task, persisted);
-                throw err;
+                throw lastStepErr;
             }
         }
         return { stepResults: results };