cacher: extra validation and use fs

src/core/native.ts

@@ -1,6 +1,14 @@
+const nmp = nativeModuleProxy;
+
 const {
     RTNFileManager
-} = nativeModuleProxy;
+} = nmp;
+
+const ClientInfo = nmp.InfoDictionaryManager ?? nmp.RTNClientInfoManager;
+
+export function getBuildNumber() {
+    return ClientInfo.Build;
+}
 
 export async function removeFile(path: string, prefix = "pyoncord/") {
     return void await RTNFileManager.removeFile("documents", `${prefix}${path}`);
@@ -28,7 +36,7 @@ export async function readFile(path: string, fallback?: string, prefix = "pyonco
             throw new Error(`File ${path} doesn't exist`);
         }
 
-        writeFile(path, fallback);
+        await writeFile(path, fallback);
         return fallback;
     }
 }

src/entry.js

@@ -1,3 +1,5 @@
+import { getBuildNumber } from "@native";
+
 import commitHash from "~commit-hash";
 
 console.log(`ピョン! (Pyoncord, hash=${commitHash}, dev=${__PYONCORD_DEV__})`);
@@ -23,7 +25,7 @@ console.log(`ピョン! (Pyoncord, hash=${commitHash}, dev=${__PYONCORD_DEV__})`
             "Failed to load Pyoncord.\n",
             `Build Hash: ${commitHash}`,
             `Debug Build: ${__PYONCORD_DEV__}`,
-            `Build Number: ${nativeModuleProxy.RTNClientInfoManager?.Build}`,
+            `Build Number: ${getBuildNumber()}`,
             error
         ].join("\n"));
 

src/internal/cacher.ts

@@ -1,23 +1,23 @@
 import { findInitializedModule } from "@internal/metro";
 import { getRequireDefintion } from "@internal/requireDef";
+import { getBuildNumber, readFile, writeFile } from "@native";
 import { before } from "spitroast";
 
 import moduleDefinitionHash from "~module-definition-hash";
 
-const MMKVManager = nativeModuleProxy.MMKVManager as any;
-const currentVersion = nativeModuleProxy.RTNClientInfoManager.Build;
+const currentVersion = getBuildNumber();
 const window = globalThis as typeof globalThis & { [key: string]: any; };
 
-async function getItem() {
-    const raw = await MMKVManager.getItem("pyon-cache");
-    if (raw == null) return;
-    return JSON.parse(raw);
+async function getAndParseCache() {
+    try {
+        return JSON.parse(await readFile("pyon-cache"));
+    } catch {
+        return null;
+    }
 }
 
-async function updateItemAndRestart(value: any, key = "pyon-cache") {
-    MMKVManager.removeItem(key);
-    MMKVManager.setItem(key, JSON.stringify(value));
-    await MMKVManager.getItem(key);
+async function writeCacheAndRestart(value: any, key = "pyon-cache") {
+    await writeFile(key, JSON.stringify(value));
     window.nativeModuleProxy.BundleUpdaterManager.reload();
 }
 
@@ -89,7 +89,7 @@ async function beginCache() {
         }
     }
 
-    await updateItemAndRestart(cache);
+    await writeCacheAndRestart(cache);
 }
 
 function isCacheInvalidated(cache: any) {
@@ -98,7 +98,7 @@ function isCacheInvalidated(cache: any) {
 }
 
 export async function initCache() {
-    const cached = await getItem();
+    const cached = await getAndParseCache();
 
     if (cached && !isCacheInvalidated(cached)) {
         window.pyonRequire = function pyonRequire(id: string) {
@@ -115,6 +115,6 @@ export async function initCache() {
 
     window.ErrorUtils = void 0;
     window.__startDiscord?.();
-    await beginCache().then(console.error);
+    await beginCache().catch(alert);
     await new Promise(() => void 0);
 }