@tstdl/base 0.93.134 → 0.93.136

package/document-management/server/services/document-validation.service.js

@@ -37,7 +37,7 @@ let DocumentValidationService = DocumentValidationService_1 = class DocumentVali
     #validationExecutionService = injectRepository(DocumentValidationExecution);
     #validationExecutionRelatedDocumentService = injectRepository(DocumentValidationExecutionRelatedDocument);
     #documentTypeValidationService = injectRepository(DocumentTypeValidation);
-    #taskQueue = inject((TaskQueue), { namespace: 'DocumentManagement:validation', visibilityTimeout: 5 * millisecondsPerMinute, maxTries: 3 });
+    #taskQueue = inject((TaskQueue), { namespace: 'DocumentManagement:Validation', visibilityTimeout: 5 * millisecondsPerMinute, maxTries: 3 });
     #executors = injectAll(DOCUMENT_VALIDATION_EXECUTORS);
     #logger = inject(Logger, DocumentValidationService_1.name);
     #executorMap = new Map(this.#executors.map((executor) => [executor.identifier, executor]));

package/document-management/server/services/document-workflow.service.js

@@ -37,7 +37,7 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
     #documentAssignmentTaskRepository = injectRepository(DocumentAssignmentTask);
     #documentAssignmentScopeRepository = injectRepository(DocumentAssignmentScope);
     #observationService = inject(DocumentManagementObservationService);
-    #taskQueue = inject((TaskQueue), { namespace: 'DocumentManagement:DocumentWorkflow', visibilityTimeout: 5 * 60 * 1000, maxTries: 3 });
+    #taskQueue = inject((TaskQueue), { namespace: 'DocumentManagement:Workflow', visibilityTimeout: 5 * 60 * 1000, maxTries: 3 });
     #logger = inject(Logger, DocumentWorkflowService_1.name);
     documentService = inject(forwardRef(() => DocumentService));
     repository = injectRepository(DocumentWorkflow);
@@ -107,7 +107,7 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
     async initiateWorkflow(tenantId, documentId, step, skipAi) {
         const workflow = await this.repository.insert({ tenantId, documentId, step, state: 'pending', failReason: null, completeTimestamp: null, completeUserId: null, skipAi });
         if (!skipAi) {
-            await this.#taskQueue.enqueue('workflow', { workflowId: workflow.id });
+            await this.#taskQueue.enqueue(step, { workflowId: workflow.id });
         }
         this.#observationService.documentChange(workflow.id, this.session);
         return workflow;

package/notification/server/services/notification-delivery.worker.d.ts

@@ -5,7 +5,7 @@ import { TaskProcessResult } from '../../../task-queue/task-queue.js';
 import { NotificationChannel } from '../../models/index.js';
 import type { ChannelProvider } from '../providers/channel-provider.js';
 export type NotificationTaskDefinitions = TaskDefinitionMap<{
-    'notification/deliver': TaskDefinition<{
+    deliver: TaskDefinition<{
         notificationId: string;
     }>;
 }>;

package/notification/server/services/notification.service.js

@@ -44,7 +44,7 @@ let NotificationService = NotificationService_1 = class NotificationService exte
                 currentStep: 0,
             };
             const insertedNotification = await this.#notificationLogRepository.withTransaction(tx).insert(notificationToInsert);
-            await this.#taskQueue.withTransaction(tx).enqueue('notification/deliver', { notificationId: insertedNotification.id });
+            await this.#taskQueue.withTransaction(tx).enqueue('deliver', { notificationId: insertedNotification.id });
         });
     }
     async listInApp(tenantId, userId, options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.134",
+  "version": "0.93.136",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -162,8 +162,8 @@
     "file-type": "^21.3",
     "genkit": "^1.28",
     "handlebars": "^4.7",
-    "@aws-sdk/client-s3": "^3.992",
-    "@aws-sdk/s3-request-presigner": "^3.992",
+    "@aws-sdk/client-s3": "^3.993",
+    "@aws-sdk/s3-request-presigner": "^3.993",
     "mjml": "^4.18",
     "nodemailer": "^8.0",
     "pg": "^8.18",

package/task-queue/task-context.d.ts

@@ -3,7 +3,7 @@ import type { Logger } from '../logger/index.js';
 import type { Transaction } from '../orm/server/index.js';
 import { TaskQueue, type EnqueueManyItem, type EnqueueOptions } from './task-queue.js';
 import type { TaskData, TaskDefinitionMap, TaskOfType, TaskResult, TaskState, TaskTypes } from './types.js';
-export declare class TaskContext<Definitions extends TaskDefinitionMap, Type extends TaskTypes<Definitions>> {
+export declare class TaskContext<Definitions extends TaskDefinitionMap, Type extends TaskTypes<Definitions> = TaskTypes<Definitions>> {
     #private;
     constructor(queue: TaskQueue<Definitions>, task: TaskOfType<Definitions, Type>, signal: CancellationToken, logger: Logger);
     get id(): string;

package/task-queue/task-queue.js

@@ -104,7 +104,7 @@ export class TaskQueue extends Transactional {
     async processWorker(cancellationSignal, handler, options) {
         for await (const task of this.getConsumer(cancellationSignal, options)) {
             const taskToken = cancellationSignal.createChild();
-            const context = new TaskContext(this, task, taskToken, this.logger);
+            const context = new TaskContext(this, task, taskToken, this.logger.with({ type: task.type }));
             let isTaskActive = true;
             context.logger.verbose(`Processing task`);
             void (async () => {
@@ -115,7 +115,7 @@ export class TaskQueue extends Transactional {
                     }
                     try {
                         const touchedTask = await this.touch(task);
-                        if (isUndefined(touchedTask)) {
+                        if (isUndefined(touchedTask) && taskToken.isUnset) {
                             context.logger.warn(`Task lost lease. Aborting.`);
                             isTaskActive = false;
                             taskToken.set();