steamutils 1.5.39 → 1.5.41

package/_steamproto.js

@@ -1,51 +1,53 @@
-import path from "path";
-import { fileURLToPath } from "url";
-import Protobuf from "protobufjs";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export class SteamProto {
-  constructor(proto) {
-    this._proto = proto;
-  }
-
-  toProto() {
-    const root = new Protobuf.Root().loadSync(path.join(`${__dirname}/protos/`, this._proto.filename), {
-      keepCase: true,
-    });
-    return root[this._proto.name];
-  }
-
-  protoEncode(obj) {
-    const protobuf = this.toProto();
-    return protobuf.encode(protobuf.create(obj)).finish();
-  }
-
-  protoEncodeBase64(obj) {
-    return this.protoEncode(obj).toString("base64");
-  }
-
-  protoDecode(obj) {
-    if (isBase64(obj)) {
-      obj = Buffer.from(obj, "base64");
-    }
-
-    const protobuf = this.toProto();
-    try {
-      return protobuf.toObject(protobuf.decode(obj), { defaults: true });
-    } catch (e) {
-      console.error(`[${this._proto.name}] protoDecode 1`, typeof obj, obj);
-      console.error(`[${this._proto.name}] protoDecode 2`, e);
-      return null;
-    }
-  }
-}
-
-function isBase64(str) {
-  if (typeof str !== "string") return false;
-  // remove whitespace and check
-  str = str.trim();
-  // base64 should only contain A-Z, a-z, 0-9, +, /, and possibly = at the end
-  return /^[A-Za-z0-9+/]+={0,2}$/.test(str) && str.length % 4 === 0;
-}
+import path from "path";
+import { fileURLToPath } from "url";
+import Protobuf from "protobufjs";
+import gpf from "google-proto-files";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export class SteamProto {
+  constructor(proto) {
+    this._proto = proto;
+  }
+
+  toProto() {
+    const filePath = path.join(`${__dirname}/protos/`, this._proto.filename);
+    const root = new Protobuf.Root().loadSync([gpf.getProtoPath("protobuf/descriptor.proto"), filePath], {
+      keepCase: true,
+    });
+    return root.lookupType(this._proto.name);
+  }
+
+  protoEncode(obj) {
+    const protobuf = this.toProto();
+    return protobuf.encode(protobuf.create(obj)).finish();
+  }
+
+  protoEncodeBase64(obj) {
+    return this.protoEncode(obj).toString("base64");
+  }
+
+  protoDecode(obj) {
+    if (isBase64(obj)) {
+      obj = Buffer.from(obj, "base64");
+    }
+
+    const protobuf = this.toProto();
+    try {
+      return protobuf.toObject(protobuf.decode(obj), { defaults: true });
+    } catch (e) {
+      console.error(`[${this._proto.name}] protoDecode 1`, typeof obj, obj);
+      console.error(`[${this._proto.name}] protoDecode 2`, e);
+      return null;
+    }
+  }
+}
+
+function isBase64(str) {
+  if (typeof str !== "string") return false;
+  // remove whitespace and check
+  str = str.trim();
+  // base64 should only contain A-Z, a-z, 0-9, +, /, and possibly = at the end
+  return /^[A-Za-z0-9+/]+={0,2}$/.test(str) && str.length % 4 === 0;
+}