bump version to v3

Delicious-Bacon · Jul 24, 2021 · 270330e · 270330e
1 parent 6983ce7
commit 270330e
Show file tree

Hide file tree

Showing 42 changed files with 111 additions and 111 deletions.
diff --git a/auth.go b/auth.go
@@ -5,10 +5,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/Philipp15b/go-steam/v2/protocol"
-	"github.com/Philipp15b/go-steam/v2/protocol/protobuf"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/protocol"
+	"github.com/Philipp15b/go-steam/v3/protocol/protobuf"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/auth_events.go b/auth_events.go
@@ -1,8 +1,8 @@
 package steam
 
 import (
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 )
 
 type LoggedOnEvent struct {

diff --git a/client.go b/client.go
@@ -13,12 +13,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/Philipp15b/go-steam/v2/cryptoutil"
-	"github.com/Philipp15b/go-steam/v2/netutil"
-	"github.com/Philipp15b/go-steam/v2/protocol"
-	"github.com/Philipp15b/go-steam/v2/protocol/protobuf"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/cryptoutil"
+	"github.com/Philipp15b/go-steam/v3/netutil"
+	"github.com/Philipp15b/go-steam/v3/protocol"
+	"github.com/Philipp15b/go-steam/v3/protocol/protobuf"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 )
 
 // Represents a client to the Steam network.

diff --git a/client_events.go b/client_events.go
@@ -1,7 +1,7 @@
 package steam
 
 import (
-	"github.com/Philipp15b/go-steam/v2/netutil"
+	"github.com/Philipp15b/go-steam/v3/netutil"
 )
 
 // When this event is emitted by the Client, the connection is automatically closed.

diff --git a/connection.go b/connection.go
@@ -9,8 +9,8 @@ import (
 	"net"
 	"sync"
 
-	"github.com/Philipp15b/go-steam/v2/cryptoutil"
-	"github.com/Philipp15b/go-steam/v2/protocol"
+	"github.com/Philipp15b/go-steam/v3/cryptoutil"
+	"github.com/Philipp15b/go-steam/v3/protocol"
 )
 
 type connection interface {

diff --git a/doc.go b/doc.go
@@ -16,8 +16,8 @@ You can also find a running example in the `gsbot` package.
 		"io/ioutil"
 		"log"
 
-		"github.com/Philipp15b/go-steam/v2"
-		"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+		"github.com/Philipp15b/go-steam/v3"
+		"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 	)
 
 	func main() {

diff --git a/economy/inventory/inventory.go b/economy/inventory/inventory.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/Philipp15b/go-steam/v2/jsont"
+	"github.com/Philipp15b/go-steam/v3/jsont"
 )
 
 type GenericInventory map[uint32]map[uint64]*Inventory

diff --git a/economy/inventory/inventory_apps.go b/economy/inventory/inventory_apps.go
@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 )
 
 type InventoryApps map[string]*InventoryApp

diff --git a/gamecoordinator.go b/gamecoordinator.go
@@ -3,10 +3,10 @@ package steam
 import (
 	"bytes"
 
-	"github.com/Philipp15b/go-steam/v2/protocol"
-	"github.com/Philipp15b/go-steam/v2/protocol/gamecoordinator"
-	"github.com/Philipp15b/go-steam/v2/protocol/protobuf"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/protocol"
+	"github.com/Philipp15b/go-steam/v3/protocol/gamecoordinator"
+	"github.com/Philipp15b/go-steam/v3/protocol/protobuf"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/generator/GoSteamLanguageGenerator/GoGen.cs b/generator/GoSteamLanguageGenerator/GoGen.cs
@@ -58,9 +58,9 @@ public void EmitClasses(Node root, StringBuilder sb)
             sb.AppendLine("    \"io\"");
             sb.AppendLine("    \"encoding/binary\"");
             sb.AppendLine("    \"google.golang.org/protobuf/proto\"");
-            sb.AppendLine("    \"github.com/Philipp15b/go-steam/v2/steamid\"");
-            sb.AppendLine("    \"github.com/Philipp15b/go-steam/v2/rwu\"");
-            sb.AppendLine("    \"github.com/Philipp15b/go-steam/v2/protocol/protobuf\"");
+            sb.AppendLine("    \"github.com/Philipp15b/go-steam/v3/steamid\"");
+            sb.AppendLine("    \"github.com/Philipp15b/go-steam/v3/rwu\"");
+            sb.AppendLine("    \"github.com/Philipp15b/go-steam/v3/protocol/protobuf\"");
             sb.AppendLine(")");
             sb.AppendLine();
 

diff --git a/generator/generator.go b/generator/generator.go
@@ -199,7 +199,6 @@ func forceRename(from, to string) error {
 }
 
 var pkgRegex = regexp.MustCompile(`(package \w+)`)
-var pkgCommentRegex = regexp.MustCompile(`(?s)(\/\*.*?\*\/\n)package`)
 var unusedImportCommentRegex = regexp.MustCompile("// discarding unused import .*\n")
 var fileDescriptorVarRegex = regexp.MustCompile(`fileDescriptor\d+`)
 
@@ -222,7 +221,7 @@ func fixProto(outDir, path string) {
 	importsToRemove := make([]*ast.ImportSpec, 0)
 	for _, i := range f.Imports {
 		// We remove all local imports
-		if i.Path.Value == "\".\"" {
+		if strings.Contains(i.Path.Value, ".proto") {
 			importsToRemove = append(importsToRemove, i)
 		}
 	}
@@ -231,7 +230,7 @@ func fixProto(outDir, path string) {
 		// remove the package name from all types
 		file = bytes.Replace(file, []byte(itr.Name.Name+"."), []byte{}, -1)
 		// and remove the import itself
-		file = bytes.Replace(file, []byte(fmt.Sprintf("import %v %v\n", itr.Name.Name, itr.Path.Value)), []byte{}, -1)
+		file = bytes.Replace(file, []byte(fmt.Sprintf("%v %v", itr.Name.Name, itr.Path.Value)), []byte{}, -1)
 	}
 
 	// remove warnings
@@ -242,7 +241,9 @@ func fixProto(outDir, path string) {
 
 	// fix the google dependency;
 	// we just reuse the one from protoc-gen-go
-	file = bytes.Replace(file, []byte("google/protobuf"), []byte("google.golang.org/protobuf/types/known/descriptorpb"), -1)
+	file = bytes.Replace(file, []byte("google/protobuf"), []byte("google.golang.org/protobuf"), -1)
+
+	file = bytes.Replace(file, []byte("google.golang.org/protobuf/descriptor.proto"), []byte("google.golang.org/protobuf/types/descriptorpb"), -1)
 
 	// we need to prefix local variables created by protoc-gen-go so that they don't clash with others in the same package
 	filename := strings.Split(filepath.Base(path), ".")[0]
@@ -312,11 +313,12 @@ func execute(command string, args []string) {
 	}
 
 	cmd := exec.Command(command, args...)
+	cmd.Stdout = newQuotedWriter(os.Stdout)
+	cmd.Stderr = newQuotedWriter(os.Stderr)
 
-	_, err := cmd.CombinedOutput()
+	err := cmd.Run()
 	if err != nil {
 		printerr(err.Error())
 		os.Exit(1)
 	}
-
 }
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/Philipp15b/go-steam/v2
+module github.com/Philipp15b/go-steam/v3
 
 go 1.16
 
@@ -7,4 +7,4 @@ require (
 	google.golang.org/protobuf v1.27.1
 )
 
-retract v2.0.0
+retract v3.0.0
diff --git a/go.sum b/go.sum
@@ -1,13 +1,10 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
-google.golang.org/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
diff --git a/gsbot/gsbot.go b/gsbot/gsbot.go
@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/Philipp15b/go-steam/v2"
-	"github.com/Philipp15b/go-steam/v2/netutil"
-	"github.com/Philipp15b/go-steam/v2/protocol"
+	"github.com/Philipp15b/go-steam/v3"
+	"github.com/Philipp15b/go-steam/v3/netutil"
+	"github.com/Philipp15b/go-steam/v3/protocol"
 	"github.com/davecgh/go-spew/spew"
 )
 
@@ -41,6 +41,7 @@ func Default() *GsBot {
 		log.New(os.Stdout, "", 0),
 	}
 }
+
 // This module handles authentication. It logs on automatically after a ConnectedEvent
 // and saves the sentry data to a file which is also used for logon if available.
 // If you're logging on for the first time Steam may require an authcode. You can then

diff --git a/gsbot/gsbot/gsbot.go b/gsbot/gsbot/gsbot.go
@@ -18,25 +18,25 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Philipp15b/go-steam/v2"
-	"github.com/Philipp15b/go-steam/v2/gsbot"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3"
+	"github.com/Philipp15b/go-steam/v3/gsbot"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 )
 
 const usage string = "usage: gsbot [username] [-p password] [-a authcode] [-t twofactorcode] [-l loginkey]"
 
 func main() {
-	if len(os.Args) < 3 || len(os.Args) % 2 != 0 {
+	if len(os.Args) < 3 || len(os.Args)%2 != 0 {
 		fmt.Println(usage)
 		return
 	}
 
 	details := &steam.LogOnDetails{
-		Username: os.Args[1],
+		Username:               os.Args[1],
 		ShouldRememberPassword: true,
 	}
 
-	for i := 2; i < len(os.Args) - 1; i += 2 {
+	for i := 2; i < len(os.Args)-1; i += 2 {
 		switch os.Args[i] {
 		case "-p":
 			details.Password = os.Args[i+1]

diff --git a/keys.go b/keys.go
@@ -3,8 +3,8 @@ package steam
 import (
 	"crypto/rsa"
 
-	"github.com/Philipp15b/go-steam/v2/cryptoutil"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/cryptoutil"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 )
 
 var publicKeys = map[steamlang.EUniverse][]byte{

diff --git a/notifications.go b/notifications.go
@@ -1,9 +1,9 @@
 package steam
 
 import (
-	"github.com/Philipp15b/go-steam/v2/protocol"
-	"github.com/Philipp15b/go-steam/v2/protocol/protobuf"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/protocol"
+	"github.com/Philipp15b/go-steam/v3/protocol/protobuf"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 )
 
 type Notifications struct {

diff --git a/protocol/gamecoordinator/msg.go b/protocol/gamecoordinator/msg.go
@@ -3,8 +3,8 @@ package gamecoordinator
 import (
 	"io"
 
-	"github.com/Philipp15b/go-steam/v2/protocol"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/protocol"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/protocol/gamecoordinator/packet.go b/protocol/gamecoordinator/packet.go
@@ -3,9 +3,9 @@ package gamecoordinator
 import (
 	"bytes"
 
-	"github.com/Philipp15b/go-steam/v2/protocol"
-	"github.com/Philipp15b/go-steam/v2/protocol/protobuf"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/protocol"
+	"github.com/Philipp15b/go-steam/v3/protocol/protobuf"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/protocol/internal.go b/protocol/internal.go
@@ -6,7 +6,7 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 )
 
 type JobId uint64

diff --git a/protocol/msg.go b/protocol/msg.go
@@ -3,8 +3,8 @@ package protocol
 import (
 	"io"
 
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/protocol/packet.go b/protocol/packet.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/protocol/steamlang/messages.go b/protocol/steamlang/messages.go
@@ -5,9 +5,9 @@ package steamlang
 
 import (
 	"encoding/binary"
-	"github.com/Philipp15b/go-steam/v2/protocol/protobuf"
-	"github.com/Philipp15b/go-steam/v2/rwu"
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/protocol/protobuf"
+	"github.com/Philipp15b/go-steam/v3/rwu"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 	"google.golang.org/protobuf/proto"
 	"io"
 )

diff --git a/servers.go b/servers.go
@@ -4,7 +4,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/Philipp15b/go-steam/v2/netutil"
+	"github.com/Philipp15b/go-steam/v3/netutil"
 )
 
 // CMServers contains a list of worlwide servers

diff --git a/social.go b/social.go
@@ -7,12 +7,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Philipp15b/go-steam/v2/protocol"
-	"github.com/Philipp15b/go-steam/v2/protocol/protobuf"
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
-	"github.com/Philipp15b/go-steam/v2/rwu"
-	"github.com/Philipp15b/go-steam/v2/socialcache"
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/protocol"
+	"github.com/Philipp15b/go-steam/v3/protocol/protobuf"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/rwu"
+	"github.com/Philipp15b/go-steam/v3/socialcache"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/social_events.go b/social_events.go
@@ -3,8 +3,8 @@ package steam
 import (
 	"time"
 
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 )
 
 type FriendsListEvent struct{}

diff --git a/socialcache/chats.go b/socialcache/chats.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
-	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/Philipp15b/go-steam/v3/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v3/steamid"
 )
 
 // Chats list is a thread safe map