remove fmt.println

return pointers from byte parsing

.github/dependabot.yml

@@ -1,5 +1,9 @@
 version: 2
 updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
   - package-ecosystem: gomod
     directory: /
     schedule:

.github/workflows/release-makeosc.yml

@@ -1,4 +1,4 @@
-name: "release go binaries for multiple os/arch"
+name: "release go binaries for makeosc"
 
 on:
   push:
@@ -36,13 +36,13 @@ jobs:
           - goarch: "386"
             goos: darwin
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: wangyoucao577/go-release-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
-          goversion: "1.23.1"
+          goversion: "1.25.1"
           project_path: "./cmd/makeosc"
           binary_name: "makeosc"
           asset_name: makeosc-${{ matrix.goos }}-${{ matrix.goarch }}

.github/workflows/release-receiveosc.yml

@@ -1,4 +1,4 @@
-name: "release go binaries for multiple os/arch"
+name: "release go binaries for receiveosc"
 
 on:
   push:
@@ -36,13 +36,13 @@ jobs:
           - goarch: "386"
             goos: darwin
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: wangyoucao577/go-release-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
-          goversion: "1.23.1"
+          goversion: "1.25.1"
           project_path: "./cmd/receiveosc"
           binary_name: "receiveosc"
           asset_name: receiveosc-${{ matrix.goos }}-${{ matrix.goarch }}

.github/workflows/release-sendosc.yml

@@ -1,4 +1,4 @@
-name: "release go binaries for multiple os/arch"
+name: "release go binaries for sendosc"
 
 on:
   push:
@@ -36,13 +36,13 @@ jobs:
           - goarch: "386"
             goos: darwin
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: wangyoucao577/go-release-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
-          goversion: "1.23.1"
+          goversion: "1.25.1"
           project_path: "./cmd/sendosc"
           binary_name: "sendosc"
           asset_name: sendosc-${{ matrix.goos }}-${{ matrix.goarch }}

bundle.go

@@ -21,25 +21,25 @@ func (b *OSCBundle) ToBytes() []byte {
 	return bytes
 }
 
-func BundleFromBytes(bytes []byte) (OSCBundle, []byte, error) {
+func BundleFromBytes(bytes []byte) (*OSCBundle, []byte, error) {
 	if len(bytes) < 20 {
-		return OSCBundle{}, bytes, errors.New("bundle has to be at least 20 bytes")
+		return nil, bytes, errors.New("bundle has to be at least 20 bytes")
 	}
 
 	if bytes[0] != 35 {
-		return OSCBundle{}, bytes, errors.New("bundle must start with a #")
+		return nil, bytes, errors.New("bundle must start with a #")
 	}
 
 	bundleHeader, bytesAfterBundleHeader := readOSCString(bytes)
 
 	if bundleHeader != "#bundle" {
-		return OSCBundle{}, bytesAfterBundleHeader, errors.New("bundle must start with #bundle string")
+		return nil, bytesAfterBundleHeader, errors.New("bundle must start with #bundle string")
 	}
 
 	timeTag, bytesAfterTimeTag, err := readOSCTimeTag(bytesAfterBundleHeader)
 
 	if err != nil {
-		return OSCBundle{}, bytesAfterBundleHeader, err
+		return nil, bytesAfterBundleHeader, err
 	}
 
 	bundleContents := []OSCPacket{}
@@ -52,13 +52,13 @@ func BundleFromBytes(bytes []byte) (OSCBundle, []byte, error) {
 		contentSize, bytesAfterContentSize, err := readOSCInt32(remainingBytes)
 
 		if err != nil {
-			return OSCBundle{}, remainingBytes, err
+			return nil, remainingBytes, err
 		}
 
 		remainingBytes = bytesAfterContentSize
 
 		if len(remainingBytes) < int(contentSize) {
-			return OSCBundle{}, remainingBytes, errors.New("bundle doesn't have enough bytes for the content size it specifies")
+			return nil, remainingBytes, errors.New("bundle doesn't have enough bytes for the content size it specifies")
 		}
 
 		bundleContentBytes := remainingBytes[0:contentSize]
@@ -66,17 +66,17 @@ func BundleFromBytes(bytes []byte) (OSCBundle, []byte, error) {
 		if bundleContentBytes[0] == 35 {
 			content, _, err := BundleFromBytes(bundleContentBytes)
 			if err != nil {
-				return OSCBundle{}, remainingBytes, err
+				return nil, remainingBytes, err
 			}
-			bundleContents = append(bundleContents, &content)
+			bundleContents = append(bundleContents, content)
 		} else if bundleContentBytes[0] == 47 {
 			content, err := MessageFromBytes(bundleContentBytes)
 			if err != nil {
-				return OSCBundle{}, remainingBytes, err
+				return nil, remainingBytes, err
 			}
-			bundleContents = append(bundleContents, &content)
+			bundleContents = append(bundleContents, content)
 		} else {
-			return OSCBundle{}, remainingBytes, errors.New("bundle contents does not look a bundle or message")
+			return nil, remainingBytes, errors.New("bundle contents does not look a bundle or message")
 		}
 		remainingBytes = bytesAfterContentSize[contentSize:]
 		if len(remainingBytes) == 0 {
@@ -85,7 +85,7 @@ func BundleFromBytes(bytes []byte) (OSCBundle, []byte, error) {
 
 	}
 
-	return OSCBundle{
+	return &OSCBundle{
 			TimeTag:  timeTag,
 			Contents: bundleContents,
 		},

bundle_test.go

@@ -10,12 +10,12 @@ func TestOSCBundleEncoding(t *testing.T) {
 
 	testCases := []struct {
 		description string
-		bundle      OSCBundle
+		bundle      *OSCBundle
 		expected    []byte
 	}{
 		{
 			"simple contents single message",
-			OSCBundle{
+			&OSCBundle{
 				TimeTag: OSCTimeTag{
 					seconds:           32,
 					fractionalSeconds: 0,
@@ -46,12 +46,12 @@ func TestOSCBundleEncoding(t *testing.T) {
 func TestOSCBundleDecoding(t *testing.T) {
 	testCases := []struct {
 		description string
-		expected    OSCBundle
+		expected    *OSCBundle
 		bytes       []byte
 	}{
 		{
 			"simple contents single message",
-			OSCBundle{
+			&OSCBundle{
 				TimeTag: OSCTimeTag{
 					seconds:           32,
 					fractionalSeconds: 0,

cmd/makeosc/makeosc.go

@@ -1,13 +1,14 @@
 package main
 
 import (
+	"context"
 	"encoding/hex"
 	"fmt"
 	"os"
 	"strconv"
 
 	osc "github.com/jwetzell/osc-go"
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli/v3"
 )
 
 func main() {
@@ -16,18 +17,43 @@ func main() {
 	var Types []string
 	var Slip bool
 
-	var rootCmd = &cobra.Command{
+	cmd := &cli.Command{
-		Use: "sendosc",
+		Name:  "makeosc",
-		Run: func(cmd *cobra.Command, args []string) {
+		Usage: "make osc bytes",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:        "address",
+				Value:       "",
+				Usage:       "OSC address",
+				Destination: &Address,
+				Required:    true,
+			},
+			&cli.StringSliceFlag{
+				Name:        "arg",
+				Usage:       "OSC args",
+				Destination: &Args,
+			},
+			&cli.StringSliceFlag{
+				Name:        "type",
+				Usage:       "OSC types",
+				Destination: &Types,
+			},
+			&cli.BoolFlag{
+				Name:        "slip",
+				Value:       false,
+				Usage:       "whether to slip encode the OSC Message bytes",
+				Destination: &Slip,
+			},
+		},
+		Action: func(ctx context.Context, cmd *cli.Command) error {
 			make(Address, Args, Types, Slip)
+			return nil
 		},
 	}
-	rootCmd.Flags().StringVar(&Address, "address", "", "OSC address")
+
-	rootCmd.Flags().StringArrayVar(&Args, "arg", []string{}, "OSC args")
+	if err := cmd.Run(context.Background(), os.Args); err != nil {
-	rootCmd.Flags().StringArrayVar(&Types, "type", []string{}, "OSC types")
+		panic(err)
-	rootCmd.Flags().BoolVar(&Slip, "slip", false, "whether to slip encode the OSC Message bytes")
+	}
-	rootCmd.MarkFlagRequired("address")
-	rootCmd.Execute()
 }
 
 func argToTypedArg(rawArg string, oscType string) osc.OSCArg {
@@ -117,13 +143,13 @@ func slipEncode(bytes []byte) []byte {
 	ESC_END := byte(0xdc)
 	ESC_ESC := byte(0xdd)
 
-	var encodedBytes = []byte{}
+	var encodedBytes = []byte{END}
 
 	for _, byteToEncode := range bytes {
 		if byteToEncode == END {
-			encodedBytes = append(encodedBytes, ESC_END)
+			encodedBytes = append(encodedBytes, ESC, ESC_END)
 		} else if byteToEncode == ESC {
-			encodedBytes = append(encodedBytes, ESC_ESC)
+			encodedBytes = append(encodedBytes, ESC, ESC_ESC)
 		} else {
 			encodedBytes = append(encodedBytes, byteToEncode)
 		}

cmd/receiveosc/receiveosc.go

@@ -1,36 +1,91 @@
 package main
 
 import (
+	"context"
+	"encoding/json"
 	"fmt"
 	"net"
+	"os"
 
 	osc "github.com/jwetzell/osc-go"
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli/v3"
 )
 
 func main() {
-	var Host string
+	var IP string
-	var Port string
+	var Port int32
 	var Protocol string
+	var Format string
+	var Slip bool
 
-	var rootCmd = &cobra.Command{
+	cmd := &cli.Command{
-		Use: "sendosc",
+		Name:  "receiveosc",
-		Run: func(cmd *cobra.Command, args []string) {
+		Usage: "receive OSC messages via UDP or TCP",
-			netAddress := Host + ":" + Port
+		Flags: []cli.Flag{
-			if Protocol == "udp" {
+			&cli.StringFlag{
-				listenUDP(netAddress)
+				Name:        "ip",
-			} else if Protocol == "tcp" {
+				Usage:       "ip to receive OSC messages on",
-				listenTCP(netAddress)
+				Value:       "0.0.0.0",
+				Destination: &IP,
+			},
+			&cli.Int32Flag{
+				Name:        "port",
+				Usage:       "port to receive OSC messages on",
+				Destination: &Port,
+				Value:       8888,
+			},
+			&cli.StringFlag{
+				Name:        "protocol",
+				Usage:       "protocol to use to receive (tcp or udp)",
+				Value:       "udp",
+				Destination: &Protocol,
+				Validator: func(flag string) error {
+					if flag != "udp" && flag != "tcp" {
+						return fmt.Errorf("protocol must be either 'udp' or 'tcp'")
+					}
+					return nil
+				},
+			},
+			&cli.StringFlag{
+				Name:        "format",
+				Usage:       "format for messages to be output in ('json')",
+				Value:       "json",
+				Destination: &Format,
+				Validator: func(flag string) error {
+					if flag != "json" {
+						return fmt.Errorf("format must be 'json'")
+					}
+					return nil
+				},
+			},
+			&cli.BoolFlag{
+				Name:        "slip",
+				Value:       false,
+				Usage:       "whether to slip encode the OSC Message bytes",
+				Destination: &Slip,
+			},
+		},
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			netAddress := fmt.Sprintf("%s:%d", IP, Port)
+			switch Protocol {
+			case "udp":
+				listenUDP(netAddress, Format)
+			case "tcp":
+				if !Slip {
+					return fmt.Errorf("OSC 1.0 over TCP is not supported yet")
+				}
+				listenTCP(netAddress, Slip, Format)
 			}
+			return nil
 		},
 	}
-	rootCmd.Flags().StringVar(&Host, "host", "127.0.0.1", "host to send OSC message to")
+
-	rootCmd.Flags().StringVar(&Port, "port", "8888", "port to send OSC message to")
+	if err := cmd.Run(context.Background(), os.Args); err != nil {
-	rootCmd.Flags().StringVar(&Protocol, "protocol", "udp", "protocol to use to send (tcp or udp)")
+		panic(err)
-	rootCmd.Execute()
+	}
 }
 
-func listenTCP(netAddress string) {
+func listenTCP(netAddress string, useSLIP bool, format string) {
 	socket, err := net.Listen("tcp4", netAddress)
 	if err != nil {
 		fmt.Println(err)
@@ -39,21 +94,19 @@ func listenTCP(netAddress string) {
 
 	defer socket.Close()
 
-	fmt.Printf("listening on %s (tcp w/ SLIP)\n", netAddress)
-
 	for {
 		conn, err := socket.Accept()
 		if err != nil {
 			fmt.Println(err)
 			continue
 		}
-		go handleConnection(conn)
+		go handleTCPConnection(conn, useSLIP, format)
 	}
 }
 
 type SLIP struct {
 	pendingBytes []byte
-	Messages     chan osc.OSCMessage
+	Packets      chan osc.OSCPacket
 }
 
 func (s *SLIP) decode(bytes []byte) {
@@ -78,12 +131,15 @@ func (s *SLIP) decode(bytes []byte) {
 			}
 			escapeNext = false
 		} else if packetByte == END {
-			if len(s.pendingBytes) > 0 {
+			if len(s.pendingBytes) == 0 {
-				message, err := osc.MessageFromBytes(s.pendingBytes)
+				// probably opening END byte, can discard
+				continue
+			} else {
+				oscPacket, _, err := osc.PacketFromBytes(s.pendingBytes)
 				if err != nil {
-					fmt.Println(err)
+					panic(err)
 				} else {
-					s.Messages <- message
+					s.Packets <- oscPacket
 				}
 			}
 			s.pendingBytes = []byte{}
@@ -91,21 +147,20 @@ func (s *SLIP) decode(bytes []byte) {
 			s.pendingBytes = append(s.pendingBytes, packetByte)
 		}
 	}
-
 }
 
-func handleMessages(slip SLIP) {
+func handleSLIP(slip SLIP, format string) {
-	for message := range slip.Messages {
+	for message := range slip.Packets {
-		fmt.Printf("%v\n", message)
+		handlePacket(message, format)
 	}
 }
 
-func handleConnection(conn net.Conn) {
+func handleTCPConnection(conn net.Conn, useSLIP bool, format string) {
 	slip := SLIP{
 		pendingBytes: []byte{},
-		Messages:     make(chan osc.OSCMessage),
+		Packets:      make(chan osc.OSCPacket),
 	}
-	go handleMessages(slip)
+	go handleSLIP(slip, format)
 
 	defer conn.Close()
 	buffer := make([]byte, 1024)
@@ -116,12 +171,41 @@ func handleConnection(conn net.Conn) {
 		if err != nil {
 			return
 		}
+		if useSLIP {
+			slip.decode(buffer[0:bytesRead])
+		} else {
+			// TODO(jwetzell): handle non-SLIP TCP messages properly
+		}
 
-		slip.decode(buffer[0:bytesRead])
 	}
 }
 
-func listenUDP(netAddress string) {
+func handlePacket(message osc.OSCPacket, format string) {
+	if bundle, ok := message.(*osc.OSCBundle); ok {
+		handleBundle(bundle, format)
+	} else if msg, ok := message.(*osc.OSCMessage); ok {
+		handleMessage(msg, format)
+	} else {
+		fmt.Println("Received unknown OSC Packet type")
+	}
+}
+
+func handleMessage(message *osc.OSCMessage, format string) {
+	if format == "json" {
+		jsonData, _ := json.Marshal(message)
+		fmt.Println(string(jsonData))
+	} else {
+		fmt.Printf("%v\n", message)
+	}
+}
+
+func handleBundle(bundle *osc.OSCBundle, format string) {
+	for _, packet := range bundle.Contents {
+		handlePacket(packet, format)
+	}
+}
+
+func listenUDP(netAddress string, format string) {
 
 	s, err := net.ResolveUDPAddr("udp4", netAddress)
 	if err != nil {
@@ -135,8 +219,6 @@ func listenUDP(netAddress string) {
 		return
 	}
 
-	fmt.Printf("listening on %s (udp)\n", netAddress)
-
 	defer connection.Close()
 	buffer := make([]byte, 1024)
 
@@ -147,11 +229,11 @@ func listenUDP(netAddress string) {
 			panic(err)
 		}
 
-		oscMessage, err := osc.MessageFromBytes(buffer[0:bytesRead])
+		oscPacket, _, err := osc.PacketFromBytes(buffer[0:bytesRead])
 
 		if err != nil {
 			panic(err)
 		}
-		fmt.Println(oscMessage)
+		handlePacket(oscPacket, format)
 	}
 }

cmd/sendosc/sendosc.go

@@ -1,14 +1,17 @@
 package main
 
 import (
+	"context"
+	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 	"net"
+	"os"
 	"strconv"
 
 	osc "github.com/jwetzell/osc-go"
 
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli/v3"
 )
 
 func main() {
@@ -20,23 +23,68 @@ func main() {
 	var Types []string
 	var Slip bool
 
-	var rootCmd = &cobra.Command{
+	cmd := &cli.Command{
-		Use: "sendosc",
+		Name:  "sendosc",
-		Run: func(cmd *cobra.Command, args []string) {
+		Usage: "send OSC messages via UDP or TCP",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:        "host",
+				Usage:       "host to send OSC message to",
+				Destination: &Host,
+				Required:    true,
+			},
+			&cli.Int32Flag{
+				Name:        "port",
+				Usage:       "port to send OSC message to",
+				Destination: &Port,
+				Required:    true,
+			},
+			&cli.StringFlag{
+				Name:        "protocol",
+				Usage:       "protocol to use to send (tcp or udp)",
+				Value:       "udp",
+				Destination: &Protocol,
+				Validator: func(flag string) error {
+					if flag != "udp" && flag != "tcp" {
+						return fmt.Errorf("protocol must be either 'udp' or 'tcp'")
+					}
+					return nil
+				},
+			},
+			&cli.StringFlag{
+				Name:        "address",
+				Usage:       "OSC address",
+				Destination: &Address,
+				Required:    true,
+			},
+			&cli.StringSliceFlag{
+				Name:        "arg",
+				Usage:       "OSC args",
+				Value:       []string{},
+				Destination: &Args,
+			},
+			&cli.StringSliceFlag{
+				Name:        "type",
+				Usage:       "OSC types",
+				Value:       []string{},
+				Destination: &Types,
+			},
+			&cli.BoolFlag{
+				Name:        "slip",
+				Value:       false,
+				Usage:       "whether to slip encode the OSC Message bytes",
+				Destination: &Slip,
+			},
+		},
+		Action: func(ctx context.Context, cmd *cli.Command) error {
 			send(Host, Port, Address, Args, Types, Protocol, Slip)
+			return nil
 		},
 	}
-	rootCmd.Flags().StringVar(&Host, "host", "", "host to send OSC message to")
+
-	rootCmd.Flags().Int32Var(&Port, "port", 9999, "port to send OSC message to")
+	if err := cmd.Run(context.Background(), os.Args); err != nil {
-	rootCmd.Flags().StringVar(&Address, "address", "", "OSC address")
+		panic(err)
-	rootCmd.Flags().StringVar(&Protocol, "protocol", "udp", "protocol to use to send (tcp or udp)")
+	}
-	rootCmd.Flags().StringArrayVar(&Args, "arg", []string{}, "OSC args")
-	rootCmd.Flags().StringArrayVar(&Types, "type", []string{}, "OSC types")
-	rootCmd.Flags().BoolVar(&Slip, "slip", false, "whether to slip encode the OSC Message bytes")
-	rootCmd.MarkFlagRequired("host")
-	rootCmd.MarkFlagRequired("port")
-	rootCmd.MarkFlagRequired("address")
-	rootCmd.Execute()
 }
 
 func argToTypedArg(rawArg string, oscType string) osc.OSCArg {
@@ -126,13 +174,13 @@ func slipEncode(bytes []byte) []byte {
 	ESC_END := byte(0xdc)
 	ESC_ESC := byte(0xdd)
 
-	var encodedBytes = []byte{}
+	var encodedBytes = []byte{END}
 
 	for _, byteToEncode := range bytes {
 		if byteToEncode == END {
-			encodedBytes = append(encodedBytes, ESC_END)
+			encodedBytes = append(encodedBytes, ESC, ESC_END)
 		} else if byteToEncode == ESC {
-			encodedBytes = append(encodedBytes, ESC_ESC)
+			encodedBytes = append(encodedBytes, ESC, ESC_ESC)
 		} else {
 			encodedBytes = append(encodedBytes, byteToEncode)
 		}
@@ -164,6 +212,12 @@ func send(host string, port int32, address string, args []string, types []string
 
 	if slip {
 		oscMessageBuffer = slipEncode(oscMessageBuffer)
+	} else if protocol == "tcp" {
+		// OSC 1.0 prepends a 4 byte size header for non-SLIP TCP messages
+		size := uint32(len(oscMessageBuffer))
+		sizeBytes := make([]byte, 4)
+		binary.BigEndian.PutUint32(sizeBytes, size)
+		oscMessageBuffer = append(sizeBytes, oscMessageBuffer...)
 	}
 
 	netAddress := fmt.Sprintf("%s:%d", host, port)

go.mod

@@ -1,10 +1,5 @@
 module github.com/jwetzell/osc-go
 
-go 1.23.1
+go 1.25.1
 
-require github.com/spf13/cobra v1.8.1
+require github.com/urfave/cli/v3 v3.6.2
-
-require (
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-)

go.sum

@@ -1,10 +1,10 @@
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/urfave/cli/v3 v3.6.2 h1:lQuqiPrZ1cIz8hz+HcrG0TNZFxU70dPZ3Yl+pSrH9A8=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/urfave/cli/v3 v3.6.2/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

message.go

@@ -25,11 +25,15 @@ func (m *OSCMessage) ToBytes() []byte {
 	return oscBuffer
 }
 
-func MessageFromBytes(bytes []byte) (OSCMessage, error) {
+func MessageFromBytes(bytes []byte) (*OSCMessage, error) {
+	if len(bytes) == 0 {
+		return nil, errors.New("cannot create OSC Message from empty byte array")
+	}
+
 	address, typeAndArgBytes := readOSCString(bytes)
 
 	if address[0] != 47 {
-		return OSCMessage{}, errors.New("OSC Message address must start with /")
+		return nil, errors.New("OSC Message address must start with /")
 	}
 
 	oscMessage := OSCMessage{
@@ -42,17 +46,17 @@ func MessageFromBytes(bytes []byte) (OSCMessage, error) {
 	for index, oscType := range typeString {
 		if index == 0 {
 			if oscType != ',' {
-				return OSCMessage{}, errors.New("type string is malformed")
+				return nil, errors.New("type string is malformed")
 			}
 		} else {
 			oscArg, remainingBytes, error := readOSCArg(argBytes, string(oscType))
 			if error != nil {
-				return oscMessage, error
+				return nil, error
 			}
 			argBytes = remainingBytes
 			oscMessage.Args = append(oscMessage.Args, oscArg)
 		}
 	}
 
-	return oscMessage, nil
+	return &oscMessage, nil
 }

message_test.go

@@ -11,12 +11,12 @@ func TestOSCMessageEncoding(t *testing.T) {
 
 	testCases := []struct {
 		description string
-		message     OSCMessage
+		message     *OSCMessage
 		expected    []byte
 	}{
 		{
 			"simple hello",
-			OSCMessage{
+			&OSCMessage{
 				Address: "/hello",
 				Args:    []OSCArg{},
 			},
@@ -24,7 +24,7 @@ func TestOSCMessageEncoding(t *testing.T) {
 		},
 		{
 			"simple address string arg",
-			OSCMessage{
+			&OSCMessage{
 				Address: "/hello",
 				Args: []OSCArg{
 					{
@@ -37,47 +37,47 @@ func TestOSCMessageEncoding(t *testing.T) {
 		},
 		{
 			description: "simple address integer arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "i", Value: 35}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "i", Value: 35}}},
 			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35},
 		},
 		{
 			description: "simple address float arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "f", Value: 34.5}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "f", Value: 34.5}}},
 			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0},
 		},
 		{
 			description: "simple address blob arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "b", Value: []byte{98, 108, 111, 98}}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "b", Value: []byte{98, 108, 111, 98}}}},
 			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98},
 		},
 		{
 			description: "simple address True arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{OSCArg{Type: "T", Value: true}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "T", Value: true}}},
 			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0},
 		},
 		{
 			description: "simple address False arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "F", Value: false}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "F", Value: false}}},
 			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0},
 		},
 		{
 			description: "simple address color arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "r", Value: OSCColor{r: 20, g: 21, b: 22, a: 10}}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "r", Value: OSCColor{r: 20, g: 21, b: 22, a: 10}}}},
 			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10},
 		},
 		{
 			description: "simple address nil arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "N", Value: nil}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "N", Value: nil}}},
 			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0},
 		},
 		{
 			description: "simple address int64 arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "h", Value: 281474976710655}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "h", Value: 281474976710655}}},
 			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255},
 		},
 		{
 			description: "simple address float64 arg",
-			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "d", Value: 12.7654763}}},
+			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "d", Value: 12.7654763}}},
 			expected: []byte{
 				47, 104, 101, 108, 108, 111, 0, 0, 44, 100, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
 			},
@@ -101,7 +101,7 @@ func TestOSCMessageEncoding(t *testing.T) {
 		// },
 		{
 			description: "osc 1.0 spec example 1",
-			message:     OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: 440}}},
+			message:     &OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: 440}}},
 			expected: []byte{
 				47, 111, 115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52, 47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0, 44,
 				102, 0, 0, 67, 220, 0, 0,
@@ -109,7 +109,7 @@ func TestOSCMessageEncoding(t *testing.T) {
 		},
 		{
 			description: "osc 1.0 spec example 2",
-			message: OSCMessage{
+			message: &OSCMessage{
 				Address: "/foo",
 				Args: []OSCArg{
 					{Type: "i", Value: 1000},

osc.go

@@ -174,17 +174,13 @@ func argsToBuffer(args []OSCArg) []byte {
 func readOSCString(bytes []byte) (string, []byte) {
 	//TODO(jwetzell): add error handling
 	oscString := ""
-	stringFinished := false
 	stringEndIndex := 0
-	remainingBytes := []byte{}
 
 	for index, byteIn := range bytes {
-		if !stringFinished {
+		if byteIn == 0 {
-			if byteIn == 0 {
+			oscString = string(bytes[0:index])
-				oscString = string(bytes[0:index])
+			stringEndIndex = index + 1
-				stringEndIndex = index + 1
+			break
-				break
-			}
 		}
 	}
 
@@ -194,7 +190,7 @@ func readOSCString(bytes []byte) (string, []byte) {
 		stringEndIndex = stringEndIndex + stringPadding
 	}
 
-	remainingBytes = bytes[stringEndIndex:]
+	remainingBytes := bytes[stringEndIndex:]
 
 	return oscString, remainingBytes
 }
@@ -354,3 +350,26 @@ func readOSCArg(bytes []byte, oscType string) (OSCArg, []byte, error) {
 	}
 	return oscArg, remainingBytes, readArgError
 }
+
+func PacketFromBytes(bytes []byte) (OSCPacket, []byte, error) {
+	if len(bytes) == 0 {
+		return nil, bytes, errors.New("cannot create OSC Packet from empty byte array")
+	}
+
+	switch bytes[0] {
+	case '#':
+		bundle, remainingBytes, err := BundleFromBytes(bytes)
+		if err != nil {
+			return nil, bytes, err
+		}
+		return bundle, remainingBytes, nil
+	case '/':
+		message, err := MessageFromBytes(bytes)
+		if err != nil {
+			return nil, bytes, err
+		}
+		return message, []byte{}, nil
+	default:
+		return nil, bytes, errors.New("OSC Packet must start with # for bundle or / for message")
+	}
+}

types.go

@@ -5,18 +5,18 @@ type OSCPacket interface {
 }
 
 type OSCBundle struct {
-	Contents []OSCPacket
+	Contents []OSCPacket `json:"contents"`
-	TimeTag  OSCTimeTag
+	TimeTag  OSCTimeTag  `json:"timeTag"`
 }
 
 type OSCArg struct {
-	Value any
+	Value any    `json:"value"`
-	Type  string
+	Type  string `json:"type"`
 }
 
 type OSCMessage struct {
-	Address string
+	Address string   `json:"address"`
-	Args    []OSCArg
+	Args    []OSCArg `json:"args"`
 }
 
 type OSCColor struct {