@live-change/server 0.1.9 → 0.1.13

package/lib/Renderer.js

@@ -121,6 +121,13 @@ class Renderer {
     this.vite && this.vite.ssrFixStacktrace(e)
   }
 
+  async close() {
+    if(this.vite) {
+      console.log("VITE CLOSE!!!")
+      await this.vite.close()
+    }
+  }
+
 }
 
 module.exports = Renderer

package/lib/Services.js

@@ -34,17 +34,26 @@ class Services {
     return this.config.services.find(s => s.name = serviceName)
   }
   async loadServices() {
-    if(this.config.plugins)
-    for(const plugin of this.config.plugins) {
-      const entryFile = await this.getServiceEntryFile(plugin)
-      console.log("PLUGIN", plugin, 'ENTRY FILE', entryFile)
-      this.plugins.push(require(entryFile))
+    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)
+        console.log("PLUGIN", plugin, 'ENTRY FILE', entryFile)
+        this.plugins.push(require(entryFile))
+      }
     }
-    if(this.config.services)
-    for(const service of this.config.services) {
-      const entryFile = await this.getServiceEntryFile(service)
-      console.log("SERVICE", service, 'ENTRY FILE', entryFile)
-      this.serviceDefinitions.push(require(entryFile))
+    if(this.config.services) {
+      for(const service of this.config.services) {
+        const entryFile = await this.getServiceEntryFile(service)
+        console.log("SERVICE", service, 'ENTRY FILE', entryFile)
+        const definition = require(entryFile)
+        if(definition.name != service.name) {
+          console.error("SERVICE", service, "NAME", service.name, "MISMATCH", definition.name)
+          process.exit(1)
+        }
+        this.serviceDefinitions.push(definition)
+      }
     }
 
     /// TODO: load dependent services!!!

package/lib/SsrServer.js

@@ -1,10 +1,11 @@
 const cookie = require('cookie')
 const path = require('path')
 const serveStatic = require('serve-static')
+const crypto = require('crypto')
 
-const serverDao = require('@live-change/vue3-ssr/serverDao.js')
-const generateUuid = require('@live-change/vue3-ssr/generateUuid.js')
-const getIp = require('@live-change/vue3-ssr/getIp.js')
+const serverDao = require('./serverDao.js')
+const { hashCode, encodeNumber, uidGenerator } = require('@live-change/uid')
+const getIp = require('./getIp.js')
 
 const Renderer = require('./Renderer.js')
 
@@ -17,6 +18,10 @@ class SsrServer {
     this.express = express
     this.renderer = new Renderer(manifest, settings)
 
+    this.instanceId = encodeNumber(hashCode(
+      `ssr${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
+    this.uidGenerator = uidGenerator(this.instanceId, 1)
+
     this.root = this.settings.root || process.cwd()
   }
 
@@ -36,7 +41,7 @@ class SsrServer {
   async setupSsr() {
     const readCredentials = this.settings.readCredentials || ((req) => {
       const cookies = cookie.parse(req.headers.cookie || '')
-      return { sessionKey: cookies.sessionKey || generateUuid() }
+      return { sessionKey: cookies.sessionKey || crypto.randomBytes(64).toString('base64').slice(0, 48) }
     })
     const writeCredentials = this.settings.writeCredentials || ((res, credentials) => {
       //console.log("WRITE CREDENTIALS", credentials)
@@ -54,7 +59,7 @@ class SsrServer {
       const clientIp = getIp(req)
 
       const credentials = readCredentials(req)
-      const windowId = generateUuid()
+      const windowId = this.uidGenerator()
       try {
         let dao
         if(this.settings.daoFactory) {
@@ -87,6 +92,9 @@ class SsrServer {
     })
   }
 
+  async close() {
+    await this.renderer.close()
+  }
 }
 
 module.exports = SsrServer

package/lib/TestServer.js

@@ -4,6 +4,8 @@ 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')
@@ -23,9 +25,13 @@ class TestServer {
       path.resolve(this.config.ssrRoot, 'dist/client/ssr-manifest.json')
     )
 
+    app.instanceId = encodeNumber(hashCode(
+      `app${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
+    app.uidGenerator = uidGenerator(app.instanceId, 1)
     this.dbServer = await setupDbServer({ dbBackend: 'mem' })
-    app.dao.dispose()
-    app.dao = await createLoopbackDao('local', () => this.dbServer.createDao('local') )
+    const loopbackDao = await createLoopbackDao('local', () => this.dbServer.createDao('local'))
+    app.dao = loopbackDao
+    app.databaseName = 'test'
 
     await app.dao.request(['database', 'createDatabase'], app.databaseName, { }).catch(err => 'exists')
 
@@ -47,11 +53,11 @@ class TestServer {
     await this.ssrServer.start()
 
     this.expressServer = http.createServer(this.expressApp)
-    this.services = this.apiServer.services.getServicesObject()  
+    this.services = this.apiServer.services.getServicesObject()
 
     this.wsServer = await setupApiWs(this.expressServer, this.apiServer)
     this.sockJsServer = await setupApiSockJs(this.expressServer, this.apiServer)
-      
+
     await new Promise((resolve, reject) => {
       this.httpServer = this.expressServer.listen(this.config.port || 0, () => {
         this.port = this.expressServer.address().port,
@@ -64,11 +70,22 @@ class TestServer {
     return await createLoopbackDao(credentials, () => this.apiServer.daoFactory(credentials, ip))
   }
 
-  dispose() {
-    this.httpServer.close()
-    this.dbServer.close()
-    //this.wsServer.close()
-    //this.sockJsServer.close()
+  async dispose() {
+    try {
+      console.log("CLOSE HTTP!")
+      await this.httpServer.close()
+      console.log("CLOSE APP")
+      await app.close()
+      console.log("CLOSE DB!")
+      await this.dbServer.close()
+      console.log("CLOSE SSR!")
+      await this.ssrServer.close()
+      console.log("CLOSED!")
+      //this.wsServer.close()
+      //this.sockJsServer.close()
+    } catch(error) {
+      console.error("CLOSE ERROR", error)
+    }
   }
 }
 

package/lib/getIp.js

@@ -0,0 +1,12 @@
+function getIp(connection) {
+  let ip =
+      connection.headers['x-real-ip'] ||
+      connection.headers['x-forwarded-for'] ||
+      connection.remoteAddress ||
+      (connection.connection && connection.connection.remoteAddress)
+  ip = ip.split(',')[0]
+  ip = ip.split(':').slice(-1)[0] //in case the ip returned in a format: "::ffff:146.xxx.xxx.xxx"
+  return ip
+}
+
+module.exports = getIp

package/lib/serverDao.js

@@ -0,0 +1,56 @@
+const { Dao } = require("@live-change/dao")
+const DaoWebsocket = require("@live-change/dao-websocket")
+
+function reactiveObservableListConstructor(reactive) {
+  class ReactiveObservableList extends Dao.ObservableList {
+    constructor(value, what, dispose) {
+      super(value, what, dispose, (data) => {
+        if(data && typeof data == 'object') {
+          const activated = reactive(data)
+          return activated
+        }
+        return data
+      })
+    }
+  }
+  return ReactiveObservableList
+}
+
+function serverDao(credentials, ip, settings) {
+  const serverHost = settings.remoteUrl || process.env.API_SERVER || "localhost:" + (process.env.API_PORT || 8002)
+  const wsServer = `ws://${serverHost}/api/ws`
+
+  return new Dao(credentials, {
+    remoteUrl: wsServer,
+    protocols: {
+      'ws': DaoWebsocket.client
+    },
+
+    ...settings,
+
+    connectionSettings: {
+      headers: {
+        'X-real-ip': ip,
+        'X-forwarded-for': ip
+      },
+      queueRequestsWhenDisconnected: true,
+      requestSendTimeout: 2300,
+      requestTimeout: 10000,
+      queueActiveRequestsOnDisconnect: false,
+      autoReconnectDelay: 200,
+      logLevel: 1,
+      /*connectionMonitorFactory: (connection) =>
+          new ReactiveDao.ConnectionMonitorPinger(connection, {
+            pingInterval: 50,
+            pongInterval: 200
+          })*/
+      ...(settings && settings.connectionSettings)
+    },
+    defaultRoute: {
+      type: "remote",
+      generator: settings.reactive ? reactiveObservableListConstructor(settings.reactive) : Dao.ObservableList
+    }
+  })
+}
+
+module.exports = serverDao

package/lib/setupApiServer.js

@@ -4,7 +4,7 @@ const app = require("@live-change/framework").app()
 
 
 async function setupApiServer(settings) {
-  const { services: config, withServices, updateServices, enableSessions } = settings
+  const { services: config, withServices, updateServices } = settings
 
   const services = new Services(config)
 
@@ -41,13 +41,11 @@ async function setupApiServer(settings) {
     },
     shareDefinition: true,
     logErrors: true,
-    createSessionOnUpdate: true
+    createSessionOnUpdate: true /// deprecated - moved to session-service settings
   }
 
-  const apiServer = enableSessions
-    ? await app.createSessionApiServer(apiServerConfig)
-    : await app.createApiServer(apiServerConfig)
-      
+  const apiServer = await app.createLiveApiServer(apiServerConfig)
+
   apiServer.services = services
 
   return apiServer

package/lib/setupApp.js

@@ -7,17 +7,14 @@ const createLoopbackDao = require('./createLoopbackDao.js')
 async function setupApp(settings, env = process.env) {
   const app = require("@live-change/framework").app()
   app.instanceId = encodeNumber(hashCode(
-    `${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
+    `app${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
   app.uidGenerator = uidGenerator(app.instanceId, 1)
   console.log("SETUP APP", settings)
   let dbServer
   if(settings.withDb) {
     dbServer = await setupDbServer(settings)
-    //app.dao.dispose()
     const loopbackDao = await createLoopbackDao('local', () => dbServer.createDao('local'))
     app.dao = loopbackDao
-    // loopbackDao.prepareSource(app.dao.definition.database)
-    // loopbackDao.prepareSource(app.dao.definition.store)
   } else {
     app.dao = setupDbClient(settings)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.1.9",
+  "version": "0.1.13",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "@live-change/db-server": "^0.4.80",
     "@live-change/framework": "^0.5.0",
     "@live-change/vue3-ssr": "^0.1.0",
-    "@live-change/uid": "^0.1.2",
+    "@live-change/uid": "^0.1.3",
     "http-proxy-middleware": "2.0.0",
     "dotenv": "^9.0.2",
     "express": "^4.17.1",