@muze-nl/simplystore 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/simplystore",
-	"version": "0.1.2",
+	"version": "0.1.4",
 	"main": "src/server.mjs",
 	"type": "module",
 	"scripts": {

package/package.json~

@@ -1,6 +1,6 @@
 {
-	"name": "@muze-nl/SimplyStore",
-	"version": "0.1.2",
+	"name": "@muze-nl/simplystore",
+	"version": "0.1.3",
 	"main": "src/server.mjs",
 	"type": "module",
 	"scripts": {

package/src/server.mjs

@@ -8,314 +8,316 @@ import _ from 'array-where-select'
 import { fileURLToPath } from 'url'
 import path from 'path'
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const __dirname = path.dirname(path.dirname(fileURLToPath(import.meta.url)))
+
 const server    = express()
 
 function deepFreeze(obj) {
-  Object.freeze(obj)
-  Object.keys(obj).forEach(prop => {
-    if (typeof obj[prop] === 'object' && !Object.isFrozen(obj[prop])) {
-      deepFreeze(obj[prop])
-    }
-  })
-  return obj
+		Object.freeze(obj)
+		Object.keys(obj).forEach(prop => {
+				if (typeof obj[prop] === 'object' && !Object.isFrozen(obj[prop])) {
+						deepFreeze(obj[prop])
+				}
+		})
+		return obj
 }
 
 function isString(s)
 {
-	return typeof s === 'string' || s instanceof String
+    return typeof s === 'string' || s instanceof String
 }
 
 function joinArgs(args) {
-	return args = args.map(arg => {
-		if (isString(arg)) {
-			return arg
-		} else {
-			return JSONTag.stringify(arg)
-		}
-	}).join(' ')
+    return args = args.map(arg => {
+        if (isString(arg)) {
+            return arg
+        } else {
+            return JSONTag.stringify(arg)
+        }
+    }).join(' ')
 }
 
 function connectConsole(res) {
-	return {
-		log: function(...args) {
-			res.append('X-Console-Log', joinArgs(args))
-		},
-		warning: function(...args) {
-			res.append('X-Console-Warning', joinArgs(args))
-		},
-		error: function(...args) {
-			res.append('X-Console-Error', joinArgs(args))			
-		}
-	}
+    return {
+        log: function(...args) {
+            res.append('X-Console-Log', joinArgs(args))
+        },
+        warning: function(...args) {
+            res.append('X-Console-Warning', joinArgs(args))
+        },
+        error: function(...args) {
+            res.append('X-Console-Error', joinArgs(args))            
+        }
+    }
 }
 
 async function main(options) {
-	if (!options) {
-		options = {}
-	}  
-  const port      = options.port || 3000;
-  const datafile  = options.datafile || 'data.jsontag'
-  const wwwroot   = options.wwwroot || __dirname+'../www'
+    if (!options) {
+        options = {}
+    }  
+	  const port     = options.port || 3000
+	  const datafile = options.datafile || 'data.jsontag'
+	  const wwwroot  = options.wwwroot || __dirname+'/www'
+	  let meta       = options.meta || {}
+	  let dataspace  = options.dataspace || null
 
-	const originalJSON = JSON
-	JSON = JSONTag // monkeypatching
+    const originalJSON = JSON
+    JSON = JSONTag // monkeypatching
 
-	console.log('loading data...')
-	let file = fs.readFileSync(datafile)
-	let dataspace;
-	let meta = {}
-	try {
-    dataspace = JSONTag.parse(file.toString(), null, meta)
-    if (typeof options.index == 'function') {
-    	options.index(dataspace, meta)
+    if (!dataspace) {
+        console.log('loading data...')
+        let file = fs.readFileSync(datafile)
+        try {
+        dataspace = JSONTag.parse(file.toString(), null, meta)
+        } catch(e) {
+            console.error(e)
+            process.exit()
+        }
     }
-		deepFreeze(dataspace)
-	} catch(e) {
-		console.error(e)
-		process.exit()
-	}
+    deepFreeze(dataspace)
 
-	let used = Math.round(process.memoryUsage().heapUsed / 1024 / 1024);
-	console.log(`data loaded (${used} MB)`);
+    let used = Math.round(process.memoryUsage().heapUsed / 1024 / 1024);
+    console.log(`data loaded (${used} MB)`);
 
-	server.get('/', (req,res) => {
-		res.send('<h1SimplyStore</h1>') //TODO: implement something nice
-	})
+    server.get('/', (req,res) => {
+        res.send('<h1>SimplyStore</h1>') //TODO: implement something nice
+    })
 
-	server.use(express.static(wwwroot))
+    server.use(express.static(wwwroot))
 
-	// allow access to raw body, used to parse a query send as post body
-	server.use(express.raw({
-		type: (req) => true // parse body on all requests
-	}))
+    // allow access to raw body, used to parse a query send as post body
+    server.use(express.raw({
+        type: (req) => true // parse body on all requests
+    }))
 
-	function accept(req, res, mimetypes, handler) {
-		let accept = req.accepts(mimetypes)
-		if (!accept) {
-			res.status(406)
-			res.send("<h1>406 Unacceptable</h1>\n")
-			return false
-		}
-		if (typeof handler === 'function') {
-			return handler(req, res, accept)
-		}
-		return true
-	}
+    function accept(req, res, mimetypes, handler) {
+        let accept = req.accepts(mimetypes)
+        if (!accept) {
+            res.status(406)
+            res.send("<h1>406 Unacceptable</h1>\n")
+            return false
+        }
+        if (typeof handler === 'function') {
+            return handler(req, res, accept)
+        }
+        return true
+    }
 
-	function getDataSpace(req, res, dataspace) {
-		let path = req.path.substr(6); // cut '/query'
-		if (!path) {
-			path = '';
-		}
-		if (path.substring(path.length-1)==='/') {
-			//jsonpointer doesn't allow a trailing '/'
-			path = path.substring(0, path.length-1)
-		}
-		let result
-		if (path) {
-			//jsonpointer doesn't allow an empty pointer
-			try {
-				if (pointer.has(dataspace, path)) {
-					result = pointer.get(dataspace, path)
-				} else {
-					result = JSONTag.parse('<object class="Error">{"message":"Not found", "code":404}')
-				}
-			} catch(err) {
-				result = JSONTag.parse('<object class="Error">{"message":'+originalJSON.stringify(err.message)+', "code":500}')
-			}
-		} else {
-			result = dataspace
-		}
-		return [result,path]
-	}
-	
-	let seen = new Map();
-	function countObjects(obj) {
-		if (seen.has(obj)) {
-			return 0
-		}
-		seen.set(obj, true)
-		let count = 0
-		let values = []
-		if (Array.isArray(obj)) {
-			values = obj
-			count++
-		} else if (typeof obj === 'object') {
-			if (obj instanceof String || obj instanceof Number || obj instanceof Boolean) {
-				// console.log('skipped', obj, typeof obj)
-			} else {
-				values = Object.values(obj)
-				count++
-			}
-		} else {
-			// console.log('skipped', obj, typeof obj)
-		}
-		return values
-			.filter((o) => typeof o === 'object')
-			.reduce((count, o) => count + countObjects(o), count)
-	}
+    function getDataSpace(req, res, dataspace) {
+        let path = req.path.substr(6); // cut '/query'
+        if (!path) {
+            path = '';
+        }
+        if (path.substring(path.length-1)==='/') {
+            //jsonpointer doesn't allow a trailing '/'
+            path = path.substring(0, path.length-1)
+        }
+        let result
+        if (path) {
+            //jsonpointer doesn't allow an empty pointer
+            try {
+                if (pointer.has(dataspace, path)) {
+                    result = pointer.get(dataspace, path)
+                } else {
+                    result = JSONTag.parse('<object class="Error">{"message":"Not found", "code":404}')
+                }
+            } catch(err) {
+                result = JSONTag.parse('<object class="Error">{"message":'+originalJSON.stringify(err.message)+', "code":500}')
+            }
+        } else {
+            result = dataspace
+        }
+        return [result,path]
+    }
+    
+    let seen = new Map();
+    function countObjects(obj) {
+        if (seen.has(obj)) {
+            return 0
+        }
+        seen.set(obj, true)
+        let count = 0
+        let values = []
+        if (Array.isArray(obj)) {
+            values = obj
+            count++
+        } else if (typeof obj === 'object') {
+            if (obj instanceof String || obj instanceof Number || obj instanceof Boolean) {
+                // console.log('skipped', obj, typeof obj)
+            } else {
+                values = Object.values(obj)
+                count++
+            }
+        } else {
+            // console.log('skipped', obj, typeof obj)
+        }
+        return values
+            .filter((o) => typeof o === 'object')
+            .reduce((count, o) => count + countObjects(o), count)
+    }
 
-	server.get('/status/', (req, res, next) => 
-	{
-		seen = new Map()
-		let result = {
-			memory: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)+'MB',
-			datasets: Object.keys(dataspace),
-			objects: countObjects(dataspace)
-		}
-		res.setHeader('content-type','application/json')
-		res.send(originalJSON.stringify(result, null, 4)+"\n")
-	})
+    server.get('/status/', (req, res, next) => 
+    {
+        seen = new Map()
+        let result = {
+            memory: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)+'MB',
+            datasets: Object.keys(dataspace),
+            objects: countObjects(dataspace)
+        }
+        res.setHeader('content-type','application/json')
+        res.send(originalJSON.stringify(result, null, 4)+"\n")
+    })
 
-	server.get('/query/*', (req, res, next) => 
-	{
-		let start = Date.now()
+    server.get('/query/*', (req, res, next) => 
+    {
+        let start = Date.now()
 
-		if ( !accept(req,res,
-			['application/jsontag','application/json','text/html','text/javascript','image/*'], 
-			function(req, res, accept) {
-				switch(accept) {
-					case 'text/html':
-					case 'image/*':
-					case 'text/javascript':
-						handleWebRequest(req,res,options);
-						return false
-					break
-				}
-				return true
-			}
-		)) {
-			// done
-			return
-		}
+        if ( !accept(req,res,
+            ['application/jsontag','application/json','text/html','text/javascript','image/*'], 
+            function(req, res, accept) {
+                switch(accept) {
+                    case 'text/html':
+                    case 'image/*':
+                    case 'text/javascript':
+                        handleWebRequest(req,res,options);
+                        return false
+                    break
+                }
+                return true
+            }
+        )) {
+            // done
+            return
+        }
 
-		let [result,path] = getDataSpace(req, res, dataspace)
-		if (JSONTag.getAttribute(result, 'class')==='Error') {
-			res.status(result.code)
-		}
-		result = linkReplacer(result, path+'/')
-		if (req.accepts('application/jsontag')) {
-			res.setHeader('content-type','application/jsontag+json')
-			res.send(JSONTag.stringify(result, null, 4)+"\n")
-		} else {
-			res.setHeader('content-type','application/json')
-			res.send(originalJSON.stringify(result, null, 4)+"\n")
-		}
-		let end = Date.now()
-		console.log(path, (end-start), process.memoryUsage())
-	})
+        let [result,path] = getDataSpace(req, res, dataspace)
+        if (JSONTag.getAttribute(result, 'class')==='Error') {
+            res.status(result.code)
+        }
+        result = linkReplacer(result, path+'/')
+        if (req.accepts('application/jsontag')) {
+            res.setHeader('content-type','application/jsontag+json')
+            res.send(JSONTag.stringify(result, null, 4)+"\n")
+        } else {
+            res.setHeader('content-type','application/json')
+            res.send(originalJSON.stringify(result, null, 4)+"\n")
+        }
+        let end = Date.now()
+        console.log(path, (end-start), process.memoryUsage())
+    })
 
-	/**
-	 * handle queries, query is the post body
-	 */
-	server.post('/query/*',  (req, res) => {
-		let start = Date.now()
-		if ( !accept(req,res,
-			['application/jsontag','application/json']) 
-		) {
-			return
-		}
-		let error
-		let [result,path] = getDataSpace(req, res, dataspace)
-		if (result) {
-			// do the query here
-			let query = req.body.toString() // raw body through express.raw()
-			// @todo add text search: https://github.com/nextapps-de/flexsearch
-			// @todo add tree walk map/reduce/find/filter style functions
-			// @todo add arc tree dive function?
-			const vm = new VM({
-//				timeout: 1000,
-				allowAsync: false,
-				sandbox: {
-					root: dataspace,
-					data: result,
-					meta: meta,
-					_: _,
-					console: connectConsole(res),
-					JSONTag: JSONTag,
-					request: req,
-					Array: Array
-				},
-				wasm: false
-			})
-			try {
-				result = vm.run(query)
-				let used = Math.round(process.memoryUsage().heapUsed / 1024 / 1024);
-				console.log(`(${used} MB)`);
-			} catch(err) {
-				console.log(err)
-				error = JSONTag.parse('<object class="Error">{"message":'+originalJSON.stringify(''+err)+',"code":422}')
-			}
-		}
+    /**
+     * handle queries, query is the post body
+     */
+    server.post('/query/*',  (req, res) => {
+        let start = Date.now()
+        if ( !accept(req,res,
+            ['application/jsontag','application/json']) 
+        ) {
+            return
+        }
+        let error
+        let [result,path] = getDataSpace(req, res, dataspace)
+        if (result) {
+            // do the query here
+            let query = req.body.toString() // raw body through express.raw()
+            // @todo add text search: https://github.com/nextapps-de/flexsearch
+            // @todo add tree walk map/reduce/find/filter style functions
+            // @todo add arc tree dive function?
+            const vm = new VM({
+//                timeout: 1000,
+                allowAsync: false,
+                sandbox: {
+                    root: dataspace,
+                    data: result,
+                    meta: meta,
+                    _: _,
+                    console: connectConsole(res),
+                    JSONTag: JSONTag,
+                    request: req,
+                    Array: Array
+                },
+                wasm: false
+            })
+            try {
+                result = vm.run(query)
+                let used = Math.round(process.memoryUsage().heapUsed / 1024 / 1024);
+                console.log(`(${used} MB)`);
+            } catch(err) {
+                console.log(err)
+                error = JSONTag.parse('<object class="Error">{"message":'+originalJSON.stringify(''+err)+',"code":422}')
+            }
+        }
 
-		if (error) {
-			res.status(error.code)
-			result = error
-		}
-		if (req.accepts('application/jsontag')) {
-			res.setHeader('content-type','application/jsontag+json')
-			res.send(JSONTag.stringify(result, null, 4)+"\n")
-		} else {
-			res.setHeader('content-type','application/json')
-			res.send(originalJSON.stringify(result, null, 4)+"\n")
-		}
-		let end = Date.now()
-		console.log(path, (end-start), process.memoryUsage())
-	})
+        if (error) {
+            res.status(error.code)
+            result = error
+        }
+        if (req.accepts('application/jsontag')) {
+            res.setHeader('content-type','application/jsontag+json')
+            res.send(JSONTag.stringify(result, null, 4)+"\n")
+        } else {
+            res.setHeader('content-type','application/json')
+            res.send(originalJSON.stringify(result, null, 4)+"\n")
+        }
+        let end = Date.now()
+        console.log(path, (end-start), process.memoryUsage())
+    })
 
-	function handleWebRequest(req,res,options)
-	{
-		let path = req.path;
-		path = path.replace(/[^a-z0-9_\.\-\/]*/gi, '') // whitelist acceptable file paths
-		path = path.replace(/\.+/g, '.') // blacklist '..'
-		if (!path) {
-			path = '/'
-		}
-		if (path.substring(path.length-1)==='/') {
-			path += 'index.html'
-		}
-		const fileOptions = {
-			root: options.root || process.cwd()+'/www'
-		}
-		if (fs.existsSync(fileOptions.root+path)) {
-			res.sendFile(path, fileOptions)
-		} else {
-			res.sendFile('/index.html', fileOptions)
-		}
-	}
 
-	function linkReplacer(data, baseURL) {
-		let type = JSONTag.getType(data)
-		let attributes = JSONTag.getAttributes(data)
-		if (Array.isArray(data)) {
-			data = data.map((entry,index) => {
-				return linkReplacer(data[index], baseURL+index+'/')
-			})
-		} else if (type === 'link') {
-			// do nothing
-		} else if (data && typeof data === 'object') {
-			data = JSONTag.clone(data)
-			Object.keys(data).forEach(key => {
-				if (Array.isArray(data[key])) {
-					data[key] = new JSONTag.Link(baseURL+key+'/')
-				} else if (typeof data[key] === 'object') {
-					if (JSONTag.getType(data[key])!=='link') {
-						let id=JSONTag.getAttribute(data[key], 'id')
-						if (!id) {
-							id = baseURL+key+'/'
-						}
-						data[key] = new JSONTag.Link(id)
-					}
-				}
-			})
-		}
-		return data
-	}
 
-	server.listen(port, () => {
-		console.log('SimplyStore listening on port '+port)
-	})
+    function handleWebRequest(req,res,options)
+    {
+        let path = req.path;
+        path = path.replace(/[^a-z0-9_\.\-\/]*/gi, '') // whitelist acceptable file paths
+        path = path.replace(/\.+/g, '.') // blacklist '..'
+        if (!path) {
+            path = '/'
+        }
+        if (path.substring(path.length-1)==='/') {
+            path += 'index.html'
+        }
+        const fileOptions = {
+            root: options.root || wwwroot
+        }
+        if (fs.existsSync(fileOptions.root+path)) {
+            res.sendFile(path, fileOptions)
+        } else {
+            res.sendFile('/index.html', fileOptions)
+        }
+    }
+
+    function linkReplacer(data, baseURL) {
+        let type = JSONTag.getType(data)
+        let attributes = JSONTag.getAttributes(data)
+        if (Array.isArray(data)) {
+            data = data.map((entry,index) => {
+                return linkReplacer(data[index], baseURL+index+'/')
+            })
+        } else if (type === 'link') {
+            // do nothing
+        } else if (data && typeof data === 'object') {
+            data = JSONTag.clone(data)
+            Object.keys(data).forEach(key => {
+                if (Array.isArray(data[key])) {
+                    data[key] = new JSONTag.Link(baseURL+key+'/')
+                } else if (typeof data[key] === 'object') {
+                    if (JSONTag.getType(data[key])!=='link') {
+                        let id=JSONTag.getAttribute(data[key], 'id')
+                        if (!id) {
+                            id = baseURL+key+'/'
+                        }
+                        data[key] = new JSONTag.Link(id)
+                    }
+                }
+            })
+        }
+        return data
+    }
+
+    server.listen(port, () => {
+        console.log('SimplyStore listening on port '+port)
+    })
 
 }