fix: try/catch logHttpRequest (#1627)

thirdweb-dev · Sep 19, 2023 · c54db48 · c54db48
1 parent 903145a
commit c54db48
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 40 deletions.
diff --git a/packages/service-utils/src/cf-worker/index.ts b/packages/service-utils/src/cf-worker/index.ts
@@ -204,23 +204,27 @@ export async function logHttpRequest({
   isAuthed?: boolean;
   statusMessage?: Error | string;
 }) {
-  const authorizationData = await extractAuthorizationData({ req, clientId });
-  const headers = req.headers;
-
-  console.log(
-    JSON.stringify({
-      source,
-      pathname: req.url,
-      hasSecretKey: !!authorizationData.secretKey,
-      hasClientId: !!authorizationData.clientId,
-      hasJwt: !!authorizationData.jwt,
-      clientId: authorizationData.clientId,
-      isAuthed: !!isAuthed ?? null,
-      status: res.status,
-      sdkName: headers.get("x-sdk-name") ?? "unknown",
-      sdkVersion: headers.get("x-sdk-version") ?? "unknown",
-      platform: headers.get("x-sdk-platform") ?? "unknown",
-    }),
-  );
-  console.log(`statusMessage=${statusMessage ?? res.statusText}`);
+  try {
+    const authorizationData = await extractAuthorizationData({ req, clientId });
+    const headers = req.headers;
+
+    console.log(
+      JSON.stringify({
+        source,
+        pathname: req.url,
+        hasSecretKey: !!authorizationData.secretKey,
+        hasClientId: !!authorizationData.clientId,
+        hasJwt: !!authorizationData.jwt,
+        clientId: authorizationData.clientId,
+        isAuthed: !!isAuthed ?? null,
+        status: res.status,
+        sdkName: headers.get("x-sdk-name") ?? "unknown",
+        sdkVersion: headers.get("x-sdk-version") ?? "unknown",
+        platform: headers.get("x-sdk-platform") ?? "unknown",
+      }),
+    );
+    console.log(`statusMessage=${statusMessage ?? res.statusText}`);
+  } catch (err) {
+    console.error("Failed to log HTTP request:", err);
+  }
 }
diff --git a/packages/service-utils/src/node/index.ts b/packages/service-utils/src/node/index.ts
@@ -189,25 +189,29 @@ export function logHttpRequest({
   isAuthed?: boolean;
   statusMessage?: Error | string;
 }) {
-  const authorizationData = extractAuthorizationData({ req, clientId });
-  const headers = req.headers;
-
-  const _statusMessage = statusMessage ?? res.statusMessage;
-  console.log(
-    JSON.stringify({
-      source,
-      pathname: req.url,
-      hasSecretKey: !!authorizationData.secretKey,
-      hasClientId: !!authorizationData.clientId,
-      hasJwt: !!authorizationData.jwt,
-      clientId: authorizationData.clientId,
-      isAuthed: !!isAuthed ?? null,
-      status: res.statusCode,
-      statusMessage: _statusMessage,
-      sdkName: headers["x-sdk-name"] ?? "unknown",
-      sdkVersion: headers["x-sdk-version"] ?? "unknown",
-      platform: headers["x-sdk-platform"] ?? "unknown",
-    }),
-  );
-  console.log(`statusMessage=${_statusMessage}`);
+  try {
+    const authorizationData = extractAuthorizationData({ req, clientId });
+    const headers = req.headers;
+
+    const _statusMessage = statusMessage ?? res.statusMessage;
+    console.log(
+      JSON.stringify({
+        source,
+        pathname: req.url,
+        hasSecretKey: !!authorizationData.secretKey,
+        hasClientId: !!authorizationData.clientId,
+        hasJwt: !!authorizationData.jwt,
+        clientId: authorizationData.clientId,
+        isAuthed: !!isAuthed ?? null,
+        status: res.statusCode,
+        statusMessage: _statusMessage,
+        sdkName: headers["x-sdk-name"] ?? "unknown",
+        sdkVersion: headers["x-sdk-version"] ?? "unknown",
+        platform: headers["x-sdk-platform"] ?? "unknown",
+      }),
+    );
+    console.log(`statusMessage=${_statusMessage}`);
+  } catch (err) {
+    console.error("Failed to log HTTP request:", err);
+  }
 }