@causa/runtime-google 0.35.0 → 0.35.1

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.1",
   "description": "An extension to the Causa runtime SDK (`@causa/runtime`), providing Google-specific features.",
   "repository": "github:causa-io/runtime-typescript-google",
   "license": "ISC",
@@ -62,7 +62,7 @@
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^10.0.0",
     "dotenv": "^16.4.5",
-    "eslint": "^9.15.0",
+    "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",