@muze-nl/simplystore 0.6.12 → 0.6.14

package/package.json

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

package/src/command-worker-module.mjs

@@ -51,6 +51,13 @@ export const metaIdProxy = {
     }
 }
 
+const metaReadProxy = {
+    foreach: metaProxy.forEach,
+    get: metaProxy.get,
+    has: metaProxy.has,
+    set: meta.set
+}
+
 export async function initialize(task) {
     for(let jsontag of task.data) {
         dataspace = parse(jsontag, task.meta, false) // false means mutable
@@ -60,45 +67,49 @@ export async function initialize(task) {
     metaProxy.index.id = metaIdProxy
     datafile = task.datafile
     commands = await import(task.commandsFile).then(mod => {
-        console.log('commands loaded:',Object.keys(mod.default))
         return mod.default
     })
 }
 
 export default async function runCommand(commandStr, request) {
-    let task = JSONTag.parse(commandStr, null, metaProxy)
-    if (!task.id) { throw new Error('missing command id')}
-    if (!task.name) { throw new Error('missing command name parameter')}
     let response = {
         jsontag: true
     }
-    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
-        JSONTag.setAttribute(dataspace, 'command', task.id)
-
-        const uint8sab = serialize(dataspace, {meta, changes: true}) // serialize only changes
-        response.data = uint8sab
-        response.meta = {
-            index: {
-                id: meta.index.id
+    try {
+        let task = JSONTag.parse(commandStr, null, metaReadProxy)
+        if (!task.id) { throw new Error('missing command id')}
+        if (!task.name) { throw new Error('missing command name parameter')}
+        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
+            JSONTag.setAttribute(dataspace, 'command', task.id)
+        
+            const uint8sab = serialize(dataspace, {meta, changes: true}) // serialize only changes
+            response.data = uint8sab
+            response.meta = {
+                index: {
+                    id: meta.index.id
+                }
             }
-        }
-        //TODO: write data every x commands or x minutes, in seperate thread
+            //TODO: write data every x commands or x minutes, in seperate thread
 
-        let newfilename = datafile + (meta.parts ? '.'+meta.parts : '')
-        await writeFileAtomic(newfilename, uint8sab)
-        meta.parts++
-        response.meta.parts = meta.parts
-        let end = Date.now()
-        console.log('task time',end-time)
-    } else {
-        console.error('Command not found', task.name)
-        throw {
-            code: 404,
-            message: "Command "+task.name+" not found"
+            let newfilename = datafile + (meta.parts ? '.'+meta.parts : '')
+            await writeFileAtomic(newfilename, uint8sab)
+            meta.parts++
+            response.meta.parts = meta.parts
+            let end = Date.now()
+            console.log('task time',end-time)
+        } else {
+            console.error('Command not found', task.name)
+            throw {
+                code: 404,
+                message: "Command "+task.name+" not found"
+            }
         }
+    } catch(err) {
+        console.error('task error', err)
+        throw err
     }
     return response
 }

package/src/query-worker-module.mjs

@@ -2,11 +2,11 @@ import pointer from 'json-pointer'
 import {VM} from 'vm2'
 import { memoryUsage } from 'node:process'
 import JSONTag from '@muze-nl/jsontag'
+import * as odJSONTag from '@muze-nl/od-jsontag/src/jsontag.mjs'
 import {source, isProxy, resultSet} from '@muze-nl/od-jsontag/src/symbols.mjs'
 import parse from '@muze-nl/od-jsontag/src/parse.mjs'
 import {_,from,not,anyOf,allOf,asc,desc,sum,count,avg,max,min} from 'jaqt'
 
-let resultArr = []
 let dataspace
 let meta = {}
 let metaProxy = {
@@ -14,11 +14,49 @@ let metaProxy = {
     }
 }
 
+function protect(target) {
+    if (target[source]) {
+        throw new Error('Data is immutable')
+    }
+}
+
+const myJSONTag = {
+    getAttribute: odJSONTag.getAttribute,
+    getAttributes: odJSONTag.getAttributes,
+    getType: odJSONTag.getType,
+    getTypeString: odJSONTag.getTypeString,
+    setAttribute: (target, name, value) => {
+        protect(target)
+        return odJSONTag.setAttribute(target, name, value)
+    },
+    setType: (target, type) => {
+        protect(target)
+        return odJSONTag.setType(target, type)
+    },
+    setAttributes: (target, attributes) => {
+        protect(target)
+        return odJSONTag.setAttributes(target, attributes)
+    },
+    addAttribute: (target, name, value) => {
+        protect(target)
+        return odJSONTag.addAttribute(target, name, value)
+    },
+    removeAttribute: (target, name) => {
+        protect(target)
+        return odJSONTag.removeAttribute(target, name)
+    },
+    getAttributesString: odJSONTag.getAttributesString,
+    isNull: odJSONTag.isNull,
+    clone: JSONTag.clone,
+    Link: JSONTag.Link,
+    Null: JSONTag.Null
+}
+
 const metaIdProxy = {
     get: (id) => {
         let index = meta.index.id.get(id)
         if (index || index===0) {
-            return resultArr[index]
+            return meta.resultArr[index]
         }
     },
     has: (id) => {
@@ -39,7 +77,6 @@ const tasks = {
         for (let sab of task.req.body) { //body contains an array of sharedArrayBuffers with initial data and changes
             dataspace = parse(sab, meta)
         }
-        resultArr = meta.resultArray
         metaProxy.index.id = metaIdProxy
         //@TODO: add meta.index.references? and baseURL
         return true
@@ -49,7 +86,6 @@ const tasks = {
             meta.index = task.req.meta.index
         }
         dataspace = parse(task.req.body, meta) //update only has a single changeset
-        resultArr = meta.resultArray
         return true
     },
     query: async (task) => {
@@ -95,7 +131,7 @@ export function runQuery(pointer, request, query) {
                 max,
                 min,    
 //                    console: connectConsole(res),
-                JSONTag,
+                JSONTag: myJSONTag,
                 request
             },
             wasm: false

package/src/server.mjs

@@ -245,6 +245,7 @@ async function main(options) {
                 }, 
                 //reject()
                 (error) => {
+                    console.error(error)
                     let s = {status: "failed", code: error.code, message: error.message, details: error.details}
                     status.set(command.id, s)
                     appendFile(commandStatus, JSONTag.stringify(Object.assign({command:command.id}, s)))