From 9f52b4763e93d58694981e847de4e5c146886ef7 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Thu, 9 Nov 2023 20:01:39 -0500
Subject: [PATCH] Lookup asset key from diff name

Related issue:
https://github.com/uBlockOrigin/uBlock-issues/issues/2948

This fix has to make it into next stable release to ensure
imported external lists can benefit from diff-updater.
---
 src/js/assets.js | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/js/assets.js b/src/js/assets.js
index 6e0eb9560..2c40196ba 100644
--- a/src/js/assets.js
+++ b/src/js/assets.js
@@ -172,6 +172,27 @@ const isDiffUpdatableAsset = content => {
         data.diffPath.startsWith('%') === false;
 };
 
+const assetKeyFromDiffName = diffName => {
+    const entry = assetCacheRegistry[diffName];
+    if ( entry instanceof Object ) {
+        if ( typeof entry.diffPath === 'string' ) {
+            if ( entry.diffPath.endsWith(`#${diffName}`) ) { return diffName; }
+        }
+        if ( typeof entry.diffName === 'string' ) {
+            if ( entry.diffName === diffName ) { return diffName; }
+        }
+    }
+    for ( const [ assetKey, entry ] of Object.entries(assetCacheRegistry) ) {
+        if ( typeof entry.diffPath === 'string' ) {
+            if ( entry.diffPath.endsWith(`#${diffName}`) ) { return assetKey; }
+        }
+        if ( typeof entry.diffName === 'string' ) {
+            if ( entry.diffName === diffName ) { return assetKey; }
+        }
+    }
+    return '';
+};
+
 /******************************************************************************/
 
 // favorLocal: avoid making network requests whenever possible
@@ -1237,7 +1258,8 @@ async function diffUpdater() {
             }
             if ( data.status === 'needtext' ) {
                 ubolog('Diff updater: need text for', data.name);
-                assetCacheRead(data.name).then(result => {
+                const assetKey = assetKeyFromDiffName(data.name);
+                assetCacheRead(assetKey).then(result => {
                     data.text = result.content;
                     data.status = undefined;
                     bc.postMessage(data);
@@ -1253,22 +1275,24 @@ async function diffUpdater() {
                     'Diff-Path',
                     'Diff-Expires',
                 ]);
-                assetCacheWrite(data.name, {
+                const assetKey = assetKeyFromDiffName(data.name);
+                assetCacheWrite(assetKey, {
                     content: data.text,
                     resourceTime: metadata.lastModified || 0,
                 });
-                assetCacheSetDetails(data.name, metadata);
-                updaterUpdated.push(data.name);
+                assetCacheSetDetails(assetKey, metadata);
+                updaterUpdated.push(assetKey);
             } else if ( data.error ) {
                 ubolog(`Diff updater: failed to update ${data.name} using ${data.patchPath}, reason: ${data.error}`);
             } else if ( data.status === 'nopatch-yet' || data.status === 'nodiff' ) {
                 ubolog(`Diff updater: skip update of ${data.name} using ${data.patchPath}, reason: ${data.status}`);
-                assetCacheSetDetails(data.name, {
+                const assetKey = assetKeyFromDiffName(data.name);
+                assetCacheSetDetails(assetKey, {
                     writeTime: data.lastModified || 0
                 });
                 vAPI.messaging.broadcast({
                     what: 'assetUpdated',
-                    key: data.name,
+                    key: assetKey,
                     cached: true,
                 });
             } else {