@tstdl/base 0.93.118 → 0.93.120

package/notification/server/services/notification.service.d.ts

@@ -1,10 +1,12 @@
+import { afterResolve } from '../../../injector/index.js';
 import { type NewEntity } from '../../../orm/index.js';
 import { Transactional, type Transaction } from '../../../orm/server/index.js';
 import type { TypedOmit } from '../../../types/types.js';
-import { NotificationPreference, type InAppNotificationView, type NotificationChannel, type NotificationDefinitionMap, type NotificationLog } from '../../models/index.js';
+import { NotificationChannel, NotificationPreference, type InAppNotificationView, type NotificationDefinitionMap, type NotificationLog } from '../../models/index.js';
 export type NewNotificationData<Definitions extends NotificationDefinitionMap = NotificationDefinitionMap> = TypedOmit<NewEntity<NotificationLog<Definitions>>, 'tenantId' | 'id' | 'userId' | 'timestamp' | 'status' | 'currentStep' | 'priority'> & Partial<Pick<NotificationLog<Definitions>, 'priority'>>;
 export declare class NotificationService<Definitions extends NotificationDefinitionMap = NotificationDefinitionMap> extends Transactional {
     #private;
+    [afterResolve](): void;
     send(tenantId: string, userId: string, notification: NewNotificationData<Definitions>, options?: {
         transaction: Transaction;
     }): Promise<void>;

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

@@ -7,17 +7,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var _a;
 var NotificationService_1;
 import { and, desc, eq, isNull, lt, or } from 'drizzle-orm';
+import { CancellationSignal } from '../../../cancellation/token.js';
 import { BadRequestError } from '../../../errors/bad-request.error.js';
-import { inject, Singleton } from '../../../injector/index.js';
+import { afterResolve, inject, Singleton } from '../../../injector/index.js';
 import { Logger } from '../../../logger/logger.js';
 import { TRANSACTION_TIMESTAMP } from '../../../orm/index.js';
 import { injectRepository, Transactional } from '../../../orm/server/index.js';
 import { TaskQueue } from '../../../task-queue/task-queue.js';
 import { tryIgnoreLogAsync } from '../../../utils/try-ignore.js';
 import { isDefined } from '../../../utils/type-guards.js';
-import { InAppNotification, NotificationLogEntity, NotificationPreference, NotificationPriority, NotificationStatus, toInAppNotificationView, WebPushSubscription } from '../../models/index.js';
+import { InAppNotification, NotificationChannel, NotificationLogEntity, NotificationPreference, NotificationPriority, NotificationStatus, toInAppNotificationView, WebPushSubscription } from '../../models/index.js';
+import { InAppChannelProvider } from '../providers/index.js';
 import { inAppNotification, notificationLog } from '../schemas.js';
 import { NotificationAncillaryService } from './notification-ancillary.service.js';
+import { NotificationDeliveryWorker } from './notification-delivery.worker.js';
 import { NotificationSseService } from './notification-sse.service.js';
 let NotificationService = NotificationService_1 = class NotificationService extends Transactional {
     #notificationLogRepository = injectRepository(NotificationLogEntity);
@@ -25,9 +28,16 @@ let NotificationService = NotificationService_1 = class NotificationService exte
     #preferenceRepository = injectRepository(NotificationPreference);
     #webPushSubscriptionRepository = injectRepository(WebPushSubscription);
     #notificationAncillaryService = inject(NotificationAncillaryService);
+    #deliveryWorker = inject(NotificationDeliveryWorker);
+    #inAppChannelProvider = inject(InAppChannelProvider);
     #taskQueue = inject((TaskQueue), 'notification');
     #sseService = inject(NotificationSseService);
     #logger = inject(Logger, NotificationService_1.name);
+    #cancellationSignal = inject(CancellationSignal);
+    [afterResolve]() {
+        this.#deliveryWorker.registerProvider(NotificationChannel.InApp, this.#inAppChannelProvider);
+        this.#deliveryWorker.run(this.#cancellationSignal);
+    }
     async send(tenantId, userId, notification, options) {
         await this.useTransaction(options?.transaction, async (tx) => {
             const notificationToInsert = {
@@ -135,7 +145,7 @@ let NotificationService = NotificationService_1 = class NotificationService exte
     async dispatchUnreadCountUpdate(tenantId, userId) {
         await tryIgnoreLogAsync(this.#logger, async () => {
             const unreadCount = await this.unreadCount(tenantId, userId);
-            this.#sseService.dispatchUnreadCountUpdate(tenantId, userId, unreadCount);
+            await this.#sseService.dispatchUnreadCountUpdate(tenantId, userId, unreadCount);
         });
     }
 };

package/object-storage/s3/s3.object-storage.d.ts

@@ -30,5 +30,6 @@ export declare class S3ObjectStorage extends ObjectStorage {
     private getKey;
     isNotFoundError(error: unknown): boolean;
     isForbiddenError(error: unknown): boolean;
+    isBadRequestError(error: unknown): boolean;
     isError(error: unknown, ...names: string[]): boolean;
 }

package/object-storage/s3/s3.object-storage.js

@@ -12,6 +12,7 @@ import { Readable } from 'node:stream';
 import { CopyObjectCommand, CreateBucketCommand, DeleteBucketLifecycleCommand, DeleteObjectCommand, DeleteObjectsCommand, GetBucketLifecycleConfigurationCommand, GetObjectCommand, HeadBucketCommand, HeadObjectCommand, ListObjectsV2Command, PutBucketLifecycleConfigurationCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { match, P } from 'ts-pattern';
+import { BadRequestError } from '../../errors/bad-request.error.js';
 import { Singleton } from '../../injector/decorators.js';
 import { registerAfterResolve } from '../../injector/resolution.js';
 import { ObjectStorage } from '../../object-storage/index.js';
@@ -55,6 +56,9 @@ let S3ObjectStorage = S3ObjectStorage_1 = class S3ObjectStorage extends ObjectSt
                 }));
                 return;
             }
+            if (this.isBadRequestError(error)) {
+                throw new BadRequestError(`S3 request failed with 400 Bad Request. This often indicates an invalid bucket name ("${this.bucket}") or missing "forcePathStyle: true" for local S3 providers.`);
+            }
             throw error;
         }
     }
@@ -280,11 +284,14 @@ let S3ObjectStorage = S3ObjectStorage_1 = class S3ObjectStorage extends ObjectSt
         return bucketKey.slice(this.prefix.length);
     }
     isNotFoundError(error) {
-        return this.isError(error, 'NotFound', 'NoSuchKey');
+        return this.isError(error, 'NotFound', 'NoSuchKey', 'NoSuchBucket') || ((isObject(error) && isObject(error.$metadata) && error.$metadata.httpStatusCode == 404));
     }
     isForbiddenError(error) {
         return this.isError(error, 'Forbidden', 'AccessDenied', 'InvalidAccessKeyId', 'SignatureDoesNotMatch') || ((isObject(error) && isObject(error.$metadata) && error.$metadata.httpStatusCode == 403));
     }
+    isBadRequestError(error) {
+        return (isObject(error) && isObject(error.$metadata) && error.$metadata.httpStatusCode == 400);
+    }
     isError(error, ...names) {
         return isObject(error) && names.includes(error.name);
     }

package/package.json

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