@muze-nl/simplystore 0.6.7 → 0.6.8

package/README.md

@@ -6,7 +6,7 @@ SimplyStore is a radically simpler backend storage server. It does not have a da
 Javascript queries are run in a [VM2](https://www.npmjs.com/package/vm2) sandbox. 
 You can query data using the [array-where-select](https://www.npmjs.com/package/array-where-select) extension.
 
-Note: _There are known security issues in VM2, so the project will switch to V8-isolate. For now don't use SimplyStore in production_
+Note: _There are known security issues in VM2, so the project will switch to V8-isolate. For now make sure SimplyStore is not publically accessible, by adding an api gateway in front of it for example_
 
 ## Table of Contents
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/simplystore",
-	"version": "0.6.7",
+	"version": "0.6.8",
 	"main": "src/server.mjs",
 	"type": "module",
 	"scripts": {
@@ -17,7 +17,7 @@
 	"homepage": "https://github.com/simplyedit/simplystore#readme",
 	"dependencies": {
 		"@muze-nl/jsontag": "^0.9.6",
-		"@muze-nl/od-jsontag": "^0.1.4",
+		"@muze-nl/od-jsontag": "^0.1.5",
 		"codemirror": "^6.0.1",
 		"express": "^4.18.1",
 		"jaqt": "^0.6.2",

package/src/query-worker-module.mjs

@@ -28,17 +28,21 @@ const metaIdProxy = {
 }
 
 const tasks = {
-	init: async (task) => {
-		dataspace = parse(task.req.body)
-		resultArr = dataspace[resultSet]
+    init: async (task) => {
+        if (task.req.access) {
+            task.req.access = await import(task.req.access)
+            task.req.access = task.req.access.default
+        }
+        dataspace = parse(task.req.body, { access: task.req.access })
+        resultArr = dataspace[resultSet]
         meta = task.req.meta
         metaProxy.index.id = metaIdProxy
-        //@TODO: add references and baseURL
-		return true
-	},
-	query: async (task) => {
-		return runQuery(task.req.path, task.req, task.req.body)
-	},
+        //@TODO: add meta.index.references? and baseURL
+        return true
+    },
+    query: async (task) => {
+        return runQuery(task.req.path, task.req, task.req.body)
+    },
     memoryUsage: async () => {
         let result = memoryUsage()
         console.log('memory',result)
@@ -51,7 +55,7 @@ export default tasks
 export function runQuery(pointer, request, query) {
     if (!pointer) { throw new Error('missing pointer parameter')}
     if (!request) { throw new Error('missing request parameter')}
-	let response = {
+    let response = {
         jsontag: request.jsontag
     }
     let [result,path] = getDataSpace(pointer, dataspace)
@@ -85,16 +89,16 @@ export function runQuery(pointer, request, query) {
             wasm: false
         })
         try {
-            result = deProxy(vm.run(query))
+            result = vm.run(query)
             let used = Math.round(process.memoryUsage().heapUsed / 1024 / 1024);
             console.log(`(${used} MB)`);
         } catch(err) {
             console.log(err)
             response.code = 422;
             if (request.jsontag) {
-            	response.body = '<object class="Error">{"message":'+JSON.stringify(''+err)+',"code":422}'
+                response.body = '<object class="Error">{"message":'+JSON.stringify(''+err)+',"code":422}'
             } else {
-            	response.body = JSON.stringify({message:err, code: 422})
+                response.body = JSON.stringify({message:err, code: 422})
             }
         }
     } else {
@@ -103,7 +107,7 @@ export function runQuery(pointer, request, query) {
     if (!response.code) {
         if (response.jsontag) {
             try {
-            	response.body = JSONTag.stringify(result)
+                response.body = JSONTag.stringify(result)
             } catch(err) {
                 console.log(err)
                 response.code = 500
@@ -111,7 +115,7 @@ export function runQuery(pointer, request, query) {
             }
         } else {
             //@FIXME: replace recursive links
-        	response.body = JSON.stringify(result)
+            response.body = JSON.stringify(result)
         }
     }
     return response
@@ -169,33 +173,4 @@ export function linkReplacer(data, baseURL) {
         })
     }
     return data
-}
-
-let seen = new WeakMap()
-function deProxy(o) {
-    if (!o) {
-        return o
-    }
-    if (typeof o !== 'object') {
-        return o
-    }
-    if (seen.has(o)) {
-        return seen.get(o)
-    }
-    let result
-    if (Array.isArray(o)) {
-        result = o.map(deProxy)
-    } else if (JSONTag.isNull(o)) {
-        return o
-    } else if (JSONTag.getType(o)==='object' && o[source]) {
-        result = JSONTag.clone(o[source])
-        seen.set(o, result)
-        Object.entries(o[source]).forEach(([i,v]) => {
-            result[i] = deProxy(v)
-        })
-    } else {
-        seen.set(o, o)
-        result = o
-    }
-    return result
-}
+}

package/src/server.mjs

@@ -28,6 +28,7 @@ async function main(options) {
     const commandsFile  = options.commandsFile  || __dirname+'/src/commands.mjs'
     const commandLog    = options.commandLog    || './command-log.jsontag'
     const commandStatus = options.commandStatus || './command-status.jsontag'
+    const access        = options.access        || null
 
     server.use(express.static(wwwroot))
 
@@ -64,7 +65,8 @@ async function main(options) {
             name: 'init',
             req: {
                 body: jsontagBuffer,
-                meta
+                meta,
+                access
             }
         }
     }