@muze-nl/simplystore 0.3.5 → 0.3.6

package/package.json

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

package/src/commands.mjs

@@ -1,5 +1,6 @@
 export default {
 	addPerson: (dataspace, command) => {
+		console.log('dataspace',dataspace)
 		dataspace.persons.push(command.value)
 //		dataspace.persons[0].name = 'Jan';
 		return 'foo'

package/src/server.mjs

@@ -37,7 +37,7 @@ async function main(options) {
 
     let queryWorkerpool = initWorkerPool(queryWorker)
 
-//    const commandWorkerpool = initWorkerPool(commandWorker,1) // only one update worker so no changes can get lost
+    const commandWorkerpool = initWorkerPool(commandWorker,1) // only one update worker so no changes can get lost
 
     server.get('/', (req,res) => {
         res.send('<h1>SimplyStore</h1>') //@TODO: implement something nice
@@ -224,8 +224,8 @@ async function main(options) {
                 let dataspace = JSONTag.parse(jsontag)
                 //@TODO: make sure queryWorkerpool is only replaced after
                 //workers are initialized, to prevent hickups if initialization takes a long time
-                let newQueryWorkerpool = initWorkerPool('./worker-query')
-                queryWorkerpool.terminate() // gracefully
+                let newQueryWorkerpool = initWorkerPool(queryWorker)
+                queryWorkerpool.destroy() // gracefully
                 queryWorkerpool = newQueryWorkerpool
                 //@TODO: write dataspace to disk
                 status.set(command.id, 'done')

package/src/worker-command-init.mjs

@@ -1,10 +1,11 @@
 import * as commandWorker from './worker-command.mjs'
 import worker_threads from 'node:worker_threads' 
+import JSONTag from '@muze-nl/jsontag'
 
 async function initialize() {
 	let meta = {}
 	let dataspace = JSONTag.parse(worker_threads.workerData, null, meta)
-	await commandWorker.initialize(worker_threads.workerData)
+	await commandWorker.initialize(dataspace,meta)
 	return commandWorker.runCommand
 }
 

package/src/worker-command.mjs

@@ -7,7 +7,7 @@ import commands from './commands.mjs'
  * and type+attribute data gets lost
  */
 
-let dataspace
+let dataspace, meta
 
 export function setDataspace(d) {
 	dataspace = d
@@ -19,10 +19,10 @@ export function setDataspace(d) {
  * @TODO: setTimeout or do above checks in server.mjs before queueing
  */
 
-export function async initialize(jsontag) {
+export async function initialize(jsontag, m) {
     if (!jsontag) { throw new Error('missing jsontag parameter')}
 	dataspace = jsontag
-	console.log('initialized command worker thread')
+	meta = m
 	return true
 }