@live-change/cli 0.1.14 → 0.5.19

package/bin/lcli.js

@@ -63,6 +63,10 @@ function startOptions(yargs) {
     type: 'boolean',
     description: 'create database if not exists'
   })
+  yargs.option('dbAccess', {
+    type: 'boolean',
+    description: 'give database access to frontend(only for development and db-admin)'
+  })
 }
 
 function apiServerOptions(yargs) {
@@ -107,11 +111,6 @@ 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
@@ -119,7 +118,7 @@ const argv = require('yargs') // eslint-disable-line
     apiServerOptions(yargs)
     startOptions(yargs)
   }, async (argv) => {
-    await setupApp(argv)
+    await setupApp({ ...argv, uidBorders: '[]' })
     await apiServer(argv)
   })
   .command('devApiServer', 'shortcut for apiServer --withServices --updateServices', (yargs) => {
@@ -130,7 +129,7 @@ const argv = require('yargs') // eslint-disable-line
       ...argv,
       withServices: true, updateServices: true
     }
-    await setupApp(argv)
+    await setupApp({ ...argv, uidBorders: '[]' })
     await apiServer(argv)
   })
   .command('memApiServer', 'shortcut for devApiServer --withDb --dbBackend mem --createDb', (yargs) => {
@@ -142,7 +141,7 @@ const argv = require('yargs') // eslint-disable-line
       withServices: true, updateServices: true,
       withDb: true, dbBackend: 'mem', createDb: true
     }
-    await setupApp(argv)
+    await setupApp({ ...argv, uidBorders: '[]' })
     await apiServer(argv)
   })
   .command('ssrServer', 'start ssr server', (yargs) => {
@@ -150,16 +149,16 @@ const argv = require('yargs') // eslint-disable-line
     apiServerOptions(yargs)
     startOptions(yargs)
   }, async (argv) => {
-    await setupApp(argv)
-    await ssrServer(argv, false)
+    await setupApp({ ...argv, uidBorders: '[]' })
+    await ssrServer({ ...argv, uidBorders: '[]' }, false)
   })
   .command('ssrDev', 'start ssr server in development mode', (yargs) => {
     ssrServerOptions(yargs)
     apiServerOptions(yargs)
     startOptions(yargs)
   }, async (argv) => {
-    await setupApp(argv)
-    await ssrServer(argv, true)
+    await setupApp({ ...argv, uidBorders: '[]' })
+    await ssrServer({ ...argv, uidBorders: '[]' }, true)
   })
   .command('dev', 'shortcut for ssrDev --withApi --withServices --updateServices', (yargs) => {
     ssrServerOptions(yargs)
@@ -170,8 +169,8 @@ const argv = require('yargs') // eslint-disable-line
       ...argv,
       withApi: true, withServices: true, updateServices: true
     }
-    await setupApp(argv)
-    await ssrServer(argv, true)
+    await setupApp({ ...argv, uidBorders: '[]' })
+    await ssrServer({ ...argv, uidBorders: '[]' }, true)
   })
   .command('memDev', 'shortcut for dev --withDb --dbBackend mem --createDb', (yargs) => {
     ssrServerOptions(yargs)
@@ -183,8 +182,21 @@ const argv = require('yargs') // eslint-disable-line
       withApi: true, withServices: true, updateServices: true,
       withDb: true, dbBackend: 'mem', createDb: true
     }
-    await setupApp(argv)
-    await ssrServer(argv, true)
+    await setupApp({ ...argv, uidBorders: '[]' })
+    await ssrServer({ ...argv, uidBorders: '[]' }, true)
+  })
+  .command('localDev', 'shortcut for dev --withDb --createDb', (yargs) => {
+    ssrServerOptions(yargs)
+    apiServerOptions(yargs)
+    startOptions(yargs)
+  }, async (argv) => {
+    argv = {
+      ...argv,
+      withApi: true, withServices: true, updateServices: true,
+      withDb: true, createDb: true
+    }
+    await setupApp({ ...argv, uidBorders: '[]' })
+    await ssrServer({ ...argv, uidBorders: '[]' }, true)
   })
   .option('verbose', {
     alias: 'v',
@@ -209,7 +221,9 @@ async function apiServer(argv) {
   console.log('Listening on port ' + apiPort)
 }
 async function ssrServer(argv, dev) {
-  const { ssrRoot, ssrPort, ssrHost, apiHost, apiPort, sessionExpires } = argv
+  const { ssrRoot, ssrPort, ssrHost, apiHost, apiPort } = argv
+
+  const fastAuth = true
 
   const expressApp = express()
 
@@ -231,8 +245,8 @@ async function ssrServer(argv, dev) {
 
   if(argv.createDb) {
     const list = await app.dao.get(['database', 'databasesList'])
-    console.log("EXISTING DATABASES", list)
-    console.log("CREATE DATABASE!")
+    console.log("existing databases:", list.join(', '))
+    console.log("creating database", app.databaseName)
     await app.dao.request(['database', 'createDatabase'], app.databaseName, {
       storage: { noMetaSync: true, noSync: true }
     }).catch(err => 'exists')
@@ -240,11 +254,13 @@ async function ssrServer(argv, dev) {
 
   let apiServer
   if(argv.withApi) {
-    apiServer = await setupApiServer(argv)
+    apiServer = await setupApiServer({ ...argv, fastAuth })
   }
 
   const ssrServer = new SsrServer(expressApp, manifest, {
+    ...argv,
     dev,
+    fastAuth,
     root: ssrRoot || '.',
     ...(apiServer
       ? {
@@ -255,8 +271,7 @@ 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.14",
+  "version": "0.5.19",
   "description": "Live Change Framework - command line interface",
   "main": "index.js",
   "scripts": {
@@ -28,9 +28,9 @@
     "@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.10",
-    "@live-change/server": "^0.1.17",
-    "@live-change/vue3-ssr": "^0.1.7",
+    "@live-change/framework": "^0.5.19",
+    "@live-change/server": "^0.5.19",
+    "@live-change/vue3-ssr": "^0.2.2",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "http-proxy-middleware": "2.0.1",
@@ -40,5 +40,6 @@
     "sockjs": "^0.3.24",
     "websocket": "^1.0.34",
     "yargs": "^17.3.0"
-  }
+  },
+  "gitHead": "2c25ed68487762fe4ca36208b708ac7aa7506852"
 }