@empyria/webui 0.1.22 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@empyria/webui",
-	"version": "0.1.22",
+	"version": "0.1.24",
 	"description": "Restate.dev helpers for the Empyria nanoservice framework",
 	"license": "MIT",
 	"author": "Imre Fazekas <imre.fazekas@icloud.com>",
@@ -23,9 +23,9 @@
 		"lint:fix": "bun oxlint --fix"
 	},
 	"dependencies": {
-		"@empyria/common": "0.3.11",
-		"@empyria/moleculer": "0.1.21",
-		"@empyria/restate": "0.4.15",
+		"@empyria/common": "0.3.12",
+		"@empyria/moleculer": "0.1.22",
+		"@empyria/restate": "0.4.17",
 		"@iconify-json/lucide": "^1.2.140",
 		"@iconify-json/simple-icons": "^1.2.99",
 		"@pinia/nuxt": "^1.0.2",
@@ -48,12 +48,12 @@
 		"@nuxt/ui": "^4.11.3",
 		"@nuxtjs/tailwindcss": "7.0.0-beta.1",
 		"@tailwindcss/typography": "^0.5.20",
-		"nuxt": "^4.5.2",
+		"nuxt": "^4.6.0",
+		"oxfmt": "0.72.0",
+		"oxlint": "1.87.0",
 		"tailwindcss": "^4.3.3",
 		"typescript": "^7.0.2",
-		"vue-tsc": "^3.3.12",
-		"oxfmt": "0.72.0",
-		"oxlint": "1.87.0"
+		"vue-tsc": "^3.3.12"
 	},
 	"engines": {
 		"bun": ">=1.4.2",

package/server/api/trpc/[trpc].ts

@@ -1,15 +1,13 @@
 import { fetchRequestHandler } from '@trpc/server/adapters/fetch'
+import { defineEventHandler } from 'nuxt/server'
 import { createContext } from '../../trpc/context'
 import { appRouter } from '../../routers'
 
+// The request is already a web `Request` (`event.req`): tRPC's fetch adapter takes it as it is.
 export default defineEventHandler(async (event) => {
-	// console.log('✅ Test route hit!')
-
-	const request = toWebRequest(event)
-
 	return fetchRequestHandler({
 		endpoint: '/api/trpc',
-		req: request,
+		req: event.req,
 		router: appRouter,
 		createContext: () => createContext(event),
 	})

package/server/plugins/moleculer.ts

@@ -1,9 +1,6 @@
 import type { ServiceBroker as MoleculerBroker } from 'moleculer'
 import { randomUUID as uuid } from 'node:crypto'
 import { connect } from '@empyria/moleculer/Connector.js'
-import { getCookie } from 'h3'
-
-import { AccessTokenCookieKey } from '../../app/consts'
 
 import { settings } from '../env'
 
@@ -89,8 +86,8 @@ export default defineNitroPlugin(async () => {
 			params?: any,
 			opts?: { timeout?: number; meta?: Record<string, any> },
 		): Promise<T> {
-			const event = useEvent()
-			const tokenKey = event?.context?.tokenKey || getCookie(event, AccessTokenCookieKey)
+			// server/trpc/context.ts puts the login cookie's token on the request's context.
+			const tokenKey = useEvent()?.context?.tokenKey
 
 			if (!whitelistedActions.includes(actionName) && !tokenKey) {
 				throw BaseErrors.ServiceVoilation({

package/server/plugins/restate.ts

@@ -1,7 +1,5 @@
 // server/plugins/restate.ts
 import { checkServiceHandler, clients, sendMessage } from '@empyria/restate'
-import { getCookie } from 'h3'
-import { AccessTokenCookieKey } from '../../app/consts'
 
 import { settings } from '../env'
 
@@ -20,8 +18,8 @@ export default defineNitroPlugin(() => {
 		async call<T>(serviceName: string, handlerName: string, params?: any): Promise<T> {
 			await checkServiceHandler(restateAdminURL, serviceName, handlerName)
 
-			const event = useEvent()
-			const tokenKey = event?.context?.tokenKey || getCookie(event, AccessTokenCookieKey)
+			// server/trpc/context.ts puts the login cookie's token on the request's context.
+			const tokenKey = useEvent()?.context?.tokenKey
 
 			const paramsWithToken = tokenKey ? { ...params, tokenKey } : params
 

package/server/trpc/context.ts

@@ -1,20 +1,22 @@
 import { type CookieSerializeOptions } from 'cookie-es'
 import {
-	type H3Event,
+	type RequestEvent,
 	parseCookies,
 	getCookie as getCookieFromEvent,
 	setCookie as setCookieOnEvent,
 	deleteCookie as deleteCookieOnEvent,
-} from 'h3'
+} from 'nuxt/server'
 import { AccessTokenCookieKey } from '../../app/consts'
 
-export const createContext = async (event: H3Event) => {
+export const createContext = async (event: RequestEvent) => {
 	const getCookie = (name: string) => getCookieFromEvent(event, name)
 	const setCookie = (name: string, value: string, serializeOptions?: CookieSerializeOptions) =>
 		setCookieOnEvent(event, name, value, serializeOptions)
 	const deleteCookie = (name: string, serializeOptions?: CookieSerializeOptions) =>
 		deleteCookieOnEvent(event, name, serializeOptions)
 
+	// Kept on the event's context, which every shape of the event shares, for code that runs later in the same request
+	// (server/plugins/restate.ts reads it to pass the token on to Restate).
 	const tokenKey = getCookie(AccessTokenCookieKey)
 	if (tokenKey) {
 		event.context.tokenKey = tokenKey
@@ -26,7 +28,7 @@ export const createContext = async (event: H3Event) => {
 		getCookie,
 		setCookie,
 		deleteCookie,
-		headers: event.headers,
+		headers: event.req.headers,
 	}
 }