Fix log downloading

jmerle · Apr 2, 2024 · 2aac7d1 · 2aac7d1
1 parent 7385cf1
commit 2aac7d1
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 34 deletions.
diff --git a/src/pages/home/AlgorithmDetail.tsx b/src/pages/home/AlgorithmDetail.tsx
@@ -1,4 +1,5 @@
 import { Accordion, Button, Group, MantineColor, Text } from '@mantine/core';
+import axios from 'axios';
 import { ReactNode } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { ErrorAlert } from '../../components/ErrorAlert';
@@ -7,16 +8,21 @@ import { useActualColorScheme } from '../../hooks/use-actual-color-scheme.ts';
 import { useAsync } from '../../hooks/use-async.ts';
 import { AlgorithmSummary } from '../../models.ts';
 import { useStore } from '../../store.ts';
-import { downloadAlgorithmResults, parseAlgorithmLogs } from '../../utils/algorithm.ts';
-import { authenticatedAxios } from '../../utils/axios.ts';
+import {
+  downloadAlgorithmLogs,
+  downloadAlgorithmResults,
+  getAlgorithmLogsUrl,
+  parseAlgorithmLogs,
+} from '../../utils/algorithm.ts';
 import { formatTimestamp } from '../../utils/format.ts';
 
 export interface AlgorithmDetailProps {
   position: number;
   algorithm: AlgorithmSummary;
+  proxy: string;
 }
 
-export function AlgorithmDetail({ position, algorithm }: AlgorithmDetailProps): ReactNode {
+export function AlgorithmDetail({ position, algorithm, proxy }: AlgorithmDetailProps): ReactNode {
   const setAlgorithm = useStore(state => state.setAlgorithm);
 
   const navigate = useNavigate();
@@ -32,14 +38,17 @@ export function AlgorithmDetail({ position, algorithm }: AlgorithmDetailProps):
       break;
   }
 
+  const downloadLogs = useAsync<void>(async () => {
+    await downloadAlgorithmLogs(algorithm.id);
+  });
+
   const downloadResults = useAsync<void>(async () => {
     await downloadAlgorithmResults(algorithm.id);
   });
 
   const openInVisualizer = useAsync<void>(async () => {
-    const logsResponse = await authenticatedAxios.get(
-      `https://bz97lt8b1e.execute-api.eu-west-1.amazonaws.com/prod/submission/logs/${algorithm.id}`,
-    );
+    const logsUrl = await getAlgorithmLogsUrl(algorithm.id);
+    const logsResponse = await axios.get(proxy + logsUrl);
 
     setAlgorithm(parseAlgorithmLogs(logsResponse.data, algorithm));
     navigate('/visualizer');
@@ -60,14 +69,7 @@ export function AlgorithmDetail({ position, algorithm }: AlgorithmDetailProps):
       <Accordion.Panel>
         {openInVisualizer.error && <ErrorAlert error={openInVisualizer.error} mb="xs" />}
         <Group grow mb="xs">
-          <Button
-            variant="outline"
-            component="a"
-            href={`https://bz97lt8b1e.execute-api.eu-west-1.amazonaws.com/prod/submission/logs/${algorithm.id}`}
-            download
-            target="_blank"
-            rel="noreferrer"
-          >
+          <Button variant="outline" onClick={downloadLogs.call} loading={downloadLogs.loading}>
             Download logs
           </Button>
           <Button variant="outline" onClick={downloadResults.call} loading={downloadResults.loading}>

diff --git a/src/pages/home/AlgorithmList.tsx b/src/pages/home/AlgorithmList.tsx
@@ -5,17 +5,18 @@ import { AlgorithmDetail } from './AlgorithmDetail.tsx';
 
 export interface AlgorithmListProps {
   algorithms: AlgorithmSummary[];
+  proxy: string;
 }
 
-export function AlgorithmList({ algorithms }: AlgorithmListProps): ReactNode {
+export function AlgorithmList({ algorithms, proxy }: AlgorithmListProps): ReactNode {
   if (algorithms.length === 0) {
     return <Text mt="md">No algorithms found</Text>;
   }
 
   return (
     <Accordion variant="contained" defaultValue={algorithms[0].id} mt="md">
       {algorithms.map((algorithm, i) => (
-        <AlgorithmDetail key={i} position={algorithms.length - i} algorithm={algorithm} />
+        <AlgorithmDetail key={i} position={algorithms.length - i} algorithm={algorithm} proxy={proxy} />
       ))}
     </Accordion>
   );

diff --git a/src/pages/home/LoadFromProsperity.tsx b/src/pages/home/LoadFromProsperity.tsx
@@ -1,6 +1,6 @@
-import { Button, Code, Kbd, PasswordInput, Select, Text } from '@mantine/core';
+import { Anchor, Button, Code, Kbd, PasswordInput, Select, Text, TextInput } from '@mantine/core';
 import { AxiosResponse } from 'axios';
-import { FormEvent, ReactNode, useCallback } from 'react';
+import { FormEvent, ReactNode, useCallback, useState } from 'react';
 import { ErrorAlert } from '../../components/ErrorAlert.tsx';
 import { useAsync } from '../../hooks/use-async.ts';
 import { AlgorithmSummary } from '../../models.ts';
@@ -38,6 +38,8 @@ export function LoadFromProsperity(): ReactNode {
   const round = useStore(state => state.round);
   const setRound = useStore(state => state.setRound);
 
+  const [proxy, setProxy] = useState('https://imc-prosperity-2-visualizer-cors-anywhere.jmerle.dev/');
+
   const loadAlgorithms = useAsync<AlgorithmSummary[]>(async (): Promise<AlgorithmSummary[]> => {
     let response: AxiosResponse<AlgorithmSummary[]>;
     try {
@@ -108,6 +110,12 @@ export function LoadFromProsperity(): ReactNode {
         download algorithm logs and results. The visualizer communicates directly with the API used by the Prosperity
         website and never sends data to other servers.
       </Text>
+      {/* prettier-ignore */}
+      <Text>
+        By default the &quot;Open in visualizer&quot; button routes the HTTP request to download the algorithm&apos;s logs through a <Anchor href="https://github.com/Rob--W/cors-anywhere" target="_blank" rel="noreferrer">CORS Anywhere</Anchor> instance hosted by the creator of this visualizer.
+        This is necessary because the logs need to be downloaded from an AWS S3 endpoint without <Anchor href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin" target="_blank" rel="noreferrer">Access-Control-Allow-Origin</Anchor> headers that allow downloads from this visualizer.
+        While I promise no log data is persisted server-side, you are free to change the proxy to one hosted by yourself.
+      </Text>
 
       {loadAlgorithms.error && <ErrorAlert error={loadAlgorithms.error} />}
 
@@ -128,12 +136,20 @@ export function LoadFromProsperity(): ReactNode {
           mt="xs"
         />
 
+        <TextInput
+          label='"Open in visualizer" CORS Anywhere proxy'
+          placeholder="Proxy"
+          value={proxy}
+          onInput={e => setProxy((e.target as HTMLInputElement).value)}
+          mt="xs"
+        />
+
         <Button fullWidth type="submit" loading={loadAlgorithms.loading} mt="sm">
           <div>Load algorithms</div>
         </Button>
       </form>
 
-      {loadAlgorithms.success && <AlgorithmList algorithms={loadAlgorithms.result!} />}
+      {loadAlgorithms.success && <AlgorithmList algorithms={loadAlgorithms.result!} proxy={proxy} />}
     </HomeCard>
   );
 }
diff --git a/src/pages/visualizer/AlgorithmSummaryCard.tsx b/src/pages/visualizer/AlgorithmSummaryCard.tsx
@@ -3,14 +3,18 @@ import { ReactNode } from 'react';
 import { ScrollableCodeHighlight } from '../../components/ScrollableCodeHighlight.tsx';
 import { useAsync } from '../../hooks/use-async.ts';
 import { useStore } from '../../store.ts';
-import { downloadAlgorithmResults } from '../../utils/algorithm.ts';
+import { downloadAlgorithmLogs, downloadAlgorithmResults } from '../../utils/algorithm.ts';
 import { formatTimestamp } from '../../utils/format.ts';
 import { VisualizerCard } from './VisualizerCard.tsx';
 
 export function AlgorithmSummaryCard(): ReactNode {
   const algorithm = useStore(state => state.algorithm)!;
   const summary = algorithm.summary!;
 
+  const downloadLogs = useAsync<void>(async () => {
+    await downloadAlgorithmLogs(summary.id);
+  });
+
   const downloadResults = useAsync<void>(async () => {
     await downloadAlgorithmResults(summary.id);
   });
@@ -58,14 +62,7 @@ export function AlgorithmSummaryCard(): ReactNode {
         </Grid.Col>
         <Grid.Col span={2}>
           <Group grow>
-            <Button
-              variant="outline"
-              component="a"
-              href={`https://bz97lt8b1e.execute-api.eu-west-1.amazonaws.com/prod/submission/logs/${summary.id}`}
-              download
-              target="_blank"
-              rel="noreferrer"
-            >
+            <Button variant="outline" onClick={downloadLogs.call} loading={downloadLogs.loading}>
               Download logs
             </Button>
             <Button variant="outline" onClick={downloadResults.call} loading={downloadResults.loading}>

diff --git a/src/utils/algorithm.ts b/src/utils/algorithm.ts
@@ -243,20 +243,35 @@ export function parseAlgorithmLogs(logs: string, summary?: AlgorithmSummary): Al
   };
 }
 
-export async function downloadAlgorithmResults(algorithmId: string): Promise<void> {
-  const detailsResponse = await authenticatedAxios.get(
-    `https://bz97lt8b1e.execute-api.eu-west-1.amazonaws.com/prod/results/tutorial/${algorithmId}`,
+export async function getAlgorithmLogsUrl(algorithmId: string): Promise<string> {
+  const urlResponse = await authenticatedAxios.get(
+    `https://bz97lt8b1e.execute-api.eu-west-1.amazonaws.com/prod/submission/logs/${algorithmId}`,
   );
 
-  const resultsUrl = detailsResponse.data.algo.summary.activitiesLog;
+  return urlResponse.data;
+}
 
+function downloadFile(url: string): void {
   const link = document.createElement('a');
-  link.href = resultsUrl;
-  link.download = 'results.csv';
+  link.href = url;
+  link.download = new URL(url).pathname.split('/').pop()!;
   link.target = '_blank';
   link.rel = 'noreferrer';
 
   document.body.appendChild(link);
   link.click();
   link.remove();
 }
+
+export async function downloadAlgorithmLogs(algorithmId: string): Promise<void> {
+  const logsUrl = await getAlgorithmLogsUrl(algorithmId);
+  downloadFile(logsUrl);
+}
+
+export async function downloadAlgorithmResults(algorithmId: string): Promise<void> {
+  const detailsResponse = await authenticatedAxios.get(
+    `https://bz97lt8b1e.execute-api.eu-west-1.amazonaws.com/prod/results/tutorial/${algorithmId}`,
+  );
+
+  downloadFile(detailsResponse.data.algo.summary.activitiesLog);
+}