@adminforth/background-jobs 1.3.0 → 1.4.0

package/build.log

@@ -11,5 +11,5 @@ custom/StateToIcon.vue
 custom/tsconfig.json
 custom/utils.ts
 
-sent 12,276 bytes  received 134 bytes  24,820.00 bytes/sec
-total size is 11,791  speedup is 0.95
+sent 12,501 bytes  received 134 bytes  25,270.00 bytes/sec
+total size is 12,016  speedup is 0.95

package/custom/NavbarJobs.vue

@@ -97,11 +97,18 @@
         if (data.finishedAt) {
           jobs.value[jobIndex].finishedAt = data.finishedAt;
         }
+        if (data.state) {
+          jobs.value[jobIndex].state = {
+            ...jobs.value[jobIndex].state,
+            ...data.state,
+          };
+        }
       } else {
         jobs.value.unshift({
           id: data.jobId,
           name: data.name || 'Unknown Job',
           status: data.status || 'IN_PROGRESS',
+          state: data.state || {},
           progress: data.progress || 0,
           createdAt: data.createdAt || new Date().toISOString(),
           customComponent: data.customComponent,

package/custom/utils.ts

@@ -3,6 +3,7 @@ export interface IJob {
   id: string;
   name: string;
   status: 'IN_PROGRESS' | 'DONE' | 'DONE_WITH_ERRORS' | 'CANCELLED';
+  state: Record<string, any>;
   progress: number; // 0 to 100
   createdAt: Date;
   finishedAt?: Date;

package/dist/custom/NavbarJobs.vue

@@ -97,11 +97,18 @@
         if (data.finishedAt) {
           jobs.value[jobIndex].finishedAt = data.finishedAt;
         }
+        if (data.state) {
+          jobs.value[jobIndex].state = {
+            ...jobs.value[jobIndex].state,
+            ...data.state,
+          };
+        }
       } else {
         jobs.value.unshift({
           id: data.jobId,
           name: data.name || 'Unknown Job',
           status: data.status || 'IN_PROGRESS',
+          state: data.state || {},
           progress: data.progress || 0,
           createdAt: data.createdAt || new Date().toISOString(),
           customComponent: data.customComponent,

package/dist/custom/utils.ts

@@ -3,6 +3,7 @@ export interface IJob {
   id: string;
   name: string;
   status: 'IN_PROGRESS' | 'DONE' | 'DONE_WITH_ERRORS' | 'CANCELLED';
+  state: Record<string, any>;
   progress: number; // 0 to 100
   createdAt: Date;
   finishedAt?: Date;

package/dist/index.js

@@ -12,6 +12,8 @@ import { afLogger } from "adminforth";
 import pLimit from 'p-limit';
 import { Level } from 'level';
 import fs from 'fs/promises';
+import { Mutex } from 'async-mutex';
+const mutex = new Mutex();
 export default class BackgroundJobsPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
@@ -147,6 +149,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
                 [this.options.progressField]: 0,
                 [this.options.statusField]: 'IN_PROGRESS',
                 [this.options.jobHandlerField]: jobHandlerName,
+                [this.options.stateField]: '{}'
             };
             const creationResult = yield this.adminforth.resource(this.getResourceId()).create(objectToSave);
             let createdRecord = null;
@@ -174,6 +177,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
             });
             yield Promise.all(createTaskRecordsPromises);
             this.runProcessingTasks(tasks, jobLevelDb, jobId, handleTask, parrallelLimit);
+            return jobId;
         });
     }
     runProcessingTasks(tasks, jobLevelDb, jobId, handleTask, parrallelLimit) {
@@ -209,7 +213,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
                 this.adminforth.websocket.publish(`/background-jobs-task-update/${jobId}`, { taskIndex, status: "IN_PROGRESS" });
                 //handling the task 
                 try {
-                    yield handleTask({ setTaskStateField, getTaskStateField });
+                    yield handleTask({ jobId, setTaskStateField, getTaskStateField });
                     //Set task status to completed in level db
                     yield this.setLevelDbTaskStatusField(jobLevelDb, taskIndex.toString(), 'DONE');
                     this.adminforth.websocket.publish(`/background-jobs-task-update/${jobId}`, { taskIndex, status: "DONE" });
@@ -319,6 +323,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
             const state = jobRecord[this.options.stateField];
             const parsedState = JSON.parse(state);
             parsedState[key] = value;
+            this.adminforth.websocket.publish(`/background-jobs`, { jobId, state: parsedState });
             yield this.adminforth.resource(this.getResourceId()).update(jobId, {
                 [this.options.stateField]: JSON.stringify(parsedState),
             });
@@ -385,6 +390,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
                         createdAt: job[this.options.createdAtField],
                         finishedAt: job[this.options.finishedAtField] || null,
                         status: job[this.options.statusField],
+                        state: JSON.parse(job[this.options.stateField]),
                         progress: job[this.options.progressField],
                         customComponent: this.jobCustomComponents[job[this.options.jobHandlerField]],
                     };

package/index.ts

@@ -1,15 +1,18 @@
 import { AdminForthPlugin, Filters, Sorts } from "adminforth";
-import type { IAdminForth, IHttpServer, AdminForthResourcePages, AdminForthResourceColumn, AdminForthDataTypes, AdminForthResource, AdminUser, AdminForthComponentDeclarationFull } from "adminforth";
+import type { IAdminForth, IHttpServer, AdminForthResource, AdminUser, AdminForthComponentDeclarationFull } from "adminforth";
 import type { PluginOptions } from './types.js';
 import { afLogger } from "adminforth";
 import pLimit from 'p-limit';
 import { Level } from 'level';
 import fs from 'fs/promises';
+import {Mutex, MutexInterface, Semaphore, SemaphoreInterface, withTimeout} from 'async-mutex';
+
+const mutex = new Mutex();
 
 type TaskStatus = 'SCHEDULED' | 'IN_PROGRESS' | 'DONE' | 'FAILED';
 type setStateFieldParams = (state: Record<string, any>) => void;
 type getStateFieldParams = () => any;
-type taskHandlerType = ( { setTaskStateField, getTaskStateField }: { setTaskStateField: setStateFieldParams; getTaskStateField: getStateFieldParams } ) => Promise<void>;
+type taskHandlerType = ( { jobId, setTaskStateField, getTaskStateField }: { jobId: string; setTaskStateField: setStateFieldParams; getTaskStateField: getStateFieldParams } ) => Promise<void>;
 type taskType = {
   skip?: boolean;
   state: Record<string, any>;
@@ -146,7 +149,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
     adminUser: AdminUser,
     tasks: taskType[],
     jobHandlerName: string,
-  ) {
+  ): Promise<string> {
 
     const handleTask: taskHandlerType = this.taskHandlers[jobHandlerName];
     if (!handleTask) {
@@ -161,6 +164,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
       [this.options.progressField]: 0,
       [this.options.statusField]: 'IN_PROGRESS',
       [this.options.jobHandlerField]: jobHandlerName,
+      [this.options.stateField]: '{}'
     }
 
     const creationResult = await this.adminforth.resource(this.getResourceId()).create(objectToSave);
@@ -193,6 +197,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
     await Promise.all(createTaskRecordsPromises);
 
     this.runProcessingTasks(tasks, jobLevelDb, jobId, handleTask, parrallelLimit);
+    return jobId;
   }
 
   private async runProcessingTasks(
@@ -238,7 +243,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
 
       //handling the task 
       try {
-        await handleTask({ setTaskStateField, getTaskStateField });
+        await handleTask({ jobId, setTaskStateField, getTaskStateField });
 
         //Set task status to completed in level db
         await this.setLevelDbTaskStatusField(jobLevelDb, taskIndex.toString(), 'DONE');
@@ -348,6 +353,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
     const state = jobRecord[this.options.stateField];
     const parsedState = JSON.parse(state);
     parsedState[key] = value;
+    this.adminforth.websocket.publish(`/background-jobs`, { jobId, state: parsedState });
     await this.adminforth.resource(this.getResourceId()).update(jobId, {
       [this.options.stateField]: JSON.stringify(parsedState),
     });
@@ -415,6 +421,7 @@ export default class BackgroundJobsPlugin extends AdminForthPlugin {
             createdAt: job[this.options.createdAtField],
             finishedAt: job[this.options.finishedAtField] || null,
             status: job[this.options.statusField],
+            state: JSON.parse(job[this.options.stateField]),
             progress: job[this.options.progressField],
             customComponent: this.jobCustomComponents[job[this.options.jobHandlerField]],
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/background-jobs",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -21,6 +21,7 @@
   "dependencies": {
     "@vueuse/core": "^14.2.1",
     "adminforth": "latest",
+    "async-mutex": "^0.5.0",
     "level": "^10.0.0",
     "p-limit": "^7.3.0"
   }