@ongtrieuhau861457/runner-tailscale-sync 1.260202.11948 → 1.260202.12010

package/README.md

@@ -26,61 +26,55 @@ npm install -g runner-tailscale-sync
 ### CLI
 
 ```bash
-# Full sync workflow
+# Run full workflow (init → detect → pull → stop → push)
 TAILSCALE_ENABLE=1 runner-sync
 
-# Chỉ khởi tạo Tailscale
-runner-sync init
-
-# Chỉ push git
-runner-sync push
-
-# Xem status
-runner-sync status
-
 # Custom working directory
 runner-sync --cwd /path/to/project
 
 # Verbose mode
-runner-sync -v
+runner-sync --verbose
+
+# Quiet mode
+runner-sync --quiet
 ```
 
+**Workflow tự động**:
+
+1. **Init**: Cài đặt Tailscale và kết nối mạng
+2. **Detect**: Tìm runner trước đó (cùng tag)
+3. **Pull**: Đồng bộ `.runner-data` từ runner cũ (nếu có)
+4. **Stop**: Dừng services trên runner cũ (nếu có)
+5. **Push**: Đẩy `.runner-data` lên git (nếu có runner cũ)
+
 ### Library
 
 ```javascript
-const runnerSync = require('runner-tailscale-sync');
+const runnerSync = require("runner-tailscale-sync");
 
-// Full sync
+// Run full workflow
 await runnerSync.sync({
-  cwd: '/path/to/project',
+  cwd: "/path/to/project",
   verbose: true,
 });
 
-// Chỉ init
-await runnerSync.init();
+// Access individual modules (advanced)
+const { Config, Logger, syncOrchestrator } = require("runner-tailscale-sync");
 
-// Chỉ push git
-await runnerSync.push();
+const config = new Config({ cwd: process.cwd() });
+const logger = new Logger({ packageName: "my-tool", version: "1.0.0" });
 
-// Xem status
-await runnerSync.status();
+await syncOrchestrator.orchestrate(config, logger);
 ```
 
 ### Advanced Usage - Sử dụng modules riêng lẻ
 
 ```javascript
-const { 
-  Config, 
-  Logger, 
-  syncOrchestrator,
-  runnerDetector,
-  dataSync,
-  tailscale 
-} = require('runner-tailscale-sync');
+const { Config, Logger, syncOrchestrator, runnerDetector, dataSync, tailscale } = require("runner-tailscale-sync");
 
 // Tạo config
 const config = new Config({ cwd: process.cwd() });
-const logger = new Logger({ packageName: 'my-tool', version: '1.0.0' });
+const logger = new Logger({ packageName: "my-tool", version: "1.0.0" });
 
 // Detect previous runner
 const detection = await runnerDetector.detectPreviousRunner(config, logger);
@@ -177,7 +171,7 @@ Tất cả dữ liệu được lưu trong `.runner-data/`:
     TAILSCALE_CLIENT_ID: $(TAILSCALE_CLIENT_ID)
     TAILSCALE_CLIENT_SECRET: $(TAILSCALE_CLIENT_SECRET)
     TAILSCALE_ENABLE: 1
-  displayName: 'Sync Runner Data'
+  displayName: "Sync Runner Data"
 ```
 
 ### Self-hosted Runner
@@ -231,6 +225,7 @@ node -e "require('./src/index.js').status().then(console.log)"
 Version theo giờ Việt Nam (UTC+7): `1.yyMMdd.1HHmm`
 
 Ví dụ:
+
 - Build lúc 15:30 ngày 02/02/2025 → `1.250202.11530`
 - Build lúc 09:45 ngày 15/03/2025 → `1.250315.10945`
 
@@ -246,11 +241,13 @@ Ví dụ:
 ### Windows
 
 Trên Windows, cần cài thêm:
+
 - [Tailscale for Windows](https://tailscale.com/download/windows)
 - Git for Windows (có sẵn ssh/scp)
 - Hoặc cài rsync qua: `choco install rsync` hoặc WSL
 
 Cấu hình đường dẫn trong `.env`:
+
 ```env
 SSH_PATH=C:\Program Files\Git\usr\bin\ssh.exe
 RSYNC_PATH=C:\Program Files\rsync\rsync.exe

package/bin/runner-sync.js

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 /**
  * bin/runner-sync.js
- * CLI entry point
+ * CLI entry point - Always run full workflow
  */
 
-const path = require("path");
 const Config = require("../src/utils/config");
 const Logger = require("../src/utils/logger");
 const { parseArgs, printHelp } = require("../src/cli/parser");
+const syncOrchestrator = require("../src/core/sync-orchestrator");
 const pkg = require("../package.json");
 
 // Parse arguments
-const { command, options } = parseArgs(process.argv);
+const { options } = parseArgs(process.argv);
 
 // Handle help
 if (options.help) {
@@ -20,19 +20,17 @@ if (options.help) {
 }
 
 // Handle version
-if (command === "version") {
+if (options.version) {
   console.log(`${pkg.name} v${pkg.version}`);
   process.exit(0);
 }
 
-// Create config
+// Create config & logger
 const config = new Config(options);
-
-// Create logger
 const logger = new Logger({
   packageName: pkg.name,
   version: pkg.version,
-  command,
+  command: "sync",
   verbose: options.verbose,
   quiet: options.quiet,
 });
@@ -40,46 +38,16 @@ const logger = new Logger({
 // Print banner
 logger.printBanner();
 
-// Run command
+// Run full workflow
 (async () => {
   try {
-    let commandModule;
-
-    switch (command) {
-      case "init":
-        commandModule = require("../src/cli/commands/init");
-        break;
-      case "sync":
-        commandModule = require("../src/cli/commands/sync");
-        break;
-      case "push":
-        commandModule = require("../src/cli/commands/push");
-        break;
-      case "status":
-        commandModule = require("../src/cli/commands/status");
-        break;
-      default:
-        logger.error(`Unknown command: ${command}`);
-        printHelp();
-        process.exit(1);
-    }
-
-    const result = await commandModule.run(config, logger);
-
-    if (result.success) {
-      process.exit(0);
-    } else {
-      process.exit(1);
-    }
+    const result = await syncOrchestrator.orchestrate(config, logger);
+    process.exit(result.success ? 0 : 1);
   } catch (err) {
     logger.error(err.message);
-
     if (options.verbose && err.stack) {
       logger.debug(err.stack);
     }
-
-    // Exit with appropriate code
-    const exitCode = err.exitCode || 1;
-    process.exit(exitCode);
+    process.exit(err.exitCode || 1);
   }
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ongtrieuhau861457/runner-tailscale-sync",
-  "version": "1.260202.11948",
+  "version": "1.260202.12010",
   "description": "Đồng bộ runner-data giữa các runner trên GitHub Actions, Azure Pipeline qua Tailscale network",
   "main": "src/index.js",
   "bin": {

package/src/cli/parser.js

@@ -3,32 +3,20 @@
  * Parse command-line arguments
  */
 
-/**
- * Parse command line arguments
- * Returns: { command, options }
- */
 function parseArgs(argv) {
-  const args = argv.slice(2); // Remove node and script path
+  const args = argv.slice(2);
 
   const options = {
     cwd: null,
     verbose: false,
     quiet: false,
     help: false,
+    version: false,
   };
 
-  let command = "sync"; // Default command
-
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
 
-    // Commands
-    if (arg === "init" || arg === "sync" || arg === "push" || arg === "status") {
-      command = arg;
-      continue;
-    }
-
-    // Options
     if (arg === "--cwd" && i + 1 < args.length) {
       options.cwd = args[++i];
       continue;
@@ -50,60 +38,56 @@ function parseArgs(argv) {
     }
 
     if (arg === "--version") {
-      command = "version";
+      options.version = true;
       continue;
     }
   }
 
-  return { command, options };
+  return { options };
 }
 
-/**
- * Print help
- */
 function printHelp() {
   console.log(`
 runner-tailscale-sync - Đồng bộ runner data qua Tailscale network
 
 USAGE:
-  runner-sync [command] [options]
+  runner-sync [options]
 
-COMMANDS:
-  init       Khởi tạo Tailscale và detect previous runner
-  sync       Full sync workflow (init + pull + stop services + push git)
-  push       Push .runner-data to git only
-  status     Show Tailscale status
-  --version  Show version
+DESCRIPTION:
+  Tự động chạy workflow: init → detect → pull → stop → push
+  - Init: Cài đặt và kết nối Tailscale
+  - Detect: Tìm runner trước đó trên mạng
+  - Pull: Đồng bộ .runner-data (nếu có runner cũ)
+  - Stop: Dừng services trên runner cũ (nếu có)
+  - Push: Đẩy code lên git
 
 OPTIONS:
   --cwd <path>    Set working directory (default: current dir)
-  --verbose, -v   Enable verbose logging
-  --quiet, -q     Suppress non-error output
+  --verbose       Enable verbose logging
+  --quiet         Suppress non-error output
   --help, -h      Show this help
+  --version       Show version
 
 ENVIRONMENT VARIABLES:
   TAILSCALE_CLIENT_ID       OAuth client ID (required if TAILSCALE_ENABLE=1)
   TAILSCALE_CLIENT_SECRET   OAuth client secret (required if TAILSCALE_ENABLE=1)
   TAILSCALE_TAGS            Tailscale tags (default: tag:ci)
   TAILSCALE_ENABLE          Enable Tailscale (0 or 1, default: 0)
-  SERVICES_TO_STOP          Comma-separated services to stop (default: cloudflared,pocketbase,http-server)
+  SERVICES_TO_STOP          Services to stop on old runner (default: cloudflared,pocketbase)
   GIT_PUSH_ENABLED          Enable git push (0 or 1, default: 1)
   GIT_BRANCH                Git branch (default: main)
   TOOL_CWD                  Working directory (can be overridden by --cwd)
 
 EXAMPLES:
-  # Full sync with Tailscale
+  # Run full workflow
   TAILSCALE_ENABLE=1 runner-sync
 
-  # Just push to git
-  runner-sync push
+  # Verbose mode
+  runner-sync --verbose
 
   # Custom working directory
   runner-sync --cwd /path/to/project
 
-  # Verbose mode
-  runner-sync -v
-
 For more info: https://github.com/yourname/runner-tailscale-sync
 `);
 }

package/src/core/sync-orchestrator.js

@@ -50,9 +50,6 @@ function plan(input) {
   };
 }
 
-/**
- * Execute - chạy từng bước
- */
 async function execute(planResult, input) {
   const { config, logger } = input;
   const results = {};
@@ -77,25 +74,45 @@ async function execute(planResult, input) {
 
         case "detect_previous_runner":
           results.detection = await runnerDetector.detectPreviousRunner(config, logger);
+
+          // Set flag for later steps
+          const hasPreviousRunner = results.detection?.previousRunner != null;
+
+          if (!hasPreviousRunner) {
+            logger.info("No previous runner detected - skipping pull/stop/push");
+          }
           break;
 
         case "pull_data":
-          results.pullData = await dataSync.pullData(
-            config,
-            results.detection?.previousRunner,
-            logger
-          );
+          // Check if we have previous runner
+          if (!results.detection?.previousRunner) {
+            logger.info("Skipping pull - no previous runner");
+            results.pullData = { success: true, skipped: true };
+            break;
+          }
+
+          results.pullData = await dataSync.pullData(config, results.detection.previousRunner, logger);
           break;
 
         case "stop_remote_services":
-          results.stopServices = await serviceController.stopRemoteServices(
-            config,
-            results.detection?.previousRunner,
-            logger
-          );
+          // Check if we have previous runner
+          if (!results.detection?.previousRunner) {
+            logger.info("Skipping service stop - no previous runner");
+            results.stopServices = { success: true, skipped: true };
+            break;
+          }
+
+          results.stopServices = await serviceController.stopRemoteServices(config, results.detection.previousRunner, logger);
           break;
 
         case "push_to_git":
+          // Check if we have previous runner
+          if (!results.detection?.previousRunner) {
+            logger.info("Skipping git push - no previous runner");
+            results.pushGit = { success: true, skipped: true };
+            break;
+          }
+
           results.pushGit = await pushToGit(config, logger);
           break;
 
@@ -150,7 +167,7 @@ function report(results, input) {
  */
 async function setupDirectories(config, logger) {
   logger.info("Setting up directories...");
-  
+
   const dirs = config.getDirectoriesToEnsure();
   fs_adapter.ensureDirs(dirs);
 
@@ -175,13 +192,7 @@ async function connectTailscale(config, logger) {
   }
 
   // Login
-  await tailscale.login(
-    config.tailscaleClientId,
-    config.tailscaleClientSecret,
-    config.tailscaleTags,
-    logger,
-    config
-  );
+  await tailscale.login(config.tailscaleClientId, config.tailscaleClientSecret, config.tailscaleTags, logger, config);
 
   // Get connection info
   const ip = tailscale.getIP(logger);
@@ -241,7 +252,7 @@ async function orchestrate(config, logger) {
 
   // Step 3: Plan
   const planResult = plan(input);
-  logger.debug(`Planned ${planResult.steps.filter(s => s.enabled).length} steps`);
+  logger.debug(`Planned ${planResult.steps.filter((s) => s.enabled).length} steps`);
 
   // Step 4: Execute
   const execResult = await execute(planResult, input);

package/src/index.js

@@ -110,9 +110,6 @@ async function status(options = {}) {
 module.exports = {
   // Main API
   sync,
-  init,
-  push,
-  status,
 
   // Core modules
   syncOrchestrator,