@terrafirmagreg-team/dump 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrafirmagreg-team/dump",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "type": "module",
   "description": "Game-dump readers and contracts",
   "license": "LGPL-3.0-only",
@@ -14,9 +14,9 @@
     "src"
   ],
   "dependencies": {
-    "@terrafirmagreg-team/data": "1.2.0",
-    "@terrafirmagreg-team/sites": "1.2.0",
-    "@terrafirmagreg-team/translate": "1.2.0",
+    "@terrafirmagreg-team/data": "1.2.1",
+    "@terrafirmagreg-team/sites": "1.2.1",
+    "@terrafirmagreg-team/translate": "1.2.3",
     "aws4fetch": "^1.0.20",
     "fumadocs-core": "16.17.8"
   },

package/src/lib/dump/assets/urls.ts

@@ -118,13 +118,9 @@ export function createDumpAssetResolver(
     const base =
       typeof window === 'undefined' ? 'http://x.invalid' : location.origin;
     prefix ??= new URL(dumpStorageUrl(''), base).href;
-    let resourcePath: string;
     let modelAbs: URL;
     try {
       modelAbs = new URL(modelUrl, base);
-      const resource = new URL(resourceUrl, modelAbs);
-      if (resource.origin !== modelAbs.origin) return undefined;
-      resourcePath = resource.pathname;
     } catch {
       return undefined;
     }
@@ -135,7 +131,19 @@ export function createDumpAssetResolver(
       modelHref.slice(prefix.length),
     );
     if (!modelRel) return undefined;
-    const rel = relativePath(pathDir(modelAbs.pathname), resourcePath);
+    const modelDirHref = pathDir(modelHref);
+    let rel: string | undefined;
+    if (resourceUrl.startsWith(modelDirHref)) {
+      rel = resourceUrl.slice(modelDirHref.length);
+    } else {
+      try {
+        const resource = new URL(resourceUrl, modelAbs);
+        if (resource.origin !== modelAbs.origin) return undefined;
+        rel = relativePath(pathDir(modelAbs.pathname), resource.pathname);
+      } catch {
+        return undefined;
+      }
+    }
     if (!rel || !rel.includes('/')) return undefined;
     const dumpRel = resolveAssetRel(pathDir(modelRel), rel);
     if (!dumpRel) return undefined;

package/src/lib/dump/client/dump.ts

@@ -107,16 +107,29 @@ export function dumpTextureUrl(
   return texturePublicUrl(dataset, textureId);
 }
 
+export async function multiblockModelIndex(
+  dataset: DatasetRef,
+  namespace: string,
+): Promise<unknown | undefined> {
+  return (
+    (await clientDumpJson(
+      dataset,
+      `assets/${namespace}/models/multiblock.json`,
+    )) ??
+    (await clientDumpJson(
+      dataset,
+      `data/${namespace}/models/multiblock.json`,
+    ))
+  );
+}
+
 export async function dumpModelUrl(
   dataset: DatasetRef,
   modelId: string,
 ): Promise<string | undefined> {
   const parts = splitDumpId(modelId.trim());
   if (!parts) return undefined;
-  const index = await clientDumpJson(
-    dataset,
-    `data/${parts.ns}/models/multiblock.json`,
-  );
+  const index = await multiblockModelIndex(dataset, parts.ns);
   const rel =
     index && typeof index === 'object' && !Array.isArray(index)
       ? (index as Record<string, unknown>)[modelId]

package/src/lib/dump/json-reader.ts

@@ -208,7 +208,12 @@ export class JsonDumpReader implements DumpReader {
   private async objectsIndex(
     root: string,
   ): Promise<Record<string, string> | undefined> {
-    const raw = await fetchJson(dumpStorageUrl(`${root}/objects.json`), false);
+    const raw =
+      (await fetchJsonGz(
+        dumpStorageUrl(`${root}/objects.json.gz`),
+        false,
+      )) ??
+      (await fetchJson(dumpStorageUrl(`${root}/objects.json`), false));
     const files =
       raw && typeof raw === 'object' && !Array.isArray(raw)
         ? (raw as Record<string, unknown>).files