h1v3 0.6.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1v3",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "",
   "license": "MIT",
   "author": "",

package/src/configuration.js

@@ -19,8 +19,8 @@ export function configureConfigStore(paths, _onValueWritten, _logger) {
 
 function decideSeverity(newData) {
 
-    if (!newData.severity_text) return "INFO";
-    return newData.severity_text.toUpperCase();
+    const text = newData.severity_text?.toLowerCase();
+    return ["trace", "fatal", "info", "debug", "error", "warn"].includes(text) ? text : "info";
 
 }
 
@@ -50,21 +50,42 @@ function handleLogValueWritten(logger, e) {
             },
             timestamp
         };
-        console.log("Writing log", payload);
-        logger.write(payload);
+        console.log({
+
+            "logging.googleapis.com/trace": `projects/${process.env.GCLOUD_PROJECT}/traces/${newData.trace_id}`,
+            "logging.googleapis.com/spanId": newData.span_id,
+            "severity": decideSeverity(newData),
+            "jsonPayload": {
+                ...newData,
+                time_server_ms,
+                timestamp
+            }
+
+        });
         after.ref.update({ time_server_ms });
+        // logger.write(payload);
 
     }
 
 }
 
-export function configureLoggingStore(paths, onValueWritten, logger) {
+export function configureLoggingStore({ paths, onValueWritten, logger, region, instance }) {
+
+    if (!paths) throw new Error("Missing paths");
+    if (!onValueWritten) throw new Error("Missing onValueWritten");
+    if (!logger) throw new Error("Missing logger");
+    if (!region) throw new Error("Missing region");
+    if (!instance) throw new Error("Missing instance");
 
     const ref = paths?.logs?.path;
     if (!ref) throw new Error("Missing: paths.logs.path");
     const triggerPath = refPathToTriggerPath(ref);
     return Object.assign(
-        onValueWritten(triggerPath, handleLogValueWritten.bind(this, logger)),
+        onValueWritten({
+            ref: triggerPath,
+            region,
+            instance
+        }, handleLogValueWritten.bind(this, logger)),
         {
             [RAW_STORE_META]: {
                 raw: true,

package/src/event-store/configuration.js

@@ -4,7 +4,12 @@ import { refPathToTriggerPath } from "../paths.js";
 
 export const EVENT_STORE_META = Symbol("Event store configuration metadata");
 
-export function configureEventStore({ ref, projections, ...rest }, onValueWritten, logger) {
+export function configureEventStore({ ref, projections, ...rest }, { onValueWritten, logger, region, instance }) {
+
+    if (!onValueWritten) throw new Error("Missing onValueWritten");
+    if (!logger) throw new Error("Missing logger");
+    if (!region) throw new Error("Missing region");
+    if (!instance) throw new Error("Missing instance");
 
     // considered the "home" of the event store, under which events and projections will be stored
     const eventStorePath = refPathToTriggerPath(ref);
@@ -24,16 +29,16 @@ export function configureEventStore({ ref, projections, ...rest }, onValueWritte
 
     // tag the trigger with metadata
     return Object.assign(
-        onValueWritten(writeRefPath, handler),
+        onValueWritten({ ref: writeRefPath, region, instance }, handler),
         { [EVENT_STORE_META]: metadata }
     );
 
 }
 
-configureEventStore.inject = ({ onValueWritten, logger, paths }) =>
+configureEventStore.inject = ({ onValueWritten, logger, paths, region, instance }) =>
 
     (eventStoreFactory, ...args) =>
 
-            configureEventStore(eventStoreFactory(paths, ...args), onValueWritten, logger);
+            configureEventStore(eventStoreFactory(paths, ...args), { onValueWritten, logger, region, instance });