gssh-agent 1.0.4 → 1.0.7

package/.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+
+      - name: Build
+        run: go build ./...
+
+      - name: Test
+        run: go test ./...

package/.github/workflows/publish.yml

@@ -0,0 +1,104 @@
+name: Publish
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  # npm 发布
+  publish-npm:
+    if: "contains(github.event.head_commit.message, 'publish')"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+
+      - name: Get version
+        id: version
+        run: |
+          VERSION=$(echo "${{ github.event.head_commit.message }}" | sed -n 's/.*publish[: ]*\(.*\)/\1/p')
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+          echo "Publishing version: $VERSION"
+
+      - name: Build
+        run: |
+          go build -ldflags="-s -w" -o bin/gssh ./cmd/gssh
+
+      - name: Update package.json version
+        run: |
+          VERSION="${{ steps.version.outputs.VERSION }}"
+          npm version $VERSION --no-git-tag-version
+
+      - name: Build npm package
+        run: npm pack
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Configure npm
+        run: |
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
+          cat .npmrc
+
+      - name: Publish to npm
+        run: npm publish --access public 
+
+  # GitHub Releases 发布
+  publish-github:
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    strategy:
+      matrix:
+        include:
+          - goos: linux
+            goarch: amd64
+          - goos: linux
+            goarch: arm64
+          - goos: darwin
+            goarch: amd64
+          - goos: darwin
+            goarch: arm64
+          - goos: windows
+            goarch: amd64
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+
+      - name: Build
+        env:
+          GOOS: ${{ matrix.goos }}
+          GOARCH: ${{ matrix.goarch }}
+        run: |
+          EXT=""
+          if [ "$GOOS" = "windows" ]; then
+            EXT=".exe"
+          fi
+          FILENAME="gssh-${GOOS}-${GOARCH}${EXT}"
+          go build -ldflags="-s -w" -o "$FILENAME" ./cmd/gssh
+          echo "$FILENAME" >> artifacts.txt
+
+      - name: Upload Release Asset
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.ref }}
+          files: ${{ matrix.goos }}-${{ matrix.goarch }}*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/cmd/gssh/main.go

@@ -309,6 +309,7 @@ func handleExec(args []string, socketPath string) error {
 	fs.SetOutput(os.Stderr)
 
 	sessionID := fs.String("s", "", "Session ID")
+	timeout := fs.Int("t", 0, "Timeout in seconds (0 = no timeout)")
 	sudoPassword := fs.String("S", "", "sudo password")
 	askSudoPassword := fs.Bool("ask-sudo-pass", false, "Interactively ask for sudo password")
 
@@ -334,6 +335,7 @@ func handleExec(args []string, socketPath string) error {
 	params := protocol.ExecParams{
 		SessionID: *sessionID,
 		Command:   command,
+		Timeout:   *timeout,
 	}
 
 	result, err := sendRequest(socketPath, "exec", params)

package/internal/portforward/forwarder.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net"
 	"sync"
+	"time"
 
 	"golang.org/x/crypto/ssh"
 )
@@ -74,14 +75,22 @@ func (f *Forwarder) startLocalForward() {
 			}
 			f.mu.RUnlock()
 
+			// Set deadline to prevent blocking forever
+			f.listener.(*net.TCPListener).SetDeadline(time.Now().Add(5 * time.Second))
+
 			conn, err := f.listener.Accept()
 			if err != nil {
+				// Check if it's a timeout
+				if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
+					continue
+				}
 				f.mu.RLock()
 				closed := f.closed
 				f.mu.RUnlock()
 				if closed {
 					return
 				}
+				log.Printf("[portforward] Accept error: %v", err)
 				continue
 			}
 
@@ -105,8 +114,10 @@ func (f *Forwarder) handleLocalConnection(localConn net.Conn) {
 
 	log.Printf("[portforward] Connection accepted from %s", localConn.RemoteAddr())
 
-	remoteAddr := fmt.Sprintf("localhost:%d", f.RemotePort)
-	remoteConn, err := f.sshClient.Dial("tcp", remoteAddr)
+	// Use 127.0.0.1 instead of localhost to avoid IPv6 issues
+	remoteAddr := fmt.Sprintf("127.0.0.1:%d", f.RemotePort)
+
+	remoteConn, err := net.DialTimeout("tcp", remoteAddr, 5*time.Second)
 	if err != nil {
 		log.Printf("[portforward] Failed to connect to remote %s: %v", remoteAddr, err)
 		return
@@ -136,27 +147,41 @@ func (f *Forwarder) startRemoteForward() {
 		defer f.wg.Done()
 
 		// Request the SSH server to listen on remote:remotePort and forward connections to us
-		// Payload format: string (address) + uint32 (port)
 		addr := fmt.Sprintf(":%d", f.RemotePort)
 		payload := ssh.Marshal(struct {
 			Addr string
 			Port uint32
 		}{Addr: addr, Port: uint32(f.RemotePort)})
 
-		ok, _, err := f.sshClient.SendRequest("tcpip-forward", true, payload)
-		if err != nil {
-			log.Printf("[portforward] Failed to send tcpip-forward request: %v", err)
-			return
+		// Use timeout for the request
+		type result struct {
+			ok  bool
+			err error
 		}
-		if !ok {
-			log.Printf("[portforward] SSH server rejected tcpip-forward request for port %d", f.RemotePort)
+		resultCh := make(chan result, 1)
+		go func() {
+			ok, _, err := f.sshClient.SendRequest("tcpip-forward", true, payload)
+			resultCh <- result{ok: ok, err: err}
+		}()
+
+		select {
+		case r := <-resultCh:
+			if r.err != nil {
+				log.Printf("[portforward] Failed to send tcpip-forward request: %v", r.err)
+				return
+			}
+			if !r.ok {
+				log.Printf("[portforward] SSH server rejected tcpip-forward request for port %d", f.RemotePort)
+				return
+			}
+		case <-time.After(5 * time.Second):
+			log.Printf("[portforward] tcpip-forward request timed out")
 			return
 		}
 
 		log.Printf("[portforward] Remote forward: SSH server listening on port %d", f.RemotePort)
 
-		// Now we need to accept forwarded connections from the SSH server
-		// The SSH server will open a "forwarded-tcpip" channel for each connection
+		// Accept forwarded connections in a loop
 		for {
 			f.mu.RLock()
 			if f.closed {
@@ -165,7 +190,7 @@ func (f *Forwarder) startRemoteForward() {
 			}
 			f.mu.RUnlock()
 
-			// Wait for a forwarded connection
+			// Wait for a forwarded connection with timeout
 			ch, reqs, err := f.sshClient.OpenChannel("forwarded-tcpip", nil)
 			if err != nil {
 				f.mu.RLock()
@@ -174,7 +199,9 @@ func (f *Forwarder) startRemoteForward() {
 				if closed {
 					return
 				}
+				// Log and continue - don't block
 				log.Printf("[portforward] Error accepting forwarded connection: %v", err)
+				time.Sleep(1 * time.Second)
 				continue
 			}
 
@@ -182,8 +209,8 @@ func (f *Forwarder) startRemoteForward() {
 			go ssh.DiscardRequests(reqs)
 
 			// Connect to local port
-			localAddr := fmt.Sprintf("localhost:%d", f.LocalPort)
-			localConn, err := net.Dial("tcp", localAddr)
+			localAddr := fmt.Sprintf("127.0.0.1:%d", f.LocalPort)
+			localConn, err := net.DialTimeout("tcp", localAddr, 5*time.Second)
 			if err != nil {
 				log.Printf("[portforward] Failed to connect to local port %d: %v", f.LocalPort, err)
 				ch.Close()

package/internal/protocol/types.go

@@ -72,6 +72,7 @@ type ReconnectParams struct {
 type ExecParams struct {
 	SessionID string `json:"session_id,omitempty"`
 	Command   string `json:"command"`
+	Timeout   int    `json:"timeout,omitempty"` // 超时时间（秒），0 表示无超时
 }
 
 type ForwardParams struct {
@@ -108,6 +109,7 @@ type SCPResult struct {
 // SFTPParams represents SFTP command parameters
 type SFTPParams struct {
 	SessionID string `json:"session_id,omitempty"`
-	Command   string `json:"command"` // "ls", "cd", "pwd", "mkdir", "rm", "rmdir"
+	Command   string `json:"command"`
+	Timeout   int    `json:"timeout,omitempty"` // 超时时间（秒），0 表示无超时 // "ls", "cd", "pwd", "mkdir", "rm", "rmdir"
 	Path      string `json:"path"`
 }

package/internal/session/manager.go

@@ -224,7 +224,7 @@ func (m *Manager) Reconnect(sessionID string) (*protocol.Session, error) {
 }
 
 // Exec executes a command on a session
-func (m *Manager) Exec(sessionID, command string) (*protocol.ExecResult, error) {
+func (m *Manager) Exec(sessionID, command string, timeout int) (*protocol.ExecResult, error) {
 	m.mu.RLock()
 	var ms *ManagedSession
 	if sessionID != "" {
@@ -259,9 +259,34 @@ func (m *Manager) Exec(sessionID, command string) (*protocol.ExecResult, error)
 		fullCmd = fmt.Sprintf("/bin/sh -c %q", command)
 	}
 
-	output, err := session.CombinedOutput(fullCmd)
+	// 执行命令，支持超时
+	var output []byte
+	var exitErr *ssh.ExitError
+	var ok bool
+
+	if timeout > 0 {
+		done := make(chan struct{})
+		go func() {
+			output, err = session.CombinedOutput(fullCmd)
+			close(done)
+		}()
+		select {
+		case <-done:
+			// 命令执行完成
+		case <-time.After(time.Duration(timeout) * time.Second):
+			session.Signal(ssh.SIGKILL)
+			return &protocol.ExecResult{
+				Stdout:   string(output),
+				Stderr:   "",
+				ExitCode: -1,
+			}, fmt.Errorf("command timed out after %d seconds", timeout)
+		}
+	} else {
+		output, err = session.CombinedOutput(fullCmd)
+	}
+
 	if err != nil {
-		exitErr, ok := err.(*ssh.ExitError)
+		exitErr, ok = err.(*ssh.ExitError)
 		if ok {
 			ms.LastCmd = command
 			return &protocol.ExecResult{

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "gssh-agent",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "SSH Session Manager for Agents - Stateless SSH client with SFTP support",
   "bin": {
-    "gssh": "./bin/gssh",
-    "gssh-daemon": "./bin/gssh-daemon"
+    "gssh": "./bin/gssh"
   },
   "repository": {
     "type": "git",

package/pkg/rpc/handler.go

@@ -60,7 +60,7 @@ func (h *Handler) Handle(data []byte) ([]byte, error) {
 		if err := json.Unmarshal(req.Params, &params); err != nil {
 			return h.errorResponse(req.ID, -32602, "Invalid params")
 		}
-		result, err = h.manager.Exec(params.SessionID, params.Command)
+		result, err = h.manager.Exec(params.SessionID, params.Command, params.Timeout)
 
 	case "list":
 		result = h.manager.List()

package/skill.md

@@ -41,8 +41,14 @@ gssh exec "ls -la"
 
 # sudo 命令
 gssh exec -S password "sudo systemctl restart nginx"
+
+# 后台运行（推荐格式）
+gssh exec "nohup python3 app.py > /dev/null 2>&1 &"
+gssh exec "python3 app.py &"
 ```
 
+**后台运行说明**：推荐使用 `nohup command > /dev/null 2>&1 &` 格式，可确保命令立即返回且不阻塞。
+
 ## 文件传输
 
 ```bash