rds_ssm_connect 2.0.0 → 2.0.1

package/.github/workflows/release.yml

@@ -77,6 +77,9 @@ jobs:
           npx @yao-pkg/pkg src-tauri/binaries/gui-adapter-bundle.cjs --target ${{ matrix.sidecar_target }} -o src-tauri/binaries/gui-adapter-${{ matrix.sidecar_triple }}
           rm src-tauri/binaries/gui-adapter-bundle.cjs
 
+      - name: Download session-manager-plugin
+        run: node scripts/download-ssm-plugin.js --triple ${{ matrix.sidecar_triple }}
+
       - name: Build Tauri app
         uses: tauri-apps/tauri-action@v0
         env:

package/.github/workflows/update-homebrew.yml

@@ -64,15 +64,10 @@ jobs:
             homepage "https://github.com/yarka-guru/connection_app"
 
             depends_on macos: ">= :monterey"
-            depends_on formula: "aws-vault"
-            depends_on formula: "awscli"
 
             app "RDS SSM Connect.app"
 
             caveats <<~EOS
-              You also need the AWS Session Manager Plugin:
-                brew install --cask session-manager-plugin
-
               Ensure your AWS profiles are configured in ~/.aws/config
             EOS
 
@@ -104,9 +99,6 @@ jobs:
               end
             end
 
-            depends_on "awscli"
-            depends_on "aws-vault"
-
             def install
               system "ar", "x", cached_download
               mkdir_p "extract"
@@ -118,9 +110,6 @@ jobs:
 
             def caveats
               <<~EOS
-                You also need the AWS Session Manager Plugin:
-                  https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html
-
                 Ensure your AWS profiles are configured in ~/.aws/config
 
                 On macOS, install the desktop app instead:

package/connect.js

@@ -14,9 +14,10 @@ import {
 import { createAwsClients, destroyAwsClients } from './src/aws-clients.js'
 import * as ops from './src/aws-operations.js'
 import { findPluginBinary, spawnPlugin } from './src/plugin-resolver.js'
+import { ensureSsoSession } from './src/sso-login.js'
 
 // Package info for version checking
-const packageJson = { name: 'rds_ssm_connect', version: '1.8.3' }
+const packageJson = { name: 'rds_ssm_connect', version: '2.0.1' }
 
 // Event emitter for IPC communication
 const ipcEmitter = new EventEmitter()
@@ -962,6 +963,20 @@ async function main() {
       allEnvSuffixes.find((suffix) => ENV === suffix)
     const portNumber = envPortMapping[matchedSuffix] || defaultPort
 
+    // Ensure SSO session is valid (if SSO profile)
+    await ensureSsoSession(ENV, {
+      onEvent: (_event, data) => {
+        if (data?.message) console.log(`\u23F3 ${data.message}`)
+      },
+      onOpenUrl: (url) => {
+        console.log(`\n\uD83C\uDF10 Open this URL in your browser to authorize:\n   ${url}\n`)
+        // Try to open browser automatically
+        const { platform } = process
+        const cmd = platform === 'darwin' ? 'open' : platform === 'win32' ? 'start' : 'xdg-open'
+        try { spawnSync(cmd, [url], { stdio: 'ignore' }) } catch {}
+      },
+    })
+
     // Create SDK clients ONCE for this CLI session
     const clients = createAwsClients(ENV, region)
 
@@ -1021,9 +1036,10 @@ async function main() {
     } finally {
       destroyAwsClients(clients)
     }
-  } catch (_error) {
+  } catch (error) {
+    console.error(`\n\u274C ${error.message || error}`)
     setImmediate(() => {
-      throw new Error('Forcing exit due to unhandled error')
+      process.exit(1)
     })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rds_ssm_connect",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "module",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
     "@aws-sdk/client-sso-oidc": "^3.1000.0",
     "@aws-sdk/client-sts": "^3.1000.0",
     "@aws-sdk/credential-providers": "^3.1000.0",
-    "fast-xml-parser": "^5.3.6",
+    "fast-xml-parser": "^5.3.8",
     "glob": "^13.0.0",
     "inquirer": "^13.2.2",
     "rimraf": "^6.1.2"
@@ -35,7 +35,7 @@
     "vite": "^6.4.1"
   },
   "overrides": {
-    "fast-xml-parser": "^5.3.6"
+    "fast-xml-parser": "^5.3.8"
   },
   "bin": {
     "rds_ssm_connect": "./connect.js"

package/scripts/download-ssm-plugin.js

@@ -216,6 +216,29 @@ function extractWindowsZip(archivePath, tmpDir) {
     }
   }
 
+  // The AWS Windows zip has nested archives:
+  //   outer.zip → SessionManagerPlugin.zip → package.zip → session-manager-plugin.exe
+  // Extract all nested zips we find.
+  function expandZip(zipPath, destDir) {
+    mkdirSync(destDir, { recursive: true });
+    if (isWindows) {
+      execSync(
+        `powershell -Command "Expand-Archive -Force -Path '${zipPath}' -DestinationPath '${destDir}'"`,
+        { stdio: "pipe" },
+      );
+    } else {
+      execSync(`unzip -o "${zipPath}" -d "${destDir}"`, { stdio: "pipe" });
+    }
+  }
+
+  for (const nestedName of ["SessionManagerPlugin.zip", "package.zip"]) {
+    const found = findFileRecursive(tmpDir, nestedName);
+    if (found) {
+      const destDir = join(tmpDir, nestedName.replace(".zip", "-extracted"));
+      expandZip(found, destDir);
+    }
+  }
+
   // Search for the exe — could be in bin/ subdirectory or at root
   const candidates = [
     join(tmpDir, "bin", "session-manager-plugin.exe"),
@@ -355,12 +378,25 @@ async function processTarget(target) {
 async function main() {
   const args = process.argv.slice(2);
   const currentPlatformOnly = args.includes("--current-platform-only");
+  const tripleIndex = args.indexOf("--triple");
+  const tripleArg = tripleIndex !== -1 ? args[tripleIndex + 1] : null;
 
   // Ensure output directory exists
   mkdirSync(BINARIES_DIR, { recursive: true });
 
   let targets;
-  if (currentPlatformOnly) {
+  if (tripleArg) {
+    targets = TARGETS.filter((t) => t.triple === tripleArg);
+    if (targets.length === 0) {
+      console.error(`Error: Unknown triple "${tripleArg}".`);
+      console.error("Available triples:");
+      for (const t of TARGETS) {
+        console.error(`  - ${t.triple}`);
+      }
+      process.exit(1);
+    }
+    console.log(`Downloading for triple: ${tripleArg}\n`);
+  } else if (currentPlatformOnly) {
     targets = getTargetsForCurrentPlatform();
     if (targets.length === 0) {
       console.warn(

package/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rds-ssm-connect"
-version = "2.0.0"
+version = "2.0.1"
 description = "Secure RDS connections through AWS SSM"
 authors = ["Iaroslav Pyrogov"]
 edition = "2024"

package/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "RDS SSM Connect",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "identifier": "com.rds-ssm-connect.desktop",
   "build": {
     "beforeDevCommand": "npm run dev:vite",