@rpcbase/server 0.322.0 → 0.324.0

package/boot/register_server_tasks.js

@@ -0,0 +1,21 @@
+/* @flow */
+const path = require("path")
+const queue = require("@rpcbase/server/queue")
+
+
+const no_impl_server_task = () => {
+  throw new Error("cannot run worker task on the server!")
+}
+
+const register_server_tasks = () => {
+  const wd = process.cwd()
+
+  const tasks_map = require(path.join(wd, "./src/tasks/index.js"))
+
+  for (const [task_name, task_path] of Object.entries(tasks_map)) {
+    queue.register_task(task_name, no_impl_server_task)
+  }
+
+}
+
+register_server_tasks()

package/boot/register_worker_tasks.js

@@ -0,0 +1,19 @@
+/* @flow */
+const path = require("path")
+const queue = require("@rpcbase/server/queue")
+
+
+const register_worker_tasks = () => {
+  const wd = process.cwd()
+  const tasks_dir = path.join(wd, "./src/tasks/")
+
+  const tasks_map = require(tasks_dir, "./index.js")
+
+  for (const [task_name, task_path] of Object.entries(tasks_map)) {
+    const task_fn = require(path.join(tasks_dir, task_path))
+    queue.register_task(task_name, task_fn)
+  }
+
+}
+
+register_worker_tasks()

package/boot/server.js

@@ -7,6 +7,8 @@ const {rpc_router, client_router, express} = require("../")
 
 const realtime_state = require("../rts")
 
+require("./register_server_tasks")
+
 const {SERVER_PORT} = process.env
 
 const app = express()

package/boot/worker.js

@@ -1,6 +1,8 @@
 /* @flow */
 require("./shared")
 
+require("./register_worker_tasks")
+
 const queue = require("../queue")
 
 queue.start()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.322.0",
+  "version": "0.324.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {

package/src/access-control/check_apply_permissions.js

@@ -50,7 +50,10 @@ const check_apply_permissions = (ac_config, model_name, operation, user_id, item
       const conditions = query.getQuery()
 
       if (conditions._owners) {
-        console.log(colors.yellow("Warning!"), model_name, "ACL for read is owner, but client is sending _owners in query, the field will be overwritten")
+        if (conditions._owners.length !== 1 || conditions._owners[0] !== user_id) {
+          console.log(colors.yellow("Warning!"), model_name, "ACL for read is owner, but client is sending _owners in query, the field will be overwritten")
+          console.log("received conditions._owners:", JSON.stringify(conditions._owners))
+        }
       }
       // TODO: implement dynamic ACL based on what the application allows the user to read
       query.setQuery({