steamutils 1.4.48 → 1.4.49

package/helpers/protos.js

@@ -1,52 +1,48 @@
-import Protobuf from "protobufjs";
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export default function Protos(protos, ignoreErrors = true) {
-  const protobufs = {};
-
-  for (let proto of protos) {
-    let root = new Protobuf.Root();
-    let files = Array.isArray(proto.protos) ? proto.protos : fs.readdirSync(proto.protos).map((file) => path.join(proto.protos, file));
-
-    for (let file of files) {
-      if (!file.endsWith(".proto") || !fs.existsSync(file)) {
-        continue;
-      }
-
-      try {
-        root = root.loadSync(file, {
-          keepCase: true,
-        });
-      } catch (err) {
-        if (!ignoreErrors) {
-          throw err;
-        }
-      }
-    }
-
-    protobufs[proto.name] = root;
-  }
-
-  return protobufs;
-}
-
-export function loadProfos(dir, protos = []) {
-  const currentDir = fs.readdirSync(dir);
-  for (const currentFile of currentDir) {
-    const _dir = path.join(dir, currentFile);
-    const isDirectory = fs.lstatSync(_dir).isDirectory();
-    if (isDirectory) {
-      loadProfos(_dir, protos);
-    } else {
-      if (currentFile.endsWith(".proto")) {
-        protos.push(_dir);
-      }
-    }
-  }
-  return protos;
-}
+import Protobuf from "protobufjs";
+import fs from "fs";
+import path from "path";
+
+export default function Protos(protos, ignoreErrors = true) {
+  const protobufs = {};
+
+  for (let proto of protos) {
+    const root = new Protobuf.Root();
+    const files = Array.isArray(proto.protos) ? proto.protos : fs.readdirSync(proto.protos).map((file) => path.join(proto.protos, file));
+
+    for (const file of files) {
+      if (!file.endsWith(".proto") || !fs.existsSync(file)) {
+        continue;
+      }
+
+      const childRoot = new Protobuf.Root().loadSync(file, {
+        keepCase: true,
+      });
+
+      for (const child of childRoot.nestedArray) {
+        try {
+          root.add(child);
+        } catch (e) {}
+      }
+    }
+
+    protobufs[proto.name] = root;
+  }
+
+  return protobufs;
+}
+
+export function loadProfos(dir, protos = []) {
+  const currentDir = fs.readdirSync(dir);
+  for (const currentFile of currentDir) {
+    const _dir = path.join(dir, currentFile);
+    const isDirectory = fs.lstatSync(_dir).isDirectory();
+    if (isDirectory) {
+      loadProfos(_dir, protos);
+    } else {
+      if (currentFile.endsWith(".proto")) {
+        protos.push(_dir);
+      }
+    }
+  }
+  return protos;
+}