@live-change/cli 0.1.8 → 0.1.12

package/bin/lcli.js

@@ -16,7 +16,9 @@ const {
   setupApiServer,
   setupApiSockJs,
   setupApiWs,
-  setupDbServer
+  setupDbServer,
+  setupDbClient,
+  setupApp
 
 } = require("@live-change/server")
 
@@ -39,10 +41,6 @@ function startOptions(yargs) {
     type: 'boolean',
     description: 'update all services'
   })
-  yargs.option('enableSessions', {
-    type: 'boolean',
-    description: 'enable session based data access'
-  })
   yargs.option('withDb', {
     type: 'boolean',
     description: 'start local database'
@@ -120,62 +118,73 @@ 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) => {
+    argv = {
       ...argv,
       withServices: true, updateServices: true
-    })
+    }
+    await setupApp(argv)
+    await apiServer(argv)
   })
   .command('memApiServer', 'shortcut for devApiServer --withDb --dbBackend mem --createDb', (yargs) => {
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    apiServer({
+  }, async (argv) => {
+    argv = {
       ...argv,
       withServices: true, updateServices: true,
       withDb: true, dbBackend: 'mem', createDb: true
-    })
+    }
+    await setupApp(argv)
+    await apiServer(argv)
   })
   .command('ssrServer', 'start ssr server', (yargs) => {
     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) => {
+    argv = {
       ...argv,
       withApi: true, withServices: true, updateServices: true
-    }, true)
+    }
+    await setupApp(argv)
+    await ssrServer(argv, true)
   })
   .command('memDev', 'shortcut for dev --withDb --dbBackend mem --createDb', (yargs) => {
     ssrServerOptions(yargs)
     apiServerOptions(yargs)
     startOptions(yargs)
-  }, (argv) => {
-    ssrServer({
+  }, async (argv) => {
+    argv = {
       ...argv,
       withApi: true, withServices: true, updateServices: true,
       withDb: true, dbBackend: 'mem', createDb: true
-    }, true)
+    }
+    await setupApp(argv)
+    await ssrServer(argv, true)
   })
   .option('verbose', {
     alias: 'v',
@@ -187,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()
 
@@ -220,15 +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()
-    const loopbackDao = await createLoopbackDao('local', () => dbServer.createDao('local'))
-    loopbackDao.prepareSource(app.dao.definition.database)
-    loopbackDao.prepareSource(app.dao.definition.store)
-  }
-
   if(argv.createDb) {
     const list = await app.dao.get(['database', 'databasesList'])
     console.log("EXISTING DATABASES", list)
@@ -240,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, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/cli",
-  "version": "0.1.8",
+  "version": "0.1.12",
   "description": "Live Change Framework - command line interface",
   "main": "index.js",
   "scripts": {
@@ -24,21 +24,21 @@
   },
   "homepage": "https://github.com/live-change/cli",
   "dependencies": {
-    "@live-change/dao": "^0.3.3",
-    "@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/vue3-ssr": "^0.1.1",
+    "@live-change/dao": "^0.3.12",
+    "@live-change/dao-sockjs": "^0.2.1",
+    "@live-change/dao-websocket": "^0.3.2",
+    "@live-change/db-server": "^0.4.82",
+    "@live-change/framework": "^0.5.8",
+    "@live-change/server": "^0.1.16",
+    "@live-change/vue3-ssr": "^0.1.7",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
-    "http-proxy-middleware": "2.0.0",
+    "http-proxy-middleware": "2.0.1",
     "resolve": "^1.20.0",
     "segfault-handler": "^1.3.0",
     "serialize-javascript": "^6.0.0",
-    "sockjs": "^0.3.21",
+    "sockjs": "^0.3.24",
     "websocket": "^1.0.34",
-    "yargs": "^17.0.1"
+    "yargs": "^17.3.0"
   }
 }