fixup! feat(cloudflare): Support basic WorkerEntrypoint

Author: JPeer264

dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/env.d.ts

@@ -1,7 +1,12 @@
 // Generated by Wrangler on Mon Jul 29 2024 21:44:31 GMT-0400 (Eastern Daylight Time)
 // by running `wrangler types`
-
-interface Env {
-  E2E_TEST_DSN: '';
-  MY_DURABLE_OBJECT: DurableObjectNamespace;
+declare namespace Cloudflare {
+  interface GlobalProps {
+    mainModule: typeof import("./src/index");
+	}
+	interface Env {
+    E2E_TEST_DSN: '';
+    MY_DURABLE_OBJECT: DurableObjectNamespace;
+  }
 }
+interface Env extends Cloudflare.Env {}

packages/cloudflare/src/withSentry.ts

@@ -25,6 +25,8 @@ import {
  * @param handler {ExportedHandler} The handler to wrap.
  * @returns The wrapped handler.
  */
+// TODO(v11): The generic types need to be rewritten to following to improve type safety:
+// T extends ExportedHandler<any, any, any> | WorkerEntrypointConstructor<any, any>
 export function withSentry<
   Env = typeof cloudflareEnv,
   QueueHandlerMessage = unknown,
@@ -34,20 +36,26 @@ export function withSentry<
     QueueHandlerMessage,
     CfHostMetadata
   >,
->(optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined, handler: T): T {
+>(optionsCallback: (env: Env) => CloudflareOptions | undefined, handler: T): T {
   if (isCloudflareClass(handler, 'WorkerEntrypoint')) {
-    return instrumentWorkerEntrypoint(optionsCallback, handler);
+    // oxlint-disable-next-line typescript/no-explicit-any
+    return instrumentWorkerEntrypoint(optionsCallback as any, handler);
   }
 
   setAsyncLocalStorageAsyncContextStrategy();
 
   try {
-    instrumentExportedHandlerFetch(handler, optionsCallback);
+    // oxlint-disable-next-line typescript/no-explicit-any
+    instrumentExportedHandlerFetch(handler, optionsCallback as any);
     instrumentHonoErrorHandler(handler);
-    instrumentExportedHandlerScheduled(handler, optionsCallback);
-    instrumentExportedHandlerEmail(handler, optionsCallback);
-    instrumentExportedHandlerQueue(handler, optionsCallback);
-    instrumentExportedHandlerTail(handler, optionsCallback);
+    // oxlint-disable-next-line typescript/no-explicit-any
+    instrumentExportedHandlerScheduled(handler, optionsCallback as any);
+    // oxlint-disable-next-line typescript/no-explicit-any
+    instrumentExportedHandlerEmail(handler, optionsCallback as any);
+    // oxlint-disable-next-line typescript/no-explicit-any
+    instrumentExportedHandlerQueue(handler, optionsCallback as any);
+    // oxlint-disable-next-line typescript/no-explicit-any
+    instrumentExportedHandlerTail(handler, optionsCallback as any);
     // This is here because Miniflare sometimes cannot get instrumented
   } catch {
     // Do not console anything here, we don't want to spam the console with errors