@rpcbase/api 0.14.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/api",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "type": "module",
   "main": "./src/index.ts",
   "scripts": {

package/src/initApi.ts

@@ -1,5 +1,5 @@
 import assert from "assert"
-import dotenv from "dotenv"
+import env from "@rpcbase/env"
 import BBPromise from "bluebird"
 import { Application , json } from "express"
 
@@ -9,10 +9,11 @@ import { Api, ApiHandler, Payload, Result, Middleware } from "./types"
 
 
 // dotenv setup, merge process env with vite process.env file
+
 process.env = {
   ...__vite_env__,
   ...process.env,
-  ...dotenv.config().parsed
+  ...env.config().parsed
 }
 
 
@@ -68,10 +69,22 @@ export const initApi = async (app: Application) => {
 
   const routeEntries = Object.entries(routes) as RouteModule[]
 
-  const loadRoute = async([routePath, loadFn]: RouteModule) => {
+  const loadRoute = async ([routePath, loadFn]: RouteModule) => {
     const routeModule = await loadFn()
     routeModule.default(api)
-    console.log("loaded api route", routePath)
+
+    let loggedPath = routePath.startsWith("../../")
+      ? routePath.replace("../../", "@rpcbase/")
+      : routePath
+
+    // Colorize output: gray for @rpcbase paths, default (white) otherwise
+    const GRAY = "\x1b[90m"
+    const RESET = "\x1b[0m"
+    const coloredPath = loggedPath.startsWith("@rpcbase/")
+      ? `${GRAY}${loggedPath}${RESET}`
+      : loggedPath
+
+    console.log("loaded api route", coloredPath)
   }
 
   await BBPromise.map(routeEntries, loadRoute)

package/src/loadModel.ts

@@ -2,7 +2,7 @@ import assert from "assert"
 import mongoose from "mongoose"
 import { Ctx } from "./types"
 
-const { APP_NAME, DB_NAME } = process.env
+const { APP_NAME, MONGO_PORT } = process.env
 const connections: Record<string, mongoose.Connection> = {}
 
 // @ts-ignore: Property 'glob' does not exist on type 'ImportMeta'.
@@ -39,10 +39,10 @@ export const loadModel = async (modelName: string, ctx: Ctx) => {
   assert(tenantId, "Tenant ID is missing from session")
 
   const dbName = ["User", "Tenant"].includes(modelName)
-    ? `${APP_NAME}-users-${DB_NAME}`
-    : `${APP_NAME}-${tenantId}-${DB_NAME}`
+    ? `${APP_NAME}-users-db`
+    : `${APP_NAME}-${tenantId}-db`
 
-  const connectionString = `mongodb://localhost:27017/${dbName}`
+  const connectionString = `mongodb://localhost:${MONGO_PORT}/${dbName}`
 
   if (!connections[dbName]) {
     const connection = mongoose.createConnection(connectionString, {