@tstdl/base 0.93.156 → 0.93.157

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

@@ -42,7 +42,7 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
     documentService = inject(forwardRef(() => DocumentService));
     repository = injectRepository(DocumentWorkflow);
     [afterResolve](_, { cancellationSignal }) {
-        if (this.isInTransaction) {
+        if (this.isFork) {
             return;
         }
         this.#taskQueue.process({ concurrency: 5, cancellationSignal }, async (taskContext) => await this.processWorkflowJob(taskContext));

package/orm/server/repository.js

@@ -101,7 +101,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         return this.#table;
     }
     [afterResolve]() {
-        if (!this.isInTransaction) {
+        if (!this.isFork) {
             void this.expirationLoop();
         }
     }

package/orm/server/transactional.d.ts

@@ -11,6 +11,7 @@ export type TransactionInitOptions = TransactionConfig & {
 };
 export type TransactionHandler<R> = (transaction: Transaction) => Promise<R>;
 type TransactionalContext<ContextData = unknown> = {
+    isFork: boolean;
     session: Database | PgTransaction;
     instances: WeakMap<Type, WeakMap<Database | PgTransaction, any>>;
     data: ContextData;
@@ -26,6 +27,7 @@ export declare abstract class Transactional<ContextData = unknown> {
     protected transactionalContextData: ContextData | undefined;
     readonly session: Database | PgTransaction;
     readonly isInTransaction: boolean;
+    readonly isFork: boolean;
     constructor();
     /**
      * Starts a new database transaction.

package/orm/server/transactional.js

@@ -42,6 +42,7 @@ export class Transactional {
     transactionalContextData = this.#context.data;
     session = this.#context.session ?? inject(Database);
     isInTransaction = this.session instanceof DrizzlePgTransaction;
+    isFork = (this.#context.isFork ?? false) || this.isInTransaction;
     constructor() {
         this.#classConstructor = new.target;
     }
@@ -77,6 +78,7 @@ export class Transactional {
             return this;
         }
         const context = {
+            isFork: true,
             session,
             instances: this.#instances,
             data: this.getTransactionalContextData(),
@@ -119,6 +121,7 @@ export class Transactional {
             return await this.transaction(handler);
         }
         const context = {
+            isFork: true,
             session: existingTransaction.pgTransaction,
             instances: this.#instances,
             data: this.getTransactionalContextData(),
@@ -139,6 +142,7 @@ export class Transactional {
     async transaction(handler, config) {
         const transaction = await this.startTransaction(config);
         const context = {
+            isFork: true,
             session: transaction.pgTransaction,
             instances: this.#instances,
             data: this.getTransactionalContextData(),

package/orm/sqls/sqls.js

@@ -8,7 +8,7 @@ import { and, Column, eq, isSQLWrapper, sql, isNotNull as sqlIsNotNull, isNull a
 import { match, P } from 'ts-pattern';
 import { distinct, toArray } from '../../utils/array/array.js';
 import { objectEntries, objectValues } from '../../utils/object/object.js';
-import { assertDefined, isArray, isBoolean, isDefined, isInstanceOf, isNotNull, isNull, isNullOrUndefined, isNumber, isObject, isString } from '../../utils/type-guards.js';
+import { assertDefined, isArray, isBoolean, isDefined, isInstanceOf, isLiteralObject, isNotNull, isNull, isNullOrUndefined, isNumber, isString } from '../../utils/type-guards.js';
 import { getEnumName } from '../enums.js';
 import { caseWhen } from './case-when.js';
 const isJsonbSymbol = Symbol('isJsonb');
@@ -454,8 +454,17 @@ export function buildJsonb(value) {
         const elements = value.map((inner) => buildJsonb(inner));
         return markAsJsonb(sql `jsonb_build_array(${sql.join(elements, sql `, `)})`);
     }
-    if (isObject(value)) {
+    if (isLiteralObject(value)) {
         return jsonbBuildObject(value);
     }
+    if (isString(value)) {
+        return markAsJsonb(sql `to_jsonb(${value}::text)`);
+    }
+    if (isNumber(value)) {
+        return markAsJsonb(sql `to_jsonb(${value}::numeric)`);
+    }
+    if (isBoolean(value)) {
+        return markAsJsonb(sql `to_jsonb(${value}::boolean)`);
+    }
     return markAsJsonb(sql `to_jsonb(${value})`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.156",
+  "version": "0.93.157",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

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

@@ -135,6 +135,7 @@ export declare class PostgresTaskQueue<Definitions extends TaskDefinitionMap = T
     private lowFrequencyMaintenanceLoop;
     private mediumFrequencyMaintenanceLoop;
     private highFrequencyMaintenanceLoop;
+    private logPromiseAllSettledErrors;
     getBatchConsumer<Type extends TaskTypes<Definitions>>(size: number, cancellationSignal: CancellationSignal, options?: {
         forceDequeue?: boolean;
         types?: Type[];

package/task-queue/postgres/task-queue.js

@@ -137,7 +137,7 @@ let PostgresTaskQueue = class PostgresTaskQueue extends TaskQueue {
         result: null,
     };
     [afterResolve]() {
-        if (!this.isInTransaction) {
+        if (!this.isFork) {
             this.maintenanceLoop();
         }
     }
@@ -1311,10 +1311,11 @@ let PostgresTaskQueue = class PostgresTaskQueue extends TaskQueue {
     async lowFrequencyMaintenanceLoop() {
         while (this.#cancellationSignal.isUnset) {
             try {
-                await Promise.allSettled([
+                const results = await Promise.allSettled([
                     this.performArchival(),
                     this.performArchivePurge(),
                 ]);
+                this.logPromiseAllSettledErrors(results, 'low frequency maintenance loop');
             }
             catch (error) {
                 this.#logger.error('Error during low frequency maintenance loop', error);
@@ -1327,10 +1328,11 @@ let PostgresTaskQueue = class PostgresTaskQueue extends TaskQueue {
     async mediumFrequencyMaintenanceLoop() {
         while (this.#cancellationSignal.isUnset) {
             try {
-                await Promise.allSettled([
+                const results = await Promise.allSettled([
                     this.processExpirations(),
                     this.processPriorityAging(),
                 ]);
+                this.logPromiseAllSettledErrors(results, 'medium frequency maintenance loop');
             }
             catch (error) {
                 this.#logger.error('Error during medium frequency maintenance loop', error);
@@ -1343,11 +1345,12 @@ let PostgresTaskQueue = class PostgresTaskQueue extends TaskQueue {
     async highFrequencyMaintenanceLoop() {
         while (this.#cancellationSignal.isUnset) {
             try {
-                await Promise.allSettled([
+                const results = await Promise.allSettled([
                     this.processZombieRetries(),
                     this.processZombieExhaustions(),
                     this.processHardTimeouts(),
                 ]);
+                this.logPromiseAllSettledErrors(results, 'high frequency maintenance loop');
             }
             catch (error) {
                 this.#logger.error('Error during high frequency maintenance loop', error);
@@ -1357,6 +1360,13 @@ let PostgresTaskQueue = class PostgresTaskQueue extends TaskQueue {
             }
         }
     }
+    logPromiseAllSettledErrors(results, context) {
+        for (const result of results) {
+            if (result.status == 'rejected') {
+                this.#logger.error(`Error during ${context}`, result.reason);
+            }
+        }
+    }
     async *getBatchConsumer(size, cancellationSignal, options) {
         const continue$ = merge(this.#messageBus.allMessages$).pipe(filter((namespace) => namespace == this.#namespace));
         const mergedContinue$ = merge(continue$, cancellationSignal);