Merge branch 'main' into localACMLogging

.releaserc.json

@@ -1,8 +1,5 @@
 {
-  "branches": [
-    "main",
-    "next"
-  ],
+  "branches": ["main", "next"],
   "plugins": [
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
@@ -12,20 +9,24 @@
       {
         "assets": [
           {
-            "path": "rpc_linux_x64",
+            "path": "rpc_linux_x64.tar.gz",
             "label": "Linux x64 RPC Executable"
           },
           {
-            "path": "rpc_linux_x86",
+            "path": "rpc_linux_x86.tar.gz",
             "label": "Linux x86 RPC Executable"
           },
           {
-            "path": "rpc_windows_x64.exe",
+            "path": "rpc_windows_x64.zip",
             "label": "Windows x64 RPC Executable"
           },
           {
-            "path": "rpc_windows_x86.exe",
+            "path": "rpc_windows_x86.zip",
             "label": "Windows x86 RPC Executable"
+          },
+          {
+            "path": "rpc_so_x64.tar.gz",
+            "label": "Linux x64 RPC Library"
           }
         ]
       }
@@ -34,11 +35,11 @@
     [
       "@semantic-release/exec",
       {
-        "prepareCmd": "docker build -t vprodemo.azurecr.io/rpc-go:v${nextRelease.version} . && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags \"-s -w -X 'rpc/pkg/utils.ProjectVersion=${nextRelease.version}'\" -trimpath -o rpc_linux_x64 ./cmd/main.go && CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags \"-s -w -X 'rpc/pkg/utils.ProjectVersion=${nextRelease.version}'\" -trimpath -o rpc_linux_x86 ./cmd/main.go && CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags \"-s -w -X 'rpc/pkg/utils.ProjectVersion=${nextRelease.version}'\" -trimpath -o rpc_windows_x64.exe ./cmd/main.go && CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags \"-s -w -X 'rpc/pkg/utils.ProjectVersion=${nextRelease.version}'\" -trimpath -o rpc_windows_x86.exe ./cmd/main.go",
+        "prepareCmd": "./build.sh ${nextRelease.version}",
         "publishCmd": "docker push vprodemo.azurecr.io/rpc-go:v${nextRelease.version}",
         "verifyReleaseCmd": "echo v${nextRelease.version} > .nextVersion"
       }
     ],
     "@semantic-release/git"
   ]
-}
+}

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [2.35.0](https://github.com/open-amt-cloud-toolkit/rpc-go/compare/v2.34.2...v2.35.0) (2024-06-20)
+
+
+### Features
+
+* enable local commands without lms ([#486](https://github.com/open-amt-cloud-toolkit/rpc-go/issues/486)) ([8b7e7b1](https://github.com/open-amt-cloud-toolkit/rpc-go/commit/8b7e7b1bad73aa903a1e11294e78831d07c8fb45))
+
 ## [2.34.2](https://github.com/open-amt-cloud-toolkit/rpc-go/compare/v2.34.1...v2.34.2) (2024-06-05)
 
 

Dockerfile

@@ -3,7 +3,7 @@
 # * SPDX-License-Identifier: Apache-2.0
 # **********************************************************************
 
-FROM golang:1.22-alpine@sha256:6522f0ca555a7b14c46a2c9f50b86604a234cdc72452bf6a268cae6461d9000b as builder
+FROM golang:1.22-alpine@sha256:8274bcfe89f5989777cb759302a7ced08c8a712c81982ca3ecc9fce0626592f1 as builder
 RUN apk update
 RUN apk upgrade
 RUN apk add --no-cache git

build.sh

@@ -0,0 +1,29 @@
+# Get version from the first argument
+version=$1
+
+docker build -t vprodemo.azurecr.io/rpc-go:v$version . 
+
+# Build for Linux
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X 'rpc/pkg/utils.ProjectVersion=$version'" -trimpath -o rpc_linux_x64 ./cmd/main.go
+CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags "-s -w -X 'rpc/pkg/utils.ProjectVersion=$version'" -trimpath -o rpc_linux_x86 ./cmd/main.go
+
+# Build for Windows
+CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X 'rpc/pkg/utils.ProjectVersion=$version'" -trimpath -o rpc_windows_x64.exe ./cmd/main.go 
+CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags "-s -w -X 'rpc/pkg/utils.ProjectVersion=$version'" -trimpath -o rpc_windows_x86.exe ./cmd/main.go
+
+# Build library for Linux
+CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -trimpath -buildmode=c-shared -o rpc.so.$version ./cmd
+
+# Mark the Unix system outputs as executable
+chmod +x rpc_linux_x64
+chmod +x rpc_linux_x86
+
+# Add them to tar files respectively
+tar cvfpz rpc_linux_x64.tar.gz rpc_linux_x64
+tar cvfpz rpc_linux_x86.tar.gz rpc_linux_x86
+tar cvfpz rpc_linux_x86.tar.gz rpc_linux_x86
+tar cvfpz rpc_so_x64.tar.gz rpc.so.$version
+
+# Add Windows build to a zip file
+zip rpc_windows_x64.zip rpc_windows_x64.exe
+zip rpc_windows_x86.zip rpc_windows_x86.exe

internal/flags/maintenance.go

@@ -207,9 +207,6 @@ func (f *Flags) handleMaintenanceSyncIP() error {
 			continue
 		}
 		addrs, _ := f.netEnumerator.InterfaceAddrs(&i)
-		if err != nil {
-			continue
-		}
 		for _, address := range addrs {
 			if ipnet, ok := address.(*net.IPNet); ok &&
 				ipnet.IP.To4() != nil &&

internal/lm/engine.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"rpc/pkg/pthi"
+	"sync"
 	"time"
 
 	"github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/apf"
@@ -22,7 +23,7 @@ type LMEConnection struct {
 	retries    int
 }
 
-func NewLMEConnection(data chan []byte, errors chan error, status chan bool) *LMEConnection {
+func NewLMEConnection(data chan []byte, errors chan error, wg *sync.WaitGroup) *LMEConnection {
 	lme := &LMEConnection{
 		ourChannel: 1,
 	}
@@ -31,7 +32,7 @@ func NewLMEConnection(data chan []byte, errors chan error, status chan bool) *LM
 		DataBuffer:  data,
 		ErrorBuffer: errors,
 		Tempdata:    []byte{},
-		Status:      status,
+		WaitGroup:   wg,
 	}
 
 	return lme
@@ -65,7 +66,7 @@ func (lme *LMEConnection) Connect() error {
 	} else {
 		lme.ourChannel = channel
 	}
-
+	lme.Session.WaitGroup.Add(1)
 	bin_buf := apf.ChannelOpen(lme.ourChannel)
 	err := lme.Command.Send(bin_buf.Bytes(), uint32(bin_buf.Len()))
 	if err != nil {
@@ -133,21 +134,11 @@ func (lme *LMEConnection) Listen() {
 		lme.Session.DataBuffer <- lme.Session.Tempdata
 		lme.Session.Tempdata = []byte{}
 		var bin_buf bytes.Buffer
-		// var windowAdjust apf.APF_CHANNEL_WINDOW_ADJUST_MESSAGE
-		// if lme.Session.RXWindow > 1024 { // TODO: Check this
-		// 	windowAdjust = apf.ChannelWindowAdjust(lme.Session.RecipientChannel, lme.Session.RXWindow)
-		// 	lme.Session.RXWindow = 0
-		// 	binary.Write(&bin_buf, binary.BigEndian, windowAdjust.MessageType)
-		// 	binary.Write(&bin_buf, binary.BigEndian, windowAdjust.RecipientChannel)
-		// 	lme.Command.Call(bin_buf.Bytes(), uint32(bin_buf.Len()))
-		// }
-
 		channelData := apf.ChannelClose(lme.Session.SenderChannel)
 		binary.Write(&bin_buf, binary.BigEndian, channelData.MessageType)
 		binary.Write(&bin_buf, binary.BigEndian, channelData.RecipientChannel)
 
 		lme.Command.Send(bin_buf.Bytes(), uint32(bin_buf.Len()))
-		lme.Session.Status <- true
 	}()
 	for {
 		result2, bytesRead, err2 := lme.Command.Receive()
@@ -167,7 +158,7 @@ func (lme *LMEConnection) Listen() {
 	}
 }
 
-// Close closes the LMS socket connection
+// Close closes the LME connection
 func (lme *LMEConnection) Close() error {
 	log.Debug("closing connection to lme")
 	lme.Command.Close()

internal/lm/engine_test.go

@@ -7,6 +7,7 @@ package lm
 import (
 	"errors"
 	"rpc/pkg/pthi"
+	"sync"
 	"testing"
 
 	"github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/apf"
@@ -52,11 +53,10 @@ func Test_NewLMEConnection(t *testing.T) {
 	resetMock()
 	lmDataChannel := make(chan []byte)
 	lmErrorChannel := make(chan error)
-	lmStatusChannel := make(chan bool)
-	lme := NewLMEConnection(lmDataChannel, lmErrorChannel, lmStatusChannel)
+	wg := &sync.WaitGroup{}
+	lme := NewLMEConnection(lmDataChannel, lmErrorChannel, wg)
 	assert.Equal(t, lmDataChannel, lme.Session.DataBuffer)
 	assert.Equal(t, lmErrorChannel, lme.Session.ErrorBuffer)
-	assert.Equal(t, lmStatusChannel, lme.Session.Status)
 }
 func TestLMEConnection_Initialize(t *testing.T) {
 	resetMock()
@@ -96,8 +96,10 @@ func TestLMEConnection_Initialize(t *testing.T) {
 			sendError = tt.sendErr
 			initError = tt.initErr
 			lme := &LMEConnection{
-				Command:    pthiVar,
-				Session:    &apf.Session{},
+				Command: pthiVar,
+				Session: &apf.Session{
+					WaitGroup: &sync.WaitGroup{},
+				},
 				ourChannel: 1,
 			}
 			if err := lme.Initialize(); (err != nil) != tt.wantErr {
@@ -112,9 +114,10 @@ func Test_Send(t *testing.T) {
 	sendBytesWritten = 14
 
 	lme := &LMEConnection{
-		Command:    pthiVar,
-		Session:    &apf.Session{},
-		ourChannel: 1,
+		Command: pthiVar,
+		Session: &apf.Session{
+			WaitGroup: &sync.WaitGroup{},
+		}, ourChannel: 1,
 	}
 	data := []byte("hello")
 	err := lme.Send(data)
@@ -124,8 +127,10 @@ func Test_Connect(t *testing.T) {
 	resetMock()
 	sendBytesWritten = 54
 	lme := &LMEConnection{
-		Command:    pthiVar,
-		Session:    &apf.Session{},
+		Command: pthiVar,
+		Session: &apf.Session{
+			WaitGroup: &sync.WaitGroup{},
+		},
 		ourChannel: 1,
 	}
 	err := lme.Connect()
@@ -136,8 +141,10 @@ func Test_Connect_With_Error(t *testing.T) {
 	sendError = errors.New("no such device")
 	sendBytesWritten = 54
 	lme := &LMEConnection{
-		Command:    pthiVar,
-		Session:    &apf.Session{},
+		Command: pthiVar,
+		Session: &apf.Session{
+			WaitGroup: &sync.WaitGroup{},
+		},
 		ourChannel: 1,
 	}
 	err := lme.Connect()
@@ -154,6 +161,7 @@ func Test_Listen(t *testing.T) {
 			DataBuffer:  lmDataChannel,
 			ErrorBuffer: lmErrorChannel,
 			Status:      make(chan bool),
+			WaitGroup:   &sync.WaitGroup{},
 		},
 		ourChannel: 1,
 	}

internal/local/amt/localTransport.go

@@ -12,27 +12,28 @@ import (
 	"io"
 	"net/http"
 	"rpc/internal/lm"
+	"sync"
 
 	"github.com/sirupsen/logrus"
 )
 
-// LocalTransport - Your custom net.Conn implementation
 type LocalTransport struct {
-	local  lm.LocalMananger
-	data   chan []byte
-	errors chan error
-	status chan bool
+	local     lm.LocalMananger
+	data      chan []byte
+	errors    chan error
+	status    chan bool
+	waitGroup *sync.WaitGroup
 }
 
 func NewLocalTransport() *LocalTransport {
 	lmDataChannel := make(chan []byte)
 	lmErrorChannel := make(chan error)
-	lmStatus := make(chan bool)
+	waiter := &sync.WaitGroup{}
 	lm := &LocalTransport{
-		local:  lm.NewLMEConnection(lmDataChannel, lmErrorChannel, lmStatus),
-		data:   lmDataChannel,
-		errors: lmErrorChannel,
-		status: lmStatus,
+		local:     lm.NewLMEConnection(lmDataChannel, lmErrorChannel, waiter),
+		data:      lmDataChannel,
+		errors:    lmErrorChannel,
+		waitGroup: waiter,
 	}
 	// defer lm.local.Close()
 	// defer close(lmDataChannel)
@@ -49,20 +50,18 @@ func NewLocalTransport() *LocalTransport {
 
 // Custom dialer function
 func (l *LocalTransport) RoundTrip(r *http.Request) (*http.Response, error) {
-	//Something comes here...Maybe
-	go l.local.Listen()
-
 	// send channel open
 	err := l.local.Connect()
+	//Something comes here...Maybe
+	go l.local.Listen()
 
 	if err != nil {
 		logrus.Error(err)
 		return nil, err
 	}
 	// wait for channel open confirmation
-	<-l.status
+	l.waitGroup.Wait()
 	logrus.Trace("Channel open confirmation received")
-
 	// Serialize the HTTP request to raw form
 	rawRequest, err := serializeHTTPRequest(r)
 	if err != nil {
@@ -71,22 +70,30 @@ func (l *LocalTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 	}
 
 	var responseReader *bufio.Reader
-	// send our data to LMX
-	err = l.local.Send(rawRequest)
+
+	err = l.local.Send([]byte(rawRequest))
 	if err != nil {
 		logrus.Error(err)
 		return nil, err
 	}
 
-	for dataFromLM := range l.data {
-		if len(dataFromLM) > 0 {
-			logrus.Debug("received data from LME")
-			logrus.Trace(string(dataFromLM))
-
-			// /<-l.status
-			responseReader = bufio.NewReader(bytes.NewReader(dataFromLM))
-			break
+Loop:
+	for {
+		select {
+		case dataFromLM := <-l.data:
+			if len(dataFromLM) > 0 {
+				logrus.Debug("received data from LME")
+				logrus.Trace(string(dataFromLM))
+				responseReader = bufio.NewReader(bytes.NewReader(dataFromLM))
+				break Loop
+			}
+		case errFromLMS := <-l.errors:
+			if errFromLMS != nil {
+				logrus.Error("error from LMS")
+				break Loop
+			}
 		}
+
 	}
 
 	response, err := http.ReadResponse(responseReader, r)
@@ -101,6 +108,8 @@ func (l *LocalTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 func serializeHTTPRequest(r *http.Request) ([]byte, error) {
 	var reqBuffer bytes.Buffer
 
+	r.Header.Set("Transfer-Encoding", "chunked")
+
 	// Write request line
 	reqLine := fmt.Sprintf("%s %s %s\r\n", r.Method, r.URL.RequestURI(), r.Proto)
 	reqBuffer.WriteString(reqLine)
@@ -115,8 +124,12 @@ func serializeHTTPRequest(r *http.Request) ([]byte, error) {
 		if err != nil {
 			return nil, err
 		}
+		length := fmt.Sprintf("%x", len(bodyBytes))
+		bodyBytes = append([]byte(length+"\r\n"), bodyBytes...)
+		bodyBytes = append(bodyBytes, []byte("\r\n0\r\n\r\n")...)
 		// Important: Replace the body so it can be read again later if needed
 		r.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
+
 		reqBuffer.Write(bodyBytes)
 	}