CalvinBackup/entdb-entitlements-iOS
1
0
Fork 0
mirror of https://github.com/ChiChou/entdb.git synced 2026-09-23 21:20:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix KV engine to handle version_build URL format and array index data

Browse Source 
The keys/paths pages failed to load because:
1. findOS expected just build ID but URL contains version_build format
2. openKV expected object format but index files use array format
This commit is contained in:
cc
2026-04-14 16:47:03 +02:00
parent 59f2ebb268
commit 7d35a88b39
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/engine/kv.ts
+13 -6
View File
@@ -61,13 +61,13 @@ export class KVEngine implements Engine {
async getPaths(build: string): Promise<string[]> { async getPaths(build: string): Promise<string[]> {
const os = await this.findOS(build); const os = await this.findOS(build);
const tag = `${os.version}_${build}`; const tag = `${os.version}_${os.build}`;
return fetchLines(`${this.#baseURL}/${tag}/paths.txt`); return fetchLines(`${this.#baseURL}/${tag}/paths.txt`);
} }
async getBinaryXML(build: string, path: string): Promise<string> { async getBinaryXML(build: string, path: string): Promise<string> {
const os = await this.findOS(build); const os = await this.findOS(build);
const tag = `${os.version}_${build}`; const tag = `${os.version}_${os.build}`;
const reader = await this.openKV(`${this.#baseURL}/${tag}/blobs`); const reader = await this.openKV(`${this.#baseURL}/${tag}/blobs`);
const blob = await reader.get(path); const blob = await reader.get(path);
@@ -80,14 +80,14 @@ export class KVEngine implements Engine {
async getKeys(build: string): Promise<string[]> { async getKeys(build: string): Promise<string[]> {
const os = await this.findOS(build); const os = await this.findOS(build);
const tag = `${os.version}_${build}`; const tag = `${os.version}_${os.build}`;
const reader = await this.openKV(`${this.#baseURL}/${tag}/keys`); const reader = await this.openKV(`${this.#baseURL}/${tag}/keys`);
return [...reader.keys()]; return [...reader.keys()];
} }
async getPathsForKey(build: string, key: string): Promise<string[]> { async getPathsForKey(build: string, key: string): Promise<string[]> {
const os = await this.findOS(build); const os = await this.findOS(build);
const tag = `${os.version}_${build}`; const tag = `${os.version}_${os.build}`;
const reader = await this.openKV(`${this.#baseURL}/${tag}/keys`); const reader = await this.openKV(`${this.#baseURL}/${tag}/keys`);
const lines = await reader.get(key); const lines = await reader.get(key);
return lines.split("\n").filter(Boolean); return lines.split("\n").filter(Boolean);
@@ -99,7 +99,10 @@ export class KVEngine implements Engine {
if (!this.#osCache) { if (!this.#osCache) {
this.#osCache = await this.listOS(); this.#osCache = await this.listOS();
} }
const os = this.#osCache.find((o) => o.build === build); // Handle both "23E254" and "26.4.1_23E254" formats
const os = this.#osCache.find(
(o) => o.build === build || `${o.version}_${o.build}` === build
);
if (!os) throw new Error(`OS not found for build: ${build}`); if (!os) throw new Error(`OS not found for build: ${build}`);
return os; return os;
} }
@@ -107,7 +110,11 @@ export class KVEngine implements Engine {
private async openKV(baseURL: string): Promise<KVStore> { private async openKV(baseURL: string): Promise<KVStore> {
const recordsURL = baseURL + ".index.json"; const recordsURL = baseURL + ".index.json";
const blobsURL = baseURL + ".txt"; const blobsURL = baseURL + ".txt";
const records = await fetch(recordsURL).then((r) => r.json()); const raw = await fetch(recordsURL).then((r) => r.json());
// Handle both array format [key, offset, length] and object format {key, offset, length}
const records: KVRecord[] = raw.map((r: [string, number, number] | KVRecord) =>
Array.isArray(r) ? { key: r[0], offset: r[1], length: r[2] } : r
);
return new KVStore(records, blobsURL); return new KVStore(records, blobsURL);
} }
} }