@rpcbase/server 0.376.0 → 0.377.0

package/boot/server.js

@@ -6,19 +6,22 @@ const rb_server_plugin = require("rb-plugin-server")
 
 const http = require("http")
 
-const {rpc_router, client_router, express} = require("../")
+const {client_router, express} = require("../")
+
+const {init_rts} = require("../rts")
 
-const realtime_state = require("../rts")
 
 const {SERVER_PORT} = process.env
 
 const app = express()
 const server = http.createServer(app)
 
-realtime_state(server)
+init_rts(server)
 
 rb_server_plugin.default(app)
 
+client_router(app)
+
 server.listen(SERVER_PORT, "0.0.0.0", () => {
   console.log(`listening on 0.0.0.0:${SERVER_PORT}`)
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.376.0",
+  "version": "0.377.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "scripts": {

package/rts/index.js

@@ -24,8 +24,8 @@ const QUERY_MAX_LIMIT = 4096
 // TODO: does this even support multiple clients ?
 // TODO: investigate multiple change streams event triggers per client
 // TODO: add tracing
-
 const _sockets = {}
+const _handlers = []
 const _change_streams = {}
 // we index both queries and socket queries
 // to avoid going through all queries when a socket disconnects
@@ -87,7 +87,7 @@ const dispatch_doc_change = (model, doc) => {
       // socket was destroyed
       // TODO: remove socket id from _queries when destroyed
       if (!s) {
-        log("NO SOCKET RETURNING")
+        log("NO SOCKET, RETURNING")
         return
       }
       // console.log("dipatch change", query_key)
@@ -285,7 +285,7 @@ const run_query = async(socket_id, {model_name, query, query_key, options}) => {
   }
 
   const query_options = get_query_options(ctx, options)
-
+  // log("QUERY", query)
   const query_promise = model.find(query, options.projection, query_options)
 
   if (query_options.sort) {
@@ -358,7 +358,7 @@ const disconnect_handler = (socket_id, reason) => {
 }
 
 
-const rts_server = async(server) => {
+const init_rts = async(server) => {
   // register the delete plugin
   mongoose.plugin(mongoose_delete_plugin)
   // txn plugin
@@ -402,9 +402,11 @@ const rts_server = async(server) => {
 
   io.on("connection", (socket) => {
     _sockets[socket.id] = socket
-    console.log("socket connected", socket.id)
-    //
-    socket.on("register_query", (payload) => {
+
+    log("socket connected", socket.id)
+
+    // RTS handlers
+    socket.on("registerQuery", (payload) => {
       add_change_stream(socket.id, payload)
     })
 
@@ -419,12 +421,25 @@ const rts_server = async(server) => {
         console.log("run_query caught error", err)
       }
     })
+    // !RTS handlers
+
+    // register_rts_handler: custom server generic handlers
+    const cleanup_fns = _handlers.map((handler_fn) => handler_fn(socket))
 
     socket.on("disconnect", (reason) => {
       disconnect_handler(socket.id, reason)
+      cleanup_fns
+        .filter((fn) => typeof fn === "function")
+        .forEach((fn) => fn())
     })
   })
 }
 
 
-module.exports = rts_server
+const register_rts_handler = (handler_fn) => {
+  console.log("REGister handler", handler_fn)
+  _handlers.push(handler_fn)
+}
+
+
+module.exports = {init_rts, register_rts_handler}

package/src/access-control/apply_policies.js

@@ -11,7 +11,6 @@ const perm_operations = ["create", "read", "update", "delete"]
 
 // TODO: add LRU cache for policies
 
-
 // Owner
 // the creator of the document, or an user_id that is in the "owners" field