@rpcbase/server 0.2.0 → 0.3.0

package/client/client_router.js

@@ -5,6 +5,11 @@ const glob = require("glob")
 
 const src_path = path.join(process.cwd(), "./src/")
 const build_dir = path.join(process.cwd(), "build/")
+const client_build_dir = path.join(build_dir, "./client")
+const index_file_buffer = fs.readFileSync(path.join(client_build_dir, "./index.html"))
+
+
+// TODO: add build time static assets compression
 
 
 const async_wrapper = fn => (req, res, next) => {
@@ -12,36 +17,38 @@ const async_wrapper = fn => (req, res, next) => {
     .catch(next)
 }
 
+const get_client_routes = () => {
+  const client_files = glob.sync(path.join(client_build_dir, "./**/*"))
+  const routes = client_files
+    .filter((f) => {
+      const stat = fs.statSync(f)
+      return !stat.isDirectory()
+    })
+    .map((f) => `/${path.relative(client_build_dir, f)}`)
+  return routes
+}
+
 
 const client_router = (app) => {
+  const client_routes = get_client_routes()
 
   app.get("*", async_wrapper(async(req, res, next) => {
-    console.log("client router wow", req)
-    next()
+    const full_path = req.baseUrl + req.path
+
+    if (full_path.startsWith("/api/") || full_path.startsWith("/rpc/")) {
+      return next()
+    }
+
+    if (client_routes.indexOf(full_path) > -1) {
+      const file_path = path.join(client_build_dir, full_path)
+      return res.sendFile(file_path)
+    } else {
+      res.writeHead(200, {
+        "Content-Type": "text/html"
+      })
+      res.end(index_file_buffer)
+    }
   }))
-
-  // 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("GOT REQ", req.body)
-  //     const result = await rpc_fn(req.body, req)
-  //     // console.log("rpc", route_path, result)
-  //     res.json(result)
-  //   }))
-  // })
-
 }
 
 module.exports = client_router

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "scripts": {