@muze-nl/simplystore 0.7.0 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/simplystore",
-	"version": "0.7.0",
+	"version": "0.7.2",
 	"main": "src/server.mjs",
 	"type": "module",
 	"scripts": {
@@ -16,20 +16,21 @@
 	"bugs": "https://github.com/simplyedit/simplystore/issues",
 	"homepage": "https://github.com/simplyedit/simplystore#readme",
 	"dependencies": {
+		"@muze-nl/jaqt": "^0.10.1",
 		"@muze-nl/jsontag": "^0.9.11",
 		"@muze-nl/od-jsontag": "^0.3.3",
 		"codemirror": "^6.0.1",
 		"express": "^4.18.1",
-		"@muze-nl/jaqt": "^0.9.8",
 		"json-pointer": "^0.6.2",
-		"jsonpath-plus": "^7.2.0",
 		"vm2": "^3.9.13",
 		"write-file-atomic": "^5.0.1"
 	},
 	"devDependencies": {
-		"eslint": "^8.48.0",
+		"@eslint/js": "^9.36.0",
+		"eslint": "^9.36.0",
+		"globals": "^16.4.0",
 		"process": "^0.11.10",
-		"tap": "^16.3.8"
+		"tap": "^21.1.0"
 	},
 	"files": [
 		"README.md",

package/src/query-worker-module.mjs

@@ -3,9 +3,9 @@ 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 {source} 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,distinct} from '@muze-nl/jaqt'
+import {_,from,not,anyOf,allOf,asc,desc,sum,count,avg,max,min,many,one,distinct} from '@muze-nl/jaqt'
 
 let dataspace
 let meta = {}
@@ -134,6 +134,8 @@ export function runQuery(pointer, request, query) {
                 avg,
                 max,
                 min,
+                many,
+                one,
                 distinct,
 //                    console: connectConsole(res),
                 JSONTag: myJSONTag,
@@ -188,7 +190,6 @@ function parseAllObjects(o, reset=true) {
         return
     }
     if (o && typeof o == 'object') {
-        let temp = o[source]
         seen.set(o, true)
         if (Array.isArray(o)) {
             for (let v of o) {
@@ -231,7 +232,6 @@ export function getDataSpace(path, dataspace) {
 
 export function linkReplacer(data, baseURL) {
     let type = JSONTag.getType(data)
-    let attributes = JSONTag.getAttributes(data)
     if (Array.isArray(data)) {
         data = data.map((entry,index) => {
             return linkReplacer(data[index], baseURL+index+'/')

package/src/server.mjs

@@ -7,7 +7,6 @@ import { fileURLToPath } from 'url'
 import {appendFile} from './util.mjs'
 import path from 'path'
 import httpStatusCodes from './statusCodes.mjs'
-import writeFileAtomic from 'write-file-atomic'
 
 const server = express()
 const __dirname = path.dirname(path.dirname(fileURLToPath(import.meta.url)))
@@ -35,7 +34,7 @@ async function main(options) {
 
     // allow access to raw body, used to parse a query send as post body
     server.use(express.raw({
-        type: (req) => true, // parse body on all requests
+        type: () => true, // parse body on all requests
         limit: '50MB'
     }))
 
@@ -71,12 +70,12 @@ async function main(options) {
     server.get('/command/:id', handleGetCommand)
 
     try {
-        const response = await fetch(`http://localhost:${port}`, {
+        await fetch(`http://localhost:${port}`, {
             signal: AbortSignal.timeout(2000)
         })
         console.error(`Port ${port} is already occupied, aborting.`)
         process.exit()
-    } catch(error) {
+    } catch(err) {
         server.listen(port, () => {
             console.log('SimplyStore listening on port '+port)
             let used = Math.round(process.memoryUsage().rss / 1024 / 1024);
@@ -145,20 +144,21 @@ async function main(options) {
         })
     }
 
-    async function handleGetQuery(req, res, next) {
+    async function handleGetQuery(req, res) {
         let start = Date.now()
         if ( !accept(req,res,
             ['application/jsontag','application/json','text/html','text/javascript','image/*'], 
             function(req, res, accept) {
+                let result = true
                 switch(accept) {
                     case 'text/html':
                     case 'image/*':
                     case 'text/javascript':
                         handleWebRequest(req,res,{root:wwwroot});
-                        return false
+                        result = false
                     break
                 }
-                return true
+                return result
             }
         )) {
             // done
@@ -307,7 +307,6 @@ async function main(options) {
                             })
                         }
                     }
-                    let l = Object.assign({command:command.id}, s)
                     appendFile(commandStatus, JSONTag.stringify(Object.assign({command:command.id}, s)))
                 }, 
                 //reject()
@@ -357,7 +356,7 @@ async function main(options) {
             sendResponse({code: 422, body: JSON.stringify(error)}, res)
             return false
         } else if (status.has(command.id)) {
-            sendResponse({body: JSON.stringify(s)}, res)
+            sendResponse({body: JSON.stringify(commandOK)}, res)
             return false
         } else if (!command.name) {
             error = {
@@ -419,7 +418,7 @@ function accept(req, res, mimetypes, handler) {
 function handleWebRequest(req,res,options)
 {
     let path = req.path;
-    path = path.replace(/[^a-z0-9_\.\-\/]*/gi, '') // whitelist acceptable file paths
+    path = path.replace(/[^a-z0-9_.\-/]*/gi, '') // whitelist acceptable file paths
     path = path.replace(/\.+/g, '.') // blacklist '..'
     if (!path) {
         path = '/'

package/src/statusCodes.mjs

@@ -5,8 +5,6 @@ const httpStatusCodes = {
 	'103': 'Early Hints',
 	'200': 'OK',
 	'201': 'Created',
-	'200': 'OK',
-	'201': 'Created',
 	'202': 'Accepted',
 	'203': 'Non-Authoritative Information',
 	'204': 'No Content',

package/src/workerPool.mjs

@@ -103,7 +103,7 @@ export default class WorkerPool extends EventEmitter {
 
   memoryUsage() {
     for (let worker of this.freeWorkers) {
-      worker[kTaskInfo] = new WorkerPoolTaskInfo((result) => {})
+      worker[kTaskInfo] = new WorkerPoolTaskInfo(() => {})
       worker.postMessage({name:'memoryUsage'})
     }
   }