fix: crashes when wrapper encounters an error.

Author: WorldObservationLog

decrypt.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"github.com/sirupsen/logrus"
 	"sync"
 )
@@ -56,6 +57,14 @@ func (d *Dispatcher) RemoveInstance(id string) {
 
 func (d *Dispatcher) Submit(task *Task) {
 	inst := d.selectInstance(task.AdamId)
+	if inst == nil {
+		task.Result <- &Result{
+			Success: false,
+			Data:    task.Payload,
+			Error:   fmt.Errorf("no available instance"),
+		}
+		return
+	}
 	inst.Process(task)
 }
 

decrypt_instance.go

@@ -25,6 +25,7 @@ type DecryptInstance struct {
 	LastAdamId     string
 	LastKey        string
 	LastHandleTime time.Time
+	closeOnce      sync.Once
 	Available      bool
 }
 
@@ -45,14 +46,16 @@ func NewDecryptInstance(inst *WrapperInstance) (*DecryptInstance, error) {
 }
 
 func (d *DecryptInstance) Unavailable() {
-	err := d.conn.Close()
-	if err != nil {
-		logrus.Errorf("failed to close conn of insttance %s: %s", d.id, err)
-	}
-	err = KillWrapper(d.id)
-	if err != nil {
-		logrus.Errorf("failed to kill insttance %s: %s", d.id, err)
-	}
+	d.closeOnce.Do(func() {
+		err := d.conn.Close()
+		if err != nil {
+			logrus.Errorf("failed to close conn of insttance %s: %s", d.id, err)
+		}
+		err = KillWrapper(d.id)
+		if err != nil {
+			logrus.Errorf("failed to kill insttance %s: %s", d.id, err)
+		}
+	})
 }
 
 func (d *DecryptInstance) GetLastAdamId() string {

wrapper.go

@@ -204,6 +204,15 @@ func wrapperDown(instance *WrapperInstance) {
 
 func KillWrapper(id string) error {
 	instance := GetInstance(id)
+	if instance == nil {
+		return fmt.Errorf("instance %s not found", id)
+	}
+	if instance.Cmd == nil {
+		return fmt.Errorf("instance %s cmd is nil", id)
+	}
+	if instance.Cmd.Process == nil {
+		return fmt.Errorf("instance %s process is nil", id)
+	}
 	return instance.Cmd.Process.Kill()
 }