fix: restore pure headless operation

Author: starpit

packages/core/src/main/headless-pretty-print.ts

@@ -19,7 +19,7 @@ const debug = Debug('main/headless-pretty-print')
 debug('loading')
 
 import { Writable } from 'stream'
-import * as colors from 'colors/safe'
+import colors from 'colors/safe'
 
 import ElementMimic from '../util/element-mimic'
 import { isTable, Row } from '../webapp/models/table'

packages/core/src/main/main.ts

@@ -36,7 +36,7 @@ function getPrefsFromEnv(env: typeof process.env, defaultPrefs: ISubwindowPrefs)
  */
 export const main = async (argv: string[], env = process.env, execOptions?: ExecOptions) => {
   const N = argv.length
-  const isRunningHeadless = argv[N - 3] === 'bash' && argv[N - 2] === 'websocket'
+  const isRunningHeadless = !!process.env.KUI_HEADLESS || (argv[N - 3] === 'bash' && argv[N - 2] === 'websocket')
 
   if (!isRunningHeadless) {
     // then spawn the electron graphics

packages/core/src/repl/exec.ts

@@ -23,6 +23,7 @@
 
 import Debug from 'debug'
 const debug = Debug('core/repl')
+const debugCommandErrors = Debug('core/repl/errors')
 
 import { v4 as uuid } from 'uuid'
 import encodeComponent from './encode'
@@ -456,6 +457,7 @@ class InProcessExecutor implements Executor {
             return response
           })
         } catch (err) {
+          debugCommandErrors(err)
           evaluator.error(command, tab, execType, err)
           if (execType === ExecType.Nested) {
             throw err

plugins/plugin-bash-like/fs/src/lib/ls.ts

@@ -34,6 +34,17 @@ import { localFilepath } from './usage-helpers'
 const dateFormatter = speedDate('MMM DD HH:mm')
 const strings = i18n('plugin-bash-like')
 
+/** Heading names */
+const Key = {
+  UID: 'UID',
+  GID: 'GID',
+  Size: 'Size',
+  User: 'User',
+  Group: 'Group',
+  Permissions: 'Permissions',
+  LastModified: 'Last Modified'
+}
+
 /**
  * Mimic ls -lh
  *
@@ -161,17 +172,23 @@ function attrs(
   // const language = withLanguage(args.execOptions).language
 
   const wide = args.parsedOptions.l
-  const perms = wide && hasPermissions ? [{ value: formatPermissions(entry), outerCSS: outerCSSSecondary }] : []
-  const uid = wide && hasUid ? [{ value: formatUid(entry), outerCSS: outerCSSSecondary, css: cssSecondary }] : []
-  const gid = wide && hasGid ? [{ value: formatGid(entry), outerCSS: outerCSSSecondary, css: cssSecondary }] : []
+  const perms =
+    wide && hasPermissions
+      ? [{ key: Key.Permissions, value: formatPermissions(entry), outerCSS: outerCSSSecondary }]
+      : []
+  const uid =
+    wide && hasUid ? [{ key: Key.UID, value: formatUid(entry), outerCSS: outerCSSSecondary, css: cssSecondary }] : []
+  const gid =
+    wide && hasGid ? [{ key: Key.GID, value: formatGid(entry), outerCSS: outerCSSSecondary, css: cssSecondary }] : []
   const size =
     wide && hasSize
-      ? [{ value: prettyBytes(entry.stats.size).replace(/\s/g, ''), outerCSS: '', css: 'yellow-text' }]
+      ? [{ key: Key.Size, value: prettyBytes(entry.stats.size).replace(/\s/g, ''), outerCSS: '', css: 'yellow-text' }]
       : []
   const lastMod =
     wide && hasMtime
       ? [
           {
+            key: Key.LastModified,
             value: prettyTime(entry.stats.mtimeMs),
             outerCSS: outerCSSLesser,
             css: `${cssLesser} ${cssSecondary} pre-wrap sub-text`
@@ -209,11 +226,15 @@ function toTable(entries: GlobStats[], args: Arguments<LsOptions>): Table {
   }))
 
   const wide = args.parsedOptions.l
-  const perms = wide && hasPermissions ? [{ value: 'Permissions', outerCSS: outerCSSSecondary }] : []
-  const uid = wide && hasUid ? [{ value: 'User', outerCSS: outerCSSSecondary }] : []
-  const gid = wide && hasGid ? [{ value: 'Group', outerCSS: outerCSSSecondary }] : []
-  const size = wide && hasSize ? [{ value: 'Size', outerCSS: '' }] : []
-  const lastMod = wide && hasMtime ? [{ value: 'Last Modified', outerCSS: outerCSSLesser, css: cssLesser }] : []
+  const perms =
+    wide && hasPermissions ? [{ key: Key.Permissions, value: 'Permissions', outerCSS: outerCSSSecondary }] : []
+  const uid = wide && hasUid ? [{ key: Key.User, value: 'User', outerCSS: outerCSSSecondary }] : []
+  const gid = wide && hasGid ? [{ key: Key.Group, value: 'Group', outerCSS: outerCSSSecondary }] : []
+  const size = wide && hasSize ? [{ key: Key.Size, value: 'Size', outerCSS: '' }] : []
+  const lastMod =
+    wide && hasMtime
+      ? [{ key: Key.LastModified, value: 'Last Modified', outerCSS: outerCSSLesser, css: cssLesser }]
+      : []
 
   const header = {
     name: 'Name',

plugins/plugin-bash-like/fs/src/vfs/index.ts

@@ -179,19 +179,32 @@ async function mountAll({ REPL }: Pick<Arguments, 'REPL'>, vfsFn: VFSProducingFu
  */
 export async function mount(vfs: VFS | VFSProducingFunction) {
   if (typeof vfs !== 'function') {
-    _mount(vfs)
+    await _mount(vfs)
   } else {
     const tab = getCurrentTab()
     if (!tab) {
-      let debounce = false
-      eventBus.on('/tab/new', tab => {
-        if (!debounce) {
-          debounce = true
-          mountAll(tab, vfs)
+      return new Promise((resolve, reject) => {
+        try {
+          let debounce = false
+          eventBus.on('/tab/new', async tab => {
+            try {
+              if (!debounce) {
+                debounce = true
+                await mountAll(tab, vfs)
+                resolve(undefined)
+              }
+            } catch (err) {
+              console.error('Error in mount 1', err)
+              reject(err)
+            }
+          })
+        } catch (err) {
+          console.error('Error in mount 2', err)
+          reject(err)
         }
       })
     } else {
-      mountAll(tab, vfs)
+      await mountAll(tab, vfs)
     }
   }
 }