wattpm 2.10.0 → 2.12.0

package/lib/commands/external.js

@@ -4,15 +4,31 @@ import { platformaticRuntime } from '@platformatic/runtime'
 import { ensureLoggableError } from '@platformatic/utils'
 import { bold } from 'colorette'
 import { execa } from 'execa'
-import { existsSync } from 'node:fs'
-import { readdir, readFile, writeFile } from 'node:fs/promises'
-import { basename, isAbsolute, join, relative, resolve, sep, dirname } from 'node:path'
+import { existsSync, } from 'node:fs'
+import { readdir, readFile, stat, writeFile } from 'node:fs/promises'
+import { basename, dirname, isAbsolute, join, relative, resolve, sep } from 'node:path'
 import { defaultServiceJson } from '../defaults.js'
 import { version } from '../schema.js'
-import { checkEmptyDirectory, findConfigurationFile, overrideFatal, parseArgs } from '../utils.js'
+import { findConfigurationFile, overrideFatal, parseArgs } from '../utils.js'
 
 const originCandidates = ['origin', 'upstream']
 
+export async function checkEmptyDirectory (logger, path, relativePath) {
+  if (existsSync(path)) {
+    const statObject = await stat(path)
+
+    if (!statObject.isDirectory()) {
+      logger.fatal(`Path ${bold(relativePath)} exists but it is not a directory.`)
+    }
+
+    const entries = await readdir(path)
+
+    if (entries.filter(e => !e.startsWith('.')).length) {
+      logger.fatal(`Directory ${bold(relativePath)} is not empty.`)
+    }
+  }
+}
+
 async function parseConfiguration (logger, configurationFile) {
   const store = new Store({
     cwd: process.cwd(),

package/lib/commands/init.js

@@ -1,12 +1,13 @@
 import { ConfigManager } from '@platformatic/config'
 import { ensureLoggableError } from '@platformatic/utils'
 import { bold } from 'colorette'
-import { mkdir, writeFile } from 'node:fs/promises'
+import { existsSync, } from 'node:fs'
+import { mkdir, stat, writeFile } from 'node:fs/promises'
 import { basename, resolve } from 'node:path'
 import { defaultConfiguration, defaultPackageJson } from '../defaults.js'
 import { gitignore } from '../gitignore.js'
 import { schema, version } from '../schema.js'
-import { checkEmptyDirectory, parseArgs, verbose } from '../utils.js'
+import { parseArgs, verbose } from '../utils.js'
 
 export async function initCommand (logger, args) {
   const {
@@ -29,12 +30,34 @@ export async function initCommand (logger, args) {
   const web = resolve(root, 'web')
   const configurationFile = resolve(root, 'watt.json')
 
-  // Check that the target directory is empty, otherwise cloning will likely fail
-  await checkEmptyDirectory(logger, root, root)
+  // Check that the none of the files to be created already exist
+  if (existsSync(root)) {
+    const statObject = await stat(root)
+
+    if (!statObject.isDirectory()) {
+      logger.fatal(`Path ${bold(root)} exists but it is not a directory.`)
+    }
+
+    const webFolder = resolve(root, 'web')
+
+    if (existsSync(webFolder)) {
+      const statObject = await stat(webFolder)
+
+      if (!statObject.isDirectory()) {
+        logger.fatal(`Path ${bold(webFolder)} exists but it is not a directory.`)
+      }
+    }
+
+    for (const file of ['watt.json', 'package.json', '.gitignore']) {
+      if (existsSync(resolve(root, file))) {
+        logger.fatal(`Path ${bold(resolve(root, file))} already exists.`)
+      }
+    }
+  }
 
   // Create the web folder, will implicitly create the root
   try {
-    await mkdir(web, { recursive: true, maxRetries: 10, retryDelay: 1000 })
+    await mkdir(web, { recursive: true, })
     /* c8 ignore next 6 */
   } catch (error) {
     logger.fatal(

package/lib/utils.js

@@ -1,9 +1,7 @@
 import { ConfigManager, loadConfig as pltConfigLoadConfig, Store } from '@platformatic/config'
 import { platformaticRuntime, buildRuntime as pltBuildRuntime } from '@platformatic/runtime'
 import { bgGreen, black, bold } from 'colorette'
-import { existsSync } from 'node:fs'
-import { readdir, stat } from 'node:fs/promises'
-import { resolve, dirname } from 'node:path'
+import { dirname, resolve } from 'node:path'
 import { parseArgs as nodeParseArgs } from 'node:util'
 import pino from 'pino'
 import pinoPretty from 'pino-pretty'
@@ -114,22 +112,6 @@ export async function findConfigurationFile (logger, root) {
   return resolved
 }
 
-export async function checkEmptyDirectory (logger, path, relativePath) {
-  if (existsSync(path)) {
-    const statObject = await stat(path)
-
-    if (!statObject.isDirectory()) {
-      logger.fatal(`Path ${bold(relativePath)} exists but it is not a directory.`)
-    }
-
-    const entries = await readdir(path)
-
-    if (entries.length) {
-      logger.fatal(`Directory ${bold(relativePath)} is not empty.`)
-    }
-  }
-}
-
 export async function buildRuntime (logger, configurationFile) {
   const store = new Store()
   store.add(platformaticRuntime)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattpm",
-  "version": "2.10.0",
+  "version": "2.12.0",
   "description": "The Node.js Application Server",
   "main": "index.js",
   "type": "module",
@@ -31,14 +31,14 @@
     "help-me": "^5.0.0",
     "minimist": "^1.2.8",
     "pino": "^9.4.0",
-    "pino-pretty": "^12.0.0",
+    "pino-pretty": "^13.0.0",
     "split2": "^4.2.0",
     "table": "^6.8.2",
-    "@platformatic/basic": "2.10.0",
-    "@platformatic/config": "2.10.0",
-    "@platformatic/control": "2.10.0",
-    "@platformatic/runtime": "2.10.0",
-    "@platformatic/utils": "2.10.0"
+    "@platformatic/basic": "2.12.0",
+    "@platformatic/config": "2.12.0",
+    "@platformatic/control": "2.12.0",
+    "@platformatic/runtime": "2.12.0",
+    "@platformatic/utils": "2.12.0"
   },
   "devDependencies": {
     "borp": "^0.18.0",
@@ -48,7 +48,7 @@
     "neostandard": "^0.11.1",
     "typescript": "^5.5.4",
     "undici": "^6.19.8",
-    "@platformatic/node": "2.10.0"
+    "@platformatic/node": "2.12.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=300000",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/wattpm/2.10.0.json",
+  "$id": "https://schemas.platformatic.dev/wattpm/2.12.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -654,6 +654,11 @@
       },
       "additionalProperties": false
     },
+    "startTimeout": {
+      "default": 30000,
+      "type": "number",
+      "minimum": 0
+    },
     "restartOnError": {
       "default": true,
       "anyOf": [
@@ -1051,6 +1056,18 @@
           "type": "boolean"
         }
       }
+    },
+    "serviceTimeout": {
+      "anyOf": [
+        {
+          "type": "number",
+          "minimum": 1
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "default": 300000
     }
   },
   "anyOf": [