@character-foundry/character-foundry 0.1.8 → 0.1.9-dev.1765913722

package/dist/loader.cjs

@@ -134,7 +134,23 @@ function streamingUnzipSync(data, limits = DEFAULT_ZIP_LIMITS) {
       if (unsafePathHandling === "warn" && limits.onUnsafePath) {
         limits.onUnsafePath(file.name, reason);
       }
-      file.ondata = () => {
+      file.ondata = (err, chunk, _final) => {
+        if (error) return;
+        if (err) {
+          error = err;
+          return;
+        }
+        if (chunk && chunk.length > 0) {
+          totalBytes += chunk.length;
+          if (totalBytes > limits.maxTotalSize) {
+            error = new ZipPreflightError(
+              `Total actual size ${totalBytes} exceeds limit ${limits.maxTotalSize}`,
+              totalBytes,
+              limits.maxTotalSize
+            );
+            file.terminate();
+          }
+        }
       };
       file.start();
       return;
@@ -8182,6 +8198,43 @@ var DEFAULT_OPTIONS3 = {
   maxTotalSize: 500 * 1024 * 1024,
   extractAssets: true
 };
+var ASSET_PREFIX_VARIANTS = [
+  { prefix: "__asset:", format: "CCv3 (SillyTavern)" },
+  { prefix: "asset:", format: "CCv2/CCv3 common" },
+  { prefix: "pngchunk:", format: "Explicit PNG chunk" },
+  { prefix: "chara-ext-asset_:", format: "RisuAI (with colon)" },
+  { prefix: "chara-ext-asset_", format: "RisuAI" },
+  { prefix: "__asset_", format: "Legacy underscore variant" }
+];
+function isChunkReference(uri) {
+  return ASSET_PREFIX_VARIANTS.some(({ prefix }) => uri.startsWith(prefix)) || !uri.includes(":");
+}
+function stripAssetPrefix(uri) {
+  for (const { prefix } of ASSET_PREFIX_VARIANTS) {
+    if (uri.startsWith(prefix)) {
+      return uri.substring(prefix.length);
+    }
+  }
+  return uri;
+}
+function generateChunkKeyCandidates(assetId, originalUri) {
+  return [
+    assetId,
+    // Plain ID: "0"
+    originalUri,
+    // Original URI: "__asset:0"
+    `asset:${assetId}`,
+    // Common format
+    `__asset:${assetId}`,
+    // CCv3 format
+    `__asset_${assetId}`,
+    // Legacy underscore variant
+    `chara-ext-asset_${assetId}`,
+    // RisuAI format
+    `chara-ext-asset_:${assetId}`
+    // RisuAI format with colon
+  ];
+}
 function estimateBase64DecodedSize(base64Length) {
   return Math.ceil(base64Length * 0.75);
 }
@@ -8249,39 +8302,22 @@ function parsePng(data, options) {
   if (extracted.extraChunks && options.extractAssets && card.data.assets) {
     const usedChunks = /* @__PURE__ */ new Set();
     const chunkMap = /* @__PURE__ */ new Map();
+    const risuIndexPrefixes = ASSET_PREFIX_VARIANTS.filter((v) => v.prefix.startsWith("chara-ext-asset_"));
     for (const chunk of extracted.extraChunks) {
       chunkMap.set(chunk.keyword, chunk);
-      if (chunk.keyword.startsWith("chara-ext-asset_")) {
-        const suffix = chunk.keyword.replace("chara-ext-asset_", "");
-        chunkMap.set(suffix, chunk);
-        if (suffix.startsWith(":")) {
-          chunkMap.set(suffix.substring(1), chunk);
+      for (const { prefix } of risuIndexPrefixes) {
+        if (chunk.keyword.startsWith(prefix)) {
+          const suffix = chunk.keyword.substring(prefix.length);
+          chunkMap.set(suffix, chunk);
+          break;
         }
       }
     }
     for (const descriptor of card.data.assets) {
       if (!descriptor.uri) continue;
-      if (descriptor.uri.startsWith("__asset:") || descriptor.uri.startsWith("asset:") || descriptor.uri.startsWith("pngchunk:") || !descriptor.uri.includes(":")) {
-        let assetId = descriptor.uri;
-        if (assetId.startsWith("__asset:")) assetId = assetId.substring(8);
-        else if (assetId.startsWith("asset:")) assetId = assetId.substring(6);
-        else if (assetId.startsWith("pngchunk:")) assetId = assetId.substring(9);
-        const candidates = [
-          assetId,
-          // "0"
-          descriptor.uri,
-          // "__asset:0"
-          `asset:${assetId}`,
-          // "asset:0"
-          `__asset:${assetId}`,
-          // "__asset:0"
-          `__asset_${assetId}`,
-          // "__asset_0"
-          `chara-ext-asset_${assetId}`,
-          // "chara-ext-asset_0"
-          `chara-ext-asset_:${assetId}`
-          // "chara-ext-asset_:0"
-        ];
+      if (isChunkReference(descriptor.uri)) {
+        const assetId = stripAssetPrefix(descriptor.uri);
+        const candidates = generateChunkKeyCandidates(assetId, descriptor.uri);
         let chunk;
         for (const candidate of candidates) {
           chunk = chunkMap.get(candidate);
@@ -8328,13 +8364,15 @@ function parsePng(data, options) {
         }
       }
     }
+    const risuPrefixes = ASSET_PREFIX_VARIANTS.filter((v) => v.prefix.startsWith("chara-ext-asset_"));
     for (const chunk of extracted.extraChunks) {
       if (!usedChunks.has(chunk.keyword)) {
         let assetId = null;
-        if (chunk.keyword.startsWith("chara-ext-asset_:")) {
-          assetId = chunk.keyword.substring("chara-ext-asset_:".length);
-        } else if (chunk.keyword.startsWith("chara-ext-asset_")) {
-          assetId = chunk.keyword.substring("chara-ext-asset_".length);
+        for (const { prefix } of risuPrefixes) {
+          if (chunk.keyword.startsWith(prefix)) {
+            assetId = chunk.keyword.substring(prefix.length);
+            break;
+          }
         }
         if (assetId) {
           try {