@live-change/db-server 0.9.137 → 0.9.139

package/lib/dbDao.js

@@ -242,6 +242,23 @@ function localRequests(server, scriptContext) {
       if(!db) throw new Error('databaseNotFound')
       const queryFunction = scriptContext.getOrCreateFunction(code, 'query')
       return db.queryUpdate((input, output) => queryFunction(input, output, params))
+    },
+    runQuery: async (dbName, queryCodeTable, queryCodeId, params) => {
+      if(dbName === 'system') throw new Error("system database is not writable")
+      if(!dbName) throw new Error("databaseNameRequired")
+      const db = server.databases.get(dbName)  
+      if(!db) throw new Error('databaseNotFound')
+      const table = db.table(queryCodeTable)
+      if(!table) throw new Error("tableNotFound")
+      const queryData = await table.objectGet(queryCodeId)
+      if(!queryData) throw new Error("queryCodeNotFound")
+      const queryCode = queryData.code
+      const querySourceName = queryData.sourceName
+      const queryFunction = scriptContext.getOrCreateFunction(
+        queryCode, 
+        querySourceName ? querySourceName : 'queryCode:' + queryCodeId
+      )
+      return db.queryUpdate((input, output) => queryFunction(input, output, params))
     }
   }
 }
@@ -378,6 +395,14 @@ function remoteRequests(server) {
       const db = server.databases.get(dbName)
       if(!db) throw new Error('databaseNotFound')
       return server.masterDao.request(['database', 'query'], dbName, code, params )
+    },
+    runQuery: async (dbName, queryCodeTable, queryCodeId, params) => {
+      if(!dbName) throw new Error("databaseNameRequired")
+      const db = server.databases.get(dbName)
+      if(!db) throw new Error('databaseNotFound')
+      const table = db.table(queryCodeTable)
+      if(!table) throw new Error("tableNotFound")
+      return server.masterDao.request(['database', 'runQuery'], dbName, queryCodeTable, queryCodeId, params)
     }
   }
 }
@@ -859,6 +884,74 @@ function localReads(server, scriptContext) {
         const queryFunction = scriptContext.getOrCreateFunction(code, 'queryCode:' + sourceName)
         return db.queryObjectGet((input, output) => queryFunction(input, output, params))
       }
+    },
+    runQuery: {
+      get: async (dbName, queryCodeTable, queryCodeId, params) => {
+        if(!dbName) throw new Error("databaseNameRequired")
+        const db = server.databases.get(dbName)
+        if(!db) throw new Error('databaseNotFound')
+        const table = db.table(queryCodeTable)
+        if(!table) throw new Error("tableNotFound")
+        const queryData = await table.objectGet(queryCodeId)
+        if(!queryData) throw new Error("queryCodeNotFound")
+        const queryCode = queryData.code
+        const querySourceName = queryData.sourceName
+        const queryFunction = scriptContext.getOrCreateFunction(
+          queryCode, 
+          querySourceName ? querySourceName : 'queryCode:' + queryCodeId
+        )
+        return db.queryGet((input, output) => queryFunction(input, output, params))
+      },
+      observable: async (dbName, queryCodeTable, queryCodeId, params) => {
+        if(!dbName) return new ReactiveDao.ObservableError("databaseNameRequired")
+        const db = server.databases.get(dbName)
+        if(!db) return new ReactiveDao.ObservableError('databaseNotFound')
+        const table = db.table(queryCodeTable)
+        if(!table) return new ReactiveDao.ObservableError('tableNotFound')
+        const queryData = await table.objectGet(queryCodeId)
+        if(!queryData) throw new Error("queryCodeNotFound")
+        const queryCode = queryData.code
+        const querySourceName = queryData.sourceName
+        const queryFunction = scriptContext.getOrCreateFunction(
+          queryCode, 
+          querySourceName ? querySourceName : 'queryCode:' + queryCodeId
+        )
+        return db.queryObservable((input, output) => queryFunction(input, output, params))
+      }
+    },
+    runQueryObject: {
+      get: async (dbName, queryCodeTable, queryCodeId, params) => {
+        if(!dbName) throw new Error("databaseNameRequired")
+        const db = server.databases.get(dbName)
+        if(!db) throw new Error('databaseNotFound')
+        const table = db.table(queryCodeTable)
+        if(!table) throw new Error("tableNotFound")
+        const queryData = await table.objectGet(queryCodeId)
+        if(!queryData) throw new Error("queryCodeNotFound")
+        const queryCode = queryData.code
+        const querySourceName = queryData.sourceName
+        const queryFunction = scriptContext.getOrCreateFunction(
+          queryCode, 
+          querySourceName ? querySourceName : 'queryCode:' + queryCodeId
+        )
+        return db.queryObjectGet((input, output) => queryFunction(input, output, params))
+      },
+      observable: async (dbName, queryCodeTable, queryCodeId, params) => {
+        if(!dbName) return new ReactiveDao.ObservableError("databaseNameRequired")
+        const db = server.databases.get(dbName)
+        if(!db) return new ReactiveDao.ObservableError('databaseNotFound')
+        const table = db.table(queryCodeTable)
+        if(!table) return new ReactiveDao.ObservableError('tableNotFound')
+        const queryData = await table.objectGet(queryCodeId)
+        if(!queryData) throw new Error("queryCodeNotFound")
+        const queryCode = queryData.code
+        const querySourceName = queryData.sourceName
+        const queryFunction = scriptContext.getOrCreateFunction(
+          queryCode, 
+          querySourceName ? querySourceName : 'queryCode:' + queryCodeId
+        )
+        return db.queryObjectObservable((input, output) => queryFunction(input, output, params))
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-server",
-  "version": "0.9.137",
+  "version": "0.9.139",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -37,18 +37,18 @@
     "vite-plugin-vue-images": "^0.6.1"
   },
   "dependencies": {
-    "@live-change/dao": "^0.9.137",
-    "@live-change/dao-message": "^0.9.137",
-    "@live-change/dao-sockjs": "^0.9.137",
-    "@live-change/dao-websocket": "^0.9.137",
-    "@live-change/db": "^0.9.137",
-    "@live-change/db-admin": "^0.9.137",
-    "@live-change/db-client": "^0.9.137",
-    "@live-change/db-store-level": "^0.9.137",
-    "@live-change/db-store-lmdb": "^0.9.137",
-    "@live-change/db-store-observable-db": "^0.9.137",
-    "@live-change/db-store-rbtree": "^0.9.137",
-    "@live-change/server": "^0.9.137",
+    "@live-change/dao": "^0.9.139",
+    "@live-change/dao-message": "^0.9.139",
+    "@live-change/dao-sockjs": "^0.9.139",
+    "@live-change/dao-websocket": "^0.9.139",
+    "@live-change/db": "^0.9.139",
+    "@live-change/db-admin": "^0.9.139",
+    "@live-change/db-client": "^0.9.139",
+    "@live-change/db-store-level": "^0.9.139",
+    "@live-change/db-store-lmdb": "^0.9.139",
+    "@live-change/db-store-observable-db": "^0.9.139",
+    "@live-change/db-store-rbtree": "^0.9.139",
+    "@live-change/server": "^0.9.139",
     "@live-change/sockjs": "0.4.1",
     "@tailwindcss/vite": "^4.1.0",
     "express": "^4.18.2",
@@ -58,5 +58,5 @@
     "websocket": "^1.0.34",
     "yargs": "^17.7.2"
   },
-  "gitHead": "762fcddea43fa160b99ee72eb29219a5e0048498"
+  "gitHead": "9202c36abc25e3baf5fe39806d89c3fab203f428"
 }

package/.nx/cache/lockfile.hash

@@ -1 +0,0 @@
-14138194452193804272

package/LICENSE.md

@@ -1,11 +0,0 @@
-Copyright 2019-2024 Michał Łaszczewski
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.