@christianirack/brainllm-runtime 0.6.1 → 0.8.0

package/server/native-sockets.mjs

@@ -17,7 +17,7 @@ const unique = (headers, names) => {
   return true
 }
 
-export function installNativeSockets(server, {target, base='/', cookie, log}) {
+export function installNativeSockets(server, {target, base='/', cookie, client, log}) {
   if (installed.has(server)) throw Error('The native socket bridge is already installed')
   if (typeof target !== 'string' || target.length>2048) throw Error('Native sockets require a fixed loopback HTTP backend')
   let origin
@@ -29,15 +29,17 @@ export function installNativeSockets(server, {target, base='/', cookie, log}) {
   const path = (base === '/' ? '' : base.slice(0,-1)) + '/_brain/socket'
   const owned = new Set()
   let stopped = false, window = 0, reports = 0
-  // Fixed fields only: never log target URLs, credentials, frames, request headers or exception messages.
-  const report = (code,rid) => {
+  // Fixed fields only: never log target URLs, credentials, frames or exception messages. The one request header that
+  // is logged is a refused Origin, bounded, because it is the whole evidence of that refusal (B0743).
+  const report = (code,rid,origin) => {
     const current = Math.floor(Date.now()/60000)
     if (window !== current) { window=current; reports=0 }
     if (reports++ >= 16) return
-    try { log('warn','native socket unavailable',{code,rid,fix:'Check native socket activation, the trusted Origin, authentication and backend availability; reconnect after correcting the cause'}) } catch {}
+    const refused = code === 'NATIVE_SOCKET_ORIGIN' ? {brainCode:'B0743',seenOrigin:typeof origin === 'string' ? origin.slice(0,256) : null,fix:'This Origin is not one canonical http(s) origin. Open the site at an exact origin listed in brain.json backend.sockets.allowedOrigins (never a wildcard). Run brain explain B0743'} : {fix:'Check native socket activation, the trusted Origin, authentication and backend availability; reconnect after correcting the cause'}
+    try { log('warn','native socket unavailable',{code,rid,...refused}) } catch {}
   }
-  const reject = (socket,status,rid,code) => {
-    report(code,rid)
+  const reject = (socket,status,rid,code,origin) => {
+    report(code,rid,origin)
     if (socket.destroyed) return
     socket.setTimeout(LIMITS.close,()=>socket.destroy())
     socket.end(`HTTP/1.1 ${status} Socket unavailable\r\nConnection: close\r\nCache-Control: no-store\r\nX-Request-Id: ${rid}\r\nContent-Length: 0\r\n\r\n`,()=>socket.destroy())
@@ -58,8 +60,8 @@ export function installNativeSockets(server, {target, base='/', cookie, log}) {
     if (headerBytes>LIMITS.headers || !unique(incoming.rawHeaders,SINGLE)) return reject(browser,431,rid,'NATIVE_SOCKET_HEADERS')
     if (head.length>LIMITS.head || incoming.headers['content-length'] && incoming.headers['content-length'] !== '0' || incoming.headers['transfer-encoding']) return reject(browser,400,rid,'NATIVE_SOCKET_BODY')
     let site
-    try { site=new URL(incoming.headers.origin) } catch { return reject(browser,403,rid,'NATIVE_SOCKET_ORIGIN') }
-    if (!['http:','https:'].includes(site.protocol) || site.origin !== incoming.headers.origin || site.origin.length>2048) return reject(browser,403,rid,'NATIVE_SOCKET_ORIGIN')
+    try { site=new URL(incoming.headers.origin) } catch { return reject(browser,403,rid,'NATIVE_SOCKET_ORIGIN',incoming.headers.origin) }
+    if (!['http:','https:'].includes(site.protocol) || site.origin !== incoming.headers.origin || site.origin.length>2048) return reject(browser,403,rid,'NATIVE_SOCKET_ORIGIN',incoming.headers.origin)
     const key = incoming.headers['sec-websocket-key']
     if (incoming.headers.upgrade?.toLowerCase() !== 'websocket' || !connectionUpgrade(incoming.headers.connection) || incoming.headers['sec-websocket-version'] !== '13' || incoming.headers['sec-websocket-protocol'] !== PROTOCOL || typeof key !== 'string' || !/^[A-Za-z0-9+/]{22}==$/.test(key) || Buffer.from(key,'base64').toString('base64') !== key) return reject(browser,400,rid,'NATIVE_SOCKET_HANDSHAKE')
     let credentials
@@ -116,7 +118,7 @@ export function installNativeSockets(server, {target, base='/', cookie, log}) {
     try {
       outgoing=request(new URL('/_brain/socket',origin),{
         method:'GET',agent:false,maxHeaderSize:8192,
-        headers:{host:origin.host,origin:site.origin,connection:'Upgrade',upgrade:'websocket','sec-websocket-version':'13','sec-websocket-key':key,'sec-websocket-protocol':PROTOCOL,'x-request-id':rid,...(credentials ? {cookie:credentials} : {}),...(authorization !== undefined ? {authorization} : {})},
+        headers:{host:origin.host,origin:site.origin,connection:'Upgrade',upgrade:'websocket','sec-websocket-version':'13','sec-websocket-key':key,'sec-websocket-protocol':PROTOCOL,'x-request-id':rid,...(credentials ? {cookie:credentials} : {}),...(authorization !== undefined ? {authorization} : {}),...(client?.(incoming) ? {'x-forwarded-for':client(incoming)} : {})},
       })
       outgoing.once('error',()=>finish('NATIVE_SOCKET_UPSTREAM_UNAVAILABLE',502))
       outgoing.once('response',response=>{
@@ -127,7 +129,8 @@ export function installNativeSockets(server, {target, base='/', cookie, log}) {
         if (done) { socket.destroy(); return }
         upstream=socket
         socket.on('error',()=>finish('NATIVE_SOCKET_UPSTREAM_ERROR'))
-        socket.once('close',()=>finish())
+        // After a clean EOF the browser may still hold queued bytes: its own finish (or the bounded close timer) ends the tunnel.
+        socket.once('close',()=>{if (!socket.readableEnded || browser.writableFinished) finish()})
         const expected=createHash('sha1').update(key+'258EAFA5-E914-47DA-95CA-C5AB0DC85B11').digest('base64')
         if (response.statusCode !== 101 || !unique(response.rawHeaders,new Set(['upgrade','sec-websocket-accept','sec-websocket-protocol'])) || response.headers.upgrade?.toLowerCase() !== 'websocket' || !connectionUpgrade(response.headers.connection) || response.headers['sec-websocket-accept'] !== expected || response.headers['sec-websocket-protocol'] !== PROTOCOL || response.headers['sec-websocket-extensions'] || buffered.length>LIMITS.upstreamHead) return finish('NATIVE_SOCKET_BAD_UPSTREAM_HANDSHAKE',502)
         clearTimeout(handshake)