Merge pull request #138 from platformatic/custom-socket

feat: Support custom sockets.

Author: ShogunPanda

cli.d.ts

@@ -1,3 +1,4 @@
 import type { Runtime } from '@platformatic/control'
 
+export declare function cli (): Promise<Runtime>
 export default function main (): Promise<Runtime | null>

cli.js

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
 
-'use strict'
-
-import esmain from 'es-main'
-import { RuntimeApiClient } from '@platformatic/control'
 import { select } from '@inquirer/prompts'
+import { RuntimeApiClient } from '@platformatic/control'
+import { parseArgs } from 'node:util'
 import { start } from './lib/start.js'
 
 async function getLocationDetails (client, runtime) {
@@ -40,11 +38,22 @@ async function getLocationDetails (client, runtime) {
   }
 }
 
-let client
+function getSocket () {
+  const {
+    values: { socket }
+  } = parseArgs({
+    options: {
+      socket: { type: 'string', short: 'S' }
+    }
+  })
+
+  return socket
+}
+
 export default async function main () {
   try {
     // Get available runtimes
-    client = new RuntimeApiClient()
+    const client = new RuntimeApiClient({ socket: getSocket() })
 
     const runtimes = await client.getRuntimes()
 
@@ -114,8 +123,7 @@ export default async function main () {
       console.log(`PID: ${selectedRuntime.pid}`)
       console.log(`Working directory: ${locationDetails.cwd}`)
 
-      if (locationDetails.configPath !== 'Unknown' &&
-          locationDetails.configPath !== 'Unknown (config not available)') {
+      if (locationDetails.configPath !== 'Unknown' && locationDetails.configPath !== 'Unknown (config not available)') {
         console.log(`Configuration path: ${locationDetails.configPath}`)
       }
 
@@ -136,17 +144,25 @@ export default async function main () {
   }
 }
 
-// Execute the main function if this script is run directly
-if (esmain(import.meta)) {
-  main().then((selectedRuntime) => {
-    if (!selectedRuntime) {
-      return
+export async function cli () {
+  try {
+    const runtime = await main()
+
+    console.log(runtime)
+    if (runtime) {
+      const client = new RuntimeApiClient({ socket: getSocket() })
+
+      console.log('Starting Watt admin...')
+      console.log('--------')
+      return await start(client, runtime.pid)
     }
-    console.log('Starting Watt admin...')
-    console.log('--------')
-    return start(client, selectedRuntime.pid)
-  }).catch(error => {
+  } catch (error) {
     console.error('Fatal error:', error)
     process.exit(1)
-  })
+  }
+}
+
+// Execute the main function if this script is run directly
+if (import.meta.main) {
+  await cli()
 }

lib/start.js

@@ -50,7 +50,7 @@ export async function start (client, selectedRuntime) {
 
   // We move to the project root to start the server
   // so amaro will load correctly
-  const cwd = process.cwd() 
+  const cwd = process.cwd()
   const root = join(import.meta.dirname, '..')
   process.chdir(root)
   const server = await create('watt.json', undefined, {
@@ -97,4 +97,6 @@ export async function start (client, selectedRuntime) {
       console.log(`Failure triggering the start command: ${await body.text()}`)
     }
   }
+
+  return server
 }