sloss-cli 1.2.2 → 1.3.1

package/bin/sloss.js

@@ -120,15 +120,15 @@ program
 // Build command
 program
   .command('build')
-  .description('Queue a build via the Sloss build agent')
+  .description('Run a local EAS build and upload to Sloss')
   .option('--platform <platform>', 'Platform (ios or android)', 'ios')
   .option('--profile <profile>', 'Build profile (development, preview, production)', 'development')
   .option('--bump <type>', 'Version bump type for production (patch, minor, major)', 'patch')
-  .option('--dir <path>', 'Project directory (default: current directory)', '.')
+  .option('--dir <path>', 'Project directory (default: current directory)')
+  .option('--yes', 'Skip confirmation prompt')
   .action(async (options) => {
     try {
-      const config = resolveConfig(program.opts());
-      await buildCommand(options, config);
+      await buildCommand(options);
     } catch (error) {
       console.error(`Error: ${error.message}`);
       process.exit(1);

package/build.sh

@@ -0,0 +1,274 @@
+#!/usr/bin/env bash
+# sloss build — Local EAS build + Sloss upload for Expo apps
+# Invoked by the `sloss build` Node CLI command.
+set -euo pipefail
+
+# ─── Defaults ───────────────────────────────────────────────────────────────
+PLATFORM="ios"
+PROFILE="development"
+BUMP="patch"
+PROJECT_DIR="$(pwd)"
+YES=false
+
+# ─── Flag parsing ───────────────────────────────────────────────────────────
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --platform)  PLATFORM="$2";  shift 2 ;;
+    --profile)   PROFILE="$2";   shift 2 ;;
+    --bump)      BUMP="$2";      shift 2 ;;
+    --dir)       PROJECT_DIR="$2"; shift 2 ;;
+    --yes|-y)    YES=true;       shift ;;
+    --help|-h)
+      echo "Usage: sloss build [options]"
+      echo ""
+      echo "Options:"
+      echo "  --platform ios|android   Target platform (default: ios)"
+      echo "  --profile  <name>        EAS build profile (default: development)"
+      echo "  --bump     patch|minor|major  Version bump type (default: patch)"
+      echo "  --dir      <path>        Project directory (default: cwd)"
+      echo "  --yes, -y                Skip confirmation prompt"
+      echo "  --help, -h               Show this help"
+      exit 0
+      ;;
+    *) echo "Unknown flag: $1"; exit 1 ;;
+  esac
+done
+
+# ─── Helpers ────────────────────────────────────────────────────────────────
+# Use node for all JSON parsing (jq not guaranteed).
+json_get() {
+  # json_get <file> <key> — read a top-level string value
+  node -e "const f=require('fs').readFileSync('$1','utf8'); console.log(JSON.parse(f)['$2'])"
+}
+
+json_set() {
+  # json_set <file> <key> <value> — set a top-level string value, preserve formatting
+  node -e "
+    const fs=require('fs'), p='$1', k='$2', v='$3';
+    const obj=JSON.parse(fs.readFileSync(p,'utf8'));
+    obj[k]=v;
+    fs.writeFileSync(p, JSON.stringify(obj, null, 2)+'\n');
+  "
+}
+
+json_nested() {
+  # json_nested <file> <path.to.key> — read a nested value via dot path
+  node -e "
+    const fs=require('fs'), p='$1', keys='$2'.split('.');
+    let obj=JSON.parse(fs.readFileSync(p,'utf8'));
+    for(const k of keys) obj=obj[k];
+    console.log(obj);
+  "
+}
+
+plist_set() {
+  # plist_set <file> <key> <value> — update a value in an XML plist
+  /usr/libexec/PlistBuddy -c "Set :$2 $3" "$1" 2>/dev/null || \
+    sed -i '' "s|<key>$2</key>.*<string>[^<]*</string>|<key>$2</key>\n\t<string>$3</string>|" "$1"
+}
+
+bump_version() {
+  # bump_version <current> <patch|minor|major> → new version string
+  node -e "
+    const [M,m,p]='$1'.split('.').map(Number);
+    const t='$2';
+    if(t==='major') console.log((M+1)+'.0.0');
+    else if(t==='minor') console.log(M+'.'+(m+1)+'.0');
+    else console.log(M+'.'+m+'.'+(p+1));
+  "
+}
+
+# ─── Validate inputs ───────────────────────────────────────────────────────
+if [[ "$PLATFORM" != "ios" && "$PLATFORM" != "android" ]]; then
+  echo "Error: --platform must be ios or android"; exit 1
+fi
+if [[ "$BUMP" != "patch" && "$BUMP" != "minor" && "$BUMP" != "major" ]]; then
+  echo "Error: --bump must be patch, minor, or major"; exit 1
+fi
+
+# ─── Read .sloss.json ──────────────────────────────────────────────────────
+CONFIG="$PROJECT_DIR/.sloss.json"
+if [[ ! -f "$CONFIG" ]]; then
+  echo "Error: No .sloss.json found in $PROJECT_DIR"
+  exit 1
+fi
+
+APP_NAME=$(json_get "$CONFIG" "app_name")
+BUNDLE_ID=$(json_get "$CONFIG" "bundle_id")
+VERSION_FILE="$PROJECT_DIR/$(json_get "$CONFIG" "version_file")"
+IOS_PLIST="$PROJECT_DIR/$(json_get "$CONFIG" "ios_plist")"
+BUNDLE_SUFFIX=$(json_nested "$CONFIG" "profiles.$PROFILE.bundle_id_suffix")
+
+FULL_BUNDLE_ID="${BUNDLE_ID}${BUNDLE_SUFFIX}"
+
+# ─── Read current version info ─────────────────────────────────────────────
+CURRENT_VERSION=$(json_get "$VERSION_FILE" "version")
+CURRENT_BUILD=$(json_get "$VERSION_FILE" "buildNumber")
+NEW_BUILD=$((CURRENT_BUILD + 1))
+
+# Marketing version bump (production only)
+if [[ "$PROFILE" == "production" ]]; then
+  NEW_VERSION=$(bump_version "$CURRENT_VERSION" "$BUMP")
+else
+  NEW_VERSION="$CURRENT_VERSION"
+fi
+
+# ─── Confirmation ───────────────────────────────────────────────────────────
+echo ""
+echo "╔══════════════════════════════════════════╗"
+echo "║           Sloss Build Summary            ║"
+echo "╠══════════════════════════════════════════╣"
+echo "║  App:       $APP_NAME"
+echo "║  Bundle ID: $FULL_BUNDLE_ID"
+echo "║  Platform:  $PLATFORM"
+echo "║  Profile:   $PROFILE"
+echo "║  Version:   $CURRENT_VERSION → $NEW_VERSION"
+echo "║  Build:     $CURRENT_BUILD → $NEW_BUILD"
+echo "╚══════════════════════════════════════════╝"
+echo ""
+
+if [[ "$YES" != true ]]; then
+  read -r -p "Proceed? [y/N] " confirm
+  if [[ "$confirm" != [yY] && "$confirm" != [yY][eE][sS] ]]; then
+    echo "Aborted."
+    exit 0
+  fi
+fi
+
+# ─── Bump versions ─────────────────────────────────────────────────────────
+echo "📦 Bumping build number: $CURRENT_BUILD → $NEW_BUILD"
+json_set "$VERSION_FILE" "buildNumber" "$NEW_BUILD"
+
+# Update Info.plist CFBundleVersion
+if [[ -f "$IOS_PLIST" ]]; then
+  plist_set "$IOS_PLIST" "CFBundleVersion" "$NEW_BUILD"
+fi
+
+if [[ "$PROFILE" == "production" ]]; then
+  echo "📦 Bumping marketing version: $CURRENT_VERSION → $NEW_VERSION ($BUMP)"
+  json_set "$VERSION_FILE" "version" "$NEW_VERSION"
+  if [[ -f "$IOS_PLIST" ]]; then
+    plist_set "$IOS_PLIST" "CFBundleShortVersionString" "$NEW_VERSION"
+  fi
+fi
+
+# ─── Run EAS build ──────────────────────────────────────────────────────────
+echo ""
+echo "🔨 Starting EAS local build..."
+echo "   eas build --profile $PROFILE --platform $PLATFORM --local --non-interactive"
+echo ""
+
+BUILD_LOG=$(mktemp)
+ARTIFACT_PATH=""
+
+# Run build, tee output so user sees it and we can parse it
+set +e
+(cd "$PROJECT_DIR" && eas build --profile "$PROFILE" --platform "$PLATFORM" --local --non-interactive 2>&1) | tee "$BUILD_LOG"
+BUILD_EXIT=${PIPESTATUS[0]}
+set -e
+
+if [[ $BUILD_EXIT -ne 0 ]]; then
+  echo ""
+  echo "❌ EAS build failed (exit code $BUILD_EXIT). Skipping upload."
+  rm -f "$BUILD_LOG"
+  exit 1
+fi
+
+# ─── Find artifact ──────────────────────────────────────────────────────────
+# EAS outputs lines like:
+#   "Build artifact: /path/to/build-xxxx.ipa"
+#   or the artifact path on its own line ending in .ipa/.apk
+if [[ "$PLATFORM" == "ios" ]]; then
+  EXT="ipa"
+else
+  EXT="apk"
+fi
+
+ARTIFACT_PATH=$(grep -oE '/[^ ]+\.'$EXT "$BUILD_LOG" | tail -1 || true)
+
+# Fallback: check common EAS output directory
+if [[ -z "$ARTIFACT_PATH" || ! -f "$ARTIFACT_PATH" ]]; then
+  ARTIFACT_PATH=$(find "$PROJECT_DIR" -maxdepth 1 -name "*.$EXT" -newer "$VERSION_FILE" -print -quit 2>/dev/null || true)
+fi
+
+rm -f "$BUILD_LOG"
+
+if [[ -z "$ARTIFACT_PATH" || ! -f "$ARTIFACT_PATH" ]]; then
+  echo ""
+  echo "⚠️  Could not locate build artifact. Check the build output above."
+  echo "   Expected a .$EXT file."
+  exit 1
+fi
+
+echo ""
+echo "✅ Build artifact: $ARTIFACT_PATH"
+
+# ─── Upload to Sloss ───────────────────────────────────────────────────────
+echo ""
+echo "📤 Uploading to Sloss..."
+
+# Resolve Sloss URL and API key
+UPLOAD_URL="${SLOSS_URL:-https://sloss.ngrok.app}/upload"
+
+if [[ -z "${SLOSS_API_KEY:-}" ]]; then
+  CREDS_FILE="$HOME/.config/sloss/credentials.json"
+  if [[ -f "$CREDS_FILE" ]]; then
+    SLOSS_API_KEY=$(node -e "console.log(JSON.parse(require('fs').readFileSync('$CREDS_FILE','utf8')).api_key)")
+  else
+    echo "❌ No SLOSS_API_KEY env var and no ~/.config/sloss/credentials.json found."
+    echo "   Artifact is at: $ARTIFACT_PATH"
+    exit 1
+  fi
+fi
+
+# Upload — field name is 'ipa' for iOS, 'apk' for Android
+FIELD_NAME="$EXT"
+set +e
+UPLOAD_RESPONSE=$(curl -s -w "\n%{http_code}" \
+  -H "Authorization: Bearer $SLOSS_API_KEY" \
+  -F "${FIELD_NAME}=@${ARTIFACT_PATH}" \
+  -F "app_name=${APP_NAME}" \
+  -F "bundle_id=${FULL_BUNDLE_ID}" \
+  -F "version=${NEW_VERSION}" \
+  -F "build_number=${NEW_BUILD}" \
+  -F "profile=${PROFILE}" \
+  "$UPLOAD_URL")
+UPLOAD_EXIT=$?
+set -e
+
+if [[ $UPLOAD_EXIT -ne 0 ]]; then
+  echo "❌ Upload failed (curl error)."
+  echo "   Artifact is at: $ARTIFACT_PATH"
+  exit 1
+fi
+
+HTTP_CODE=$(echo "$UPLOAD_RESPONSE" | tail -1)
+RESPONSE_BODY=$(echo "$UPLOAD_RESPONSE" | sed '$d')
+
+if [[ "$HTTP_CODE" -lt 200 || "$HTTP_CODE" -ge 300 ]]; then
+  echo "❌ Upload failed (HTTP $HTTP_CODE)."
+  echo "   $RESPONSE_BODY"
+  echo "   Artifact is at: $ARTIFACT_PATH"
+  exit 1
+fi
+
+# ─── Print results ──────────────────────────────────────────────────────────
+PAGE_URL=$(node -e "try{console.log(JSON.parse(process.argv[1]).page_url||'')}catch{console.log('')}" "$RESPONSE_BODY")
+INSTALL_URL=$(node -e "try{console.log(JSON.parse(process.argv[1]).install_url||'')}catch{console.log('')}" "$RESPONSE_BODY")
+
+echo ""
+echo "╔══════════════════════════════════════════╗"
+echo "║           🎉 Build Complete!             ║"
+echo "╠══════════════════════════════════════════╣"
+echo "║  App:       $APP_NAME"
+echo "║  Version:   $NEW_VERSION ($NEW_BUILD)"
+echo "║  Profile:   $PROFILE"
+echo "║  Platform:  $PLATFORM"
+echo "║  Artifact:  $ARTIFACT_PATH"
+if [[ -n "$PAGE_URL" ]]; then
+echo "║  Page:      $PAGE_URL"
+fi
+if [[ -n "$INSTALL_URL" ]]; then
+echo "║  Install:   $INSTALL_URL"
+fi
+echo "╚══════════════════════════════════════════╝"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sloss-cli",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "CLI for Sloss — a self-hosted IPA/APK distribution server",
   "type": "module",
   "bin": {
@@ -9,6 +9,7 @@
   "files": [
     "bin/",
     "src/",
+    "build.sh",
     "skills/",
     "README.md"
   ],

package/src/commands/build.js

@@ -1,115 +1,40 @@
 /**
- * Build command - Tar up the project and queue a remote build via Sloss agent
+ * Build command — thin wrapper that execs cli/build.sh with CLI flags passed through.
  */
 
-import { SlossClient } from '../client.js';
-import { existsSync, readFileSync } from 'fs';
-import { resolve, basename } from 'path';
-import { execSync } from 'child_process';
-import { tmpdir } from 'os';
-import { join } from 'path';
-import { formatBuild } from '../format.js';
+import { resolve, dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+import { execFileSync } from 'child_process';
 
-export async function buildCommand(options, config) {
-  const platform = (options.platform || 'ios').toLowerCase();
-  const profile = (options.profile || 'development').toLowerCase();
-  const bump = options.bump || 'patch';
-  const projectDir = resolve(options.dir || '.');
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const BUILD_SCRIPT = resolve(__dirname, '../../build.sh');
 
-  // Validate platform
-  if (!['ios', 'android'].includes(platform)) {
-    throw new Error('Platform must be "ios" or "android"');
-  }
+export async function buildCommand(options) {
+  const args = [];
 
-  // Validate profile
-  if (!['development', 'preview', 'production'].includes(profile)) {
-    throw new Error('Profile must be "development", "preview", or "production"');
+  if (options.platform) {
+    args.push('--platform', options.platform);
   }
-
-  // Check for .sloss.json
-  const slossConfigPath = join(projectDir, '.sloss.json');
-  if (!existsSync(slossConfigPath)) {
-    throw new Error(
-      `.sloss.json not found in ${projectDir}\n` +
-      '  Create a .sloss.json config file in your project root.\n' +
-      '  See: https://github.com/aualdrich/sloss#build-agent'
-    );
+  if (options.profile) {
+    args.push('--profile', options.profile);
   }
-
-  // Read config for display
-  const slossConfig = JSON.parse(readFileSync(slossConfigPath, 'utf8'));
-
-  console.log('╔══════════════════════════════════════════╗');
-  console.log('║ SLOSS BUILD                              ║');
-  console.log('╠══════════════════════════════════════════╣');
-  console.log(`║ app       : ${(slossConfig.app_name || '—').padEnd(27)} ║`);
-  console.log(`║ platform  : ${platform.padEnd(27)} ║`);
-  console.log(`║ profile   : ${profile.padEnd(27)} ║`);
-  console.log(`║ bump      : ${bump.padEnd(27)} ║`);
-  console.log(`║ server    : ${config.baseUrl.padEnd(27)} ║`);
-  console.log('╚══════════════════════════════════════════╝');
-  console.log('');
-
-  // Create tarball
-  console.log('📦 Packaging project...');
-  const tarballPath = join(tmpdir(), `sloss-build-${Date.now()}.tar.gz`);
-
-  // Use git archive if in a git repo (respects .gitignore), otherwise tar with excludes
-  let tarCmd;
-  try {
-    execSync('git rev-parse --git-dir', { cwd: projectDir, stdio: 'pipe' });
-    // git archive from the repo root, only including the project subdir if needed
-    const gitRoot = execSync('git rev-parse --show-toplevel', { cwd: projectDir, encoding: 'utf8' }).trim();
-    const relPath = projectDir.replace(gitRoot, '').replace(/^\//, '');
-
-    if (relPath) {
-      // Project is in a subdirectory — include only that dir
-      tarCmd = `cd "${gitRoot}" && git archive --format=tar HEAD -- "${relPath}" | gzip > "${tarballPath}"`;
-    } else {
-      tarCmd = `cd "${projectDir}" && git archive --format=tar.gz HEAD > "${tarballPath}"`;
-    }
-  } catch {
-    // Not a git repo — fall back to tar with common excludes
-    tarCmd = `cd "${projectDir}" && tar czf "${tarballPath}" --exclude=node_modules --exclude=.git --exclude=ios/build --exclude=android/build .`;
+  if (options.bump) {
+    args.push('--bump', options.bump);
   }
-
-  execSync(tarCmd, { stdio: 'pipe' });
-
-  // Get tarball size for display
-  const { statSync } = await import('fs');
-  const tarSize = statSync(tarballPath).size;
-  const sizeMB = (tarSize / (1024 * 1024)).toFixed(1);
-  console.log(`   → ${sizeMB} MB`);
-
-  // Read version info from .sloss.json's version_file
-  let version = '';
-  let buildNumber = '';
-  if (slossConfig.version_file) {
-    const versionFilePath = join(projectDir, slossConfig.version_file);
-    if (existsSync(versionFilePath)) {
-      const versionData = JSON.parse(readFileSync(versionFilePath, 'utf8'));
-      version = versionData.version || '';
-      buildNumber = versionData.buildNumber || '';
-    }
+  if (options.dir) {
+    args.push('--dir', resolve(options.dir));
+  }
+  if (options.yes) {
+    args.push('--yes');
   }
 
-  // Upload tarball to start build
-  console.log('🚀 Queuing build...');
-  const client = new SlossClient(config.baseUrl, config.apiKey);
-  const result = await client.startBuild(tarballPath, {
-    profile,
-    platform,
-    bump,
-    appName: slossConfig.app_name || '',
-    bundleId: slossConfig.bundle_id || '',
-    version,
-    buildNumber,
-  });
-
-  // Clean up tarball
-  const { unlinkSync } = await import('fs');
-  try { unlinkSync(tarballPath); } catch { /* ignore */ }
-
-  console.log('');
-  console.log(formatBuild(result, config.jsonMode));
+  try {
+    execFileSync('bash', [BUILD_SCRIPT, ...args], {
+      stdio: 'inherit',
+      env: process.env,
+    });
+  } catch (error) {
+    // build.sh handles its own error messages; just exit with the same code
+    process.exit(error.status || 1);
+  }
 }