logs (#98)

Author: fforres

.eslintrc.cjs

@@ -32,7 +32,7 @@ module.exports = {
         // No nos sirve esta regla realmente y causa varios falsos positivos
         // https://typescript-eslint.io/rules/no-non-null-assertion/
         "@typescript-eslint/no-unsafe-arguments": "off",
-        "no-console": "error",
+        // "no-console": "error", // We capture console.log on our logger system, so we allow it
         curly: ["error", "all"],
       },
     },

package-lock.json

@@ -89,6 +89,7 @@
     "@pothos/plugin-authz": "^3.5.8",
     "@pothos/plugin-tracing": "^0.5.8",
     "@sanity/client": "^6.7.0",
+    "@tsndr/cloudflare-worker-jwt": "^2.3.2",
     "@types/react": "^18.2.22",
     "cookie": "^0.5.0",
     "dbdocs": "^0.8.2",

package.json

@@ -10,6 +10,7 @@ import { initContextCache } from "@pothos/core";
 import { useOpenTelemetry } from "@envelop/opentelemetry";
 import { provider } from "~/obs/exporter";
 import { verifyToken } from "@clerk/backend";
+import jwt from "@tsndr/cloudflare-worker-jwt";
 import {
   ProfileInfoSchema,
   updateUserProfileInfo,
@@ -71,6 +72,24 @@ const getUser = async ({
   return updateUserProfileInfo(DB, profileInfo);
 };
 
+const attachPossibleUserIdFromJWT = (request: Request) => {
+  const JWT_TOKEN = (request.headers.get("Authorization") ?? "").split(" ")[1];
+  if (!JWT_TOKEN) {
+    console.info("No token present");
+    return null;
+  }
+  try {
+    const { payload } = jwt.decode(JWT_TOKEN);
+    const userId = (payload as { id: string })?.id ?? "ANONYMOUS";
+    H.setAttributes({
+      userId: userId,
+    });
+  } catch (error) {
+    console.error("Could not parse token", error);
+    return null;
+  }
+};
+
 export const yoga = createYoga<Env>({
   landingPage: APP_ENV !== "production",
   graphqlEndpoint: "/graphql",
@@ -177,6 +196,8 @@ export default {
     H.setAttributes({
       APP_ENV: APP_ENV ?? "none",
     });
+
+    attachPossibleUserIdFromJWT(req);
     // eslint-disable-next-line no-console
     console.log("🏁 — Initialize Request");
     const response = await yoga.fetch(

src/index.ts

@@ -1 +1,5 @@
-RESEND_EMAIL_KEY=""
+SANITY_PROJECT_ID=
+SANITY_DATASET=
+SANITY_API_VERSION=
+SANITY_SECRET_TOKEN=
+HIGHLIGHT_PROJECT_ID=

workers/google_import_queue_consumer/.dev.vars.example

@@ -1,11 +1,14 @@
 /* eslint-disable no-console */
+import { H } from "@highlight-run/cloudflare";
 import { createClient } from "@sanity/client";
 import { ensureKeys } from "../utils";
 import { GoogleImportQueueElement } from "../../src/datasources/queues/google_import";
 import { v5 } from "uuid";
+import { APP_ENV } from "../../src/env";
 
 type ENV = {
   SANITY_PROJECT_ID: string;
+  HIGHLIGHT_PROJECT_ID: string;
   SANITY_DATASET: string;
   SANITY_API_VERSION: string;
   SANITY_SECRET_TOKEN: string;
@@ -23,55 +26,75 @@ const getSanityClient = (env: ENV) =>
 export const queueConsumer: ExportedHandlerQueueHandler<
   ENV,
   GoogleImportQueueElement
-> = async (batch, env) => {
-  ensureKeys(env, [
-    "SANITY_PROJECT_ID",
-    "SANITY_DATASET",
-    "SANITY_API_VERSION",
-    "SANITY_SECRET_TOKEN",
-  ]);
-  const sanityClient = getSanityClient(env);
-  console.log("Processing queue", batch.queue);
-  for await (const msg of batch.messages) {
-    console.log("Processing message", msg);
-    const { googleMedia, sanityEventInstanceId } = msg.body;
-    const eventInstance = await sanityClient.getDocument(sanityEventInstanceId);
-    if (!eventInstance) {
-      throw new Error(`Event instance ${sanityEventInstanceId} not found`);
-    }
-    const response = await fetch(googleMedia.baseUrl + "=w4096");
-    const blob = await response.blob();
-
-    const createdAsset = await sanityClient.assets.upload("image", blob, {
-      contentType: googleMedia.mimeType,
-      title: googleMedia.id,
-      preserveFilename: true,
-      creditLine: "JavaScript Chile",
-      extract: ["blurhash", "exif", "image", "location", "lqip", "palette"],
+> = async (batch, env, ctx) => {
+  try {
+    const r = new Request("cloudflare:workers:google_import_queue_consumer");
+    H.init(r, { HIGHLIGHT_PROJECT_ID: env.HIGHLIGHT_PROJECT_ID ?? "" }, ctx);
+    H.setAttributes({
+      APP_ENV: APP_ENV ?? "none",
     });
-    console.log("Created asset", createdAsset, createdAsset.metadata);
+    ensureKeys(env, [
+      "SANITY_PROJECT_ID",
+      "SANITY_DATASET",
+      "SANITY_API_VERSION",
+      "SANITY_SECRET_TOKEN",
+      "HIGHLIGHT_PROJECT_ID",
+    ]);
+    const sanityClient = getSanityClient(env);
+    console.log("Processing queue", batch.queue);
+    for await (const msg of batch.messages) {
+      try {
+        console.log("Processing message", msg);
+        const { googleMedia, sanityEventInstanceId } = msg.body;
+        const eventInstance = await sanityClient.getDocument(
+          sanityEventInstanceId,
+        );
+        if (!eventInstance) {
+          throw new Error(`Event instance ${sanityEventInstanceId} not found`);
+        }
+        const response = await fetch(googleMedia.baseUrl + "=w4096");
+        const blob = await response.blob();
 
-    const createdImage = await sanityClient.createOrReplace({
-      _id: v5(googleMedia.id, v5.URL),
-      _type: "eventImage",
-      externalId: googleMedia.id,
-      externalURL: googleMedia.baseUrl,
-      eventInstance: {
-        _type: "reference",
-        _ref: sanityEventInstanceId,
-      },
-      title: googleMedia.filename,
-      image: {
-        _type: "image",
-        asset: {
-          _type: "reference",
-          _ref: createdAsset._id,
-        },
-      },
-    });
+        const createdAsset = await sanityClient.assets.upload("image", blob, {
+          contentType: googleMedia.mimeType,
+          title: googleMedia.id,
+          preserveFilename: true,
+          creditLine: "JavaScript Chile",
+          extract: ["blurhash", "exif", "image", "location", "lqip", "palette"],
+        });
+        console.log("Created asset", createdAsset, createdAsset.metadata);
 
-    console.log("Created image", createdImage);
+        const createdImage = await sanityClient.createOrReplace({
+          _id: v5(googleMedia.id, v5.URL),
+          _type: "eventImage",
+          externalId: googleMedia.id,
+          externalURL: googleMedia.baseUrl,
+          eventInstance: {
+            _type: "reference",
+            _ref: sanityEventInstanceId,
+          },
+          title: googleMedia.filename,
+          image: {
+            _type: "image",
+            asset: {
+              _type: "reference",
+              _ref: createdAsset._id,
+            },
+          },
+        });
 
-    msg.ack();
+        console.log("Created image", createdImage);
+
+        msg.ack();
+      } catch (e) {
+        console.error(e);
+        H.consumeError(e as Error);
+        throw e;
+      }
+    }
+  } catch (e) {
+    console.error(e);
+    H.consumeError(e as Error);
+    throw e;
   }
 };