instaserve 0.1.19 → 0.1.22

package/.devcontainer/Dockerfile

@@ -1,9 +1,9 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/alpine/.devcontainer/base.Dockerfile
-
-# [Choice] Alpine version: 3.16, 3.15, 3.14, 3.13
-ARG VARIANT="3.16"
-FROM mcr.microsoft.com/vscode/devcontainers/base:0-alpine-${VARIANT}
-
-# ** [Optional] Uncomment this section to install additional packages. **
-# RUN apk update \
-#     && apk add --no-cache <your-package-list-here>
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/alpine/.devcontainer/base.Dockerfile
+
+# [Choice] Alpine version: 3.16, 3.15, 3.14, 3.13
+ARG VARIANT="3.16"
+FROM mcr.microsoft.com/vscode/devcontainers/base:0-alpine-${VARIANT}
+
+# ** [Optional] Uncomment this section to install additional packages. **
+# RUN apk update \
+#     && apk add --no-cache <your-package-list-here>

package/.devcontainer/devcontainer.json

@@ -1,22 +1,22 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/alpine
-{
-	"name": "Alpine-NodeJS",
-	"build": {
-		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick an Alpine version: 3.13, 3.14, 3.15, 3.16
-		"args": { "VARIANT": "3.16" }
-	},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "uname -a",
-
-	// Replace when using a ptrace-based debugger like C++, Go, and Rust
-	// "runArgs": [ "--init", "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode"
-}
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/alpine
+{
+	"name": "Alpine-NodeJS",
+	"build": {
+		"dockerfile": "Dockerfile",
+		// Update 'VARIANT' to pick an Alpine version: 3.13, 3.14, 3.15, 3.16
+		"args": { "VARIANT": "3.16" }
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Replace when using a ptrace-based debugger like C++, Go, and Rust
+	// "runArgs": [ "--init", "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+
+	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}

package/README.md

@@ -1,44 +1,44 @@
-# instaserve
-Instant web stack
-
-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
-
-> npm run deno (deno)
-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
-Use custom port and routes file
-
-###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')
-}
+# instaserve
+Instant web stack
+
+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
+
+> npm run deno (deno)
+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
+Use custom port and routes file
+
+###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 - data is request body + query string
+````
+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,54 +1,63 @@
-import http from 'node:http'
-import fs from 'node:fs'
-const debug = process.env.debug
-
-function public_file(r, s) {
-    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, ip = '127.0.0.1') {
-    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 (debug) console.log(`routes: "${JSON.stringify(routes)}"`)
-                if (data) data = JSON.parse(data)
-                const midware = Object.keys(routes)
-                    .filter((k) => k.startsWith('_'))
-                    .find((k) => routes[k](r, s, data))
-
-                const fc = public_file(r, s)
-                if(fc) return s.end(fc)
-                
-                const url = r.url.split('/')[1]
-                if (routes[url]) {
-                    const resp = routes[url](r, s, data)
-                    if(debug) console.log(`route: ${url}, returned: ${JSON.stringify(resp)}`)
-                    return s.end(typeof resp === 'string' ? resp:JSON.stringify(resp))
-                }
-                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)
-            }
-        })
-    }).listen(process.env.port || port, process.env.ip || ip)
-
-    console.log(`started on: ${(process.env.ip || ip)}:${(process.env.port || port)}, using routes: ${Object.keys(routes)}`)
-    
-    return {
-        routes: routes,
-        port: port,
-        server: server,
-        stop: () => { server.close(); return true }
-    }
-
-}
+import http from 'node:http'
+import fs from 'node:fs'
+
+const debug = process.env.debug
+
+function public_file(r, s) {
+    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, ip = '127.0.0.1') {
+    const server = http.createServer(async (r, s) => {
+        let sdata = ''
+        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('?')
+                if(qs && qs[1]) {
+                    const o = JSON.parse('{"' + decodeURI(qs[1].replace(/&/g, "\",\"").replace(/=/g, "\":\"")) + '"}')
+                    Object.assign(data, o)
+                }
+
+                const midware = Object.keys(routes)
+                    .filter((k) => k.startsWith('_'))
+                    .find((k) => routes[k](r, s, data))
+
+                const fc = public_file(r, s)
+                if(fc) return s.end(fc)
+
+                const url = r.url.split('/')[1].split('?')[0]
+                if (routes[url]) {
+                    const resp = routes[url](r, s, data)
+                    if(debug) console.log(`route: ${url}, returned: ${JSON.stringify(resp)}`)
+                    return s.end(typeof resp === 'string' ? resp:JSON.stringify(resp))
+                }
+                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)
+            }
+        })
+    }).listen(process.env.port || port, process.env.ip || ip)
+
+    console.log(`started on: ${(process.env.ip || ip)}:${(process.env.port || port)}, using routes: ${Object.keys(routes)}`)
+    
+    return {
+        routes: routes,
+        port: port,
+        server: server,
+        stop: () => { server.close(); return true }
+    }
+
+}

package/package.json

@@ -1,13 +1,13 @@
-{
-    "name": "instaserve",
-    "version": "0.1.19",
-    "description": "Instant web stack",
-    "main": "module.mjs",
-    "bin": "./server.mjs",
-    "scripts": {
-        "start": "node server.mjs",
-        "deno": "deno run --allow-env --unstable --allow-net --allow-read deno/server.js",
-        "bun": "bun run bun/http.js",
-        "test": "node --no-warnings test.mjs"
-    }
-}
+{
+    "name": "instaserve",
+    "version": "0.1.22",
+    "description": "Instant web stack",
+    "main": "module.mjs",
+    "bin": "./server.mjs",
+    "scripts": {
+        "start": "node server.mjs",
+        "deno": "deno run --allow-env --unstable --allow-net --allow-read deno/server.js",
+        "bun": "bun run bun/http.js",
+        "test": "node --no-warnings test.mjs"
+    }
+}

package/routes.mjs

@@ -1,6 +1,9 @@
+import url from 'node:url'
+
 export default {
-        _debug: ({method, url}, s) => !console.log(method, url),
+        _debug: ({method, url}, s, data) => { console.log(method, url, data) },
         _example: (r, s) => console.log('returning a falsy value (above) will stop the chain'),
-        api: (r, s) => 'an example api response',
-        testerror: () => { throw new Error('this from testerror') }
+        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/test.mjs

@@ -1,48 +1,48 @@
-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)
-}, port)
-te(server.port, port)
-
-// Routes
-const resp = await get('http://localhost:8080/api')
-te(resp, 'Hello!')
-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,
-    testerror: () => { throw new Error('this from testerror')}
-}, 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, '')
-
-const test_error = await get('http://localhost:8085/testerror')
-te(test_error.error, 'this from testerror')
-
-server2.stop()
+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)
+}, port)
+te(server.port, port)
+
+// Routes
+const resp = await get('http://localhost:8080/api')
+te(resp, 'Hello!')
+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,
+    testerror: () => { throw new Error('this from testerror')}
+}, 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, '')
+
+const test_error = await get('http://localhost:8085/testerror')
+te(test_error.error, 'this from testerror')
+
+server2.stop()
 console.log('tests complete')