@srfnstack/spliffy 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srfnstack/spliffy",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "author": "snowbldr",
   "private": false,
   "homepage": "https://github.com/SRFNStack/spliffy",
@@ -30,10 +30,10 @@
     "rest"
   ],
   "dependencies": {
-    "cookie": "^0.4.1",
+    "cookie": "^1.0.2",
     "etag": "^1.8.1",
     "uuid": "^8.3.2",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.40.0"
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.51.0"
   },
   "devDependencies": {
     "helmet": "^4.6.0",

package/src/decorator.mjs

@@ -92,21 +92,19 @@ export function decorateResponse (res, req, finalizeResponse, errorTransformer,
     if (!res.statusCode) res.statusCode = httpStatusCodes.OK
     if (!res.statusMessage) res.statusMessage = defaultStatusMessages[res.statusCode]
     res.headersSent = true
-    res.cork(() => {
-      res.writeStatus(`${res.statusCode} ${res.statusMessage}`)
-      if (typeof res.onFlushHeaders === 'function') {
-        res.onFlushHeaders(res)
-      }
-      for (const header of Object.keys(res.headers)) {
-        if (Array.isArray(res.headers[header])) {
-          for (const multiple of res.headers[header]) {
-            res.writeHeader(header, multiple.toString())
-          }
-        } else {
-          res.writeHeader(header, res.headers[header].toString())
+    res.writeStatus(`${res.statusCode} ${res.statusMessage}`)
+    if (typeof res.onFlushHeaders === 'function') {
+      res.onFlushHeaders(res)
+    }
+    for (const header of Object.keys(res.headers)) {
+      if (Array.isArray(res.headers[header])) {
+        for (const multiple of res.headers[header]) {
+          res.writeHeader(header, multiple.toString())
         }
+      } else {
+        res.writeHeader(header, res.headers[header].toString())
       }
-    })
+    }
   }
   res.writeHead = (status, headers) => {
     res.statusCode = status
@@ -128,23 +126,20 @@ export function decorateResponse (res, req, finalizeResponse, errorTransformer,
   res.uwsWrite = res.write
   res.write = (chunk, encoding, cb) => {
     try {
-      let result
-      res.cork(() => {
-        res.streaming = true
-        res.flushHeaders()
-        let data
-        if (chunk instanceof Buffer) {
-          data = toArrayBuffer(chunk)
-        } else if (typeof chunk === 'string') {
-          data = toArrayBuffer(Buffer.from(chunk, encoding || 'utf8'))
-        } else {
-          data = toArrayBuffer(Buffer.from(JSON.stringify(chunk), encoding || 'utf8'))
-        }
-        result = res.uwsWrite(data)
-        if (typeof cb === 'function') {
-          cb()
-        }
-      })
+      res.streaming = true
+      res.flushHeaders()
+      let data
+      if (chunk instanceof Buffer) {
+        data = toArrayBuffer(chunk)
+      } else if (typeof chunk === 'string') {
+        data = toArrayBuffer(Buffer.from(chunk, encoding || 'utf8'))
+      } else {
+        data = toArrayBuffer(Buffer.from(JSON.stringify(chunk), encoding || 'utf8'))
+      }
+      const result = res.uwsWrite(data)
+      if (typeof cb === 'function') {
+        cb()
+      }
       return result
     } catch (e) {
       if (typeof cb === 'function') {
@@ -182,12 +177,10 @@ export function decorateResponse (res, req, finalizeResponse, errorTransformer,
     }
     // provide writableEnded like node does, with slightly different behavior
     if (!res.writableEnded) {
-      res.cork(() => {
-        res.flushHeaders()
-        uwsEnd.call(res, body)
-        res.writableEnded = true
-        res.ended = true
-      })
+      res.flushHeaders()
+      uwsEnd.call(res, body)
+      res.writableEnded = true
+      res.ended = true
     }
     if (typeof res.onEnd === 'function') {
       res.onEnd()

package/src/handler.mjs

@@ -185,30 +185,32 @@ const handleRequest = async (req, res, handler, middleware, errorTransformer) =>
   }
 }
 
-export const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD', 'CONNECT', 'TRACE']
+export const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD', 'CONNECT', 'TRACE', 'WEBSOCKET']
 
 let currentDate = new Date().toISOString()
 setInterval(() => { currentDate = new Date().toISOString() }, 1000)
 
 export const createHandler = (handler, middleware, pathParameters, config) => function (res, req) {
   try {
-    req = decorateRequest(req, pathParameters, res, config)
-    res = decorateResponse(res, req, finalizeResponse, config.errorTransformer, endError, config)
+    res.cork(() => {
+      req = decorateRequest(req, pathParameters, res, config)
+      res = decorateResponse(res, req, finalizeResponse, config.errorTransformer, endError, config)
 
-    if (config.logAccess) {
-      res.onEnd = writeAccess(req, res)
-    }
+      if (config.logAccess) {
+        res.onEnd = writeAccess(req, res)
+      }
 
-    if (config.writeDateHeader) {
-      res.headers.date = currentDate
-    }
+      if (config.writeDateHeader) {
+        res.headers.date = currentDate
+      }
 
-    handleRequest(req, res, handler, middleware, config.errorTransformer)
-      .catch(e => {
-        log.error('Failed handling request', e)
-        res.statusCode = 500
-        res.end()
-      })
+      handleRequest(req, res, handler, middleware, config.errorTransformer)
+        .catch(e => {
+          log.error('Failed handling request', e)
+          res.statusCode = 500
+          res.end()
+        })
+    })
   } catch (e) {
     log.error('Failed handling request', e)
     res.statusCode = 500

package/src/routes.mjs

@@ -140,8 +140,10 @@ const buildJSHandlerRoute = async (name, filePath, urlPath, inheritedMiddleware,
     if (typeof loadedHandler.handler === 'function') {
       handler = loadedHandler.handler
     }
-    if (typeof handler !== 'function') {
-      throw new Error(`Request method ${method} in file ${filePath} must be a function. Got: ${handlers[method]}`)
+    if (typeof handler !== 'function' && method !== 'WEBSOCKET') {
+      throw new Error(`Request method ${method} in file ${filePath} must be a function. Got: ${typeof handlers[method]}`)
+    } else if (method === 'WEBSOCKET' && typeof handler !== 'object') {
+      throw new Error(`Websocket in file ${filePath} must be an object. Got: ${typeof handlers[method]}`)
     }
     if (!('streamRequestBody' in loadedHandler)) {
       handler.streamRequestBody = handlers.streamRequestBody

package/src/server.mjs

@@ -19,7 +19,8 @@ const appMethods = {
   OPTIONS: 'options',
   HEAD: 'head',
   CONNECT: 'connect',
-  TRACE: 'trace'
+  TRACE: 'trace',
+  WEBSOCKET: 'ws'
 }
 const optionsHandler = (config, middleware, methods) => {
   return createHandler(() => ({
@@ -97,7 +98,12 @@ export async function startServer (config) {
         route.urlPath = route.urlPath.substring(0, route.urlPath.length - 1)
       }
       for (const method in route.handlers) {
-        const theHandler = createHandler(route.handlers[method], route.middleware, route.pathParameters, config)
+        let theHandler = null
+        if (method === 'WEBSOCKET') {
+          theHandler = route.handlers[method]
+        } else {
+          theHandler = createHandler(route.handlers[method], route.middleware, route.pathParameters, config)
+        }
         app[appMethods[method]](route.urlPath, theHandler)
         if (hadSlash && config.serveRoutesWithSlash) {
           app[appMethods[method]](route.urlPath + '/', theHandler)