@live-change/cli 0.1.5 → 0.1.9

package/bin/lcli.js

@@ -11,12 +11,14 @@ const app = require("@live-change/framework").app()
 const {
 
   SsrServer,
-  
+
   createLoopbackDao,
   setupApiServer,
   setupApiSockJs,
   setupApiWs,
-  setupDbServer
+  setupDbServer,
+  setupDbClient,
+  setupApp
 
 } = require("@live-change/server")
 
@@ -109,20 +111,27 @@ function ssrServerOptions(yargs) {
     describe: 'start internal api server',
     type: 'boolean'
   })
+  yargs.option('sessionExpires', {
+    describe: 'session expires after (in minutes)',
+    type: 'number',
+    default: 30*24*60
+  })
 }
 
 const argv = require('yargs') // eslint-disable-line
   .command('apiServer', 'start server', (yargs) => {
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    apiServer(argv)
+  }, async (argv) => {
+    await setupApp(argv)
+    await apiServer(argv)
   })
   .command('devApiServer', 'shortcut for apiServer --withServices --updateServices', (yargs) => {
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    apiServer({
+  }, async (argv) => {
+    await setupApp(argv)
+    await apiServer({
       ...argv,
       withServices: true, updateServices: true
     })
@@ -130,8 +139,9 @@ const argv = require('yargs') // eslint-disable-line
   .command('memApiServer', 'shortcut for devApiServer --withDb --dbBackend mem --createDb', (yargs) => {
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    apiServer({
+  }, async (argv) => {
+    await setupApp(argv)
+    await apiServer({
       ...argv,
       withServices: true, updateServices: true,
       withDb: true, dbBackend: 'mem', createDb: true
@@ -141,36 +151,40 @@ const argv = require('yargs') // eslint-disable-line
     ssrServerOptions(yargs)
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    ssrServer(argv, false)
+  }, async (argv) => {
+    await setupApp(argv)
+    await ssrServer(argv, false)
   })
   .command('ssrDev', 'start ssr server in development mode', (yargs) => {
     ssrServerOptions(yargs)
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    ssrServer(argv, true)
+  }, async (argv) => {
+    await setupApp(argv)
+    await ssrServer(argv, true)
   })
   .command('dev', 'shortcut for ssrDev --withApi --withServices --updateServices', (yargs) => {
     ssrServerOptions(yargs)
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    ssrServer({
+  }, async (argv) => {
+    await setupApp(argv)
+    await ssrServer({
       ...argv,
       withApi: true, withServices: true, updateServices: true
-    })
+    }, true)
   })
   .command('memDev', 'shortcut for dev --withDb --dbBackend mem --createDb', (yargs) => {
     ssrServerOptions(yargs)
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    ssrServer({
+  }, async (argv) => {
+    await setupApp(argv)
+    await ssrServer({
       ...argv,
       withApi: true, withServices: true, updateServices: true,
       withDb: true, dbBackend: 'mem', createDb: true
-    })
+    }, true)
   })
   .option('verbose', {
     alias: 'v',
@@ -182,7 +196,7 @@ const argv = require('yargs') // eslint-disable-line
 async function apiServer(argv) {
   const { apiPort, apiHost } = argv
 
-  const apiServer = await setupApiServer(argv)
+  const apiServer = await setupApiServer(argv, dbServer)
 
   const expressApp = express()
 
@@ -195,12 +209,13 @@ async function apiServer(argv) {
   console.log('Listening on port ' + apiPort)
 }
 async function ssrServer(argv, dev) {
-  const { ssrRoot, ssrPort, ssrHost, apiHost, apiPort } = argv
+  const { ssrRoot, ssrPort, ssrHost, apiHost, apiPort, sessionExpires } = argv
 
   const expressApp = express()
 
-  const manifest = dev ? null : require(path.resolve(ssrRoot,
-    'dist/client/ssr-manifest.json'))
+  //expressApp.use('/static', express.static(path.resolve(ssrRoot, 'public')))
+
+  const manifest = dev ? null : require(path.resolve(ssrRoot, 'dist/client/ssr-manifest.json'))
 
   if(!argv.withApi) {
     const apiServerHost = (argv.apiHost == '0.0.0.0' ? 'localhost' : argv.apiHost) + ':' + argv.apiPort
@@ -214,13 +229,6 @@ async function ssrServer(argv, dev) {
     console.log("PROXY /api to", target)
   }
 
-  let dbServer
-  if(argv.withDb) {
-    dbServer = await setupDbServer(argv)   
-    app.dao.dispose()
-    app.dao = await createLoopbackDao('local', () => dbServer.createDao('local') )
-  }
-
   if(argv.createDb) {
     const list = await app.dao.get(['database', 'databasesList'])
     console.log("EXISTING DATABASES", list)
@@ -232,7 +240,7 @@ async function ssrServer(argv, dev) {
 
   let apiServer
   if(argv.withApi) {
-    apiServer = await setupApiServer(argv, dbServer)
+    apiServer = await setupApiServer(argv)
   }
 
   const ssrServer = new SsrServer(expressApp, manifest, {
@@ -247,7 +255,8 @@ async function ssrServer(argv, dev) {
       : {
         apiHost, apiPort
       }
-    )
+    ),
+    ...(sessionExpires ? { sessionExpires: sessionExpires * 60 * 1000 } : {})
   })
 
   await ssrServer.start()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/cli",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "description": "Live Change Framework - command line interface",
   "main": "index.js",
   "scripts": {
@@ -28,8 +28,8 @@
     "@live-change/dao-sockjs": "^0.2.0",
     "@live-change/dao-websocket": "^0.3.1",
     "@live-change/db-server": "^0.4.80",
-    "@live-change/framework": "^0.4.36",
-    "@live-change/server": "^0.1.3",
+    "@live-change/framework": "^0.5.0",
+    "@live-change/server": "^0.1.7",
     "@live-change/vue3-ssr": "^0.1.1",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",