@causa/runtime-google 0.35.0 → 0.35.2

package/dist/pubsub/interceptor.d.ts

@@ -1,9 +1,8 @@
 import { type ObjectSerializer } from '@causa/runtime';
-import { BaseEventHandlerInterceptor, type ParsedEventRequest } from '@causa/runtime/nestjs';
+import { BaseEventHandlerInterceptor, Logger, type ParsedEventRequest } from '@causa/runtime/nestjs';
 import { type ExecutionContext, type Type } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import type { Request } from 'express';
-import { PinoLogger } from 'nestjs-pino';
 /**
  * The ID of the Pub/Sub event handler interceptor, that can passed to the `UseEventHandler` decorator.
  */
@@ -35,7 +34,7 @@ declare class PubSubMessage {
  */
 export declare class PubSubEventHandlerInterceptor extends BaseEventHandlerInterceptor {
     protected readonly serializer: ObjectSerializer;
-    constructor(serializer: ObjectSerializer, reflector: Reflector, logger: PinoLogger);
+    constructor(serializer: ObjectSerializer, reflector: Reflector, logger: Logger);
     /**
      * Parses the given request as the payload of a Pub/Sub push request.
      *

package/dist/pubsub/interceptor.js

@@ -9,11 +9,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var PubSubEventHandlerInterceptor_1;
 import { AllowMissing, IsDateType, ValidateNestedType, ValidationError, parseObject, validateObject, } from '@causa/runtime';
-import { BadRequestError, BaseEventHandlerInterceptor, } from '@causa/runtime/nestjs';
+import { BadRequestError, BaseEventHandlerInterceptor, Logger, } from '@causa/runtime/nestjs';
 import { Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { IsBase64, IsObject, IsString } from 'class-validator';
-import { PinoLogger } from 'nestjs-pino';
 /**
  * The ID of the Pub/Sub event handler interceptor, that can passed to the `UseEventHandler` decorator.
  */
@@ -86,6 +85,7 @@ let PubSubEventHandlerInterceptor = PubSubEventHandlerInterceptor_1 = class PubS
     constructor(serializer, reflector, logger) {
         super(PUBSUB_EVENT_HANDLER_ID, reflector, logger);
         this.serializer = serializer;
+        this.logger.setContext(PubSubEventHandlerInterceptor_1.name);
     }
     /**
      * Parses the given request as the payload of a Pub/Sub push request.
@@ -148,7 +148,7 @@ let PubSubEventHandlerInterceptor = PubSubEventHandlerInterceptor_1 = class PubS
         };
         PubSubEventHandlerInterceptorWithSerializer = __decorate([
             Injectable(),
-            __metadata("design:paramtypes", [Reflector, PinoLogger])
+            __metadata("design:paramtypes", [Reflector, Logger])
         ], PubSubEventHandlerInterceptorWithSerializer);
         return PubSubEventHandlerInterceptorWithSerializer;
     }
@@ -156,6 +156,6 @@ let PubSubEventHandlerInterceptor = PubSubEventHandlerInterceptor_1 = class PubS
 PubSubEventHandlerInterceptor = PubSubEventHandlerInterceptor_1 = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [Object, Reflector,
-        PinoLogger])
+        Logger])
 ], PubSubEventHandlerInterceptor);
 export { PubSubEventHandlerInterceptor };

package/dist/pubsub/publisher.js

@@ -110,29 +110,30 @@ export class PubSubPublisher {
             ? topicOrPreparedEvent
             : await this.prepare(topicOrPreparedEvent, event, options);
         const pubSubTopic = this.getTopic(topic);
-        const baseLogData = {
+        const messageInfo = {
             topic,
             pubSubTopic: pubSubTopic.name,
         };
         if (attributes && 'eventId' in attributes) {
-            baseLogData.eventId = attributes.eventId;
+            messageInfo.eventId = attributes.eventId;
         }
         try {
-            const pubSubMessageId = await pubSubTopic.publishMessage({
+            const messageId = await pubSubTopic.publishMessage({
                 data,
                 attributes,
                 orderingKey: key,
             });
-            this.logger.info({ ...baseLogData, pubSubMessageId }, 'Published message to Pub/Sub.');
+            this.logger.info({ publishedMessage: { ...messageInfo, messageId } }, 'Published message to Pub/Sub.');
         }
         catch (error) {
             this.logger.error({
-                ...baseLogData,
-                pubSubMessage: data.toString('base64'),
-                pubSubAttributes: attributes,
-                pubSubOrderingKey: key,
-                errorMessage: error.message,
-                errorStack: error.stack,
+                failedMessage: {
+                    ...messageInfo,
+                    data: data.toString('base64'),
+                    attributes,
+                    key,
+                },
+                error: error.stack,
             }, 'Failed to publish message to Pub/Sub.');
             throw error;
         }

package/dist/spanner/lifecycle.service.d.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@causa/runtime/nestjs';
 import { Database, Spanner } from '@google-cloud/spanner';
 import { type OnApplicationShutdown } from '@nestjs/common';
 /**
@@ -7,6 +8,7 @@ import { type OnApplicationShutdown } from '@nestjs/common';
 export declare class SpannerLifecycleService implements OnApplicationShutdown {
     private readonly spanner;
     private readonly database;
-    constructor(spanner: Spanner, database: Database);
+    private readonly logger;
+    constructor(spanner: Spanner, database: Database, logger: Logger);
     onApplicationShutdown(): Promise<void>;
 }

package/dist/spanner/lifecycle.service.js

@@ -7,7 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { Logger } from '@causa/runtime/nestjs';
 import { Database, Spanner } from '@google-cloud/spanner';
+import { SessionLeakError } from '@google-cloud/spanner/build/src/session-pool.js';
 import { Injectable } from '@nestjs/common';
 /**
  * A private service that handles the graceful shutdown of the Spanner Database.
@@ -16,18 +18,29 @@ import { Injectable } from '@nestjs/common';
 let SpannerLifecycleService = class SpannerLifecycleService {
     spanner;
     database;
-    constructor(spanner, database) {
+    logger;
+    constructor(spanner, database, logger) {
         this.spanner = spanner;
         this.database = database;
+        this.logger = logger;
     }
     async onApplicationShutdown() {
-        await this.database.close();
-        this.spanner.close();
+        try {
+            await this.database.close();
+            this.spanner.close();
+        }
+        catch (error) {
+            this.logger.error({
+                error: error.stack,
+                spannerLeaks: error instanceof SessionLeakError ? error.messages : undefined,
+            }, 'Failed to close Spanner client.');
+        }
     }
 };
 SpannerLifecycleService = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [Spanner,
-        Database])
+        Database,
+        Logger])
 ], SpannerLifecycleService);
 export { SpannerLifecycleService };

package/dist/transaction/spanner-outbox/module.js

@@ -1,5 +1,6 @@
 import { EVENT_PUBLISHER_INJECTION_NAME, Logger } from '@causa/runtime/nestjs';
 import { ConfigService } from '@nestjs/config';
+import { PubSubPublisher } from '../../pubsub/index.js';
 import { SpannerEntityManager } from '../../spanner/index.js';
 import { SpannerOutboxEvent } from './event.js';
 import { SpannerOutboxTransactionRunner } from './runner.js';
@@ -7,11 +8,12 @@ import { SpannerOutboxSender, } from './sender.js';
 /**
  * Combines options passed to the module with the configuration (from the environment).
  *
- * @param options Options passed to the module.
+ * @param defaultOptions Options inferred by the module itself.
+ * @param customOptions Options passed to the module by the caller.
  * @param config The {@link ConfigService} to use.
  * @returns The parsed {@link SpannerOutboxSenderOptions}.
  */
-function parseSenderOptions(options, config) {
+function parseSenderOptions(defaultOptions, customOptions, config) {
     function validateIntOrUndefined(name) {
         const strValue = config.get(name);
         if (strValue === undefined) {
@@ -34,7 +36,7 @@ function parseSenderOptions(options, config) {
     const sharding = shardingColumn && shardingCount
         ? { column: shardingColumn, count: shardingCount }
         : undefined;
-    const envOptions = {
+    const envOptionsWithUndefined = {
         batchSize,
         pollingInterval,
         idColumn,
@@ -43,8 +45,15 @@ function parseSenderOptions(options, config) {
         sharding,
         leaseDuration,
     };
-    return { ...envOptions, ...options };
+    const envOptions = Object.fromEntries(Object.entries(envOptionsWithUndefined).filter(([, v]) => v !== undefined));
+    return { ...defaultOptions, ...envOptions, ...customOptions };
 }
+/**
+ * The default lease duration, in milliseconds, when the publisher is Pub/Sub.
+ * Pub/Sub has a default retry/timeout of 60 seconds. This ensures the lease is long enough and the event doesn't get
+ * picked up by another instance.
+ */
+const DEFAULT_PUBSUB_LEASE_DURATION = 70000;
 /**
  * The module providing the {@link SpannerOutboxTransactionRunner}.
  * This assumes the `SpannerModule` and an {@link EventPublisher} are available (as well as the `LoggerModule`).
@@ -69,7 +78,10 @@ export class SpannerOutboxTransactionModule {
                 {
                     provide: SpannerOutboxSender,
                     useFactory: (entityManager, publisher, logger, config) => {
-                        const options = parseSenderOptions(senderOptions, config);
+                        const defaultOptions = publisher instanceof PubSubPublisher
+                            ? { leaseDuration: DEFAULT_PUBSUB_LEASE_DURATION }
+                            : {};
+                        const options = parseSenderOptions(defaultOptions, senderOptions, config);
                         return new SpannerOutboxSender(entityManager, outboxEventType, publisher, logger, options);
                     },
                     inject: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@causa/runtime-google",
-  "version": "0.35.0",
+  "version": "0.35.2",
   "description": "An extension to the Causa runtime SDK (`@causa/runtime`), providing Google-specific features.",
   "repository": "github:causa-io/runtime-typescript-google",
   "license": "ISC",
@@ -29,12 +29,12 @@
     "test:cov": "npm run test -- --coverage"
   },
   "dependencies": {
-    "@causa/runtime": ">= 0.24.1 < 1.0.0",
+    "@causa/runtime": ">= 0.24.2 < 1.0.0",
     "@google-cloud/precise-date": "^4.0.0",
     "@google-cloud/pubsub": "^4.9.0",
     "@google-cloud/spanner": "^7.16.0",
     "@google-cloud/tasks": "^5.5.1",
-    "@grpc/grpc-js": "^1.12.2",
+    "@grpc/grpc-js": "^1.12.3",
     "@nestjs/common": "^10.4.12",
     "@nestjs/config": "^3.3.0",
     "@nestjs/core": "^10.4.12",
@@ -45,7 +45,6 @@
     "express": "^4.21.1",
     "firebase-admin": "^13.0.1",
     "jsonwebtoken": "^9.0.2",
-    "nestjs-pino": "^4.1.0",
     "passport-http-bearer": "^1.0.1",
     "pino": "^9.5.0",
     "reflect-metadata": "^0.2.2"
@@ -61,8 +60,8 @@
     "@types/passport-http-bearer": "^1.0.41",
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^10.0.0",
-    "dotenv": "^16.4.5",
-    "eslint": "^9.15.0",
+    "dotenv": "^16.4.6",
+    "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",
@@ -72,7 +71,7 @@
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.2",
-    "typescript-eslint": "^8.16.0",
+    "typescript-eslint": "^8.17.0",
     "uuid": "^11.0.3"
   }
 }