@causa/runtime-google 0.34.0 → 0.35.1

package/dist/app-check/guard.js

@@ -7,6 +7,7 @@ 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);
 };
+var AppCheckGuard_1;
 import { Logger, UnauthenticatedError } from '@causa/runtime/nestjs';
 import { Injectable, } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
@@ -16,7 +17,7 @@ import { APP_CHECK_DISABLED_METADATA_KEY } from './app-check-disabled.decorator.
  * A NestJS guard that verifies the App Check token in the request.
  * The token is expected to be in the `X-Firebase-AppCheck` header.
  */
-let AppCheckGuard = class AppCheckGuard {
+let AppCheckGuard = AppCheckGuard_1 = class AppCheckGuard {
     appCheck;
     reflector;
     logger;
@@ -24,6 +25,7 @@ let AppCheckGuard = class AppCheckGuard {
         this.appCheck = appCheck;
         this.reflector = reflector;
         this.logger = logger;
+        this.logger.setContext(AppCheckGuard_1.name);
     }
     async canActivate(context) {
         const isDisabled = this.reflector.getAllAndOverride(APP_CHECK_DISABLED_METADATA_KEY, [context.getHandler(), context.getClass()]);
@@ -45,7 +47,7 @@ let AppCheckGuard = class AppCheckGuard {
         }
     }
 };
-AppCheckGuard = __decorate([
+AppCheckGuard = AppCheckGuard_1 = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [AppCheck,
         Reflector,

package/dist/identity-platform/identity-platform.strategy.js

@@ -7,6 +7,7 @@ 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);
 };
+var IdentityPlatformStrategy_1;
 import { Logger, UnauthenticatedError } from '@causa/runtime/nestjs';
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
@@ -19,7 +20,7 @@ import { Strategy } from 'passport-http-bearer';
  * The `IDENTITY_PLATFORM_STRATEGY_CHECK_REVOKED_TOKEN` configuration key can be set to `true` to also check whether the
  * token was revoked. This implies a call to the Identity Platform, which will increase latency.
  */
-let IdentityPlatformStrategy = class IdentityPlatformStrategy extends PassportStrategy(Strategy) {
+let IdentityPlatformStrategy = IdentityPlatformStrategy_1 = class IdentityPlatformStrategy extends PassportStrategy(Strategy) {
     auth;
     configService;
     logger;
@@ -32,6 +33,7 @@ let IdentityPlatformStrategy = class IdentityPlatformStrategy extends PassportSt
         this.auth = auth;
         this.configService = configService;
         this.logger = logger;
+        this.logger.setContext(IdentityPlatformStrategy_1.name);
         this.checkRevoked = this.configService.get('IDENTITY_PLATFORM_STRATEGY_CHECK_REVOKED_TOKEN', false);
     }
     async validate(token) {
@@ -56,7 +58,7 @@ let IdentityPlatformStrategy = class IdentityPlatformStrategy extends PassportSt
         return user;
     }
 };
-IdentityPlatformStrategy = __decorate([
+IdentityPlatformStrategy = IdentityPlatformStrategy_1 = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [Auth,
         ConfigService,

package/dist/pubsub/publisher.d.ts

@@ -1,7 +1,7 @@
 import { type EventPublisher, type ObjectSerializer, type PreparedEvent, type PublishOptions } from '@causa/runtime';
+import { Logger } from '@causa/runtime/nestjs';
 import { PubSub, type PublishOptions as TopicPublishOptions } from '@google-cloud/pubsub';
 import type { OnApplicationShutdown } from '@nestjs/common';
-import type { Logger } from 'pino';
 /**
  * Options for the {@link PubSubPublisher}.
  */
@@ -32,16 +32,12 @@ export type PubSubPublisherOptions = {
      * This inherits and overrides the {@link PubSubPublisherOptions.publishOptions} for a given topic.
      */
     topicPublishOptions?: Record<string, TopicPublishOptions>;
-    /**
-     * The logger to use.
-     * Defaults to {@link getDefaultLogger}.
-     */
-    logger?: Logger;
 };
 /**
  * An implementation of the {@link EventPublisher} using Google Pub/Sub as the broker.
  */
 export declare class PubSubPublisher implements EventPublisher, OnApplicationShutdown {
+    private readonly logger;
     /**
      * The {@link PubSub} client to use.
      */
@@ -59,10 +55,6 @@ export declare class PubSubPublisher implements EventPublisher, OnApplicationShu
      * A cache of Pub/Sub {@link Topic}s to which messages can be published.
      */
     private readonly topicCache;
-    /**
-     * The logger to use.
-     */
-    readonly logger: Logger;
     /**
      * The options to use when publishing messages.
      * This is used to instantiate the Pub/Sub {@link Topic}s.
@@ -77,9 +69,10 @@ export declare class PubSubPublisher implements EventPublisher, OnApplicationShu
     /**
      * Creates a new {@link PubSubPublisher}.
      *
+     * @param logger The logger to use.
      * @param options Options for the publisher.
      */
-    constructor(options?: PubSubPublisherOptions);
+    constructor(logger: Logger, options?: PubSubPublisherOptions);
     /**
      * Returns the Pub/Sub {@link Topic} to which messages can be published for a given event topic.
      * If the topic has not been used before, it will be created using the {@link PubSubPublisher.publishOptions}.

package/dist/pubsub/publisher.js

@@ -1,4 +1,5 @@
-import { JsonObjectSerializer, getDefaultLogger, } from '@causa/runtime';
+import { JsonObjectSerializer, } from '@causa/runtime';
+import { Logger } from '@causa/runtime/nestjs';
 import { PubSub, Topic, } from '@google-cloud/pubsub';
 import { getConfigurationKeyForTopic } from './configuration.js';
 import { PubSubTopicNotConfiguredError } from './errors.js';
@@ -14,6 +15,7 @@ const DEFAULT_PUBLISH_OPTIONS = {
  * An implementation of the {@link EventPublisher} using Google Pub/Sub as the broker.
  */
 export class PubSubPublisher {
+    logger;
     /**
      * The {@link PubSub} client to use.
      */
@@ -31,10 +33,6 @@ export class PubSubPublisher {
      * A cache of Pub/Sub {@link Topic}s to which messages can be published.
      */
     topicCache = {};
-    /**
-     * The logger to use.
-     */
-    logger;
     /**
      * The options to use when publishing messages.
      * This is used to instantiate the Pub/Sub {@link Topic}s.
@@ -49,16 +47,18 @@ export class PubSubPublisher {
     /**
      * Creates a new {@link PubSubPublisher}.
      *
+     * @param logger The logger to use.
      * @param options Options for the publisher.
      */
-    constructor(options = {}) {
+    constructor(logger, options = {}) {
+        this.logger = logger;
+        this.logger.setContext(PubSubPublisher.name);
         this.pubSub = options.pubSub ?? new PubSub();
         this.serializer = options.serializer ?? new JsonObjectSerializer();
         this.getConfiguration =
             options.configurationGetter ?? ((key) => process.env[key]);
         this.publishOptions = options.publishOptions ?? DEFAULT_PUBLISH_OPTIONS;
         this.topicPublishOptions = options.topicPublishOptions ?? {};
-        this.logger = options.logger ?? getDefaultLogger();
     }
     /**
      * Returns the Pub/Sub {@link Topic} to which messages can be published for a given event topic.

package/dist/pubsub/publisher.module.js

@@ -28,11 +28,10 @@ export class PubSubPublisherModule {
                 },
                 {
                     provide: PubSubPublisher,
-                    useFactory: (pubSub, configurationGetter, { logger }) => new PubSubPublisher({
+                    useFactory: (pubSub, configurationGetter, logger) => new PubSubPublisher(logger, {
                         ...options,
                         pubSub,
                         configurationGetter,
-                        logger,
                     }),
                     inject: [
                         PubSub,

package/dist/transaction/firestore-pubsub/runner.js

@@ -7,6 +7,7 @@ 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);
 };
+var FirestorePubSubTransactionRunner_1;
 import { BufferEventTransaction, TransactionRunner } from '@causa/runtime';
 import { Logger } from '@causa/runtime/nestjs';
 import { Firestore } from '@google-cloud/firestore';
@@ -22,7 +23,7 @@ import { FirestorePubSubTransaction } from './transaction.js';
  * This runner and the transaction use the {@link FirestoreStateTransaction}, which handles soft-deleted documents. All
  * entities that are written to the state should be decorated with the `SoftDeletedFirestoreCollection` decorator.
  */
-let FirestorePubSubTransactionRunner = class FirestorePubSubTransactionRunner extends TransactionRunner {
+let FirestorePubSubTransactionRunner = FirestorePubSubTransactionRunner_1 = class FirestorePubSubTransactionRunner extends TransactionRunner {
     firestore;
     pubSubPublisher;
     collectionResolver;
@@ -33,6 +34,7 @@ let FirestorePubSubTransactionRunner = class FirestorePubSubTransactionRunner ex
         this.pubSubPublisher = pubSubPublisher;
         this.collectionResolver = collectionResolver;
         this.logger = logger;
+        this.logger.setContext(FirestorePubSubTransactionRunner_1.name);
     }
     async run(runFn) {
         this.logger.info('Creating a Firestore Pub/Sub transaction.');
@@ -49,7 +51,7 @@ let FirestorePubSubTransactionRunner = class FirestorePubSubTransactionRunner ex
         return [result];
     }
 };
-FirestorePubSubTransactionRunner = __decorate([
+FirestorePubSubTransactionRunner = FirestorePubSubTransactionRunner_1 = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [Firestore,
         PubSubPublisher, Object, Logger])

package/dist/transaction/spanner-outbox/event.d.ts

@@ -12,7 +12,7 @@ import type { EventAttributes, OutboxEvent } from '@causa/runtime';
  *   attributes JSON NOT NULL,
  *   leaseExpiration TIMESTAMP,
  *   -- 20 is the number of shards.
- *   shard INT64 NOT NULL AS (MOD(ABS(FARM_FINGERPRINT(id)), 20)),
+ *   shard INT64 AS (MOD(ABS(FARM_FINGERPRINT(id)), 20)),
  * ) PRIMARY KEY (id);
  * CREATE INDEX OutboxEventsByShardAndLeaseExpiration ON OutboxEvent(shard, leaseExpiration)
  * ```

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

@@ -21,7 +21,7 @@ import { SpannerColumn, SpannerTable } from '../../spanner/index.js';
  *   attributes JSON NOT NULL,
  *   leaseExpiration TIMESTAMP,
  *   -- 20 is the number of shards.
- *   shard INT64 NOT NULL AS (MOD(ABS(FARM_FINGERPRINT(id)), 20)),
+ *   shard INT64 AS (MOD(ABS(FARM_FINGERPRINT(id)), 20)),
  * ) PRIMARY KEY (id);
  * CREATE INDEX OutboxEventsByShardAndLeaseExpiration ON OutboxEvent(shard, leaseExpiration)
  * ```

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/dist/transaction/spanner-pubsub/runner.js

@@ -7,6 +7,7 @@ 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);
 };
+var SpannerPubSubTransactionRunner_1;
 import { BufferEventTransaction, TransactionRunner } from '@causa/runtime';
 import { Logger } from '@causa/runtime/nestjs';
 import { Injectable } from '@nestjs/common';
@@ -19,7 +20,7 @@ import { throwRetryableInTransactionIfNeeded } from '../spanner-utils.js';
  * A {@link TransactionRunner} that uses Spanner for state and Pub/Sub for events.
  * A Spanner transaction is used as the main transaction. If it succeeds, events are published to Pub/Sub outside of it.
  */
-let SpannerPubSubTransactionRunner = class SpannerPubSubTransactionRunner extends TransactionRunner {
+let SpannerPubSubTransactionRunner = SpannerPubSubTransactionRunner_1 = class SpannerPubSubTransactionRunner extends TransactionRunner {
     entityManager;
     publisher;
     logger;
@@ -35,6 +36,7 @@ let SpannerPubSubTransactionRunner = class SpannerPubSubTransactionRunner extend
         this.entityManager = entityManager;
         this.publisher = publisher;
         this.logger = logger;
+        this.logger.setContext(SpannerPubSubTransactionRunner_1.name);
     }
     async run(runFn) {
         this.logger.info('Creating a Spanner Pub/Sub transaction.');
@@ -58,7 +60,7 @@ let SpannerPubSubTransactionRunner = class SpannerPubSubTransactionRunner extend
         return [result];
     }
 };
-SpannerPubSubTransactionRunner = __decorate([
+SpannerPubSubTransactionRunner = SpannerPubSubTransactionRunner_1 = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [SpannerEntityManager,
         PubSubPublisher,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@causa/runtime-google",
-  "version": "0.34.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",
@@ -29,15 +29,15 @@
     "test:cov": "npm run test -- --coverage"
   },
   "dependencies": {
-    "@causa/runtime": ">= 0.24.0 < 1.0.0",
+    "@causa/runtime": ">= 0.24.1 < 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",
-    "@nestjs/common": "^10.4.11",
+    "@nestjs/common": "^10.4.12",
     "@nestjs/config": "^3.3.0",
-    "@nestjs/core": "^10.4.11",
+    "@nestjs/core": "^10.4.12",
     "@nestjs/passport": "^10.0.3",
     "@nestjs/terminus": "^10.2.3",
     "class-transformer": "^0.5.1",
@@ -51,18 +51,18 @@
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@nestjs/testing": "^10.4.11",
+    "@nestjs/testing": "^10.4.12",
     "@swc/core": "^1.9.3",
     "@swc/jest": "^0.2.37",
     "@tsconfig/node22": "^22.0.0",
     "@types/jest": "^29.5.14",
     "@types/jsonwebtoken": "^9.0.7",
-    "@types/node": "^22.10.0",
+    "@types/node": "^22.10.1",
     "@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",
+    "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",