@rpcbase/server 0.255.0 → 0.257.0

package/cli/run_docker.js

@@ -3,8 +3,8 @@ const {execSync} = require("child_process")
 const path = require("path")
 const fs = require("fs")
 
-// TODO: this should be NODE_ENV, remove INFRASTRUCTURE_IS_PRODUCTION
-const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
+
+const is_production = process.env.NODE_ENV === "production"
 const is_ci = process.env.CI === "true"
 
 const run_docker = async(infrastructure_dir, proj_prefix, args) => {

package/express/custom_cors.js

@@ -6,9 +6,9 @@ const cors = require("cors")
 const log = debug("rb:cors")
 
 
-const is_production = process.env.IS_PRODUCTION === "yes"
+const {RB_SKIP_CORS_PATHS, NODE_ENV, APP_DOMAIN, CLIENT_PORT} = process.env
 
-const {RB_SKIP_CORS_PATHS, APP_DOMAIN, CLIENT_PORT} = process.env
+const is_production = NODE_ENV === "production"
 
 const custom_cors = (app) => {
 

package/express/index.js

@@ -14,9 +14,9 @@ const custom_cors = require("./custom_cors")
 
 const log = debug("rb:server")
 
-const is_production = process.env.IS_PRODUCTION === "yes"
-const is_development = process.env.NODE_ENV === "development"
-const {APP_DOMAIN, SENTRY_DSN, CLIENT_PORT} = process.env
+const {APP_DOMAIN, NODE_ENV, SENTRY_DSN, CLIENT_PORT} = process.env
+
+const is_production = NODE_ENV === "production"
 
 const has_sentry = !!SENTRY_DSN
 
@@ -31,31 +31,28 @@ module.exports = () => {
 
   const app = express()
 
-  if (has_sentry && !is_development) {
+  if (has_sentry && is_production) {
     Sentry.init({
-    dsn: SENTRY_DSN,
-    integrations: [
-      // enable HTTP calls tracing
-      new Sentry.Integrations.Http({
-        tracing: true
-      }),
-      // enable Express.js middleware tracing
-      new Sentry.Integrations.Express({
-        app
-      }),
-    ],
-    // Performance Monitoring
-    tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!,
-  });
+      dsn: SENTRY_DSN,
+      integrations: [
+        // enable HTTP calls tracing
+        new Sentry.Integrations.Http({
+          tracing: true
+        }),
+        // enable Express.js middleware tracing
+        new Sentry.Integrations.Express({
+          app
+        }),
+      ],
+      // Performance Monitoring
+      tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!,
+    })
 
     // Trace incoming requests
-    app.use(Sentry.Handlers.requestHandler());
-    app.use(Sentry.Handlers.tracingHandler());
-
+    app.use(Sentry.Handlers.requestHandler())
+    app.use(Sentry.Handlers.tracingHandler())
   }
 
-
-
   app.use(request_ip.mw())
 
   app.use(body_parser.json({limit: `${BODY_MAX_SIZE_MB}mb`}))

package/mailer/index.js

@@ -4,15 +4,15 @@ const postmark = require("postmark")
 
 const log = debug("rb:mailer")
 
-const {POSTMARK_API_KEY, IS_PRODUCTION, RB_FORCE_SEND_EMAILS} = process.env
+const {POSTMARK_API_KEY, NODE_ENV, RB_FORCE_SEND_EMAILS} = process.env
 
-const is_production = IS_PRODUCTION === "yes"
+const is_production = NODE_ENV === "production"
 const force_send = RB_FORCE_SEND_EMAILS === "yes"
 
 
 // TMP use proper mock smtp server in development
 
-log("mailer, is_production:", is_production, "env:", JSON.stringify(IS_PRODUCTION))
+log("mailer, is_production:", {is_production})
 
 let client
 

package/package.json

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

package/rts/index.js

@@ -13,8 +13,7 @@ const mongoose = require("../mongoose")
 
 const log = debug("rb:rts:server")
 
-const is_production = process.env.IS_PRODUCTION === "yes"
-
+const is_production = process.env.NODE_ENV === "production"
 
 const QUERY_MAX_LIMIT = 4096