@muze-nl/simplystore 0.3.6 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/simplystore",
-	"version": "0.3.6",
+	"version": "0.4.1",
 	"main": "src/server.mjs",
 	"type": "module",
 	"scripts": {
@@ -17,7 +17,7 @@
 	"homepage": "https://github.com/simplyedit/simplystore#readme",
 	"dependencies": {
 		"@muze-nl/jsontag": "^0.8.5",
-		"array-where-select": "^0.3.1",
+		"array-where-select": "^0.4.0",
 		"codemirror": "^6.0.1",
 		"express": "^4.18.1",
 		"json-pointer": "^0.6.2",

package/src/commands.mjs

@@ -1,8 +1,8 @@
 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

@@ -90,7 +90,6 @@ async function main(options) {
 
     server.get('/query/*', (req, res, next) => 
     {
-        console.log('express query')
         let start = Date.now()
 
         if ( !accept(req,res,
@@ -172,73 +171,81 @@ async function main(options) {
     })
 
     server.post('/command', async (req, res) => {
-        let start = Date.now()
-        if ( !accept(req,res,
-            ['application/jsontag','application/json']) 
-        ) {
-            return
-        }
-        let error, result
+        try {
+            let start = Date.now()
+            if ( !accept(req,res,
+                ['application/jsontag','application/json']) 
+            ) {
+                return
+            }
+            let error, result
 
-        let commandStr = req.body.toString() // raw body through express.raw()
-        let command = JSONTag.parse(commandStr)
-        if (!command.id) {
-            error = {
-                code: 422,
-                message: "Command has no id"
+            let commandStr = req.body.toString() // raw body through express.raw()
+            let command = JSONTag.parse(commandStr)
+            console.log('command',command)
+            if (!command || !command.id) {
+                error = {
+                    code: 422,
+                    message: "Command has no id"
+                }
+                sendCommandResponse(error, req, res)
+                return
+            } else if (status.has(command.id)) {
+                result = "OK"
+                sendCommandResponse(result, req, res)
+                return
+            } else if (!command.name || !commands[command.name]) {
+                error = {
+                    code: 422,
+                    message: "Command has no name or is unknown"
+                }
+                sendCommandResponse(error, req, res)
+                return            
             }
-            sendCommandResponse(error, req, res)
-            return
-        } else if (status.has(command.id)) {
+            // catch appendFile errors?
+            await appendFile(commandLog, JSONTag.stringify(command))
+
+            status.set(command.id, 'queued')
+            console.log('command',command)
+
             result = "OK"
             sendCommandResponse(result, req, res)
-            return
-        } else if (!command.name || !commands[command.name]) {
-            error = {
-                code: 422,
-                message: "Command has no name or is unknown"
+            let request = {
+                method: req.method,
+                url: req.originalUrl,
+                query: req.query,
+                jsontag: req.accepts('application/jsontag')
             }
-            sendCommandResponse(error, req, res)
-            return            
-        }
-        await appendFile(commandLog, JSONTag.stringify(command))
 
-        status.set(command.id, 'queued')
-        console.log('command',command)
-
-        result = "OK"
-        sendCommandResponse(result, req, res)
-        let request = {
-            method: req.method,
-            url: req.originalUrl,
-            query: req.query,
-            jsontag: req.accepts('application/jsontag')
-        }
-
-        commandWorkerpool
-        .run({request, commandStr})
-        .then(response => {
-            //@TODO store response status, if response.code => error
-            if (!response.code) {
-                jsontag = response.body // global jsontag
-                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(queryWorker)
-                queryWorkerpool.destroy() // gracefully
-                queryWorkerpool = newQueryWorkerpool
-                //@TODO: write dataspace to disk
-                status.set(command.id, 'done')
-                let end = Date.now()
-                console.log(command.name, (end-start), process.memoryUsage())        
-            }
-        })
-        .catch(err => {
+            commandWorkerpool
+            .run({request, commandStr})
+            .then(response => {
+                //@TODO: add try/catch here as well
+                //@TODO store response status, if response.code => error
+                if (!response.code) {
+                    jsontag = response.body // global jsontag
+                    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(queryWorker)
+                    queryWorkerpool.destroy() // gracefully
+                    queryWorkerpool = newQueryWorkerpool
+                    //@TODO: write dataspace to disk
+                    status.set(command.id, 'done')
+                    let end = Date.now()
+                    console.log(command.name, (end-start), process.memoryUsage())        
+                }
+            })
+            .catch(err => {
+                console.error(err)
+                //@TODO: set status for this command to error with this err
+                status.set(command.id, err)
+            })
+        } catch(err) {
             console.error(err)
-            //@TODO: set status for this command to error with this err
-            status.set(command.id, err)
-        })
-
+            res.status(500)
+            res.send(err)
+        }
     })
 
     function handleWebRequest(req,res,options)

package/src/share.mjs

@@ -5,34 +5,24 @@ const handler = function(root, index, buffer)
 	return {
 		get(target, key, receiver) 
 		{
-			//@FIXME: array.length needs to be handled
-			//@FIXME: array functions need to be handled
 			let keyNumber = index.key[key]
 			if (root[keyNumber]) {
 				let keyStart = root[keyNumber].s + root.s
 				let keyEnd = root[keyNumber].e + root.s
-				// subobjecten hoeven niet geparsed...
+				subobjecten hoeven niet geparsed...
 				if (root[keyNumber].c) {
 					// object
 					return new jsontagProxy(root[keyNumber], index, buffer)
 				}
 				return JSON.parse(buffer.slice(keyStart,keyEnd))
 			}
-		},
-
-		set() {
-			throw new Error('This data is immutable')
-		},
-
-		deleteProperty() {
-			throw new Error('This data is immutable')
-		},
+		}
 
 		has(target, key)
 		{
 			let keyNumber = index.key[key]
 			return typeof root[keyNumber] !== 'undefined'
-		},
+		}
 
 		ownKeys(target)
 		{
@@ -41,16 +31,21 @@ const handler = function(root, index, buffer)
 	}
 }
 
-export function getJsontagProxy(root, index, buffer) {
-	return new Proxy({}, handler(root, index, buffer))
+export class jsontagProxy extends proxy
+{
+	constructor(root, index, buffer) 
+	{
+		super({}, handler(root, index, buffer))
+	}
+
 }
 
-export function share(data)
+export default function share(data)
 {
 	let jsontag = JSONTag.stringify(data)
 	let buffer = new SharedArrayBuffer(jsontag.length)
 	let dv = new DataView(buffer)
-	let encoder = new TextEncoder('utf-8')
+	let encode = new TextEncoder('utf-8')
 	let root = {}
 	let index = {
 		key: {},
@@ -58,12 +53,11 @@ export function share(data)
 		types: {}
 	}
 	let current = 0
-	let seen = new Map()
 
 	function getKey(key) {
 		let l;
 		if (typeof index.key[key] == 'undefined') {
-			l = Object.keys(index.key).length
+			l = Object.keys(index.key)
 			index.key[key] = l
 			index.reverse[l] = key
 		}
@@ -72,7 +66,7 @@ export function share(data)
 
 	function getType(type) {
 		if (typeof index.types[type] == 'undefined') {
-			let l = Object.keys(index.types).length;
+			l = Object.keys(index.types);
 			index.types[type] = l
 		}
 
@@ -80,10 +74,6 @@ export function share(data)
 
 	function store(container, key, value) {
 		let l = getKey(key)
-		if (seen.has(value)) {
-			container[l] = seen.get(value)	
-			return
-		}
 		container[l] = {
 			s: current
 		}
@@ -94,25 +84,24 @@ export function share(data)
 				s: current,
 				c: {}
 			}
-			Object.entries(attributes).forEach(([k,v]) => {
+			attributes.forEach((v,k) => {
 				let l = getKey(k)
 				let t = getType('string')
 				container.a.c[k] = {
 					s: current,
 					t
 				}
-				v = JSON.stringify(v)
-				let {r,w} = encoder.encodeInto(v, dv, current)
+				let v = JSON.stringify(value)
+				let (r,w) = encoder.encodeInto(v, dv, current)
 				current += w
 				container.a.c[k].e = current
 			})
 		}
-		let type = JSONTag.getType(value)
+		let type = JSONTag.getType(node)
 		let t = getType(type)
 		container.t = t
 		let v = JSON.stringify(value)
-		let uint8buffer = new Uint8Array(buffer)
-		let {r,w} = encoder.encodeInto(v, uint8buffer, current)
+		let (r,w) = encoder.encodeInto(v, dv, current)
 		current+= w
 		container.e = current
 	}
@@ -120,15 +109,10 @@ export function share(data)
 
 	function walk(node, parentKey, parent, save) 
 	{
-		if (seen.has(node)) {
-			Object.assign(save, seen.get(node))
-			return
-		}
 		let type = JSONTag.getType(node)
 		let t = getType(type)
 		switch (type) {
 			case 'array':
-				seen.set(node,save)
 				save.s = current
 				save.t = t
 				save.c = []
@@ -136,11 +120,10 @@ export function share(data)
 				save.e = current
 				break
 			case 'object':
-				seen.set(node, save)
 				save.s = current
 				save.c = []
 				save.t = t
-				Object.entries(node).forEach(([k,v]) => walk(v, k, node, save.c))
+				Object.entries(node).forEach((k,v) => walk(v, k, node, save.c))
 				save.e = current
 				break
 			default:
@@ -150,9 +133,9 @@ export function share(data)
 	}
 
 	walk(data, null, null, root)
-	console.log(root)
+
 	return {
-		root: getJsontagProxy(root, index, buffer),
+		root: new jsontagProxy(root, index, buffer),
 		index,
 		buffer
 	}

package/.eslintrc.cjs

@@ -1,15 +0,0 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": "eslint:recommended",
-    "overrides": [
-    ],
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "rules": {
-    }
-}

package/test/produce.mjs

@@ -1,79 +0,0 @@
-import tap from 'tap'
-import fs from 'fs'
-import JSONTag from '@muze-nl/jsontag'
-import {produce,index} from '../src/produce.mjs'
-import {deepFreeze} from '../src/util.mjs'
-
-let data = deepFreeze(JSONTag.parse(fs.readFileSync('./test/test.jsontag','utf-8')))
-
-tap.test('data is frozen', t => {
-	t.throws(() => {
-		data.persons.foo = 'bar'
-	})
-	t.notHas(data.persons, {foo:'bar'})
-	t.end()
-})
-
-tap.test('produce can create new data', t => {
-	let newData = produce(data, (draft) => {
-		draft.persons.foo = 'bar'
-	})
-	t.has(newData.persons, {foo:'bar'})
-	t.end()
-})
-
-tap.test('produce does not change base data', t => {
-	let newData = produce(data, (draft) => {
-		console.log('Persons draft',draft.persons, Object.isFrozen(draft.persons))
-		draft.persons.foo = 'bar'
-	})
-	t.notHas(data.persons, {foo:'bar'})
-	t.end()	
-})
-
-tap.test('produce handles array access', t => {
-	let newData = produce(data, (draft) => {
-		draft.persons[0].name = 'Jan'
-	})
-	t.equal(newData.persons[0].name, 'Jan')
-	t.end()
-})
-
-tap.test('produce handles array functions', t => {
-	let newData = produce(data, (draft) => {
-		draft.persons.push({
-			name: 'Jan'
-		})
-	})
-	t.equal(newData.persons[2].name, 'Jan')
-	t.same(data.persons[2],null)
-	t.end()
-})
-
-tap.test('produce can use array.indexOf inside', t => {
-	let newData = produce(data, (draft) => {
-		let p = draft.persons[1] // this returns a proxy
-		let i = draft.persons.indexOf(p) // this is passed on to the baseState/clone, which has values without proxy
-		t.equal(i,1) // so this no longer fails, as indexOf automatically calls getRealValue on all params
-	})
-	t.end()
-})
-
-tap.test('produce does not alter unaccessed objects', t => {
-	let newData = produce(data, (draft) => {
-		draft.persons.foo = 'bar'
-	})
-	t.equal(data.persons[0],newData.persons[0])
-	t.equal(data.persons[1],newData.persons[1])
-	t.notEqual(data.persons,newData.persons)
-	t.end()
-})
-
-tap.test('proxies get re-used', t => {
-	let newData = produce(data, (draft) => {
-		let p1 = draft.persons[0]
-		let p2 = draft.persons[0]
-		t.equal(p1,p2)
-	})
-	t.end()
-})

package/test/share.mjs

@@ -1,18 +0,0 @@
-import tap from 'tap'
-import {share} from '../src/share.mjs'
-import JSONTag from '@muze-nl/jsontag'
-import fs from 'fs'
-
-let data = JSONTag.parse(fs.readFileSync('./test/test.jsontag','utf-8'))
-
-tap.test('create shared array buffer', t => {
-	let shared = share(data)
-	console.log(shared)
-	let decoder = new TextDecoder()
-	let uint8buffer = new Uint8Array(shared.buffer)
-	let str = decoder.decode(uint8buffer)
-	console.log('string',str)
-
-	t.end()
-})
-

package/test/test.jsontag

@@ -1,20 +0,0 @@
-{
-	"persons": [
-		<object id="john" class="Person">{
-			"name": "John",
-			"lastName": "Doe",
-			"dob": <date>"1972-09-20",
-			"foaf": [
-				<link>"jane"
-			]
-		},
-		<object id="jane" class="Person">{
-			"name": "Jane",
-			"lastName": "Doe",
-			"dob": <date>"1986-01-01",
-			"foaf": [
-				<link>"john"
-			]
-		}
-	]
-}