@factiii/stack 0.1.200 → 0.1.203

package/package.json

@@ -1,114 +1,100 @@
-{
-    "name": "@factiii/stack",
-    "version": "0.1.200",
-    "description": "Infrastructure management package for deploying services to servers",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "bin": {
-        "stack": "./bin/stack"
-    },
-    "files": [
-        "bin/",
-        "dist/"
-    ],
-    "scripts": {
-        "build": "tsc && npm run copy-assets",
-        "build:watch": "tsc --watch",
-        "clean": "node -e \"const fs=require('fs');if(fs.existsSync('dist'))fs.rmSync('dist',{recursive:true,force:true})\"",
-        "copy-assets": "node -e \"const fs=require('fs'),p=require('path');fs.cpSync('src/plugins/approved.json','dist/plugins/approved.json');const d='dist/plugins/pipelines/factiii/workflows';fs.mkdirSync(d,{recursive:true});for(const f of fs.readdirSync('src/plugins/pipelines/factiii/workflows').filter(f=>f.endsWith('.yml')))fs.cpSync(p.join('src/plugins/pipelines/factiii/workflows',f),p.join(d,f));const pd='dist/plugins/pipelines/aws/policies';fs.mkdirSync(pd,{recursive:true});for(const f of fs.readdirSync('src/plugins/pipelines/aws/policies').filter(f=>f.endsWith('.json')))fs.cpSync(p.join('src/plugins/pipelines/aws/policies',f),p.join(pd,f))\"",
-        "prebuild": "npm run clean",
-        "prepublish-check": "node -e \"const v=require('./package.json').version; if(v.includes('-d')){console.error('❌ Cannot publish dev version:',v); process.exit(1)}\"",
-        "prepublishOnly": "npm run prepublish-check && npm run build",
-        "test": "jest",
-        "test:watch": "jest --watch",
-        "test:coverage": "jest --coverage",
-        "typecheck": "tsc --noEmit",
-        "build:auth": "pnpm --filter @factiii/auth build",
-        "build:all": "pnpm --filter @factiii/auth build && pnpm run build",
-        "test:auth": "pnpm --filter @factiii/auth test",
-        "test:all": "pnpm test && pnpm --filter @factiii/auth test",
-        "changeset": "changeset",
-        "version-packages": "changeset version",
-        "release": "pnpm build:all && changeset publish"
-    },
-    "keywords": [
-        "infrastructure",
-        "deployment",
-        "docker",
-        "nginx"
-    ],
-    "author": "",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/factiii/stack.git"
-    },
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org"
-    },
-    "dependencies": {
-        "@aws-sdk/client-ec2": "^3.750.0",
-        "@aws-sdk/client-ec2-instance-connect": "^3.1001.0",
-        "@aws-sdk/client-ecr": "^3.750.0",
-        "@aws-sdk/client-iam": "^3.750.0",
-        "@aws-sdk/client-rds": "^3.750.0",
-        "@aws-sdk/client-route-53": "^3.1001.0",
-        "@aws-sdk/client-s3": "^3.750.0",
-        "@aws-sdk/client-ses": "^3.750.0",
-        "@aws-sdk/client-sts": "^3.750.0",
-        "@factiii/auth": "^0.6.1",
-        "@octokit/rest": "^20.0.2",
-        "ansible-vault": "^1.3.0",
-        "commander": "^11.1.0",
-        "js-yaml": "^4.1.1",
-        "libsodium-wrappers": "^0.7.11"
-    },
-    "devDependencies": {
-        "@changesets/cli": "^2.30.0",
-        "@types/jest": "^30.0.0",
-        "@types/js-yaml": "^4.0.9",
-        "@types/node": "^25.0.3",
-        "jest": "^29.7.0",
-        "ts-jest": "^29.4.6",
-        "ts-node": "^10.9.2",
-        "typescript": "^5.9.3"
-    },
-    "jest": {
-        "preset": "ts-jest",
-        "testEnvironment": "node",
-        "testMatch": [
-            "**/test/**/*.test.ts"
-        ],
-        "moduleNameMapper": {
-            "^(\\.{1,2}/.*)\\.js$": "$1"
-        },
-        "collectCoverageFrom": [
-            "src/**/*.ts",
-            "!**/node_modules/**"
-        ],
-        "coverageThreshold": {
-            "global": {
-                "branches": 70,
-                "functions": 70,
-                "lines": 70,
-                "statements": 70
-            }
-        }
-    },
-    "packageManager": "pnpm@10.32.1",
-    "engines": {
-        "node": ">=18.0.0"
-    },
-    "pnpm": {
-        "overrides": {
-            "minimatch": ">=10.2.1",
-            "diff": ">=4.0.4",
-            "hono": ">=4.12.7",
-            "@hono/node-server": ">=1.19.10",
-            "lodash": ">=4.17.23",
-            "flatted": ">=3.4.0",
-            "rollup": ">=4.59.0",
-            "ajv": ">=6.14.0"
-        }
-    }
-}
+{
+  "name": "@factiii/stack",
+  "version": "0.1.203",
+  "description": "Infrastructure management package for deploying services to servers",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "bin": {
+    "stack": "./bin/stack"
+  },
+  "files": [
+    "bin/",
+    "dist/"
+  ],
+  "keywords": [
+    "infrastructure",
+    "deployment",
+    "docker",
+    "nginx"
+  ],
+  "author": "",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/factiii/stack.git"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "dependencies": {
+    "@aws-sdk/client-ec2": "^3.750.0",
+    "@aws-sdk/client-ec2-instance-connect": "^3.1001.0",
+    "@aws-sdk/client-ecr": "^3.750.0",
+    "@aws-sdk/client-iam": "^3.750.0",
+    "@aws-sdk/client-rds": "^3.750.0",
+    "@aws-sdk/client-route-53": "^3.1001.0",
+    "@aws-sdk/client-s3": "^3.750.0",
+    "@aws-sdk/client-ses": "^3.750.0",
+    "@aws-sdk/client-sts": "^3.750.0",
+    "@octokit/rest": "^20.0.2",
+    "ansible-vault": "^1.3.0",
+    "commander": "^11.1.0",
+    "js-yaml": "^4.1.1",
+    "libsodium-wrappers": "^0.7.11",
+    "@factiii/auth": "0.6.3"
+  },
+  "devDependencies": {
+    "@changesets/cli": "^2.30.0",
+    "@types/jest": "^30.0.0",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^25.0.3",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.4.6",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.3"
+  },
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "testMatch": [
+      "**/test/**/*.test.ts"
+    ],
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.js$": "$1"
+    },
+    "collectCoverageFrom": [
+      "src/**/*.ts",
+      "!**/node_modules/**"
+    ],
+    "coverageThreshold": {
+      "global": {
+        "branches": 70,
+        "functions": 70,
+        "lines": 70,
+        "statements": 70
+      }
+    }
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "scripts": {
+    "build": "tsc && npm run copy-assets",
+    "build:watch": "tsc --watch",
+    "clean": "node -e \"const fs=require('fs');if(fs.existsSync('dist'))fs.rmSync('dist',{recursive:true,force:true})\"",
+    "copy-assets": "node -e \"const fs=require('fs'),p=require('path');fs.cpSync('src/plugins/approved.json','dist/plugins/approved.json');const d='dist/plugins/pipelines/factiii/workflows';fs.mkdirSync(d,{recursive:true});for(const f of fs.readdirSync('src/plugins/pipelines/factiii/workflows').filter(f=>f.endsWith('.yml')))fs.cpSync(p.join('src/plugins/pipelines/factiii/workflows',f),p.join(d,f));const pd='dist/plugins/pipelines/aws/policies';fs.mkdirSync(pd,{recursive:true});for(const f of fs.readdirSync('src/plugins/pipelines/aws/policies').filter(f=>f.endsWith('.json')))fs.cpSync(p.join('src/plugins/pipelines/aws/policies',f),p.join(pd,f))\"",
+    "prebuild": "npm run clean",
+    "prepublish-check": "node -e \"const v=require('./package.json').version; if(v.includes('-d')){console.error('❌ Cannot publish dev version:',v); process.exit(1)}\"",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "typecheck": "tsc --noEmit",
+    "build:auth": "pnpm --filter @factiii/auth build",
+    "build:all": "pnpm --filter @factiii/auth build && pnpm run build",
+    "test:auth": "pnpm --filter @factiii/auth test",
+    "test:all": "pnpm test && pnpm --filter @factiii/auth test",
+    "changeset": "changeset",
+    "version-packages": "changeset version",
+    "release": "pnpm build:all && changeset publish"
+  }
+}

package/dist/plugins/pipelines/factiii/scanfix/docker.d.ts

@@ -1,20 +0,0 @@
-/**
- * Docker Pre-SSH Checks (Factiii Pipeline)
- *
- * Ensures Docker is installed and running on staging/prod servers via SSH
- * BEFORE the pipeline SSHes in to run `npx stack fix --staging/--prod`.
- *
- * Called from fixStage() and deployStage() — NOT via the scanfix array,
- * because remote stages bypass runLocalFixes() entirely.
- *
- * Handles both Mac (Docker Desktop / Colima) and Ubuntu (apt / get.docker.com).
- */
-import type { FactiiiConfig, Stage } from '../../../../types/index.js';
-/**
- * Pre-SSH Docker check: ensure Docker is installed and running on the remote server.
- *
- * Call this from fixStage() / deployStage() BEFORE SSHing to run the full fix/deploy.
- * Returns true if Docker is ready, false if it couldn't be fixed.
- */
-export declare function ensureRemoteDocker(stage: Stage, config: FactiiiConfig): Promise<boolean>;
-//# sourceMappingURL=docker.d.ts.map

package/dist/plugins/pipelines/factiii/scanfix/docker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/pipelines/factiii/scanfix/docker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAqB,MAAM,4BAA4B,CAAC;AA8H1F;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,OAAO,CAAC,CAsBlB"}

package/dist/plugins/pipelines/factiii/scanfix/docker.js

@@ -1,131 +0,0 @@
-"use strict";
-/**
- * Docker Pre-SSH Checks (Factiii Pipeline)
- *
- * Ensures Docker is installed and running on staging/prod servers via SSH
- * BEFORE the pipeline SSHes in to run `npx stack fix --staging/--prod`.
- *
- * Called from fixStage() and deployStage() — NOT via the scanfix array,
- * because remote stages bypass runLocalFixes() entirely.
- *
- * Handles both Mac (Docker Desktop / Colima) and Ubuntu (apt / get.docker.com).
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureRemoteDocker = ensureRemoteDocker;
-const config_helpers_js_1 = require("../../../../utils/config-helpers.js");
-const ssh_helper_js_1 = require("../../../../utils/ssh-helper.js");
-/**
- * Get the server type from the environment config, default to 'ubuntu'
- */
-function getServerType(envConfig) {
-    return envConfig.server ?? 'ubuntu';
-}
-/**
- * Ensure Docker is installed on a remote server via SSH.
- * Returns true if Docker is now installed, false if it failed.
- */
-async function ensureDockerInstalled(envConfig, stage, config) {
-    // Check if Docker is already installed
-    try {
-        await (0, ssh_helper_js_1.sshExec)(envConfig, 'export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" && docker --version', stage, config);
-        return true; // Already installed
-    }
-    catch {
-        // Not installed — proceed to install
-    }
-    const server = getServerType(envConfig);
-    console.log('   Docker not found on ' + stage + ' server — installing...');
-    try {
-        if (server === 'mac') {
-            await (0, ssh_helper_js_1.sshExec)(envConfig, 'export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" && ' +
-                'which docker >/dev/null 2>&1 || (' +
-                'brew install docker docker-compose colima 2>/dev/null && ' +
-                'colima start --memory 4 --cpu 2' +
-                ')', stage, config);
-        }
-        else {
-            await (0, ssh_helper_js_1.sshExec)(envConfig, 'sudo DEBIAN_FRONTEND=noninteractive apt-get update -qq && ' +
-                'curl -fsSL https://get.docker.com | sh && ' +
-                'sudo usermod -aG docker $USER && ' +
-                'sudo systemctl enable docker && sudo systemctl start docker', stage, config);
-        }
-        // Verify
-        const version = await (0, ssh_helper_js_1.sshExec)(envConfig, 'export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" && docker --version', stage, config);
-        console.log('   [OK] Docker installed: ' + version.trim());
-        return true;
-    }
-    catch (e) {
-        console.log('   [!] Failed to install Docker: ' + (e instanceof Error ? e.message : String(e)));
-        return false;
-    }
-}
-/**
- * Ensure Docker daemon is running on a remote server via SSH.
- * Returns true if Docker is now running, false if it failed.
- */
-async function ensureDockerRunning(envConfig, stage, config) {
-    // Check if Docker is already running
-    try {
-        await (0, ssh_helper_js_1.sshExec)(envConfig, 'export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" && docker info >/dev/null 2>&1', stage, config);
-        return true; // Already running
-    }
-    catch {
-        // Not running — proceed to start
-    }
-    const server = getServerType(envConfig);
-    console.log('   Docker not running on ' + stage + ' server — starting...');
-    try {
-        if (server === 'mac') {
-            // Try Colima first, then Docker Desktop headless
-            await (0, ssh_helper_js_1.sshExec)(envConfig, 'export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" && ' +
-                'if command -v colima >/dev/null 2>&1; then ' +
-                '  colima start --memory 4 --cpu 2 2>/dev/null && echo "Colima started"; ' +
-                'elif [ -d "/Applications/Docker.app" ]; then ' +
-                '  nohup /Applications/Docker.app/Contents/MacOS/Docker --unattended > /dev/null 2>&1 & ' +
-                '  for i in $(seq 1 60); do sleep 1; if docker info >/dev/null 2>&1; then echo "Docker Desktop started"; exit 0; fi; done; ' +
-                '  echo "Docker Desktop failed to start within 60s"; exit 1; ' +
-                'else ' +
-                '  echo "No Docker runtime found"; exit 1; ' +
-                'fi', stage, config);
-        }
-        else {
-            await (0, ssh_helper_js_1.sshExec)(envConfig, 'sudo systemctl start docker && sudo systemctl enable docker', stage, config);
-        }
-        // Verify
-        await (0, ssh_helper_js_1.sshExec)(envConfig, 'export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" && docker info >/dev/null 2>&1', stage, config);
-        console.log('   [OK] Docker is running on ' + stage + ' server');
-        return true;
-    }
-    catch (e) {
-        console.log('   [!] Failed to start Docker: ' + (e instanceof Error ? e.message : String(e)));
-        return false;
-    }
-}
-/**
- * Pre-SSH Docker check: ensure Docker is installed and running on the remote server.
- *
- * Call this from fixStage() / deployStage() BEFORE SSHing to run the full fix/deploy.
- * Returns true if Docker is ready, false if it couldn't be fixed.
- */
-async function ensureRemoteDocker(stage, config) {
-    const environments = (0, config_helpers_js_1.extractEnvironments)(config);
-    const envConfig = stage === 'prod'
-        ? (environments.prod ?? environments.production)
-        : environments[stage];
-    if (!envConfig?.domain || envConfig.domain.toUpperCase().startsWith('EXAMPLE'))
-        return true; // Skip — no real domain
-    if (!(0, ssh_helper_js_1.findSshKeyForStage)(stage, config.name))
-        return true; // Skip — no SSH key
-    const installed = await ensureDockerInstalled(envConfig, stage, config);
-    if (!installed) {
-        console.log('   [!] Docker is not installed on ' + stage + ' — remote fix/deploy may fail');
-        return false;
-    }
-    const running = await ensureDockerRunning(envConfig, stage, config);
-    if (!running) {
-        console.log('   [!] Docker is not running on ' + stage + ' — remote fix/deploy may fail');
-        return false;
-    }
-    return true;
-}
-//# sourceMappingURL=docker.js.map

package/dist/plugins/pipelines/factiii/scanfix/docker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../src/plugins/pipelines/factiii/scanfix/docker.ts"],"names":[],"mappings":"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"}