instaserve 0.1.6 → 0.1.7

package/README.md

@@ -3,7 +3,7 @@ Instant web stack
 
 > npx instaserve (node)
 Starts a server in the current directory
-Creates a routes.mjs file if none exists
+Creates an example routes.mjs file if none exists
 Create a public folder and add files for static file serving
 
 > npm run deno (deno)

package/module.mjs

@@ -2,28 +2,36 @@ import http from 'node:http'
 import fs from 'node:fs'
 const debug = process.env.debug
 
-export default function (routes = { _debug: ({ method, url }, s) => console.log(method, url) }, port = 3000) {
+function public_file(r) {
+    if (r.url == '/') r.url = '/index.html'
+    const fn = `./public${r.url.replace('..', '')}`
+    if (fs.existsSync(fn)) {
+        if (fn.match(/.js$/)) s.writeHead(200, { 'Content-Type': 'application/javascript' })
+        return fs.readFileSync(fn, 'utf-8')
+    }
+}
 
+export default function (routes, port = 3000) {
     const server = http.createServer(async (r, s) => {
         let data = ''
         r.on('data', (s) => data += s.toString().trim())
         r.on('end', (x) => {
             try {
                 if (debug) console.log(`parsing data: "${data}"`)
-                if(data) data = JSON.parse(data)
+                if (debug) console.log(`routes: "${routes}"`)
+                if (data) data = JSON.parse(data)
                 const midware = Object.keys(routes)
                     .filter((k) => k.startsWith('_'))
                     .find((k) => routes[k](r, s, data))
-                if (r.url == '/') r.url = '/index.html'
-                const fn = `./public${r.url.replace('..', '')}`
-                if (fs.existsSync(fn)) {
-                    if (fn.match(/sw\.js/)) s.writeHead(200, { 'Content-Type': 'application/javascript' })
-                    return s.end(fs.readFileSync(fn, 'utf-8'))
-                }
+
+                const fc = public_file(r)
+                if(fc) return s.end(fc)
+                
                 const url = r.url.split('/')[1]
                 if (routes[url]) {
                     const resp = routes[url](r, s, data)
-                    return s.end(resp)
+                    if(debug) console.log(`route: ${url}, returned: ${resp}`)
+                    return s.end(typeof resp === 'string' ? resp:JSON.stringify(resp))
                 }
                 throw Error(r.url + ' not found')
             } catch (e) {
@@ -34,6 +42,9 @@ export default function (routes = { _debug: ({ method, url }, s) => console.log(
     }).listen(port)
 
     return {
+        routes: routes,
+        port: port,
+        server: server,
         stop: () => { server.close(); return true }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "instaserve",
-    "version": "0.1.6",
+    "version": "0.1.7",
     "description": "Instant web stack",
     "main": "module.mjs",
     "bin": "./server.mjs",
@@ -9,8 +9,5 @@
         "deno": "deno run --unstable --allow-net --allow-read deno/server.js",
         "bun": "bun run bun/http.js",
         "test": "node --no-warnings test.mjs"
-    },
-    "dependencies": {
-        "instax": "^0.1.2"
     }
 }

package/public/test.html

@@ -0,0 +1 @@
+ok

package/routes.mjs

@@ -1,5 +1,5 @@
 export default {
-        _debug: ({method, url}, s) => !console.log(method, url),
-        _example: (r, s) => console.log('returning a falsy value (above) will stop the chain'),
-        api: () => 'an example api response'
-  }
+      _debug: ({ method, url }, s) => !console.log(method, url),
+      _example: (r, s) => console.log('returning a falsy value (above) will stop the chain'),
+      api: () => 'an example api response'
+}

package/test.mjs

@@ -1,15 +1,44 @@
 import serve from './module.mjs'
 import { get, te, tde } from '../instax/module.mjs'
 
+const port = 8080
 const server = serve({
     api: (r, s) => 'Hello!',
     api2: (r, s, data) => JSON.stringify(data)
-}, 3001)
+}, port)
+te(server.port, port)
 
-const resp = await get('http://localhost:3001/api')
+// Routes
+const resp = await get('http://localhost:8080/api')
 te(resp, 'Hello!')
-const resp2 = await get('http://localhost:3001/api2', {method: 'POST', body: JSON.stringify({a:1})})
+const resp2 = await get('http://localhost:8080/api2', {method: 'POST', body: JSON.stringify({a:1})})
 tde(resp2, {a:1})
 
+// Public
+const testhtml = await get('http://localhost:8080/test.html')
+te(testhtml, 'ok')
 te(server.stop(), true)
+
+// Test route returned values
+const db = {}
+const server2 = serve({
+    _: ({url}) => console.log(url),
+    __: ({headers: {host}, method, url}) => console.log(host, method, url),
+    str: () => 'ok',
+    obj: x => ({a: 'ok'}),
+    undef: () => undefined
+}, 8085)
+te(server2.port, 8085)
+te(server2.routes.str(), 'ok')
+
+const return_str = await get('http://localhost:8085/str') 
+te(return_str, 'ok')
+
+const return_obj = await get('http://localhost:8085/obj')
+te(return_obj.a, 'ok')
+
+const return_undefined = await get('http://localhost:8085/undef')
+te(return_undefined, '')
+
+server2.stop()
 console.log('tests complete')