@muze-nl/simplystore 0.5.5 → 0.5.7

package/package.json

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

package/src/command-worker-module.mjs

@@ -1,5 +1,5 @@
 import JSONTag from '@muze-nl/jsontag'
-import {source, isChanged} from './symbols.mjs'
+import {source, isChanged, getIndex} from './symbols.mjs'
 import fastParse from './fastParse.mjs'
 import {stringToSAB,resultSetStringify} from './fastStringify.mjs'
 import writeFileAtomic from 'write-file-atomic'
@@ -25,8 +25,16 @@ export const metaIdProxy = {
         })
     },
     set: (id,ref) => {
-        //FIXME: is this correct?
-        meta.index.id.set(id, resultSet.length-1)
+        if (!meta.index.id.has(id)) {
+            if (ref[getIndex]) {
+                meta.index.id.set(id, ref[getIndex])
+            } else {
+                throw new Error('cannot set index.id for non-proxy')
+            }
+        } else {
+            let line = meta.index.id.get(id)
+            resultSet[line] = ref
+        }
     },
     get: (id) => {
         let index = meta.index.id.get(id)
@@ -44,15 +52,16 @@ export const metaIdProxy = {
 }
 
 export const FastJSONTag = {
-    getType: (obj) => JSONTag.getType(obj[source]),
-    getAttribute: (obj, attr) => JSONTag.getAttribute(obj[source],attr),
+    getType: (obj) => JSONTag.getType(obj?.[source]),
+    getAttribute: (obj, attr) => JSONTag.getAttribute(obj?.[source],attr),
     setAttribute: (obj, attr, value) => {
+        if (!obj) return
         obj[isChanged] = true
         return JSONTag.setAttribute(obj[source], attr, value)
     },
-    getAttributes: (obj) => JSONTag.getAttributes(obj[source]),
-    getAttributeString: (obj) => JSONTag.getAttributesString(obj[source]),
-    getTypeString: (obj) => JSONTag.getTypeString(obj[source])
+    getAttributes: (obj) => JSONTag.getAttributes(obj?.[source]),
+    getAttributeString: (obj) => JSONTag.getAttributesString(obj?.[source]),
+    getTypeString: (obj) => JSONTag.getTypeString(obj?.[source])
 }
 
 export async function initialize(task) {
@@ -77,7 +86,6 @@ export default async function runCommand(commandStr, request) {
     if (commands[task.name]) {
         let time = Date.now()
         commands[task.name](dataspace, task, request, metaProxy)
-        //TODO: if command/task makes no changes, skip updating data.jsontag and writing it, skip response.data
         FastJSONTag.setAttribute(dataspace, 'command', task.id)
 
         const strData = resultSetStringify(resultSet)
@@ -88,7 +96,7 @@ export default async function runCommand(commandStr, request) {
                 id: meta.index.id
             }
         }
-        //TODO: write data every x commands or x minutes, in seperate thread
+
         await writeFileAtomic(datafile, uint8sab)
         let end = Date.now()
         console.log('task time',end-time)

package/src/fastParse.mjs

@@ -726,7 +726,7 @@ export default function parse(input, meta, immutable=true)
                 if (JSONTag.getType(value)==='object' && !value[isProxy]) {
                     value = getNewValueProxy(value)
                 }
-                target[prop] = val
+                target[prop] = value
                 return true                    
             }
         }
@@ -761,6 +761,9 @@ export default function parse(input, meta, immutable=true)
             get(target, prop) {
                 if (target[prop] instanceof Function) {
                     if (['copyWithin','fill','pop','push','reverse','shift','sort','splice','unshift'].indexOf(prop)!==-1) {
+                        if (immutable) {
+                            throw new Error('dataspace is immutable')
+                        }
                         targetIsChanged = true
                     }
                     return (...args) => {
@@ -782,6 +785,9 @@ export default function parse(input, meta, immutable=true)
                 }
             },
             set(target, prop, value) {
+                if (immutable) {
+                    throw new Error('dataspace is immutable')
+                }
                 if (JSONTag.getType(value)==='object' && !value[isProxy]) {
                     value = getNewValueProxy(value)
                 } 
@@ -790,6 +796,9 @@ export default function parse(input, meta, immutable=true)
                 return true
             },
             deleteProperty(target, prop) {
+                if (immutable) {
+                    throw new Error('dataspace is immutable')
+                }
                 //FIXME: if target[prop] was the last reference to an object
                 //that object should be deleted so that its line will become empty
                 //when stringifying resultArray again
@@ -828,7 +837,7 @@ export default function parse(input, meta, immutable=true)
                         return targetIsChanged
                     break
                     default:
-                        if (!immutable && Array.isArray(target[prop])) {
+                        if (Array.isArray(target[prop]) && target[prop].propertyIsEnumerable()) {
                             return new Proxy(target[prop], arrayHandler)
                         }
                         return target[prop] // FIXME: make arrays immutable as well
@@ -1021,5 +1030,4 @@ export default function parse(input, meta, immutable=true)
     }
     
     return resultArray
-}
-
+}

package/src/server.mjs

@@ -261,8 +261,8 @@ async function main(options) {
         if (!commandId) {
             return
         }
-        let commandStr = req.body.toString()
         try {
+            let commandStr = req.body.toString()
             let request = {
                 method: req.method,
                 url: req.originalUrl,
@@ -289,12 +289,24 @@ async function main(options) {
     })
 
     function checkCommand(req, res) {
+        let error, command, commandOK
         let commandStr = req.body.toString() // raw body through express.raw()
-        let command = JSONTag.parse(commandStr)
-        let commandOK = {
-            command: command?.id,
-            code: 202,
-            status: 'accepted'
+        try {
+            command = JSONTag.parse(commandStr)
+
+            commandOK = {
+                command: command?.id,
+                code: 202,
+                status: 'accepted'
+            }
+        } catch(err) {
+            error = {
+                code: 400,
+                message: "Bad request",
+                details: err
+            }
+            sendResponse({code: 400, body: JSON.stringify(error)}, res)
+            return false
         }
         if (!command || !command.id) {
             error = {