@live-change/server 0.7.39 → 0.8.1

package/index.js

@@ -1,20 +1,19 @@
-const Renderer = require('./lib/Renderer.js')
-const Services = require('./lib/Services.js')
-const SsrServer = require('./lib/SsrServer.js')
-const TestServer = require('./lib/TestServer.js')
+import Renderer from './lib/Renderer.js'
+import Services from './lib/Services.js'
+import SsrServer from './lib/SsrServer.js'
+import TestServer from './lib/TestServer.js'
 
-const createLoopbackDao = require('./lib/createLoopbackDao.js')
-const renderTemplate = require('./lib/renderTemplate.js')
-const setupApiServer = require('./lib/setupApiServer.js')
-const setupApiSockJs = require('./lib/setupApiSockJs.js')
-const setupApiWs = require('./lib/setupApiWs.js')
-const setupApiEndpoints = require('./lib/setupApiEndpoints.js')
-const setupDbServer = require('./lib/setupDbServer.js')
-const setupDbClient = require('./lib/setupDbClient.js')
-const setupApp = require('./lib/setupApp.js')
-
-module.exports = {
+import createLoopbackDao from './lib/createLoopbackDao.js'
+import renderTemplate from './lib/renderTemplate.js'
+import setupApiServer from './lib/setupApiServer.js'
+import setupApiSockJs from './lib/setupApiSockJs.js'
+import setupApiWs from './lib/setupApiWs.js'
+import setupApiEndpoints from './lib/setupApiEndpoints.js'
+import setupDbServer from './lib/setupDbServer.js'
+import setupDbClient from './lib/setupDbClient.js'
+import setupApp from './lib/setupApp.js'
 
+export {
   Renderer,
   Services,
   SsrServer,
@@ -29,5 +28,4 @@ module.exports = {
   setupDbServer,
   setupDbClient,
   setupApp
-
-}
+}

package/lib/Renderer.js

@@ -1,9 +1,9 @@
-const fs = require('fs')
-const path = require('path')
-const serialize = require('serialize-javascript')
-const renderTemplate = require('./renderTemplate.js')
-
-const { SitemapStream } = require('sitemap')
+import fs from 'fs'
+import path from 'path'
+import * as vite from 'vite'
+import serialize from 'serialize-javascript'
+import renderTemplate from './renderTemplate.js'
+import { SitemapStream } from 'sitemap'
 
 class Renderer {
   constructor(manifest, settings) {
@@ -16,7 +16,7 @@ class Renderer {
     if(this.settings.dev) {
       await this.setupVite()
     } else {
-      const serverEntryPath = path.resolve(this.root, this.settings.serverEntry ?? './dist/server/entry-server.mjs')
+      const serverEntryPath = path.resolve(this.root, this.settings.serverEntry ?? './dist/server/entry-server.js')
       this.module = await import(serverEntryPath)
       this.renderer = this.module.render
       this.sitemap = this.module.sitemap
@@ -26,7 +26,7 @@ class Renderer {
   }
 
   async setupVite() {
-    this.vite = await require('vite').createServer({
+    this.vite = await vite.createServer({
       root: this.root,
       mode: this.settings.mode,
       logLevel: 'info', //isTest ? 'error' : 'info',
@@ -174,4 +174,4 @@ class Renderer {
 
 }
 
-module.exports = Renderer
+export default Renderer

package/lib/Services.js

@@ -1,17 +1,26 @@
-const { def } = require('@vue/shared')
-const fs = require('fs')
-const path = require('path')
-const resolve = require('util').promisify(require('resolve'))
-const app = require("@live-change/framework").app()
+import fs from 'fs'
+import path from 'path'
+import { promisify } from 'util'
+import resolveCb from 'resolve'
+const resolve = promisify(resolveCb)
+import App from "@live-change/framework"
+const app = App.app()
 
-const debug = require('debug')('framework')
+import Debug from 'debug'
+const debug = Debug('framework')
 
 class Services {
-  constructor(configPath) {
-    if(!configPath) throw new Error("services config parameter is required")
-    this.configPath = path.resolve(configPath)
-    this.config = require(path.resolve(this.configPath))
-    this.servicesDir = path.dirname(this.configPath)
+  constructor(config) {
+    if(!config) throw new Error("services config parameter is required")
+    if(typeof config == 'string') {
+      this.configPath = path.resolve(config)
+      this.servicesDir = path.dirname(this.configPath)
+      this.configPromise = import(path.resolve(this.configPath)).then(x => x.default)
+      this.config = null
+    } else {
+      this.config = config
+      this.configPromise = Promise.resolve(config)
+    }
 
     this.plugins = []
     this.serviceDefinitions = []
@@ -29,32 +38,52 @@ class Services {
     return path
   }
 
-  servicesList() {
+  async servicesList() {
+    this.config = await this.configPromise
     return this.config.services.map(s => s.name)
   }
-  serviceConfig(serviceName) {
+  async serviceConfig(serviceName) {
+    this.config = await this.configPromise
     return this.config.services.find(s => s.name = serviceName)
   }
   async loadServices() {
+
+    this.config = await this.configPromise
     app.config.services = this.config.services
     app.config.plugins = this.config.plugins
+
     if(this.config.plugins) {
       for(const plugin of this.config.plugins) {
-        const entryFile = await this.getServiceEntryFile(plugin)
-        debug("PLUGIN", plugin, 'ENTRY FILE', entryFile)
-        this.plugins.push((await import(entryFile)).default)
+        if(plugin.module) {
+          const module = plugin.module
+          const definition = module
+          this.plugins.push(definition)
+        } else {
+          const entryFile = await this.getServiceEntryFile(plugin)
+          debug("PLUGIN", plugin, 'ENTRY FILE', entryFile)
+          const module = await import(entryFile)
+          this.plugins.push(module.default)
+        }
       }
     }
     if(this.config.services) {
       for(const service of this.config.services) {
-        const entryFile = await this.getServiceEntryFile(service)
-        debug("SERVICE", service, 'ENTRY FILE', entryFile)
-        const definition = (await import(entryFile)).default
-        if(definition.name != service.name) {
-          console.error("SERVICE", service, "NAME", service.name, "MISMATCH", definition.name)
-          process.exit(1)
+        if(service.module) {
+          const module = service.module
+          const definition = module
+          this.serviceDefinitions.push(definition)
+          //console.log("SERVICE DEFINITION", definition, "OF", service)
+        } else {
+          const entryFile = await this.getServiceEntryFile(service)
+          debug("SERVICE", service, 'ENTRY FILE', entryFile)
+          const module = await import(entryFile)
+          const definition = module.default
+          if (definition.name != service.name) {
+            console.error("SERVICE", service, "NAME", service.name, "MISMATCH", definition.name)
+            process.exit(1)
+          }
+          this.serviceDefinitions.push(definition)
         }
-        this.serviceDefinitions.push(definition)
       }
     }
 
@@ -139,16 +168,18 @@ class Services {
     // when starting all services at once remove triggerRoutes for cleanup
     await app.dao.request(['database', 'deleteTable'], app.databaseName, 'triggerRoutes').catch(e => 'ok')
     await Promise.all(this.plugins.map(plugin => plugin(app, this)))
-    this.services = await Promise.all(this.serviceDefinitions.map(defn => {
+    this.servicesPromise = Promise.all(this.serviceDefinitions.map(defn => {
       if(!defn.processed) {
         app.processServiceDefinition(defn)
         defn.processed = true
       }
       return app.startService(defn, startOptions)
     }))
+    this.services = await this.servicesPromise
   }
 
-  getServicesObject() {
+  async getServicesObject() {
+    await this.servicesPromise
     let object = {}
     for(const service of this.services) object[service.name] = service
     return object
@@ -156,4 +187,4 @@ class Services {
 
 }
 
-module.exports = Services
+export default Services

package/lib/SsrServer.js

@@ -1,16 +1,17 @@
-const cookie = require('cookie')
-const path = require('path')
-const serveStatic = require('serve-static')
-const crypto = require('crypto')
-const expressStaticGzip = require("express-static-gzip")
+import cookie from 'cookie'
+import path from 'path'
+import crypto from 'crypto'
+import os from 'os'
+import expressStaticGzip from "express-static-gzip"
 
-const serverDao = require('./serverDao.js')
-const { hashCode, encodeNumber, uidGenerator } = require('@live-change/uid')
-const getIp = require('./getIp.js')
+import serverDao from './serverDao.js'
+import { hashCode, encodeNumber, uidGenerator } from '@live-change/uid'
+import getIp from './getIp.js'
 
-const Renderer = require('./Renderer.js')
+import Renderer from './Renderer.js'
+
+import { fbRedirect } from './fbRedirect.js'
 
-const { fbRedirect } = require('./fbRedirect.js')
 
 class SsrServer {
   constructor(express, manifest, settings) {
@@ -24,7 +25,7 @@ class SsrServer {
     }
 
     this.instanceId = encodeNumber(hashCode(
-      `ssr${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
+      `ssr${process.pid}${os.hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
     this.uidGenerator = uidGenerator(this.instanceId, 1, this.settings.uidBorders)
 
     this.root = this.settings.root || process.cwd()
@@ -165,4 +166,4 @@ class SsrServer {
   }
 }
 
-module.exports = SsrServer
+export default SsrServer

package/lib/TestServer.js

@@ -1,17 +1,18 @@
-const path = require('path')
-const http = require('http')
-const express = require('express')
-
-const app = require('@live-change/framework').app()
-
-const { hashCode, encodeNumber, uidGenerator } = require('@live-change/uid')
-
-const setupApiServer = require('./setupApiServer.js')
-const setupApiSockJs = require('./setupApiSockJs.js')
-const setupApiWs = require('./setupApiWs.js')
-const setupDbServer = require('./setupDbServer.js')
-const createLoopbackDao = require('./createLoopbackDao.js')
-const SsrServer = require('./SsrServer.js')
+import path from 'path'
+import http from 'http'
+import express from 'express'
+
+import App from '@live-change/framework'
+const app = App.app()
+
+import { hashCode, encodeNumber, uidGenerator } from '@live-change/uid'
+import setupApiServer from './setupApiServer.js'
+import setupApiSockJs from './setupApiSockJs.js'
+import setupApiWs from './setupApiWs.js'
+import setupDbServer from './setupDbServer.js'
+import createLoopbackDao from './createLoopbackDao.js'
+import SsrServer from './SsrServer.js'
+import fs from "fs";
 
 class TestServer {
   constructor(config) {
@@ -21,9 +22,9 @@ class TestServer {
   async start() {
     this.expressApp = express()
 
-    this.manifest = this.config.dev ? null : require(
-      path.resolve(this.config.ssrRoot, 'dist/client/ssr-manifest.json')
-    )
+    const manifest = (dev || argv.spa)
+        ? null
+        : JSON.parse(fs.readFileSync((path.resolve(ssrRoot, 'dist/client/.vite/ssr-manifest.json'))))
 
     app.instanceId = encodeNumber(hashCode(
       `app${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
@@ -90,4 +91,4 @@ class TestServer {
   }
 }
 
-module.exports = TestServer
+export default TestServer

package/lib/createLoopbackDao.js

@@ -1,4 +1,4 @@
-const Dao = require("@live-change/dao")
+import Dao from "@live-change/dao"
 
 async function createLoopbackDao(credentials, daoFactory) {
   const server = new Dao.ReactiveServer(daoFactory)
@@ -24,4 +24,4 @@ async function createLoopbackDao(credentials, daoFactory) {
   return dao
 }
 
-module.exports = createLoopbackDao
+export default createLoopbackDao

package/lib/fbRedirect.js

@@ -30,7 +30,7 @@ function fbRedirect(req, res) {
   }
 }
 
-module.exports = {
+export {
   isAppSpecificUserAgent,
   isIOs,
   fbRedirect

package/lib/getIp.js

@@ -9,4 +9,4 @@ function getIp(connection) {
   return ip
 }
 
-module.exports = getIp
+export default getIp

package/lib/renderTemplate.js

@@ -19,4 +19,4 @@ function renderTemplate(source, replacements) {
   return output.join('')
 }
 
-module.exports = renderTemplate
+export default renderTemplate

package/lib/serverDao.js

@@ -1,5 +1,5 @@
-const { Dao } = require("@live-change/dao")
-const DaoWebsocket = require("@live-change/dao-websocket")
+import Dao from "@live-change/dao"
+import { client as DaoWebsocket } from "@live-change/dao-websocket"
 
 function reactiveObservableListConstructor(reactive) {
   class ReactiveObservableList extends Dao.ObservableList {
@@ -53,4 +53,4 @@ function serverDao(credentials, ip, settings) {
   })
 }
 
-module.exports = serverDao
+export default serverDao

package/lib/setupApiEndpoints.js

@@ -1,5 +1,3 @@
-const { app } = require("@live-change/framework")
-
 async function setupApiEndpoints(expressApp, apiServer) {
   for(const serviceDefinition of apiServer.services.serviceDefinitions) {
     const { name, endpoints } = serviceDefinition
@@ -14,4 +12,4 @@ async function setupApiEndpoints(expressApp, apiServer) {
   }
 }
 
-module.exports = setupApiEndpoints
+export default setupApiEndpoints

package/lib/setupApiServer.js

@@ -1,9 +1,8 @@
-const cookie = require("cookie")
-const Dao = require("@live-change/dao")
-const { connection } = require("websocket")
-const Services = require('../lib/Services.js')
-const app = require("@live-change/framework").app()
-const DaoWebsocket = require("@live-change/dao-websocket")
+import Dao from "@live-change/dao"
+import Services from '../lib/Services.js'
+import App from "@live-change/framework"
+const app = App.app()
+import * as DaoWebsocket from "@live-change/dao-websocket"
 
 async function setupApiServer(settings) {
   const { services: config, withServices, updateServices } = settings
@@ -12,6 +11,7 @@ async function setupApiServer(settings) {
     const list = await app.dao.get(['database', 'databasesList'])
     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')
@@ -20,14 +20,19 @@ async function setupApiServer(settings) {
   const services = new Services(config)
 
   await services.loadServices()
+
   if(updateServices) await services.update()
   await services.start(withServices
       ? { runCommands: true, handleEvents: true, indexSearch: true }
       : { runCommands: false, handleEvents: false, indexSearch: false })
 
   if(settings.initScript) {
-    const initScript = await import(await services.resolve(settings.initScript))
-    await (initScript.default || initScript)(services.getServicesObject())
+    if(config.init) {
+      config.init(await services.getServicesObject())
+    } else {
+      const initScript = await import(await services.resolve(settings.initScript))
+      await (initScript.default || initScript)(await services.getServicesObject())
+    }
   }
 
   const apiServerConfig = {
@@ -76,13 +81,7 @@ async function setupApiServer(settings) {
     shareDefinition: true,
     logErrors: true,
     createSessionOnUpdate: true, /// deprecated - moved to session-service settings
-    fastAuth: settings.fastAuth /* && ((connection) => {
-      const cookies = cookie.parse(connection.headers.cookie || '')
-      return {
-        sesionId: cookies.sessionId,
-        sessionKey: cookies.sessionKey
-      }
-    }) */
+    fastAuth: settings.fastAuth
   }
 
   const apiServer = await app.createLiveApiServer(apiServerConfig)
@@ -92,4 +91,4 @@ async function setupApiServer(settings) {
   return apiServer
 }
 
-module.exports = setupApiServer
+export default setupApiServer

package/lib/setupApiSockJs.js

@@ -1,4 +1,4 @@
-const sockjs = require('@live-change/sockjs')
+import sockjs from '@live-change/sockjs'
 
 function setupApiSockJs(httpServer, apiServer) {
   const sockJsServer = sockjs.createServer({
@@ -18,4 +18,4 @@ function setupApiSockJs(httpServer, apiServer) {
   return sockJsServer
 }
 
-module.exports = setupApiSockJs
+export default setupApiSockJs

package/lib/setupApiWs.js

@@ -1,5 +1,5 @@
-const WebSocketServer = require('websocket').server
-const DaoWebsocket = require("@live-change/dao-websocket")
+import { server as WebSocketServer} from 'websocket'
+import * as DaoWebsocket from "@live-change/dao-websocket"
 
 function setupApiWs(httpServer, apiServer) {
   const wsServer = new WebSocketServer({ httpServer, autoAcceptConnections: false })
@@ -12,4 +12,4 @@ function setupApiWs(httpServer, apiServer) {
   return wsServer
 }
 
-module.exports = setupApiWs
+export default setupApiWs

package/lib/setupApp.js

@@ -1,15 +1,20 @@
-const { hashCode, encodeNumber, uidGenerator } = require('@live-change/uid')
+import os from 'os'
 
-const setupDbServer = require('./setupDbServer.js')
-const setupDbClient = require('./setupDbClient.js')
-const createLoopbackDao = require('./createLoopbackDao.js')
+import { hashCode, encodeNumber, uidGenerator }from '@live-change/uid'
 
-const debug = require('debug')('server:app')
+import setupDbServer from './setupDbServer.js'
+import setupDbClient from './setupDbClient.js'
+import createLoopbackDao from './createLoopbackDao.js'
+
+import Debug from 'debug'
+const debug = Debug('server:app')
+
+import App from "@live-change/framework"
 
 async function setupApp(settings, env = process.env) {
-  const app = require("@live-change/framework").app()
+  const app = App.app()
   app.instanceId = encodeNumber(hashCode(
-    `app${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
+    `app${process.pid}${os.hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
   app.uidGenerator = uidGenerator(app.instanceId, 1, settings.uidBorders)
   debug("SETUP APP", settings)
   let dbServer
@@ -23,4 +28,4 @@ async function setupApp(settings, env = process.env) {
   app.databaseName = env.DB_NAME || 'test'
 }
 
-module.exports = setupApp
+export default setupApp

package/lib/setupDbClient.js

@@ -1,6 +1,5 @@
-
-const ReactiveDao = require("@live-change/dao")
-const ReactiveDaoWebsocket = require("@live-change/dao-websocket")
+import ReactiveDao from "@live-change/dao"
+import * as ReactiveDaoWebsocket from "@live-change/dao-websocket"
 
 function setupDbClient(argv, env = process.env) {
   const config = {
@@ -38,4 +37,4 @@ function setupDbClient(argv, env = process.env) {
   return dbDao
 }
 
-module.exports = setupDbClient
+export default setupDbClient

package/lib/setupDbServer.js

@@ -1,5 +1,5 @@
-const path = require('path')
-const DbServer = require('@live-change/db-server')
+import path from 'path'
+import DbServer from '@live-change/db-server'
 
 async function setupDbServer(settings) {
   const { dbRoot, dbBackend, dbBackendUrl, dbSlowStart } = settings
@@ -24,4 +24,4 @@ async function setupDbServer(settings) {
   return server
 }
 
-module.exports = setupDbServer
+export default setupDbServer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.7.39",
+  "version": "0.8.1",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -19,24 +19,25 @@
   "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/db-server": "0.6.23",
-    "@live-change/framework": "^0.7.39",
+    "@live-change/dao": "0.6.0",
+    "@live-change/dao-sockjs": "0.6.0",
+    "@live-change/db-server": "0.7.3",
+    "@live-change/framework": "^0.8.1",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "^0.7.39",
-    "dotenv": "^16.0.3",
+    "@live-change/uid": "^0.8.1",
+    "dotenv": "^16.4.4",
     "express": "^4.18.2",
     "express-static-gzip": "2.1.7",
     "http-proxy-middleware": "2.0.6",
-    "resolve": "^1.22.1",
-    "serialize-javascript": "^6.0.1",
+    "resolve": "^1.22.8",
+    "serialize-javascript": "^6.0.2",
     "sitemap": "^7.1.1",
-    "vite": "^4.4.9",
+    "vite": "^5.1.1",
     "websocket": "^1.0.34",
-    "yargs": "^17.5.1"
+    "yargs": "^17.7.2"
   },
-  "gitHead": "9e9cd47f2fb1c3c82b20fdddbc5505c99e1e1c68"
+  "gitHead": "d26056b63edb7fecb98c6b9ee14eba859360f900"
 }