@rpcbase/server 0.335.0 → 0.336.0

package/boot/server.js

@@ -2,7 +2,7 @@
 // MUST COME FIRST!
 require("./shared")
 //
-const rb_server_plugin = require("rb-server-plugin")
+const rb_server_plugin = require("rb-plugin-server")
 
 const http = require("http")
 
@@ -10,8 +10,6 @@ const {rpc_router, client_router, express} = require("../")
 
 const realtime_state = require("../rts")
 
-require("./register_server_tasks")
-
 const {SERVER_PORT} = process.env
 
 const app = express()
@@ -19,7 +17,7 @@ const server = http.createServer(app)
 
 realtime_state(server)
 
-rb_server_plugin(app)
+rb_server_plugin.default(app)
 
 server.listen(SERVER_PORT, "0.0.0.0", () => {
   console.log(`listening on 0.0.0.0:${SERVER_PORT}`)

package/boot/shared.js

@@ -1,12 +1,17 @@
 /* @flow */
+if (typeof __RB_IS_WEBPACK__ === "undefined") {
+  throw new Error("cannot run outside of webpack bundling")
+}
+
 require("./setup_env")
 
 require("../extend-expect")
 
 const mongoose = require("../mongoose")
-require("../src/access-control")(mongoose)
 
-// require("./load_models")
+require("../src/models")
+
+require("../src/access-control")(mongoose)
 
 const {database, firebase} = require("../")
 

package/boot/worker.js

@@ -1,9 +1,7 @@
 /* @flow */
 require("./shared")
 
-require("./load_models")
-
-require("./register_worker_tasks")
+require("rb-plugin-worker")
 
 const register_queue_listener = require("../queue/register_queue_listener")
 

package/cli/run_dev_server.js

@@ -1,22 +1,13 @@
 /* @flow */
 const get_dev_watcher = require("./get_dev_watcher")
 
-
-console.trace("DEV SERVER LINKED")
-
 const run_dev_server = (args) => {
 
   const watcher = get_dev_watcher({
-    script: "build/server.js",
-    ignore: [
-    ],
+    script: "./build/server.js",
+    ignore: [],
     watch: [
-      "./server.js",
-      "build/",
-      "src/",
-      "../../../pms/plugin/",
-      "../../../../rpcbase/rpcbase/pkg/access-control/",
-      "../../../../rpcbase/rpcbase/pkg/server/"
+      "./build/server.js",
     ],
     delay: "500ms"
   })

package/cli/run_dev_worker.js

@@ -4,19 +4,14 @@ const get_dev_watcher = require("./get_dev_watcher")
 const run_dev_worker = (args) => {
 
   const watcher = get_dev_watcher({
-    script: "worker.js",
-    ignore: [
-    ],
+    script: "./build/worker.js",
+    ignore: [],
     watch: [
-      "./worker.js",
-      "build/",
-      "src/",
-      "../../../pms/plugin/",
-      "../../../../rpcbase/rpcbase/pkg/access-control/",
-      "../../../../rpcbase/rpcbase/pkg/server/"
+      "./build/worker.js",
     ],
     delay: "500ms"
   })
+
 }
 
 module.exports = run_dev_worker

package/index.js

@@ -4,7 +4,6 @@ const queue = require("./queue")
 const express = require("./express")
 const firebase = require("./firebase")
 const client_router = require("./src/client/client_router")
-const rpc_router = require("./src/rpc/rpc_router")
 const sign_up = require("./src/auth/sign_up")
 
 
@@ -14,6 +13,5 @@ module.exports = {
   express,
   firebase,
   client_router,
-  rpc_router,
   sign_up,
 }

package/mongoose.js

@@ -5,4 +5,19 @@ const mongoose = require("mongoose")
 // https://mongoosejs.com/docs/migrating_to_7.html#strictquery
 mongoose.set("strictQuery", false)
 
+const originalModelFunction = mongoose.model
+
+mongoose.model = function(name, schema, collection, skipInit) {
+  // Check if the model is already defined
+  if (mongoose.connection.models[name]) {
+    // If the model exists, delete it to avoid duplication errors
+    delete mongoose.connection.models[name]
+  }
+
+  // Call the original mongoose model function with the provided arguments
+  return originalModelFunction.call(this, name, schema, collection, skipInit)
+}
+
+
+
 module.exports = mongoose

package/package.json

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

package/src/models/index.js

@@ -0,0 +1,5 @@
+/* @flow */
+require("./Invite")
+require("./ResetPasswordToken")
+require("./User")
+require("./UserStoredValues")

package/boot/load_models.js

@@ -1,23 +0,0 @@
-/* @flow */
-const glob = require("glob")
-const path = require("path")
-
-
-const is_pascal_case = (str) => /^[A-Z][a-zA-Z0-9]*$/.test(str)
-
-
-const load_models = () => {
-  const wd = process.cwd()
-
-  const models_dir = path.join(wd, "./src/models")
-
-  const files = glob.sync(path.join(models_dir, "./**/*.js"))
-
-  files
-    .filter((f) => !path.dirname(f).endsWith("/helpers"))
-    .filter((f) => is_pascal_case(path.basename(f, ".js")))
-    .forEach((f) => require(f))
-
-}
-
-load_models()

package/boot/register_server_tasks.js

@@ -1,21 +0,0 @@
-/* @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

@@ -1,19 +0,0 @@
-/* @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/src/rpc/rpc_router.js

@@ -1,73 +0,0 @@
-/* @flow */
-const fs = require("fs")
-const path = require("path")
-const glob = require("glob")
-const debug = require("debug")
-
-
-const log = debug("rb:rpc")
-
-const server_src_dir = path.join(process.cwd(), "./src/")
-const build_dir = path.join(process.cwd(), "build/")
-const client_dir = path.join(process.cwd(), "../../client/")
-
-const is_production = process.env.NODE_ENV === "production"
-
-
-const setup_prod_rpc_routes = (app) => {
-  // the difference with the dev router is that routes are loaded at startup time, whereas in dev mode routes are resolved on each request
-  const rpc_routes = glob.sync(path.join(build_dir, "./client/rpc/*"))
-
-  rpc_routes.forEach((file_path) => {
-    const basename = path.basename(file_path)
-    const route_path = basename.replace(/__slash__/g, "/")
-    const module_path = path.join(server_src_dir, `${route_path}.js`)
-
-    // if module not found, remove created route file
-    if (!fs.existsSync(module_path)) {
-      fs.unlinkSync(file_path)
-      console.log("removed inexistant rpc route", basename, "with module path", module_path)
-    }
-
-    const rpc_fn = require(module_path)
-    app.post(`/rpc/${route_path}`, async(req, res) => {
-
-      log(`POST /rpc/${route_path}`)
-
-      // TODO: add jaegerclient / opentelemetry
-      const result = await rpc_fn(req.body, {req, res})
-      res.json(result)
-    })
-  })
-}
-
-
-const setup_dev_rpc_routes = (app) => {
-  const rpc_routes = glob.sync(path.join(client_dir, "./build/rpc/*"))
-
-  app.post("/rpc/*", async(req, res) => {
-    const route_path = req.params[0]
-
-    const module_path = path.join(server_src_dir, `${route_path}.js`)
-
-    const rpc_fn = require(module_path)
-    log(`POST /rpc/${route_path}`)
-
-    // TODO: add jaegerclient / opentelemetry
-    const result = await rpc_fn(req.body, {req, res})
-    res.json(result)
-  })
-}
-
-
-const rpc_router = (app) => {
-
-  if (is_production) {
-    setup_prod_rpc_routes(app)
-  } else {
-    setup_dev_rpc_routes(app)
-  }
-
-}
-
-module.exports = rpc_router