@platformatic/runtime 1.52.2 → 1.53.0

package/lib/api-client.js

@@ -8,6 +8,7 @@ const { createReadStream, watch } = require('node:fs')
 const { readdir, readFile, stat, access } = require('node:fs/promises')
 const { setTimeout: sleep } = require('node:timers/promises')
 const errors = require('./errors')
+const { Unpromise } = require('@watchable/unpromise')
 const ts = require('tail-file-stream')
 
 const platformaticVersion = require('../package.json').version
@@ -99,7 +100,7 @@ class RuntimeApiClient extends EventEmitter {
     await this.#sendCommand('plt:stop-services')
 
     this.worker.postMessage({ command: 'plt:close' })
-    const res = await Promise.race([
+    const res = await Unpromise.race([
       this.#exitPromise,
       // We must kill the worker if it doesn't exit in 10 seconds
       // because it may be stuck in an infinite loop.
@@ -286,10 +287,11 @@ class RuntimeApiClient extends EventEmitter {
 
     let latestFileId = parseInt(runtimeLogFiles.at(-1).slice('logs.'.length))
 
-    let waiting = false
     let fileStream = null
     let fileId = startLogId ?? latestFileId
 
+    let isClosed = false
+
     const runtimeLogsDir = this.#getRuntimeLogsDir(runtimePID)
 
     const watcher = watch(runtimeLogsDir, async (event, filename) => {
@@ -297,9 +299,7 @@ class RuntimeApiClient extends EventEmitter {
         const logFileId = parseInt(filename.slice('logs.'.length))
         if (logFileId > latestFileId) {
           latestFileId = logFileId
-          if (waiting) {
-            streamLogFile(++fileId)
-          }
+          fileStream.unwatch()
         }
       }
     }).unref()
@@ -324,25 +324,25 @@ class RuntimeApiClient extends EventEmitter {
       }
 
       fileStream.on('error', (err) => {
+        isClosed = true
         logger.error(err, 'Error streaming log file')
         fileStream.destroy()
         watcher.close()
         writableStream.end()
       })
 
-      fileStream.on('data', () => {
-        waiting = false
+      fileStream.on('close', () => {
+        if (latestFileId > fileId && !isClosed) {
+          streamLogFile(++fileId)
+        }
       })
 
       fileStream.on('eof', () => {
         if (fileId >= endLogId) {
           writableStream.end()
-          return
         }
         if (latestFileId > fileId) {
-          streamLogFile(++fileId)
-        } else {
-          waiting = true
+          fileStream.unwatch()
         }
       })
 
@@ -352,10 +352,12 @@ class RuntimeApiClient extends EventEmitter {
     streamLogFile(fileId)
 
     writableStream.on('close', () => {
+      isClosed = true
       watcher.close()
       fileStream.destroy()
     })
     writableStream.on('error', () => {
+      isClosed = true
       watcher.close()
       fileStream.destroy()
     })
@@ -446,7 +448,7 @@ class RuntimeApiClient extends EventEmitter {
   async #sendCommand (command, params = {}) {
     const operationId = randomUUID()
     this.worker.postMessage({ operationId, command, params })
-    const [message] = await Promise.race(
+    const [message] = await Unpromise.race(
       [once(this, operationId), this.#exitPromise]
     )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.52.2",
+  "version": "1.53.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -21,56 +21,57 @@
     "@fastify/formbody": "^7.4.0",
     "@matteo.collina/tspl": "^0.1.1",
     "borp": "^0.16.0",
-    "c8": "^10.0.0",
+    "c8": "^10.1.2",
     "execa": "^8.0.1",
-    "express": "^4.18.3",
-    "fast-jwt": "^4.0.0",
+    "express": "^4.20.0",
+    "fast-jwt": "^4.0.5",
     "get-port": "^7.1.0",
-    "pino-abstract-transport": "^1.1.0",
+    "pino-abstract-transport": "^1.2.0",
     "snazzy": "^9.0.0",
     "split2": "^4.2.0",
     "standard": "^17.1.0",
-    "tsd": "^0.31.0",
-    "typescript": "^5.4.2",
+    "tsd": "^0.31.2",
+    "typescript": "^5.6.2",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/sql-graphql": "1.52.2",
-    "@platformatic/sql-mapper": "1.52.2"
+    "@platformatic/sql-graphql": "1.53.0",
+    "@platformatic/sql-mapper": "1.53.0"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
-    "@fastify/websocket": "^10.0.0",
+    "@fastify/websocket": "^10.0.1",
     "@hapi/topo": "^6.0.2",
+    "@watchable/unpromise": "^1.0.2",
     "boring-name-generator": "^1.0.3",
     "change-case-all": "^2.1.0",
     "close-with-grace": "^1.3.0",
     "commist": "^3.2.0",
-    "debounce": "^2.0.0",
+    "debounce": "^2.1.1",
     "desm": "^1.3.1",
     "dotenv-tool": "^0.1.1",
     "es-main": "^1.3.0",
     "fastest-levenshtein": "^1.0.16",
-    "fastify": "^4.26.2",
+    "fastify": "^4.28.1",
     "fastify-undici-dispatcher": "^0.6.0",
-    "graphql": "^16.8.1",
+    "graphql": "^16.9.0",
     "help-me": "^5.0.0",
     "minimist": "^1.2.8",
-    "pino": "^8.19.0",
-    "pino-pretty": "^11.0.0",
-    "pino-roll": "^1.0.0",
+    "pino": "^8.21.0",
+    "pino-pretty": "^11.2.2",
+    "pino-roll": "^1.3.0",
     "semgrator": "^0.3.0",
-    "tail-file-stream": "^0.1.0",
-    "undici": "^6.9.0",
-    "why-is-node-running": "^2.2.2",
-    "ws": "^8.16.0",
-    "@platformatic/composer": "1.52.2",
-    "@platformatic/config": "1.52.2",
-    "@platformatic/db": "1.52.2",
-    "@platformatic/generators": "1.52.2",
-    "@platformatic/service": "1.52.2",
-    "@platformatic/telemetry": "1.52.2",
-    "@platformatic/bus": "1.52.2",
-    "@platformatic/utils": "1.52.2"
+    "tail-file-stream": "^0.2.0",
+    "undici": "^6.19.8",
+    "why-is-node-running": "^2.3.0",
+    "ws": "^8.18.0",
+    "@platformatic/bus": "1.53.0",
+    "@platformatic/composer": "1.53.0",
+    "@platformatic/config": "1.53.0",
+    "@platformatic/db": "1.53.0",
+    "@platformatic/service": "1.53.0",
+    "@platformatic/generators": "1.53.0",
+    "@platformatic/telemetry": "1.53.0",
+    "@platformatic/utils": "1.53.0"
   },
   "standard": {
     "ignore": [