@causa/runtime-google 1.5.1 → 1.5.3

package/dist/firestore/healthcheck.d.ts

@@ -1,11 +1,12 @@
-import { BaseHealthIndicatorService } from '@causa/runtime/nestjs';
-import { type HealthIndicatorResult } from '@nestjs/terminus';
+import { BaseHealthIndicatorService, type HealthChecker } from '@causa/runtime/nestjs';
+import { HealthIndicatorService, type HealthIndicatorResult } from '@nestjs/terminus';
 import { Firestore } from 'firebase-admin/firestore';
 /**
  * A service testing the availability of the Firestore service.
  */
-export declare class FirestoreHealthIndicator extends BaseHealthIndicatorService {
+export declare class FirestoreHealthIndicator extends BaseHealthIndicatorService implements HealthChecker {
     private readonly firestore;
-    constructor(firestore: Firestore);
+    private readonly healthIndicatorService;
+    constructor(firestore: Firestore, healthIndicatorService: HealthIndicatorService);
     check(): Promise<HealthIndicatorResult>;
 }

package/dist/firestore/healthcheck.js

@@ -7,9 +7,10 @@ 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 { BaseHealthIndicatorService } from '@causa/runtime/nestjs';
+import { orFallbackFn, tryMap } from '@causa/runtime';
+import { BaseHealthIndicatorService, } from '@causa/runtime/nestjs';
 import { Injectable } from '@nestjs/common';
-import { HealthCheckError } from '@nestjs/terminus';
+import { HealthIndicatorService, } from '@nestjs/terminus';
 import { Firestore } from 'firebase-admin/firestore';
 /**
  * The key used to identify the Firestore health indicator.
@@ -20,24 +21,23 @@ const FIRESTORE_HEALTH_KEY = 'google.firestore';
  */
 let FirestoreHealthIndicator = class FirestoreHealthIndicator extends BaseHealthIndicatorService {
     firestore;
-    constructor(firestore) {
+    healthIndicatorService;
+    constructor(firestore, healthIndicatorService) {
         super();
         this.firestore = firestore;
+        this.healthIndicatorService = healthIndicatorService;
     }
     async check() {
-        try {
+        const check = this.healthIndicatorService.check(FIRESTORE_HEALTH_KEY);
+        return await tryMap(async () => {
             await this.firestore.listCollections();
-            return this.getStatus(FIRESTORE_HEALTH_KEY, true);
-        }
-        catch (error) {
-            throw new HealthCheckError('Failed to check health by listing Firestore collections.', this.getStatus(FIRESTORE_HEALTH_KEY, false, {
-                error: error.message,
-            }));
-        }
+            return check.up();
+        }, orFallbackFn((error) => check.down({ error: error.message })));
     }
 };
 FirestoreHealthIndicator = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [Firestore])
+    __metadata("design:paramtypes", [Firestore,
+        HealthIndicatorService])
 ], FirestoreHealthIndicator);
 export { FirestoreHealthIndicator };

package/dist/pubsub/healthcheck.d.ts

@@ -1,11 +1,12 @@
-import { BaseHealthIndicatorService } from '@causa/runtime/nestjs';
+import { BaseHealthIndicatorService, type HealthChecker } from '@causa/runtime/nestjs';
 import { PubSub } from '@google-cloud/pubsub';
-import { type HealthIndicatorResult } from '@nestjs/terminus';
+import { HealthIndicatorService, type HealthIndicatorResult } from '@nestjs/terminus';
 /**
  * A service testing the availability of the Pub/Sub service.
  */
-export declare class PubSubHealthIndicator extends BaseHealthIndicatorService {
+export declare class PubSubHealthIndicator extends BaseHealthIndicatorService implements HealthChecker {
     private readonly pubSub;
-    constructor(pubSub: PubSub);
+    private readonly healthIndicatorService;
+    constructor(pubSub: PubSub, healthIndicatorService: HealthIndicatorService);
     check(): Promise<HealthIndicatorResult>;
 }

package/dist/pubsub/healthcheck.js

@@ -7,11 +7,12 @@ 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 { BaseHealthIndicatorService } from '@causa/runtime/nestjs';
+import { orFallbackFn, tryMap } from '@causa/runtime';
+import { BaseHealthIndicatorService, } from '@causa/runtime/nestjs';
 import { PubSub } from '@google-cloud/pubsub';
 import { status } from '@grpc/grpc-js';
 import { Injectable } from '@nestjs/common';
-import { HealthCheckError } from '@nestjs/terminus';
+import { HealthIndicatorService, } from '@nestjs/terminus';
 /**
  * The key used to identify the Pub/Sub health indicator.
  */
@@ -21,30 +22,30 @@ const PUBSUB_HEALTH_KEY = 'google.pubSub';
  */
 let PubSubHealthIndicator = class PubSubHealthIndicator extends BaseHealthIndicatorService {
     pubSub;
-    constructor(pubSub) {
+    healthIndicatorService;
+    constructor(pubSub, healthIndicatorService) {
         super();
         this.pubSub = pubSub;
+        this.healthIndicatorService = healthIndicatorService;
     }
     async check() {
-        try {
-            await this.pubSub.getTopics({
-                autoPaginate: false,
-                pageSize: 1,
-            });
-        }
-        catch (error) {
+        const check = this.healthIndicatorService.check(PUBSUB_HEALTH_KEY);
+        return await tryMap(async () => {
+            await this.pubSub.getTopics({ autoPaginate: false, pageSize: 1 });
+            return check.up();
+        }, orFallbackFn((error) => {
             // Permission denied errors are treated as healthy, as they indicate that the service could successfully connect
             // to the Pub/Sub service (which is probably healthy), but was not allowed to list topics (which is usually not
             // the case for publishers).
-            if (error.code !== status.PERMISSION_DENIED) {
-                throw new HealthCheckError('Failed to check health by retrieving Pub/Sub topics.', this.getStatus(PUBSUB_HEALTH_KEY, false, { error: error.message }));
-            }
-        }
-        return this.getStatus(PUBSUB_HEALTH_KEY, true);
+            return error.code === status.PERMISSION_DENIED
+                ? check.up()
+                : check.down({ error: error.message });
+        }));
     }
 };
 PubSubHealthIndicator = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [PubSub])
+    __metadata("design:paramtypes", [PubSub,
+        HealthIndicatorService])
 ], PubSubHealthIndicator);
 export { PubSubHealthIndicator };

package/dist/spanner/conversion.js

@@ -57,6 +57,25 @@ function spannerValueToJavaScript(value, columnMetadata) {
     }
     return value;
 }
+/**
+ * Converts a number, bigint, or string value to a Spanner `Int`, throwing if the value is not a safe integer.
+ *
+ * @param value The value to convert.
+ * @returns The Spanner `Int` value.
+ */
+function toSafeSpannerInt(value) {
+    const valueType = typeof value;
+    if (valueType !== 'number' &&
+        valueType !== 'string' &&
+        valueType !== 'bigint') {
+        throw new TypeError(`Expected a number, bigint, or string, but received ${valueType}.`);
+    }
+    const num = valueType !== 'number' ? Number(value) : value;
+    if (!Number.isSafeInteger(num)) {
+        throw new RangeError('Value is not a safe integer for column marked as integer.');
+    }
+    return new Int(value.toString());
+}
 /**
  * Converts a value such that it is safe to pass to the Spanner client.
  * Numeric values and arrays of numeric values are wrapped using Spanner classes.
@@ -70,11 +89,16 @@ function makeSpannerValue(value, metadata) {
     if (value === undefined || value === null) {
         return value;
     }
-    if (metadata.isBigInt || metadata.isInt) {
+    if (metadata.isBigInt) {
         return Array.isArray(value)
             ? value.map((v) => new Int(v.toString()))
             : new Int(value.toString());
     }
+    if (metadata.isInt) {
+        return Array.isArray(value)
+            ? value.map(toSafeSpannerInt)
+            : toSafeSpannerInt(value);
+    }
     if (metadata.isJson) {
         return JSON.stringify(value);
     }

package/dist/spanner/entity-manager.js

@@ -293,15 +293,15 @@ let SpannerEntityManager = class SpannerEntityManager {
             ? optionsOrStatement
             : {};
         const sqlStatement = statement ?? optionsOrStatement;
-        const { entityType, requestOptions } = options;
+        const { entityType, requestOptions, transaction } = options;
         let snapshot;
         try {
-            let { transaction } = options;
-            if (!transaction) {
+            let txn = transaction;
+            if (!txn) {
                 [snapshot] = await this.database.getSnapshot();
-                transaction = snapshot;
+                txn = snapshot;
             }
-            const stream = transaction.runStream({
+            const stream = txn.runStream({
                 ...sqlStatement,
                 requestOptions,
                 json: true,
@@ -316,8 +316,7 @@ let SpannerEntityManager = class SpannerEntityManager {
             }
         }
         catch (error) {
-            // If running in a transaction, the error will be caught by `snapshot()` or `transaction()`.
-            throw !snapshot ? error : (convertSpannerToEntityError(error) ?? error);
+            throw convertSpannerToEntityError(error) ?? error;
         }
         finally {
             snapshot?.end();

package/dist/spanner/healthcheck.d.ts

@@ -1,11 +1,12 @@
-import { BaseHealthIndicatorService } from '@causa/runtime/nestjs';
+import { BaseHealthIndicatorService, type HealthChecker } from '@causa/runtime/nestjs';
 import { Database } from '@google-cloud/spanner';
-import { type HealthIndicatorResult } from '@nestjs/terminus';
+import { HealthIndicatorService, type HealthIndicatorResult } from '@nestjs/terminus';
 /**
  * A service testing the availability of the Spanner service.
  */
-export declare class SpannerHealthIndicator extends BaseHealthIndicatorService {
+export declare class SpannerHealthIndicator extends BaseHealthIndicatorService implements HealthChecker {
     private readonly database;
-    constructor(database: Database);
+    private readonly healthIndicatorService;
+    constructor(database: Database, healthIndicatorService: HealthIndicatorService);
     check(): Promise<HealthIndicatorResult>;
 }

package/dist/spanner/healthcheck.js

@@ -7,10 +7,11 @@ 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 { BaseHealthIndicatorService } from '@causa/runtime/nestjs';
+import { orFallbackFn, tryMap } from '@causa/runtime';
+import { BaseHealthIndicatorService, } from '@causa/runtime/nestjs';
 import { Database } from '@google-cloud/spanner';
 import { Injectable } from '@nestjs/common';
-import { HealthCheckError } from '@nestjs/terminus';
+import { HealthIndicatorService, } from '@nestjs/terminus';
 /**
  * The key used to identify the Spanner health indicator.
  */
@@ -20,22 +21,23 @@ const SPANNER_HEALTH_KEY = 'google.spanner';
  */
 let SpannerHealthIndicator = class SpannerHealthIndicator extends BaseHealthIndicatorService {
     database;
-    constructor(database) {
+    healthIndicatorService;
+    constructor(database, healthIndicatorService) {
         super();
         this.database = database;
+        this.healthIndicatorService = healthIndicatorService;
     }
     async check() {
-        try {
+        const check = this.healthIndicatorService.check(SPANNER_HEALTH_KEY);
+        return await tryMap(async () => {
             await this.database.run('SELECT 1');
-            return this.getStatus(SPANNER_HEALTH_KEY, true);
-        }
-        catch (error) {
-            throw new HealthCheckError('Failed to check health by running Spanner query.', this.getStatus(SPANNER_HEALTH_KEY, false, { error: error.message }));
-        }
+            return check.up();
+        }, orFallbackFn((error) => check.down({ error: error.message })));
     }
 };
 SpannerHealthIndicator = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [Database])
+    __metadata("design:paramtypes", [Database,
+        HealthIndicatorService])
 ], SpannerHealthIndicator);
 export { SpannerHealthIndicator };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@causa/runtime-google",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "An extension to the Causa runtime SDK (`@causa/runtime`), providing Google-specific features.",
   "repository": {
     "type": "git",
@@ -32,10 +32,10 @@
     "test:cov": "npm run test -- --coverage"
   },
   "dependencies": {
-    "@causa/runtime": "^1.4.0",
+    "@causa/runtime": "^1.5.0",
     "@google-cloud/precise-date": "^5.0.0",
     "@google-cloud/pubsub": "^5.2.1",
-    "@google-cloud/spanner": "^8.3.1",
+    "@google-cloud/spanner": "^8.4.0",
     "@google-cloud/tasks": "^6.2.1",
     "@grpc/grpc-js": "^1.14.3",
     "@nestjs/common": "^11.1.11",
@@ -49,7 +49,7 @@
     "firebase-admin": "^13.6.0",
     "jsonwebtoken": "^9.0.3",
     "passport-http-bearer": "^1.0.1",
-    "pino": "^9.14.0",
+    "pino": "^10.1.1",
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
@@ -59,7 +59,7 @@
     "@tsconfig/node20": "^20.1.8",
     "@types/jest": "^30.0.0",
     "@types/jsonwebtoken": "^9.0.10",
-    "@types/node": "^20.19.27",
+    "@types/node": "^20.19.28",
     "@types/passport-http-bearer": "^1.0.42",
     "@types/supertest": "^6.0.3",
     "@types/uuid": "^11.0.0",