instaserve 0.1.22 → 0.1.24

package/README.md

@@ -6,9 +6,7 @@ In any folder:
 > npx instaserve
 Starts a server in the current directory
 Create a public folder and add files for static file serving
-
-> npx instaserve create
-Creates an example routes.mjs file if none exists
+Use a routes.mjs or one will be created automatically
 
 > npm run deno (deno)
 Starts a deno server using routes.mjs and static serving
@@ -16,7 +14,7 @@ Starts a deno server using routes.mjs and static serving
 > npm run bun (bun)
 Starts a bun server
 
-> port=8080 routes=myroutes.mjs npx instaserve
+> port=8080 npx instaserve
 Use custom port and routes file
 
 ###Script usage
@@ -38,7 +36,12 @@ serve({
 ````
 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'),
+      _example: (r, s, data) => console.log('returning a truthy value (above) will stop the chain'),
       api: (r, s, data) => s.end('an example api response')
 }
+````
+
+###Helpers
+````
+saveJSON(url, file, fetch_options)
 ````

package/module.mjs

@@ -1,7 +1,13 @@
 import http from 'node:http'
 import fs from 'node:fs'
 
-const debug = process.env.debug
+global.saveJSON = async (url, filename, options) => {
+    const f = await fetch(url, options)
+    const j = await f.json()
+    fs.writeFileSync(filename, JSON.stringify(j, null, 2))
+}
+
+const {debug, port, ip} = process.env
 
 function public_file(r, s) {
     if (r.url == '/') r.url = '/index.html'
@@ -14,16 +20,15 @@ function public_file(r, s) {
 
 export default function (routes, port = 3000, ip = '127.0.0.1') {
     const server = http.createServer(async (r, s) => {
-        let sdata = ''
+        let sdata = '', rrurl = r.url || ''
         r.on('data', (s) => sdata += s.toString().trim())
         r.on('end', (x) => {
             try {
-                if (debug) console.log(`parsing data: "${data}"`)
                 if (debug) console.log(`routes: "${JSON.stringify(routes)}"`)
                 
                 // Compose data object
                 const data = sdata ? JSON.parse(sdata) : {}
-                const qs = r.url.split('?')
+                const qs = rrurl.split('?')
                 if(qs && qs[1]) {
                     const o = JSON.parse('{"' + decodeURI(qs[1].replace(/&/g, "\",\"").replace(/=/g, "\":\"")) + '"}')
                     Object.assign(data, o)
@@ -33,10 +38,13 @@ export default function (routes, port = 3000, ip = '127.0.0.1') {
                     .filter((k) => k.startsWith('_'))
                     .find((k) => routes[k](r, s, data))
 
+                // Response closed by middleware
+                if(s.finished) return
+
                 const fc = public_file(r, s)
                 if(fc) return s.end(fc)
 
-                const url = r.url.split('/')[1].split('?')[0]
+                const url = rrurl.split('/')[1].split('?')[0]
                 if (routes[url]) {
                     const resp = routes[url](r, s, data)
                     if(debug) console.log(`route: ${url}, returned: ${JSON.stringify(resp)}`)
@@ -44,12 +52,11 @@ export default function (routes, port = 3000, ip = '127.0.0.1') {
                 }
                 throw Error(r.url + ' not found')
             } catch (e) {
-                const err = JSON.stringify({error: e.message})
-                console.log('Server error: ' + e)
-                s.writeHead(404).end(err)
+                console.error(e.stack)
+                s.writeHead(500).end()
             }
         })
-    }).listen(process.env.port || port, process.env.ip || ip)
+    }).listen(port || 3000, ip || '')
 
     console.log(`started on: ${(process.env.ip || ip)}:${(process.env.port || port)}, using routes: ${Object.keys(routes)}`)
     

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "instaserve",
-    "version": "0.1.22",
+    "version": "0.1.24",
     "description": "Instant web stack",
     "main": "module.mjs",
     "bin": "./server.mjs",

package/public/index.html

@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel="icon" href="data:;base64,iVBORw0KGgo=">
 <script src="enigmatic.js"></script>
 
 <script>

package/routes.mjs

@@ -1,8 +1,12 @@
 import url from 'node:url'
 
 export default {
+        /*_testerror: ()=>console.testerrors(),*/
         _debug: ({method, url}, s, data) => { console.log(method, url, data) },
-        _example: (r, s) => console.log('returning a falsy value (above) will stop the chain'),
+        _returnfalsy: (r, s) => { return true },
+        _example: (r, s) => console.log('returning a truthy value (above) will stop the chain'),
+        //_end: (r, s) => s.end('ended early'),
+
         api: (r, s, data) => 'an example api response, data:' + JSON.stringify(data),
         testerror: () => { throw new Error('this from testerror') },
         testdata: (r, s, c, d) => c

package/server.mjs

@@ -1,20 +1,22 @@
 #!/usr/local/bin/node
 
+// > npx instaserve
+// > port=8080 npx instaserve
+
 import server from './module.mjs'
 import { pathToFileURL } from 'node:url'
-import { resolve } from 'node:path'
 import fs from 'node:fs'
-const routesfile = resolve(process.env.routes || 'routes.mjs')
 const [npx, instaserve, cmd] = process.argv
+const {port, ip} = process.env
 
-if (cmd === 'create' && !fs.existsSync(routesfile)) {
-  fs.writeFileSync(routesfile, `export default {
+if (cmd === 'create' && !fs.existsSync('routes.mjs')) {
+  fs.writeFileSync('routes.mjs', `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: (r, s) => 'an example api response'
   }`)
 }
 
-const routesurl = pathToFileURL(routesfile).href
+const routesurl = pathToFileURL('routes.mjs').href
 const routes = (await import(routesurl)).default
-server(routes, process.env.port, process.env.ip)
+server(routes, Number(port||3000), ip)