@abyrd9/harbor-cli 0.0.3 → 0.1.0

package/dist/index.js

@@ -90,37 +90,61 @@ if (process.argv.length <= 2) {
 }
 program.command('dock')
     .description(`Prepares your development environment by creating both:
-- harbor.json configuration file
-- Caddyfile for reverse proxy
+- harbor.json configuration file (or harbor field in package.json)
+- Caddyfile for reverse proxy (if needed)
 	
 This is typically the first command you'll run in a new project.`)
     .option('-p, --path <path>', 'The path to the root of your project', './')
     .action(async (options) => {
-    const caddyFileExists = fileExists('Caddyfile');
-    const configFileExists = fileExists('harbor.json');
-    if (caddyFileExists || configFileExists) {
-        console.log('❌ Error: Harbor project already initialized');
-        if (caddyFileExists) {
-            console.log('   - Caddyfile already exists');
+    try {
+        const caddyFileExists = fileExists('Caddyfile');
+        const configExists = checkHasHarborConfig();
+        if (caddyFileExists || configExists) {
+            console.log('❌ Error: Harbor project already initialized');
+            if (caddyFileExists) {
+                console.log('   - Caddyfile already exists');
+            }
+            if (configExists) {
+                console.log('   - Harbor configuration already exists');
+            }
+            console.log('\nTo reinitialize, please remove these files first.');
+            process.exit(1);
         }
-        if (configFileExists) {
-            console.log('   - harbor.json already exists');
+        const servicesAdded = await generateDevFile(options.path);
+        // Only try to generate Caddyfile if services were actually added
+        if (servicesAdded) {
+            try {
+                await generateCaddyFile();
+                console.log('✨ Environment successfully prepared and anchored!');
+            }
+            catch (err) {
+                if (err instanceof Error && err.message.includes('No harbor configuration found')) {
+                    // This is expected if no services were added
+                    console.log('✨ Environment prepared! No services configured yet.');
+                }
+                else {
+                    console.log('❌ Error generating Caddyfile:', err instanceof Error ? err.message : 'Unknown error');
+                    process.exit(1);
+                }
+            }
+        }
+        else {
+            console.log('✨ Environment prepared! No services configured yet.');
         }
-        console.log('\nTo reinitialize, please remove these files first.');
+    }
+    catch (err) {
+        console.log('❌ Error:', err instanceof Error ? err.message : 'Unknown error');
         process.exit(1);
     }
-    await generateDevFile(options.path);
-    await generateCaddyFile();
-    console.log('✨ Environment successfully prepared and anchored!');
 });
 program.command('moor')
-    .description('Add new services to your harbor.json configuration file')
+    .description('Add new services to your harbor configuration')
     .option('-p, --path <path>', 'The path to the root of your project', './')
     .action(async (options) => {
-    if (!fileExists('harbor.json')) {
-        console.log('❌ No harbor.json configuration found');
+    if (!checkHasHarborConfig()) {
+        console.log('❌ No harbor configuration found');
         console.log('\nTo initialize a new Harbor project, please use:');
-        console.log('  harbor anchor');
+        console.log('  harbor dock');
         process.exit(1);
     }
     await generateDevFile(options.path);
@@ -130,10 +154,10 @@ program.command('anchor')
 
 Note: This command will stop any active Caddy processes, including those from other Harbor projects.`)
     .action(async () => {
-    if (!fileExists('harbor.json')) {
-        console.log('❌ No harbor.json configuration found');
+    if (!checkHasHarborConfig()) {
+        console.log('❌ No harbor configuration found');
         console.log('\nTo initialize a new Harbor project, please use:');
-        console.log('  harbor anchor');
+        console.log('  harbor dock');
         process.exit(1);
     }
     await generateCaddyFile();
@@ -178,28 +202,63 @@ function validateConfig(config) {
 }
 async function generateDevFile(dirPath) {
     let config;
+    let writeToPackageJson = false;
     try {
-        const existing = await fs.promises.readFile('harbor.json', 'utf-8');
-        config = JSON.parse(existing);
-        console.log('Found existing harbor.json, scanning for new services...');
-    }
-    catch (err) {
-        if (err.code !== 'ENOENT') {
-            console.error('Error reading harbor.json:', err);
-            process.exit(1);
+        // First try to read from harbor.json
+        try {
+            const existing = await fs.promises.readFile('harbor.json', 'utf-8');
+            config = JSON.parse(existing);
+            console.log('Found existing harbor.json, scanning for new services...');
         }
-        // Initialize new config with defaults
-        config = {
-            domain: 'localhost',
-            useSudo: false,
-            services: [],
-        };
-        console.log('Creating new harbor.json...');
-    }
-    // Create a map of existing services for easy lookup
-    const existing = new Set(config.services.map(s => s.name));
-    let newServicesAdded = false;
-    try {
+        catch (err) {
+            if (err.code !== 'ENOENT') {
+                throw new Error(`Error reading harbor.json: ${err instanceof Error ? err.message : 'Unknown error'}`);
+            }
+            // If harbor.json doesn't exist, try package.json
+            try {
+                const packageData = await fs.promises.readFile('package.json', 'utf-8');
+                const packageJson = JSON.parse(packageData);
+                if (packageJson.harbor) {
+                    config = packageJson.harbor;
+                    writeToPackageJson = true;
+                    console.log('Found existing harbor config in package.json, scanning for new services...');
+                }
+                else if (fileExists('package.json')) {
+                    // If package.json exists but no harbor config, use it
+                    writeToPackageJson = true;
+                    config = {
+                        domain: 'localhost',
+                        useSudo: false,
+                        services: [],
+                    };
+                    console.log('Creating new harbor config in package.json...');
+                }
+                else {
+                    // No package.json, create harbor.json
+                    config = {
+                        domain: 'localhost',
+                        useSudo: false,
+                        services: [],
+                    };
+                    console.log('Creating new harbor.json...');
+                }
+            }
+            catch (err) {
+                if (err.code !== 'ENOENT') {
+                    throw new Error(`Error reading package.json: ${err instanceof Error ? err.message : 'Unknown error'}`);
+                }
+                // No package.json, create harbor.json
+                config = {
+                    domain: 'localhost',
+                    useSudo: false,
+                    services: [],
+                };
+                console.log('Creating new harbor.json...');
+            }
+        }
+        // Create a map of existing services for easy lookup
+        const existing = new Set(config.services.map(s => s.name));
+        let newServicesAdded = false;
         const folders = await fs.promises.readdir(dirPath, { withFileTypes: true });
         for (const folder of folders) {
             if (folder.isDirectory()) {
@@ -232,40 +291,87 @@ async function generateDevFile(dirPath) {
         }
         if (!newServicesAdded) {
             console.log('No new services found to add, feel free to add them manually');
-            return;
+            // Still write the initial config even if no services were found
+            const validationError = validateConfig(config);
+            if (validationError) {
+                throw new Error(`Invalid harbor configuration: ${validationError}`);
+            }
+            if (writeToPackageJson) {
+                // Update package.json
+                const packageData = await fs.promises.readFile('package.json', 'utf-8');
+                const packageJson = JSON.parse(packageData);
+                packageJson.harbor = config;
+                await fs.promises.writeFile('package.json', JSON.stringify(packageJson, null, 2), 'utf-8');
+                console.log('\npackage.json updated successfully with harbor configuration');
+            }
+            else {
+                // Write to harbor.json
+                await fs.promises.writeFile('harbor.json', JSON.stringify(config, null, 2), 'utf-8');
+                console.log('\nharbor.json created successfully');
+            }
+            return false;
         }
         const validationError = validateConfig(config);
         if (validationError) {
-            console.log(`❌ Invalid harbor.json configuration: ${validationError}`);
-            process.exit(1);
+            throw new Error(`Invalid harbor configuration: ${validationError}`);
+        }
+        if (writeToPackageJson) {
+            // Update package.json
+            const packageData = await fs.promises.readFile('package.json', 'utf-8');
+            const packageJson = JSON.parse(packageData);
+            packageJson.harbor = config;
+            await fs.promises.writeFile('package.json', JSON.stringify(packageJson, null, 2), 'utf-8');
+            console.log('\npackage.json updated successfully with harbor configuration');
+        }
+        else {
+            // Write to harbor.json
+            await fs.promises.writeFile('harbor.json', JSON.stringify(config, null, 2), 'utf-8');
+            console.log('\nharbor.json created successfully');
         }
-        await fs.promises.writeFile('harbor.json', JSON.stringify(config, null, 2), 'utf-8');
-        console.log('\nharbor.json updated successfully');
         console.log('\nImportant:');
         console.log('  - Update the \'Port\' field for each service to match its actual port or leave blank to ignore in the Caddyfile');
         console.log('  - Verify the auto-detected commands are correct for your services');
+        return true;
     }
     catch (err) {
-        console.error('Error processing directory:', err);
-        process.exit(1);
+        throw new Error(`Error processing directory: ${err instanceof Error ? err.message : 'Unknown error'}`);
     }
 }
 async function readHarborConfig() {
+    // First try to read from harbor.json
     try {
         const data = await fs.promises.readFile('harbor.json', 'utf-8');
         const config = JSON.parse(data);
         const validationError = validateConfig(config);
         if (validationError) {
-            throw new Error(`Invalid configuration: ${validationError}`);
+            throw new Error(`Invalid configuration in harbor.json: ${validationError}`);
         }
         return config;
     }
     catch (err) {
-        if (err.code === 'ENOENT') {
-            throw new Error('harbor.json not found');
+        if (err.code !== 'ENOENT') {
+            throw err;
+        }
+    }
+    // If harbor.json doesn't exist, try package.json
+    try {
+        const packageData = await fs.promises.readFile('package.json', 'utf-8');
+        const packageJson = JSON.parse(packageData);
+        if (packageJson.harbor) {
+            const config = packageJson.harbor;
+            const validationError = validateConfig(config);
+            if (validationError) {
+                throw new Error(`Invalid configuration in package.json harbor field: ${validationError}`);
+            }
+            return config;
+        }
+    }
+    catch (err) {
+        if (err.code !== 'ENOENT') {
+            throw err;
         }
-        throw err;
     }
+    throw new Error('No harbor configuration found in harbor.json or package.json');
 }
 async function stopCaddy() {
     try {
@@ -322,11 +428,11 @@ async function generateCaddyFile() {
     }
 }
 async function runServices() {
-    // Check for required files
-    if (!fileExists('harbor.json')) {
-        console.log('❌ No harbor.json configuration found');
+    const hasHarborConfig = checkHasHarborConfig();
+    if (!hasHarborConfig) {
+        console.log('❌ No harbor configuration found');
         console.log('\nTo initialize a new Harbor project, please use:');
-        console.log('  harbor anchor');
+        console.log('  harbor dock');
         process.exit(1);
     }
     // Load and validate config
@@ -414,3 +520,18 @@ async function ensureScriptsExist() {
         throw err;
     }
 }
+function checkHasHarborConfig() {
+    // Check for harbor.json
+    if (fileExists('harbor.json')) {
+        return true;
+    }
+    // Check for harbor config in package.json
+    try {
+        const packageData = fs.readFileSync(`${process.cwd()}/package.json`, 'utf-8');
+        const packageJson = JSON.parse(packageData);
+        return !!packageJson.harbor;
+    }
+    catch {
+        return false;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abyrd9/harbor-cli",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "A CLI tool for managing local development services with automatic subdomain routing",
   "type": "module",
   "bin": {
@@ -14,8 +14,8 @@
     "check": "bunx npm-check -u",
     "build": "tsc",
     "prepare": "bun run build",
-    "start": "node dist/index.js",
-    "harbor": "node dist/index.js",
+    "start": "bun dist/index.js",
+    "harbor": "bun dist/index.js",
     "release": "bash release.sh"
   },
   "keywords": [
@@ -40,12 +40,30 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@commander-js/extra-typings": "^12.1.0"
+    "@commander-js/extra-typings": "^13.1.0"
   },
   "devDependencies": {
-    "@types/node": "^22.10.2",
+    "@types/node": "^22.13.1",
     "bun-types": "latest",
-    "typescript": "^5.3.3"
+    "typescript": "^5.7.3"
   },
-  "main": "index.js"
+  "main": "index.js",
+  "harbor": {
+    "domain": "localhost",
+    "useSudo": false,
+    "services": [
+      {
+        "name": "vite-project",
+        "path": "test-services/vite-project",
+        "subdomain": "vite-project",
+        "command": "npm run dev"
+      },
+      {
+        "name": "go-api",
+        "path": "test-services/go-api",
+        "subdomain": "go-api",
+        "command": "go run ."
+      }
+    ]
+  }
 }

package/scripts/dev.sh

@@ -6,6 +6,17 @@ if tmux has-session -t local-dev-test 2>/dev/null; then
     tmux kill-session -t local-dev-test
 fi
 
+# Function to get harbor config
+get_harbor_config() {
+    if [ -f "harbor.json" ]; then
+        cat harbor.json
+    elif [ -f "package.json" ]; then
+        jq '.harbor' package.json
+    else
+        echo "{}"
+    fi
+}
+
 # Start a new tmux session named 'local-dev-test' and rename the initial window
 tmux new-session -d -s local-dev-test
 
@@ -70,7 +81,7 @@ tmux rename-window -t local-dev-test:0 'Terminal'
 
 # Check if any services need Caddy
 needs_caddy=false
-jq -c '.services[]' harbor.json | while read service; do
+get_harbor_config | jq -c '.services[]' | while read service; do
     subdomain=$(echo $service | jq -r '.subdomain // empty')
     port=$(echo $service | jq -r '.port // empty')
     if [ ! -z "$subdomain" ] && [ ! -z "$port" ]; then
@@ -89,8 +100,8 @@ if [ "$needs_caddy" = true ]; then
     window_index=2  # Start services from index 2
 fi
 
-# Create windows dynamically based on harbor.json
-jq -c '.services[]' harbor.json | while read service; do
+# Create windows dynamically based on harbor config
+get_harbor_config | jq -c '.services[]' | while read service; do
     name=$(echo $service | jq -r '.name')
     path=$(echo $service | jq -r '.path')
     command=$(echo $service | jq -r '.command')