@cravery/firebase 0.0.44 → 0.0.46

package/dist/lib/monitoring.js

@@ -1,36 +1,75 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shutdown = exports.createMetricsScope = exports.registerGauge = exports.withTiming = exports.recordTiming = exports.incrementCounter = void 0;
+exports.shutdown = exports.forceFlush = exports.createMetricsScope = exports.registerGauge = exports.withTiming = exports.recordTiming = exports.incrementCounter = void 0;
 const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
 const resources_1 = require("@opentelemetry/resources");
 const opentelemetry_cloud_monitoring_exporter_1 = require("@google-cloud/opentelemetry-cloud-monitoring-exporter");
+const METRIC_NAME_REGEX = /^[a-zA-Z][a-zA-Z0-9_.-]*$/;
+const MAX_CACHED_METRICS = 1000;
+const validateMetricName = (name) => {
+    if (!METRIC_NAME_REGEX.test(name)) {
+        throw new Error(`Invalid metric name "${name}": must start with a letter and contain only alphanumeric characters, underscores, dots, or hyphens`);
+    }
+};
 const resource = (0, resources_1.resourceFromAttributes)({
     "service.name": "cravery-backend",
 });
-const exporter = new opentelemetry_cloud_monitoring_exporter_1.MetricExporter();
-const meterProvider = new sdk_metrics_1.MeterProvider({
-    resource,
-    readers: [
-        new sdk_metrics_1.PeriodicExportingMetricReader({
-            exporter,
-            exportIntervalMillis: 60000,
-        }),
-    ],
-});
-const meter = meterProvider.getMeter("cravery");
+let meterProvider = null;
+let meter = null;
+let isShutdown = false;
+const initializeProvider = () => {
+    if (meterProvider)
+        return;
+    try {
+        const exporter = new opentelemetry_cloud_monitoring_exporter_1.MetricExporter();
+        meterProvider = new sdk_metrics_1.MeterProvider({
+            resource,
+            readers: [
+                new sdk_metrics_1.PeriodicExportingMetricReader({
+                    exporter,
+                    exportIntervalMillis: 60000,
+                }),
+            ],
+        });
+        meter = meterProvider.getMeter("cravery");
+    }
+    catch (error) {
+        console.error("Failed to initialize metrics provider:", error);
+        throw error;
+    }
+};
+const getMeter = () => {
+    if (isShutdown) {
+        throw new Error("Metrics provider has been shut down");
+    }
+    if (!meter) {
+        initializeProvider();
+    }
+    return meter;
+};
 const counters = new Map();
 const histograms = new Map();
+const gauges = new Map();
 const getCounter = (name, description) => {
+    validateMetricName(name);
+    if (counters.size >= MAX_CACHED_METRICS && !counters.has(name)) {
+        throw new Error(`Maximum number of cached counters (${MAX_CACHED_METRICS}) exceeded. Avoid dynamic metric names.`);
+    }
     if (!counters.has(name)) {
-        counters.set(name, meter.createCounter(`cravery.${name}`, { description }));
+        counters.set(name, getMeter().createCounter(`cravery.${name}`, { description }));
     }
     return counters.get(name);
 };
-const getHistogram = (name, description) => {
+const getHistogram = (name, options = {}) => {
+    var _a;
+    validateMetricName(name);
+    if (histograms.size >= MAX_CACHED_METRICS && !histograms.has(name)) {
+        throw new Error(`Maximum number of cached histograms (${MAX_CACHED_METRICS}) exceeded. Avoid dynamic metric names.`);
+    }
     if (!histograms.has(name)) {
-        histograms.set(name, meter.createHistogram(`cravery.${name}`, {
-            description,
-            unit: "ms",
+        histograms.set(name, getMeter().createHistogram(`cravery.${name}`, {
+            description: options.description,
+            unit: (_a = options.unit) !== null && _a !== void 0 ? _a : "ms",
         }));
     }
     return histograms.get(name);
@@ -45,17 +84,30 @@ const recordTiming = (name, durationMs, attributes) => {
 exports.recordTiming = recordTiming;
 const withTiming = async (name, fn, attributes) => {
     const start = Date.now();
-    const result = await fn();
-    (0, exports.recordTiming)(name, Date.now() - start, attributes);
-    return result;
+    try {
+        return await fn();
+    }
+    finally {
+        (0, exports.recordTiming)(name, Date.now() - start, attributes);
+    }
 };
 exports.withTiming = withTiming;
 const registerGauge = (name, callback, attributes) => {
-    const gauge = meter.createObservableGauge(`cravery.${name}`);
-    gauge.addCallback(async (observableResult) => {
-        const value = await callback();
-        observableResult.observe(value, attributes);
+    validateMetricName(name);
+    if (gauges.has(name)) {
+        throw new Error(`Gauge "${name}" is already registered. Gauges cannot be re-registered.`);
+    }
+    const gauge = getMeter().createObservableGauge(`cravery.${name}`);
+    gauge.addCallback((observableResult) => {
+        try {
+            const value = callback();
+            observableResult.observe(value, attributes);
+        }
+        catch (error) {
+            console.error(`Error in gauge callback for "${name}":`, error);
+        }
     });
+    gauges.set(name, gauge);
     return gauge;
 };
 exports.registerGauge = registerGauge;
@@ -66,6 +118,22 @@ const createMetricsScope = (defaultAttributes) => ({
     registerGauge: (name, callback, attributes) => (0, exports.registerGauge)(name, callback, Object.assign(Object.assign({}, defaultAttributes), attributes)),
 });
 exports.createMetricsScope = createMetricsScope;
-const shutdown = () => meterProvider.shutdown();
+const forceFlush = async () => {
+    if (!meterProvider || isShutdown) {
+        return;
+    }
+    await meterProvider.forceFlush();
+};
+exports.forceFlush = forceFlush;
+const shutdown = async () => {
+    if (!meterProvider || isShutdown) {
+        return;
+    }
+    isShutdown = true;
+    await meterProvider.shutdown();
+    counters.clear();
+    histograms.clear();
+    gauges.clear();
+};
 exports.shutdown = shutdown;
 //# sourceMappingURL=monitoring.js.map

package/dist/lib/monitoring.js.map

@@ -1 +1 @@
-{"version":3,"file":"monitoring.js","sourceRoot":"","sources":["../../src/lib/monitoring.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monitoring.js","sourceRoot":"","sources":["../../src/lib/monitoring.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cravery/firebase",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "Shared Firebase Admin SDK utilities for Cravery",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@cravery/core": "^0.0.66",
+    "@cravery/core": "^0.0.68",
     "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.4.0",

package/src/converters/equipment/content.ts

@@ -6,7 +6,7 @@ import {
 import type { EquipmentEntityContent } from "@cravery/core";
 import { stripUndefined } from "../../lib";
 
-export const equipmentContentConverter: FirestoreDataConverter<EquipmentEntityContent> =
+export const equipmentEntityContentConverter: FirestoreDataConverter<EquipmentEntityContent> =
   {
     toFirestore(content: EquipmentEntityContent): DocumentData {
       return stripUndefined({ ...content });

package/src/converters/equipment/meta.ts

@@ -12,7 +12,7 @@ import {
   stripUndefined,
 } from "../../lib";
 
-export const equipmentMetaConverter: FirestoreDataConverter<EquipmentEntityMeta> =
+export const equipmentEntityMetaConverter: FirestoreDataConverter<EquipmentEntityMeta> =
   {
     toFirestore(meta: EquipmentEntityMeta): DocumentData {
       const { id, createdAt, updatedAt, deletedAt, ...rest } = meta;

package/src/converters/index.ts

@@ -1,6 +1,7 @@
-export * from "./access";
 export * from "./equipment";
 export * from "./ingredients";
+export * from "./interactions";
+export * from "./limits";
 export * from "./recipes";
 export * from "./reports";
 export * from "./settings";

package/src/converters/ingredients/content.ts

@@ -6,7 +6,7 @@ import {
 import type { IngredientEntityContent } from "@cravery/core";
 import { stripUndefined } from "../../lib";
 
-export const ingredientContentConverter: FirestoreDataConverter<IngredientEntityContent> =
+export const ingredientEntityContentConverter: FirestoreDataConverter<IngredientEntityContent> =
   {
     toFirestore(content: IngredientEntityContent): DocumentData {
       return stripUndefined({ ...content });

package/src/converters/ingredients/meta.ts

@@ -12,7 +12,7 @@ import {
   stripUndefined,
 } from "../../lib";
 
-export const ingredientMetaConverter: FirestoreDataConverter<IngredientEntityMeta> =
+export const ingredientEntityMetaConverter: FirestoreDataConverter<IngredientEntityMeta> =
   {
     toFirestore(meta: IngredientEntityMeta): DocumentData {
       const { id, createdAt, updatedAt, deletedAt, ...rest } = meta;

package/src/converters/interactions/cook.ts

@@ -0,0 +1,36 @@
+import {
+  FirestoreDataConverter,
+  QueryDocumentSnapshot,
+  DocumentData,
+} from "firebase-admin/firestore";
+import type { CookedRecipe } from "@cravery/core";
+import {
+  toTimestamp,
+  toOptionalTimestamp,
+  toFirestoreTimestamp,
+  toOptionalFirestoreTimestamp,
+  stripUndefined,
+} from "../../lib";
+
+export const cookedRecipeConverter: FirestoreDataConverter<CookedRecipe> = {
+  toFirestore(cookedRecipe: CookedRecipe): DocumentData {
+    const { id, createdAt, updatedAt, deletedAt, ...rest } = cookedRecipe;
+    return stripUndefined({
+      ...rest,
+      createdAt: toFirestoreTimestamp(createdAt),
+      updatedAt: toFirestoreTimestamp(updatedAt),
+      deletedAt: toOptionalFirestoreTimestamp(deletedAt),
+    });
+  },
+
+  fromFirestore(snapshot: QueryDocumentSnapshot): CookedRecipe {
+    const { createdAt, updatedAt, deletedAt, ...rest } = snapshot.data();
+    return {
+      ...rest,
+      id: snapshot.id,
+      createdAt: toTimestamp(createdAt),
+      updatedAt: toTimestamp(updatedAt),
+      deletedAt: toOptionalTimestamp(deletedAt),
+    } as CookedRecipe;
+  },
+};

package/src/converters/interactions/index.ts

@@ -0,0 +1,3 @@
+export * from "./cook";
+export * from "./rate";
+export * from "./save";

package/src/converters/{users/profile.ts → interactions/rate.ts}

@@ -1,36 +1,36 @@
-import {
-  FirestoreDataConverter,
-  QueryDocumentSnapshot,
-  DocumentData,
-} from "firebase-admin/firestore";
-import type { Profile } from "@cravery/core";
-import {
-  toTimestamp,
-  toOptionalTimestamp,
-  toFirestoreTimestamp,
-  toOptionalFirestoreTimestamp,
-  stripUndefined,
-} from "../../lib";
-
-export const profileConverter: FirestoreDataConverter<Profile> = {
-  toFirestore(profile: Profile): DocumentData {
-    const { id, createdAt, updatedAt, deletedAt, ...rest } = profile;
-    return stripUndefined({
-      ...rest,
-      createdAt: toFirestoreTimestamp(createdAt),
-      updatedAt: toFirestoreTimestamp(updatedAt),
-      deletedAt: toOptionalFirestoreTimestamp(deletedAt),
-    });
-  },
-
-  fromFirestore(snapshot: QueryDocumentSnapshot): Profile {
-    const { createdAt, updatedAt, deletedAt, ...rest } = snapshot.data();
-    return {
-      ...rest,
-      id: snapshot.id,
-      createdAt: toTimestamp(createdAt),
-      updatedAt: toTimestamp(updatedAt),
-      deletedAt: toOptionalTimestamp(deletedAt),
-    } as Profile;
-  },
-};
+import {
+  FirestoreDataConverter,
+  QueryDocumentSnapshot,
+  DocumentData,
+} from "firebase-admin/firestore";
+import type { RatedRecipe } from "@cravery/core";
+import {
+  toTimestamp,
+  toOptionalTimestamp,
+  toFirestoreTimestamp,
+  toOptionalFirestoreTimestamp,
+  stripUndefined,
+} from "../../lib";
+
+export const ratedRecipeConverter: FirestoreDataConverter<RatedRecipe> = {
+  toFirestore(ratedRecipe: RatedRecipe): DocumentData {
+    const { id, createdAt, updatedAt, deletedAt, ...rest } = ratedRecipe;
+    return stripUndefined({
+      ...rest,
+      createdAt: toFirestoreTimestamp(createdAt),
+      updatedAt: toFirestoreTimestamp(updatedAt),
+      deletedAt: toOptionalFirestoreTimestamp(deletedAt),
+    });
+  },
+
+  fromFirestore(snapshot: QueryDocumentSnapshot): RatedRecipe {
+    const { createdAt, updatedAt, deletedAt, ...rest } = snapshot.data();
+    return {
+      ...rest,
+      id: snapshot.id,
+      createdAt: toTimestamp(createdAt),
+      updatedAt: toTimestamp(updatedAt),
+      deletedAt: toOptionalTimestamp(deletedAt),
+    } as RatedRecipe;
+  },
+};

package/src/converters/{users/bookmark.ts → interactions/save.ts}

@@ -3,7 +3,7 @@ import {
   QueryDocumentSnapshot,
   DocumentData,
 } from "firebase-admin/firestore";
-import type { Bookmark } from "@cravery/core";
+import type { SavedRecipe } from "@cravery/core";
 import {
   toTimestamp,
   toOptionalTimestamp,
@@ -12,9 +12,9 @@ import {
   stripUndefined,
 } from "../../lib";
 
-export const bookmarkConverter: FirestoreDataConverter<Bookmark> = {
-  toFirestore(bookmark: Bookmark): DocumentData {
-    const { id, createdAt, updatedAt, deletedAt, ...rest } = bookmark;
+export const savedRecipeConverter: FirestoreDataConverter<SavedRecipe> = {
+  toFirestore(savedRecipe: SavedRecipe): DocumentData {
+    const { id, createdAt, updatedAt, deletedAt, ...rest } = savedRecipe;
     return stripUndefined({
       ...rest,
       createdAt: toFirestoreTimestamp(createdAt),
@@ -23,7 +23,7 @@ export const bookmarkConverter: FirestoreDataConverter<Bookmark> = {
     });
   },
 
-  fromFirestore(snapshot: QueryDocumentSnapshot): Bookmark {
+  fromFirestore(snapshot: QueryDocumentSnapshot): SavedRecipe {
     const { createdAt, updatedAt, deletedAt, ...rest } = snapshot.data();
     return {
       ...rest,
@@ -31,6 +31,6 @@ export const bookmarkConverter: FirestoreDataConverter<Bookmark> = {
       createdAt: toTimestamp(createdAt),
       updatedAt: toTimestamp(updatedAt),
       deletedAt: toOptionalTimestamp(deletedAt),
-    } as Bookmark;
+    } as SavedRecipe;
   },
 };

package/src/converters/{access → limits}/index.ts

@@ -1 +1 @@
-export * from "./usage";
+export * from "./usage";

package/src/converters/{access → limits}/usage.ts

@@ -1,28 +1,24 @@
-import {
-  FirestoreDataConverter,
-  QueryDocumentSnapshot,
-  DocumentData,
-} from "firebase-admin/firestore";
-import type { UsagePeriod } from "@cravery/core";
-import {
-  toTimestamp,
-  toFirestoreTimestamp,
-  stripUndefined,
-} from "../../lib";
-
-export const usagePeriodConverter: FirestoreDataConverter<UsagePeriod> = {
-  toFirestore(usage: UsagePeriod): DocumentData {
-    return stripUndefined({
-      counts: usage.counts,
-      updatedAt: toFirestoreTimestamp(usage.updatedAt),
-    });
-  },
-
-  fromFirestore(snapshot: QueryDocumentSnapshot): UsagePeriod {
-    const data = snapshot.data();
-    return {
-      counts: data.counts ?? {},
-      updatedAt: toTimestamp(data.updatedAt),
-    };
-  },
-};
+import {
+  FirestoreDataConverter,
+  QueryDocumentSnapshot,
+  DocumentData,
+} from "firebase-admin/firestore";
+import type { UsagePeriod } from "@cravery/core";
+import { toTimestamp, toFirestoreTimestamp, stripUndefined } from "../../lib";
+
+export const usagePeriodConverter: FirestoreDataConverter<UsagePeriod> = {
+  toFirestore(usage: UsagePeriod): DocumentData {
+    return stripUndefined({
+      counts: usage.counts,
+      updatedAt: toFirestoreTimestamp(usage.updatedAt),
+    });
+  },
+
+  fromFirestore(snapshot: QueryDocumentSnapshot): UsagePeriod {
+    const data = snapshot.data();
+    return {
+      counts: data.counts ?? {},
+      updatedAt: toTimestamp(data.updatedAt),
+    };
+  },
+};

package/src/converters/subscriptions/subscription.ts

@@ -13,20 +13,22 @@ import {
 } from "../../lib";
 
 function toFirestoreMember(member: Member): DocumentData {
-  const { invitedAt, joinedAt, ...rest } = member;
+  const { invitedAt, joinedAt, removedAt, ...rest } = member;
   return stripUndefined({
     ...rest,
     invitedAt: toFirestoreTimestamp(invitedAt),
     joinedAt: toOptionalFirestoreTimestamp(joinedAt),
+    removedAt: toOptionalFirestoreTimestamp(removedAt),
   });
 }
 
 function fromFirestoreMember(data: DocumentData): Member {
-  const { invitedAt, joinedAt, ...rest } = data;
+  const { invitedAt, joinedAt, removedAt, ...rest } = data;
   return {
     ...rest,
     invitedAt: toTimestamp(invitedAt),
     joinedAt: toOptionalTimestamp(joinedAt),
+    removedAt: toOptionalTimestamp(removedAt),
   } as Member;
 }
 

package/src/converters/users/index.ts

@@ -1,4 +1,2 @@
-export * from "./bookmark";
-export * from "./profile";
 export * from "./request";
 export * from "./user";