added nodejs foxx support

CHANGELOG.md

@@ -0,0 +1,138 @@
+# Changelog
+
+All notable changes to ServiceMaker will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+#### Node.js/Foxx Service Support
+- **Node.js Base Image**: Added `Dockerfile.node22base` for Node.js 22 base image with pre-installed ArangoDB packages
+  - Installs Node.js 22 from NodeSource
+  - Pre-installs `@arangodb/node-foxx`, `@arangodb/node-foxx-launcher`, and `@arangodb/arangodb` packages
+  - Creates base `node_modules` with checksums for dependency tracking
+  - Added to `baseimages/imagelist.txt` as `node22base`
+
+- **Node.js Dockerfile Template**: Created `Dockerfile.nodejs.template` for building Node.js/Foxx service images
+  - Supports wrapper structure for single service directories
+  - Configures working directory and user permissions
+  - Executes `prepareproject-nodejs.sh` for dependency management
+
+- **Dependency Management Script**: Added `scripts/prepareproject-nodejs.sh`
+  - Copies base `node_modules` from base image
+  - Installs project-specific dependencies from `package.json`
+  - Ensures `node-foxx` binary is always available with multiple safety checks
+  - Tracks new dependencies using SHA256 checksums
+  - Separates base packages from project packages
+  - Includes automatic recovery mechanism if base packages are removed during `npm install`
+  - Handles `package.json` copying to wrapper root for proper dependency installation
+
+- **Project Type Detection**: Extended `detect_project_type()` to support:
+  - `python`: Projects with `pyproject.toml`
+  - `foxx`: Multi-service projects with `package.json` and `services.json`
+  - `foxx-service`: Single service directory with `package.json` (creates wrapper structure)
+  - `nodejs`: Generic Node.js projects
+
+- **Wrapper Structure Generation**: Automatic wrapper creation for single service directories
+  - Creates `wrapper/` directory structure
+  - Copies service directory into `wrapper/{service-name}/`
+  - Generates `services.json` automatically with mount path configuration
+  - Copies `package.json` to wrapper root for dependency installation
+
+- **CLI Arguments**:
+  - `--mount-path`: Required for `foxx-service` type, specifies the mount path for the Foxx service
+
+- **Services JSON Generation**: Added `generate_services_json()` function
+  - Automatically generates `services.json` for single service directories
+  - Configures mount path and base path for Foxx services
+
+- **Package.json Support**: Added functions to read Node.js project metadata
+  - `read_name_from_package_json()`: Extracts project name from `package.json`
+  - `read_service_info_from_package_json()`: Extracts name and version for Helm charts
+
+- **Entrypoint Enhancement**: Updated `baseimages/scripts/entrypoint.sh` to support Node.js/Foxx services
+  - Detects service type based on project files
+  - Automatically runs `node-foxx` for Foxx services
+  - Falls back to generic Node.js execution for non-Foxx services
+  - Maintains backward compatibility with Python services
+
+- **Test Service**: Added `itzpapalotl-node` test service in `testprojects/`
+  - Example Node.js/Foxx service for testing ServiceMaker functionality
+  - Demonstrates wrapper structure generation and dependency management
+
+### Changed
+
+- **Main Application Logic**: Extended `src/main.rs` to support Node.js projects
+  - Added project type detection for Node.js/Foxx services
+  - Updated file copying logic to handle wrapper structure
+  - Modified Dockerfile generation to use appropriate template based on project type
+  - Updated Helm chart generation to support Node.js projects
+  - Added `prepareproject-nodejs.sh` to embedded scripts list
+
+- **Entrypoint Script**: Enhanced `baseimages/scripts/entrypoint.sh` to support Node.js/Foxx services
+  - Added service type detection based on project files
+  - Maintains backward compatibility with Python services
+
+- **Base Image List**: Updated `baseimages/imagelist.txt` to include `node22base`
+
+- **File Copying Logic**: Updated `copy_dir_recursive()` to skip `node_modules` directories
+  - Prevents copying local `node_modules` which should be installed in Docker build
+
+### Fixed
+
+- **Windows Compatibility**: Fixed Windows build issues in `src/main.rs`
+  - Added conditional compilation for Unix-specific file permissions (`#[cfg(unix)]`)
+  - Windows builds now skip `set_mode()` calls that are Unix-only
+
+### Technical Details
+
+- **Base Image Structure**:
+  - Base `node_modules` located at `/home/user/base_node_modules/node_modules`
+  - Checksums stored at `/home/user/sums_sha256` for dependency tracking
+  - Base packages: `@arangodb/node-foxx@^0.0.1-alpha.0`, `@arangodb/node-foxx-launcher@^0.0.1-alpha.0`, `@arangodb/arangodb@^0.0.1-alpha.0`
+
+- **Wrapper Structure**:
+  ```
+  wrapper/
+  ├── package.json          # Copied from service for npm install
+  ├── services.json         # Auto-generated with mount path
+  ├── node_modules/         # Installed dependencies (base + project)
+  └── {service-name}/       # Service directory
+      ├── package.json
+      └── ...
+  ```
+
+- **Dependency Tracking**:
+  - Uses SHA256 checksums to identify new files vs. base files
+  - New project dependencies copied to `/project/node_modules/` for tracking
+  - Base packages remain in base image for efficiency
+
+## [0.9.2] - Previous Release
+
+### Existing Features
+- Python service support with `pyproject.toml`
+- Base image management for Python 3.13
+- Docker image building and pushing
+- Helm chart generation
+- Project tar.gz creation
+- Virtual environment management with `uv`
+
+---
+
+## Version History
+
+- **0.9.2**: Initial release with Python support
+- **Unreleased**: Added Node.js/Foxx service support
+
+---
+
+## Notes
+
+- All changes maintain backward compatibility with existing Python projects
+- Node.js support is additive and does not affect Python service functionality
+- Base images must be built separately using `baseimages/build.sh`
+- Windows users should use WSL or Linux environment for building base images
+

Dockerfile.nodejs.template

@@ -0,0 +1,17 @@
+FROM {BASE_IMAGE}
+
+USER root
+
+COPY ./scripts /scripts
+COPY {PROJECT_DIR} /project/{PROJECT_DIR}
+RUN chown -R user:user /project/{PROJECT_DIR}
+
+USER user
+WORKDIR /project/{PROJECT_DIR}
+
+RUN /scripts/prepareproject-nodejs.sh
+
+EXPOSE {PORT}
+
+CMD ["node_modules/.bin/node-foxx"]
+

baseimages/Dockerfile.node22base

@@ -0,0 +1,26 @@
+FROM debian:trixie-slim
+
+COPY ./scripts /scripts
+RUN /scripts/debinstall.sh
+
+# Install Node.js 22
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get install -y nodejs && \
+    apt-get clean
+
+WORKDIR /home/user
+USER user
+
+# Create base node_modules with node-foxx dependencies
+RUN mkdir -p base_node_modules && \
+    cd base_node_modules && \
+    npm init -y && \
+    npm install @arangodb/node-foxx@^0.0.1-alpha.0 \
+                @arangodb/node-foxx-launcher@^0.0.1-alpha.0 \
+                @arangodb/arangodb@^0.0.1-alpha.0
+
+# Create checksums for base node_modules
+RUN find base_node_modules/node_modules -type f -print0 | \
+    xargs -0 sha256sum > sums_sha256
+
+CMD [ "/scripts/entrypoint.sh" ]

baseimages/imagelist.txt

@@ -1,3 +1,4 @@
 py13base
 py13cugraph
 py13torch
+node22base

baseimages/scripts/entrypoint.sh

@@ -14,16 +14,40 @@ if test -e project.tar.gz ; then
   tar xzvf project.tar.gz > /dev/null
 fi
 
-# Run the entrypoint if configured:
+# Detect service type and run accordingly
 if test -e entrypoint ; then
   ENTRYPOINT=$(cat entrypoint)
   echo Running project ...
-  . /home/user/.local/bin/env
-  . /home/user/the_venv/bin/activate
-  for p in /project/the_venv/lib/python*/site-packages ; do
-    export PYTHONPATH=$p
-  done
-  exec python $ENTRYPOINT
+
+  # Check if it's a Node.js/Foxx service
+  if [ -f "package.json" ] && [ -f "services.json" ]; then
+    # Node.js/Foxx service
+    echo "Detected Node.js/Foxx service"
+    if [ -f "node_modules/.bin/node-foxx" ]; then
+      exec node_modules/.bin/node-foxx
+    else
+      echo "Error: node-foxx not found. Make sure node_modules are installed."
+      exit 1
+    fi
+  elif [ -f "package.json" ]; then
+    # Generic Node.js service
+    echo "Detected Node.js service"
+    if [ -f "$ENTRYPOINT" ]; then
+      exec node "$ENTRYPOINT"
+    else
+      echo "Error: Entrypoint file not found: $ENTRYPOINT"
+      exit 1
+    fi
+  else
+    # Python service (existing logic)
+    echo "Detected Python service"
+    . /home/user/.local/bin/env
+    . /home/user/the_venv/bin/activate
+    for p in /project/the_venv/lib/python*/site-packages ; do
+      export PYTHONPATH=$p
+    done
+    exec python $ENTRYPOINT
+  fi
 fi
 
 echo No entrypoint found, running bash instead...

scripts/prepareproject-nodejs.sh

@@ -0,0 +1,126 @@
+#!/bin/bash
+# This is to be run in the project directory to install dependencies.
+# It copies base node_modules from the base image and installs additional
+# project dependencies, tracking changes similar to the Python script.
+
+set -e
+
+# We're already in /project/{PROJECT_DIR} from the Dockerfile WORKDIR
+PROJECT_DIR=$(pwd)
+
+# Copy base node_modules if they exist in base image
+if [ -d "/home/user/base_node_modules/node_modules" ]; then
+    echo "Copying base node_modules..."
+    if [ -d "node_modules" ]; then
+        # Merge with existing node_modules if any
+        cp -r /home/user/base_node_modules/node_modules/* ./node_modules/ 2>/dev/null || true
+    else
+        cp -r /home/user/base_node_modules/node_modules ./node_modules
+    fi
+
+    # Verify node-foxx binary exists after copy
+    if [ -f "node_modules/.bin/node-foxx" ]; then
+        echo "✓ Base node-foxx binary copied successfully"
+    else
+        echo "Warning: node-foxx binary not found after copying base node_modules"
+    fi
+
+    # Track existing files
+    cd /home/user
+    if [ -f "sums_sha256" ]; then
+        sha256sum -c sums_sha256 || true
+    fi
+    cd "$PROJECT_DIR"
+else
+    echo "Warning: Base node_modules not found at /home/user/base_node_modules/node_modules"
+fi
+
+# Install additional project dependencies if package.json exists
+if [ -f "package.json" ]; then
+    echo "Installing project dependencies..."
+
+    # Always ensure base packages are installed first (they provide node-foxx binary)
+    # This ensures node-foxx is available even if npm install does a clean install
+    echo "Ensuring base node-foxx packages are installed..."
+    npm install --production --no-save \
+        @arangodb/node-foxx@^0.0.1-alpha.0 \
+        @arangodb/node-foxx-launcher@^0.0.1-alpha.0 \
+        @arangodb/arangodb@^0.0.1-alpha.0 || {
+        echo "Warning: Failed to install base packages, continuing anyway..."
+    }
+
+    # Verify node-foxx exists after installing base packages
+    if [ ! -f "node_modules/.bin/node-foxx" ]; then
+        echo "ERROR: node-foxx binary not found after installing base packages!"
+        echo "Listing node_modules/.bin contents:"
+        ls -la node_modules/.bin/ 2>/dev/null || echo "node_modules/.bin directory does not exist"
+        exit 1
+    fi
+    echo "✓ Base node-foxx packages installed"
+
+    # Install project dependencies (this should preserve base packages)
+    npm install --production --no-save
+
+    # Final verification that node-foxx still exists
+    if [ -f "node_modules/.bin/node-foxx" ]; then
+        echo "✓ node-foxx binary exists after installing project dependencies"
+    else
+        echo "ERROR: node-foxx binary missing after npm install!"
+        echo "Reinstalling base packages..."
+        npm install --production --no-save \
+            @arangodb/node-foxx@^0.0.1-alpha.0 \
+            @arangodb/node-foxx-launcher@^0.0.1-alpha.0 \
+            @arangodb/arangodb@^0.0.1-alpha.0
+
+        # Final check
+        if [ ! -f "node_modules/.bin/node-foxx" ]; then
+            echo "ERROR: Failed to install node-foxx binary!"
+            echo "Current directory: $(pwd)"
+            echo "Listing node_modules/.bin contents:"
+            ls -la node_modules/.bin/ 2>/dev/null || echo "node_modules/.bin directory does not exist"
+            echo "Listing node_modules contents:"
+            ls -la node_modules/ 2>/dev/null | head -20
+            exit 1
+        fi
+        echo "✓ node-foxx binary restored"
+    fi
+
+    # Find all files in node_modules and create checksums
+    find node_modules -type f -print0 | xargs -0 sha256sum > /tmp/node_modules_sha256_new 2>/dev/null || true
+
+    # Find new files (files in current node_modules that weren't in base)
+    if [ -f "/home/user/sums_sha256" ] && [ -f "/tmp/node_modules_sha256_new" ]; then
+        cat /tmp/node_modules_sha256_new /home/user/sums_sha256 | sort | uniq -c | grep "^      1 " | awk '{ print $3 }' > /tmp/newfiles || true
+    else
+        # If no base checksums, all files are new
+        if [ -f "/tmp/node_modules_sha256_new" ]; then
+            awk '{ print $3 }' /tmp/node_modules_sha256_new > /tmp/newfiles || true
+        fi
+    fi
+
+    # Move new files to /project/node_modules (similar to Python approach)
+    if [ -f "/tmp/newfiles" ]; then
+        mkdir -p /project/node_modules
+        while IFS= read -r filename; do
+            # Skip empty lines
+            [[ -z "$filename" ]] && continue
+
+            # Check if source file exists and is relative to current dir
+            if [[ "$filename" == node_modules/* ]] && [ -f "$filename" ]; then
+                # Get the directory part of the filename
+                DIR=$(dirname "$filename")
+
+                # Create the destination directory structure
+                mkdir -p "/project/$DIR"
+
+                # Copy the file preserving the directory hierarchy
+                cp "$filename" "/project/$filename"
+            fi
+        done < "/tmp/newfiles"
+    fi
+
+    rm -f /tmp/node_modules_sha256_new /tmp/newfiles
+fi
+
+echo "Node.js project prepared successfully"
+