@novely/core 0.40.0-next → 0.40.0

package/dist/index.js

@@ -585,26 +585,31 @@ var fetchContentType = async (url, request) => {
     return "";
   }
 };
-var getResourseType = memoize2(async (url, request) => {
-  if (!isCSSImage(url)) {
+var getResourseType = memoize2(
+  async ({ url, request }) => {
+    if (!isCSSImage(url)) {
+      return "other";
+    }
+    const extension = getUrlFileExtension(url);
+    if (HOWLER_SUPPORTED_FILE_FORMATS.has(extension)) {
+      return "audio";
+    }
+    if (SUPPORTED_IMAGE_FILE_FORMATS.has(extension)) {
+      return "image";
+    }
+    const contentType = await fetchContentType(url, request);
+    if (contentType.includes("audio")) {
+      return "audio";
+    }
+    if (contentType.includes("image")) {
+      return "image";
+    }
     return "other";
+  },
+  {
+    getCacheKey: ({ url }) => url
   }
-  const extension = getUrlFileExtension(url);
-  if (HOWLER_SUPPORTED_FILE_FORMATS.has(extension)) {
-    return "audio";
-  }
-  if (SUPPORTED_IMAGE_FILE_FORMATS.has(extension)) {
-    return "image";
-  }
-  const contentType = await fetchContentType(url, request);
-  if (contentType.includes("audio")) {
-    return "audio";
-  }
-  if (contentType.includes("image")) {
-    return "image";
-  }
-  return "other";
-});
+);
 var capitalize = (str2) => {
   return str2[0].toUpperCase() + str2.slice(1);
 };
@@ -784,6 +789,17 @@ var getCharactersData = (characters) => {
 var toArray = (target) => {
   return Array.isArray(target) ? target : [target];
 };
+var getLanguageFromStore = (store2) => {
+  return store2.get().meta[0];
+};
+var getVolumeFromStore = (store2) => {
+  const { meta } = store2.get();
+  return {
+    music: meta[2],
+    sound: meta[3],
+    voice: meta[4]
+  };
+};
 
 // src/novely.ts
 import { throttle } from "es-toolkit/function";
@@ -966,6 +982,11 @@ import pLimit from "p-limit";
 import { DEV as DEV3 } from "esm-env";
 
 // src/preloading.ts
+var ACTION_NAME_TO_VOLUME_MAP = {
+  "playMusic": "music",
+  "playSound": "sound",
+  "voice": "voice"
+};
 var enqueueAssetForPreloading = (asset2) => {
   if (!PRELOADED_ASSETS.has(asset2)) {
     ASSETS_TO_PRELOAD.add(asset2);
@@ -974,7 +995,10 @@ var enqueueAssetForPreloading = (asset2) => {
 var handleAssetsPreloading = async ({ request, limiter, preloadAudioBlocking, preloadImageBlocking }) => {
   const list = mapSet(ASSETS_TO_PRELOAD, (asset2) => {
     return limiter(async () => {
-      const type = await getResourseType(request, asset2);
+      const type = await getResourseType({
+        url: asset2,
+        request
+      });
       switch (type) {
         case "audio": {
           await preloadAudioBlocking(asset2);
@@ -992,7 +1016,7 @@ var handleAssetsPreloading = async ({ request, limiter, preloadAudioBlocking, pr
   await Promise.allSettled(list);
   ASSETS_TO_PRELOAD.clear();
 };
-var huntAssets = ({ characters, action, props, handle }) => {
+var huntAssets = ({ volume, lang, mode, characters, action, props, handle }) => {
   if (action === "showBackground") {
     if (isString(props[0])) {
       handle(handleAudioAsset(props[0]));
@@ -1001,13 +1025,39 @@ var huntAssets = ({ characters, action, props, handle }) => {
       for (const value of Object.values(props[0])) {
         if (isImageAsset(value)) {
           handle(value);
+        } else if (isAsset(value)) {
+          const unwrapped = handleImageAsset(value);
+          if (isImageAsset(unwrapped)) {
+            handle(unwrapped);
+          }
         }
       }
     }
     return;
   }
+  const getVolumeFor = (action2) => {
+    if (action2 in ACTION_NAME_TO_VOLUME_MAP) {
+      return volume[ACTION_NAME_TO_VOLUME_MAP[action2]];
+    }
+    return 0;
+  };
   if (isAudioAction(action) && isString(props[0])) {
-    handle(handleAudioAsset(props[0]));
+    if (getVolumeFor(action) > 0) {
+      handle(handleAudioAsset(props[0]));
+    }
+    return;
+  }
+  if (action === "voice" && typeof props[0] === "object") {
+    if (getVolumeFor("voice") == 0) {
+      return;
+    }
+    for (const [language, value] of Object.entries(props[0])) {
+      if (mode === "blocking") {
+        value && handle(handleAudioAsset(value));
+      } else if (language === lang) {
+        value && handle(handleAudioAsset(value));
+      }
+    }
     return;
   }
   if (action === "showCharacter" && isString(props[0]) && isString(props[1])) {
@@ -1099,7 +1149,15 @@ var novely = ({
       }
       return (...props) => {
         if (preloadAssets === "blocking") {
-          huntAssets({ characters, action: action2, props, handle: enqueueAssetForPreloading });
+          huntAssets({
+            action: action2,
+            props,
+            mode: preloadAssets,
+            characters,
+            lang: getLanguageFromStore(storageData),
+            volume: getVolumeFromStore(storageData),
+            handle: enqueueAssetForPreloading
+          });
         }
         return [action2, ...props];
       };
@@ -1362,7 +1420,15 @@ var novely = ({
       if (isAudioAction(action2)) return;
       if (action2 === "vibrate") return;
       if (action2 === "end") return;
-      huntAssets({ characters, action: action2, props, handle: assets.push.bind(assets) });
+      huntAssets({
+        action: action2,
+        props,
+        mode: preloadAssets,
+        characters,
+        lang: getLanguageFromStore(storageData),
+        volume: getVolumeFromStore(storageData),
+        handle: assets.push.bind(assets)
+      });
       return match(action2, props, {
         ctx,
         data: data2
@@ -1403,7 +1469,10 @@ var novely = ({
     getCustomActionHolder(ctx, fn).cleanup();
   };
   const getResourseTypeForRenderer = (url) => {
-    return getResourseType(url, request);
+    return getResourseType({
+      url,
+      request
+    });
   };
   const getCharacterColor = (c) => {
     return c in characters ? characters[c].color : "#000000";
@@ -1472,7 +1541,15 @@ var novely = ({
           refer
         });
         for (const [action3, ...props2] of collection) {
-          huntAssets({ characters, action: action3, props: props2, handle: enqueueAssetForPreloading });
+          huntAssets({
+            action: action3,
+            props: props2,
+            mode: preloadAssets,
+            characters,
+            lang: getLanguageFromStore(storageData),
+            volume: getVolumeFromStore(storageData),
+            handle: enqueueAssetForPreloading
+          });
         }
         handleAssetsPreloading({
           ...renderer.misc,
@@ -1591,7 +1668,7 @@ var novely = ({
     function({ ctx, push }, [fn]) {
       const { restoring, goingBack, preview: preview2 } = ctx.meta;
       const result = fn({
-        lang: storageData.get().meta[0],
+        lang: getLanguageFromStore(storageData),
         goingBack,
         restoring,
         preview: preview2,
@@ -1610,7 +1687,7 @@ var novely = ({
       }
       const transformedChoices = choices.map(([content, action2, visible]) => {
         const shown = !visible || visible({
-          lang: storageData.get().meta[0],
+          lang: getLanguageFromStore(storageData),
           state: getStateAtCtx(ctx)
         });
         if (DEV3 && action2.length === 0 && !shown) {
@@ -1697,7 +1774,7 @@ var novely = ({
         ctx.clearBlockingActions(void 0);
       }
       const state = getStateFunction(ctx);
-      const lang = storageData.get().meta[0];
+      const lang = getLanguageFromStore(storageData);
       const result = handleCustomAction(ctx, fn, {
         ...ctx.custom(fn),
         state,