@live-change/server 0.1.11 → 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/SsrServer.js

@@ -92,6 +92,9 @@ class SsrServer {
     })
   }
 
+  async close() {
+    await this.renderer.close()
+  }
 }
 
 module.exports = SsrServer

package/lib/TestServer.js

@@ -4,10 +4,11 @@ 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 setupApp = require('./setupApp.js')
 const setupDbServer = require('./setupDbServer.js')
 const createLoopbackDao = require('./createLoopbackDao.js')
 const SsrServer = require('./SsrServer.js')
@@ -24,10 +25,13 @@ class TestServer {
       path.resolve(this.config.ssrRoot, 'dist/client/ssr-manifest.json')
     )
 
-    await setupApp({
-      withDb: true,
-      dbBackend: 'mem'
-    })
+    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' })
+    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')
 
@@ -66,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

@@ -13,11 +13,8 @@ async function setupApp(settings, env = process.env) {
   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.11",
+  "version": "0.1.12",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {