lopata 0.5.2 → 0.7.0

package/src/plugin.ts

@@ -1,116 +1,18 @@
 import { plugin } from 'bun'
 import type { BrowserBinding } from './bindings/browser'
-import { SqliteCacheStorage } from './bindings/cache'
-import { FixedLengthStream, IdentityTransformStream } from './bindings/cf-streams'
 import { ContainerBase, getContainer, getRandom } from './bindings/container'
-import { patchGlobalCrypto } from './bindings/crypto-extras'
 import { DurableObjectBase, WebSocketRequestResponsePair } from './bindings/durable-object'
 import { EmailMessage } from './bindings/email'
-import { HTMLRewriter } from './bindings/html-rewriter'
 import type { ImageTransformOptions, OutputOptions } from './bindings/images'
 import { WebSocketPair } from './bindings/websocket-pair'
 import { NonRetryableError, WorkflowEntrypointBase } from './bindings/workflow'
-import { getDatabase } from './db'
 import { globalEnv } from './env'
 import { getActiveExecutionContext } from './execution-context'
+import { setupCloudflareGlobals } from './setup-globals'
 import { getActiveContext } from './tracing/context'
-import { instrumentBinding } from './tracing/instrument'
-import { addSpanEvent, persistError, setSpanAttribute, startSpan } from './tracing/span' // ─── Userland tracing API ────────────────────────────────────────────
- // Exposes a lightweight global that user code can call to create custom
-// spans visible in the Lopata dashboard.  In production (without Lopata)
-// the global is simply absent, so the user's thin wrapper becomes a no-op.
-;(globalThis as any).__lopata = {
-	trace<T>(name: string, attrsOrFn: Record<string, unknown> | (() => T | Promise<T>), maybeFn?: () => T | Promise<T>): Promise<T> {
-		const fn = typeof attrsOrFn === 'function' ? attrsOrFn : maybeFn!
-		const attributes = typeof attrsOrFn === 'function' ? undefined : attrsOrFn
-		return startSpan({ name, attributes }, fn)
-	},
-	setAttribute: setSpanAttribute,
-	addEvent(name: string, message?: string, attrs?: Record<string, unknown>): void {
-		addSpanEvent(name, 'info', message ?? '', attrs)
-	},
-}
-
-// Register global `caches` object (CacheStorage) with tracing
-const rawCacheStorage = new SqliteCacheStorage(getDatabase())
-const cacheMethods = ['match', 'put', 'delete']
-
-// Instrument the default cache
-rawCacheStorage.default = instrumentBinding(rawCacheStorage.default, {
-	type: 'cache',
-	name: 'default',
-	methods: cacheMethods,
-}) as typeof rawCacheStorage.default
-
-// Wrap open() to return instrumented caches
-const originalOpen = rawCacheStorage.open.bind(rawCacheStorage)
-rawCacheStorage.open = async (cacheName: string) => {
-	const cache = await originalOpen(cacheName)
-	return instrumentBinding(cache, {
-		type: 'cache',
-		name: cacheName,
-		methods: cacheMethods,
-	})
-}
-
-Object.defineProperty(globalThis, 'caches', {
-	value: rawCacheStorage,
-	writable: false,
-	configurable: true,
-})
-
-// Register global `HTMLRewriter` class
-Object.defineProperty(globalThis, 'HTMLRewriter', {
-	value: HTMLRewriter,
-	writable: false,
-	configurable: true,
-})
+import { addSpanEvent, persistError, setSpanAttribute, startSpan } from './tracing/span'
 
-// Register global `WebSocketPair` class
-Object.defineProperty(globalThis, 'WebSocketPair', {
-	value: WebSocketPair,
-	writable: false,
-	configurable: true,
-})
-
-// Register global CF stream classes
-Object.defineProperty(globalThis, 'IdentityTransformStream', {
-	value: IdentityTransformStream,
-	writable: false,
-	configurable: true,
-})
-
-Object.defineProperty(globalThis, 'FixedLengthStream', {
-	value: FixedLengthStream,
-	writable: false,
-	configurable: true,
-})
-
-// Patch crypto with CF-specific extensions (timingSafeEqual, DigestStream)
-patchGlobalCrypto()
-
-// Set navigator.userAgent to match Cloudflare Workers
-Object.defineProperty(globalThis.navigator, 'userAgent', {
-	value: 'Cloudflare-Workers',
-	writable: false,
-	configurable: true,
-})
-
-// Set navigator.language (behind enable_navigator_language compat flag in CF)
-if (!globalThis.navigator.language) {
-	Object.defineProperty(globalThis.navigator, 'language', {
-		value: 'en',
-		writable: false,
-		configurable: true,
-	})
-}
-
-// Set performance.timeOrigin to 0 (CF semantics)
-Object.defineProperty(globalThis.performance, 'timeOrigin', {
-	value: 0,
-	writable: false,
-	configurable: true,
-})
+setupCloudflareGlobals()
 
 // Register addEventListener shim for legacy service worker syntax
 // Workers that use addEventListener("fetch", handler) instead of export default { fetch }
@@ -127,17 +29,6 @@ Object.defineProperty(globalThis, 'addEventListener', {
 }) /** @internal Get the registered service worker fetch handler */
 ;(globalThis as any).__lopata_sw_handlers = _serviceWorkerHandlers
 
-// Register scheduler.wait(ms) — await-able setTimeout alternative
-Object.defineProperty(globalThis, 'scheduler', {
-	value: {
-		wait(ms: number): Promise<void> {
-			return new Promise((resolve) => setTimeout(resolve, ms))
-		},
-	},
-	writable: false,
-	configurable: true,
-})
-
 // ─── Console instrumentation ─────────────────────────────────────────
 // Captures console.log/info/warn/error/debug as span events when inside a trace context.
 

package/src/setup-globals.ts

@@ -0,0 +1,150 @@
+import { SqliteCacheStorage } from './bindings/cache'
+import { FixedLengthStream, IdentityTransformStream } from './bindings/cf-streams'
+import { patchGlobalCrypto } from './bindings/crypto-extras'
+import { WebSocketRequestResponsePair } from './bindings/durable-object'
+import { HTMLRewriter } from './bindings/html-rewriter'
+import { WebSocketPair } from './bindings/websocket-pair'
+import { getDatabase } from './db'
+import { instrumentBinding } from './tracing/instrument'
+import { addSpanEvent, setSpanAttribute, startSpan } from './tracing/span'
+
+let initialized = false
+
+/**
+ * Sets up global Cloudflare-compatible APIs:
+ * caches, HTMLRewriter, WebSocketPair, IdentityTransformStream, FixedLengthStream,
+ * navigator.userAgent, navigator.language, performance.timeOrigin, scheduler.wait(),
+ * crypto extensions, and __lopata userland tracing API.
+ *
+ * Idempotent — safe to call multiple times.
+ */
+export function setupCloudflareGlobals() {
+	if (initialized) return
+	initialized = true // ─── Userland tracing API ────────────────────────────────────────────
+	 // Exposes a lightweight global that user code can call to create custom
+	// spans visible in the Lopata dashboard.  In production (without Lopata)
+	// the global is simply absent, so the user's thin wrapper becomes a no-op.
+	;(globalThis as any).__lopata = {
+		trace<T>(name: string, attrsOrFn: Record<string, unknown> | (() => T | Promise<T>), maybeFn?: () => T | Promise<T>): Promise<T> {
+			const fn = typeof attrsOrFn === 'function' ? attrsOrFn : maybeFn!
+			const attributes = typeof attrsOrFn === 'function' ? undefined : attrsOrFn
+			return startSpan({ name, attributes }, fn)
+		},
+		setAttribute: setSpanAttribute,
+		addEvent(name: string, message?: string, attrs?: Record<string, unknown>): void {
+			addSpanEvent(name, 'info', message ?? '', attrs)
+		},
+	}
+
+	// Register global `caches` object (CacheStorage) with tracing
+	const rawCacheStorage = new SqliteCacheStorage(getDatabase())
+	const cacheMethods = ['match', 'put', 'delete']
+
+	// Instrument the default cache
+	rawCacheStorage.default = instrumentBinding(rawCacheStorage.default, {
+		type: 'cache',
+		name: 'default',
+		methods: cacheMethods,
+	}) as typeof rawCacheStorage.default
+
+	// Wrap open() to return instrumented caches
+	const originalOpen = rawCacheStorage.open.bind(rawCacheStorage)
+	rawCacheStorage.open = async (cacheName: string) => {
+		const cache = await originalOpen(cacheName)
+		return instrumentBinding(cache, {
+			type: 'cache',
+			name: cacheName,
+			methods: cacheMethods,
+		})
+	}
+
+	Object.defineProperty(globalThis, 'caches', {
+		value: rawCacheStorage,
+		writable: false,
+		configurable: true,
+	})
+
+	// Register global `HTMLRewriter` class
+	Object.defineProperty(globalThis, 'HTMLRewriter', {
+		value: HTMLRewriter,
+		writable: false,
+		configurable: true,
+	})
+
+	// Register global `WebSocketPair` class
+	Object.defineProperty(globalThis, 'WebSocketPair', {
+		value: WebSocketPair,
+		writable: false,
+		configurable: true,
+	})
+
+	// Register global `WebSocketRequestResponsePair` class (used by DO hibernation API)
+	Object.defineProperty(globalThis, 'WebSocketRequestResponsePair', {
+		value: WebSocketRequestResponsePair,
+		writable: false,
+		configurable: true,
+	})
+
+	// Patch Response to preserve CF-specific `webSocket` property from init
+	const OriginalResponse = globalThis.Response
+	globalThis.Response = class extends OriginalResponse {
+		webSocket?: InstanceType<typeof WebSocketPair>[0]
+
+		constructor(body?: any, init?: ResponseInit & { webSocket?: InstanceType<typeof WebSocketPair>[0] }) {
+			super(body, init)
+			if (init && 'webSocket' in init) {
+				this.webSocket = init.webSocket
+			}
+		}
+	}
+
+	// Register global CF stream classes
+	Object.defineProperty(globalThis, 'IdentityTransformStream', {
+		value: IdentityTransformStream,
+		writable: false,
+		configurable: true,
+	})
+
+	Object.defineProperty(globalThis, 'FixedLengthStream', {
+		value: FixedLengthStream,
+		writable: false,
+		configurable: true,
+	})
+
+	// Patch crypto with CF-specific extensions (timingSafeEqual, DigestStream)
+	patchGlobalCrypto()
+
+	// Set navigator.userAgent to match Cloudflare Workers
+	Object.defineProperty(globalThis.navigator, 'userAgent', {
+		value: 'Cloudflare-Workers',
+		writable: false,
+		configurable: true,
+	})
+
+	// Set navigator.language (behind enable_navigator_language compat flag in CF)
+	if (!globalThis.navigator.language) {
+		Object.defineProperty(globalThis.navigator, 'language', {
+			value: 'en',
+			writable: false,
+			configurable: true,
+		})
+	}
+
+	// Set performance.timeOrigin to 0 (CF semantics)
+	Object.defineProperty(globalThis.performance, 'timeOrigin', {
+		value: 0,
+		writable: false,
+		configurable: true,
+	})
+
+	// Register scheduler.wait(ms) — await-able setTimeout alternative
+	Object.defineProperty(globalThis, 'scheduler', {
+		value: {
+			wait(ms: number): Promise<void> {
+				return new Promise((resolve) => setTimeout(resolve, ms))
+			},
+		},
+		writable: false,
+		configurable: true,
+	})
+}

package/src/vite-plugin/config-plugin.ts

@@ -19,7 +19,7 @@ class LopataDevEnvironment extends DevEnvironment {
 
 	get runner(): ModuleRunner {
 		if (!this._runner) {
-			this._runner = createServerModuleRunner(this, { hmr: false })
+			this._runner = createServerModuleRunner(this, { hmr: {} })
 		}
 		return this._runner
 	}
@@ -42,15 +42,19 @@ export function configPlugin(envName: string): Plugin {
 		name: 'lopata:config',
 		config() {
 			return {
+				// Disable Vite's SPA fallback (history API fallback) — Lopata handles
+				// all requests via worker.fetch(), so no index.html rewriting is needed.
+				appType: 'custom',
 				server: {
 					watch: {
-						ignored: ['**/.lopata/**'],
+						ignored: ['**/.lopata/**', '**/.wrangler/**', '**/.react-router/**'],
 					},
 				},
 				environments: {
 					[envName]: {
 						resolve: {
 							externalConditions: ['workerd', 'worker'],
+							dedupe: ['react', 'react-dom', 'react-router', 'react-router-dom'],
 						},
 						dev: {
 							createEnvironment(name, config) {