@platformatic/runtime 3.0.0-alpha.5 → 3.0.0-alpha.8

package/lib/worker/round-robin-map.js

@@ -1,9 +1,7 @@
-'use strict'
-
-class RoundRobinMap extends Map {
+export class RoundRobinMap extends Map {
   #instances
 
-  constructor (iterable, instances) {
+  constructor (iterable, instances = {}) {
     super(iterable)
     this.#instances = instances
   }
@@ -12,29 +10,37 @@ class RoundRobinMap extends Map {
     return { ...this.#instances }
   }
 
-  configure (services) {
+  configure (applications) {
     this.#instances = {}
 
-    for (const service of services) {
-      this.#instances[service.id] = { next: service.next ?? 0, count: service.workers }
+    for (const application of applications) {
+      this.#instances[application.id] = { next: application.next ?? 0, count: application.workers }
     }
   }
 
-  getCount (service) {
-    return this.#instances[service].count
+  getCount (application) {
+    if (!this.#instances[application]) {
+      return null
+    }
+
+    return this.#instances[application].count
   }
 
-  setCount (service, count) {
-    this.#instances[service].count = count
+  setCount (application, count) {
+    if (!this.#instances[application]) {
+      throw new Error(`Application ${application} is not configured.`)
+    }
+
+    this.#instances[application].count = count
   }
 
-  next (service) {
-    if (!this.#instances[service]) {
-      return undefined
+  next (application) {
+    if (!this.#instances[application]) {
+      return null
     }
 
     let worker
-    let { next, count } = this.#instances[service]
+    let { next, count } = this.#instances[application]
 
     // Try count times to get the next worker. This is to handle the case where a worker is being restarted.
     for (let i = 0; i < count; i++) {
@@ -43,16 +49,14 @@ class RoundRobinMap extends Map {
         next = 0
       }
 
-      worker = this.get(`${service}:${current}`)
+      worker = this.get(`${application}:${current}`)
 
       if (worker) {
         break
       }
     }
 
-    this.#instances[service].next = next
+    this.#instances[application].next = next
     return worker
   }
 }
-
-module.exports = { RoundRobinMap }

package/lib/worker/shared-context.js

@@ -1,8 +1,6 @@
-'use strict'
+import { kITC } from './symbols.js'
 
-const { kITC } = require('./symbols')
-
-class SharedContext {
+export class SharedContext {
   constructor () {
     this.sharedContext = null
   }
@@ -22,5 +20,3 @@ class SharedContext {
     this.sharedContext = context
   }
 }
-
-module.exports = { SharedContext }

package/lib/worker/symbols.js

@@ -1,33 +1,16 @@
-'use strict'
-
-const kConfig = Symbol.for('plt.runtime.config')
-const kId = Symbol.for('plt.runtime.id') // This is also used to detect if we are running in a Platformatic runtime thread
-const kFullId = Symbol.for('plt.runtime.fullId')
-const kServiceId = Symbol.for('plt.runtime.service.id')
-const kWorkerId = Symbol.for('plt.runtime.worker.id')
-const kITC = Symbol.for('plt.runtime.itc')
-const kHealthCheckTimer = Symbol.for('plt.runtime.worker.healthCheckTimer')
-const kWorkerStatus = Symbol('plt.runtime.worker.status')
-const kInterceptors = Symbol.for('plt.runtime.worker.interceptors')
-const kLastELU = Symbol.for('plt.runtime.worker.lastELU')
+export const kConfig = Symbol.for('plt.runtime.config')
+export const kId = Symbol.for('plt.runtime.id') // This is also used to detect if we are running in a Platformatic runtime thread
+export const kFullId = Symbol.for('plt.runtime.fullId')
+export const kApplicationId = Symbol.for('plt.runtime.application.id')
+export const kWorkerId = Symbol.for('plt.runtime.worker.id')
+export const kITC = Symbol.for('plt.runtime.itc')
+export const kHealthCheckTimer = Symbol.for('plt.runtime.worker.healthCheckTimer')
+export const kWorkerStatus = Symbol('plt.runtime.worker.status')
+export const kInterceptors = Symbol.for('plt.runtime.worker.interceptors')
+export const kLastELU = Symbol.for('plt.runtime.worker.lastELU')
 
 // This string marker should be safe to use since it belongs to Unicode private area
-const kStderrMarker = '\ue002'
+export const kStderrMarker = '\ue002'
 
 // Note that this is used to create a BroadcastChannel so it must be a string
-const kWorkersBroadcast = 'plt.runtime.workers'
-
-module.exports = {
-  kConfig,
-  kId,
-  kFullId,
-  kServiceId,
-  kWorkerId,
-  kITC,
-  kHealthCheckTimer,
-  kLastELU,
-  kWorkerStatus,
-  kStderrMarker,
-  kInterceptors,
-  kWorkersBroadcast
-}
+export const kWorkersBroadcast = 'plt.runtime.workers'

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@platformatic/runtime",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-alpha.8",
   "description": "",
   "main": "index.js",
+  "type": "module",
   "author": "Platformatic Inc. <oss@platformatic.dev> (https://platformatic.dev)",
   "repository": {
     "type": "git",
@@ -18,8 +19,8 @@
     "@fastify/express": "^4.0.0",
     "@fastify/formbody": "^8.0.0",
     "autocannon": "^8.0.0",
-    "borp": "^0.20.0",
     "c8": "^10.0.0",
+    "cleaner-spec-reporter": "^0.5.0",
     "eslint": "9",
     "execa": "^9.0.0",
     "express": "^4.18.3",
@@ -33,18 +34,19 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "3.0.0-alpha.5",
-    "@platformatic/db": "3.0.0-alpha.5",
-    "@platformatic/node": "3.0.0-alpha.5",
-    "@platformatic/service": "3.0.0-alpha.5",
-    "@platformatic/sql-graphql": "3.0.0-alpha.5",
-    "@platformatic/sql-mapper": "3.0.0-alpha.5"
+    "@platformatic/composer": "3.0.0-alpha.8",
+    "@platformatic/gateway": "3.0.0-alpha.8",
+    "@platformatic/db": "3.0.0-alpha.8",
+    "@platformatic/node": "3.0.0-alpha.8",
+    "@platformatic/service": "3.0.0-alpha.8",
+    "@platformatic/sql-graphql": "3.0.0-alpha.8",
+    "@platformatic/sql-mapper": "3.0.0-alpha.8",
+    "@platformatic/wattpm-pprof-capture": "3.0.0-alpha.8"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
     "@fastify/error": "^4.0.0",
     "@fastify/websocket": "^11.0.0",
-    "@hapi/topo": "^6.0.2",
     "@opentelemetry/api": "^1.9.0",
     "@platformatic/undici-cache-memory": "^0.8.1",
     "@watchable/unpromise": "^1.0.2",
@@ -68,27 +70,26 @@
     "undici": "^7.0.0",
     "undici-thread-interceptor": "^0.14.0",
     "ws": "^8.16.0",
-    "@platformatic/foundation": "3.0.0-alpha.5",
-    "@platformatic/generators": "3.0.0-alpha.5",
-    "@platformatic/metrics": "3.0.0-alpha.5",
-    "@platformatic/telemetry": "3.0.0-alpha.5",
-    "@platformatic/itc": "3.0.0-alpha.5",
-    "@platformatic/basic": "3.0.0-alpha.5"
+    "@platformatic/basic": "3.0.0-alpha.8",
+    "@platformatic/generators": "3.0.0-alpha.8",
+    "@platformatic/itc": "3.0.0-alpha.8",
+    "@platformatic/telemetry": "3.0.0-alpha.8",
+    "@platformatic/metrics": "3.0.0-alpha.8",
+    "@platformatic/foundation": "3.0.0-alpha.8"
   },
   "engines": {
     "node": ">=22.18.0"
   },
   "scripts": {
-    "test": "pnpm run lint && borp --concurrency=1 --timeout=1200000",
-    "test:main": "borp --concurrency=1 --timeout=1200000 test/*.test.js test/*.test.mjs test/versions/*.test.js test/versions/*.test.mjs",
-    "test:api": "borp --concurrency=1 --timeout=1200000 test/api/*.test.js test/api/*.test.mjs test/management-api/*.test.js test/management-api/*.test.mjs",
-    "test:cli": "borp --concurrency=1 --timeout=1200000 test/cli/*.test.js test/cli/*.test.mjs test/cli/**/*.test.js test/cli/**/*.test.mjs",
-    "test:start": "borp --concurrency=1 --reporter=tap --timeout=1200000 test/start/*.test.js test/start/*.test.mjs",
-    "test:multiple-workers": "borp --concurrency=1 --timeout=1200000 test/multiple-workers/*.test.js test/multiple-workers/*.test.mjs",
-    "coverage": "pnpm run lint && borp -X fixtures -X test -C --concurrency=1 --timeout=1200000 ",
+    "test": "npm run test:main && npm run test:api && npm run test:cli && npm run test:start && npm run test:multiple-workers",
+    "test:main": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/*.test.js test/versions/*.test.js",
+    "test:api": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/api/*.test.js test/management-api/*.test.js",
+    "test:cli": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/cli/*.test.js test/cli/**/*.test.js",
+    "test:start": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/start/*.test.js",
+    "test:multiple-workers": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/multiple-workers/*.test.js",
     "gen-schema": "node lib/schema.js > schema.json",
     "gen-types": "json2ts > config.d.ts < schema.json",
-    "build": "pnpm run gen-schema && pnpm run gen-types",
+    "build": "npm run gen-schema && npm run gen-types",
     "lint": "eslint"
   }
 }

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/3.0.0-alpha.5.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/3.0.0-alpha.8.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Runtime Config",
   "type": "object",
@@ -186,6 +186,12 @@
                   }
                 ]
               },
+              "dependencies": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
               "arguments": {
                 "type": "array",
                 "items": {
@@ -200,7 +206,7 @@
         }
       }
     },
-    "services": {
+    "applications": {
       "type": "array",
       "items": {
         "type": "object",
@@ -347,6 +353,13 @@
             },
             "additionalProperties": false
           },
+          "dependencies": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "default": []
+          },
           "arguments": {
             "type": "array",
             "items": {
@@ -429,17 +442,241 @@
         }
       }
     },
-    "workers": {
-      "anyOf": [
-        {
-          "type": "number",
-          "minimum": 1
-        },
-        {
-          "type": "string"
+    "services": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "anyOf": [
+          {
+            "required": [
+              "id",
+              "path"
+            ]
+          },
+          {
+            "required": [
+              "id",
+              "url"
+            ]
+          }
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "path": {
+            "type": "string",
+            "allowEmptyPaths": true,
+            "resolvePath": true
+          },
+          "config": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "gitBranch": {
+            "type": "string",
+            "default": "main"
+          },
+          "useHttp": {
+            "type": "boolean"
+          },
+          "workers": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 1
+              },
+              {
+                "type": "string"
+              }
+            ]
+          },
+          "health": {
+            "type": "object",
+            "default": {},
+            "properties": {
+              "enabled": {
+                "anyOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "interval": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "minimum": 0
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "gracePeriod": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "minimum": 0
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "maxUnhealthyChecks": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "minimum": 1
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "maxELU": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "minimum": 0,
+                    "maximum": 1
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "maxHeapUsed": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "minimum": 0,
+                    "maximum": 1
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "maxHeapTotal": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "minimum": 0
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "maxYoungGeneration": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "minimum": 0
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          },
+          "dependencies": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "default": []
+          },
+          "arguments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "env": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "envfile": {
+            "type": "string"
+          },
+          "sourceMaps": {
+            "type": "boolean",
+            "default": false
+          },
+          "packageManager": {
+            "type": "string",
+            "enum": [
+              "npm",
+              "pnpm",
+              "yarn"
+            ]
+          },
+          "preload": {
+            "anyOf": [
+              {
+                "type": "string",
+                "resolvePath": true
+              },
+              {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "resolvePath": true
+                }
+              }
+            ]
+          },
+          "nodeOptions": {
+            "type": "string"
+          },
+          "telemetry": {
+            "type": "object",
+            "properties": {
+              "instrumentations": {
+                "type": "array",
+                "description": "An array of instrumentations loaded if telemetry is enabled",
+                "items": {
+                  "oneOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "package": {
+                          "type": "string"
+                        },
+                        "exportName": {
+                          "type": "string"
+                        },
+                        "options": {
+                          "type": "object",
+                          "additionalProperties": true
+                        }
+                      },
+                      "required": [
+                        "package"
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
+          }
         }
-      ],
-      "default": 1
+      }
     },
     "web": {
       "type": "array",
@@ -588,6 +825,13 @@
             },
             "additionalProperties": false
           },
+          "dependencies": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "default": []
+          },
           "arguments": {
             "type": "array",
             "items": {
@@ -670,6 +914,18 @@
         }
       }
     },
+    "workers": {
+      "anyOf": [
+        {
+          "type": "number",
+          "minimum": 1
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "default": 1
+    },
     "logger": {
       "type": "object",
       "properties": {
@@ -976,7 +1232,7 @@
           ],
           "default": 10000
         },
-        "service": {
+        "application": {
           "anyOf": [
             {
               "type": "number",
@@ -992,7 +1248,7 @@
       "default": {},
       "required": [
         "runtime",
-        "service"
+        "application"
       ],
       "additionalProperties": false
     },
@@ -1423,13 +1679,13 @@
             }
           ]
         },
-        "serviceName": {
+        "applicationName": {
           "type": "string",
-          "description": "The name of the service. Defaults to the folder name if not specified."
+          "description": "The name of the application. Defaults to the folder name if not specified."
         },
         "version": {
           "type": "string",
-          "description": "The version of the service (optional)"
+          "description": "The version of the application (optional)"
         },
         "skip": {
           "type": "array",
@@ -1536,7 +1792,7 @@
         }
       },
       "required": [
-        "serviceName"
+        "applicationName"
       ],
       "additionalProperties": false
     },
@@ -1557,7 +1813,7 @@
         }
       }
     },
-    "serviceTimeout": {
+    "applicationTimeout": {
       "anyOf": [
         {
           "type": "number",
@@ -1581,7 +1837,7 @@
       ],
       "default": 30000
     },
-    "resolvedServicesBasePath": {
+    "resolvedApplicationsBasePath": {
       "type": "string",
       "default": "external"
     },
@@ -1668,6 +1924,11 @@
         "autoload"
       ]
     },
+    {
+      "required": [
+        "applications"
+      ]
+    },
     {
       "required": [
         "services"