@live-change/server 0.9.119 → 0.9.121

package/lib/Renderer.js

@@ -4,6 +4,8 @@ import * as vite from 'vite'
 import serialize from 'serialize-javascript'
 import renderTemplate from './renderTemplate.js'
 import { SitemapStream } from 'sitemap'
+import vm from 'vm'
+import { createRequire } from 'module'
 
 class Renderer {
   constructor(manifest, settings) {
@@ -16,10 +18,17 @@ class Renderer {
     if(this.settings.dev) {
       await this.setupVite()
     } else {
-      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
+      const serverEntryPath = path.resolve(this.root, this.settings.serverEntry ?? './dist/server/server.cjs')
+      const serverEntryCode = await fs.promises.readFile(serverEntryPath, { encoding: 'utf-8' })
+      this.script = new vm.Script(serverEntryCode, {
+        filename: serverEntryPath,
+        lineOffset: 0,
+        columnOffset: 0                
+      })      
+      this.baseContext = {
+        require: createRequire(serverEntryPath),
+        __dirname: path.dirname(serverEntryPath),
+      }
       const templatePath = path.resolve(this.root, this.settings.templatePath ?? './dist/client/index.html')
       this.template = await fs.promises.readFile(templatePath, { encoding: 'utf-8' })
     }
@@ -44,7 +53,7 @@ class Renderer {
   }
 
   async renderPage(params) {
-    const { url, headers, dao, clientIp, credentials, windowId, version, now, domain } = params
+    const { url, headers, dao, clientIp, credentials, windowId, version, now, domain } = params    
 
     const render = await this.getRenderFunction()
     const { html: appHtml, modules, data, meta, response } = await render(params)
@@ -53,13 +62,6 @@ class Renderer {
 
     const preloadLinks = this.renderPreloadLinks(modules)
 
-    for(const [path, value] of data) {
-      if(path !== '{"paths":[{"what":["accessControl","objectOwnedAccessInvitations",{"object":"[Wf1KCKj1w.0@BCriY]","objectType":"speedDating_Event"}],"more":[{"schema":[["userIdentification","identification",{"object":{"sessionOrUserType":{"property":"contactOrUserType"},"sessionOrUser":{"property":"contactOrUser"}}}]],"to":"identification"}]}]}')
-        continue
-      console.log("SERIALIZE DATA", path, value[0])
-      console.log("SERIALIZED", serialize(value[0], { isJSON: true }))
-    }
-
     const appDataScript = `  <script>` +
         `    window.__DAO_CACHE__= ${serialize(data, { isJSON: true })}\n`+
         (this.settings.fastAuth ? ''
@@ -125,13 +127,36 @@ class Renderer {
     return template
   }
 
+  async createRenderContext() {
+    const contextObject = {
+      //...globalThis,
+      ...this.baseContext,
+      exports: {},
+      //process: process,
+      process: {
+        env: {
+          NODE_ENV: 'production'
+        },
+        stdout: process.stdout,
+        stderr: process.stderr,       
+      } 
+    }
+    const requestContext = vm.createContext(contextObject, {
+      name: 'SSR Render '+(new Date().toISOString()),
+      ///microtaskMode: 'afterEvaluate'        
+    })
+    this.script.runInContext(requestContext) 
+    return contextObject    
+  }
+
   async getRenderFunction() {
     if(this.settings.dev) {
       /// Reload every request
       const entryPath = path.resolve(this.root, this.settings.serverEntry || 'src/entry-server.js')
       return (await this.vite.ssrLoadModule(entryPath)).render
     } else {
-      return this.renderer
+      const context = await this.createRenderContext()
+      return context.exports.render
     }
   }
 
@@ -141,7 +166,8 @@ class Renderer {
       const entryPath = path.resolve(this.root, this.settings.serverEntry || 'src/entry-server.js')
       return (await this.vite.ssrLoadModule(entryPath)).sitemap
     } else {
-      return this.sitemap
+      const context = await this.createRenderContext()
+      return context.exports.sitemap
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.9.119",
+  "version": "0.9.121",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -22,12 +22,12 @@
   "type": "module",
   "homepage": "https://github.com/live-change/live-change-stack",
   "dependencies": {
-    "@live-change/dao": "^0.9.119",
-    "@live-change/dao-sockjs": "^0.9.119",
-    "@live-change/db-server": "^0.9.119",
-    "@live-change/framework": "^0.9.119",
+    "@live-change/dao": "^0.9.121",
+    "@live-change/dao-sockjs": "^0.9.121",
+    "@live-change/db-server": "^0.9.121",
+    "@live-change/framework": "^0.9.121",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "^0.9.119",
+    "@live-change/uid": "^0.9.121",
     "dotenv": "^17.2.1",
     "express": "^4.18.2",
     "express-static-gzip": "2.1.7",
@@ -39,5 +39,5 @@
     "websocket": "^1.0.34",
     "yargs": "^17.7.2"
   },
-  "gitHead": "b93111cbcd227526a64a46e14dda74adf03064fe"
+  "gitHead": "4052c94c9fcd898af1ed1ef7d497e2fc807b5cb0"
 }