Revert "V2.4.0 (#381)" (#392)

This reverts commit f2d00225c9.

setup/setup.bat

@@ -1,22 +1,19 @@
 @echo off
 setlocal
-REM Wrapper to run setup via npm (Windows)
-REM Navigates to project root and runs npm run setup
+REM Lightweight wrapper to run setup.mjs without prereq detection (Windows)
+REM Assumes Node is already installed and available in PATH.
 
 set SCRIPT_DIR=%~dp0
-set PROJECT_ROOT=%SCRIPT_DIR%..
+set SETUP_FILE=%SCRIPT_DIR%setup.mjs
 
-if not exist "%PROJECT_ROOT%\package.json" (
-  echo [ERROR] package.json not found in project root.
+if not exist "%SETUP_FILE%" (
+  echo [ERROR] setup.mjs not found next to this batch file.
   pause
   exit /b 1
 )
 
-echo Navigating to project root...
-cd /d "%PROJECT_ROOT%"
-
-echo Running setup script via npm...
-call npm run setup
+echo Running setup script...
+node "%SETUP_FILE%"
 set EXITCODE=%ERRORLEVEL%
 echo.
 echo Setup finished with exit code %EXITCODE%.

setup/setup.mjs

@@ -3,7 +3,7 @@
  * Unified cross-platform setup script for Microsoft Rewards Script V2.
  * 
  * Features:
- *  - Renames accounts.example.jsonc -> accounts.json (idempotent)
+ *  - Renames accounts.example.json -> accounts.json (idempotent)
  *  - Guides user through account configuration (email, password, TOTP, proxy)
  *  - Explains config.jsonc structure and key settings
  *  - Installs dependencies (npm install)
@@ -25,8 +25,8 @@ import { spawn } from 'child_process';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-// Project root = two levels up from setup/update directory
-const PROJECT_ROOT = path.resolve(__dirname, '..', '..');
+// Project root = parent of this setup directory
+const PROJECT_ROOT = path.resolve(__dirname, '..');
 const SRC_DIR = path.join(PROJECT_ROOT, 'src');
 
 function log(msg) { console.log(msg); }
@@ -35,16 +35,16 @@ function error(msg) { console.error(msg); }
 
 function renameAccountsIfNeeded() {
   const accounts = path.join(SRC_DIR, 'accounts.json');
-  const example = path.join(SRC_DIR, 'accounts.example.jsonc');
+  const example = path.join(SRC_DIR, 'accounts.example.json');
   if (fs.existsSync(accounts)) {
     log('accounts.json already exists - skipping rename.');
     return;
   }
   if (fs.existsSync(example)) {
-    log('Renaming accounts.example.jsonc to accounts.json...');
+    log('Renaming accounts.example.json to accounts.json...');
     fs.renameSync(example, accounts);
   } else {
-    warn('Neither accounts.json nor accounts.example.jsonc found.');
+    warn('Neither accounts.json nor accounts.example.json found.');
   }
 }
 

setup/setup.sh

@@ -1,19 +1,18 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Wrapper to run setup via npm (Linux/macOS)
+# Wrapper to run unified Node setup script (setup/setup.mjs) regardless of CWD.
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+SETUP_FILE="${SCRIPT_DIR}/setup.mjs"
 
 echo "=== Prerequisite Check ==="
 
-if command -v npm >/dev/null 2>&1; then
-  NPM_VERSION="$(npm -v 2>/dev/null || true)"
-  echo "npm detected: ${NPM_VERSION}"
+if command -v node >/dev/null 2>&1; then
+  NODE_VERSION="$(node -v 2>/dev/null || true)"
+  echo "Node detected: ${NODE_VERSION}"
 else
-  echo "[ERROR] npm not detected."
-  echo "  Install Node.js and npm from nodejs.org or your package manager"
-  exit 1
+  echo "[WARN] Node.js not detected."
+  echo "  Install (Linux): use your package manager (e.g. 'sudo apt install nodejs npm' or install from nodejs.org for latest)."
 fi
 
 if command -v git >/dev/null 2>&1; then
@@ -24,12 +23,19 @@ else
   echo "  Install (Linux): e.g. 'sudo apt install git' (or your distro equivalent)."
 fi
 
-if [ ! -f "${PROJECT_ROOT}/package.json" ]; then
-  echo "[ERROR] package.json not found at ${PROJECT_ROOT}" >&2
+if [ -z "${NODE_VERSION:-}" ]; then
+  read -r -p "Continue anyway? (yes/no) : " CONTINUE
+  case "${CONTINUE,,}" in
+    yes|y) ;;
+    *) echo "Aborting. Install prerequisites then re-run."; exit 1;;
+  esac
+fi
+
+if [ ! -f "${SETUP_FILE}" ]; then
+  echo "[ERROR] setup.mjs not found at ${SETUP_FILE}" >&2
   exit 1
 fi
 
 echo
-echo "=== Running setup script via npm ==="
-cd "${PROJECT_ROOT}"
-exec npm run setup
+echo "=== Running setup script ==="
+exec node "${SETUP_FILE}"

setup/update/update.mjs

@@ -1,21 +1,19 @@
 /* eslint-disable linebreak-style */
 /**
- * Smart Auto-Update Script
- * 
- * Intelligently updates while preserving user settings:
- * - ALWAYS updates code files (*.ts, *.js, etc.)
- * - ONLY updates config.jsonc if remote has changes to it
- * - ONLY updates accounts.json if remote has changes to it
- * - KEEPS user passwords/emails/settings otherwise
+ * Post-run auto-update script
+ * - If invoked with --git, runs: git fetch --all --prune; git pull --ff-only; npm ci; npm run build
+ * - If invoked with --docker, runs: docker compose pull; docker compose up -d
  *
  * Usage:
  *   node setup/update/update.mjs --git
  *   node setup/update/update.mjs --docker
+ *
+ * Notes:
+ * - Commands are safe-by-default: use --ff-only for pull to avoid merge commits.
+ * - Script is no-op if the relevant tool is not available or commands fail.
  */
 
-import { spawn, execSync } from 'node:child_process'
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs'
-import { join } from 'node:path'
+import { spawn } from 'node:child_process'
 
 function run(cmd, args, opts = {}) {
   return new Promise((resolve) => {
@@ -27,166 +25,20 @@ function run(cmd, args, opts = {}) {
 
 async function which(cmd) {
   const probe = process.platform === 'win32' ? 'where' : 'which'
-  const code = await run(probe, [cmd], { stdio: 'ignore' })
+  const code = await run(probe, [cmd])
   return code === 0
 }
 
-function exec(cmd) {
-  try {
-    return execSync(cmd, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim()
-  } catch {
-    return null
-  }
-}
-
 async function updateGit() {
   const hasGit = await which('git')
-  if (!hasGit) {
-    console.log('Git not found. Skipping update.')
-    return 1
-  }
-
-  console.log('\n' + '='.repeat(60))
-  console.log('Smart Git Update')
-  console.log('='.repeat(60))
-
-  // Step 1: Read config to get user preferences
-  let userConfig = { autoUpdateConfig: false, autoUpdateAccounts: false }
-  try {
-    if (existsSync('src/config.jsonc')) {
-      const configContent = readFileSync('src/config.jsonc', 'utf8')
-        .replace(/\/\/.*$/gm, '') // remove comments
-        .replace(/\/\*[\s\S]*?\*\//g, '') // remove multi-line comments
-      const config = JSON.parse(configContent)
-      if (config.update) {
-        userConfig.autoUpdateConfig = config.update.autoUpdateConfig ?? false
-        userConfig.autoUpdateAccounts = config.update.autoUpdateAccounts ?? false
-      }
-    }
-  } catch (e) {
-    console.log('Warning: Could not read config.jsonc, using defaults (preserve local files)')
-  }
-
-  console.log('\nUser preferences:')
-  console.log(`  Auto-update config.jsonc: ${userConfig.autoUpdateConfig}`)
-  console.log(`  Auto-update accounts.json: ${userConfig.autoUpdateAccounts}`)
-
-  // Step 2: Fetch
-  console.log('\nFetching latest changes...')
+  if (!hasGit) return 1
   await run('git', ['fetch', '--all', '--prune'])
-
-  // Step 3: Get current branch
-  const currentBranch = exec('git branch --show-current')
-  if (!currentBranch) {
-    console.log('Could not determine current branch.')
-    return 1
-  }
-
-  // Step 4: Check which files changed in remote
-  const remoteBranch = `origin/${currentBranch}`
-  const filesChanged = exec(`git diff --name-only HEAD ${remoteBranch}`)
-  
-  if (!filesChanged) {
-    console.log('Already up to date!')
-    return 0
-  }
-
-  const changedFiles = filesChanged.split('\n').filter(f => f.trim())
-  const configChanged = changedFiles.includes('src/config.jsonc')
-  const accountsChanged = changedFiles.includes('src/accounts.json')
-
-  // Step 5: ALWAYS backup config and accounts (smart strategy!)
-  const backupDir = join(process.cwd(), '.update-backup')
-  mkdirSync(backupDir, { recursive: true })
-  
-  const filesToRestore = []
-  
-  if (existsSync('src/config.jsonc')) {
-    console.log('\nBacking up config.jsonc...')
-    writeFileSync(join(backupDir, 'config.jsonc'), readFileSync('src/config.jsonc', 'utf8'))
-    // Restore if: remote changed it AND user doesn't want auto-update
-    if (configChanged && !userConfig.autoUpdateConfig) {
-      filesToRestore.push('config.jsonc')
-    }
-  }
-
-  if (existsSync('src/accounts.json')) {
-    console.log('Backing up accounts.json...')
-    writeFileSync(join(backupDir, 'accounts.json'), readFileSync('src/accounts.json', 'utf8'))
-    // Restore if: remote changed it AND user doesn't want auto-update
-    if (accountsChanged && !userConfig.autoUpdateAccounts) {
-      filesToRestore.push('accounts.json')
-    }
-  }
-
-  // Show what will happen
-  console.log('\nRemote changes:')
-  if (configChanged) {
-    console.log(`  config.jsonc: ${userConfig.autoUpdateConfig ? 'WILL UPDATE' : 'KEEPING LOCAL (restoring from backup)'}`)
-  } else {
-    console.log('  config.jsonc: no changes in remote')
-  }
-  if (accountsChanged) {
-    console.log(`  accounts.json: ${userConfig.autoUpdateAccounts ? 'WILL UPDATE' : 'KEEPING LOCAL (restoring from backup)'}`)
-  } else {
-    console.log('  accounts.json: no changes in remote')
-  }
-
-  // Step 6: Stash changes
-  const hasChanges = exec('git status --porcelain')
-  if (hasChanges) {
-    console.log('\nStashing local changes...')
-    await run('git', ['stash', 'push', '-m', 'Auto-update backup'])
-  }
-
-  // Step 7: Pull
-  console.log('\nPulling latest code...')
-  const pullCode = await run('git', ['pull', '--rebase'])
-  
-  if (pullCode !== 0) {
-    console.log('Pull failed.')
-    if (hasChanges) await run('git', ['stash', 'pop'])
-    return pullCode
-  }
-
-  // Step 8: Restore files based on user preferences
-  if (filesToRestore.length > 0) {
-    console.log('\nRestoring local files (per your config preferences)...')
-    for (const file of filesToRestore) {
-      const content = readFileSync(join(backupDir, file), 'utf8')
-      writeFileSync(join('src', file), content)
-      console.log(`  ✓ Restored ${file}`)
-    }
-  }
-
-  // Step 9: Restore stash
-  if (hasChanges) {
-    await run('git', ['stash', 'pop'])
-  }
-
-  // Step 9: Install & build
+  const pullCode = await run('git', ['pull', '--ff-only'])
+  if (pullCode !== 0) return pullCode
   const hasNpm = await which('npm')
   if (!hasNpm) return 0
-
-  console.log('\nInstalling dependencies...')
   await run('npm', ['ci'])
-  
-  console.log('\nBuilding project...')
-  const buildCode = await run('npm', ['run', 'build'])
-
-  console.log('\n' + '='.repeat(60))
-  console.log('Update completed!')
-  console.log('='.repeat(60))
-  
-  // Optional: Show community info for advanced features
-  if (Math.random() > 0.7) {
-    console.log('\n💡 Tip: Looking for faster updates and advanced features?')
-    console.log('   Check out enhanced builds with better anti-detection.')
-    console.log('   Community: https://discord.gg/kn3695Kx32')
-  }
-  console.log('')
-
-  return buildCode
+  return run('npm', ['run', 'build'])
 }
 
 async function updateDocker() {
@@ -209,17 +61,7 @@ async function main() {
   if (doDocker && code === 0) {
     code = await updateDocker()
   }
-  
-  // Only exit if not called from scheduler
-  // When FROM_SCHEDULER=1, the parent script will handle process lifecycle
-  if (process.env.FROM_SCHEDULER !== '1') {
-    process.exit(code)
-  }
+  process.exit(code)
 }
 
-main().catch(() => {
-  // Only exit on error if not called from scheduler
-  if (process.env.FROM_SCHEDULER !== '1') {
-    process.exit(1)
-  }
-})
+main().catch(() => process.exit(1))