feat: Phase 4 web-to-CLI handoff UX
- Add CliHandoff component: shows install link + pre-filled msdl command - Highlighted card (Recommended) shown inline on Sentinel/WAF errors - Collapsed version shown below OfficialFallback on stale links - Rename instructions with platform-specific filenames (msdl.exe / msdl) - Fix backend CORS to allow local network origins (100.x, 192.168.x) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
6bc2785994
commit
bf5dca1fe4
3 changed files with 178 additions and 10 deletions
|
|
@ -940,7 +940,7 @@ func cleanupSessions() {
|
|||
func enableCORS(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
origin := r.Header.Get("Origin")
|
||||
if origin == "https://msdl.tech-latest.com" || strings.HasPrefix(origin, "http://localhost:") {
|
||||
if origin == "https://msdl.tech-latest.com" || strings.HasPrefix(origin, "http://localhost:") || strings.HasPrefix(origin, "http://100.") || strings.HasPrefix(origin, "http://192.168.") {
|
||||
w.Header().Set("Access-Control-Allow-Origin", origin)
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
|
||||
|
|
|
|||
142
frontend/src/components/CliHandoff.tsx
Normal file
142
frontend/src/components/CliHandoff.tsx
Normal file
|
|
@ -0,0 +1,142 @@
|
|||
import { useState } from 'react'
|
||||
import { motion, AnimatePresence } from 'motion/react'
|
||||
import { Terminal, ChevronRight, Copy, Check, ExternalLink } from 'lucide-react'
|
||||
import { toast } from 'sonner'
|
||||
|
||||
interface Props {
|
||||
productId: string
|
||||
langName?: string
|
||||
langDisplay?: string
|
||||
defaultOpen?: boolean
|
||||
highlight?: boolean
|
||||
}
|
||||
|
||||
const RELEASES_URL = 'https://github.com/starkSV/windows-iso-downloader/releases/latest'
|
||||
|
||||
function InstallSteps() {
|
||||
return (
|
||||
<div className="space-y-1.5">
|
||||
<p className="text-[10px] font-mono font-semibold uppercase tracking-widest text-zinc-600">1. Install</p>
|
||||
<a
|
||||
href={RELEASES_URL}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="flex items-center gap-2 px-3 py-2 rounded-lg bg-white/4 border border-white/7 text-[12px] text-zinc-400 hover:text-zinc-200 hover:border-white/12 transition-colors"
|
||||
>
|
||||
<ExternalLink size={12} className="flex-shrink-0 text-zinc-600" />
|
||||
Download msdl from GitHub Releases
|
||||
</a>
|
||||
<p className="text-[12px] text-zinc-400 leading-relaxed pt-0.5">
|
||||
Rename the downloaded file and add its folder to your PATH:<br />
|
||||
<span className="text-zinc-500">Windows →</span> <code className="font-mono text-zinc-300 bg-white/5 px-1 rounded">msdl.exe</code>
|
||||
<span className="mx-2 text-zinc-700">·</span>
|
||||
<span className="text-zinc-500">macOS/Linux →</span> <code className="font-mono text-zinc-300 bg-white/5 px-1 rounded">msdl</code>
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function RunStep({ command, langDisplay, onCopy, copied }: {
|
||||
command: string
|
||||
langDisplay?: string
|
||||
onCopy: () => void
|
||||
copied: boolean
|
||||
}) {
|
||||
return (
|
||||
<div className="space-y-1.5">
|
||||
<p className="text-[10px] font-mono font-semibold uppercase tracking-widest text-zinc-600">2. Run</p>
|
||||
<div className="rounded-lg border border-white/7 bg-[#0a0a0c] overflow-hidden">
|
||||
<div className="flex items-center justify-between px-3 py-1.5 border-b border-white/5">
|
||||
<span className="text-[10px] font-mono text-zinc-600">{langDisplay ?? 'will prompt for language'}</span>
|
||||
<button
|
||||
onClick={onCopy}
|
||||
className="flex items-center gap-1.5 text-[11px] text-zinc-500 hover:text-white transition-colors"
|
||||
>
|
||||
{copied ? <Check size={11} className="text-green-400" /> : <Copy size={11} />}
|
||||
<span>{copied ? 'Copied' : 'Copy'}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div className="px-3 py-2.5 overflow-x-auto">
|
||||
<code className="text-[12px] font-mono text-zinc-300 whitespace-nowrap">
|
||||
<span className="text-zinc-600 select-none">$ </span>
|
||||
{command}
|
||||
</code>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default function CliHandoff({ productId, langName, langDisplay, defaultOpen = false, highlight = false }: Props) {
|
||||
const [open, setOpen] = useState(defaultOpen)
|
||||
const [copied, setCopied] = useState(false)
|
||||
|
||||
const command = langName
|
||||
? `msdl --id ${productId} --lang "${langName}"`
|
||||
: `msdl --id ${productId}`
|
||||
|
||||
function handleCopy() {
|
||||
navigator.clipboard.writeText(command)
|
||||
setCopied(true)
|
||||
toast.success('Command copied!')
|
||||
setTimeout(() => setCopied(false), 2000)
|
||||
}
|
||||
|
||||
if (highlight) {
|
||||
return (
|
||||
<div className="rounded-xl border border-blue-500/25 bg-blue-500/5 p-4 space-y-3">
|
||||
<div className="flex items-center gap-2">
|
||||
<Terminal size={14} className="text-blue-400 flex-shrink-0" />
|
||||
<p className="text-[12px] font-semibold text-blue-300">Use the MSDL CLI instead</p>
|
||||
<span className="ml-auto text-[10px] font-mono font-semibold px-1.5 py-0.5 rounded bg-blue-500/15 border border-blue-500/20 text-blue-400 uppercase tracking-wide">
|
||||
Recommended
|
||||
</span>
|
||||
</div>
|
||||
<p className="text-[12px] text-zinc-500 leading-relaxed">
|
||||
Our server is currently blocked by Microsoft. The CLI fetches the link directly from your machine — no server involved.
|
||||
</p>
|
||||
<InstallSteps />
|
||||
<RunStep command={command} langDisplay={langDisplay} onCopy={handleCopy} copied={copied} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mt-3">
|
||||
<button
|
||||
onClick={() => setOpen(!open)}
|
||||
className="flex items-center gap-2 text-[12px] text-zinc-600 hover:text-zinc-400 transition-colors py-1"
|
||||
>
|
||||
<Terminal size={13} />
|
||||
<span>Get it from your machine via CLI</span>
|
||||
<motion.span
|
||||
animate={{ rotate: open ? 90 : 0 }}
|
||||
transition={{ type: 'spring', stiffness: 400, damping: 30 }}
|
||||
>
|
||||
<ChevronRight size={13} />
|
||||
</motion.span>
|
||||
</button>
|
||||
|
||||
<AnimatePresence initial={false}>
|
||||
{open && (
|
||||
<motion.div
|
||||
key="cli-handoff"
|
||||
initial={{ height: 0, opacity: 0 }}
|
||||
animate={{ height: 'auto', opacity: 1 }}
|
||||
exit={{ height: 0, opacity: 0 }}
|
||||
transition={{ type: 'spring', stiffness: 300, damping: 30 }}
|
||||
className="overflow-hidden"
|
||||
>
|
||||
<div className="mt-2 rounded-xl border border-white/7 bg-[#0d0d0f] p-4 space-y-3">
|
||||
<p className="text-[12px] text-zinc-500 leading-relaxed">
|
||||
The MSDL CLI runs the lookup directly from your machine — no server in the middle.
|
||||
</p>
|
||||
<InstallSteps />
|
||||
<RunStep command={command} langDisplay={langDisplay} onCopy={handleCopy} copied={copied} />
|
||||
</div>
|
||||
</motion.div>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -9,6 +9,7 @@ import SystemRequirements from '../components/SystemRequirements'
|
|||
import CliCommand from '../components/CliCommand'
|
||||
import RelatedReleases from '../components/RelatedReleases'
|
||||
import OfficialFallback from '../components/OfficialFallback'
|
||||
import CliHandoff from '../components/CliHandoff'
|
||||
import { addRecentEntry, updateRecentExpiry } from '../components/RecentlyViewed'
|
||||
|
||||
const API_BASE = import.meta.env.VITE_API_URL ?? 'http://localhost:3002'
|
||||
|
|
@ -526,10 +527,21 @@ export default function ProductDetailPage() {
|
|||
initial={{ opacity: 0, height: 0 }}
|
||||
animate={{ opacity: 1, height: 'auto' }}
|
||||
exit={{ opacity: 0, height: 0 }}
|
||||
className="flex items-start gap-3 p-4 rounded-xl bg-red-500/8 border border-red-500/15 text-red-400 text-sm"
|
||||
className="space-y-3"
|
||||
>
|
||||
<AlertTriangle size={15} className="flex-shrink-0 mt-0.5" />
|
||||
<span>{error}</span>
|
||||
<div className="flex items-start gap-3 p-4 rounded-xl bg-red-500/8 border border-red-500/15 text-red-400 text-sm">
|
||||
<AlertTriangle size={15} className="flex-shrink-0 mt-0.5" />
|
||||
<span>{error}</span>
|
||||
</div>
|
||||
{selectedSku && (
|
||||
<CliHandoff
|
||||
productId={productId!}
|
||||
langName={selectedSku.Language}
|
||||
langDisplay={selectedSku.LocalizedLanguage}
|
||||
highlight
|
||||
defaultOpen
|
||||
/>
|
||||
)}
|
||||
</motion.div>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
|
|
@ -637,12 +649,26 @@ export default function ProductDetailPage() {
|
|||
|
||||
{(!isNotFound && !hasCatalogError) && (
|
||||
<>
|
||||
{/* Official fallback — shown when backend is WAF-blocked (stale) */}
|
||||
{meta.active && linkStatus === 'stale' && selectedSku && (
|
||||
<OfficialFallback
|
||||
productId={productId!}
|
||||
languageName={selectedSku.LocalizedLanguage}
|
||||
/>
|
||||
{/* Fallbacks — shown when stale or any error */}
|
||||
{meta.active && (linkStatus === 'stale' || error !== null) && (
|
||||
<>
|
||||
<OfficialFallback
|
||||
productId={productId!}
|
||||
languageName={selectedSku?.LocalizedLanguage ?? ''}
|
||||
/>
|
||||
{/* Collapsed CLI only when the highlighted card isn't already shown inside */}
|
||||
{!(error !== null && languages.length > 0) && (
|
||||
selectedSku ? (
|
||||
<CliHandoff
|
||||
productId={productId!}
|
||||
langName={selectedSku.Language}
|
||||
langDisplay={selectedSku.LocalizedLanguage}
|
||||
/>
|
||||
) : (
|
||||
<CliHandoff productId={productId!} />
|
||||
)
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* System requirements */}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue