@live-change/db-server 0.5.20 → 0.5.22

package/bin/server.js

@@ -10,6 +10,11 @@ const db = require("@live-change/db")
 const profileOutput = require("../lib/profileOutput.js")
 const { performance } = require('perf_hooks')
 
+const {
+  SsrServer,
+  createLoopbackDao
+} = require("@live-change/server")
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason)
 })
@@ -154,7 +159,27 @@ async function serve(argv) {
   await server.initialize()
   if(verbose) console.info(`database initialized!`)
   if(verbose) console.info(`listening on: ${argv.host}:${argv.port}`)
-  server.listen(port, host)
+
+  const ssrRoot = path.dirname(require.resolve("@live-change/db-admin/front/vite.config.js"))
+
+  const http = await server.getHttp()
+  const { app } = http
+
+  const dev = await fs.promises.access(path.resolve(ssrRoot, './dist'), fs.constants.R_OK)
+    .then(r => false).catch(r => true)
+  if(dev) console.log("STARTING ADMIN IN DEV MODE!")
+  const manifest = dev ? null : require(path.resolve(ssrRoot, 'dist/client/ssr-manifest.json'))
+  const admin = new SsrServer(app, manifest, {
+    dev,
+    fastAuth: true,
+    root: ssrRoot,
+    daoFactory: async (credentials, ip) => {
+      return await createLoopbackDao(credentials, () => server.apiServer.daoFactory(credentials, ip))
+    }
+  })
+  admin.start()
+  http.server.listen(port, host)
+
   if(verbose) console.info(`server started!`)
   await db.profileLog.end(profileOp)
 }

package/lib/Server.js

@@ -19,10 +19,6 @@ const Database = require('@live-change/db').Database
 
 const debug = require('debug')('db-server')
 
-const {
-  SsrServer,
-  createLoopbackDao
-} = require("@live-change/server")
 const packageInfo = require("@live-change/db-server/package.json");
 
 class DatabaseStore {
@@ -331,27 +327,11 @@ class Server {
       })
       sockJsServer.attach(server)
 
-      const ssrRoot = path.dirname(require.resolve("@live-change/db-admin/front/vite.config.js"))
-      const dev = await fs.promises.access(path.resolve(ssrRoot, './dist'), fs.constants.R_OK)
-          .then(r => false).catch(r => true)
-      if(dev) console.log("STARTING ADMIN IN DEV MODE!")
-      const manifest = dev ? null : require(path.resolve(ssrRoot, 'dist/client/ssr-manifest.json'))
-      const admin = new SsrServer(app, manifest, {
-        dev,
-        fastAuth: true,
-        root: ssrRoot,
-        daoFactory: async (credentials, ip) => {
-          return await createLoopbackDao(credentials, () => this.apiServer.daoFactory(credentials, ip))
-        }
-      })
-      admin.start()
-
       this.http = {
         app,
         sockJsServer,
         wsServer,
-        server,
-        admin
+        server
       }
       return this.http
     })()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-server",
-  "version": "0.5.20",
+  "version": "0.5.22",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -31,13 +31,13 @@
     "@live-change/dao": "0.5.8",
     "@live-change/dao-sockjs": "0.5.8",
     "@live-change/dao-websocket": "0.5.8",
-    "@live-change/db": "^0.5.20",
-    "@live-change/db-admin": "^0.5.20",
-    "@live-change/db-client": "^0.5.20",
-    "@live-change/db-store-level": "^0.5.20",
-    "@live-change/db-store-lmdb": "^0.5.20",
-    "@live-change/db-store-observable-db": "^0.5.20",
-    "@live-change/db-store-rbtree": "^0.5.20",
+    "@live-change/db": "^0.5.22",
+    "@live-change/db-admin": "^0.5.22",
+    "@live-change/db-client": "^0.5.22",
+    "@live-change/db-store-level": "^0.5.22",
+    "@live-change/db-store-lmdb": "^0.5.22",
+    "@live-change/db-store-observable-db": "^0.5.22",
+    "@live-change/db-store-rbtree": "^0.5.22",
     "@live-change/sockjs": "0.4.1",
     "express": "^4.18.1",
     "line-reader": "^0.4.0",
@@ -49,5 +49,5 @@
     "websocket": "^1.0.34",
     "yargs": "^17.5.1"
   },
-  "gitHead": "49282865084b8a3c07e57743f2897d97480a6115"
+  "gitHead": "8428eb866bd0dc9d9ee247d77c120553713a5987"
 }