@platformatic/node 2.0.0-alpha.7 → 2.0.0-alpha.9

package/config.d.ts

@@ -62,6 +62,9 @@ export interface PlatformaticNodeJsStackable {
           };
           [k: string]: unknown;
         };
+    loggerInstance?: {
+      [k: string]: unknown;
+    };
     serializerOpts?: {
       schema?: {
         [k: string]: unknown;
@@ -150,11 +153,18 @@ export interface PlatformaticNodeJsStackable {
       }
     | boolean
     | string;
-  deploy?: {
+  application?: {
+    basePath?: string;
+    outputDirectory?: string;
     include?: string[];
-    buildCommand?: string;
-    installCommand?: string;
-    startCommand?: string;
-    [k: string]: unknown;
+    commands?: {
+      install?: string;
+      build?: string;
+      development?: string;
+      production?: string;
+    };
+  };
+  node?: {
+    entrypoint?: string;
   };
 }

package/index.js

@@ -1,6 +1,8 @@
 import {
   BaseStackable,
+  cleanBasePath,
   createServerListener,
+  ensureTrailingSlash,
   getServerUrl,
   importFile,
   injectViaRequest,
@@ -13,6 +15,7 @@ import { existsSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import { Server } from 'node:http'
 import { resolve as pathResolve, resolve } from 'node:path'
+import { pathToFileURL } from 'url'
 import { packageJson, schema } from './lib/schema.js'
 
 const validFields = [
@@ -37,18 +40,14 @@ function isFastify (app) {
 }
 
 export class NodeStackable extends BaseStackable {
-  #entrypoint
-  #hadEntrypointField
   #module
   #app
   #server
   #dispatcher
   #isFastify
 
-  constructor (options, root, configManager, entrypoint, hadEntrypointField) {
+  constructor (options, root, configManager) {
     super('nodejs', packageJson.version, options, root, configManager)
-    this.#entrypoint = entrypoint
-    this.#hadEntrypointField = hadEntrypointField
   }
 
   async start ({ listen }) {
@@ -63,17 +62,36 @@ export class NodeStackable extends BaseStackable {
       return this.url
     }
 
-    // Require the application
-    if (!this.#hadEntrypointField) {
-      this.logger.warn(
-        `The service ${this.id} had no valid entrypoint defined in the package.json file. Falling back to the file ${this.#entrypoint}.`
-      )
+    const config = this.configManager.current
+    const command = config.application.commands[this.isProduction ? 'production' : 'development']
+
+    if (command) {
+      return this.startWithCommand(command)
     }
 
+    // Resolve the entrypoint
+    // The priority is platformatic.application.json, then package.json and finally autodetect.
+    // Only when autodetecting we eventually search in the dist folder when in production mode
+    const finalEntrypoint = await this._findEntrypoint()
+
+    // Require the application
+    const basePath = config.application?.basePath
+      ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
+      : undefined
+
+    this.registerGlobals({
+      // Always use URL to avoid serialization problem in Windows
+      id: this.id,
+      root: pathToFileURL(this.root).toString(),
+      basePath,
+      logLevel: this.logger.level
+    })
+
     // The server promise must be created before requiring the entrypoint even if it's not going to be used
     // at all. Otherwise there is chance we miss the listen event.
-    const serverPromise = createServerListener()
-    this.#module = await importFile(pathResolve(this.root, this.#entrypoint))
+    const serverOptions = this.serverConfig
+    const serverPromise = createServerListener((this.isEntrypoint ? serverOptions?.port : undefined) ?? true)
+    this.#module = await importFile(finalEntrypoint)
     this.#module = this.#module.default || this.#module
 
     // Deal with application
@@ -100,37 +118,60 @@ export class NodeStackable extends BaseStackable {
   }
 
   async stop () {
+    if (this.subprocess) {
+      return this.stopCommand()
+    }
+
     if (this.#isFastify) {
       return this.#app.close()
     }
 
-    if (this.#server) {
-      /* c8 ignore next 3 */
-      if (!this.#server.listening) {
-        return
-      }
+    /* c8 ignore next 3 */
+    if (!this.#server?.listening) {
+      return
+    }
 
-      return new Promise((resolve, reject) => {
-        this.#server.close(error => {
-          /* c8 ignore next 3 */
-          if (error) {
-            return reject(error)
-          }
+    return new Promise((resolve, reject) => {
+      this.#server.close(error => {
+        /* c8 ignore next 3 */
+        if (error) {
+          return reject(error)
+        }
 
-          resolve(error)
-        })
+        resolve()
       })
+    })
+  }
+
+  async build () {
+    const command = this.configManager.current.application.commands.build
+
+    if (command) {
+      return this.buildWithCommand(command, null)
     }
+
+    // If no command was specified, we try to see if there is a build script defined in package.json.
+    const hasBuildScript = await this.#hasBuildScript()
+
+    if (!hasBuildScript) {
+      this.logger.warn(
+        'No "application.commands.build" configuration value specified and no build script found in package.json. Skipping build ...'
+      )
+      return
+    }
+
+    return this.buildWithCommand('npm run build', null)
   }
 
   async inject (injectParams, onInject) {
     let res
-    if (this.#isFastify) {
+
+    if (this.url) {
+      res = await injectViaRequest(this.url, injectParams, onInject)
+    } else if (this.#isFastify) {
       res = await this.#app.inject(injectParams, onInject)
-    } else if (this.#dispatcher) {
-      res = await inject(this.#dispatcher, injectParams, onInject)
     } else {
-      res = await injectViaRequest(this.url, injectParams, onInject)
+      res = await inject(this.#dispatcher ?? this.#app, injectParams, onInject)
     }
 
     /* c8 ignore next 3 */
@@ -145,9 +186,22 @@ export class NodeStackable extends BaseStackable {
   }
 
   getMeta () {
-    return {
-      deploy: this.configManager.current.deploy
+    const config = this.configManager.current
+    let composer = { prefix: this.servicePrefix, wantsAbsoluteUrls: true, needsRootRedirect: true }
+
+    if (this.url) {
+      composer = {
+        tcp: true,
+        url: this.url,
+        prefix: config.application?.basePath
+          ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
+          : this.servicePrefix,
+        wantsAbsoluteUrls: true,
+        needsRootRedirect: true
+      }
     }
+
+    return { composer }
   }
 
   async _listen () {
@@ -175,6 +229,58 @@ export class NodeStackable extends BaseStackable {
   _getApplication () {
     return this.#app
   }
+
+  async _findEntrypoint () {
+    const config = this.configManager.current
+    const outputRoot = resolve(this.root, config.application.outputDirectory)
+
+    if (config.node.entrypoint) {
+      return pathResolve(this.root, config.node.entrypoint)
+    }
+
+    const { entrypoint, hadEntrypointField } = await getEntrypointInformation(this.root)
+
+    if (!entrypoint) {
+      this.logger.error(
+        `The service ${this.id} had no valid entrypoint defined in the package.json file and no valid entrypoint file was found.`
+      )
+
+      process.exit(1)
+    }
+
+    if (!hadEntrypointField) {
+      this.logger.warn(
+        `The service ${this.id} had no valid entrypoint defined in the package.json file. Falling back to the file "${entrypoint}".`
+      )
+    }
+
+    let root = this.root
+
+    if (this.isProduction) {
+      const hasCommand = this.configManager.current.application.commands.build
+      const hasBuildScript = await this.#hasBuildScript()
+
+      if (hasCommand || hasBuildScript) {
+        this.verifyOutputDirectory(outputRoot)
+        root = outputRoot
+      }
+    }
+
+    return pathResolve(root, entrypoint)
+  }
+
+  async #hasBuildScript () {
+    // If no command was specified, we try to see if there is a build script defined in package.json.
+    let hasBuildScript
+    try {
+      const packageJson = JSON.parse(await readFile(resolve(this.root, 'package.json'), 'utf-8'))
+      hasBuildScript = typeof packageJson.scripts.build === 'string' && packageJson.scripts.build
+    } catch (e) {
+      // No-op
+    }
+
+    return hasBuildScript
+  }
 }
 
 async function getEntrypointInformation (root) {
@@ -227,14 +333,14 @@ async function getEntrypointInformation (root) {
 export async function buildStackable (opts) {
   const root = opts.context.directory
 
-  const { entrypoint, hadEntrypointField } = await getEntrypointInformation(root)
-
   const configManager = new ConfigManager({ schema, source: opts.config ?? {}, schemaOptions, transformConfig })
   await configManager.parseAndValidate()
 
-  return new NodeStackable(opts, root, configManager, entrypoint, hadEntrypointField)
+  return new NodeStackable(opts, root, configManager)
 }
 
+export { schema, schemaComponents } from './lib/schema.js'
+
 export default {
   configType: 'nodejs',
   configManagerConfig: {

package/lib/schema.js

@@ -1,9 +1,22 @@
-import { schemaComponents } from '@platformatic/basic'
-import { schemas as utilsSchema } from '@platformatic/utils'
+import { schemaComponents as basicSchemaComponents } from '@platformatic/basic'
+import { schemaComponents as utilsSchemaComponents } from '@platformatic/utils'
 import { readFileSync } from 'node:fs'
 
 export const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf-8'))
 
+const node = {
+  type: 'object',
+  properties: {
+    entrypoint: {
+      type: 'string'
+    }
+  },
+  default: {},
+  additionalProperties: false
+}
+
+export const schemaComponents = { node }
+
 export const schema = {
   $id: `https://schemas.platformatic.dev/@platformatic/vite/${packageJson.version}.json`,
   $schema: 'http://json-schema.org/draft-07/schema#',
@@ -11,13 +24,14 @@ export const schema = {
   type: 'object',
   properties: {
     $schema: {
-      type: 'string',
+      type: 'string'
     },
-    server: utilsSchema.server,
-    watch: schemaComponents.watch,
-    deploy: schemaComponents.deploy
+    server: utilsSchemaComponents.server,
+    watch: basicSchemaComponents.watch,
+    application: basicSchemaComponents.application,
+    node
   },
-  additionalProperties: false,
+  additionalProperties: false
 }
 
 /* c8 ignore next 3 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/node",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.9",
   "description": "Platformatic Node.js Stackable",
   "main": "index.js",
   "type": "module",
@@ -15,25 +15,26 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "dependencies": {
-    "light-my-request": "^5.13.0",
-    "@platformatic/basic": "2.0.0-alpha.7",
-    "@platformatic/utils": "2.0.0-alpha.7",
-    "@platformatic/config": "2.0.0-alpha.7"
+    "light-my-request": "^6.0.0",
+    "@platformatic/basic": "2.0.0-alpha.9",
+    "@platformatic/utils": "2.0.0-alpha.9",
+    "@platformatic/config": "2.0.0-alpha.9"
   },
   "devDependencies": {
     "borp": "^0.17.0",
     "express": "^4.19.2",
     "eslint": "9",
-    "fastify": "^4.28.1",
+    "fastify": "5.0.0-alpha.4",
     "json-schema-to-typescript": "^15.0.1",
     "neostandard": "^0.11.1",
+    "tsx": "^4.19.0",
     "typescript": "^5.5.4",
-    "@platformatic/composer": "2.0.0-alpha.7",
-    "@platformatic/service": "2.0.0-alpha.7"
+    "@platformatic/composer": "2.0.0-alpha.9",
+    "@platformatic/service": "2.0.0-alpha.9"
   },
   "scripts": {
-    "test": "npm run lint && borp --concurrency=1 --timeout=180000",
-    "coverage": "npm run lint && borp -C -X test -X test/fixtures --concurrency=1 --timeout=180000",
+    "test": "npm run lint && borp --concurrency=1 --no-timeout",
+    "coverage": "npm run lint && borp -C -X test -X test/fixtures --concurrency=1 --no-timeout",
     "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",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/vite/2.0.0-alpha.7.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/vite/2.0.0-alpha.9.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Node.js Stackable",
   "type": "object",
@@ -161,6 +161,9 @@
             }
           ]
         },
+        "loggerInstance": {
+          "type": "object"
+        },
         "serializerOpts": {
           "type": "object",
           "properties": {
@@ -492,9 +495,16 @@
         }
       ]
     },
-    "deploy": {
+    "application": {
       "type": "object",
       "properties": {
+        "basePath": {
+          "type": "string"
+        },
+        "outputDirectory": {
+          "type": "string",
+          "default": "dist"
+        },
         "include": {
           "type": "array",
           "items": {
@@ -504,20 +514,39 @@
             "dist"
           ]
         },
-        "buildCommand": {
-          "type": "string",
-          "default": "npm run build"
-        },
-        "installCommand": {
-          "type": "string",
-          "default": "npm ci --omit-dev"
-        },
-        "startCommand": {
-          "type": "string",
-          "default": "npm run start"
+        "commands": {
+          "type": "object",
+          "properties": {
+            "install": {
+              "type": "string",
+              "default": "npm ci --omit-dev"
+            },
+            "build": {
+              "type": "string"
+            },
+            "development": {
+              "type": "string"
+            },
+            "production": {
+              "type": "string"
+            }
+          },
+          "default": {},
+          "additionalProperties": false
         }
       },
+      "additionalProperties": false,
       "default": {}
+    },
+    "node": {
+      "type": "object",
+      "properties": {
+        "entrypoint": {
+          "type": "string"
+        }
+      },
+      "default": {},
+      "additionalProperties": false
     }
   },
   "additionalProperties": false

package/test/express.test.js

@@ -1,54 +0,0 @@
-import { ifError } from 'node:assert'
-import { resolve } from 'node:path'
-import { test } from 'node:test'
-import { createRuntime, setFixturesDir, verifyJSONViaHTTP, verifyJSONViaInject } from '../../basic/test/helper.js'
-
-const packageRoot = resolve(import.meta.dirname, '..')
-setFixturesDir(resolve(import.meta.dirname, './fixtures'))
-
-test('can detect and start an express application with no build function defined', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'express/no-build/platformatic.as-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/direct', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/direct', 200, { ok: true })
-})
-
-test('can detect and start an express application with no build function and when not the entrypoint', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'express/no-build/platformatic.no-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/mesh', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/mesh', 200, { ok: true })
-})
-
-test('can detect and start an express application with build function defined', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'express/with-build/platformatic.as-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/direct', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/direct', 200, { ok: true })
-})
-
-test('can detect and start an express applicationwith build function defined and when not the entrypoint', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'express/no-build/platformatic.no-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/mesh', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/mesh', 200, { ok: true })
-
-  const details = await runtime.getServiceDetails('internal')
-  ifError(details.url)
-})

package/test/fastify.test.js

@@ -1,54 +0,0 @@
-import { ifError } from 'node:assert'
-import { resolve } from 'node:path'
-import { test } from 'node:test'
-import { createRuntime, setFixturesDir, verifyJSONViaHTTP, verifyJSONViaInject } from '../../basic/test/helper.js'
-
-const packageRoot = resolve(import.meta.dirname, '..')
-setFixturesDir(resolve(import.meta.dirname, './fixtures'))
-
-test('can detect and start a fastify application with no build function defined', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'fastify/no-build/platformatic.as-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/direct', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/direct', 200, { ok: true })
-})
-
-test('can detect and start a fastify application with no build function and when not the entrypoint', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'fastify/no-build/platformatic.no-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/mesh', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/mesh', 200, { ok: true })
-})
-
-test('can detect and start a fastify application with build function defined', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'fastify/with-build/platformatic.as-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/direct', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/direct', 200, { ok: true })
-})
-
-test('can detect and start a fastify application with build function defined and when not the entrypoint', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'fastify/no-build/platformatic.no-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/mesh', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/mesh', 200, { ok: true })
-
-  const details = await runtime.getServiceDetails('internal')
-  ifError(details.url)
-})

package/test/fixtures/express/no-build/index.js

@@ -1,16 +0,0 @@
-import express from 'express'
-
-const app = express()
-
-app.get('/direct', (req, res) => {
-  res.send({ ok: true })
-})
-
-app.get('/internal', (req, res) => {
-  fetch('http://main.plt.local/direct')
-    .then(response => response.json())
-    .then(res.json.bind(res))
-})
-
-// This would likely fail if our code doesn't work
-app.listen(1)

package/test/fixtures/express/no-build/package.json

@@ -1,7 +0,0 @@
-{
-  "main": "index.js",
-  "type": "module",
-  "dependencies": {
-    "express": "^4.19.2"
-  }
-}

package/test/fixtures/express/no-build/platformatic.application.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/basic/1.52.0.json"
-}

package/test/fixtures/express/no-build/platformatic.as-entrypoint.runtime.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "main",
-      "path": ".",
-      "config": "platformatic.application.json"
-    }
-  ]
-}

package/test/fixtures/express/no-build/platformatic.no-entrypoint.runtime.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    { "id": "main", "path": "../../platformatic-service", "config": "platformatic.service.json" },
-    { "id": "internal", "path": ".", "config": "platformatic.application.json" }
-  ]
-}

package/test/fixtures/express/with-build/index.js

@@ -1,17 +0,0 @@
-import express from 'express'
-
-export function build () {
-  const app = express()
-
-  app.get('/direct', (req, res) => {
-    res.send({ ok: true })
-  })
-
-  app.get('/internal', (req, res) => {
-    fetch('http://main.plt.local/direct')
-      .then(response => response.json())
-      .then(res.json.bind(res))
-  })
-
-  return app
-}

package/test/fixtures/express/with-build/package.json

@@ -1,7 +0,0 @@
-{
-  "main": "index.js",
-  "type": "module",
-  "dependencies": {
-    "express": "^4.19.2"
-  }
-}

package/test/fixtures/express/with-build/platformatic.application.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/basic/1.52.0.json"
-}

package/test/fixtures/express/with-build/platformatic.as-entrypoint.runtime.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "main",
-      "path": ".",
-      "config": "platformatic.application.json"
-    }
-  ]
-}

package/test/fixtures/express/with-build/platformatic.no-entrypoint.runtime.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    { "id": "main", "path": "../../platformatic-service", "config": "platformatic.service.json" },
-    { "id": "internal", "path": ".", "config": "platformatic.application.json" }
-  ]
-}

package/test/fixtures/fastify/no-build/index.js

@@ -1,14 +0,0 @@
-import fastify from 'fastify'
-
-const app = fastify()
-
-app.get('/direct', async () => {
-  return { ok: true }
-})
-
-app.get('/internal', () => {
-  return fetch('http://main.plt.local/direct').then(response => response.json())
-})
-
-// This would likely fail if our code doesn't work
-app.listen({ port: 1 })

package/test/fixtures/fastify/no-build/package.json

@@ -1,7 +0,0 @@
-{
-  "main": "index.js",
-  "type": "module",
-  "dependencies": {
-    "fastify": "^4.28.1"
-  }
-}

package/test/fixtures/fastify/no-build/platformatic.application.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/basic/1.52.0.json"
-}

package/test/fixtures/fastify/no-build/platformatic.as-entrypoint.runtime.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "main",
-      "path": ".",
-      "config": "platformatic.application.json"
-    }
-  ]
-}

package/test/fixtures/fastify/no-build/platformatic.no-entrypoint.runtime.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    { "id": "main", "path": "../../platformatic-service", "config": "platformatic.service.json" },
-    { "id": "internal", "path": ".", "config": "platformatic.application.json" }
-  ]
-}

package/test/fixtures/fastify/with-build/index.js

@@ -1,15 +0,0 @@
-import fastify from 'fastify'
-
-export function build () {
-  const app = fastify()
-
-  app.get('/direct', async () => {
-    return { ok: true }
-  })
-
-  app.get('/internal', () => {
-    return fetch('http://main.plt.local/direct').then(response => response.json())
-  })
-
-  return app
-}

package/test/fixtures/fastify/with-build/package.json

@@ -1,7 +0,0 @@
-{
-  "main": "index.js",
-  "type": "module",
-  "dependencies": {
-    "fastify": "^4.28.1"
-  }
-}

package/test/fixtures/fastify/with-build/platformatic.application.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/basic/1.52.0.json"
-}

package/test/fixtures/fastify/with-build/platformatic.as-entrypoint.runtime.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "main",
-      "path": ".",
-      "config": "platformatic.application.json"
-    }
-  ]
-}

package/test/fixtures/fastify/with-build/platformatic.no-entrypoint.runtime.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    { "id": "main", "path": "../../platformatic-service", "config": "platformatic.service.json" },
-    { "id": "internal", "path": ".", "config": "platformatic.application.json" }
-  ]
-}

package/test/fixtures/nodejs/no-build/index.js

@@ -1,21 +0,0 @@
-import { createServer } from 'node:http'
-
-const server = createServer((req, res) => {
-  if (req.url === '/direct') {
-    res.writeHead(200, { 'content-type': 'application/json', connection: 'close' })
-    res.end(JSON.stringify({ ok: true }))
-  } else if (req.url === '/mesh') {
-    fetch('http://main.plt.local/direct')
-      .then(response => response.json())
-      .then(json => {
-        res.writeHead(200, { 'content-type': 'application/json', connection: 'close' })
-        res.end(JSON.stringify({ ok: true }))
-      })
-  } else {
-    res.writeHead(404, { 'content-type': 'application/json', connection: 'close' })
-    res.end(JSON.stringify({ ok: false }))
-  }
-})
-
-// This would likely fail if our code doesn't work
-server.listen(1)

package/test/fixtures/nodejs/no-build/package.json

@@ -1,7 +0,0 @@
-{
-  "main": "index.js",
-  "type": "module",
-  "dependencies": {
-    "express": "^4.19.2"
-  }
-}

package/test/fixtures/nodejs/no-build/platformatic.application.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/basic/1.52.0.json"
-}

package/test/fixtures/nodejs/no-build/platformatic.as-entrypoint.runtime.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": true,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "warn"
-    }
-  },
-  "services": [
-    {
-      "id": "main",
-      "path": ".",
-      "config": "platformatic.application.json"
-    }
-  ]
-}

package/test/fixtures/nodejs/no-build/platformatic.no-entrypoint.runtime.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": true,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "warn"
-    }
-  },
-  "services": [
-    { "id": "main", "path": "../../platformatic-service", "config": "platformatic.service.json" },
-    { "id": "internal", "path": ".", "config": "platformatic.application.json" }
-  ]
-}

package/test/fixtures/nodejs/no-configuration/index.js

@@ -1,21 +0,0 @@
-import { createServer } from 'node:http'
-
-const server = createServer((req, res) => {
-  if (req.url === '/direct') {
-    res.writeHead(200, { 'content-type': 'application/json', connection: 'close' })
-    res.end(JSON.stringify({ ok: true }))
-  } else if (req.url === '/mesh') {
-    fetch('http://main.plt.local/direct')
-      .then(response => response.json())
-      .then(json => {
-        res.writeHead(200, { 'content-type': 'application/json', connection: 'close' })
-        res.end(JSON.stringify({ ok: true }))
-      })
-  } else {
-    res.writeHead(404, { 'content-type': 'application/json', connection: 'close' })
-    res.end(JSON.stringify({ ok: false }))
-  }
-})
-
-// This would likely fail if our code doesn't work
-server.listen(1)

package/test/fixtures/nodejs/no-configuration/platformatic.as-entrypoint.runtime.json

@@ -1,18 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": true,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "warn"
-    }
-  },
-  "services": [
-    {
-      "id": "main",
-      "path": "."
-    }
-  ]
-}

package/test/fixtures/nodejs/no-configuration/platformatic.no-entrypoint.runtime.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": true,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "warn"
-    }
-  },
-  "services": [
-    { "id": "main", "path": "../../platformatic-service", "config": "platformatic.service.json" },
-    { "id": "internal", "path": "." }
-  ]
-}

package/test/fixtures/nodejs/with-build/index.js

@@ -1,20 +0,0 @@
-import { createServer } from 'node:http'
-
-export function build () {
-  return createServer((req, res) => {
-    if (req.url === '/direct') {
-      res.writeHead(200, { 'content-type': 'application/json', connection: 'close' })
-      res.end(JSON.stringify({ ok: true }))
-    } else if (req.url === '/mesh') {
-      fetch('http://main.plt.local/direct')
-        .then(response => response.json())
-        .then(json => {
-          res.writeHead(200, { 'content-type': 'application/json', connection: 'close' })
-          res.end(JSON.stringify({ ok: true }))
-        })
-    } else {
-      res.writeHead(404, { 'content-type': 'application/json', connection: 'close' })
-      res.end(JSON.stringify({ ok: false }))
-    }
-  })
-}

package/test/fixtures/nodejs/with-build/package.json

@@ -1,7 +0,0 @@
-{
-  "main": "index.js",
-  "type": "module",
-  "dependencies": {
-    "express": "^4.19.2"
-  }
-}

package/test/fixtures/nodejs/with-build/platformatic.application.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/basic/1.52.0.json"
-}

package/test/fixtures/nodejs/with-build/platformatic.as-entrypoint.runtime.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": true,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "warn"
-    }
-  },
-  "services": [
-    {
-      "id": "main",
-      "path": ".",
-      "config": "platformatic.application.json"
-    }
-  ]
-}

package/test/fixtures/nodejs/with-build/platformatic.no-entrypoint.runtime.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": true,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "warn"
-    }
-  },
-  "services": [
-    { "id": "main", "path": "../../platformatic-service", "config": "platformatic.service.json" },
-    { "id": "internal", "path": ".", "config": "platformatic.application.json" }
-  ]
-}

package/test/fixtures/platformatic-service/platformatic.service.json

@@ -1,15 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/service/1.52.0.json",
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "plugins": {
-    "paths": [
-      {
-        "path": "./plugin.js"
-      }
-    ]
-  }
-}

package/test/fixtures/platformatic-service/plugin.js

@@ -1,12 +0,0 @@
-'use strict'
-
-export default async function (app) {
-  app.get('/mesh', async () => {
-    const response = await fetch('http://internal.plt.local/direct')
-    return response.json()
-  })
-
-  app.get('/direct', async () => {
-    return { ok: true }
-  })
-}

package/test/node.test.js

@@ -1,97 +0,0 @@
-import { deepStrictEqual, ifError, ok } from 'node:assert'
-import { resolve } from 'node:path'
-import { test } from 'node:test'
-import {
-  createRuntime,
-  getLogs,
-  setFixturesDir,
-  verifyJSONViaHTTP,
-  verifyJSONViaInject
-} from '../../basic/test/helper.js'
-
-const packageRoot = resolve(import.meta.dirname, '..')
-setFixturesDir(resolve(import.meta.dirname, './fixtures'))
-
-test('can detect and start a Node.js application with no configuration files', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'nodejs/no-configuration/platformatic.as-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/direct', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/direct', 200, { ok: true })
-
-  const missingConfigurationMessage =
-    'The service main had no valid entrypoint defined in the package.json file. Falling back to the file index.js.'
-
-  const logs = await getLogs(runtime)
-  ok(logs.map(m => m.msg).includes(missingConfigurationMessage))
-})
-
-test('can detect and start a Node.js application with no configuration files and when not the entrypoint', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'nodejs/no-configuration/platformatic.no-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/mesh', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/mesh', 200, { ok: true })
-
-  const missingConfigurationMessage =
-    'The service internal had no valid entrypoint defined in the package.json file. Falling back to the file index.js.'
-
-  const logs = await getLogs(runtime)
-  ok(logs.map(m => m.msg).includes(missingConfigurationMessage))
-})
-
-test('can detect and start a Node.js application with no build function defined', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'nodejs/no-build/platformatic.as-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/direct', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/direct', 200, { ok: true })
-
-  const logs = await getLogs(runtime)
-  deepStrictEqual(logs, [])
-})
-
-test('can detect and start a Node.js application with no build function and when not the entrypoint', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'nodejs/no-build/platformatic.no-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/mesh', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/mesh', 200, { ok: true })
-})
-
-test('can detect and start a Node.js application with build function defined', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'nodejs/with-build/platformatic.as-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/direct', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/direct', 200, { ok: true })
-})
-
-test('can detect and start a Node.js application with build function defined and when not the entrypoint', async t => {
-  const { runtime, url } = await createRuntime(
-    t,
-    'nodejs/no-build/platformatic.no-entrypoint.runtime.json',
-    packageRoot
-  )
-
-  await verifyJSONViaHTTP(url, '/mesh', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/mesh', 200, { ok: true })
-
-  const details = await runtime.getServiceDetails('internal')
-  ifError(details.url)
-})