@fenwave/agent 1.1.3 → 1.1.5

package/cli-commands.js

@@ -127,7 +127,6 @@ function setupCLICommands(program, startServerFunction) {
     .action(async () => {
       try {
         const { loadDeviceCredential, isDeviceRegistered } = await import('./store/deviceCredentialStore.js');
-        const { hasNpmToken } = await import('./store/npmTokenStore.js');
 
         console.log(chalk.bold('\n📊 Fenwave Agent Status\n'));
 
@@ -233,7 +232,6 @@ function setupCLICommands(program, startServerFunction) {
       try {
         const { getDeviceMetadata } = await import('./utils/deviceInfo.js');
         const { saveDeviceCredential, isDeviceRegistered } = await import('./store/deviceCredentialStore.js');
-        const { saveNpmToken } = await import('./store/npmTokenStore.js');
 
         // Check if already registered
         if (isDeviceRegistered()) {
@@ -299,11 +297,6 @@ function setupCLICommands(program, startServerFunction) {
           agentVersion: deviceMetadata.agentVersion,
         });
 
-        // Save NPM token if provided
-        if (response.data.npmToken) {
-          saveNpmToken(response.data.npmToken);
-        }
-
         spinner.succeed('Device registered successfully');
         console.log(chalk.green('\n✅ Registration Complete'));
         console.log(chalk.gray(`   Device ID: ${response.data.deviceId}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fenwave/agent",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Fenwave Docker Agent and CLI",
   "keywords": [
     "fenwave",

package/scripts/release.sh

@@ -0,0 +1,212 @@
+#!/bin/bash
+
+# Fenwave Agent Release Script
+# Usage: ./scripts/release.sh [patch|minor|major|x.x.x]
+
+set -e
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Functions
+log_info() { echo -e "${BLUE}ℹ ${NC}$1"; }
+log_success() { echo -e "${GREEN}✓ ${NC}$1"; }
+log_warning() { echo -e "${YELLOW}⚠ ${NC}$1"; }
+log_error() { echo -e "${RED}✗ ${NC}$1"; exit 1; }
+
+# Check prerequisites
+check_prerequisites() {
+    log_info "Checking prerequisites..."
+
+    command -v node >/dev/null 2>&1 || log_error "Node.js is required"
+    command -v npm >/dev/null 2>&1 || log_error "npm is required"
+    command -v gh >/dev/null 2>&1 || log_error "GitHub CLI (gh) is required"
+    command -v git >/dev/null 2>&1 || log_error "git is required"
+
+    # Check if logged into npm
+    npm whoami >/dev/null 2>&1 || log_error "Not logged into npm. Run 'npm login' first"
+
+    # Check if logged into GitHub CLI
+    gh auth status >/dev/null 2>&1 || log_error "Not logged into GitHub CLI. Run 'gh auth login' first"
+
+    # Check for uncommitted changes
+    if [[ -n $(git status --porcelain) ]]; then
+        log_error "Working directory has uncommitted changes. Commit or stash them first"
+    fi
+
+    # Check we're on main branch
+    CURRENT_BRANCH=$(git branch --show-current)
+    if [[ "$CURRENT_BRANCH" != "main" ]]; then
+        log_warning "Not on main branch (currently on: $CURRENT_BRANCH)"
+        read -p "Continue anyway? (y/N) " -n 1 -r
+        echo
+        [[ ! $REPLY =~ ^[Yy]$ ]] && exit 1
+    fi
+
+    # Pull latest changes
+    log_info "Pulling latest changes..."
+    git pull origin "$CURRENT_BRANCH"
+
+    log_success "Prerequisites check passed"
+}
+
+# Get version argument
+get_version() {
+    VERSION_ARG=$1
+    CURRENT_VERSION=$(node -p "require('./package.json').version")
+
+    if [[ -z "$VERSION_ARG" ]]; then
+        echo "" >&2
+        echo "Current version: $CURRENT_VERSION" >&2
+        echo "" >&2
+        echo "Select version bump:" >&2
+        echo "  1) patch (x.x.X) - Bug fixes" >&2
+        echo "  2) minor (x.X.0) - New features" >&2
+        echo "  3) major (X.0.0) - Breaking changes" >&2
+        echo "  4) custom - Enter specific version" >&2
+        echo "" >&2
+        read -p "Choice [1-4]: " choice
+
+        case $choice in
+            1) VERSION_ARG="patch" ;;
+            2) VERSION_ARG="minor" ;;
+            3) VERSION_ARG="major" ;;
+            4) read -p "Enter version (e.g., 1.2.3): " VERSION_ARG ;;
+            *) log_error "Invalid choice" ;;
+        esac
+    fi
+
+    echo "$VERSION_ARG"
+}
+
+# Bump version
+bump_version() {
+    local VERSION_TYPE=$1
+
+    log_info "Bumping version ($VERSION_TYPE)..." >&2
+
+    if [[ "$VERSION_TYPE" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        # Specific version provided
+        npm version "$VERSION_TYPE" --no-git-tag-version >/dev/null
+    else
+        # patch, minor, or major
+        npm version "$VERSION_TYPE" --no-git-tag-version >/dev/null
+    fi
+
+    NEW_VERSION=$(node -p "require('./package.json').version")
+    log_success "Version bumped to $NEW_VERSION" >&2
+
+    echo "$NEW_VERSION"
+}
+
+# Commit and tag
+commit_and_tag() {
+    local VERSION=$1
+
+    log_info "Committing version bump..."
+
+    git add package.json package-lock.json 2>/dev/null || git add package.json
+    git commit -m "chore: release v$VERSION"
+
+    log_info "Creating git tag v$VERSION..."
+    git tag -a "v$VERSION" -m "Release v$VERSION"
+
+    log_success "Committed and tagged"
+}
+
+# Push to remote
+push_to_remote() {
+    local VERSION=$1
+
+    log_info "Pushing to remote..."
+
+    git push origin "$(git branch --show-current)"
+    git push origin "v$VERSION"
+
+    log_success "Pushed to remote"
+}
+
+# Create GitHub release
+create_github_release() {
+    local VERSION=$1
+
+    log_info "Creating GitHub release..."
+
+    # Get commits since last tag
+    LAST_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
+
+    if [[ -n "$LAST_TAG" ]]; then
+        CHANGES=$(git log "$LAST_TAG"..HEAD --pretty=format:"- %s" --no-merges | grep -v "chore: release")
+    else
+        CHANGES="- Initial release"
+    fi
+
+    # Create release notes
+    RELEASE_NOTES="## What's Changed
+
+$CHANGES
+
+**Full Changelog**: https://github.com/$(gh repo view --json nameWithOwner -q .nameWithOwner)/compare/${LAST_TAG:-v0.0.0}...v$VERSION"
+
+    gh release create "v$VERSION" \
+        --title "v$VERSION" \
+        --notes "$RELEASE_NOTES"
+
+    log_success "GitHub release created"
+}
+
+# Publish to npm
+publish_to_npm() {
+    log_info "Publishing to npm..."
+
+    # Check if OTP is needed
+    read -p "Enter npm OTP (leave empty if not using 2FA): " OTP
+
+    if [[ -n "$OTP" ]]; then
+        npm publish --access public --otp="$OTP"
+    else
+        npm publish --access public
+    fi
+
+    log_success "Published to npm"
+}
+
+# Main
+main() {
+    echo ""
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo "       Fenwave Agent Release Script"
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
+
+    check_prerequisites
+
+    VERSION_ARG=$(get_version "$1")
+    NEW_VERSION=$(bump_version "$VERSION_ARG")
+
+    echo ""
+    log_info "Ready to release v$NEW_VERSION"
+    read -p "Continue with release? (y/N) " -n 1 -r
+    echo ""
+    [[ ! $REPLY =~ ^[Yy]$ ]] && { log_warning "Release cancelled"; exit 0; }
+
+    commit_and_tag "$NEW_VERSION"
+    push_to_remote "$NEW_VERSION"
+    create_github_release "$NEW_VERSION"
+    publish_to_npm
+
+    echo ""
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo -e "${GREEN}  Release v$NEW_VERSION completed successfully!${NC}"
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
+    echo "  npm: https://www.npmjs.com/package/@fenwave/agent"
+    echo "  GitHub: $(gh repo view --json url -q .url)/releases/tag/v$NEW_VERSION"
+    echo ""
+}
+
+main "$@"

package/setup/setupWizard.js

@@ -29,17 +29,15 @@ import {
   saveDeviceCredential,
   isDeviceRegistered,
 } from "../store/deviceCredentialStore.js";
-import { saveNpmToken } from "../store/npmTokenStore.js";
 import {
   saveSetupProgress,
   clearSetupState,
   SetupStep,
   isSetupInProgress,
 } from "../store/setupState.js";
-import { authenticateDockerWithECR } from "../utils/ecrAuth.js";
 import { initializeConfig } from "../store/configStore.js";
 
-const TOTAL_STEPS = 7;
+const TOTAL_STEPS = 5; // Reduced - no ECR auth or NPM config needed (public package and GHCR)
 
 /**
  * Setup Wizard Orchestrator
@@ -49,8 +47,6 @@ export class SetupWizard {
   constructor(options = {}) {
     this.backendUrl = options.backendUrl || "http://localhost:7007";
     this.frontendUrl = options.frontendUrl || "http://localhost:3000";
-    this.awsRegion = options.awsRegion || "eu-west-1";
-    this.awsAccountId = options.awsAccountId || null; // Will be set from Backstage during registration
     this.skipPrerequisites = options.skipPrerequisites || false;
     this.registrationToken = options.token || null;
   }
@@ -67,8 +63,6 @@ export class SetupWizard {
       const agentConfig = {
         backendUrl: this.backendUrl,
         frontendUrl: this.frontendUrl,
-        awsRegion: this.awsRegion,
-        awsAccountId: this.awsAccountId,
       };
 
       initializeConfig(agentConfig);
@@ -76,10 +70,6 @@ export class SetupWizard {
       displayInfo("Agent configuration initialized:");
       displayKeyValue("Backend URL", this.backendUrl);
       displayKeyValue("Frontend URL", this.frontendUrl);
-      displayKeyValue("AWS Region", this.awsRegion);
-      if (this.awsAccountId) {
-        displayKeyValue("AWS Account ID", this.awsAccountId);
-      }
       console.log("");
 
       // Check if already registered
@@ -116,19 +106,13 @@ export class SetupWizard {
       // Step 2: Device Registration
       const registrationData = await this.registrationStep();
 
-      // Step 3: Docker Registry Configuration
-      await this.dockerRegistryStep(registrationData);
-
-      // Step 4: Pull DevApp Image
+      // Step 3: Pull DevApp Image (GHCR is public, no auth required)
       await this.pullImageStep(registrationData);
 
-      // Step 5: NPM Configuration
-      await this.npmConfigStep(registrationData);
-
-      // Step 6: Start Agent (optional)
+      // Step 4: Start Agent (optional)
       await this.startAgentStep();
 
-      // Step 7: Complete
+      // Step 5: Complete
       this.displayComplete(registrationData);
 
       // Clear setup state
@@ -266,7 +250,6 @@ export class SetupWizard {
       return {
         deviceId: response.data.deviceId,
         deviceCredential: response.data.deviceCredential,
-        npmToken: response.data.npmToken,
         registryConfig: response.data.registryConfig,
         userEntityRef: response.data.userEntityRef || "unknown",
       };
@@ -288,73 +271,10 @@ export class SetupWizard {
   }
 
   /**
-   * Step 3: Docker Registry Configuration
-   */
-  async dockerRegistryStep(registrationData) {
-    displayStep(3, TOTAL_STEPS, "Docker Registry Configuration");
-
-    const shouldConfigure = await promptConfirmation(
-      "Configure AWS ECR for Fenwave images?",
-      true
-    );
-
-    if (!shouldConfigure) {
-      displayInfo("Skipping Docker registry configuration");
-      saveSetupProgress(SetupStep.DOCKER_REGISTRY, { skipped: true });
-      return;
-    }
-
-    const { awsRegion, awsAccountId } = registrationData.registryConfig;
-
-    displayInfo(`Authenticating with AWS ECR (${awsRegion})...`);
-    displayInfo(
-      "🔐 Using Backstage-controlled credential flow (temporary credentials)"
-    );
-
-    try {
-      // Use Backstage-controlled credential flow
-      const authResult = await authenticateDockerWithECR(this.backendUrl);
-
-      displaySuccess("AWS ECR authenticated successfully");
-      displayInfo(`✅ Credentials expire at: ${authResult.expiration}`);
-      displayInfo(`📦 Registry: ${authResult.registryUri}`);
-
-      saveSetupProgress(SetupStep.DOCKER_REGISTRY, {
-        awsRegion: authResult.region,
-        awsAccountId: authResult.accountId,
-        registryUri: authResult.registryUri,
-        expiration: authResult.expiration,
-      });
-    } catch (error) {
-      displayError("Failed to authenticate with AWS ECR");
-      displayError(`Error: ${error.message}`);
-      displayWarning(
-        "Make sure your device is registered and Backstage is running"
-      );
-
-      const shouldContinue = await promptConfirmation(
-        "Continue without ECR authentication?",
-        true
-      );
-      if (!shouldContinue) {
-        throw createError(
-          ErrorCode.ECR_AUTH_FAILED,
-          "ECR authentication failed"
-        );
-      }
-
-      saveSetupProgress(SetupStep.DOCKER_REGISTRY, {
-        failed: true,
-        error: error.message,
-      });
-    }
-  }
-
-  /**
-   * Step 4: Pull Fenwave DevApp Image
+   * Step 3: Pull Fenwave DevApp Image (GHCR is public, no auth required)
    */
   async pullImageStep(registrationData) {
-    displayStep(4, TOTAL_STEPS, "Pull Fenwave DevApp Image");
+    displayStep(3, TOTAL_STEPS, "Pull Fenwave DevApp Image");
 
     const shouldPull = await promptConfirmation(
       "Pull Fenwave DevApp Docker image?",
@@ -412,28 +332,10 @@ export class SetupWizard {
   }
 
   /**
-   * Step 5: NPM Configuration
-   */
-  async npmConfigStep(registrationData) {
-    displayStep(5, TOTAL_STEPS, "NPM Configuration");
-
-    const { npmToken } = registrationData;
-
-    if (npmToken) {
-      saveNpmToken(npmToken);
-      displaySuccess("NPM token configured for future updates");
-      saveSetupProgress(SetupStep.NPM_CONFIG, { configured: true });
-    } else {
-      displayWarning("No NPM token provided by backend");
-      saveSetupProgress(SetupStep.NPM_CONFIG, { configured: false });
-    }
-  }
-
-  /**
-   * Step 6: Start Agent (optional)
+   * Step 4: Start Agent (optional)
    */
   async startAgentStep() {
-    displayStep(6, TOTAL_STEPS, "Start Agent Service");
+    displayStep(4, TOTAL_STEPS, "Start Agent Service");
 
     const shouldStart = await promptConfirmation("Start the agent now?", true);
 
@@ -453,7 +355,7 @@ export class SetupWizard {
    * Display completion message
    */
   displayComplete(registrationData) {
-    displayStep(7, TOTAL_STEPS, "Setup Complete! 🎉");
+    displayStep(5, TOTAL_STEPS, "Setup Complete! 🎉");
 
     console.log("");
     displayHeader("Setup Summary");