node: Fix non tgz index_entry not valied on npm 8 by adding reqHeaders

flatpak · Jul 10, 2022 · ed05266 · ed05266
1 parent 341fa77
commit ed05266
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/node/flatpak_node_generator/providers/npm.py b/node/flatpak_node_generator/providers/npm.py
@@ -34,6 +34,10 @@
 from . import LockfileProvider, ModuleProvider, ProviderFactory, RCFileProvider
 from .special import SpecialSourceProvider
 
+_NPM_CORGIDOC = (
+    'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*'
+)
+
 
 class NpmLockfileProvider(LockfileProvider):
     _ALIAS_RE = re.compile(r'^npm:(.[^@]*)@(.*)$')
@@ -163,8 +167,14 @@ def get_cacache_content_path(self, integrity: Integrity) -> Path:
             / self.get_cacache_integrity_path(integrity)
         )
 
-    def add_index_entry(self, url: str, metadata: RemoteUrlMetadata) -> None:
+    def add_index_entry(
+        self,
+        url: str,
+        metadata: RemoteUrlMetadata,
+        request_headers: Dict[str, str] = {},
+    ) -> None:
         key = f'make-fetch-happen:request-cache:{url}'
+
         index_json = json.dumps(
             {
                 'key': key,
@@ -173,7 +183,7 @@ def add_index_entry(self, url: str, metadata: RemoteUrlMetadata) -> None:
                 'size': metadata.size,
                 'metadata': {
                     'url': url,
-                    'reqHeaders': {},
+                    'reqHeaders': request_headers,
                     'resHeaders': {},
                 },
             }
@@ -304,7 +314,9 @@ def _finalize(self) -> None:
             )
             content_path = self.get_cacache_content_path(metadata.integrity)
             self.gen.add_data_source(raw_data, content_path)
-            self.add_index_entry(index.url, metadata)
+            self.add_index_entry(
+                index.url, metadata, request_headers={'accept': _NPM_CORGIDOC}
+            )
 
         patch_commands: DefaultDict[Path, List[str]] = collections.defaultdict(
             lambda: []