wattpm 2.7.1-alpha.2 → 2.8.0-alpha.2

package/lib/commands/execution.js

@@ -75,7 +75,7 @@ export async function restartCommand (logger, args) {
     await client.restartRuntime(runtime.pid)
     await client.close()
 
-    logger.done(`Runtime ${bold(runtime.packageName)} have been restarted.`)
+    logger.done(`Runtime ${bold(runtime.packageName)} has been restarted.`)
   } catch (error) {
     if (error.code === 'PLT_CTR_RUNTIME_NOT_FOUND') {
       logger.fatal('Cannot find a matching runtime.')

package/lib/commands/management.js

@@ -96,17 +96,21 @@ export async function servicesCommand (logger, args) {
   try {
     const client = new RuntimeApiClient()
     const runtime = await client.getMatchingRuntime(getMatchingRuntimeArgs(logger, positionals))
-    const services = await client.getRuntimeServices(runtime.pid)
+    const { production, services } = await client.getRuntimeServices(runtime.pid)
     await client.close()
 
-    const rows = services.services.map(runtime => {
-      const { id, type, entrypoint } = runtime
+    const headers = production
+      ? [bold('Name'), bold('Workers'), bold('Type'), bold('Entrypoint')]
+      : [bold('Name'), bold('Type'), bold('Entrypoint')]
+
+    const rows = services.map(runtime => {
+      const { id, workers, type, entrypoint } = runtime
 
       /* c8 ignore next */
-      return [id, type, entrypoint ? 'Yes' : 'No']
+      return [id, workers, type, entrypoint ? 'Yes' : 'No'].filter(t => t)
     })
 
-    console.log('\n' + table([[bold('Name'), bold('Type'), bold('Entrypoint')], ...rows], tableConfig))
+    console.log('\n' + table([headers, ...rows], tableConfig))
   } catch (error) {
     if (error.code === 'PLT_CTR_RUNTIME_NOT_FOUND') {
       logger.fatal('Cannot find a matching runtime.')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattpm",
-  "version": "2.7.1-alpha.2",
+  "version": "2.8.0-alpha.2",
   "description": "The Node.js Application Server",
   "main": "index.js",
   "type": "module",
@@ -34,11 +34,11 @@
     "pino-pretty": "^11.2.2",
     "split2": "^4.2.0",
     "table": "^6.8.2",
-    "@platformatic/basic": "2.7.1-alpha.2",
-    "@platformatic/config": "2.7.1-alpha.2",
-    "@platformatic/runtime": "2.7.1-alpha.2",
-    "@platformatic/control": "2.7.1-alpha.2",
-    "@platformatic/utils": "2.7.1-alpha.2"
+    "@platformatic/basic": "2.8.0-alpha.2",
+    "@platformatic/config": "2.8.0-alpha.2",
+    "@platformatic/runtime": "2.8.0-alpha.2",
+    "@platformatic/utils": "2.8.0-alpha.2",
+    "@platformatic/control": "2.8.0-alpha.2"
   },
   "devDependencies": {
     "borp": "^0.18.0",
@@ -50,8 +50,8 @@
     "undici": "^6.19.8"
   },
   "scripts": {
-    "test": "npm run lint && borp --concurrency=1 --timeout=180000",
-    "coverage": "npm run lint && borp -X test -C --concurrency=1 --timeout=180000",
+    "test": "npm run lint && borp --concurrency=1 --timeout=300000",
+    "coverage": "npm run lint && borp -X test -C --concurrency=1 --timeout=300000",
     "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/wattpm/2.7.1-alpha.2.json",
+  "$id": "https://schemas.platformatic.dev/wattpm/2.8.0-alpha.2.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -91,10 +91,33 @@
           },
           "useHttp": {
             "type": "boolean"
+          },
+          "workers": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 1
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         }
       }
     },
+    "workers": {
+      "anyOf": [
+        {
+          "type": "number",
+          "minimum": 1
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "default": 1
+    },
     "web": {
       "type": "array",
       "items": {
@@ -129,6 +152,17 @@
           },
           "useHttp": {
             "type": "boolean"
+          },
+          "workers": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 1
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         }
       }
@@ -340,6 +374,41 @@
         }
       ]
     },
+    "gracefulShutdown": {
+      "type": "object",
+      "properties": {
+        "runtime": {
+          "anyOf": [
+            {
+              "type": "number",
+              "minimum": 1
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "default": 10000
+        },
+        "service": {
+          "anyOf": [
+            {
+              "type": "number",
+              "minimum": 1
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "default": 10000
+        }
+      },
+      "default": {},
+      "required": [
+        "runtime",
+        "service"
+      ],
+      "additionalProperties": false
+    },
     "undici": {
       "type": "object",
       "properties": {
@@ -382,35 +451,6 @@
         }
       }
     },
-    "httpCache": {
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "store": {
-              "type": "string"
-            },
-            "methods": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              },
-              "default": [
-                "GET",
-                "HEAD"
-              ],
-              "minItems": 1
-            },
-            "cacheTagsHeader": {
-              "type": "string"
-            }
-          }
-        }
-      ]
-    },
     "watch": {
       "anyOf": [
         {