@push.rocks/taskbuffer 3.5.0 → 4.1.0

package/ts/taskbuffer.classes.taskmanager.ts

@@ -4,7 +4,8 @@ import {
   AbstractDistributedCoordinator,
   type IDistributedTaskRequestResult,
 } from './taskbuffer.classes.distributedcoordinator.js';
-import type { ITaskMetadata, ITaskExecutionReport, IScheduledTaskInfo } from './taskbuffer.interfaces.js';
+import type { ITaskMetadata, ITaskExecutionReport, IScheduledTaskInfo, ITaskEvent } from './taskbuffer.interfaces.js';
+import { logger } from './taskbuffer.logging.js';
 
 export interface ICronJob {
   cronString: string;
@@ -19,6 +20,8 @@ export interface ITaskManagerConstructorOptions {
 export class TaskManager {
   public randomId = plugins.smartunique.shortId();
   public taskMap = new plugins.lik.ObjectMap<Task<any, any>>();
+  public readonly taskSubject = new plugins.smartrx.rxjs.Subject<ITaskEvent>();
+  private taskSubscriptions = new Map<Task<any, any>, plugins.smartrx.rxjs.Subscription>();
   private cronJobManager = new plugins.smarttime.CronManager();
   public options: ITaskManagerConstructorOptions = {
     distributedCoordinator: null,
@@ -37,6 +40,19 @@ export class TaskManager {
       throw new Error('Task must have a name to be added to taskManager');
     }
     this.taskMap.add(task);
+    const subscription = task.eventSubject.subscribe((event) => {
+      this.taskSubject.next(event);
+    });
+    this.taskSubscriptions.set(task, subscription);
+  }
+
+  public removeTask(task: Task<any, any>): void {
+    this.taskMap.remove(task);
+    const subscription = this.taskSubscriptions.get(task);
+    if (subscription) {
+      subscription.unsubscribe();
+      this.taskSubscriptions.delete(task);
+    }
   }
 
   public addAndScheduleTask(task: Task<any, any>, cronString: string) {
@@ -75,31 +91,35 @@ export class TaskManager {
             triggerTime,
           );
           if (!announcementResult.shouldTrigger) {
-            console.log('Distributed coordinator result: NOT EXECUTING');
+            logger.log('info', 'Distributed coordinator result: NOT EXECUTING');
             return;
           } else {
-            console.log('Distributed coordinator result: CHOSEN AND EXECUTING');
+            logger.log('info', 'Distributed coordinator result: CHOSEN AND EXECUTING');
           }
         }
-        await task.trigger();
+        try {
+          await task.trigger();
+        } catch (err) {
+          logger.log('error', `TaskManager: scheduled task "${task.name || 'unnamed'}" failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
       },
     );
     task.cronJob = cronJob;
   }
 
   private logTaskState(task: Task<any, any>) {
-    console.log(`Taskbuffer schedule triggered task >>${task.name}<<`);
+    logger.log('info', `Taskbuffer schedule triggered task >>${task.name}<<`);
     const bufferState = task.buffered
       ? `buffered with max ${task.bufferMax} buffered calls`
       : `unbuffered`;
-    console.log(`Task >>${task.name}<< is ${bufferState}`);
+    logger.log('info', `Task >>${task.name}<< is ${bufferState}`);
   }
 
   private async performDistributedConsultation(
     task: Task<any, any>,
     triggerTime: number,
   ): Promise<IDistributedTaskRequestResult> {
-    console.log('Found a distributed coordinator, performing consultation.');
+    logger.log('info', 'Found a distributed coordinator, performing consultation.');
 
     return this.options.distributedCoordinator.fireDistributedTaskRequest({
       submitterId: this.randomId,
@@ -145,6 +165,10 @@ export class TaskManager {
     if (this.options.distributedCoordinator) {
       await this.options.distributedCoordinator.stop();
     }
+    for (const [, subscription] of this.taskSubscriptions) {
+      subscription.unsubscribe();
+    }
+    this.taskSubscriptions.clear();
   }
 
   // Get metadata for a specific task
@@ -193,6 +217,14 @@ export class TaskManager {
     return scheduledRuns;
   }
 
+  public getTasksByLabel(key: string, value: string): Task<any, any>[] {
+    return this.taskMap.getArray().filter(task => task.labels[key] === value);
+  }
+
+  public getTasksMetadataByLabel(key: string, value: string): ITaskMetadata[] {
+    return this.getTasksByLabel(key, value).map(task => task.getMetadata());
+  }
+
   // Add, execute, and remove a task while collecting metadata
   public async addExecuteRemoveTask<T, TSteps extends ReadonlyArray<{ name: string; description: string; percentage: number }>>(
     task: Task<T, TSteps>,
@@ -231,7 +263,7 @@ export class TaskManager {
       };
       
       // Remove task from manager
-      this.taskMap.remove(task);
+      this.removeTask(task);
       
       // Deschedule if it was scheduled
       if (options?.schedule && task.name) {
@@ -255,7 +287,7 @@ export class TaskManager {
       };
       
       // Remove task from manager even on error
-      this.taskMap.remove(task);
+      this.removeTask(task);
       
       // Deschedule if it was scheduled
       if (options?.schedule && task.name) {

package/ts/taskbuffer.classes.taskparallel.ts

@@ -13,7 +13,9 @@ export class Taskparallel extends Task {
           this.taskArray.forEach(function (taskArg) {
             promiseArray.push(taskArg.trigger());
           });
-          Promise.all(promiseArray).then(done.resolve);
+          Promise.all(promiseArray)
+            .then((results) => done.resolve(results))
+            .catch((err) => done.reject(err));
           return done.promise;
         },
       },

package/ts/taskbuffer.classes.taskrunner.ts

@@ -1,13 +1,14 @@
 import * as plugins from './taskbuffer.plugins.js';
 
 import { Task } from './taskbuffer.classes.task.js';
+import { logger } from './taskbuffer.logging.js';
 
 export class TaskRunner {
-  public maxParrallelJobs: number = 1;
+  public maxParallelJobs: number = 1;
   public status: 'stopped' | 'running' = 'stopped';
   public runningTasks: plugins.lik.ObjectMap<Task> =
     new plugins.lik.ObjectMap<Task>();
-  public qeuedTasks: Task[] = [];
+  public queuedTasks: Task[] = [];
 
   constructor() {
     this.runningTasks.eventSubject.subscribe(async (eventArg) => {
@@ -16,19 +17,19 @@ export class TaskRunner {
   }
 
   /**
-   * adds a task to the qeue
+   * adds a task to the queue
    */
   public addTask(taskArg: Task) {
-    this.qeuedTasks.push(taskArg);
+    this.queuedTasks.push(taskArg);
     this.checkExecution();
   }
 
   /**
    * set amount of parallel tasks
-   * be careful, you might loose dependability of tasks
+   * be careful, you might lose dependability of tasks
    */
-  public setMaxParallelJobs(maxParrallelJobsArg: number) {
-    this.maxParrallelJobs = maxParrallelJobsArg;
+  public setMaxParallelJobs(maxParallelJobsArg: number) {
+    this.maxParallelJobs = maxParallelJobsArg;
   }
 
   /**
@@ -39,17 +40,21 @@ export class TaskRunner {
   }
 
   /**
-   * checks wether execution is on point
+   * checks whether execution is on point
    */
   public async checkExecution() {
     if (
-      this.runningTasks.getArray().length < this.maxParrallelJobs &&
+      this.runningTasks.getArray().length < this.maxParallelJobs &&
       this.status === 'running' &&
-      this.qeuedTasks.length > 0
+      this.queuedTasks.length > 0
     ) {
-      const nextJob = this.qeuedTasks.shift();
+      const nextJob = this.queuedTasks.shift();
       this.runningTasks.add(nextJob);
-      await nextJob.trigger();
+      try {
+        await nextJob.trigger();
+      } catch (err) {
+        logger.log('error', `TaskRunner: task "${nextJob.name || 'unnamed'}" failed: ${err instanceof Error ? err.message : String(err)}`);
+      }
       this.runningTasks.remove(nextJob);
       this.checkExecution();
     }

package/ts/taskbuffer.interfaces.ts

@@ -15,6 +15,9 @@ export interface ITaskMetadata {
   buffered?: boolean;
   bufferMax?: number;
   timeout?: number;
+  lastError?: string;
+  errorCount?: number;
+  labels?: Record<string, string>;
 }
 
 export interface ITaskExecutionReport {
@@ -36,4 +39,14 @@ export interface IScheduledTaskInfo {
   lastRun?: Date;
   steps?: ITaskStep[];
   metadata?: ITaskMetadata;
+}
+
+export type TTaskEventType = 'started' | 'step' | 'completed' | 'failed';
+
+export interface ITaskEvent {
+  type: TTaskEventType;
+  task: ITaskMetadata;
+  timestamp: number;
+  stepName?: string;   // present when type === 'step'
+  error?: string;      // present when type === 'failed'
 }

package/ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/taskbuffer',
-  version: '3.5.0',
+  version: '4.1.0',
   description: 'A flexible task management library supporting TypeScript, allowing for task buffering, scheduling, and execution with dependency management.'
 }