instaserve 0.1.1 → 0.1.5

package/README.md

@@ -1,8 +1,40 @@
 # instaserve
 Instant web stack
 
-routes.mjs (created by default)
-
 > npx instaserve (node)
+Starts a server in the current directory
+Creates a routes.mjs file if none exists
+Create a public folder and add files for static file serving
+
 > npm run deno (deno)
-> npm run bun (bun)
+Starts a deno server using routes.mjs and static serving
+
+> npm run bun (bun)
+Starts a bun server
+
+> debug=true npx instaserve
+Show more request info
+
+###Script usage
+````
+import serve from 'instaserve'
+serve({
+
+    // routes prefixed with _ run on every request
+
+    _log: (r, s) => console.log(r.method, r.url),
+    _example: (r, s) => console.log('returning a falsy value (above) will stop processing'),
+
+    /api: (r, s, body) => s.end('an api response'),
+
+}, port)  // port is optional (3000)
+````
+
+###Routes.mjs file example
+````
+export default {
+      _debug: ({ method, url }, s, data) => !console.log(method, url, data),
+      _example: (r, s, data) => console.log('returning a falsy value (above) will stop the chain'),
+      '/api': (r, s, data) => s.end('an example api response')
+}
+````

package/module.mjs

@@ -1,31 +1,37 @@
 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) {
-    http.createServer(async (r, s) => {
-        try {
-            let data = ''
-            r.on('data', (s) => (data += s.toString()))
-            r.on('end', (x) => {
-                try {
-                    data = JSON.parse(data)
-                } catch { }
-            })
-            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'))
+export default function (routes = { _debug: ({ method, url }, s) => console.log(method, url) }, 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)
+                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 url = '/' + r.url.split('/')[1]
+                if (routes[url]) return routes[url](r, s, data)
+                throw Error(r.url + ' not found')
+            } catch (e) {
+                console.log(e)
+                s.writeHead(404).end()
             }
-            if (routes[r.url]) return routes[r.url](r, s, data)
-            else s.writeHead(404).end()
-        } catch (e) {
-            console.log(e)
-            s.writeHead(404).end()
-        }
-    })
-    .listen(port, (x) => console.log('listening on ' + port))
-}
+        })
+    }).listen(port)
+
+    return {
+        stop: () => { server.close(); return true }
+    }
+
+}

package/package.json

@@ -1,12 +1,16 @@
 {
-  "name": "instaserve",
-  "version": "0.1.1",
-  "description": "Instant web stack",
-  "main": "server.mjs",
-  "bin": "./server.mjs",
-  "scripts": {
-    "start": "node server.mjs",
-    "deno": "deno run --unstable --allow-net --allow-read deno/server.js",
-    "bun": "bun run bun/http.js"
-  }
+    "name": "instaserve",
+    "version": "0.1.5",
+    "description": "Instant web stack",
+    "main": "module.mjs",
+    "bin": "./server.mjs",
+    "scripts": {
+        "start": "node server.mjs",
+        "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/routes.mjs

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

package/server.mjs

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 
-import http from 'node:http'
+import server from './module.mjs'
 import { pathToFileURL } from 'node:url'
 import { resolve } from 'node:path'
 import fs from 'node:fs'
-
 const routesfile = resolve('routes.mjs')
 
 if (!fs.existsSync(routesfile)) {
@@ -18,31 +17,4 @@ if (!fs.existsSync(routesfile)) {
 const routesurl = pathToFileURL(routesfile).href
 console.log(routesfile, routesurl)
 const routes = (await import(routesurl)).default
-
-http
-  .createServer(async (r, s) => {
-    try {
-      let data = ''
-      r.on('data', (s) => (data += s.toString()))
-      r.on('end', (x) => {
-        try {
-          data = JSON.parse(data)
-        } catch {}
-      });
-      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'))
-      }
-      if (routes[r.url]) return routes[r.url](r, s, data)
-      else s.writeHead(404).end()
-    } catch (e) {
-      console.log(e)
-      s.writeHead(404).end()
-    }
-  })
-  .listen(3000, (x) => console.log('listening on 3000'))
+server(routes)

package/test.mjs

@@ -0,0 +1,12 @@
+import serve from './module.mjs'
+import { get, te } from 'instax'
+
+const server = serve({
+    '/api': (r, s) => s.end('Hello!')
+}, 3001)
+
+const resp = await get('http://localhost:3001/api')
+te(resp, 'Hello!')
+
+te(server.stop(), true)
+console.log('closing server')

package/testmodule.mjs

@@ -1,2 +0,0 @@
-import server from './module.mjs'
-server()