@platformatic/runtime 0.39.0 → 0.40.0

package/lib/app.js

@@ -57,6 +57,10 @@ class PlatformaticApp {
 
     this.#restarting = true
 
+    // The CJS cache should not be cleared from the loader because v20 moved
+    // the loader to a different thread with a different CJS cache.
+    clearCjsCache()
+
     /* c8 ignore next 4 - tests may not pass in a MessagePort. */
     if (this.#loaderPort) {
       this.#loaderPort.postMessage('plt:clear-cache')
@@ -257,4 +261,19 @@ class PlatformaticApp {
   }
 }
 
+/* c8 ignore next 11 - c8 upgrade marked many existing things as uncovered */
+function clearCjsCache () {
+  // This evicts all of the modules from the require() cache.
+  // Note: This does not clean up children references to the deleted module.
+  // It's likely not a big deal for most cases, but it is a leak. The child
+  // references can be cleaned up, but it is expensive and involves walking
+  // the entire require() cache. See the DEP0144 documentation for how to do
+  // it.
+  Object.keys(require.cache).forEach((key) => {
+    if (!key.match(/node_modules/)) {
+      delete require.cache[key]
+    }
+  })
+}
+
 module.exports = { PlatformaticApp }

package/lib/loader.mjs

@@ -1,7 +1,6 @@
 import { createRequire, isBuiltin } from 'node:module'
 import { dirname, isAbsolute, resolve as pathResolve } from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
-const require = createRequire(import.meta.url)
 const isWindows = process.platform === 'win32'
 let timestamp = process.hrtime.bigint()
 let port
@@ -11,21 +10,6 @@ function bustEsmCache () {
   timestamp = process.hrtime.bigint()
 }
 
-/* c8 ignore next 11 - c8 upgrade marked many existing things as uncovered */
-function clearCjsCache () {
-  // This evicts all of the modules from the require() cache.
-  // Note: This does not clean up children references to the deleted module.
-  // It's likely not a big deal for most cases, but it is a leak. The child
-  // references can be cleaned up, but it is expensive and involves walking
-  // the entire require() cache. See the DEP0144 documentation for how to do
-  // it.
-  Object.keys(require.cache).forEach((key) => {
-    if (!key.match(/node_modules/)) {
-      delete require.cache[key]
-    }
-  })
-}
-
 function isRelativePath (p) {
   // This function is extracted from Node core, so it should work.
   /* c8 ignore next - c8 upgrade marked many existing things as uncovered */
@@ -103,9 +87,16 @@ export function globalPreload (context) {
   port.on('message', () => {
     /* c8 ignore next 3 - c8 upgrade marked many existing things as uncovered */
     bustEsmCache()
-    clearCjsCache()
     port.postMessage('plt:cache-cleared')
   })
 
   return 'globalThis.LOADER_PORT = port;'
 }
+
+export async function initialize (data) {
+  port = data.port
+  port.on('message', () => {
+    bustEsmCache()
+    port.postMessage('plt:cache-cleared')
+  })
+}

package/lib/start.js

@@ -38,6 +38,10 @@ async function startWithConfig (configManager, env = process.env) {
     parseInspectorOptions(configManager)
   }
 
+  if (config.hotReload) {
+    config.loaderFile = kLoaderFile
+  }
+
   const worker = new Worker(kWorkerFile, {
     /* c8 ignore next */
     execArgv: config.hotReload ? kWorkerExecArgv : [],

package/lib/worker.js

@@ -1,16 +1,32 @@
 'use strict'
 
 const inspector = require('node:inspector')
+const { register } = require('node:module')
 const { isatty } = require('node:tty')
-const { parentPort, workerData } = require('node:worker_threads')
+const {
+  MessageChannel,
+  parentPort,
+  workerData
+} = require('node:worker_threads')
 const undici = require('undici')
 const pino = require('pino')
 const RuntimeApi = require('./api')
 const { MessagePortWritable } = require('./message-port-writable')
-const loaderPort = globalThis.LOADER_PORT // Added by loader.mjs.
+let loaderPort
+
+if (typeof register === 'function' && workerData.config.loaderFile) {
+  const { port1, port2 } = new MessageChannel()
+  register(workerData.config.loaderFile, {
+    data: { port: port2 },
+    transferList: [port2]
+  })
+  loaderPort = port1
+} else if (globalThis.LOADER_PORT) {
+  loaderPort = globalThis.LOADER_PORT
+  delete globalThis.LOADER_PORT
+}
 
 globalThis.fetch = undici.fetch
-delete globalThis.LOADER_PORT
 
 let transport
 let destination

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "0.39.0",
+  "version": "0.40.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -24,8 +24,8 @@
     "standard": "^17.1.0",
     "tsd": "^0.28.1",
     "typescript": "^5.1.6",
-    "@platformatic/sql-graphql": "0.39.0",
-    "@platformatic/sql-mapper": "0.39.0"
+    "@platformatic/sql-graphql": "0.40.0",
+    "@platformatic/sql-mapper": "0.40.0"
   },
   "dependencies": {
     "@hapi/topo": "^6.0.2",
@@ -42,12 +42,12 @@
     "pino": "^8.14.1",
     "pino-pretty": "^10.0.0",
     "undici": "^5.22.1",
-    "@platformatic/composer": "0.39.0",
-    "@platformatic/config": "0.39.0",
-    "@platformatic/db": "0.39.0",
-    "@platformatic/service": "0.39.0",
-    "@platformatic/telemetry": "0.39.0",
-    "@platformatic/utils": "0.39.0"
+    "@platformatic/config": "0.40.0",
+    "@platformatic/composer": "0.40.0",
+    "@platformatic/db": "0.40.0",
+    "@platformatic/service": "0.40.0",
+    "@platformatic/telemetry": "0.40.0",
+    "@platformatic/utils": "0.40.0"
   },
   "standard": {
     "ignore": [

package/test/cli/watch.test.mjs

@@ -132,7 +132,7 @@ test('should not hot reload files with `--hot-reload false', async (t) => {
   assert.strictEqual(version, 'v1')
 })
 
-test('watches CommonJS files with hotreload', { timeout: 30000, skip: process.env.CI }, async (t) => {
+test('watches CommonJS files with hotreload', { timeout: 30000 }, async (t) => {
   const tmpDir = await mkdtemp(join(base, 'watch-'))
   t.after(() => saferm(tmpDir))
   t.diagnostic(`using ${tmpDir}`)
@@ -171,7 +171,7 @@ test('watches CommonJS files with hotreload', { timeout: 30000, skip: process.en
   assert.ok(restartedThirdTime)
 })
 
-test('watches CommonJS files with hotreload on a single service', { timeout: 30000, skip: process.env.CI }, async (t) => {
+test('watches CommonJS files with hotreload on a single service', { timeout: 30000 }, async (t) => {
   const tmpDir = await mkdtemp(join(base, 'watch-'))
   t.after(() => saferm(tmpDir))
   t.diagnostic(`using ${tmpDir}`)
@@ -207,7 +207,7 @@ test('watches CommonJS files with hotreload on a single service', { timeout: 300
   assert.ok(restartedThirdTime)
 })
 
-test('do not hot reload dependencies', { timeout: 30000, skip: process.env.CI }, async (t) => {
+test('do not hot reload dependencies', { timeout: 30000 }, async (t) => {
   process.env.PORT = 0
   const config = join(fixturesDir, 'do-not-reload-dependencies', 'platformatic.service.json')
   const { child, url } = await start('-c', config)
@@ -247,7 +247,7 @@ test('do not hot reload dependencies', { timeout: 30000, skip: process.env.CI },
   assert.strictEqual((await res4.body.json()).hello, plugin2)
 })
 
-test('watches CommonJS files with hotreload on a single service', { timeout: 30000, skip: process.env.CI }, async (t) => {
+test('watches CommonJS files with hotreload on a single service', { timeout: 30000 }, async (t) => {
   const tmpDir = await mkdtemp(join(base, 'watch-'))
   t.after(() => saferm(tmpDir))
   t.diagnostic(`using ${tmpDir}`)