print out unserializable items

cfi2017 · Apr 12, 2020 · dd6d578 · dd6d578
1 parent df58627
commit dd6d578
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/internal/item/item.go b/internal/item/item.go
@@ -2,13 +2,11 @@ package item
 
 import (
 	"encoding/binary"
-	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"hash/crc32"
 	"io/ioutil"
-	"log"
 	"strings"
 	"sync"
 
@@ -22,15 +20,15 @@ var (
 )
 
 type Item struct {
-	Level        int
-	Balance      string
-	Manufacturer string
-	InvData      string
-	Parts        []string
-	Generics     []string
-	Overflow     string
-	Version      uint64
-	Wrapper      *pb.OakInventoryItemSaveGameData
+	Level        int                              `json:"level"`
+	Balance      string                           `json:"balance"`
+	Manufacturer string                           `json:"manufacturer"`
+	InvData      string                           `json:"inv_data"`
+	Parts        []string                         `json:"parts"`
+	Generics     []string                         `json:"generics"`
+	Overflow     string                           `json:"overflow"`
+	Version      uint64                           `json:"version"`
+	Wrapper      *pb.OakInventoryItemSaveGameData `json:"wrapper"`
 }
 
 func DecryptSerial(data []byte) ([]byte, error) {
@@ -44,7 +42,6 @@ func DecryptSerial(data []byte) ([]byte, error) {
 	decrypted := bogoDecrypt(seed, data[5:])
 	crc := binary.BigEndian.Uint16(decrypted)                          // first two bytes of decrypted data are crc checksum
 	combined := append(append(data[:5], 0xFF, 0xFF), decrypted[2:]...) // combined data with checksum replaced with 0xFF to compute checksum
-	log.Println(hex.EncodeToString(combined))
 	computedChecksum := crc32.ChecksumIEEE(combined)
 	check := uint16(((computedChecksum) >> 16) ^ ((computedChecksum & 0xFFFF) >> 0))
 
@@ -151,6 +148,9 @@ func getBits(k string, v uint64) int {
 
 func getPart(key string, index uint64) string {
 	data := db.GetData(key)
+	if int(index) >= len(data.Assets) {
+		return ""
+	}
 	return data.GetPart(index)
 }
 

diff --git a/internal/server/character.go b/internal/server/character.go
@@ -1,7 +1,9 @@
 package server
 
 import (
+	"encoding/base64"
 	"io/ioutil"
+	"log"
 	"math"
 	"os"
 	"regexp"
@@ -126,17 +128,21 @@ func getItems(c *gin.Context) {
 		c.AbortWithStatus(500)
 	}
 	_, char := character.Deserialize(f)
-	items := make([]item.Item, len(char.InventoryItems))
+	items := make([]item.Item, 0)
 	for _, data := range char.InventoryItems {
-		i, err := item.Deserialize(data.ItemSerialNumber)
+		d := make([]byte, len(data.ItemSerialNumber))
+		copy(d, data.ItemSerialNumber)
+		i, err := item.Deserialize(d)
 		if err != nil {
-			c.AbortWithStatus(500)
-			return
+			log.Println(err)
+			log.Println(base64.StdEncoding.EncodeToString(data.ItemSerialNumber))
+			// c.AbortWithStatus(500)
+			// return
 		}
 		i.Wrapper = data
 		items = append(items, i)
 	}
-	c.JSON(200, items)
+	c.JSON(200, &items)
 	return
 }