@rpcbase/server 0.78.0 → 0.81.0

package/cli/run_native.js

@@ -40,6 +40,8 @@ const init_processes = (args) => {
   const worker_queue_dir = path.join(process.cwd(), "../infrastructure/data/worker-queue/data")
   const worker_queue_logs_path = path.join(process.cwd(), "../infrastructure/data/worker-queue/log/logs.txt")
 
+  // console.log("WORKER QUEUE ON PORT", env.WORKER_QUEUE_PORT)
+
   // TODO: add a redis cache
   const processes = [
     // web server

package/database.js

@@ -1,10 +1,10 @@
 /* @flow */
 const mongoose = require("mongoose")
-const validator = require("validator")
+const isPort = require("validator/lib/isPort")
 
 const {DATABASE_NAME, DATABASE_PORT, CONTAINER_MODE} = process.env
 
-if (typeof DATABASE_PORT !== "string" || !validator.isPort(DATABASE_PORT)) {
+if (typeof DATABASE_PORT !== "string" || !isPort(DATABASE_PORT)) {
   throw new Error("expected DATABASE_PORT to be a valid port number")
 }
 
@@ -17,6 +17,8 @@ const hostname = CONTAINER_MODE === "native" ? "localhost" : "database"
 const mongo_url = `mongodb://${hostname}:${DATABASE_PORT}/${DATABASE_NAME}?directConnection=true&replicaSet=rs0`
 
 
+// TODO: handle multiple databases, remove DATABASE_NAME env
+
 module.exports = async() => {
   // set listeners before attempting to connect
   mongoose.connection.on("connected", () => {

package/express/index.js

@@ -2,6 +2,7 @@
 const cors = require("cors")
 const express = require("express")
 const body_parser = require("body-parser")
+const request_ip = require("request-ip")
 
 // functionality middlewares
 const auth = require("../src/auth")
@@ -16,6 +17,9 @@ const {APP_DOMAIN, CLIENT_PORT} = process.env
 
 module.exports = () => {
   const app = express()
+
+  app.use(request_ip.mw())
+
   app.use(body_parser.json({limit: "2mb"}))
 
   app.set("trust proxy", 1)
@@ -29,7 +33,7 @@ module.exports = () => {
     res.set("Cache-Control", "no-store")
     next()
   })
-  console.log("\nwowowowow\nwowowoowo\nlfdkfdskfjlkfjdskfjds\n\n")
+
   // CORS
   const cors_origins = is_production ?
     // https://stackoverflow.com/questions/14003332/access-control-allow-origin-wildcard-subdomains-ports-and-protocols

package/index.js

@@ -1,10 +1,12 @@
 /* @flow */
 const database = require("./database")
+const queue = require("./queue")
 const express = require("./express")
 const client_router = require("./src/client/client_router")
 const rpc_router = require("./src/rpc/rpc_router")
 
 module.exports = {
+  queue,
   database,
   express,
   client_router,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.78.0",
+  "version": "0.81.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -13,6 +13,7 @@
     "@rpcbase/agent": "0.9.0",
     "@rpcbase/std": "0.3.0",
     "body-parser": "1.20.0",
+    "bull": "4.8.4",
     "connect-redis": "6.1.3",
     "cors": "2.8.5",
     "debug": "4.3.4",
@@ -21,10 +22,11 @@
     "express-session": "1.17.3",
     "glob": "8.0.3",
     "lodash": "4.17.21",
-    "mongoose": "6.4.0",
+    "mongoose": "6.4.3",
     "picocolors": "1.0.0",
     "postmark": "3.0.12",
-    "redis": "4.1.0",
+    "redis": "4.2.0",
+    "request-ip": "3.3.0",
     "validator": "13.7.0",
     "yargs": "17.5.1"
   }

package/queue.js

@@ -0,0 +1,65 @@
+/* @flow */
+const Queue = require("bull")
+
+const {WORKER_QUEUE_PORT, CONTAINER_MODE} = process.env
+const hostname = CONTAINER_MODE === "native" ? "localhost" : "worker-queue"
+const worker_queue_url = `redis://${hostname}:${WORKER_QUEUE_PORT}`
+
+console.log("using worker-queue url", worker_queue_url)
+
+
+const tasks_list = Object.create(null)
+
+let worker_queue
+
+const worker_add = async(task_name, payload, options) => {
+  const res = await worker_queue.add({task_name, payload}, options)
+  // paymentsQueue.add(paymentsData, { repeat: { cron: '15 3 * * *' } });
+  console.log("created task:", task_name, res.id)
+  return res
+}
+
+
+const register_task = (name, fn) => {
+  // append module to tasks list
+  tasks_list[name] = fn
+}
+
+const start_worker = async() => {
+  worker_queue = new Queue("worker-queue", worker_queue_url)
+
+  // error handler
+  worker_queue.on("error", (err) => {
+    console.log(`A queue error happened: ${err.message}`)
+  })
+
+  // on stall
+  worker_queue.on("stalled", (id) => {
+    console.log(`Job ${id} stalled and will be reprocessed`)
+  })
+
+  worker_queue.on("job failed", (id, err) => {
+    console.log(`Job ${id} failed with error ${err.message}`)
+  })
+
+  // processor function
+  worker_queue.process(async(job) => {
+    try {
+      const {task_name, payload} = job.data
+      console.log(`start job ${job.id} ${task_name}`)
+      // await Pomise.delay(2000)
+      const task_fn = tasks_list[task_name]
+      const res = await task_fn(payload)
+      return res
+    } catch (err) {
+      console.log("ERRRR", err)
+    }
+  })
+}
+
+
+module.exports = {
+  start: start_worker,
+  register_task,
+  add: worker_add,
+}