@live-change/cli 0.7.39 → 0.8.0

package/bin/lcli.js

@@ -1,321 +1,4 @@
-#!/usr/bin/env node
-require('dotenv').config()
-const express = require("express")
-const path = require('path')
-const http = require("http")
-const { createProxyMiddleware } = require('http-proxy-middleware')
-const { readFile } = require('fs').promises
+import starter from '../lib/starter.js'
 
-const app = require("@live-change/framework").app()
+starter()
 
-const {
-
-  SsrServer,
-
-  createLoopbackDao,
-  setupApiServer,
-  setupApiSockJs,
-  setupApiWs,
-  setupApp,
-  setupApiEndpoints
-
-} = require("@live-change/server")
-
-process.on('unhandledRejection', (reason, p) => {
-  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason)
-})
-
-process.on('uncaughtException', function (err) {
-  console.error(err.stack)
-})
-
-function startOptions(yargs) {
-  yargs.option('withServices', {
-    type: 'boolean',
-    description: 'start all services'
-  })
-  yargs.options('updateServices', {
-    type: 'boolean',
-    description: 'update all services'
-  })
-  yargs.option('withDb', {
-    type: 'boolean',
-    description: 'start local database'
-  })
-  yargs.option('dbBackend', {
-    type: 'string',
-    description: 'select db backend engine ( lmdb | leveldb | rocksdb | memdown | mem )',
-    default: 'lmdb'
-  })
-  yargs.option('dbBackendUrl', {
-    type: 'string',
-    description: 'database backend url parameter'
-  })
-  yargs.option('dbRoot', {
-    type: 'string',
-    description: 'database root directory',
-    default: 'tmp.db'
-  })
-  yargs.option('createDb', {
-    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) {
-  yargs.option('apiPort', {
-    describe: 'api server port',
-    type: 'number',
-    default: process.env.API_SERVER_PORT || 8002
-  })
-  yargs.option('apiHost', {
-    describe: 'api server bind host',
-    type: 'string',
-    default: process.env.API_SERVER_HOST || '0.0.0.0'
-  })
-  yargs.option('services', {
-    describe: 'services config',
-    type: 'string',
-    default: 'server/services.config.js'
-  })
-  yargs.option('initScript', {
-    description: 'run init script',
-    type: 'string'
-  })
-}
-
-function ssrServerOptions(yargs) {
-  yargs.option('ssrRoot', {
-    describe: 'frontend root directory',
-    type: 'string',
-    default: './front'
-  })
-  yargs.option('ssrPort', {
-    describe: 'port to bind on',
-    type: 'number',
-    default: process.env.SSR_SERVER_PORT || 8001
-  })
-  yargs.option('ssrHost', {
-    describe: 'bind host',
-    type: 'string',
-    default: process.env.SSR_SERVER_HOST || '0.0.0.0'
-  })
-  yargs.option('withApi', {
-    describe: 'start internal api server',
-    type: 'boolean'
-  })
-  yargs.option('serverEntry', {
-    describe: 'front ssr entry file',
-    type: 'string'
-  })
-  yargs.option('templatePath', {
-    describe: 'front ssr entry file',
-    type: 'string'
-  })
-  yargs.option('version', {
-    describe: 'server version',
-    type: 'string'
-  })
-  yargs.option('versionFile', {
-    describe: 'server version file',
-    type: 'string'
-  })
-  yargs.option('plugin', {
-    describe: 'start in plugin mode - without ssr, and with vite mode plugin',
-    type: 'boolean'
-  })
-  yargs.option('mode', {
-    describe: 'vite mode',
-    type: 'string'
-  })
-}
-
-const argv = require('yargs') // eslint-disable-line
-  .command('apiServer', 'start server', (yargs) => {
-    apiServerOptions(yargs)
-    startOptions(yargs)
-  }, async (argv) => {
-    await setupApp({ ...argv, uidBorders: '[]' })
-    await apiServer(argv)
-  })
-  .command('devApiServer', 'shortcut for apiServer --withServices --updateServices', (yargs) => {
-    apiServerOptions(yargs)
-    startOptions(yargs)
-  }, async (argv) => {
-    argv = {
-      ...argv,
-      withServices: true, updateServices: true
-    }
-    await setupApp({ ...argv, uidBorders: '[]' })
-    await apiServer(argv)
-  })
-  .command('memApiServer', 'shortcut for devApiServer --withDb --dbBackend mem --createDb', (yargs) => {
-    apiServerOptions(yargs)
-    startOptions(yargs)
-  }, async (argv) => {
-    argv = {
-      ...argv,
-      withApi: true, withServices: true, updateServices: true,
-      withDb: true, dbBackend: 'mem', createDb: true
-    }
-    await setupApp({ ...argv, uidBorders: '[]' })
-    await apiServer(argv)
-  })
-  .command('ssrServer', 'start ssr server', (yargs) => {
-    ssrServerOptions(yargs)
-    apiServerOptions(yargs)
-    startOptions(yargs)
-  }, async (argv) => {
-    await setupApp({ ...argv, uidBorders: '[]' })
-    await server({ ...argv, uidBorders: '[]' }, false)
-  })
-  .command('server', 'start server', (yargs) => {
-    ssrServerOptions(yargs)
-    apiServerOptions(yargs)
-    startOptions(yargs)
-  }, async (argv) => {
-    await setupApp({ ...argv, uidBorders: '[]' })
-    await server({ ...argv, uidBorders: '[]' }, false)
-  })
-  .command('ssrDev', 'start ssr server in development mode', (yargs) => {
-    ssrServerOptions(yargs)
-    apiServerOptions(yargs)
-    startOptions(yargs)
-  }, async (argv) => {
-    await setupApp({ ...argv, uidBorders: '[]' })
-    await server({ ...argv, uidBorders: '[]' }, true)
-  })
-  .command('dev', 'shortcut for ssrDev --withApi --withServices --updateServices --createDb', (yargs) => {
-    ssrServerOptions(yargs)
-    apiServerOptions(yargs)
-    startOptions(yargs)
-  }, async (argv) => {
-    argv = {
-      ...argv,
-      withApi: true, withServices: true, updateServices: true, createDb: true,
-    }
-    await setupApp({ ...argv, uidBorders: '[]' })
-    await server({ ...argv, uidBorders: '[]' }, true)
-  })
-  .command('memDev', 'shortcut for dev --withDb --dbBackend mem --createDb', (yargs) => {
-    ssrServerOptions(yargs)
-    apiServerOptions(yargs)
-    startOptions(yargs)
-  }, async (argv) => {
-    argv = {
-      ...argv,
-      withApi: true, withServices: true, updateServices: true,
-      withDb: true, dbBackend: 'mem', createDb: true
-    }
-    await setupApp({ ...argv, uidBorders: '[]' })
-    await server({ ...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 server({ ...argv, uidBorders: '[]' }, true)
-  })
-  .option('verbose', {
-    alias: 'v',
-    type: 'boolean',
-    description: 'Run with verbose logging'
-  }).argv
-/// TODO api.gen.js generation command
-
-async function apiServer(argv) {
-  const { apiPort, apiHost } = argv
-
-  const apiServer = await setupApiServer(argv)
-
-  const expressApp = express()
-
-  await setupApiEndpoints(expressApp, apiServer)
-
-  const httpServer = http.createServer(expressApp)
-
-  setupApiWs(httpServer, apiServer)
-  setupApiSockJs(httpServer, apiServer)
-
-  httpServer.listen(apiPort, apiHost)
-  console.log('Listening on port ' + apiPort)
-}
-
-async function server(argv, dev) {
-  const { ssrRoot, ssrPort, ssrHost, apiHost, apiPort } = argv
-
-  const fastAuth = true
-
-  const expressApp = express()
-
-  //expressApp.use('/static', express.static(path.resolve(ssrRoot, 'public')))
-
-  const manifest = (dev || argv.spa) ? null : require(path.resolve(ssrRoot, 'dist/client/ssr-manifest.json'))
-
-  if(!argv.version) argv.version = process.env.VERSION
-  if(argv.versionFile) argv.version = await readFile(argv.versionFile, 'utf8')
-
-  if(!argv.withApi) {
-    const apiServerHost = (argv.apiHost == '0.0.0.0' ? 'localhost' : argv.apiHost) + ':' + argv.apiPort
-    const target = `http://${apiServerHost}/`
-    const apiProxy = createProxyMiddleware({
-      target,
-      changeOrigin: true,
-      ws: true
-    })
-    expressApp.use('/api', apiProxy)
-    console.log("PROXY /api to", target)
-  }
-
-  let apiServer
-  if(argv.withApi) {
-    apiServer = await setupApiServer({ ...argv, fastAuth })
-    await setupApiEndpoints(expressApp, apiServer)
-  }
-
-  console.log("ENDPOINTS INSTALLED! CREATING WEB SERVER!")
-
-  const ssrServer = new SsrServer(expressApp, manifest, {
-    ...argv,
-    dev,
-    fastAuth,
-    root: ssrRoot || '.',
-    ...(apiServer
-        ? {
-          daoFactory: async (credentials, ip) => {
-            return await createLoopbackDao(credentials, () => apiServer.daoFactory(credentials, ip))
-          }
-        }
-        : {
-          apiHost, apiPort
-        }
-    )
-  })
-  await ssrServer.start()
-
-
-  console.log("SSR INSTALLED! CREATING HTTP SERVER!")
-
-  const httpServer = http.createServer(expressApp)
-  if(argv.withApi) {
-    setupApiWs(httpServer, apiServer)
-    setupApiSockJs(httpServer, apiServer)
-  }
-
-  console.log("HTTP SERVER CREATED! INSTALLING!")
-
-  httpServer.listen(ssrPort, ssrHost)
-
-  console.log("LISTENING ON ",`${ssrHost}:${ssrPort} link: http://${ssrHost}:${ssrPort}/`)
-}

package/index.js

@@ -0,0 +1,2 @@
+import starter from './lib/starter.js'
+export { starter }

package/lib/starter.js

@@ -0,0 +1,338 @@
+#!/usr/bin/env node
+import dotenv from 'dotenv'
+dotenv.config()
+import express from 'express'
+import path from 'path'
+import http from 'http'
+import fs from 'fs'
+import yargs from 'yargs'
+
+import { createProxyMiddleware } from 'http-proxy-middleware'
+import { readFile } from 'fs/promises'
+import App from '@live-change/framework'
+const app = App.app()
+
+import {
+
+  SsrServer,
+
+  createLoopbackDao,
+  setupApiServer,
+  setupApiSockJs,
+  setupApiWs,
+  setupApp,
+  setupApiEndpoints
+
+} from "@live-change/server"
+
+process.on('unhandledRejection', (reason, p) => {
+  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason)
+})
+
+process.on('uncaughtException', function (err) {
+  console.error(err.stack)
+})
+
+function startOptions(yargs) {
+  yargs.option('withServices', {
+    type: 'boolean',
+    description: 'start all services'
+  })
+  yargs.options('updateServices', {
+    type: 'boolean',
+    description: 'update all services'
+  })
+  yargs.option('withDb', {
+    type: 'boolean',
+    description: 'start local database'
+  })
+  yargs.option('dbBackend', {
+    type: 'string',
+    description: 'select db backend engine ( lmdb | leveldb | rocksdb | memdown | mem )',
+    default: 'lmdb'
+  })
+  yargs.option('dbBackendUrl', {
+    type: 'string',
+    description: 'database backend url parameter'
+  })
+  yargs.option('dbRoot', {
+    type: 'string',
+    description: 'database root directory',
+    default: 'tmp.db'
+  })
+  yargs.option('createDb', {
+    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) {
+  yargs.option('apiPort', {
+    describe: 'api server port',
+    type: 'number',
+    default: process.env.API_SERVER_PORT || 8002
+  })
+  yargs.option('apiHost', {
+    describe: 'api server bind host',
+    type: 'string',
+    default: process.env.API_SERVER_HOST || '0.0.0.0'
+  })
+  yargs.option('services', {
+    describe: 'services config',
+    type: 'string',
+    default: 'server/services.config.js'
+  })
+  yargs.option('initScript', {
+    description: 'run init script',
+    type: 'string'
+  })
+}
+
+function ssrServerOptions(yargs) {
+  yargs.option('ssrRoot', {
+    describe: 'frontend root directory',
+    type: 'string',
+    default: './front'
+  })
+  yargs.option('ssrPort', {
+    describe: 'port to bind on',
+    type: 'number',
+    default: process.env.SSR_SERVER_PORT || 8001
+  })
+  yargs.option('ssrHost', {
+    describe: 'bind host',
+    type: 'string',
+    default: process.env.SSR_SERVER_HOST || '0.0.0.0'
+  })
+  yargs.option('withApi', {
+    describe: 'start internal api server',
+    type: 'boolean'
+  })
+  yargs.option('serverEntry', {
+    describe: 'front ssr entry file',
+    type: 'string'
+  })
+  yargs.option('templatePath', {
+    describe: 'front ssr entry file',
+    type: 'string'
+  })
+  yargs.option('version', {
+    describe: 'server version',
+    type: 'string'
+  })
+  yargs.option('versionFile', {
+    describe: 'server version file',
+    type: 'string'
+  })
+  yargs.option('plugin', {
+    describe: 'start in plugin mode - without ssr, and with vite mode plugin',
+    type: 'boolean'
+  })
+  yargs.option('mode', {
+    describe: 'vite mode',
+    type: 'string'
+  })
+}
+
+let globalServicesConfig
+
+export default function starter(servicesConfig = null) {
+  globalServicesConfig = servicesConfig
+  yargs(process.argv.slice(2))
+      .command('apiServer', 'start server', (yargs) => {
+        apiServerOptions(yargs)
+        startOptions(yargs)
+      }, async (argv) => {
+        await setupApp({...argv, uidBorders: '[]'})
+        await apiServer(argv)
+      })
+      .command('devApiServer', 'shortcut for apiServer --withServices --updateServices', (yargs) => {
+        apiServerOptions(yargs)
+        startOptions(yargs)
+      }, async (argv) => {
+        argv = {
+          ...argv,
+          withServices: true, updateServices: true
+        }
+        await setupApp({...argv, uidBorders: '[]'})
+        await apiServer(argv)
+      })
+      .command('memApiServer', 'shortcut for devApiServer --withDb --dbBackend mem --createDb', (yargs) => {
+        apiServerOptions(yargs)
+        startOptions(yargs)
+      }, async (argv) => {
+        argv = {
+          ...argv,
+          withApi: true, withServices: true, updateServices: true,
+          withDb: true, dbBackend: 'mem', createDb: true
+        }
+        await setupApp({...argv, uidBorders: '[]'})
+        await apiServer(argv)
+      })
+      .command('ssrServer', 'start ssr server', (yargs) => {
+        ssrServerOptions(yargs)
+        apiServerOptions(yargs)
+        startOptions(yargs)
+      }, async (argv) => {
+        await setupApp({...argv, uidBorders: '[]'})
+        await server({...argv, uidBorders: '[]'}, false)
+      })
+      .command('server', 'start server', (yargs) => {
+        ssrServerOptions(yargs)
+        apiServerOptions(yargs)
+        startOptions(yargs)
+      }, async (argv) => {
+        await setupApp({...argv, uidBorders: '[]'})
+        await server({...argv, uidBorders: '[]'}, false)
+      })
+      .command('ssrDev', 'start ssr server in development mode', (yargs) => {
+        ssrServerOptions(yargs)
+        apiServerOptions(yargs)
+        startOptions(yargs)
+      }, async (argv) => {
+        await setupApp({...argv, uidBorders: '[]'})
+        await server({...argv, uidBorders: '[]'}, true)
+      })
+      .command('dev', 'shortcut for ssrDev --withApi --withServices --updateServices --createDb', (yargs) => {
+        ssrServerOptions(yargs)
+        apiServerOptions(yargs)
+        startOptions(yargs)
+      }, async (argv) => {
+        argv = {
+          ...argv,
+          withApi: true, withServices: true, updateServices: true, createDb: true,
+        }
+        await setupApp({...argv, uidBorders: '[]'})
+        await server({...argv, uidBorders: '[]'}, true)
+      })
+      .command('memDev', 'shortcut for dev --withDb --dbBackend mem --createDb', (yargs) => {
+        ssrServerOptions(yargs)
+        apiServerOptions(yargs)
+        startOptions(yargs)
+      }, async (argv) => {
+        argv = {
+          ...argv,
+          withApi: true, withServices: true, updateServices: true,
+          withDb: true, dbBackend: 'mem', createDb: true
+        }
+        await setupApp({...argv, uidBorders: '[]'})
+        await server({...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 server({...argv, uidBorders: '[]'}, true)
+      })
+      .option('verbose', {
+        alias: 'v',
+        type: 'boolean',
+        description: 'Run with verbose logging'
+      }).argv
+  /// TODO api.gen.js generation command
+}
+
+
+async function apiServer(argv) {
+  if(globalServicesConfig) argv.services = globalServicesConfig
+
+  const { apiPort, apiHost } = argv
+
+  const apiServer = await setupApiServer(argv)
+
+  const expressApp = express()
+
+  await setupApiEndpoints(expressApp, apiServer)
+
+  const httpServer = http.createServer(expressApp)
+
+  setupApiWs(httpServer, apiServer)
+  setupApiSockJs(httpServer, apiServer)
+
+  httpServer.listen(apiPort, apiHost)
+  console.log('Listening on port ' + apiPort)
+}
+
+async function server(argv, dev) {
+
+  if(globalServicesConfig) argv.services = globalServicesConfig
+
+  const { ssrRoot, ssrPort, ssrHost, apiHost, apiPort } = argv
+
+  const fastAuth = true
+
+  const expressApp = express()
+
+  //expressApp.use('/static', express.static(path.resolve(ssrRoot, 'public')))
+
+  const manifest = (dev || argv.spa)
+      ? null
+      : JSON.parse(fs.readFileSync((path.resolve(ssrRoot, 'dist/client/.vite/ssr-manifest.json'))))
+
+  if(!argv.version) argv.version = process.env.VERSION
+  if(argv.versionFile) argv.version = await readFile(argv.versionFile, 'utf8')
+
+  if(!argv.withApi) {
+    const apiServerHost = (argv.apiHost == '0.0.0.0' ? 'localhost' : argv.apiHost) + ':' + argv.apiPort
+    const target = `http://${apiServerHost}/`
+    const apiProxy = createProxyMiddleware({
+      target,
+      changeOrigin: true,
+      ws: true
+    })
+    expressApp.use('/api', apiProxy)
+    console.log("PROXY /api to", target)
+  }
+
+  let apiServer
+  if(argv.withApi) {
+    apiServer = await setupApiServer({ ...argv, fastAuth })
+    await setupApiEndpoints(expressApp, apiServer)
+  }
+
+  console.log("ENDPOINTS INSTALLED! CREATING WEB SERVER!")
+
+  const ssrServer = new SsrServer(expressApp, manifest, {
+    ...argv,
+    dev,
+    fastAuth,
+    root: ssrRoot || '.',
+    ...(apiServer
+            ? {
+              daoFactory: async (credentials, ip) => {
+                return await createLoopbackDao(credentials, () => apiServer.daoFactory(credentials, ip))
+              }
+            }
+            : {
+              apiHost, apiPort
+            }
+    )
+  })
+  await ssrServer.start()
+
+
+  console.log("SSR INSTALLED! CREATING HTTP SERVER!")
+
+  const httpServer = http.createServer(expressApp)
+  if(argv.withApi) {
+    setupApiWs(httpServer, apiServer)
+    setupApiSockJs(httpServer, apiServer)
+  }
+
+  console.log("HTTP SERVER CREATED! INSTALLING!")
+
+  httpServer.listen(ssrPort, ssrHost)
+
+  console.log("LISTENING ON ",`${ssrHost}:${ssrPort} link: http://${ssrHost}:${ssrPort}/`)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/cli",
-  "version": "0.7.39",
+  "version": "0.8.0",
   "description": "Live Change Framework - command line interface",
   "main": "index.js",
   "scripts": {
@@ -22,22 +22,23 @@
   "bugs": {
     "url": "https://github.com/live-change/live-change-framework/issues"
   },
+  "type": "module",
   "homepage": "https://github.com/live-change/live-change-framework",
   "dependencies": {
-    "@live-change/dao": "0.5.22",
-    "@live-change/dao-sockjs": "0.5.22",
-    "@live-change/dao-websocket": "0.5.22",
-    "@live-change/db-server": "0.6.23",
-    "@live-change/framework": "^0.7.39",
-    "@live-change/server": "^0.7.39",
-    "dotenv": "^16.0.3",
+    "@live-change/dao": "0.6.0",
+    "@live-change/dao-sockjs": "0.6.0",
+    "@live-change/dao-websocket": "0.6.0",
+    "@live-change/db-server": "0.7.2",
+    "@live-change/framework": "^0.8.0",
+    "@live-change/server": "^0.8.0",
+    "dotenv": "^16.4.4",
     "express": "^4.18.2",
     "http-proxy-middleware": "2.0.6",
-    "resolve": "^1.22.1",
-    "serialize-javascript": "^6.0.1",
+    "resolve": "^1.22.8",
+    "serialize-javascript": "^6.0.2",
     "sockjs": "^0.3.24",
     "websocket": "^1.0.34",
-    "yargs": "^17.5.1"
+    "yargs": "^17.7.2"
   },
-  "gitHead": "9e9cd47f2fb1c3c82b20fdddbc5505c99e1e1c68"
+  "gitHead": "59b8c38965b6b737b6123fdcdf12fd0b5bed164f"
 }