lopata 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "lopata",
-	"version": "0.4.0",
+	"version": "0.4.2",
 	"type": "module",
 	"license": "MIT",
 	"repository": {

package/src/bindings/crypto-extras.ts

@@ -77,8 +77,8 @@ function isPkcs1RsaKey(data: Uint8Array): boolean {
 	if (data.length < 10 || data[0] !== 0x30) return false
 	let offset = 1
 	// Skip outer SEQUENCE length
-	if (data[offset] & 0x80) {
-		offset += 1 + (data[offset] & 0x7f)
+	if (data[offset]! & 0x80) {
+		offset += 1 + (data[offset]! & 0x7f)
 	} else {
 		offset += 1
 	}
@@ -138,7 +138,7 @@ function wrapPkcs1InPkcs8(pkcs1Key: Uint8Array): Uint8Array {
 	return derWrap(0x30, inner)
 }
 
-function toUint8Array(data: BufferSource): Uint8Array {
+function toUint8Array(data: ArrayBuffer | ArrayBufferView): Uint8Array {
 	if (data instanceof Uint8Array) return data
 	if (ArrayBuffer.isView(data)) return new Uint8Array(data.buffer, data.byteOffset, data.byteLength)
 	return new Uint8Array(data)
@@ -166,19 +166,13 @@ export function patchGlobalCrypto(): void {
 	// Patch importKey to accept PKCS#1 RSA keys with "pkcs8" format (matching workerd behavior).
 	// Workerd is lenient and auto-wraps PKCS#1 in PKCS#8; Bun/Node native crypto rejects it.
 	const origImportKey = subtle.importKey.bind(subtle)
-	subtle.importKey = function(
-		format: KeyFormat,
-		keyData: BufferSource | JsonWebKey,
-		algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | AesKeyAlgorithm,
-		extractable: boolean,
-		keyUsages: readonly KeyUsage[],
-	): Promise<CryptoKey> {
-		if (format === 'pkcs8' && !(keyData as JsonWebKey).kty) {
-			const bytes = toUint8Array(keyData as BufferSource)
+	subtle.importKey = ((format: string, keyData: unknown, algorithm: unknown, extractable: boolean, keyUsages: readonly string[]) => {
+		if (format === 'pkcs8' && typeof keyData === 'object' && keyData !== null && !('kty' in keyData)) {
+			const bytes = toUint8Array(keyData as ArrayBuffer | ArrayBufferView)
 			if (isPkcs1RsaKey(bytes)) {
-				return origImportKey('pkcs8', wrapPkcs1InPkcs8(bytes), algorithm, extractable, keyUsages)
+				return (origImportKey as any)('pkcs8', wrapPkcs1InPkcs8(bytes), algorithm, extractable, [...keyUsages])
 			}
 		}
-		return origImportKey(format, keyData as BufferSource, algorithm, extractable, keyUsages)
-	}
+		return (origImportKey as any)(format, keyData, algorithm, extractable, [...keyUsages])
+	}) as typeof subtle.importKey
 }

package/src/vite-plugin/dev-server-plugin.ts

@@ -52,6 +52,8 @@ export function devServerPlugin(options: DevServerPluginOptions): Plugin {
 	let currentModule: Record<string, unknown> | null = null
 	// Serializes module reload — prevents concurrent wireClassRefs calls
 	let reloadLock: Promise<void> | null = null
+	// Flag set on file change; next request will clear runner cache
+	let needsReload = false
 
 	return {
 		name: 'lopata:dev-server',
@@ -133,7 +135,7 @@ export function devServerPlugin(options: DevServerPluginOptions): Plugin {
 					config,
 					gracePeriodMs: 0,
 					get active() {
-						return currentModule ? { workerModule: currentModule, env } : null
+						return currentModule ? { workerModule: currentModule, env, registry } : null
 					},
 					list() {
 						return []
@@ -165,7 +167,24 @@ export function devServerPlugin(options: DevServerPluginOptions): Plugin {
 				apiMod.setWorkerRegistry(workerRegistry)
 			}
 
-			// 5. Set up WebSocket trace streaming on httpServer
+			// 5. Track SSR-relevant file changes.
+			// Vite's built-in HMR flow invalidates the module graph and sends
+			// full-reload events to the runner. However, the runner's async HMR
+			// handler can race with incoming requests. We set a flag here and
+			// clear the runner's evaluated module cache on the next request,
+			// ensuring a clean re-evaluation from the freshly-invalidated module graph.
+			server.watcher.on('change', (file) => {
+				const ssrEnv = server.environments[options.envName]
+				if (!ssrEnv) return
+				const normalizedFile = file.replace(/\\/g, '/')
+				const mods = ssrEnv.moduleGraph.getModulesByFile(normalizedFile)
+				if (mods && mods.size > 0) {
+					needsReload = true
+					currentModule = null
+				}
+			})
+
+			// 6. Set up WebSocket trace streaming on httpServer
 			setupTraceWebSocket(server)
 
 			// 6. Return middleware callback (post-middleware — runs after framework plugins)
@@ -225,6 +244,19 @@ export function devServerPlugin(options: DevServerPluginOptions): Plugin {
 						// Wait for any in-progress reload before importing
 						if (reloadLock) await reloadLock
 
+						// Clear runner's evaluated module cache when files changed.
+						// The module graph is already invalidated by Vite's onFileChange,
+						// but the runner caches evaluated modules independently.
+						// Using .clear() (like the Cloudflare plugin) wipes all three
+						// maps (idToModuleMap, fileToModulesMap, urlToIdModuleMap),
+						// forcing a full re-evaluation from the fresh module graph.
+						if (needsReload) {
+							needsReload = false
+							const runner = (ssrEnv as { runner: { evaluatedModules: { clear(): void } } }).runner
+							runner.evaluatedModules.clear()
+							console.log('[lopata:vite] Cleared runner module cache (file change detected)')
+						}
+
 						const workerModule = await (ssrEnv as any).runner.import(entrypoint) as Record<string, unknown>
 
 						// Re-wire class refs when module changes (HMR invalidation)