@srfnstack/spliffy 1.2.2 → 1.2.4

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@srfnstack/spliffy",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "author": "snowbldr",
   "private": false,
-  "homepage": "https://github.com/narcolepticsnowman/spliffy",
+  "homepage": "https://github.com/SRFNStack/spliffy",
   "license": "MIT",
   "type": "module",
   "files": [
@@ -14,7 +14,7 @@
   "main": "src/index.mjs",
   "repository": {
     "type": "git",
-    "url": "git@github.com:narcolepticsnowman/spliffy.git"
+    "url": "git@github.com:SRFNStack/spliffy.git"
   },
   "scripts": {
     "test": "npm run lint:fix && jest",

package/src/handler.mjs

@@ -185,7 +185,7 @@ 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)

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,18 +19,19 @@ const appMethods = {
   OPTIONS: 'options',
   HEAD: 'head',
   CONNECT: 'connect',
-  TRACE: 'trace'
+  TRACE: 'trace',
+  WEBSOCKET: 'ws'
 }
 const optionsHandler = (config, middleware, methods) => {
-  return createHandler(() => ({
-    headers: {
-      allow: methods
-    },
-    statusCode: 204
-  }),
-  middleware,
-  [],
-  config
+  return createHandler(() => ( {
+      headers: {
+        allow: methods
+      },
+      statusCode: 204
+    } ),
+    middleware,
+    [],
+    config
   )
 }
 
@@ -68,7 +69,7 @@ const getHttpsApp = (key, cert) => {
 export async function startServer (config) {
   if (!state.initialized) {
     state.initialized = true
-    const routes = [...getNodeModuleRoutes(config), ...(await findRoutes(config))]
+    const routes = [...getNodeModuleRoutes(config), ...( await findRoutes(config) )]
     let app, port
     if (config.httpsKeyFile) {
       app = getHttpsApp(config.secure)
@@ -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)