@rpcbase/server 0.234.0 → 0.236.0

package/package.json

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

package/src/auth/reset_password.js

@@ -48,7 +48,7 @@ const reset_password = async({email}, ctx) => {
 
   await reset_token.save()
 
-  const reset_url = `https://${APP_DOMAIN}/set-new-password?id=${user._id}&token=${token}`
+  const reset_url = `https://${APP_DOMAIN}/set-new-password?uid=${user._id}&token=${token}`
 
   const res = await mailer.sendEmail({
     From: MAILER_FROM_EMAIL,

package/src/client/client_router.js

@@ -1,4 +1,5 @@
 /* @flow */
+const assert = require("assert")
 const fs = require("fs")
 const path = require("path")
 const glob = require("glob")
@@ -7,19 +8,20 @@ const Sentry = require("@sentry/node")
 const async_wrapper = require("../helpers/async_wrapper")
 
 
-const COMPRESSED_EXTENSIONS_MAP = {
+const MIME_TYPES = {
   ".css": "text/css",
   ".js": "text/javascript",
   ".json": "application/json",
   ".svg": "image/svg+xml",
+  ".woff2": "font/woff2",
+  ".png": "image/png",
 }
 
 const {SENTRY_DSN, NODE_ENV} = process.env
 const has_sentry = !!SENTRY_DSN
 
 const is_development = NODE_ENV === "development"
-// do not serve compression in dev, the assets are only compressed in the github action
-const COMPRESSED_EXTENSIONS = is_development ? [] : Object.keys(COMPRESSED_EXTENSIONS_MAP)
+
 
 const src_path = path.join(process.cwd(), "./src/")
 const build_dir = path.join(process.cwd(), "build/")
@@ -41,38 +43,17 @@ const get_client_routes = () => {
 const serve_file = (req, res, full_path) => {
   const file_path = path.join(client_build_dir, full_path)
 
-  const extname = path.extname(full_path)
-  const has_compression = COMPRESSED_EXTENSIONS.includes(extname)
-
-  if (has_compression) {
-    const accept_encoding = req.headers["accept-encoding"]
-    // brotli
-    if (accept_encoding.indexOf("br") > -1) {
-      res.sendFile(`${file_path}.br`, {
-        headers: {
-          "Content-Encoding": "br",
-          "Content-Type": COMPRESSED_EXTENSIONS_MAP[extname],
-        }
-      })
-    }
-    // gzip
-    else if (!is_development && accept_encoding.indexOf("gzip") > -1) {
-      res.sendFile(`${file_path}.gz`, {
-        headers: {
-          "Content-Encoding": "gzip",
-          "Content-Type": COMPRESSED_EXTENSIONS_MAP[extname],
-        }
-      })
-    }
-    // unknown accept-encoding
-    else {
-      res.sendFile(file_path)
+  const extname = path.extname(file_path)
+
+  const content_type = MIME_TYPES[extname]
+  assert(content_type, "unable to resolve content type")
+
+  res.sendFile(file_path, {
+    headers: {
+      "Cache-Control": `public, max-age=1800`, // 30 mins
+      "Content-Type": content_type,
     }
-  }
-  // not compressed
-  else {
-    res.sendFile(file_path)
-  }
+  })
 }
 
 
@@ -112,6 +93,7 @@ const client_router = (app) => {
   }
 
 
+  // TODO: this should not be here
   app.use((err, req, res, next) => {
     console.error("server got err", err)
     res.status(500).json({