@sentry/cloudflare 11.6.0 → 11.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cjs/dev/index.js +2 -0
- package/build/cjs/dev/index.js.map +1 -1
- package/build/cjs/dev/instrumentations/worker/instrumentScheduled.js +21 -1
- package/build/cjs/dev/instrumentations/worker/instrumentScheduled.js.map +1 -1
- package/build/cjs/dev/integrations/cronTriggers.js +97 -0
- package/build/cjs/dev/integrations/cronTriggers.js.map +1 -0
- package/build/cjs/dev/vite/autoInstrument.js +40 -16
- package/build/cjs/dev/vite/autoInstrument.js.map +1 -1
- package/build/cjs/dev/vite/instrumentFile.js +1 -2
- package/build/cjs/dev/vite/instrumentFile.js.map +1 -1
- package/build/cjs/dev/vite/transform.js +47 -6
- package/build/cjs/dev/vite/transform.js.map +1 -1
- package/build/cjs/dev/vite/wranglerConfig.js +7 -3
- package/build/cjs/dev/vite/wranglerConfig.js.map +1 -1
- package/build/cjs/prod/index.js +2 -0
- package/build/cjs/prod/index.js.map +1 -1
- package/build/cjs/prod/instrumentations/worker/instrumentScheduled.js +21 -1
- package/build/cjs/prod/instrumentations/worker/instrumentScheduled.js.map +1 -1
- package/build/cjs/prod/integrations/cronTriggers.js +97 -0
- package/build/cjs/prod/integrations/cronTriggers.js.map +1 -0
- package/build/cjs/prod/vite/autoInstrument.js +40 -16
- package/build/cjs/prod/vite/autoInstrument.js.map +1 -1
- package/build/cjs/prod/vite/instrumentFile.js +1 -2
- package/build/cjs/prod/vite/instrumentFile.js.map +1 -1
- package/build/cjs/prod/vite/transform.js +47 -6
- package/build/cjs/prod/vite/transform.js.map +1 -1
- package/build/cjs/prod/vite/wranglerConfig.js +7 -3
- package/build/cjs/prod/vite/wranglerConfig.js.map +1 -1
- package/build/esm/dev/index.js +1 -0
- package/build/esm/dev/index.js.map +1 -1
- package/build/esm/dev/instrumentations/worker/instrumentScheduled.js +22 -2
- package/build/esm/dev/instrumentations/worker/instrumentScheduled.js.map +1 -1
- package/build/esm/dev/integrations/cronTriggers.js +95 -0
- package/build/esm/dev/integrations/cronTriggers.js.map +1 -0
- package/build/esm/dev/package.json +1 -1
- package/build/esm/dev/vite/autoInstrument.js +41 -17
- package/build/esm/dev/vite/autoInstrument.js.map +1 -1
- package/build/esm/dev/vite/instrumentFile.js +2 -3
- package/build/esm/dev/vite/instrumentFile.js.map +1 -1
- package/build/esm/dev/vite/transform.js +47 -6
- package/build/esm/dev/vite/transform.js.map +1 -1
- package/build/esm/dev/vite/wranglerConfig.js +7 -3
- package/build/esm/dev/vite/wranglerConfig.js.map +1 -1
- package/build/esm/prod/index.js +1 -0
- package/build/esm/prod/index.js.map +1 -1
- package/build/esm/prod/instrumentations/worker/instrumentScheduled.js +22 -2
- package/build/esm/prod/instrumentations/worker/instrumentScheduled.js.map +1 -1
- package/build/esm/prod/integrations/cronTriggers.js +95 -0
- package/build/esm/prod/integrations/cronTriggers.js.map +1 -0
- package/build/esm/prod/package.json +1 -1
- package/build/esm/prod/vite/autoInstrument.js +41 -17
- package/build/esm/prod/vite/autoInstrument.js.map +1 -1
- package/build/esm/prod/vite/instrumentFile.js +2 -3
- package/build/esm/prod/vite/instrumentFile.js.map +1 -1
- package/build/esm/prod/vite/transform.js +47 -6
- package/build/esm/prod/vite/transform.js.map +1 -1
- package/build/esm/prod/vite/wranglerConfig.js +7 -3
- package/build/esm/prod/vite/wranglerConfig.js.map +1 -1
- package/build/types/index.d.ts +2 -0
- package/build/types/index.d.ts.map +1 -1
- package/build/types/instrumentations/worker/instrumentScheduled.d.ts.map +1 -1
- package/build/types/integrations/cronTriggers.d.ts +62 -0
- package/build/types/integrations/cronTriggers.d.ts.map +1 -0
- package/build/types/vite/autoInstrument.d.ts +7 -6
- package/build/types/vite/autoInstrument.d.ts.map +1 -1
- package/build/types/vite/instrumentFile.d.ts +3 -3
- package/build/types/vite/instrumentFile.d.ts.map +1 -1
- package/build/types/vite/transform.d.ts.map +1 -1
- package/build/types/vite/wranglerConfig.d.ts +10 -6
- package/build/types/vite/wranglerConfig.d.ts.map +1 -1
- package/package.json +9 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wranglerConfig.js","sources":["../../../../src/vite/wranglerConfig.ts"],"sourcesContent":["import { existsSync } from 'node:fs';\nimport { dirname, resolve } from 'node:path';\nimport { type Unstable_Config, unstable_readConfig } from 'wrangler';\n\n/**\n * The slice of the wrangler configuration the auto-instrument plugin cares\n * about
|
|
1
|
+
{"version":3,"file":"wranglerConfig.js","sources":["../../../../src/vite/wranglerConfig.ts"],"sourcesContent":["import { existsSync } from 'node:fs';\nimport { dirname, resolve } from 'node:path';\nimport { type Unstable_Config, unstable_readConfig } from 'wrangler';\n\n/**\n * The slice of the wrangler configuration the auto-instrument plugin cares\n * about.\n */\nexport interface WranglerConfig {\n /**\n * An absolute path when `main` names a JS or TS file, otherwise the\n * original value (a package export or virtual module) for Vite to resolve.\n */\n main?: string;\n durableObjects: Array<{ name: string; className: string }>;\n workflows: Array<{ name: string; className: string }>;\n /**\n * Named `WorkerEntrypoint` exports this worker binds to itself via a service\n * binding (`services[]` whose `service` is this worker's own `name`). Only\n * self-bindings appear here: a service binding's `entrypoint` otherwise names\n * an export on a *different* worker, which this build can't wrap.\n */\n workerEntrypoints: string[];\n /**\n * Bindings whose RPC receiver lives in this worker, so this build instruments it. Not deduped by\n * class, two bindings may point at the same class and both names have to be listed.\n */\n sameWorkerBindings: SameWorkerBinding[];\n}\n\n// Same rule as `@cloudflare/vite-plugin`: only these extensions mark `main` as a file path.\nconst ENTRY_FILE_REGEX = /\\.(?:m?[jt]s|[jt]sx)$/;\n\n/** Stands in for a class name where a binding targets the module's default export. */\nexport const DEFAULT_EXPORT = Symbol('defaultExport');\n\n/** The name a binding or an export is known by, either an exported class name or the default export. */\nexport type ExportName = string | typeof DEFAULT_EXPORT;\n\nexport interface SameWorkerBinding {\n bindingName: string;\n className: ExportName;\n}\n\n/**\n * Locate and resolve the wrangler configuration via wrangler's own\n * `unstable_readConfig` — the API `@cloudflare/vite-plugin` uses.\n *\n * We only locate the file (probing `wrangler.json`, `.jsonc`, `.toml` inside\n * `root` with wrangler's own precedence, since it discovers from `cwd` rather\n * than an arbitrary root); wrangler then parses it and flattens the active\n * environment (honoring `CLOUDFLARE_ENV`). Durable Object and Workflow\n * bindings are the active environment's, matching what the deployed Worker\n * actually binds.\n *\n * Returns `undefined` when no config file is found or it can't be read/parsed\n * (the caller warns and disables auto-instrumentation rather than failing the\n * whole build).\n */\nexport function resolveWranglerConfig(\n root: string,\n explicitPath?: string,\n): { config: WranglerConfig; configPath: string; configDir: string } | undefined {\n const configPath = explicitPath\n ? resolve(root, explicitPath)\n : ['wrangler.json', 'wrangler.jsonc', 'wrangler.toml'].map(name => resolve(root, name)).find(existsSync);\n\n if (!configPath || !existsSync(configPath)) {\n return undefined;\n }\n\n let raw: Unstable_Config;\n try {\n // `hideWarnings` keeps wrangler's config diagnostics (e.g. missing DO\n // migrations) out of the Vite build output.\n raw = unstable_readConfig({ config: configPath }, { hideWarnings: true, preserveOriginalMain: true });\n } catch {\n return undefined;\n }\n\n const resolvedConfigPath = raw.configPath ?? configPath;\n const configDir = dirname(resolvedConfigPath);\n\n return {\n config: {\n main: raw.main && ENTRY_FILE_REGEX.test(raw.main) ? resolve(configDir, raw.main) : raw.main,\n durableObjects: collectClassBindings(raw.durable_objects?.bindings),\n workflows: collectClassBindings(raw.workflows),\n workerEntrypoints: collectSelfBoundEntrypoints(raw),\n sameWorkerBindings: collectSameWorkerBindings(raw),\n },\n configPath: resolvedConfigPath,\n configDir,\n };\n}\n\n/**\n * Collect named `WorkerEntrypoint` exports the worker binds to itself. A service\n * binding's `entrypoint` normally names an export on the *target* worker, so it\n * is only ours when `service` equals this worker's own `name`. Without a `name`\n * there is nothing to match against, so no entrypoints are derivable.\n */\nfunction collectSelfBoundEntrypoints(raw: Unstable_Config): string[] {\n if (!raw.name) {\n return [];\n }\n const entrypoints = new Set<string>();\n for (const binding of raw.services ?? []) {\n if (binding?.service === raw.name && typeof binding.entrypoint === 'string') {\n entrypoints.add(binding.entrypoint);\n }\n }\n return [...entrypoints];\n}\n\n/**\n * Bindings with a `script_name` or naming another worker target a class this build does not wrap,\n * so they are excluded and stay opt-in.\n */\nfunction collectSameWorkerBindings(raw: Unstable_Config): SameWorkerBinding[] {\n const bindings: SameWorkerBinding[] = [];\n\n for (const binding of raw.durable_objects?.bindings ?? []) {\n if (typeof binding?.name === 'string' && typeof binding.class_name === 'string' && !binding.script_name) {\n bindings.push({ bindingName: binding.name, className: binding.class_name });\n }\n }\n\n for (const binding of raw.services ?? []) {\n // A service binding is only ours when `service` names this worker; without a `name` none can be.\n if (raw.name && binding?.service === raw.name && typeof binding.binding === 'string') {\n bindings.push({\n bindingName: binding.binding,\n className: typeof binding.entrypoint === 'string' ? binding.entrypoint : DEFAULT_EXPORT,\n });\n }\n }\n\n return bindings;\n}\n\n/**\n * Map wrangler class bindings (Durable Objects, Workflows — same shape) to the\n * `{ name, className }` the transform needs, skipping duplicates and bindings\n * with a `script_name` (those reference a class exported by a *different*\n * worker, so there is nothing to wrap in this worker's entry file).\n */\nfunction collectClassBindings(\n bindings: ReadonlyArray<{ name: string; class_name?: string; script_name?: string }> | undefined,\n): Array<{ name: string; className: string }> {\n const result: Array<{ name: string; className: string }> = [];\n const seenClassNames = new Set<string>();\n for (const binding of bindings ?? []) {\n if (typeof binding?.class_name !== 'string' || binding.script_name || seenClassNames.has(binding.class_name)) {\n continue;\n }\n seenClassNames.add(binding.class_name);\n result.push({ name: binding.name, className: binding.class_name });\n }\n return result;\n}\n"],"names":[],"mappings":"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"}
|
package/build/esm/prod/index.js
CHANGED
|
@@ -11,6 +11,7 @@ export { _INTERNAL_wrapRequestHandler, getDefaultIntegrations } from './sdk.js';
|
|
|
11
11
|
export { httpServerIntegration } from './integrations/httpServer.js';
|
|
12
12
|
export { fetchIntegration } from './integrations/fetch.js';
|
|
13
13
|
export { spotlightIntegration } from './integrations/spotlight.js';
|
|
14
|
+
export { cronTriggersIntegration } from './integrations/cronTriggers.js';
|
|
14
15
|
export { instrumentWorkflowWithSentry } from './workflows.js';
|
|
15
16
|
export { setAsyncLocalStorageAsyncContextStrategy } from '@sentry/server-utils/no-diagnostic-channels';
|
|
16
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SENTRY_SEGMENT_NAME_SOURCE, SENTRY_ORIGIN, FAAS_TRIGGER, FAAS_TIME, FAAS_CRON, CODE_FUNCTION_NAME, SENTRY_DESCRIPTION, SENTRY_OP } from '@sentry/conventions/attributes';
|
|
2
2
|
import { FUNCTION } from '@sentry/conventions/op';
|
|
3
|
-
import { withIsolationScope, startSpan, hasSpanStreamingEnabled, captureException } from '@sentry/core';
|
|
3
|
+
import { withIsolationScope, startSpan, hasSpanStreamingEnabled, debug, captureException } from '@sentry/core';
|
|
4
|
+
import { DEBUG_BUILD } from '../../debug-build.js';
|
|
4
5
|
import { flushAndDispose } from '../../flush.js';
|
|
5
6
|
import { ensureInstrumented } from '../../instrument.js';
|
|
6
7
|
import { getFinalOptions } from '../../options.js';
|
|
@@ -35,9 +36,28 @@ function wrapScheduledHandler(controller, options, context, fn) {
|
|
|
35
36
|
}
|
|
36
37
|
},
|
|
37
38
|
async () => {
|
|
39
|
+
let finishCheckIn;
|
|
38
40
|
try {
|
|
39
|
-
|
|
41
|
+
finishCheckIn = client?.getIntegrationByName("CronTriggers")?.startCheckIn(controller.cron);
|
|
42
|
+
if (finishCheckIn) {
|
|
43
|
+
waitUntil(Promise.resolve(client?.getTransport()?.flush(2e3)).catch(() => void 0));
|
|
44
|
+
}
|
|
40
45
|
} catch (e) {
|
|
46
|
+
DEBUG_BUILD && debug.warn("Failed to send the in_progress cron check-in", e);
|
|
47
|
+
}
|
|
48
|
+
const finish = (status) => {
|
|
49
|
+
try {
|
|
50
|
+
finishCheckIn?.(status);
|
|
51
|
+
} catch (e) {
|
|
52
|
+
DEBUG_BUILD && debug.warn(`Failed to send the ${status} cron check-in`, e);
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
try {
|
|
56
|
+
const result = await fn();
|
|
57
|
+
finish("ok");
|
|
58
|
+
return result;
|
|
59
|
+
} catch (e) {
|
|
60
|
+
finish("error");
|
|
41
61
|
captureException(e, { mechanism: { handled: false, type: "auto.faas.cloudflare.scheduled" } });
|
|
42
62
|
throw e;
|
|
43
63
|
} finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentScheduled.js","sources":["../../../../../src/instrumentations/worker/instrumentScheduled.ts"],"sourcesContent":["import type { ScheduledController } from '@cloudflare/workers-types';\nimport type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport {\n SENTRY_SEGMENT_NAME_SOURCE,\n CODE_FUNCTION_NAME,\n SENTRY_OP,\n FAAS_CRON,\n FAAS_TIME,\n FAAS_TRIGGER,\n SENTRY_DESCRIPTION,\n SENTRY_ORIGIN,\n} from '@sentry/conventions/attributes';\nimport { FUNCTION } from '@sentry/conventions/op';\nimport { captureException, hasSpanStreamingEnabled, startSpan, withIsolationScope } from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { setInvocationState } from '../../utils/invocationContext';\nimport { instrumentEnv } from './instrumentEnv';\n\nfunction wrapScheduledHandler(\n controller: ScheduledController,\n options: CloudflareOptions,\n context: ExecutionContext,\n fn: () => unknown,\n): unknown {\n return withIsolationScope(isolationScope => {\n const waitUntil = context.waitUntil.bind(context);\n\n setInvocationState(isolationScope, { ctx: context });\n\n const client = init({ ...options, ctx: context });\n isolationScope.setClient(client);\n\n addCloudResourceContext(isolationScope);\n\n const description = `Scheduled Cron ${controller.cron}`;\n\n return startSpan(\n {\n name: client && hasSpanStreamingEnabled(client) ? 'scheduled' : description,\n attributes: {\n [SENTRY_OP]: FUNCTION,\n // override description inference by Relay to preserve the original (transaction-based) description.\n // sentry-conventions can't map the special case for the \"Scheduled Cron\" prefix and the chron string.\n [SENTRY_DESCRIPTION]: description,\n [CODE_FUNCTION_NAME]: 'scheduled',\n [FAAS_CRON]: controller.cron,\n [FAAS_TIME]: new Date(controller.scheduledTime).toISOString(),\n [FAAS_TRIGGER]: 'timer',\n [SENTRY_ORIGIN]: 'auto.faas.cloudflare.scheduled',\n [SENTRY_SEGMENT_NAME_SOURCE]: 'task',\n },\n },\n async () => {\n try {\n
|
|
1
|
+
{"version":3,"file":"instrumentScheduled.js","sources":["../../../../../src/instrumentations/worker/instrumentScheduled.ts"],"sourcesContent":["import type { ScheduledController } from '@cloudflare/workers-types';\nimport type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport {\n SENTRY_SEGMENT_NAME_SOURCE,\n CODE_FUNCTION_NAME,\n SENTRY_OP,\n FAAS_CRON,\n FAAS_TIME,\n FAAS_TRIGGER,\n SENTRY_DESCRIPTION,\n SENTRY_ORIGIN,\n} from '@sentry/conventions/attributes';\nimport { FUNCTION } from '@sentry/conventions/op';\nimport { captureException, debug, hasSpanStreamingEnabled, startSpan, withIsolationScope } from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { DEBUG_BUILD } from '../../debug-build';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport type { CronTriggersIntegration } from '../../integrations/cronTriggers';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { setInvocationState } from '../../utils/invocationContext';\nimport { instrumentEnv } from './instrumentEnv';\n\nfunction wrapScheduledHandler(\n controller: ScheduledController,\n options: CloudflareOptions,\n context: ExecutionContext,\n fn: () => unknown,\n): unknown {\n return withIsolationScope(isolationScope => {\n const waitUntil = context.waitUntil.bind(context);\n\n setInvocationState(isolationScope, { ctx: context });\n\n const client = init({ ...options, ctx: context });\n isolationScope.setClient(client);\n\n addCloudResourceContext(isolationScope);\n\n const description = `Scheduled Cron ${controller.cron}`;\n\n return startSpan(\n {\n name: client && hasSpanStreamingEnabled(client) ? 'scheduled' : description,\n attributes: {\n [SENTRY_OP]: FUNCTION,\n // override description inference by Relay to preserve the original (transaction-based) description.\n // sentry-conventions can't map the special case for the \"Scheduled Cron\" prefix and the chron string.\n [SENTRY_DESCRIPTION]: description,\n [CODE_FUNCTION_NAME]: 'scheduled',\n [FAAS_CRON]: controller.cron,\n [FAAS_TIME]: new Date(controller.scheduledTime).toISOString(),\n [FAAS_TRIGGER]: 'timer',\n [SENTRY_ORIGIN]: 'auto.faas.cloudflare.scheduled',\n [SENTRY_SEGMENT_NAME_SOURCE]: 'task',\n },\n },\n async () => {\n let finishCheckIn: ReturnType<CronTriggersIntegration['startCheckIn']>;\n try {\n finishCheckIn = client\n ?.getIntegrationByName<CronTriggersIntegration>('CronTriggers')\n ?.startCheckIn(controller.cron);\n // The transport holds envelopes until the flush after the handler, so a run that is longer than\n // the check-in margin would deliver its in_progress check-in too late and show as missed.\n if (finishCheckIn) {\n waitUntil(Promise.resolve(client?.getTransport()?.flush(2000)).catch(() => undefined));\n }\n } catch (e) {\n DEBUG_BUILD && debug.warn('Failed to send the in_progress cron check-in', e);\n }\n\n const finish = (status: 'ok' | 'error'): void => {\n try {\n finishCheckIn?.(status);\n } catch (e) {\n DEBUG_BUILD && debug.warn(`Failed to send the ${status} cron check-in`, e);\n }\n };\n\n try {\n const result = await fn();\n finish('ok');\n return result;\n } catch (e) {\n finish('error');\n captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.scheduled' } });\n throw e;\n } finally {\n waitUntil(flushAndDispose(client));\n }\n },\n );\n });\n}\n\n/**\n * Instruments a scheduled handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerScheduled<T extends AnyExportedHandler>(\n handler: T,\n optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n if (!('scheduled' in handler) || typeof handler.scheduled !== 'function') {\n return;\n }\n\n handler.scheduled = ensureInstrumented(\n handler.scheduled,\n original =>\n new Proxy(original, {\n apply(target, thisArg, args: Parameters<NonNullable<T['scheduled']>>) {\n const [controller, env, ctx] = args;\n const context = instrumentContext(ctx);\n const options = getFinalOptions(optionsCallback(env), env);\n args[1] = instrumentEnv(env, options);\n args[2] = context;\n\n return wrapScheduledHandler(controller, options, context, () => target.apply(thisArg, args));\n },\n }),\n );\n}\n\n/**\n * Instruments a scheduled method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointScheduled<T extends WorkerEntrypoint>(\n instance: T,\n options: CloudflareOptions,\n context: ExecutionContext,\n): void {\n if (!instance.scheduled) {\n return;\n }\n\n const original = instance.scheduled.bind(instance);\n instance.scheduled = new Proxy(original, {\n apply(target, thisArg, args: [ScheduledController]) {\n const [controller] = args;\n\n return wrapScheduledHandler(controller, options, context, () => Reflect.apply(target, thisArg, args));\n },\n });\n}\n"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { defineIntegration, debug, captureCheckIn, timestampInSeconds } from '@sentry/core';
|
|
2
|
+
import { DEBUG_BUILD } from '../debug-build.js';
|
|
3
|
+
|
|
4
|
+
const INTEGRATION_NAME = "CronTriggers";
|
|
5
|
+
const SLUG_TOKENS = { " ": "-", "*": "x", ",": "_", "-": "to", "/": "by" };
|
|
6
|
+
function cronToMonitorSlug(cron) {
|
|
7
|
+
const expression = cron.trim().toLowerCase().split(/\s+/).join(" ");
|
|
8
|
+
const slug = `cron-${expression.replace(/[ *,\-/]/g, (char) => SLUG_TOKENS[char])}`;
|
|
9
|
+
if (/^[a-z0-9_-]{1,50}$/.test(slug)) {
|
|
10
|
+
return slug;
|
|
11
|
+
}
|
|
12
|
+
let hash = 0;
|
|
13
|
+
for (let i = 0; i < expression.length; i++) {
|
|
14
|
+
hash = (hash * 31 + expression.charCodeAt(i)) % 2147483647;
|
|
15
|
+
}
|
|
16
|
+
return `${slug.replace(/[^a-z0-9_-]+/g, "-").slice(0, 43)}-${hash.toString(36)}`;
|
|
17
|
+
}
|
|
18
|
+
const WEEKDAYS = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"];
|
|
19
|
+
function weekdayIndex(value) {
|
|
20
|
+
return /^[1-7]$/.test(value) ? Number(value) - 1 : WEEKDAYS.indexOf(value.toUpperCase());
|
|
21
|
+
}
|
|
22
|
+
function convertWeekdayItem(item) {
|
|
23
|
+
const match = item.match(/^(\*|\w+)(?:-(\w+))?(?:\/(\d+))?$/);
|
|
24
|
+
if (!match) {
|
|
25
|
+
return void 0;
|
|
26
|
+
}
|
|
27
|
+
const [, from, to, step] = match;
|
|
28
|
+
if (step && !(Number(step) > 0)) {
|
|
29
|
+
return void 0;
|
|
30
|
+
}
|
|
31
|
+
if (from === "*") {
|
|
32
|
+
return to ? void 0 : item;
|
|
33
|
+
}
|
|
34
|
+
const start = weekdayIndex(from);
|
|
35
|
+
const end = to ? weekdayIndex(to) : step ? 6 : start;
|
|
36
|
+
if (start < 0 || end < start) {
|
|
37
|
+
return void 0;
|
|
38
|
+
}
|
|
39
|
+
if (start === end) {
|
|
40
|
+
return WEEKDAYS[start];
|
|
41
|
+
}
|
|
42
|
+
const days = `${WEEKDAYS[start]}-${WEEKDAYS[end]}`;
|
|
43
|
+
return step ? `${days}/${step}` : days;
|
|
44
|
+
}
|
|
45
|
+
function cloudflareCronToCrontab(cron) {
|
|
46
|
+
const fields = cron.trim().split(/\s+/);
|
|
47
|
+
const [, , dayOfMonth = "", , dayOfWeek = ""] = fields;
|
|
48
|
+
if (fields.length !== 5 || /[w?]|l-/i.test(dayOfMonth) || dayOfMonth !== "*" && dayOfWeek !== "*" && (dayOfMonth.startsWith("*") || dayOfWeek.startsWith("*"))) {
|
|
49
|
+
return void 0;
|
|
50
|
+
}
|
|
51
|
+
const weekdays = dayOfWeek.split(",").map(convertWeekdayItem);
|
|
52
|
+
return weekdays.includes(void 0) ? void 0 : [...fields.slice(0, 4), weekdays.join(",")].join(" ");
|
|
53
|
+
}
|
|
54
|
+
const _cronTriggersIntegration = ((options = {}) => {
|
|
55
|
+
return {
|
|
56
|
+
name: INTEGRATION_NAME,
|
|
57
|
+
startCheckIn(cron) {
|
|
58
|
+
if (!cron) {
|
|
59
|
+
return void 0;
|
|
60
|
+
}
|
|
61
|
+
let monitor;
|
|
62
|
+
try {
|
|
63
|
+
monitor = options.monitorSlug ? options.monitorSlug(cron) : cronToMonitorSlug(cron);
|
|
64
|
+
} catch (e) {
|
|
65
|
+
DEBUG_BUILD && debug.warn(`[Cron Triggers] \`monitorSlug\` threw for "${cron}", sending no check-ins:`, e);
|
|
66
|
+
return void 0;
|
|
67
|
+
}
|
|
68
|
+
if (!monitor) {
|
|
69
|
+
return void 0;
|
|
70
|
+
}
|
|
71
|
+
const { monitorSlug, ...monitorSettings } = typeof monitor === "string" ? { monitorSlug: monitor } : monitor;
|
|
72
|
+
if (!monitorSlug) {
|
|
73
|
+
return void 0;
|
|
74
|
+
}
|
|
75
|
+
const crontab = cloudflareCronToCrontab(cron);
|
|
76
|
+
if (!crontab) {
|
|
77
|
+
DEBUG_BUILD && debug.warn(
|
|
78
|
+
`[Cron Triggers] Can't convert "${cron}" to a Sentry schedule, sending check-ins without a schedule or the other monitor settings.`
|
|
79
|
+
);
|
|
80
|
+
}
|
|
81
|
+
const checkInId = captureCheckIn(
|
|
82
|
+
{ monitorSlug, status: "in_progress" },
|
|
83
|
+
crontab ? { ...monitorSettings, schedule: { type: "crontab", value: crontab } } : void 0
|
|
84
|
+
);
|
|
85
|
+
const startTime = timestampInSeconds();
|
|
86
|
+
return (status) => {
|
|
87
|
+
captureCheckIn({ monitorSlug, status, checkInId, duration: timestampInSeconds() - startTime });
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
});
|
|
92
|
+
const cronTriggersIntegration = defineIntegration(_cronTriggersIntegration);
|
|
93
|
+
|
|
94
|
+
export { cronTriggersIntegration };
|
|
95
|
+
//# sourceMappingURL=cronTriggers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cronTriggers.js","sources":["../../../../src/integrations/cronTriggers.ts"],"sourcesContent":["import type { IntegrationFn, MonitorConfig } from '@sentry/core';\nimport { captureCheckIn, debug, defineIntegration, timestampInSeconds } from '@sentry/core';\nimport { DEBUG_BUILD } from '../debug-build';\n\nconst INTEGRATION_NAME = 'CronTriggers' as const;\n\n/**\n * The monitor slug and settings for a Cron Trigger, see `cronTriggersIntegration`.\n */\nexport type CronTriggerMonitorSettings = { monitorSlug: string } & Omit<MonitorConfig, 'schedule' | 'timezone'>;\n\nexport interface CronTriggersOptions {\n /**\n * Chooses the monitor slug for a cron expression. It can also return an object with the `monitorSlug`\n * and other monitor settings, such as `checkinMargin` or `maxRuntime`. Returning `undefined`\n * sends no check-ins for that trigger, and so does a function that throws.\n */\n monitorSlug?: (cron: string) => string | CronTriggerMonitorSettings | undefined;\n}\n\n/** @internal Used by the scheduled handler instrumentation. */\nexport interface CronTriggersIntegration {\n name: string;\n startCheckIn(cron: string): ((status: 'ok' | 'error') => void) | undefined;\n}\n\nconst SLUG_TOKENS: Record<string, string> = { ' ': '-', '*': 'x', ',': '_', '-': 'to', '/': 'by' };\n\n/**\n * Derives a monitor slug from a cron expression, e.g. `30 9 * * MON-FRI` -> `cron-30-9-x-x-montofri`.\n *\n * A hash of the expression is appended when it has any other characters or the slug would be\n * longer than 50 characters, so different expressions don't share a slug.\n */\nfunction cronToMonitorSlug(cron: string): string {\n const expression = cron.trim().toLowerCase().split(/\\s+/).join(' ');\n const slug = `cron-${expression.replace(/[ *,\\-/]/g, char => SLUG_TOKENS[char] as string)}`;\n if (/^[a-z0-9_-]{1,50}$/.test(slug)) {\n return slug;\n }\n\n // A polynomial string hash modulo 2^31 - 1, at most 6 characters in base 36.\n let hash = 0;\n for (let i = 0; i < expression.length; i++) {\n hash = (hash * 31 + expression.charCodeAt(i)) % 2147483647;\n }\n return `${slug.replace(/[^a-z0-9_-]+/g, '-').slice(0, 43)}-${hash.toString(36)}`;\n}\n\nconst WEEKDAYS = ['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'];\n\n// Cloudflare numbers weekdays from 1 = Sunday to 7 = Saturday. Returns -1 for anything else.\nfunction weekdayIndex(value: string): number {\n return /^[1-7]$/.test(value) ? Number(value) - 1 : WEEKDAYS.indexOf(value.toUpperCase());\n}\n\nfunction convertWeekdayItem(item: string): string | undefined {\n const match = item.match(/^(\\*|\\w+)(?:-(\\w+))?(?:\\/(\\d+))?$/);\n if (!match) {\n return undefined;\n }\n const [, from, to, step] = match;\n if (step && !(Number(step) > 0)) {\n return undefined;\n }\n\n // `*` and `*/n` give the same days in both numberings, and keep their `*` meaning for Sentry.\n if (from === '*') {\n return to ? undefined : item;\n }\n\n const start = weekdayIndex(from as string);\n // A step without an end runs to Saturday, so it is written as a range.\n const end = to ? weekdayIndex(to) : step ? 6 : start;\n if (start < 0 || end < start) {\n return undefined;\n }\n\n // A step over a single day would run on to Sunday in Sentry's cron parser, so it is left out.\n if (start === end) {\n return WEEKDAYS[start];\n }\n const days = `${WEEKDAYS[start]}-${WEEKDAYS[end]}`;\n return step ? `${days}/${step}` : days;\n}\n\n/**\n * Converts a Cloudflare cron expression into a crontab Sentry accepts, which numbers weekdays from\n * 0 = Sunday. Returns `undefined` if the day fields can't be converted.\n */\nfunction cloudflareCronToCrontab(cron: string): string | undefined {\n const fields = cron.trim().split(/\\s+/);\n const [, , dayOfMonth = '', , dayOfWeek = ''] = fields;\n // Sentry rejects `W`, `?` and `L-n` in the day of month. When both day fields are set, Cloudflare and Sentry\n // run on the days that match either field, but Sentry requires both to match when one starts with `*`.\n if (\n fields.length !== 5 ||\n /[w?]|l-/i.test(dayOfMonth) ||\n (dayOfMonth !== '*' && dayOfWeek !== '*' && (dayOfMonth.startsWith('*') || dayOfWeek.startsWith('*')))\n ) {\n return undefined;\n }\n\n const weekdays = dayOfWeek.split(',').map(convertWeekdayItem);\n return weekdays.includes(undefined) ? undefined : [...fields.slice(0, 4), weekdays.join(',')].join(' ');\n}\n\nconst _cronTriggersIntegration = ((options: CronTriggersOptions = {}): CronTriggersIntegration => {\n return {\n name: INTEGRATION_NAME,\n startCheckIn(cron) {\n // Manual runs, e.g. through `wrangler dev --test-scheduled`, can have no cron expression.\n if (!cron) {\n return undefined;\n }\n\n let monitor: string | CronTriggerMonitorSettings | undefined;\n try {\n monitor = options.monitorSlug ? options.monitorSlug(cron) : cronToMonitorSlug(cron);\n } catch (e) {\n DEBUG_BUILD && debug.warn(`[Cron Triggers] \\`monitorSlug\\` threw for \"${cron}\", sending no check-ins:`, e);\n return undefined;\n }\n\n if (!monitor) {\n return undefined;\n }\n\n const { monitorSlug, ...monitorSettings } = typeof monitor === 'string' ? { monitorSlug: monitor } : monitor;\n if (!monitorSlug) {\n return undefined;\n }\n\n const crontab = cloudflareCronToCrontab(cron);\n if (!crontab) {\n DEBUG_BUILD &&\n debug.warn(\n `[Cron Triggers] Can't convert \"${cron}\" to a Sentry schedule, sending check-ins without a schedule or the other monitor settings.`,\n );\n }\n\n // Check-ins are captured directly rather than through `withMonitor`, which would fork the\n // isolation scope and lose the invocation state attached to it.\n const checkInId = captureCheckIn(\n { monitorSlug, status: 'in_progress' },\n crontab ? { ...monitorSettings, schedule: { type: 'crontab', value: crontab } } : undefined,\n );\n const startTime = timestampInSeconds();\n\n return status => {\n captureCheckIn({ monitorSlug, status, checkInId, duration: timestampInSeconds() - startTime });\n };\n },\n };\n}) satisfies IntegrationFn;\n\n/**\n * Sends cron check-ins for every Cron Trigger run of the `scheduled` handler, with the trigger's\n * schedule, so Sentry creates the monitor on the first run.\n *\n * Cron Triggers have no names, so map each cron expression to a slug. Without `monitorSlug`, the slug is\n * derived from the expression (`30 9 * * MON-FRI` becomes `cron-30-9-x-x-montofri`) and changes with it.\n * Workers that send to the same project get the same slug for the same expression, so they share a monitor.\n *\n * @example\n * ```ts\n * // src/monitorSlugs.ts\n * export const monitorSlugs: Record<string, string> = {\n * '30 9 * * MON-FRI': 'daily-report',\n * };\n *\n * // src/instrument.server.ts\n * import { cronTriggersIntegration, defineCloudflareOptions } from '@sentry/cloudflare';\n * import { monitorSlugs } from './monitorSlugs';\n *\n * export default defineCloudflareOptions((env) => ({\n * dsn: env.SENTRY_DSN,\n * integrations: [cronTriggersIntegration({ monitorSlug: (cron) => monitorSlugs[cron] })],\n * }));\n *\n * // src/index.ts\n * import { monitorSlugs } from './monitorSlugs';\n *\n * export default {\n * async scheduled(controller, env) {\n * switch (monitorSlugs[controller.cron]) {\n * case 'daily-report':\n * // ...\n * break;\n * }\n * },\n * };\n * ```\n */\nexport const cronTriggersIntegration = defineIntegration(_cronTriggersIntegration);\n"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"type":"module","version":"11.
|
|
1
|
+
{"type":"module","version":"11.8.0","sideEffects":false}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { basename } from 'node:path';
|
|
1
|
+
import { basename, isAbsolute, dirname } from 'node:path';
|
|
2
|
+
import { createIdResolver } from 'vite';
|
|
2
3
|
import { collectAgentCandidates, detectAgentClasses } from './agentClass.js';
|
|
3
4
|
import { resolveInstrumentFile, buildOptionsImport, ENV_FALLBACK_OPTIONS_FN } from './instrumentFile.js';
|
|
4
5
|
import { applyAutoInstrumentTransforms } from './transform.js';
|
|
@@ -19,9 +20,30 @@ async function resolvesNextjsCloudflare(resolver, importer) {
|
|
|
19
20
|
function sentryCloudflareAutoInstrumentPlugin(options = {}) {
|
|
20
21
|
let wranglerConfig;
|
|
21
22
|
let entryFilePath;
|
|
22
|
-
let
|
|
23
|
-
let
|
|
23
|
+
let entrySpecifier;
|
|
24
|
+
let wranglerConfigPath;
|
|
25
|
+
let resolveId;
|
|
26
|
+
const resolvedEntries = /* @__PURE__ */ new Map();
|
|
27
|
+
let instrumentFilePath;
|
|
24
28
|
let isVinext = false;
|
|
29
|
+
function resolveEntrySpecifier(ctx, specifier) {
|
|
30
|
+
const environment = ctx.environment;
|
|
31
|
+
if (!environment || !resolveId) return Promise.resolve(void 0);
|
|
32
|
+
let entry = resolvedEntries.get(environment.name);
|
|
33
|
+
if (!entry) {
|
|
34
|
+
entry = resolveId(environment, specifier, wranglerConfigPath).catch(() => void 0).then((id) => {
|
|
35
|
+
if (!id) {
|
|
36
|
+
ctx.warn?.(
|
|
37
|
+
`[sentry] Could not resolve the wrangler \`main\` "${specifier}". Auto-instrumentation disabled.`
|
|
38
|
+
);
|
|
39
|
+
return void 0;
|
|
40
|
+
}
|
|
41
|
+
return normalizePath(id.replace(/[?#].*$/, ""));
|
|
42
|
+
});
|
|
43
|
+
resolvedEntries.set(environment.name, entry);
|
|
44
|
+
}
|
|
45
|
+
return entry;
|
|
46
|
+
}
|
|
25
47
|
return {
|
|
26
48
|
name: "sentry-cloudflare-auto-instrument",
|
|
27
49
|
configResolved(config) {
|
|
@@ -34,25 +56,26 @@ function sentryCloudflareAutoInstrumentPlugin(options = {}) {
|
|
|
34
56
|
return;
|
|
35
57
|
}
|
|
36
58
|
wranglerConfig = result.config;
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
59
|
+
const main = wranglerConfig.main;
|
|
60
|
+
if (main && isAbsolute(main)) {
|
|
61
|
+
entryFilePath = normalizePath(main);
|
|
62
|
+
instrumentFilePath = resolveInstrumentFile(dirname(main));
|
|
63
|
+
} else if (main) {
|
|
64
|
+
entrySpecifier = main;
|
|
65
|
+
wranglerConfigPath = result.configPath;
|
|
66
|
+
resolveId = createIdResolver(config);
|
|
67
|
+
instrumentFilePath = resolveInstrumentFile(result.configDir);
|
|
47
68
|
}
|
|
48
69
|
},
|
|
49
70
|
async transform(code, id) {
|
|
50
|
-
if (!wranglerConfig || !entryFilePath) return void 0;
|
|
71
|
+
if (!wranglerConfig || !entryFilePath && !entrySpecifier) return void 0;
|
|
51
72
|
if (this.environment?.name === "client") return void 0;
|
|
73
|
+
const entryPath = entrySpecifier ? await resolveEntrySpecifier(this, entrySpecifier) : entryFilePath;
|
|
74
|
+
if (!entryPath) return void 0;
|
|
52
75
|
const normalizedId = normalizePath(id.replace(/[?#].*$/, ""));
|
|
53
|
-
if (normalizedId !==
|
|
54
|
-
if (!JS_EXTENSION_REGEX.test(normalizedId) || !JS_EXTENSION_REGEX.test(
|
|
55
|
-
if (normalizedId.replace(JS_EXTENSION_REGEX, "") !==
|
|
76
|
+
if (normalizedId !== entryPath) {
|
|
77
|
+
if (!JS_EXTENSION_REGEX.test(normalizedId) || !JS_EXTENSION_REGEX.test(entryPath)) return void 0;
|
|
78
|
+
if (normalizedId.replace(JS_EXTENSION_REGEX, "") !== entryPath.replace(JS_EXTENSION_REGEX, "")) {
|
|
56
79
|
return void 0;
|
|
57
80
|
}
|
|
58
81
|
}
|
|
@@ -81,6 +104,7 @@ function sentryCloudflareAutoInstrumentPlugin(options = {}) {
|
|
|
81
104
|
resolve: this.resolve ? (source, importer) => this.resolve(source, importer) : void 0
|
|
82
105
|
}) : void 0;
|
|
83
106
|
const sentryModule = isVinext && await resolvesNextjsCloudflare(this, normalizedId) ? NEXTJS_CLOUDFLARE_MODULE : void 0;
|
|
107
|
+
const { optionsFn, importStmt: optionsImport } = instrumentFilePath ? buildOptionsImport(entryPath, instrumentFilePath) : { optionsFn: ENV_FALLBACK_OPTIONS_FN, importStmt: void 0 };
|
|
84
108
|
const result = applyAutoInstrumentTransforms(code, ast, {
|
|
85
109
|
classWrappers,
|
|
86
110
|
agentClasses,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autoInstrument.js","sources":["../../../../src/vite/autoInstrument.ts"],"sourcesContent":["import { basename } from 'node:path';\nimport { collectAgentCandidates, detectAgentClasses, type ModuleResolver } from './agentClass';\nimport { buildOptionsImport, ENV_FALLBACK_OPTIONS_FN, resolveInstrumentFile } from './instrumentFile';\nimport { applyAutoInstrumentTransforms, type ClassWrapperKind, type ProgramBody } from './transform';\nimport { resolveWranglerConfig, type WranglerConfig } from './wranglerConfig';\n\n// Vite normalizes module IDs to posix separators even on Windows, while\n// `path.resolve` yields backslashes there — normalize before comparing.\nfunction normalizePath(path: string): string {\n return path.replace(/\\\\/g, '/');\n}\n\n// Extensions the entry-module match may tolerate swapping (e.g. wrangler's\n// `main` says `.ts` but the served module is `.js`). Anything else — `.css`,\n// `.html`, … — sharing the entry's basename must never be treated as the entry.\nconst JS_EXTENSION_REGEX = /\\.[cm]?[jt]sx?$/;\n\n// Re-exports everything the generated code uses, and adds the Next.js span handling and OpenTelemetry context.\nconst NEXTJS_CLOUDFLARE_MODULE = '@sentry/nextjs/cloudflare';\n\n/**\n * Whether `@sentry/nextjs/cloudflare` resolves from `importer`. Vite throws instead of returning `null` when\n * `@sentry/nextjs` is installed in a version without that entry.\n */\nasync function resolvesNextjsCloudflare(resolver: ModuleResolver, importer: string): Promise<boolean> {\n try {\n return !!(await resolver.resolve?.(NEXTJS_CLOUDFLARE_MODULE, importer));\n } catch {\n return false;\n }\n}\n\nexport function sentryCloudflareAutoInstrumentPlugin(options: { wranglerConfigPath?: string } = {}) {\n let wranglerConfig: WranglerConfig | undefined;\n let entryFilePath: string | undefined;\n\n let optionsFn = ENV_FALLBACK_OPTIONS_FN;\n let optionsImport: string | undefined;\n let isVinext = false;\n\n return {\n name: 'sentry-cloudflare-auto-instrument',\n\n configResolved(config: {\n root: string;\n plugins?: readonly { name?: string }[];\n logger?: { warn(msg: string): void };\n }): void {\n isVinext = config.plugins?.some(plugin => plugin.name?.startsWith('vinext:')) ?? false;\n\n const result = resolveWranglerConfig(config.root, options.wranglerConfigPath);\n if (!result) {\n // An explicit path that fails is a misconfiguration worth naming;\n // without one, hint at the option so custom-named configs (e.g. a\n // `configPath` handed to @cloudflare/vite-plugin) are discoverable.\n config.logger?.warn(\n options.wranglerConfigPath\n ? `[sentry] Could not find or parse the wrangler config \"${basename(options.wranglerConfigPath)}\" ` +\n '(resolved against the Vite root) — auto-instrumentation disabled.'\n : '[sentry] No parseable wrangler config found — auto-instrumentation disabled. ' +\n 'Set `wranglerConfigPath` if your config uses a custom name.',\n );\n return;\n }\n\n wranglerConfig = result.config;\n if (wranglerConfig.main) {\n // `main` is already absolute (wrangler resolves it); just normalize\n // separators so the entry-module comparison holds on Windows.\n entryFilePath = normalizePath(wranglerConfig.main);\n }\n\n if (entryFilePath) {\n const instrumentFilePath = resolveInstrumentFile(entryFilePath);\n if (instrumentFilePath) {\n const built = buildOptionsImport(entryFilePath, instrumentFilePath);\n optionsFn = built.optionsFn;\n optionsImport = built.importStmt;\n }\n }\n },\n\n async transform(\n this: ModuleResolver & { warn?(msg: string): void; environment?: { name?: string } },\n code: string,\n id: string,\n ): Promise<{ code: string; map: unknown } | undefined> {\n if (!wranglerConfig || !entryFilePath) return undefined;\n\n // The worker entry never belongs to the client (browser) environment.\n // Skipping it keeps a same-basename sibling (e.g. a `src/index.tsx`\n // client entry next to a `src/index.ts` worker) out of the browser bundle.\n if (this.environment?.name === 'client') return undefined;\n\n // Vite may append query/hash params to the module ID.\n const normalizedId = normalizePath(id.replace(/[?#].*$/, ''));\n if (normalizedId !== entryFilePath) {\n // Tolerate a differing JS-flavored extension (e.g. `.js` vs `.ts`).\n if (!JS_EXTENSION_REGEX.test(normalizedId) || !JS_EXTENSION_REGEX.test(entryFilePath)) return undefined;\n if (normalizedId.replace(JS_EXTENSION_REGEX, '') !== entryFilePath.replace(JS_EXTENSION_REGEX, '')) {\n return undefined;\n }\n }\n\n let ast: ProgramBody;\n try {\n ast = this.parse(code);\n } catch {\n // Raw TypeScript or syntax error — esbuild hasn't run yet (unlikely)\n // or the file is genuinely broken. Either way, skip silently.\n return undefined;\n }\n\n const classWrappers = new Map<string, ClassWrapperKind>();\n for (const { className } of wranglerConfig.durableObjects) {\n classWrappers.set(className, 'durableObject');\n }\n for (const { className } of wranglerConfig.workflows) {\n classWrappers.set(className, 'workflow');\n }\n for (const className of wranglerConfig.workerEntrypoints) {\n classWrappers.set(className, 'workerEntrypoint');\n }\n\n // An `agents` Agent is a Durable Object, so wrangler lists it among the DO bindings and only\n // its base-class chain tells the two apart. Detection walks the module graph (base classes\n // usually live in their own file), so it is limited to the configured DO classes.\n //\n // Only `resolve` is handed over — never `load`: awaiting `load()` from inside a transform\n // hook deadlocks the build, since the module can't finish loading while this transform is\n // still pending. `agentClass` reads sibling modules off disk instead.\n const agentCandidates = collectAgentCandidates(\n ast,\n [...classWrappers].filter(([, kind]) => kind === 'durableObject').map(([name]) => name),\n );\n const agentClasses =\n agentCandidates.size > 0\n ? await detectAgentClasses(ast, normalizedId, agentCandidates, {\n parse: code => this.parse(code),\n resolve: this.resolve ? (source, importer) => this.resolve!(source, importer) : undefined,\n })\n : undefined;\n\n // A vinext app with `@sentry/nextjs` installed gets `withSentry` of `@sentry/nextjs/cloudflare`.\n const sentryModule =\n isVinext && (await resolvesNextjsCloudflare(this, normalizedId)) ? NEXTJS_CLOUDFLARE_MODULE : undefined;\n\n // No registration import is injected here: the orchestrion plugin's\n // subscribe-injection makes each bundled package self-register its channel\n // subscriber on the global marker, so wrapping the entry with `withSentry`\n // is all this plugin needs to do.\n const result = applyAutoInstrumentTransforms(code, ast, {\n classWrappers,\n agentClasses,\n optionsFn,\n optionsImport,\n sameWorkerBindings: wranglerConfig.sameWorkerBindings,\n sentryModule,\n });\n\n const wrappedClasses = result?.wrappedClasses ?? new Set<string>();\n const missing = [...classWrappers.keys()].filter(name => !wrappedClasses.has(name));\n if (missing.length > 0) {\n this.warn?.(\n `[sentry] Could not auto-instrument ${missing.join(', ')}.` +\n 'The worker entry has no export matching them. ' +\n 'Star re-exports (`export * from \"./do\"`) are not matched. ' +\n 'Export them by name or wrap them manually with corresponding `instrument*WithSentry` helpers.',\n );\n }\n\n return result ?? undefined;\n },\n };\n}\n"],"names":["code"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"autoInstrument.js","sources":["../../../../src/vite/autoInstrument.ts"],"sourcesContent":["import { basename, dirname, isAbsolute } from 'node:path';\nimport { createIdResolver, type ResolvedConfig } from 'vite';\nimport { collectAgentCandidates, detectAgentClasses, type ModuleResolver } from './agentClass';\nimport { buildOptionsImport, ENV_FALLBACK_OPTIONS_FN, resolveInstrumentFile } from './instrumentFile';\nimport { applyAutoInstrumentTransforms, type ClassWrapperKind, type ProgramBody } from './transform';\nimport { resolveWranglerConfig, type WranglerConfig } from './wranglerConfig';\n\n// Vite normalizes module IDs to posix separators even on Windows, while\n// `path.resolve` yields backslashes there — normalize before comparing.\nfunction normalizePath(path: string): string {\n return path.replace(/\\\\/g, '/');\n}\n\n// Extensions the entry-module match may tolerate swapping (e.g. wrangler's\n// `main` says `.ts` but the served module is `.js`). Anything else — `.css`,\n// `.html`, … — sharing the entry's basename must never be treated as the entry.\nconst JS_EXTENSION_REGEX = /\\.[cm]?[jt]sx?$/;\n\n// Re-exports everything the generated code uses, and adds the Next.js span handling and OpenTelemetry context.\nconst NEXTJS_CLOUDFLARE_MODULE = '@sentry/nextjs/cloudflare';\n\n/**\n * Whether `@sentry/nextjs/cloudflare` resolves from `importer`. Vite throws instead of returning `null` when\n * `@sentry/nextjs` is installed in a version without that entry.\n */\nasync function resolvesNextjsCloudflare(resolver: ModuleResolver, importer: string): Promise<boolean> {\n try {\n return !!(await resolver.resolve?.(NEXTJS_CLOUDFLARE_MODULE, importer));\n } catch {\n return false;\n }\n}\n\ntype TransformContext = ModuleResolver & {\n warn?(msg: string): void;\n environment?: Parameters<ReturnType<typeof createIdResolver>>[0];\n};\n\nexport function sentryCloudflareAutoInstrumentPlugin(options: { wranglerConfigPath?: string } = {}) {\n let wranglerConfig: WranglerConfig | undefined;\n let entryFilePath: string | undefined;\n // A `main` that is not a file path (a package export or virtual module).\n let entrySpecifier: string | undefined;\n let wranglerConfigPath: string | undefined;\n let resolveId: ReturnType<typeof createIdResolver> | undefined;\n // Each environment resolves with its own conditions, so the entry may differ between them.\n const resolvedEntries = new Map<string, Promise<string | undefined>>();\n\n let instrumentFilePath: string | undefined;\n let isVinext = false;\n\n function resolveEntrySpecifier(ctx: TransformContext, specifier: string): Promise<string | undefined> {\n const environment = ctx.environment;\n if (!environment || !resolveId) return Promise.resolve(undefined);\n\n let entry = resolvedEntries.get(environment.name);\n if (!entry) {\n // Resolved from the wrangler config, as wrangler does. Without an importer, Vite's resolver\n // tries the specifier as a path below the root first.\n entry = resolveId(environment, specifier, wranglerConfigPath)\n .catch(() => undefined)\n .then(id => {\n if (!id) {\n ctx.warn?.(\n `[sentry] Could not resolve the wrangler \\`main\\` \"${specifier}\". Auto-instrumentation disabled.`,\n );\n return undefined;\n }\n return normalizePath(id.replace(/[?#].*$/, ''));\n });\n resolvedEntries.set(environment.name, entry);\n }\n return entry;\n }\n\n return {\n name: 'sentry-cloudflare-auto-instrument',\n\n configResolved(config: {\n root: string;\n plugins?: readonly { name?: string }[];\n logger?: { warn(msg: string): void };\n }): void {\n isVinext = config.plugins?.some(plugin => plugin.name?.startsWith('vinext:')) ?? false;\n\n const result = resolveWranglerConfig(config.root, options.wranglerConfigPath);\n if (!result) {\n // An explicit path that fails is a misconfiguration worth naming;\n // without one, hint at the option so custom-named configs (e.g. a\n // `configPath` handed to @cloudflare/vite-plugin) are discoverable.\n config.logger?.warn(\n options.wranglerConfigPath\n ? `[sentry] Could not find or parse the wrangler config \"${basename(options.wranglerConfigPath)}\" ` +\n '(resolved against the Vite root) — auto-instrumentation disabled.'\n : '[sentry] No parseable wrangler config found — auto-instrumentation disabled. ' +\n 'Set `wranglerConfigPath` if your config uses a custom name.',\n );\n return;\n }\n\n wranglerConfig = result.config;\n const main = wranglerConfig.main;\n if (main && isAbsolute(main)) {\n // Normalize separators so the entry-module comparison holds on Windows.\n entryFilePath = normalizePath(main);\n instrumentFilePath = resolveInstrumentFile(dirname(main));\n } else if (main) {\n entrySpecifier = main;\n wranglerConfigPath = result.configPath;\n // Not `this.resolve()`: Rollup's commonjs resolver loads the module it resolves, so a\n // resolve of the entry from the entry's own `transform` never finishes.\n resolveId = createIdResolver(config as ResolvedConfig);\n // A package entry has no project directory of its own.\n instrumentFilePath = resolveInstrumentFile(result.configDir);\n }\n },\n\n async transform(\n this: TransformContext,\n code: string,\n id: string,\n ): Promise<{ code: string; map: unknown } | undefined> {\n if (!wranglerConfig || (!entryFilePath && !entrySpecifier)) return undefined;\n\n // The worker entry never belongs to the client (browser) environment.\n // Skipping it keeps a same-basename sibling (e.g. a `src/index.tsx`\n // client entry next to a `src/index.ts` worker) out of the browser bundle.\n if (this.environment?.name === 'client') return undefined;\n\n const entryPath = entrySpecifier ? await resolveEntrySpecifier(this, entrySpecifier) : entryFilePath;\n if (!entryPath) return undefined;\n\n // Vite may append query/hash params to the module ID.\n const normalizedId = normalizePath(id.replace(/[?#].*$/, ''));\n if (normalizedId !== entryPath) {\n // Tolerate a differing JS-flavored extension (e.g. `.js` vs `.ts`).\n if (!JS_EXTENSION_REGEX.test(normalizedId) || !JS_EXTENSION_REGEX.test(entryPath)) return undefined;\n if (normalizedId.replace(JS_EXTENSION_REGEX, '') !== entryPath.replace(JS_EXTENSION_REGEX, '')) {\n return undefined;\n }\n }\n\n let ast: ProgramBody;\n try {\n ast = this.parse(code);\n } catch {\n // Raw TypeScript or syntax error — esbuild hasn't run yet (unlikely)\n // or the file is genuinely broken. Either way, skip silently.\n return undefined;\n }\n\n const classWrappers = new Map<string, ClassWrapperKind>();\n for (const { className } of wranglerConfig.durableObjects) {\n classWrappers.set(className, 'durableObject');\n }\n for (const { className } of wranglerConfig.workflows) {\n classWrappers.set(className, 'workflow');\n }\n for (const className of wranglerConfig.workerEntrypoints) {\n classWrappers.set(className, 'workerEntrypoint');\n }\n\n // An `agents` Agent is a Durable Object, so wrangler lists it among the DO bindings and only\n // its base-class chain tells the two apart. Detection walks the module graph (base classes\n // usually live in their own file), so it is limited to the configured DO classes.\n //\n // Only `resolve` is handed over — never `load`: awaiting `load()` from inside a transform\n // hook deadlocks the build, since the module can't finish loading while this transform is\n // still pending. `agentClass` reads sibling modules off disk instead.\n const agentCandidates = collectAgentCandidates(\n ast,\n [...classWrappers].filter(([, kind]) => kind === 'durableObject').map(([name]) => name),\n );\n const agentClasses =\n agentCandidates.size > 0\n ? await detectAgentClasses(ast, normalizedId, agentCandidates, {\n parse: code => this.parse(code),\n resolve: this.resolve ? (source, importer) => this.resolve!(source, importer) : undefined,\n })\n : undefined;\n\n // A vinext app with `@sentry/nextjs` installed gets `withSentry` of `@sentry/nextjs/cloudflare`.\n const sentryModule =\n isVinext && (await resolvesNextjsCloudflare(this, normalizedId)) ? NEXTJS_CLOUDFLARE_MODULE : undefined;\n\n const { optionsFn, importStmt: optionsImport } = instrumentFilePath\n ? buildOptionsImport(entryPath, instrumentFilePath)\n : { optionsFn: ENV_FALLBACK_OPTIONS_FN, importStmt: undefined };\n\n // No registration import is injected here: the orchestrion plugin's\n // subscribe-injection makes each bundled package self-register its channel\n // subscriber on the global marker, so wrapping the entry with `withSentry`\n // is all this plugin needs to do.\n const result = applyAutoInstrumentTransforms(code, ast, {\n classWrappers,\n agentClasses,\n optionsFn,\n optionsImport,\n sameWorkerBindings: wranglerConfig.sameWorkerBindings,\n sentryModule,\n });\n\n const wrappedClasses = result?.wrappedClasses ?? new Set<string>();\n const missing = [...classWrappers.keys()].filter(name => !wrappedClasses.has(name));\n if (missing.length > 0) {\n this.warn?.(\n `[sentry] Could not auto-instrument ${missing.join(', ')}.` +\n 'The worker entry has no export matching them. ' +\n 'Star re-exports (`export * from \"./do\"`) are not matched. ' +\n 'Export them by name or wrap them manually with corresponding `instrument*WithSentry` helpers.',\n );\n }\n\n return result ?? undefined;\n },\n };\n}\n"],"names":["code"],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
|
-
import {
|
|
2
|
+
import { resolve, relative, dirname } from 'node:path';
|
|
3
3
|
|
|
4
4
|
const ENV_FALLBACK_OPTIONS_FN = "() => undefined";
|
|
5
5
|
const OPTIONS_IMPORT_IDENTIFIER = "__SENTRY_OPTIONS_CALLBACK__";
|
|
6
6
|
const INSTRUMENT_FILE_BASENAME = "instrument.server";
|
|
7
7
|
const INSTRUMENT_FILE_EXTENSIONS = ["ts", "mts", "js", "mjs", "cjs"];
|
|
8
|
-
function resolveInstrumentFile(
|
|
9
|
-
const dir = dirname(entryFilePath);
|
|
8
|
+
function resolveInstrumentFile(dir) {
|
|
10
9
|
for (const ext of INSTRUMENT_FILE_EXTENSIONS) {
|
|
11
10
|
const candidate = resolve(dir, `${INSTRUMENT_FILE_BASENAME}.${ext}`);
|
|
12
11
|
if (existsSync(candidate)) return candidate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentFile.js","sources":["../../../../src/vite/instrumentFile.ts"],"sourcesContent":["import { existsSync } from 'node:fs';\nimport { dirname, relative, resolve } from 'node:path';\n\n// Fallback options callback used when no instrument file is present. Returning\n// `undefined` makes the SDK read all configuration (DSN, release, environment,\n// sample rate, …) from the worker's `env` at runtime.\nexport const ENV_FALLBACK_OPTIONS_FN = '() => undefined';\n\n// Identifier the generated import binds the user's options module to.\nconst OPTIONS_IMPORT_IDENTIFIER = '__SENTRY_OPTIONS_CALLBACK__';\n\n// Conventional, non-configurable name of the Sentry options module. It is\n// looked up next to the worker entry file; its default export is the options\n// callback `(env) => CloudflareOptions`.\nconst INSTRUMENT_FILE_BASENAME = 'instrument.server';\nconst INSTRUMENT_FILE_EXTENSIONS = ['ts', 'mts', 'js', 'mjs', 'cjs'];\n\n/**\n * Locate the conventional `instrument.server.*` module
|
|
1
|
+
{"version":3,"file":"instrumentFile.js","sources":["../../../../src/vite/instrumentFile.ts"],"sourcesContent":["import { existsSync } from 'node:fs';\nimport { dirname, relative, resolve } from 'node:path';\n\n// Fallback options callback used when no instrument file is present. Returning\n// `undefined` makes the SDK read all configuration (DSN, release, environment,\n// sample rate, …) from the worker's `env` at runtime.\nexport const ENV_FALLBACK_OPTIONS_FN = '() => undefined';\n\n// Identifier the generated import binds the user's options module to.\nconst OPTIONS_IMPORT_IDENTIFIER = '__SENTRY_OPTIONS_CALLBACK__';\n\n// Conventional, non-configurable name of the Sentry options module. It is\n// looked up next to the worker entry file, or next to the wrangler config\n// when `main` is not a file path; its default export is the options\n// callback `(env) => CloudflareOptions`.\nconst INSTRUMENT_FILE_BASENAME = 'instrument.server';\nconst INSTRUMENT_FILE_EXTENSIONS = ['ts', 'mts', 'js', 'mjs', 'cjs'];\n\n/**\n * Locate the conventional `instrument.server.*` module in `dir`. Returns its\n * absolute path, or `undefined` when absent.\n */\nexport function resolveInstrumentFile(dir: string): string | undefined {\n for (const ext of INSTRUMENT_FILE_EXTENSIONS) {\n const candidate = resolve(dir, `${INSTRUMENT_FILE_BASENAME}.${ext}`);\n if (existsSync(candidate)) return candidate;\n }\n return undefined;\n}\n\n/**\n * Build the `optionsFn` reference and `import` statement for the instrument\n * module whose **default export** is the options callback\n * `(env) => CloudflareOptions`.\n *\n * The import is emitted relative to `entryFilePath` because it is injected into\n * the entry file's source. The file extension is kept: extensionless specifiers\n * only resolve for extensions in Vite's default `resolve.extensions` (which\n * excludes `.cjs`), and keeping it makes our probe order authoritative when\n * several `instrument.server.*` files coexist.\n */\nexport function buildOptionsImport(\n entryFilePath: string,\n instrumentFilePath: string,\n): { optionsFn: string; importStmt: string } {\n let relativePath = relative(dirname(entryFilePath), instrumentFilePath).replace(/\\\\/g, '/');\n if (!relativePath.startsWith('.')) relativePath = `./${relativePath}`;\n\n return {\n optionsFn: OPTIONS_IMPORT_IDENTIFIER,\n importStmt: `import ${OPTIONS_IMPORT_IDENTIFIER} from '${relativePath}';\\n`,\n };\n}\n"],"names":[],"mappings":";;;AAMO,MAAM,uBAAA,GAA0B;AAGvC,MAAM,yBAAA,GAA4B,6BAAA;AAMlC,MAAM,wBAAA,GAA2B,mBAAA;AACjC,MAAM,6BAA6B,CAAC,IAAA,EAAM,KAAA,EAAO,IAAA,EAAM,OAAO,KAAK,CAAA;AAM5D,SAAS,sBAAsB,GAAA,EAAiC;AACrE,EAAA,KAAA,MAAW,OAAO,0BAAA,EAA4B;AAC5C,IAAA,MAAM,YAAY,OAAA,CAAQ,GAAA,EAAK,GAAG,wBAAwB,CAAA,CAAA,EAAI,GAAG,CAAA,CAAE,CAAA;AACnE,IAAA,IAAI,UAAA,CAAW,SAAS,CAAA,EAAG,OAAO,SAAA;AAAA,EACpC;AACA,EAAA,OAAO,MAAA;AACT;AAaO,SAAS,kBAAA,CACd,eACA,kBAAA,EAC2C;AAC3C,EAAA,IAAI,YAAA,GAAe,SAAS,OAAA,CAAQ,aAAa,GAAG,kBAAkB,CAAA,CAAE,OAAA,CAAQ,KAAA,EAAO,GAAG,CAAA;AAC1F,EAAA,IAAI,CAAC,YAAA,CAAa,UAAA,CAAW,GAAG,CAAA,EAAG,YAAA,GAAe,KAAK,YAAY,CAAA,CAAA;AAEnE,EAAA,OAAO;AAAA,IACL,SAAA,EAAW,yBAAA;AAAA,IACX,UAAA,EAAY,CAAA,OAAA,EAAU,yBAAyB,CAAA,OAAA,EAAU,YAAY,CAAA;AAAA;AAAA,GACvE;AACF;;;;"}
|
|
@@ -33,7 +33,8 @@ function applyAutoInstrumentTransforms(code, ast, ctx) {
|
|
|
33
33
|
// The identifier must be chosen before wrapping, which bindings survive is only known after.
|
|
34
34
|
optionsFn: sameWorkerBindings.length > 0 ? MERGED_OPTIONS_IDENTIFIER : ctx.optionsFn,
|
|
35
35
|
autoWrapped: /* @__PURE__ */ new Set(),
|
|
36
|
-
manuallyWrappedLocals: collectManuallyWrappedLocals(ast)
|
|
36
|
+
manuallyWrappedLocals: collectManuallyWrappedLocals(ast),
|
|
37
|
+
declaringStatements: collectDeclaringStatements(ast)
|
|
37
38
|
};
|
|
38
39
|
const { wrappedClasses } = state;
|
|
39
40
|
for (const node of ast.body) {
|
|
@@ -85,8 +86,9 @@ function collectManuallyWrappedLocals(ast) {
|
|
|
85
86
|
const wrapperMethods = Object.values(WRAPPER_METHODS);
|
|
86
87
|
const locals = /* @__PURE__ */ new Set();
|
|
87
88
|
for (const node of ast.body) {
|
|
88
|
-
|
|
89
|
-
|
|
89
|
+
const declaration = declarationOf(node);
|
|
90
|
+
if (declaration?.type !== "VariableDeclaration") continue;
|
|
91
|
+
for (const declarator of declaration.declarations ?? []) {
|
|
90
92
|
const name = declarator.id?.type === "Identifier" ? declarator.id.name : void 0;
|
|
91
93
|
const init = declarator.init;
|
|
92
94
|
if (name && init && wrapperMethods.some((method) => isCallToMethod(init, method))) {
|
|
@@ -96,15 +98,31 @@ function collectManuallyWrappedLocals(ast) {
|
|
|
96
98
|
}
|
|
97
99
|
return locals;
|
|
98
100
|
}
|
|
101
|
+
function collectDeclaringStatements(ast) {
|
|
102
|
+
const statements = /* @__PURE__ */ new Map();
|
|
103
|
+
for (const node of ast.body) {
|
|
104
|
+
const declaration = declarationOf(node);
|
|
105
|
+
if (!declaration) continue;
|
|
106
|
+
const ids = declaration.type === "VariableDeclaration" ? (declaration.declarations ?? []).map((declarator) => declarator.id) : declaration.type === "ImportDeclaration" ? (declaration.specifiers ?? []).map((specifier) => specifier.local) : [declaration.id];
|
|
107
|
+
for (const id of ids) {
|
|
108
|
+
if (id?.type === "Identifier" && id.name) statements.set(id.name, node);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return statements;
|
|
112
|
+
}
|
|
99
113
|
function collectTopLevelClasses(ast) {
|
|
100
114
|
const classes = /* @__PURE__ */ new Map();
|
|
101
115
|
for (const node of ast.body) {
|
|
102
|
-
|
|
103
|
-
|
|
116
|
+
const declaration = declarationOf(node);
|
|
117
|
+
if (declaration?.type !== "ClassDeclaration") continue;
|
|
118
|
+
const classNode = declaration;
|
|
104
119
|
if (classNode.id?.name) classes.set(classNode.id.name, classNode);
|
|
105
120
|
}
|
|
106
121
|
return classes;
|
|
107
122
|
}
|
|
123
|
+
function declarationOf(node) {
|
|
124
|
+
return node.type === "ExportNamedDeclaration" ? node.declaration : node;
|
|
125
|
+
}
|
|
108
126
|
function wrapDefaultExport(node, ctx, state) {
|
|
109
127
|
const decl = node.declaration;
|
|
110
128
|
if (isCallToMethod(decl, "withSentry")) return;
|
|
@@ -195,11 +213,34 @@ function wrapSpecifierExports(node, ctx, state) {
|
|
|
195
213
|
}
|
|
196
214
|
state.ms.overwrite(node.start, node.end, statements.join("\n"));
|
|
197
215
|
}
|
|
216
|
+
function wrapDefaultSpecifier(localName, state) {
|
|
217
|
+
if (state.manuallyWrappedLocals.has(localName)) return void 0;
|
|
218
|
+
const wrappedName = state.wrappedLocals.get(localName);
|
|
219
|
+
if (wrappedName) {
|
|
220
|
+
state.autoWrapped.add(DEFAULT_EXPORT);
|
|
221
|
+
return `${wrappedName} as default`;
|
|
222
|
+
}
|
|
223
|
+
const declaringStatement = state.declaringStatements.get(localName);
|
|
224
|
+
if (declaringStatement) {
|
|
225
|
+
state.ms.appendLeft(declaringStatement.end, `
|
|
226
|
+
var __SENTRY_DEFAULT_EXPORT__ = ${localName};`);
|
|
227
|
+
}
|
|
228
|
+
state.ms.append(
|
|
229
|
+
`
|
|
230
|
+
${declaringStatement ? "" : "var "}__SENTRY_DEFAULT_EXPORT__ = __SENTRY__.withSentry(${state.optionsFn}, ${localName});`
|
|
231
|
+
);
|
|
232
|
+
state.needsImport = true;
|
|
233
|
+
state.autoWrapped.add(DEFAULT_EXPORT);
|
|
234
|
+
return "__SENTRY_DEFAULT_EXPORT__ as default";
|
|
235
|
+
}
|
|
198
236
|
function wrapSpecifier(specifier, sourceLiteral, ctx, state, prelude) {
|
|
199
237
|
const exportedName = specifier.type === "ExportSpecifier" && specifier.exported?.type === "Identifier" ? specifier.exported.name : void 0;
|
|
200
238
|
const localName = specifier.local?.type === "Identifier" ? specifier.local.name : void 0;
|
|
201
239
|
const kind = exportedName ? resolveWrapperKind(exportedName, sourceLiteral ? void 0 : localName, state) : void 0;
|
|
202
|
-
if (!exportedName || !localName
|
|
240
|
+
if (!exportedName || !localName) return void 0;
|
|
241
|
+
if (!kind) {
|
|
242
|
+
return exportedName === DEFAULT_IMPORT && !sourceLiteral ? wrapDefaultSpecifier(localName, state) : void 0;
|
|
243
|
+
}
|
|
203
244
|
if (!sourceLiteral) {
|
|
204
245
|
const localClass = state.topLevelClasses.get(localName);
|
|
205
246
|
if (localClass?.id) {
|