@navios/commander-tui 1.0.0 → 1.2.0

package/src/__tests__/components/sidebar.spec.tsx

@@ -200,6 +200,23 @@ describe('Sidebar', () => {
 
       expect(component).toMatchSnapshot()
     })
+
+    it('should render static status', () => {
+      const screens = [createMockScreen({ id: '1', name: 'Static', status: 'static' })]
+
+      const component = wrapWithContext(
+        <Sidebar
+          screens={screens}
+          selectedIndex={0}
+          activeScreenId="1"
+          focused={true}
+          width={30}
+          title="Screens"
+        />,
+      )
+
+      expect(component).toMatchSnapshot()
+    })
   })
 
   describe('badge counts', () => {

package/src/__tests__/services/logger.spec.ts

@@ -1,12 +1,14 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { TestContainer } from '@navios/core/testing'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LogLevel } from '@navios/core'
 
 import { ScreenLoggerInstance } from '../../services/logger.ts'
 import { Screen } from '../../tokens/index.ts'
 import { createMockScreenInstance } from '../utils/factories.ts'
 
+import type { ScreenInstance } from '../../index.js'
 import type { MockScreenInstance } from '../utils/factories.ts'
-import type { LogLevel } from '@navios/core'
 
 describe('ScreenLoggerInstance', () => {
   let container: TestContainer
@@ -17,7 +19,7 @@ describe('ScreenLoggerInstance', () => {
   beforeEach(() => {
     container = new TestContainer()
     mockScreen = createMockScreenInstance()
-    container.bind(Screen).toValue(mockScreen)
+    container.bind(Screen).toValue(mockScreen as unknown as ScreenInstance)
   })
 
   afterEach(async () => {

package/src/factories/index.ts

@@ -1 +1,2 @@
+export * from './isomorphic-logger.factory.js'
 export * from './screen.factory.ts'

package/src/factories/isomorphic-logger.factory.ts

@@ -0,0 +1,23 @@
+import { Factory, inject, Logger, type FactoryContext } from '@navios/core'
+
+import { ScreenManager } from '../services/screen_manager.js'
+import { IsomorphicLogger, ScreenLogger } from '../tokens/logger.js'
+
+import type { IsomorphicLoggerInterface } from '../interfaces/isomorphic-logger.js'
+import type { LoggerOptions } from '../schemas/index.js'
+
+@Factory({
+  token: IsomorphicLogger,
+})
+export class IsomorphicLoggerFactory {
+  private readonly screenManager = inject(ScreenManager)
+
+  async create(ctx: FactoryContext, options: LoggerOptions): Promise<IsomorphicLoggerInterface> {
+    if (this.screenManager.isTuiBound()) {
+      return ctx.inject(ScreenLogger, options)
+    }
+    return ctx.inject(Logger, {
+      context: options.context,
+    })
+  }
+}

package/src/index.ts

@@ -3,6 +3,11 @@
 // ============================================
 export * from './types/index.ts'
 
+// ============================================
+// Interfaces
+// ============================================
+export * from './interfaces/index.ts'
+
 // ============================================
 // Components
 // ============================================

package/src/interfaces/index.ts

@@ -0,0 +1 @@
+export * from './isomorphic-logger.ts'

package/src/interfaces/isomorphic-logger.ts

@@ -0,0 +1,9 @@
+import type { LoggerInstance } from '@navios/core'
+
+import type { ScreenLoggerInstance } from '../services/logger.ts'
+
+type PublicLoggerMethods = Pick<LoggerInstance, keyof LoggerInstance>
+type PublicScreenLoggerMethods = Pick<ScreenLoggerInstance, keyof ScreenLoggerInstance>
+type ScreenOwnMethods = Partial<Omit<PublicScreenLoggerMethods, keyof PublicLoggerMethods>>
+
+export interface IsomorphicLoggerInterface extends PublicLoggerMethods, ScreenOwnMethods {}

package/src/overrides/console.logger.override.ts

@@ -3,11 +3,13 @@ import {
   Injectable,
   LoggerOutput,
   type ClassTypeWithInstance,
+  type LoggerOptions,
   type LoggerService,
   type LogLevel,
 } from '@navios/core'
 
 import { ScreenLogger } from '../tokens/index.ts'
+import { ALL_LOG_LEVELS } from '../types/index.ts'
 
 export function overrideConsoleLogger(
   hidden: boolean = false,
@@ -22,12 +24,17 @@ export function overrideConsoleLogger(
   class ConsoleLoggerOverride implements LoggerService {
     protected readonly logger = inject(ScreenLogger, {
       screen: {
-        name: 'default',
+        name: 'internal',
         icon: '💻',
         hidden,
+        static: true,
       },
     })
 
+    setup(options: LoggerOptions & { logLevels: LogLevel[] }): void {
+      this.logger.setLogLevels(options.logLevels ?? ALL_LOG_LEVELS)
+    }
+
     log(message: string): void {
       this.logger.log(message)
     }

package/src/schemas/screen-options.ts

@@ -9,6 +9,8 @@ export const ScreenOptionsSchema = z.object({
   badgeCount: z.number().optional(),
   /** Whether the screen is hidden */
   hidden: z.boolean().optional().default(false),
+  /** Whether the screen is static (ignored in auto-close calculations) */
+  static: z.boolean().optional().default(false),
 })
 
 export type ScreenOptions = z.infer<typeof ScreenOptionsSchema>

package/src/services/logger.ts

@@ -68,7 +68,7 @@ export class ScreenLoggerInstance implements LoggerService {
   }
 
   trace(msg: string | object, label?: string): this {
-    const trace = captureTrace()
+    const trace = captureTrace(1)
     return this.write('verbose', msg, label, trace, 'trace')
   }
 

package/src/services/screen.ts

@@ -43,6 +43,9 @@ export class ScreenInstance {
     this.icon = options.icon
     this.badgeCount = options.badgeCount ?? 0
     this.hidden = options.hidden ?? false
+    if (options.static) {
+      this.status = 'static'
+    }
   }
 
   incrementVersion(): void {

package/src/services/screen_manager.tsx

@@ -101,7 +101,7 @@ export class ScreenManager {
     this.renderer = await createCliRenderer({
       exitOnCtrlC: options?.exitOnCtrlC ?? true,
       useAlternateScreen: true,
-      useMouse: options?.useMouse ?? false,
+      useMouse: options?.useMouse ?? true,
     })
 
     this.root = createRoot(this.renderer)
@@ -244,33 +244,34 @@ export class ScreenManager {
       }
     }
 
-    // Check for auto-close
-    this.checkAutoClose()
-
     this.notifyChange()
   }
 
   /**
-   * Check if all screens are successful and start auto-close timer if enabled
+   * Check if all screens are successful (or only static) and start auto-close timer if enabled.
+   * Static screens are ignored in this calculation.
+   * If there are only static screens, the timer will trigger after the delay with no new activity.
    */
   private checkAutoClose(): void {
     const autoClose = this.bindOptions.autoClose
     if (!autoClose || !this.isBound) return
 
-    // Clear any existing timer
+    // Clear any existing timer (will be restarted if conditions are met)
     if (this.autoCloseTimer) {
       clearTimeout(this.autoCloseTimer)
       this.autoCloseTimer = null
     }
 
-    // Check if all screens are successful
-    const screens = this.getScreens()
-    if (screens.length === 0) return
+    // Get non-static screens
+    const nonStaticScreens = this.getScreens().filter((s) => s.getStatus() !== 'static')
 
-    const allSuccessful = screens.every((s) => s.getStatus() === 'success')
-    if (!allSuccessful) return
+    // If there are non-static screens, check if all are successful
+    if (nonStaticScreens.length > 0) {
+      const allSuccessful = nonStaticScreens.every((s) => s.getStatus() === 'success')
+      if (!allSuccessful) return
+    }
 
-    // Start auto-close timer
+    // Start auto-close timer (either all non-static screens succeeded, or only static screens exist)
     const delay = typeof autoClose === 'number' ? autoClose : 5000
     this.autoCloseTimer = setTimeout(() => {
       this.unbind()
@@ -376,6 +377,9 @@ export class ScreenManager {
   }
 
   private notifyChange(): void {
+    // Check auto-close on every change (resets timer if activity occurs)
+    this.checkAutoClose()
+
     // Notify listeners - React components will forceUpdate and re-render
     this.changeListeners.forEach((listener) => listener())
   }

package/src/themes/dark.ts

@@ -69,6 +69,10 @@ export const darkTheme: Theme = {
       icon: '✗',
       color: '#EF4444', // Red-500
     },
+    static: {
+      icon: '●',
+      color: '#3B82F6', // Blue-500
+    },
   },
 
   separator: {

package/src/themes/high-contrast.ts

@@ -74,6 +74,10 @@ export const highContrastTheme: Theme = {
       icon: '✗',
       color: '#EF4444', // Red-500
     },
+    static: {
+      icon: '●',
+      color: '#00FFFF', // Cyan for high visibility
+    },
   },
 
   separator: {

package/src/themes/light.ts

@@ -68,6 +68,10 @@ export const lightTheme: Theme = {
       icon: '✗',
       color: '#DC2626', // Red-600
     },
+    static: {
+      icon: '●',
+      color: '#2563EB', // Blue-600
+    },
   },
 
   separator: {

package/src/tokens/logger.ts

@@ -2,9 +2,18 @@ import { InjectionToken } from '@navios/core'
 
 import { LoggerOptionsSchema } from '../schemas/index.ts'
 
+import type { IsomorphicLoggerInterface } from '../interfaces/isomorphic-logger.ts'
 import type { ScreenLoggerInstance } from '../services/index.ts'
 
 export const ScreenLogger = InjectionToken.create<ScreenLoggerInstance, typeof LoggerOptionsSchema>(
   'ScreenLoggerInstance',
   LoggerOptionsSchema,
 )
+/**
+ * Isomorphic logger token for shared logger between TUI and Server.
+ * This token is used to inject the logger instance into the application.
+ */
+export const IsomorphicLogger = InjectionToken.create<
+  IsomorphicLoggerInterface,
+  typeof LoggerOptionsSchema
+>('IsomorphicLogger', LoggerOptionsSchema)

package/src/types/screen.types.ts

@@ -108,7 +108,7 @@ export interface LoggerContextValue {
 // Screen Service Types
 // ============================================
 
-export type ScreenStatus = 'waiting' | 'pending' | 'success' | 'fail'
+export type ScreenStatus = 'waiting' | 'pending' | 'success' | 'fail' | 'static'
 
 export interface BindOptions {
   exitOnCtrlC?: boolean
@@ -119,6 +119,6 @@ export interface BindOptions {
   autoClose?: boolean | number
   /** Theme to use for the TUI (theme object or preset name) */
   theme?: Theme | ThemePreset
-  /** Enable mouse support (default: false) */
+  /** Enable mouse support (default: true) */
   useMouse?: boolean
 }

package/src/types/theme.types.ts

@@ -52,6 +52,7 @@ export interface StatusIndicatorsTheme {
   pending: StatusIndicator
   success: StatusIndicator
   fail: StatusIndicator
+  static: StatusIndicator
 }
 
 /**

package/src/utils/format.ts

@@ -43,10 +43,11 @@ export function formatObject(obj: unknown, depth: number = 2, currentDepth: numb
 /**
  * Capture a stack trace, filtering out internal frames
  */
-export function captureTrace(): string {
+export function captureTrace(offset: number = 0): string {
   const err = new Error()
   const stack = err.stack ?? ''
   const lines = stack.split('\n')
+  const begin = lines.findIndex((line) => line.includes('captureTrace'))
   // Skip the first 4 lines: Error, captureTrace, trace method, and the log method
-  return lines.slice(4).join('\n')
+  return lines.slice(begin !== -1 ? begin + 1 + offset : 4).join('\n')
 }