@live-change/server 0.9.124 → 0.9.125

package/lib/RenderContext.js

@@ -72,10 +72,6 @@ class RenderContext {
       name: 'SSR '+(new Date().toISOString()),
       ///microtaskMode: 'afterEvaluate'        
     })
-    
-    // Start context and execute script immediately
-    this.start()
-    this.script.runInContext(this.vmContext)
   }
 
   runScript(script) {
@@ -99,7 +95,8 @@ class RenderContext {
   }
 
   // Start the context - allow nextTick operations
-  start() {
+  async start() {
+    await this.script.runInContext(this.vmContext)
     this.running = true
   }
 

package/lib/Renderer.js

@@ -5,6 +5,7 @@ import serialize from 'serialize-javascript'
 import renderTemplate from './renderTemplate.js'
 import { SitemapStream } from 'sitemap'
 import vm from 'vm'
+import { constants } from 'vm'
 import { createRequire } from 'module'
 import RenderContext from './RenderContext.js'
 
@@ -23,13 +24,16 @@ class Renderer {
     if(this.settings.dev) {
       await this.setupVite()
     } else {
-      const serverEntryPath = path.resolve(this.root, this.settings.serverEntry ?? './dist/server/server.cjs')
-      const serverEntryCode = await fs.promises.readFile(serverEntryPath, { encoding: 'utf-8' })
+      const serverEntryPath = path.resolve(this.root, this.settings.serverEntry ?? './dist/server/entry-server.js')
+      //const serverEntryCode = await fs.promises.readFile(serverEntryPath, { encoding: 'utf-8' })
+      const serverEntryCode = 
+       `import('./entry-server.js').then(m=>Object.entries(m).forEach(([k,v])=>exports[k]=v))`
       this.script = new vm.Script(serverEntryCode, {
-        filename: serverEntryPath,
+        filename: path.dirname(serverEntryPath)+'/entrypoint.generated.js',
         lineOffset: 0,
-        columnOffset: 0                
-      })      
+        columnOffset: 0,
+        importModuleDynamically: constants.USE_MAIN_CONTEXT_DEFAULT_LOADER
+      })
       this.baseContext = {
         require: createRequire(serverEntryPath),
         __dirname: path.dirname(serverEntryPath),
@@ -38,6 +42,7 @@ class Renderer {
       // Create pool of render contexts
       for (let i = 0; i < this.poolSize; i++) {
         const context = new RenderContext(this.settings, this.baseContext, this.script)
+        await context.start()
         this.contextPool.push(context)
       }
       
@@ -113,6 +118,7 @@ class Renderer {
           // Stop the context and create a replacement
           context.stop()
           const newContext = new RenderContext(this.settings, this.baseContext, this.script)
+          await newContext.start()
           this.releaseContext(newContext)
         } else {
           // Normal release back to pool

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.9.124",
+  "version": "0.9.125",
   "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.124",
-    "@live-change/dao-sockjs": "^0.9.124",
-    "@live-change/db-server": "^0.9.124",
-    "@live-change/framework": "^0.9.124",
+    "@live-change/dao": "^0.9.125",
+    "@live-change/dao-sockjs": "^0.9.125",
+    "@live-change/db-server": "^0.9.125",
+    "@live-change/framework": "^0.9.125",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "^0.9.124",
+    "@live-change/uid": "^0.9.125",
     "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": "b61ece032725f08f1225e7ecf48204a3a7eedbd0"
+  "gitHead": "ba8f22a86fea42d874c0d3163369b3364e56f60c"
 }