@rpcbase/server 0.54.0 → 0.57.0

package/admin/README.md

@@ -0,0 +1 @@
+admin middleware that exposes models, schemas etc

package/admin/index.js

@@ -0,0 +1,43 @@
+// /* @flow */
+// const fs = require("fs")
+// const path = require("path")
+// const glob = require("glob")
+// const debug = require("debug")
+//
+// const src_path = path.join(process.cwd(), "./src/")
+// const build_dir = path.join(process.cwd(), "build/")
+//
+//
+// const async_wrapper = fn => (req, res, next) => {
+//   Promise.resolve(fn(req, res, next))
+//     .catch(next)
+// }
+//
+//
+// const rpc_router = (app) => {
+//   const rpc_routes = glob.sync(path.join(build_dir, "./rpc/*"))
+//
+//   rpc_routes.forEach((file_path) => {
+//     const basename = path.basename(file_path)
+//     const route_path = basename.replace(/__slash__/g, "/")
+//     const module_path = path.join(src_path, `${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_wrapper(async(req, res) => {
+//
+//       console.log(`POST /rpc/${route_path}`)
+//       // TODO: add jaegerclient / opentelemetry
+//       const result = await rpc_fn(req.body, {req})
+//       res.json(result)
+//     }))
+//   })
+//
+// }
+//
+// module.exports = rpc_router

package/bin.js

@@ -8,6 +8,7 @@ const {hideBin} = require("yargs/helpers")
 
 const start_server = require("./cli/start_server")
 const build_server = require("./cli/build_server")
+const run_agent = require("./cli/run_agent")
 
 let is_command = false
 
@@ -16,6 +17,10 @@ const args = yargs(hideBin(process.argv))
     is_command = true
     start_server()
   })
+  .command("agent", "run the agent", () => {}, (argv) => {
+    is_command = true
+    run_agent()
+  })
   .command("build", "build server", () => {}, (argv) => {
     is_command = true
     build_server()
@@ -33,5 +38,5 @@ const args = yargs(hideBin(process.argv))
   .parse()
 
 if (!is_command) {
-  console.log("default command")
+  console.log("default com22mand")
 }

package/cli/run_agent.js

@@ -0,0 +1,33 @@
+/* @flow */
+const path = require("path")
+const fs = require("fs")
+
+// const get_runtime = require("./get_runtime")
+// const run_docker = require("./run_docker")
+// const run_native = require("./run_native")
+const {run} = require("@rpcbase/agent")
+
+const run_agent = async() => {
+  const cwd = process.cwd()
+  const proj_parent_dir = path.join(cwd, "../../")
+  const proj_prefix = path.basename(proj_parent_dir)
+
+  console.log("RUN AGENT", proj_prefix)
+  run(proj_prefix)
+  // const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
+  //
+  // // prefix
+  // const proj_parent_dir = path.join(infrastructure_dir, "../../")
+  // const proj_prefix = path.basename(proj_parent_dir)
+  //
+  // const runtime = get_runtime()
+  //
+  // if (runtime === "native") {
+  //   run_native(infrastructure_dir, proj_prefix)
+  // } else {
+  //   run_docker(infrastructure_dir, proj_prefix)
+  // }
+
+}
+
+module.exports = run_agent

package/cli/run_docker.js

@@ -15,7 +15,7 @@ const run_docker = async(infrastructure_dir, proj_prefix) => {
   }
   else compose_files.push("-f dev.yml")
 
-  console.log("got compose files", compose_files)
+  // console.log("got compose files", compose_files)
 
   const opts = ["--build", "--remove-orphans"]
   if (!is_production) opts.push("--abort-on-container-exit")

package/crypto/index.js

@@ -0,0 +1,45 @@
+/* @flow */
+const crypto = require("crypto")
+
+const ALGORITHM = "aes-256-cbc"
+const {CRYPTO_SECRET} = process.env
+
+if (!CRYPTO_SECRET || CRYPTO_SECRET === "") {
+  throw new Error("CRYPTO_SECRET not found in env")
+}
+
+const key = crypto.createHash("sha256")
+  .update(String(CRYPTO_SECRET))
+  .digest()
+
+
+const encrypt = (text) => {
+  const iv = crypto.randomBytes(16)
+  const cipher = crypto.createCipheriv(ALGORITHM, key, iv)
+
+  const encrypted = Buffer.concat([
+    cipher.update(text),
+    cipher.final()
+  ])
+
+  return {
+    iv: iv.toString("hex"),
+    content: encrypted.toString("hex")
+  }
+}
+
+const decrypt = (hash) => {
+  const decipher = crypto.createDecipheriv(
+    ALGORITHM, key, Buffer.from(hash.iv, "hex")
+  )
+
+  const decrpyted = Buffer.concat([
+    decipher.update(Buffer.from(hash.content, "hex")),
+    decipher.final(),
+  ])
+
+  return decrpyted.toString()
+}
+
+
+module.exports = {encrypt, decrypt}

package/database.js

@@ -16,7 +16,6 @@ const mongo_url = `mongodb://database:${DATABASE_PORT}/${DATABASE_NAME}?directCo
 
 
 module.exports = async() => {
-
   // set listeners before attempting to connect
   mongoose.connection.on("connected", () => {
     console.log("mongoose connected")
@@ -32,13 +31,13 @@ module.exports = async() => {
     console.log("mongoose connection error", err)
   })
 
-
   console.log("connect mongo_url", mongo_url)
 
   const connect_opts = {
     keepAlive: true,
     keepAliveInitialDelay: 5000,
     minPoolSize: 5,
+    maxPoolSize: 1024 * 1024,
     family: 4, // force ipv4
   }
 

package/express/session_middleware.js

@@ -16,7 +16,8 @@ if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PO
 
 let session_middleware = null
 
-// extreme warning: when there is blocking io redis client won't connect
+// extreme warning: docker issue
+// when there is synchronous io redis client fails to connect
 // process.nextTick(async() => {
 setTimeout(async() => {
   if (!SESSION_STORE_PORT) {
@@ -60,7 +61,7 @@ setTimeout(async() => {
     resave: false,
   })
 
-}, 500)
+}, 300)
 
 
 module.exports = (req, res, next) => {

package/infrastructure/redis/redis.conf

@@ -257,7 +257,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile ""
+logfile "/var/log/redis/logs.txt"
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.

package/mailer/index.js

@@ -12,7 +12,7 @@ if (is_production) {
 } else {
   client = {
     sendEmail: async(payload) => {
-      console.log("sendEmail disabled outside of production")
+      console.log("sendEmail disabled when not in production")
       console.log("From:", payload.From, "To:", payload.To, "Subject:", payload.Subject)
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.54.0",
+  "version": "0.57.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -10,6 +10,7 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
+    "@rpcbase/agent": "0.3.0",
     "body-parser": "1.20.0",
     "connect-redis": "6.1.3",
     "cors": "2.8.5",

package/rpc/rpc_router.js

@@ -30,11 +30,10 @@ const rpc_router = (app) => {
 
     const rpc_fn = require(module_path)
     app.post(`/rpc/${route_path}`, async_wrapper(async(req, res) => {
-      // console.log("GOT REQ", req.body)
+
       console.log(`POST /rpc/${route_path}`)
       // TODO: add jaegerclient / opentelemetry
       const result = await rpc_fn(req.body, {req})
-
       res.json(result)
     }))
   })