@live-change/server 0.1.8 → 0.1.12

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

@@ -1,3 +1,4 @@
+const { def } = require('@vue/shared')
 const fs = require('fs')
 const path = require('path')
 const resolve = require('util').promisify(require('resolve'))
@@ -5,7 +6,7 @@ const app = require("@live-change/framework").app()
 
 class Services {
   constructor(configPath) {
-    if(!configPath) throw new Error("services config parameter is required")    
+    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)
@@ -21,7 +22,7 @@ class Services {
     return path
   }
   async getServiceEntryFile(config) {
-    const path = await resolve(config.path, { basedir: this.servicesDir })    
+    const path = await resolve(config.path, { basedir: this.servicesDir })
     console.log("PATH RESOLVE", config.path, "IN", this.servicesDir, "=>", path)
     return path
   }
@@ -104,7 +105,10 @@ class Services {
 
   async update() {
     await Promise.all(this.serviceDefinitions.map(defn => {
-      app.processServiceDefinition(defn, [ ...app.defaultProcessors ])
+      if(!defn.processed) {
+        app.processServiceDefinition(defn, [ ...app.defaultProcessors ])
+        defn.processed = true
+      }
       return app.updateService(defn)
     }))
   }
@@ -112,7 +116,10 @@ class Services {
   async start(startOptions) {
     await Promise.all(this.plugins.map(plugin => plugin(app, this)))
     this.services = await Promise.all(this.serviceDefinitions.map(defn => {
-      app.processServiceDefinition(defn, [ ...app.defaultProcessors ])
+      if(!defn.processed) {
+        app.processServiceDefinition(defn, [ ...app.defaultProcessors ])
+        defn.processed = true
+      }
       return app.startService(defn, startOptions)
     }))
   }

package/lib/SsrServer.js

@@ -1,9 +1,10 @@
 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 { hashCode, encodeNumber, uidGenerator } = require('@live-change/uid')
 const getIp = require('@live-change/vue3-ssr/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,24 +41,25 @@ 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("WRC!!!")
+      //console.log("WRITE CREDENTIALS", credentials)
       const cookieExpireDate =
         this.settings.sessionExpires ? new Date(Date.now() + this.settings.sessionExpires).toUTCString() : null
-      res.set({
-        'Content-Type': 'text/html',
-        'Set-Cookie': `sessionKey=${credentials.sessionKey}; path=/`
-         + cookieExpireDate ? `; expires=${cookieExpireDate}` : ''
-      })
+      if(credentials.sessionKey) {
+        res.set({
+          'Set-Cookie': `sessionKey=${credentials.sessionKey}; Path=/`
+          + (cookieExpireDate ? `; Expires=${cookieExpireDate}` : '')
+        })
+      }
     })
     this.express.use('*', async (req, res) => {
       const url = req.originalUrl
       const clientIp = getIp(req)
 
       const credentials = readCredentials(req)
-      const windowId = generateUuid()
+      const windowId = this.uidGenerator()
       try {
         let dao
         if(this.settings.daoFactory) {
@@ -74,6 +80,9 @@ class SsrServer {
 
         res.status(200)
         writeCredentials(res, credentials)
+        res.set({
+          'Content-Type': 'text/html'
+        })
         res.end(html)
       } catch (e) {
         this.renderer.fixStackTrace(e)
@@ -83,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/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.8",
+  "version": "0.1.12",
   "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",