@tothalex/nulljs 0.0.48 → 0.0.53

package/src/commands/host.ts

@@ -1,17 +1,16 @@
+import type { Command } from 'commander'
 import { existsSync, writeFileSync, mkdirSync, readFileSync } from 'node:fs'
-import { join, resolve, dirname } from 'node:path'
+import { join } from 'node:path'
 import { execSync } from 'node:child_process'
 import { homedir } from 'node:os'
-import { fileURLToPath } from 'node:url'
 import chalk from 'chalk'
-import { updateServer } from '../lib/update-server'
 
-const getServerBinPath = (): string => {
-  // Try to find the server binary relative to this module
-  // This works both in development and when installed globally
-  const currentFile = fileURLToPath(import.meta.url)
-  const moduleRoot = resolve(dirname(currentFile), '../..')
-  return join(moduleRoot, 'bin', 'server')
+type PlatformKey = 'linux-x64' | 'linux-arm64' | 'darwin-arm64'
+
+const PLATFORMS: Record<PlatformKey, string> = {
+  'linux-x64': '@tothalex/nulljs-linux-x64',
+  'linux-arm64': '@tothalex/nulljs-linux-arm64',
+  'darwin-arm64': '@tothalex/nulljs-darwin-arm64'
 }
 
 type ProductionConfig = {
@@ -21,8 +20,23 @@ type ProductionConfig = {
   }
 }
 
+const getPlatformKey = (): string => {
+  return `${process.platform}-${process.arch}`
+}
+
+const getServerBinPath = (): string => {
+  const platformKey = getPlatformKey()
+  const pkgName = PLATFORMS[platformKey as PlatformKey]
+
+  if (!pkgName) {
+    throw new Error(`Unsupported platform: ${platformKey}`)
+  }
+
+  return require.resolve(`${pkgName}/bin/server`)
+}
+
 const generateProductionKeys = async (): Promise<{ privateKey: string; publicKey: string }> => {
-  console.log(chalk.blue('🔑 Generating production keys...'))
+  console.log(chalk.blue('Generating production keys...'))
 
   const keyPair = await crypto.subtle.generateKey(
     {
@@ -51,60 +65,65 @@ const saveProductionConfig = (cloudPath: string, privateKey: string, publicKey:
     }
   }
 
-  console.log(chalk.blue('💾 Saving production configuration...'))
+  console.log(chalk.blue('Saving production configuration...'))
   writeFileSync(configPath, JSON.stringify(config, null, 2))
 
   // Set proper permissions on the config file (readable only by owner)
   execSync(`chmod 600 ${configPath}`, { stdio: 'inherit' })
 
-  console.log(chalk.green('✅ Production configuration saved'))
+  console.log(chalk.green('Production configuration saved'))
 }
 
-const createSystemdService = (cloudPath: string, publicKey: string, serverBinPath: string, userName: string) => {
-  const serviceContent = `
-  [Unit]
-  Description=NullJS Server
-  After=network.target
-  StartLimitIntervalSec=0
-
-  [Service]
-  Type=simple
-  Restart=always
-  RestartSec=1
-  User=${userName}
-  ExecStart=${serverBinPath}
-  Environment=CLOUD_PATH=${cloudPath}
-  Environment=PUBLIC_KEY=${publicKey}
-  WorkingDirectory=${cloudPath}
-
-  [Install]
-  WantedBy=multi-user.target
+const createSystemdService = (
+  cloudPath: string,
+  publicKey: string,
+  serverBinPath: string,
+  userName: string
+) => {
+  const serviceContent = `[Unit]
+Description=NullJS Server
+After=network.target
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=${userName}
+ExecStart=${serverBinPath}
+Environment=CLOUD_PATH=${cloudPath}
+Environment=PUBLIC_KEY=${publicKey}
+WorkingDirectory=${cloudPath}
+
+[Install]
+WantedBy=multi-user.target
 `
 
   return serviceContent
 }
 
-
 const ensureCloudDirectory = (cloudPath: string) => {
   if (!existsSync(cloudPath)) {
-    console.log(chalk.blue('🔧 Creating cloud directory...'))
+    console.log(chalk.blue('Creating cloud directory...'))
     try {
       mkdirSync(cloudPath, { recursive: true })
-      console.log(chalk.green(`✅ Cloud directory created: ${cloudPath}`))
+      console.log(chalk.green(`Cloud directory created: ${cloudPath}`))
     } catch (error) {
-      console.log(chalk.red('❌ Failed to create cloud directory:'), error.message)
+      console.log(
+        chalk.red('Failed to create cloud directory:'),
+        error instanceof Error ? error.message : String(error)
+      )
       throw error
     }
   } else {
-    console.log(chalk.gray(`ℹ️  Cloud directory already exists: ${cloudPath}`))
+    console.log(chalk.gray(`Cloud directory already exists: ${cloudPath}`))
   }
 }
 
-
 const installSystemdService = (serviceContent: string) => {
   const servicePath = '/etc/systemd/system/nulljs.service'
 
-  console.log(chalk.blue('🔧 Installing systemd service...'))
+  console.log(chalk.blue('Installing systemd service...'))
 
   // Write service file
   writeFileSync('/tmp/nulljs.service', serviceContent)
@@ -114,20 +133,20 @@ const installSystemdService = (serviceContent: string) => {
   execSync('sudo systemctl daemon-reload', { stdio: 'inherit' })
   execSync('sudo systemctl enable nulljs.service', { stdio: 'inherit' })
 
-  console.log(chalk.green('✅ Systemd service installed and enabled'))
+  console.log(chalk.green('Systemd service installed and enabled'))
 }
 
 const validateLinux = () => {
   if (process.platform !== 'linux') {
-    console.log(chalk.red('❌ This command only works on Linux'))
+    console.log(chalk.red('This command only works on Linux'))
     process.exit(1)
   }
 }
 
 const validateServerBinary = (serverBinPath: string) => {
   if (!existsSync(serverBinPath)) {
-    console.log(chalk.red('❌ Server binary not found at:'), serverBinPath)
-    console.log(chalk.yellow('   Make sure you have built the server first'))
+    console.log(chalk.red('Server binary not found at:'), serverBinPath)
+    console.log(chalk.yellow('Make sure you have installed the package correctly'))
     process.exit(1)
   }
 }
@@ -145,7 +164,7 @@ const checkExistingProductionConfig = (cloudPath: string): ProductionConfig | nu
       return configContent as ProductionConfig
     }
   } catch {
-    console.log(chalk.yellow('⚠️  Existing production config is invalid, will regenerate'))
+    console.log(chalk.yellow('Existing production config is invalid, will regenerate'))
   }
 
   return null
@@ -154,129 +173,65 @@ const checkExistingProductionConfig = (cloudPath: string): ProductionConfig | nu
 const unhost = async (options: { keepData?: boolean } = {}) => {
   validateLinux()
 
-  console.log(chalk.blue('🧹 Removing NullJS production hosting...'))
+  console.log(chalk.blue('Removing NullJS production hosting...'))
 
   try {
     // Stop and disable the systemd service
-    console.log(chalk.blue('🛑 Stopping NullJS service...'))
+    console.log(chalk.blue('Stopping NullJS service...'))
     try {
       execSync('sudo systemctl stop nulljs', { stdio: 'inherit' })
-      console.log(chalk.green('✅ Service stopped'))
+      console.log(chalk.green('Service stopped'))
     } catch {
-      console.log(chalk.yellow('⚠️  Service was not running'))
+      console.log(chalk.yellow('Service was not running'))
     }
 
     try {
       execSync('sudo systemctl disable nulljs', { stdio: 'inherit' })
-      console.log(chalk.green('✅ Service disabled'))
+      console.log(chalk.green('Service disabled'))
     } catch {
-      console.log(chalk.yellow('⚠️  Service was not enabled'))
+      console.log(chalk.yellow('Service was not enabled'))
     }
 
     // Remove the systemd service file
     const servicePath = '/etc/systemd/system/nulljs.service'
     if (existsSync(servicePath)) {
-      console.log(chalk.blue('🗑️  Removing systemd service file...'))
+      console.log(chalk.blue('Removing systemd service file...'))
       execSync(`sudo rm ${servicePath}`, { stdio: 'inherit' })
       execSync('sudo systemctl daemon-reload', { stdio: 'inherit' })
-      console.log(chalk.green('✅ Systemd service file removed'))
+      console.log(chalk.green('Systemd service file removed'))
     }
 
     // Remove cloud directory (optional)
     if (!options.keepData) {
       const defaultCloudPath = join(homedir(), '.nulljs')
       if (existsSync(defaultCloudPath)) {
-        console.log(chalk.blue('🗂️  Removing cloud directory...'))
+        console.log(chalk.blue('Removing cloud directory...'))
         execSync(`rm -rf ${defaultCloudPath}`, { stdio: 'inherit' })
-        console.log(chalk.green('✅ Cloud directory removed'))
+        console.log(chalk.green('Cloud directory removed'))
       } else {
-        console.log(chalk.gray('ℹ️  Cloud directory does not exist'))
+        console.log(chalk.gray('Cloud directory does not exist'))
       }
     } else {
-      console.log(chalk.gray('ℹ️  Keeping cloud data (--keep-data specified)'))
+      console.log(chalk.gray('Keeping cloud data (--keep-data specified)'))
     }
 
-    console.log(chalk.green('🎉 NullJS hosting cleanup complete!'))
+    console.log(chalk.green('NullJS hosting cleanup complete!'))
     console.log('')
-    console.log(chalk.blue('📋 Summary:'))
-    console.log(chalk.gray('   • Systemd service stopped and removed'))
+    console.log(chalk.blue('Summary:'))
+    console.log(chalk.gray('   - Systemd service stopped and removed'))
     if (!options.keepData) {
-      console.log(chalk.gray('   • Cloud directory removed'))
+      console.log(chalk.gray('   - Cloud directory removed'))
     }
   } catch (error) {
-    console.log(chalk.red('❌ Failed to remove hosting setup:'), error.message)
+    console.log(
+      chalk.red('Failed to remove hosting setup:'),
+      error instanceof Error ? error.message : String(error)
+    )
     process.exit(1)
   }
 }
 
-const hostUpdate = async () => {
-  validateLinux()
-
-  console.log(chalk.blue('🔄 Updating NullJS server...'))
-
-  // Check if service exists
-  const serviceExists = existsSync('/etc/systemd/system/nulljs.service')
-  if (!serviceExists) {
-    console.log(chalk.red('❌ NullJS service is not installed. Run `nulljs host` first.'))
-    process.exit(1)
-  }
-
-  let wasRunning = false
-
-  try {
-    // Check if service is running
-    execSync('sudo systemctl is-active nulljs >/dev/null 2>&1')
-    wasRunning = true
-    console.log(chalk.blue('🛑 Stopping NullJS service...'))
-    execSync('sudo systemctl stop nulljs', { stdio: 'inherit' })
-    console.log(chalk.green('✅ Service stopped'))
-  } catch {
-    // Service wasn't running, that's fine
-    console.log(chalk.gray('ℹ️  Service was not running'))
-  }
-
-  try {
-    // Update the binary
-    await updateServer()
-
-    // Restart service if it was running before
-    if (wasRunning) {
-      console.log(chalk.blue('🚀 Starting NullJS service...'))
-      execSync('sudo systemctl start nulljs', { stdio: 'inherit' })
-      console.log(chalk.green('✅ Service restarted'))
-    }
-
-    console.log(chalk.green('🎉 NullJS server update complete!'))
-    console.log('')
-    console.log(chalk.blue('📋 Service management commands:'))
-    console.log(chalk.gray('   Start:   '), chalk.white('sudo systemctl start nulljs'))
-    console.log(chalk.gray('   Stop:    '), chalk.white('sudo systemctl stop nulljs'))
-    console.log(chalk.gray('   Status:  '), chalk.white('sudo systemctl status nulljs'))
-    console.log(chalk.gray('   Logs:    '), chalk.white('sudo journalctl -u nulljs -f'))
-  } catch (error) {
-    console.log(chalk.red('❌ Failed to update server:'), error.message)
-
-    // Try to restart the service even if update failed
-    if (wasRunning) {
-      try {
-        console.log(chalk.yellow('⚠️  Attempting to restart service with previous binary...'))
-        execSync('sudo systemctl start nulljs', { stdio: 'inherit' })
-        console.log(chalk.green('✅ Service restarted with previous binary'))
-      } catch (restartError) {
-        console.log(chalk.red('❌ Failed to restart service:'), restartError.message)
-      }
-    }
-
-    process.exit(1)
-  }
-}
-
-const host = async (cloudPath?: string, options: { update?: boolean } = {}) => {
-  // Handle update flag
-  if (options.update) {
-    return hostUpdate()
-  }
-
+const host = async (cloudPath?: string) => {
   validateLinux()
 
   // Use provided cloud path or default to ~/.nulljs
@@ -286,7 +241,7 @@ const host = async (cloudPath?: string, options: { update?: boolean } = {}) => {
       : join(process.cwd(), cloudPath)
     : join(homedir(), '.nulljs')
 
-  console.log(chalk.blue('🚀 Setting up NullJS production hosting...'))
+  console.log(chalk.blue('Setting up NullJS production hosting...'))
   console.log(chalk.gray(`   Cloud path: ${resolvedCloudPath}`))
 
   const serverBinPath = getServerBinPath()
@@ -294,7 +249,7 @@ const host = async (cloudPath?: string, options: { update?: boolean } = {}) => {
 
   // Get current user
   const currentUser = process.env.USER || process.env.USERNAME || 'root'
-  console.log(chalk.blue(`🔧 Setting up service to run as user: ${currentUser}`))
+  console.log(chalk.blue(`Setting up service to run as user: ${currentUser}`))
 
   // Ensure cloud directory exists
   ensureCloudDirectory(resolvedCloudPath)
@@ -307,12 +262,12 @@ const host = async (cloudPath?: string, options: { update?: boolean } = {}) => {
     saveProductionConfig(resolvedCloudPath, privateKey, publicKey)
     productionConfig = { key: { private: privateKey, public: publicKey } }
 
-    console.log(chalk.green('🔑 Production keys generated'))
-    console.log(chalk.blue('📋 Production Public Key:'))
-    console.log(chalk.gray(publicKey))
+    console.log(chalk.green('Production keys generated'))
+    console.log(chalk.blue('Production Public Key:'))
+    console.log(chalk.gray(productionConfig.key.public))
   } else {
-    console.log(chalk.green('🔑 Using existing production keys'))
-    console.log(chalk.blue('📋 Production Public Key:'))
+    console.log(chalk.green('Using existing production keys'))
+    console.log(chalk.blue('Production Public Key:'))
     console.log(chalk.gray(productionConfig.key.public))
   }
 
@@ -325,15 +280,51 @@ const host = async (cloudPath?: string, options: { update?: boolean } = {}) => {
   )
   installSystemdService(serviceContent)
 
-  console.log(chalk.green('🎉 NullJS hosting setup complete!'))
+  console.log(chalk.green('NullJS hosting setup complete!'))
   console.log('')
-  console.log(chalk.blue('📋 Service management commands:'))
+  console.log(chalk.blue('Service management commands:'))
   console.log(chalk.gray('   Start:   '), chalk.white('sudo systemctl start nulljs'))
   console.log(chalk.gray('   Stop:    '), chalk.white('sudo systemctl stop nulljs'))
   console.log(chalk.gray('   Status:  '), chalk.white('sudo systemctl status nulljs'))
   console.log(chalk.gray('   Logs:    '), chalk.white('sudo journalctl -u nulljs -f'))
   console.log('')
-  console.log(chalk.yellow('⚠️  Remember to start the service: sudo systemctl start nulljs'))
+  console.log(chalk.yellow('Remember to start the service: sudo systemctl start nulljs'))
 }
 
-export { host, unhost }
+export const registerHostCommand = (program: Command) => {
+  const hostCmd = program
+    .command('host')
+    .description('Set up NullJS production hosting with systemd')
+    .argument('[cloud-path]', 'Path for cloud storage (default: ~/.nulljs)')
+    .action(async (cloudPath?: string) => {
+      await host(cloudPath)
+    })
+
+  hostCmd
+    .command('remove')
+    .description('Remove NullJS production hosting')
+    .option('--keep-data', 'Keep cloud data directory')
+    .action(async (options: { keepData?: boolean }) => {
+      await unhost(options)
+    })
+
+  hostCmd
+    .command('logs')
+    .description('View NullJS server logs')
+    .option('-n, --lines <number>', 'Number of lines to show', '100')
+    .option('--no-follow', 'Do not follow log output')
+    .action((options: { lines: string; follow: boolean }) => {
+      validateLinux()
+
+      const args = ['-u', 'nulljs', '-n', options.lines]
+      if (options.follow) {
+        args.push('-f')
+      }
+
+      try {
+        execSync(`journalctl ${args.join(' ')}`, { stdio: 'inherit' })
+      } catch {
+        // User likely pressed Ctrl+C, which is fine
+      }
+    })
+}

package/src/commands/index.ts

@@ -1,8 +1,6 @@
-export * from './deploy'
-export * from './auth'
-export * from './secret'
-export * from './api'
-export * from './create'
-export * from './dev'
-export * from './host'
-export * from './profile'
+export { registerDevCommand } from './dev'
+export { registerDeployCommand } from './deploy'
+export { registerConfigCommand } from './config'
+export { registerStatusCommand } from './status'
+export { registerSecretCommand } from './secret'
+export { registerHostCommand } from './host'