@muze-nl/simplystore 0.3.5 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/simplystore",
-	"version": "0.3.5",
+	"version": "0.4.0",
 	"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/package.json~

@@ -0,0 +1,33 @@
+{
+	"name": "@muze-nl/simplystore",
+	"version": "0.3.7",
+	"main": "src/server.mjs",
+	"type": "module",
+	"scripts": {
+		"start": "node src/run.mjs",
+		"test": "tap test/*.mjs"
+	},
+	"author": "auke@muze.nl",
+	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/simplyedit/simplystore.git"
+	},
+	"bugs": "https://github.com/simplyedit/simplystore/issues",
+	"homepage": "https://github.com/simplyedit/simplystore#readme",
+	"dependencies": {
+		"@muze-nl/jsontag": "^0.8.5",
+		"array-where-select": "^0.4.0",
+		"codemirror": "^6.0.1",
+		"express": "^4.18.1",
+		"json-pointer": "^0.6.2",
+		"jsonpath-plus": "^7.2.0",
+		"piscina": "^4.1.0",
+		"vm2": "^3.9.13"
+	},
+	"devDependencies": {
+		"eslint": "^8.48.0",
+		"process": "^0.11.10",
+		"tap": "^16.3.8"
+	}
+}

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
@@ -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('./worker-query')
-                queryWorkerpool.terminate() // 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/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
 }
 

package/www/codemirror/addon/comment/comment.js

@@ -1,211 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var noOptions = {};
-  var nonWS = /[^\s\u00a0]/;
-  var Pos = CodeMirror.Pos, cmp = CodeMirror.cmpPos;
-
-  function firstNonWS(str) {
-    var found = str.search(nonWS);
-    return found == -1 ? 0 : found;
-  }
-
-  CodeMirror.commands.toggleComment = function(cm) {
-    cm.toggleComment();
-  };
-
-  CodeMirror.defineExtension("toggleComment", function(options) {
-    if (!options) options = noOptions;
-    var cm = this;
-    var minLine = Infinity, ranges = this.listSelections(), mode = null;
-    for (var i = ranges.length - 1; i >= 0; i--) {
-      var from = ranges[i].from(), to = ranges[i].to();
-      if (from.line >= minLine) continue;
-      if (to.line >= minLine) to = Pos(minLine, 0);
-      minLine = from.line;
-      if (mode == null) {
-        if (cm.uncomment(from, to, options)) mode = "un";
-        else { cm.lineComment(from, to, options); mode = "line"; }
-      } else if (mode == "un") {
-        cm.uncomment(from, to, options);
-      } else {
-        cm.lineComment(from, to, options);
-      }
-    }
-  });
-
-  // Rough heuristic to try and detect lines that are part of multi-line string
-  function probablyInsideString(cm, pos, line) {
-    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"\`]/.test(line)
-  }
-
-  function getMode(cm, pos) {
-    var mode = cm.getMode()
-    return mode.useInnerComments === false || !mode.innerMode ? mode : cm.getModeAt(pos)
-  }
-
-  CodeMirror.defineExtension("lineComment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = getMode(self, from);
-    var firstLine = self.getLine(from.line);
-    if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
-
-    var commentString = options.lineComment || mode.lineComment;
-    if (!commentString) {
-      if (options.blockCommentStart || mode.blockCommentStart) {
-        options.fullLines = true;
-        self.blockComment(from, to, options);
-      }
-      return;
-    }
-
-    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
-    var pad = options.padding == null ? " " : options.padding;
-    var blankLines = options.commentBlankLines || from.line == to.line;
-
-    self.operation(function() {
-      if (options.indent) {
-        var baseString = null;
-        for (var i = from.line; i < end; ++i) {
-          var line = self.getLine(i);
-          var whitespace = line.search(nonWS) === -1 ? line : line.slice(0, firstNonWS(line));
-          if (baseString == null || baseString.length > whitespace.length) {
-            baseString = whitespace;
-          }
-        }
-        for (var i = from.line; i < end; ++i) {
-          var line = self.getLine(i), cut = baseString.length;
-          if (!blankLines && !nonWS.test(line)) continue;
-          if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
-          self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
-        }
-      } else {
-        for (var i = from.line; i < end; ++i) {
-          if (blankLines || nonWS.test(self.getLine(i)))
-            self.replaceRange(commentString + pad, Pos(i, 0));
-        }
-      }
-    });
-  });
-
-  CodeMirror.defineExtension("blockComment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = getMode(self, from);
-    var startString = options.blockCommentStart || mode.blockCommentStart;
-    var endString = options.blockCommentEnd || mode.blockCommentEnd;
-    if (!startString || !endString) {
-      if ((options.lineComment || mode.lineComment) && options.fullLines != false)
-        self.lineComment(from, to, options);
-      return;
-    }
-    if (/\bcomment\b/.test(self.getTokenTypeAt(Pos(from.line, 0)))) return
-
-    var end = Math.min(to.line, self.lastLine());
-    if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
-
-    var pad = options.padding == null ? " " : options.padding;
-    if (from.line > end) return;
-
-    self.operation(function() {
-      if (options.fullLines != false) {
-        var lastLineHasText = nonWS.test(self.getLine(end));
-        self.replaceRange(pad + endString, Pos(end));
-        self.replaceRange(startString + pad, Pos(from.line, 0));
-        var lead = options.blockCommentLead || mode.blockCommentLead;
-        if (lead != null) for (var i = from.line + 1; i <= end; ++i)
-          if (i != end || lastLineHasText)
-            self.replaceRange(lead + pad, Pos(i, 0));
-      } else {
-        var atCursor = cmp(self.getCursor("to"), to) == 0, empty = !self.somethingSelected()
-        self.replaceRange(endString, to);
-        if (atCursor) self.setSelection(empty ? to : self.getCursor("from"), to)
-        self.replaceRange(startString, from);
-      }
-    });
-  });
-
-  CodeMirror.defineExtension("uncomment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = getMode(self, from);
-    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
-
-    // Try finding line comments
-    var lineString = options.lineComment || mode.lineComment, lines = [];
-    var pad = options.padding == null ? " " : options.padding, didSomething;
-    lineComment: {
-      if (!lineString) break lineComment;
-      for (var i = start; i <= end; ++i) {
-        var line = self.getLine(i);
-        var found = line.indexOf(lineString);
-        if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
-        if (found == -1 && nonWS.test(line)) break lineComment;
-        if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
-        lines.push(line);
-      }
-      self.operation(function() {
-        for (var i = start; i <= end; ++i) {
-          var line = lines[i - start];
-          var pos = line.indexOf(lineString), endPos = pos + lineString.length;
-          if (pos < 0) continue;
-          if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
-          didSomething = true;
-          self.replaceRange("", Pos(i, pos), Pos(i, endPos));
-        }
-      });
-      if (didSomething) return true;
-    }
-
-    // Try block comments
-    var startString = options.blockCommentStart || mode.blockCommentStart;
-    var endString = options.blockCommentEnd || mode.blockCommentEnd;
-    if (!startString || !endString) return false;
-    var lead = options.blockCommentLead || mode.blockCommentLead;
-    var startLine = self.getLine(start), open = startLine.indexOf(startString)
-    if (open == -1) return false
-    var endLine = end == start ? startLine : self.getLine(end)
-    var close = endLine.indexOf(endString, end == start ? open + startString.length : 0);
-    var insideStart = Pos(start, open + 1), insideEnd = Pos(end, close + 1)
-    if (close == -1 ||
-        !/comment/.test(self.getTokenTypeAt(insideStart)) ||
-        !/comment/.test(self.getTokenTypeAt(insideEnd)) ||
-        self.getRange(insideStart, insideEnd, "\n").indexOf(endString) > -1)
-      return false;
-
-    // Avoid killing block comments completely outside the selection.
-    // Positions of the last startString before the start of the selection, and the first endString after it.
-    var lastStart = startLine.lastIndexOf(startString, from.ch);
-    var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
-    if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
-    // Positions of the first endString after the end of the selection, and the last startString before it.
-    firstEnd = endLine.indexOf(endString, to.ch);
-    var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
-    lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
-    if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
-
-    self.operation(function() {
-      self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
-                        Pos(end, close + endString.length));
-      var openEnd = open + startString.length;
-      if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
-      self.replaceRange("", Pos(start, open), Pos(start, openEnd));
-      if (lead) for (var i = start + 1; i <= end; ++i) {
-        var line = self.getLine(i), found = line.indexOf(lead);
-        if (found == -1 || nonWS.test(line.slice(0, found))) continue;
-        var foundEnd = found + lead.length;
-        if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
-        self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
-      }
-    });
-    return true;
-  });
-});

package/www/codemirror/addon/comment/continuecomment.js

@@ -1,114 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  var nonspace = /\S/g;
-  var repeat = String.prototype.repeat || function (n) { return Array(n + 1).join(this); };
-  function continueComment(cm) {
-    if (cm.getOption("disableInput")) return CodeMirror.Pass;
-    var ranges = cm.listSelections(), mode, inserts = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head
-      if (!/\bcomment\b/.test(cm.getTokenTypeAt(pos))) return CodeMirror.Pass;
-      var modeHere = cm.getModeAt(pos)
-      if (!mode) mode = modeHere;
-      else if (mode != modeHere) return CodeMirror.Pass;
-
-      var insert = null, line, found;
-      var blockStart = mode.blockCommentStart, lineCmt = mode.lineComment;
-      if (blockStart && mode.blockCommentContinue) {
-        line = cm.getLine(pos.line);
-        var end = line.lastIndexOf(mode.blockCommentEnd, pos.ch - mode.blockCommentEnd.length);
-        // 1. if this block comment ended
-        // 2. if this is actually inside a line comment
-        if (end != -1 && end == pos.ch - mode.blockCommentEnd.length ||
-            lineCmt && (found = line.lastIndexOf(lineCmt, pos.ch - 1)) > -1 &&
-            /\bcomment\b/.test(cm.getTokenTypeAt({line: pos.line, ch: found + 1}))) {
-          // ...then don't continue it
-        } else if (pos.ch >= blockStart.length &&
-                   (found = line.lastIndexOf(blockStart, pos.ch - blockStart.length)) > -1 &&
-                   found > end) {
-          // reuse the existing leading spaces/tabs/mixed
-          // or build the correct indent using CM's tab/indent options
-          if (nonspaceAfter(0, line) >= found) {
-            insert = line.slice(0, found);
-          } else {
-            var tabSize = cm.options.tabSize, numTabs;
-            found = CodeMirror.countColumn(line, found, tabSize);
-            insert = !cm.options.indentWithTabs ? repeat.call(" ", found) :
-              repeat.call("\t", (numTabs = Math.floor(found / tabSize))) +
-              repeat.call(" ", found - tabSize * numTabs);
-          }
-        } else if ((found = line.indexOf(mode.blockCommentContinue)) > -1 &&
-                   found <= pos.ch &&
-                   found <= nonspaceAfter(0, line)) {
-          insert = line.slice(0, found);
-        }
-        if (insert != null) insert += mode.blockCommentContinue
-      }
-      if (insert == null && lineCmt && continueLineCommentEnabled(cm)) {
-        if (line == null) line = cm.getLine(pos.line);
-        found = line.indexOf(lineCmt);
-        // cursor at pos 0, line comment also at pos 0 => shift it down, don't continue
-        if (!pos.ch && !found) insert = "";
-        // continue only if the line starts with an optional space + line comment
-        else if (found > -1 && nonspaceAfter(0, line) >= found) {
-          // don't continue if there's only space(s) after cursor or the end of the line
-          insert = nonspaceAfter(pos.ch, line) > -1;
-          // but always continue if the next line starts with a line comment too
-          if (!insert) {
-            var next = cm.getLine(pos.line + 1) || '',
-                nextFound = next.indexOf(lineCmt);
-            insert = nextFound > -1 && nonspaceAfter(0, next) >= nextFound || null;
-          }
-          if (insert) {
-            insert = line.slice(0, found) + lineCmt +
-                     line.slice(found + lineCmt.length).match(/^\s*/)[0];
-          }
-        }
-      }
-      if (insert == null) return CodeMirror.Pass;
-      inserts[i] = "\n" + insert;
-    }
-
-    cm.operation(function() {
-      for (var i = ranges.length - 1; i >= 0; i--)
-        cm.replaceRange(inserts[i], ranges[i].from(), ranges[i].to(), "+insert");
-    });
-  }
-
-  function nonspaceAfter(ch, str) {
-    nonspace.lastIndex = ch;
-    var m = nonspace.exec(str);
-    return m ? m.index : -1;
-  }
-
-  function continueLineCommentEnabled(cm) {
-    var opt = cm.getOption("continueComments");
-    if (opt && typeof opt == "object")
-      return opt.continueLineComment !== false;
-    return true;
-  }
-
-  CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
-    if (prev && prev != CodeMirror.Init)
-      cm.removeKeyMap("continueComment");
-    if (val) {
-      var key = "Enter";
-      if (typeof val == "string")
-        key = val;
-      else if (typeof val == "object" && val.key)
-        key = val.key;
-      var map = {name: "continueComment"};
-      map[key] = continueComment;
-      cm.addKeyMap(map);
-    }
-  });
-});

package/www/codemirror/addon/dialog/dialog.css

@@ -1,32 +0,0 @@
-.CodeMirror-dialog {
-  position: absolute;
-  left: 0; right: 0;
-  background: inherit;
-  z-index: 15;
-  padding: .1em .8em;
-  overflow: hidden;
-  color: inherit;
-}
-
-.CodeMirror-dialog-top {
-  border-bottom: 1px solid #eee;
-  top: 0;
-}
-
-.CodeMirror-dialog-bottom {
-  border-top: 1px solid #eee;
-  bottom: 0;
-}
-
-.CodeMirror-dialog input {
-  border: none;
-  outline: none;
-  background: transparent;
-  width: 20em;
-  color: inherit;
-  font-family: monospace;
-}
-
-.CodeMirror-dialog button {
-  font-size: 70%;
-}