-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Add a tunnel route helper for TanStack Start React #20264
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nikolovlazar
wants to merge
4
commits into
develop
Choose a base branch
from
lazarnikolov/js-2140-tanstack-start-tunnel-adapter
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ef7b5e9
Add a TanStack Start tunnel route helper
nikolovlazar 1691509
Merge branch 'develop' into lazarnikolov/js-2140-tanstack-start-tunne…
nikolovlazar 316be89
Add TanStack Start tunnel route e2e coverage
nikolovlazar e6b6290
Merge branch 'lazarnikolov/js-2140-tanstack-start-tunnel-adapter' of …
nikolovlazar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
dev-packages/e2e-tests/test-applications/tanstackstart-react/src/globals.d.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| declare const __APP_DSN__: string; | ||
| declare const __APP_TUNNEL__: string; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/monitor.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import * as Sentry from '@sentry/tanstackstart-react'; | ||
| import { createFileRoute } from '@tanstack/react-router'; | ||
|
|
||
| const USE_TUNNEL_ROUTE = process.env.E2E_TEST_USE_TUNNEL_ROUTE === '1'; | ||
|
|
||
| const DEFAULT_DSN = 'https://public@dsn.ingest.sentry.io/1337'; | ||
| const TUNNEL_DSN = 'http://public@localhost:3031/1337'; | ||
|
|
||
| export const Route = createFileRoute('/monitor')({ | ||
| server: Sentry.createSentryTunnelRoute({ | ||
| allowedDsns: [USE_TUNNEL_ROUTE ? TUNNEL_DSN : DEFAULT_DSN], | ||
| }), | ||
| }); |
4 changes: 4 additions & 0 deletions
4
dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/errors.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/middleware.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/transaction.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/tunnel.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { expect, test } from '@playwright/test'; | ||
| import { waitForError } from '@sentry-internal/test-utils'; | ||
|
|
||
| const useTunnelRoute = process.env.E2E_TEST_USE_TUNNEL_ROUTE === '1'; | ||
|
|
||
| test.skip(!useTunnelRoute, 'Tunnel assertions only run in the tunnel variant'); | ||
|
|
||
| test('Sends client-side errors through the monitor tunnel route', async ({ page }) => { | ||
| const errorEventPromise = waitForError('tanstackstart-react', errorEvent => { | ||
| return errorEvent?.exception?.values?.[0]?.value === 'Sentry Client Test Error'; | ||
| }); | ||
|
|
||
| await page.goto('/'); | ||
|
|
||
| await expect(page.locator('button').filter({ hasText: 'Break the client' })).toBeVisible(); | ||
|
|
||
| const monitorResponsePromise = page.waitForResponse(response => { | ||
| return response.url().endsWith('/monitor') && response.request().method() === 'POST'; | ||
| }); | ||
|
|
||
| await page.locator('button').filter({ hasText: 'Break the client' }).click(); | ||
|
|
||
| const monitorResponse = await monitorResponsePromise; | ||
| const errorEvent = await errorEventPromise; | ||
|
|
||
| expect(monitorResponse.status()).toBe(200); | ||
| expect(errorEvent.exception?.values?.[0]?.value).toBe('Sentry Client Test Error'); | ||
| expect(errorEvent.transaction).toBe('/'); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import { handleTunnelRequest } from '@sentry/core'; | ||
|
|
||
| export interface CreateSentryTunnelRouteOptions { | ||
| allowedDsns: string[]; | ||
| } | ||
|
|
||
| type SentryTunnelRouteHandlerContext = { | ||
| request: Request; | ||
| }; | ||
|
|
||
| type SentryTunnelRoute = { | ||
| handlers: { | ||
| POST: (context: SentryTunnelRouteHandlerContext) => Promise<Response>; | ||
| }; | ||
| }; | ||
|
|
||
| /** | ||
| * Creates a TanStack Start server route configuration for tunneling Sentry envelopes. | ||
| * | ||
| * @example | ||
| * ```ts | ||
| * import { createFileRoute } from '@tanstack/react-router'; | ||
| * import * as Sentry from '@sentry/tanstackstart-react'; | ||
| * | ||
| * export const Route = createFileRoute('/monitoring')({ | ||
| * server: Sentry.createSentryTunnelRoute({ | ||
| * allowedDsns: ['https://public@o0.ingest.sentry.io/0'], | ||
| * }), | ||
| * }); | ||
| * ``` | ||
| */ | ||
| export function createSentryTunnelRoute(options: CreateSentryTunnelRouteOptions): SentryTunnelRoute { | ||
| return { | ||
| handlers: { | ||
| POST: async ({ request }) => { | ||
| return handleTunnelRequest({ | ||
| request, | ||
| allowedDsns: options.allowedDsns, | ||
| }); | ||
| }, | ||
| }, | ||
| }; | ||
| } |
48 changes: 48 additions & 0 deletions
48
packages/tanstackstart-react/test/server/tunnelRoute.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import { afterEach, describe, expect, it, vi } from 'vitest'; | ||
|
|
||
| const handleTunnelRequestSpy = vi.fn(); | ||
|
|
||
| vi.mock('@sentry/core', async importOriginal => { | ||
| const original = await importOriginal(); | ||
| return { | ||
| ...original, | ||
| handleTunnelRequest: (...args: unknown[]) => handleTunnelRequestSpy(...args), | ||
| }; | ||
| }); | ||
|
|
||
| const { createSentryTunnelRoute } = await import('../../src/server/tunnelRoute'); | ||
|
|
||
| describe('createSentryTunnelRoute', () => { | ||
| afterEach(() => { | ||
| vi.clearAllMocks(); | ||
| }); | ||
|
|
||
| it('returns a server route config with only a POST handler', () => { | ||
| const route = createSentryTunnelRoute({ | ||
| allowedDsns: ['https://public@o0.ingest.sentry.io/0'], | ||
| }); | ||
|
|
||
| expect(Object.keys(route.handlers)).toEqual(['POST']); | ||
| expect(route.handlers.POST).toBeTypeOf('function'); | ||
| }); | ||
|
|
||
| it('forwards the request and allowed DSNs to handleTunnelRequest', async () => { | ||
| const request = new Request('http://localhost:3000/monitoring', { method: 'POST', body: 'envelope' }); | ||
| const allowedDsns = ['https://public@o0.ingest.sentry.io/0']; | ||
| const response = new Response('ok', { status: 200 }); | ||
|
|
||
| handleTunnelRequestSpy.mockResolvedValueOnce(response); | ||
|
|
||
| const route = createSentryTunnelRoute({ allowedDsns }); | ||
| const result = await route.handlers.POST({ request }); | ||
|
|
||
| expect(handleTunnelRequestSpy).toHaveBeenCalledTimes(1); | ||
| const [options] = handleTunnelRequestSpy.mock.calls[0]!; | ||
| expect(options).toEqual({ | ||
| request, | ||
| allowedDsns, | ||
| }); | ||
| expect(options.allowedDsns).toBe(allowedDsns); | ||
| expect(result).toBe(response); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.