fix missing redirects tab

mohnjiles · mohnjiles · commit 13eb774f3407 · 2025-01-27T10:39:07.000-08:00
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -341,6 +341,7 @@ async fn send_request(
 pub fn run() {
     let cookie_jar = Arc::new(reqwest::cookie::Jar::default());
     let client = Client::builder()
+        .redirect(reqwest::redirect::Policy::none())
         .cookie_provider(Arc::clone(&cookie_jar))
         .build()
         .unwrap();
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -39,7 +39,7 @@
     "updater": {
       "active": true,
       "endpoints": [
-        "https://gist.githubusercontent.com/mohnjiles/546f0f1b3ff1f09808bd563f41a144df/raw/5a8e78fb3e7f11fa308dc11e3a071c54dd4b2ae1/test.json"
+        "https://github.com/LykosAI/LitePost/releases/latest/download/latest.json"
       ],
       "dialog": true,
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDRDQjA2Q0EwQTQ3QjI3MDQKUldRRUozdWtvR3l3VEVvYTVZa0tKNDFvUHVrd0FJUnZ1MTNsSFVMSkF6aCtaM3JhMTJhOVRqNnUK"
diff --git a/src/components/ResponsePanel.tsx b/src/components/ResponsePanel.tsx
@@ -201,6 +201,17 @@ export function ResponsePanel({
   const [rawResponse, setRawResponse] = useState<string>("")
   const { jsonViewer } = useSettings()
 
+  // Add debug logging
+  useEffect(() => {
+    if (response) {
+      console.log('Response in ResponsePanel:', {
+        hasRedirectChain: !!response.redirectChain,
+        redirectChainLength: response.redirectChain?.length,
+        fullResponse: response
+      });
+    }
+  }, [response]);
+
   useEffect(() => {
     if (response?.body) {
       try {
@@ -427,29 +438,43 @@ export function ResponsePanel({
               <div className="space-y-3 mb-2">
                 {response.redirectChain.map((redirect, index) => (
                   <div key={index} className="relative bg-muted rounded-md p-1.5">
-                    <CopyButton 
-                      content={`URL: ${redirect.url}\nStatus: ${redirect.statusText}\n\nHeaders:\n${
-                        Object.entries(redirect.headers)
-                          .map(([key, value]) => `${key}: ${value}`)
-                          .join('\n')
-                      }${
-                        redirect.cookies?.length 
-                          ? `\n\nCookies:\n${redirect.cookies.join('\n')}` 
-                          : ''
-                      }`}
-                      className="absolute right-2 top-2 z-10"
-                    />
                     <div className="flex justify-between items-center mb-1.5">
-                      <div className="text-sm font-medium">
-                        {index + 1}. {redirect.url}
-                      </div>
-                      <div className="text-xs text-muted-foreground">
-                        Status: {redirect.statusText}
+                      <div className="flex-1 min-w-0 pr-10">
+                        <div className="text-sm font-medium truncate">
+                          {index + 1}. {redirect.url}
+                        </div>
+                        <div className="text-xs text-muted-foreground mt-0.5">
+                          Status: {redirect.statusText}
+                        </div>
                       </div>
+                      <CopyButton 
+                        content={`URL: ${redirect.url}\nStatus: ${redirect.statusText}\n\nHeaders:\n${
+                          Object.entries(redirect.headers)
+                            .map(([key, value]) => `${key}: ${value}`)
+                            .join('\n')
+                        }${
+                          redirect.cookies?.length 
+                            ? `\n\nCookies:\n${redirect.cookies.join('\n')}` 
+                            : ''
+                        }`}
+                        className="absolute right-2 top-2"
+                      />
                     </div>
                     <SyntaxHighlighter
                       language="text"
-                      style={oneDark}
+                      style={{
+                        ...oneDark,
+                        'pre[class*="language-"]': {
+                          ...oneDark['pre[class*="language-"]'],
+                          background: 'transparent',
+                          margin: 0,
+                          padding: 0,
+                        },
+                        'code[class*="language-"]': {
+                          ...oneDark['code[class*="language-"]'],
+                          background: 'transparent',
+                        },
+                      }}
                       customStyle={{
                         margin: 0,
                         padding: '0.25rem',
diff --git a/src/components/Titlebar.tsx b/src/components/Titlebar.tsx
@@ -1,6 +1,6 @@
 import { Window } from '@tauri-apps/api/window'
 import { Button } from './ui/button'
-import { X, Minus, Square, Settings, Beaker, FolderOpen } from 'lucide-react'
+import { X, Minus, Square } from 'lucide-react'
 import icon from '../assets/icon_1024.png'
 import { SettingsPanel } from './SettingsPanel'
 import { EnvironmentPanel } from './EnvironmentPanel'
@@ -72,58 +72,28 @@ export function TitleBar({ currentRequest, onRequestSelect }: TitleBarProps) {
             </div>
           )}
 
-          <EnvironmentPanel 
-            open={isEnvironmentPanelOpen} 
-            onOpenChange={setIsEnvironmentPanelOpen}
-            trigger={
-              renderTooltip("Manage environments",
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  aria-label="Manage environments"
-                  className="h-10 w-10 rounded-none hover:bg-muted"
-                >
-                  <Beaker className="h-4 w-4" />
-                </Button>
-              )
-            }
-          />
+          {renderTooltip("Manage environments",
+            <EnvironmentPanel 
+              open={isEnvironmentPanelOpen} 
+              onOpenChange={setIsEnvironmentPanelOpen} 
+            />
+          )}
 
-          <SettingsPanel 
-            open={isSettingsPanelOpen} 
-            onOpenChange={setIsSettingsPanelOpen}
-            trigger={
-              renderTooltip("Settings",
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  aria-label="Settings"
-                  className="h-10 w-10 rounded-none hover:bg-muted"
-                >
-                  <Settings className="h-4 w-4" />
-                </Button>
-              )
-            }
-          />
+          {renderTooltip("Settings",
+            <SettingsPanel 
+              open={isSettingsPanelOpen} 
+              onOpenChange={setIsSettingsPanelOpen} 
+            />
+          )}
 
-          <CollectionsPanel 
-            open={isCollectionsPanelOpen}
-            onOpenChange={setIsCollectionsPanelOpen}
-            currentRequest={currentRequest}
-            onRequestSelect={onRequestSelect}
-            trigger={
-              renderTooltip("Collections",
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  aria-label="Collections"
-                  className="h-10 w-10 rounded-none hover:bg-muted"
-                >
-                  <FolderOpen className="h-4 w-4" />
-                </Button>
-              )
-            }
-          />
+          {renderTooltip("Collections",
+            <CollectionsPanel 
+              open={isCollectionsPanelOpen}
+              onOpenChange={setIsCollectionsPanelOpen}
+              currentRequest={currentRequest}
+              onRequestSelect={onRequestSelect}
+            />
+          )}
 
           {renderTooltip("Minimize",
             <Button
@@ -141,7 +111,6 @@ export function TitleBar({ currentRequest, onRequestSelect }: TitleBarProps) {
             <Button
               variant="ghost"
               size="sm"
-              aria-label="Maximize"
               className="h-10 w-10 rounded-none hover:bg-muted"
               onClick={() => appWindow.toggleMaximize()}
             >
@@ -153,7 +122,6 @@ export function TitleBar({ currentRequest, onRequestSelect }: TitleBarProps) {
             <Button
               variant="ghost"
               size="sm"
-              aria-label="Close"
               className="h-10 w-10 rounded-none hover:bg-red-500 hover:text-white"
               onClick={() => appWindow.close()}
             >
diff --git a/src/components/UpdateChecker.tsx b/src/components/UpdateChecker.tsx
@@ -1,8 +1,7 @@
-import { useEffect, useState, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 import { check, type Update } from '@tauri-apps/plugin-updater';
 import { relaunch } from '@tauri-apps/plugin-process';
 import { toast } from 'sonner';
-import { Button } from './ui/button';
 import { Progress } from './ui/progress';
 
 const toastStyles = {
@@ -48,10 +47,8 @@ export async function checkForUpdatesManually() {
 }
 
 async function installUpdateManually(update: Update) {
-  let isInstalling = false;
   let toastId: string | number = '';
   try {
-    isInstalling = true;
     let downloaded = 0;
     let contentLength = 0;
 
@@ -89,8 +86,6 @@ async function installUpdateManually(update: Update) {
       id: toastId,
       ...toastStyles,
     });
-  } finally {
-    isInstalling = false;
   }
 }
 
diff --git a/src/hooks/useRequest.ts b/src/hooks/useRequest.ts
@@ -115,7 +115,7 @@ export function useRequest(onHistoryUpdate: (item: HistoryItem) => void) {
 
       console.log('Sending request with options:', options);
       const response = await invoke<ResponseData>('send_request', { options })
-      console.log('Received response:', response);
+      console.log('Raw response from Rust:', response);
 
       // Add to history
       onHistoryUpdate({
@@ -130,6 +130,13 @@ export function useRequest(onHistoryUpdate: (item: HistoryItem) => void) {
         auth: tab.auth
       })
 
+      // Debug logging for redirect chain
+      console.log('Redirect chain from Rust:', {
+        hasRedirectChain: !!response.redirect_chain,
+        redirectChainLength: response.redirect_chain?.length,
+        redirectChain: response.redirect_chain
+      });
+
       const mappedResponse = {
         status: response.status,
         statusText: response.status_text,
@@ -150,7 +157,11 @@ export function useRequest(onHistoryUpdate: (item: HistoryItem) => void) {
         size: response.size
       }
 
-      console.log('Mapped response:', mappedResponse);
+      console.log('Mapped response with redirects:', {
+        hasRedirectChain: !!mappedResponse.redirectChain,
+        redirectChainLength: mappedResponse.redirectChain?.length,
+        redirectChain: mappedResponse.redirectChain
+      });
       return mappedResponse
     } catch (error) {
       console.error('Request error:', error)
@@ -159,7 +170,10 @@ export function useRequest(onHistoryUpdate: (item: HistoryItem) => void) {
         statusText: "Error",
         headers: {},
         body: "",
-        error: typeof error === 'string' ? error : error instanceof Error ? error.message : "An error occurred"
+        error: typeof error === 'string' ? error : error instanceof Error ? error.message : "An error occurred",
+        redirectChain: [],
+        cookies: [],
+        is_base64: false
       }
     }
   }
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -4,7 +4,7 @@ export interface Response {
   headers: Record<string, string>
   body: string
   error?: string
-  redirectChain?: {
+  redirectChain: {
     url: string
     status: number
     statusText: string
