Pass sourceUuid through the source fetching pipeline

Author: canova

src/components/app/SourceCodeFetcher.tsx

@@ -11,6 +11,7 @@ import {
   getSymbolServerUrl,
   getSourceViewFile,
   getSourceViewSourceIndex,
+  getSourceViewSourceUuid,
 } from 'firefox-profiler/selectors';
 import {
   beginLoadingSourceCodeFromUrl,
@@ -35,6 +36,7 @@ import type {
 type StateProps = {
   readonly sourceViewFile: string | null;
   readonly sourceViewSourceIndex: IndexIntoSourceTable | null;
+  readonly sourceViewSourceUuid: string | null;
   readonly sourceViewCode: SourceCodeStatus | void;
   readonly symbolServerUrl: string;
   readonly profile: Profile | null;
@@ -73,6 +75,7 @@ class SourceCodeFetcherImpl extends React.PureComponent<Props> {
       sourceViewSourceIndex,
       sourceViewCode,
       sourceViewFile,
+      sourceViewSourceUuid,
       beginLoadingSourceCodeFromUrl,
       beginLoadingSourceCodeFromBrowserConnection,
       finishLoadingSourceCode,
@@ -109,6 +112,7 @@ class SourceCodeFetcherImpl extends React.PureComponent<Props> {
 
     const fetchSourceResult = await fetchSource(
       sourceViewFile,
+      sourceViewSourceUuid,
       symbolServerUrl,
       addressProof,
       this._archiveCache,
@@ -140,6 +144,7 @@ export const SourceCodeFetcher = explicitConnect<{}, StateProps, DispatchProps>(
     mapStateToProps: (state) => ({
       sourceViewSourceIndex: getSourceViewSourceIndex(state),
       sourceViewFile: getSourceViewFile(state),
+      sourceViewSourceUuid: getSourceViewSourceUuid(state),
       sourceViewCode: getSourceViewCode(state),
       symbolServerUrl: getSymbolServerUrl(state),
       profile: getProfileOrNull(state),

src/test/unit/fetch-source.test.ts

@@ -9,6 +9,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'hg:hg.mozilla.org/mozilla-central:widget/cocoa/nsAppShell.mm:997f00815e6bc28806b75448c8829f0259d2cb28',
+        null,
         'https://symbolication.services.mozilla.com',
         null,
         new Map(),
@@ -72,6 +73,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'cargo:github.com-1ecc6299db9ec823:addr2line-0.17.0:src/lib.rs',
+        null,
         'https://symbolication.services.mozilla.com',
         null,
         archiveCache,
@@ -90,6 +92,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'cargo:github.com-1ecc6299db9ec823:addr2line-0.17.0:src/function.rs',
+        null,
         'https://symbolication.services.mozilla.com',
         null,
         archiveCache,
@@ -106,6 +109,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'cargo:github.com-1ecc6299db9ec823:addr2line-0.17.0:src/nonexist.rs',
+        null,
         'https://symbolication.services.mozilla.com',
         null,
         archiveCache,
@@ -129,6 +133,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'hg:hg.mozilla.org/mozilla-central:widget/cocoa/nsAppShell.mm:997f00815e6bc28806b75448c8829f0259d2cb28',
+        null,
         'https://symbolication.services.mozilla.com',
         null,
         new Map(),
@@ -161,6 +166,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         '/Users/mstange/code/mozilla/gfx/wr/webrender/src/renderer/mod.rs',
+        null,
         'https://symbolication.services.mozilla.com',
         {
           debugName: 'FAKE_DEBUGNAME',
@@ -199,6 +205,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         '/Users/mstange/code/mozilla/gfx/wr/webrender/src/renderer/mod.rs',
+        null,
         'http://127.0.0.1:3000',
         {
           debugName: 'FAKE_DEBUGNAME',
@@ -249,6 +256,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'git:github.com/rust-lang/rust:library/core/src/intrinsics.rs:acbe4443cc4c9695c0b74a7b64b60333c990a400',
+        null,
         'http://127.0.0.1:3001',
         {
           debugName: 'FAKE_DEBUGNAME',
@@ -299,6 +307,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'git:github.com/rust-lang/rust:library/core/src/intrinsics.rs:acbe4443cc4c9695c0b74a7b64b60333c990a400',
+        null,
         'http://127.0.0.1:3002',
         {
           debugName: 'FAKE_DEBUGNAME',
@@ -347,6 +356,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'git:github.com/rust-lang/rust:library/core/src/intrinsics.rs:acbe4443cc4c9695c0b74a7b64b60333c990a400',
+        null,
         'http://127.0.0.1:3003',
         {
           debugName: 'FAKE_DEBUGNAME',
@@ -391,6 +401,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         'git:git.iximeow.net/yaxpeax-arm:src/armv8/a64.rs:0663147eacdef847cc1bdc07cf89eed14b1aeaca',
+        null,
         'https://symbolication.services.mozilla.com',
         null,
         new Map(),
@@ -416,6 +427,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         '/Users/mstange/code/mozilla/gfx/wr/webrender/src/renderer/mod.rs',
+        null,
         'https://symbolication.services.mozilla.com',
         {
           debugName: 'FAKE_DEBUGNAME',
@@ -456,6 +468,7 @@ describe('fetchSource', function () {
     expect(
       await fetchSource(
         '/Users/mstange/code/mozilla/gfx/wr/webrender/src/renderer/mod.rs',
+        null,
         'https://symbolication.services.mozilla.com',
         {
           debugName: 'FAKE_DEBUGNAME',

src/utils/fetch-source.ts

@@ -28,6 +28,8 @@ export type FetchSourceResult =
  * then this will call `callbacks.fetchUrlResponse("https://hg.mozilla.org/mozilla-central/raw-file/997f00815e6bc28806b75448c8829f0259d2cb28/widget/cocoa/nsAppShell.mm")`.
  *
  * @param file - The path of the file that should be fetched
+ * @param sourceUUid - The optional UUID of the JS source file that should be
+ *    fetched. It's null for non-JS files.
  * @param symbolServerUrl - The symbol server URL, used for getting source code
  *    from local servers via the symbolication API /source/v1.
  * @param addressProof - An "address proof" for the requested file, if known. Otherwise null.
@@ -37,6 +39,7 @@ export type FetchSourceResult =
  */
 export async function fetchSource(
   file: string,
+  _sourceUuid: string | null,
   symbolServerUrl: string,
   addressProof: AddressProof | null,
   archiveCache: Map<string, Promise<Uint8Array>>,