brustjs 0.1.34-alpha → 0.1.36-alpha

package/README.md

@@ -13,10 +13,13 @@
 
 </div>
 
-React on the server, Rust everywhere else. One Bun host process; the HTTP accept
-loop and worker pool are pure Rust, loaded as a `.node` native module (napi-rs).
-Renders cross into Bun Worker threads via `ThreadsafeFunction` and return over
-per-worker `SharedArrayBuffer`. `tokio-uring` (io_uring) on Linux, `tokio` on macOS.
+React on the server, Rust everywhere else. One Bun host process; the HTTP server
+(hyper 1.x, HTTP/1.1 + HTTP/2) and worker pool are pure Rust, loaded as a `.node`
+native module (napi-rs). Renders cross into Bun Worker threads via
+`ThreadsafeFunction` (request as inline JSON) and return over a per-worker
+`SharedArrayBuffer`. One worker can hold several renders in-flight
+(`renderSlots`), overlapping I/O-bound (Suspense) renders. Multi-thread tokio
+runtime — runs the same everywhere (no io_uring / seccomp caveat).
 
 > Published on npm as [`brustjs`](https://www.npmjs.com/package/brustjs) (the
 > `brust` name is taken). Alpha — see **Status**.
@@ -133,7 +136,8 @@ bun test tests/integration.test.ts   # integration (real server)
 ```
 
 ```
-crates/brust/             Rust: accept loop, worker pool, napi exports, SAB
+crates/brust-core/        Rust core (pure, zero napi): hyper server, worker pool, routing, cache
+crates/brust/             Thin napi cdylib over brust-core (the .node)
 crates/jsx-rust-compiler/ JSX → jinja compiler for native: true routes
 runtime/                  Bun-side: routing, render, actions, store, native directives, CLI
 example/                  pokedex native-first demo
@@ -142,14 +146,15 @@ bench/ · docs/ · architecture.md
 
 ## Status
 
-Alpha, solo-developed. Linux is tier-1 (io_uring; glibc + musl, 6 prebuilt platform
-binaries). Known partials: `brustjs dev` reload is a full worker-respawn (not
-state-preserving HMR) — TS, islands, and `.module.css` all reload that way.
-Tailwind is opt-in — the scaffold adds it as a project dependency; `@import "tailwindcss"`
-resolves from your own `node_modules`. Deployment note: the io_uring server needs `io_uring_*`
-syscalls permitted — a default-seccomp container (Docker/k8s) must allow them or run
-`--security-opt seccomp=unconfined`. Roadmap and limitations in
-[`architecture.md`](./architecture.md).
+Alpha, solo-developed. Linux is tier-1 (glibc + musl, 6 prebuilt platform
+binaries); the multi-thread tokio server runs under default container seccomp —
+no `io_uring` exception needed. The server speaks **HTTP/1.1 + HTTP/2** with
+optional in-process **TLS**, and a worker can hold several renders in-flight
+(**`renderSlots`**) to overlap Suspense / loader-bound requests. Known partials:
+`brustjs dev` reload is a full worker-respawn (not state-preserving HMR) — TS,
+islands, and `.module.css` all reload that way. Tailwind is opt-in — the scaffold
+adds it as a project dependency; `@import "tailwindcss"` resolves from your own
+`node_modules`. Roadmap and limitations in [`architecture.md`](./architecture.md).
 
 MIT.
 

package/example/pokedex/components/AddToTeamButton.tsx

@@ -78,7 +78,7 @@ export const behavior = ({ props }: { props: AddTeamProps }) => {
 // emitted by the compiler as x-props="{{ (data) | json_attr }}" (XSS-safe).
 export default function AddToTeamButton({ data }: { data: AddTeamProps }) {
   return (
-    <div x-data="addToTeamButton" x-props={data} className="relative">
+    <div x-props={data} className="relative">
       <Plus
         size={16}
         className="pointer-events-none absolute left-4 top-1/2 -translate-y-1/2 text-white"

package/example/pokedex/components/Breadcrumb.tsx

@@ -42,7 +42,7 @@ export const behavior = () => {
 // bind and on every SPA navigation.
 export default function Breadcrumb({ crumb }: { crumb: string }) {
   return (
-    <b x-data="breadcrumb" x-text="label" className="text-slate-600 dark:text-slate-300">
+    <b x-text="label" className="text-slate-600 dark:text-slate-300">
       {crumb}
     </b>
   )

package/example/pokedex/components/DexFilter.tsx

@@ -52,7 +52,7 @@ export const behavior = ({ props }: { el: HTMLElement; props: unknown }) => {
 // behavior's props — one prop, no separate pre-stringified `dexProps`.
 export default function DexFilter({ items }: { items: Card[] }) {
   return (
-    <section x-data="dexFilter" x-props={items}>
+    <section x-props={items}>
       <div className="mb-6 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="relative w-full sm:max-w-xs">
           <Search

package/example/pokedex/components/HeroSearch.tsx

@@ -29,7 +29,6 @@ export const behavior = () => {
 export default function HeroSearch() {
   return (
     <form
-      x-data="heroSearch"
       x-on-submit="go"
       className="mx-auto mt-8 flex w-full max-w-md items-center gap-2 rounded-2xl bg-white/95 p-2 shadow-lg ring-1 ring-black/5 dark:bg-slate-900/90 dark:ring-white/10"
     >

package/example/pokedex/components/NavLink.tsx

@@ -31,7 +31,6 @@ export const behavior = ({ el }: { el: HTMLElement }) => {
 export default function NavLink({ href, label }: { href: string; label: string }) {
   return (
     <a
-      x-data="navLink"
       x-bind-class="cls"
       x-bind-aria-current="current"
       className="inline-flex items-center rounded-lg px-3 py-1.5 text-sm font-medium text-slate-600 transition-colors hover:bg-slate-100 hover:text-slate-900 dark:text-slate-300 dark:hover:bg-slate-800 dark:hover:text-white"

package/example/pokedex/components/ThemeToggle.tsx

@@ -45,7 +45,6 @@ export default function ThemeToggle() {
   return (
     <button
       type="button"
-      x-data="themeToggle"
       x-on-click="toggle"
       aria-label="Toggle theme"
       className="inline-flex items-center gap-1.5 rounded-lg border border-slate-200 px-3 py-1.5 text-sm font-medium text-slate-700 transition-colors hover:bg-slate-100 dark:border-slate-700 dark:text-slate-200 dark:hover:bg-slate-800"

package/example/pokedex/lib/pokeapi.ts

@@ -8,6 +8,40 @@ import { cachedFetch } from 'brustjs'
 
 export const API = 'https://pokeapi.co/api/v2'
 
+// Process-lifetime memo of PokeAPI JSON. `cachedFetch` dedupes only WITHIN one
+// request (it's AsyncLocalStorage-scoped), so on its own EVERY request re-hits
+// pokeapi.co over the network (~700 ms) — at 120 conns `/pokedex` collapses to
+// ~170 rps, bound entirely by that round-trip. PokeAPI is IMMUTABLE reference
+// data, so the parsed JSON is cached for the process lifetime here: the first
+// request warms it, every later request renders from memory. Only successful
+// (2xx) responses are cached; a non-ok response or a network error resolves
+// `null` and is NOT cached, so a transient 429/500 or a typo'd name retries.
+// (Per-request personalization — theme cookie, team — lives in `chrome()`, not
+// here, so it is never cached.)
+const jsonCache = new Map<string, Promise<unknown>>()
+
+async function getJson<T>(url: string): Promise<T | null> {
+  const hit = jsonCache.get(url) as Promise<T | null> | undefined
+  if (hit) return hit
+  const p = (async (): Promise<T | null> => {
+    const res = await cachedFetch(url)
+    if (!res.ok) return null
+    return (await res.json()) as T
+  })()
+  jsonCache.set(url, p)
+  // Evict anything that didn't yield cacheable data (null / rejected) so the
+  // next request can retry rather than memoizing a transient failure forever.
+  p.then(
+    (v) => {
+      if (v === null && jsonCache.get(url) === p) jsonCache.delete(url)
+    },
+    () => {
+      if (jsonCache.get(url) === p) jsonCache.delete(url)
+    },
+  )
+  return p
+}
+
 export const idFromUrl = (url: string): number => Number((url.match(/\/pokemon\/(\d+)\//) || [])[1])
 
 /** Official-artwork PNG from the PokeAPI sprites CDN — derived from id so the
@@ -81,12 +115,11 @@ export interface RawEvolutionStage {
 }
 
 export async function fetchList(offset: number, limit: number) {
-  const res = await cachedFetch(`${API}/pokemon?limit=${limit}&offset=${offset}`)
-  if (!res.ok) throw new Error(`PokeAPI list ${res.status}`)
-  const page = (await res.json()) as {
+  const page = await getJson<{
     count: number
     results: { name: string; url: string }[]
-  }
+  }>(`${API}/pokemon?limit=${limit}&offset=${offset}`)
+  if (!page) throw new Error('PokeAPI list fetch failed')
   return {
     results: page.results.map((r) => ({ id: idFromUrl(r.url), name: r.name })),
     total: page.count,
@@ -94,9 +127,8 @@ export async function fetchList(offset: number, limit: number) {
 }
 
 export async function fetchPokemon(name: string): Promise<RawPokemon | null> {
-  const res = await cachedFetch(`${API}/pokemon/${name}`)
-  if (!res.ok) return null
-  const p = (await res.json()) as any
+  const p = await getJson<any>(`${API}/pokemon/${name}`)
+  if (!p) return null
   return {
     id: p.id,
     name: p.name,
@@ -110,8 +142,8 @@ export async function fetchPokemon(name: string): Promise<RawPokemon | null> {
 }
 
 export async function fetchSpecies(id: number): Promise<RawSpecies> {
-  const res = await cachedFetch(`${API}/pokemon-species/${id}`)
-  const s = (await res.json()) as any
+  const s = await getJson<any>(`${API}/pokemon-species/${id}`)
+  if (!s) return { flavorText: '', genus: '', evolutionUrl: '' }
   const flavor = s.flavor_text_entries?.find((e: any) => e.language.name === 'en')?.flavor_text as
     | string
     | undefined
@@ -126,9 +158,8 @@ export async function fetchSpecies(id: number): Promise<RawSpecies> {
  *  flattened to the first branch — noted as an open question in the design. */
 export async function fetchEvolution(url: string): Promise<RawEvolutionStage[]> {
   if (!url) return []
-  const res = await cachedFetch(url)
-  if (!res.ok) return []
-  const data = (await res.json()) as any
+  const data = await getJson<any>(url)
+  if (!data) return []
   const stages: RawEvolutionStage[] = []
   let node = data.chain
   while (node) {
@@ -164,9 +195,8 @@ export const ALL_TYPES = [
 
 /** Fetch one type's damage relations → a map of defendingType → multiplier. */
 export async function fetchTypeRelations(type: string): Promise<Record<string, number>> {
-  const res = await cachedFetch(`${API}/type/${type}`)
-  if (!res.ok) return {}
-  const d = (await res.json()) as any
+  const d = await getJson<any>(`${API}/type/${type}`)
+  if (!d) return {}
   const rel = d.damage_relations
   const out: Record<string, number> = {}
   for (const t of rel.double_damage_to || []) out[t.name] = 2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brustjs",
-  "version": "0.1.34-alpha",
+  "version": "0.1.36-alpha",
   "description": "Bun + Rust SSR framework — React on the server, Rust everywhere else (napi cdylib + per-worker SharedArrayBuffer).",
   "license": "MIT",
   "repository": {
@@ -40,12 +40,12 @@
     "typescript": "^6.0.3"
   },
   "optionalDependencies": {
-    "brustjs-darwin-x64": "0.1.34-alpha",
-    "brustjs-darwin-arm64": "0.1.34-alpha",
-    "brustjs-linux-x64-gnu": "0.1.34-alpha",
-    "brustjs-linux-arm64-gnu": "0.1.34-alpha",
-    "brustjs-linux-x64-musl": "0.1.34-alpha",
-    "brustjs-linux-arm64-musl": "0.1.34-alpha"
+    "brustjs-darwin-x64": "0.1.36-alpha",
+    "brustjs-darwin-arm64": "0.1.36-alpha",
+    "brustjs-linux-x64-gnu": "0.1.36-alpha",
+    "brustjs-linux-arm64-gnu": "0.1.36-alpha",
+    "brustjs-linux-x64-musl": "0.1.36-alpha",
+    "brustjs-linux-arm64-musl": "0.1.36-alpha"
   },
   "peerDependencies": {
     "react": "^19.2.6",

package/runtime/cli/native-routes-emit.ts

@@ -483,6 +483,7 @@ export async function emitNativeTemplates(opts: NativeRouteEmitOpts): Promise<vo
         path: string,
         componentSources?: Record<string, string>,
         lucideIcons?: Record<string, string>,
+        directiveNames?: Record<string, string>,
       ) => { template: string; islandsJson: string; warnings?: string[] })
     | null = null
   if (nativeRoutes.length > 0) {
@@ -573,9 +574,24 @@ export async function emitNativeTemplates(opts: NativeRouteEmitOpts): Promise<vo
     const lucideIcons: Record<string, string> = {}
     for (const p of lucidePaths) Object.assign(lucideIcons, await extractLucideIcons(p))
 
+    // Build directive name map: for each ident in `sources` whose source text
+    // contains `export const behavior`, resolve its absolute path from
+    // `mergedImports` and derive the canonical directive name. Uses a dynamic
+    // import to avoid a circular dependency (native/build.ts → scanImports here).
+    const { directiveName } = await import('../native/build.ts')
+    const BEHAVIOR_RE = /export\s+const\s+behavior\b/
+    const directiveNames: Record<string, string> = {}
+    for (const [ident, src] of Object.entries(sources)) {
+      if (!BEHAVIOR_RE.test(src)) continue
+      const ref = mergedImports.get(ident)
+      if (ref && !ref.bare && typeof ref.spec === 'string') {
+        directiveNames[ident] = directiveName(ref.spec, process.cwd())
+      }
+    }
+
     let compiled: { template: string; islandsJson: string; warnings?: string[] }
     try {
-      compiled = compileJsx!(routeSource, routeSourcePath, sources, lucideIcons)
+      compiled = compileJsx!(routeSource, routeSourcePath, sources, lucideIcons, directiveNames)
     } catch (e) {
       throw new Error(
         `native route "${name}" failed to compile (${routeSourcePath}):\n${String(e)}`,

package/runtime/index.d.ts

@@ -1,5 +1,15 @@
 /* auto-generated by NAPI-RS */
 /* eslint-disable */
+/**
+ * Graceful drain: stop accepting new connections, tell every in-flight one to
+ * finish its current request then close, and resolve once they've all drained
+ * (or `timeout_ms` elapses). The TS SIGINT handler awaits this before
+ * `process.exit` so an in-flight render/stream isn't cut off mid-response (the
+ * teardown that produced spurious `split_meta` errors under load). Idempotent-ish:
+ * the accept loop only drains once; a second call just re-resolves.
+ */
+export declare function beginDrain(timeoutMs: number): Promise<NapiResult<undefined>>
+
 export declare function beginServe(opts: ServeOptions): NapiResult<undefined>
 
 export interface CachedIslandJs {
@@ -7,7 +17,7 @@ export interface CachedIslandJs {
   props: string
 }
 
-export declare function compileJsx(source: string, path: string, componentSources?: Record<string, string> | undefined | null, lucideIcons?: Record<string, string> | undefined | null): NapiCompiledJsx
+export declare function compileJsx(source: string, path: string, componentSources?: Record<string, string> | undefined | null, lucideIcons?: Record<string, string> | undefined | null, directiveNames?: Record<string, string> | undefined | null): NapiCompiledJsx
 
 export declare function configureCache(maxEntries: number): NapiResult<undefined>
 
@@ -120,7 +130,7 @@ export declare function napiRegisterWsPaths(paths: Array<string>): NapiResult<un
  * - Ack receiver dropped (handle_conn torn down mid-stream) → NAPI Err
  *   (NOT hang — worker's sink propagates via cb(err) to renderer Promise).
  */
-export declare function napiRenderChunk(workerId: number, len: number): Promise<NapiResult<undefined>>
+export declare function napiRenderChunk(workerId: number, slot: number, len: number): Promise<NapiResult<undefined>>
 
 /**
  * Buffering-path finalizer: equivalent to `napi_render_chunk(_, len)` followed
@@ -134,7 +144,7 @@ export declare function napiRenderChunk(workerId: number, len: number): Promise<
  *
  * Same error semantics as `napi_render_chunk`.
  */
-export declare function napiRenderChunkFinal(workerId: number, len: number): Promise<NapiResult<undefined>>
+export declare function napiRenderChunkFinal(workerId: number, slot: number, len: number): Promise<NapiResult<undefined>>
 
 /**
  * Sub-project J — render via minijinja using SAB-side-channeled loader data.
@@ -165,7 +175,7 @@ export declare function napiRenderChunkFinal(workerId: number, len: number): Pro
  * - `jinja::render` failure → writes a framed 500 into the SAB and returns its
  *   length (the protocol error is converted to an HTTP 500 on the wire).
  */
-export declare function napiRenderJinja(workerId: number, dataLen: number, templateName: string, status?: number | undefined | null): NapiResult<number>
+export declare function napiRenderJinja(workerId: number, slot: number, dataLen: number, templateName: string, status?: number | undefined | null): NapiResult<number>
 
 /**
  * Drop the connection's sender, which signals the per-conn task to exit
@@ -231,7 +241,7 @@ export declare function napiWsSignalOpen(connId: bigint, status: number, body: B
  */
 export declare function registerActions(endpoints: Array<EndpointReg>): NapiResult<number>
 
-export declare function registerRenderer(buf: Uint8Array, f: (arg: number | string) => Promise<number>): NapiResult<number>
+export declare function registerRenderer(buf: Uint8Array, slots: number, f: (arg0: string, arg1: number) => Promise<number>): NapiResult<number>
 
 export declare function registerRoutes(configs: Array<string>): NapiResult<number>
 
@@ -259,6 +269,21 @@ export interface ServeOptions {
   tuning?: ServeTuning
   /** Optional action prefix override. Defaults to `/_brust/action`. */
   actionPrefix?: string
+  /**
+   * Optional in-process TLS: PEM certificate (chain) path. When BOTH this and
+   * `tls_key_path` are present, the server terminates TLS itself (ALPN
+   * h2+http/1.1). Omit either to serve plaintext (unchanged default).
+   */
+  tlsCertPath?: string
+  /** Optional in-process TLS: PEM private-key path. See `tls_cert_path`. */
+  tlsKeyPath?: string
+  /**
+   * Optional minimum TLS version: `"1.2"` (default, = rustls TLS 1.2 + 1.3
+   * safe defaults) or `"1.3"` (TLS 1.3 only, for hardened/compliance
+   * deployments). Case-insensitive, trimmed. Only meaningful when TLS is
+   * configured (cert + key present). An unrecognized value is rejected.
+   */
+  tlsMinVersion?: string
 }
 
 /**
@@ -287,6 +312,22 @@ export interface ServeTuning {
    * Default 10000.
    */
   claimTimeoutMs?: number
+  /**
+   * tokio I/O runtime worker-thread count for the hyper server. Runs inside
+   * Bun (which has its own threads + render workers), so this is NOT
+   * one-per-core. Default `min(available_parallelism, 4)` (fallback 2).
+   */
+  workerThreads?: number
+  /**
+   * Number of render slots per Bun worker (concurrent in-flight renders per
+   * isolate). Default 1 (single in-flight render per worker — byte-identical
+   * to the pre-multi-slot behaviour). The COUNT reaches `register_renderer`
+   * via the `BRUST_RENDER_SLOTS` worker env var set in `runtime/index.ts`; it
+   * is NOT consumed by the Rust `Tuning` struct here (the pool learns it from
+   * `dispatch.slot_count()`). Carried on `ServeTuning` only so the JS layer
+   * has one tunable surface.
+   */
+  renderSlots?: number
 }
 
 export declare function untilReady(timeoutMs: number): Promise<NapiResult<undefined>>