Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
557 changes: 532 additions & 25 deletions apps/server/src/preview/PortScanner.test.ts

Large diffs are not rendered by default.

336 changes: 305 additions & 31 deletions apps/server/src/preview/PortScanner.ts

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions apps/server/src/ws.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2115,23 +2115,31 @@ const makeWsRpcLayer = (
observeRpcStream(WS_METHODS.subscribePreviewEvents, previewManager.events, {
"rpc.aggregate": "preview",
}),
[WS_METHODS.subscribeDiscoveredLocalServers]: (_input) =>
[WS_METHODS.subscribeDiscoveredLocalServers]: (input) =>
observeRpcStream(
WS_METHODS.subscribeDiscoveredLocalServers,
Stream.callback<DiscoveredLocalServerList>((queue) =>
Effect.gen(function* () {
const configuredUrls = input.configuredUrls ?? [];
yield* portDiscovery.retain;
const initial = yield* portDiscovery.scan();
const initial = yield* portDiscovery.scan(configuredUrls);
const initialScannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers: initial,
scannedAt: initialScannedAt,
configuredUrlProbing: true,
});
yield* portDiscovery.subscribe((servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, { servers, scannedAt });
}),
yield* portDiscovery.subscribe(
{ configuredUrls, initialSnapshot: initial },
(servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers,
scannedAt,
configuredUrlProbing: true,
});
}),
);
}),
),
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/preview/PreviewEmptyState.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
pid: number | null;
terminal: null;
source: "scanner";
listening: boolean;
}>,
}));

Expand All@@ -34,7 +33,6 @@ function server(port: number) {
pid: 1,
terminal: null,
source: "scanner" as const,
listening: true,
};
}

Expand Down
9 changes: 3 additions & 6 deletions apps/web/src/components/preview/PreviewEmptyState.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { useDiscoveredLocalServers } from "./useDiscoveredLocalServers";
interface Props {
environmentId: EnvironmentId;
configuredUrls?: ReadonlyArray<string> | undefined;
recentlySeenUrls?: ReadonlyArray<string> | undefined;
recentEntries: ReadonlyArray<BrowserHistoryEntry>;
onRemoveRecent: (url: string) => void;
onOpenUrl: (url: string) => void;
Expand All@@ -20,15 +19,13 @@ interface Props {
export function PreviewEmptyState({
environmentId,
configuredUrls,
recentlySeenUrls,
recentEntries,
onRemoveRecent,
onOpenUrl,
}: Props) {
const servers = useDiscoveredLocalServers({
environmentId,
configuredUrls,
recentlySeenUrls,
});
const recents = recentEntries.filter((entry) => URL.canParse(entry.url)).slice(0, 8);

Expand All@@ -40,7 +37,7 @@ export function PreviewEmptyState({
</EmptyMedia>
<EmptyTitle>No preview yet</EmptyTitle>
<EmptyDescription>
Type a URL above, or run a dev script. Listening localhost ports will show up here
Type a URL above, or run a dev script. Browser-ready localhost servers will show up here
automatically.
</EmptyDescription>
</Empty>
Expand All@@ -49,7 +46,7 @@ export function PreviewEmptyState({

return (
<div className="flex h-full min-h-0 overflow-y-auto px-5 py-8">
<div className="m-auto flex w-full max-w-xl flex-col gap-6">
<div className="mx-auto flex w-full max-w-xl flex-col gap-6">
{recents.length > 0 ? (
<div className="flex flex-col gap-3">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
Expand DownExpand Up@@ -84,7 +81,7 @@ export function PreviewEmptyState({
))}
</div>
<p className="px-1 text-xs text-muted-foreground">
Select a listening port to open it in this browser tab.
Select a live local server to open it in this browser tab.
</p>
</div>
) : null}
Expand Down
23 changes: 1 addition & 22 deletions apps/web/src/components/preview/PreviewLocalServerCard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,32 +21,11 @@ export function PreviewLocalServerCard({ server, onOpen }: Props) {
{server.host}:{server.port}
</span>
</div>
{server.listening ? <PulsingDot /> : <DimDot />}
</button>
);
}

function describeServer(server: PreviewableServer): string {
if (server.processName) return server.processName;
if (server.listening) return "Listening";
if (server.source === "configured") return "Configured";
return "Recently seen";
}

function PulsingDot() {
return (
<span aria-label="Listening" className="relative inline-flex size-2 shrink-0">
<span className="absolute inset-0 animate-status-ping rounded-full bg-success opacity-60" />
<span className="relative inline-flex size-2 rounded-full bg-success" />
</span>
);
}

function DimDot() {
return (
<span
aria-label="Not currently listening"
className="size-2 shrink-0 rounded-full bg-muted-foreground/40"
/>
);
return "Listening";
}
1 change: 0 additions & 1 deletion apps/web/src/components/preview/PreviewView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -712,7 +712,6 @@ export function PreviewView({
<PreviewEmptyState
environmentId={threadRef.environmentId}
configuredUrls={configuredUrls}
recentlySeenUrls={previewState.recentlySeenUrls}
recentEntries={recentHistoryEntries}
onRemoveRecent={(url) => removeUrlForThread(threadRef, url)}
onOpenUrl={(next) => void handleOpenServerUrl(next)}
Expand Down
113 changes: 60 additions & 53 deletions apps/web/src/components/preview/useDiscoveredLocalServers.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { DiscoveredLocalServer } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { mergeServers, type PreviewableServer } from "./useDiscoveredLocalServers";
import { mergeServers } from "./useDiscoveredLocalServers";

const scannerServer = (
overrides: Partial<DiscoveredLocalServer & { requestedUrl: string }>,
Expand All@@ -21,15 +21,13 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: [],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
host: "localhost",
port: 5173,
requestedUrl: "http://localhost:5173",
source: "scanner",
listening: true,
processName: "vite",
});
});
Expand All@@ -38,102 +36,111 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173, processName: "node", pid: 9999 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
port: 5173,
source: "configured",
listening: true,
processName: "node",
pid: 9999,
});
});

it("keeps configured entries that the scanner doesn't see, with listening=false", () => {
it("excludes configured entries that the live scanner doesn't see", () => {
const result = mergeServers({
scanner: [],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
source: "configured",
listening: false,
requestedUrl: "http://localhost:5173/",
});
});

it("dedupes recently-seen URLs against scanner+configured entries", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173 })],
configuredUrls: [],
recentlySeenUrls: ["http://localhost:5173/", "http://localhost:8080/"],
});
expect(result.map((s) => s.port)).toEqual([5173, 8080]);
expect(result.find((s) => s.port === 5173)?.source).toBe("scanner");
expect(result.find((s) => s.port === 8080)?.source).toBe("recent");
expect(result.find((s) => s.port === 8080)?.requestedUrl).toBe("http://localhost:8080/");
expect(result).toHaveLength(0);
});

it("ignores non-loopback URLs in configured/recent inputs", () => {
it("ignores non-loopback configured URLs", () => {
const result = mergeServers({
scanner: [],
scanner: [scannerServer({})],
configuredUrls: ["https://example.com", "ws://localhost:5173"],
recentlySeenUrls: ["https://api.example.com"],
});
expect(result).toHaveLength(0);
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("scanner");
});

it("sorts: configured before scanner before recent, then by port", () => {
it("sorts configured live servers before scanner-only servers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 8080 }), scannerServer({ port: 3000 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: ["http://localhost:9000/", "http://localhost:4321/"],
configuredUrls: ["http://localhost:8080"],
});
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual([
"configured:5173",
"scanner:3000",
"scanner:8080",
"recent:4321",
"recent:9000",
]);
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual(["configured:8080", "scanner:3000"]);
});

it("dedupes by lowercased host", () => {
const result = mergeServers({
scanner: [scannerServer({ host: "Localhost", port: 5173 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
});

it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
it.each(["127.0.0.1", "0.0.0.0", "[::1]"])(
"matches configured loopback alias %s to a live localhost server",
(host) => {
const result = mergeServers({
scanner: [
scannerServer({ requestedUrl: `http://localhost:5173/dashboard?mode=test#results` }),
],
configuredUrls: [`http://${host}:5173/dashboard?mode=test#results`],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
},
);

it("keeps the scanner-verified path and protocol", () => {
const result = mergeServers({
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
requestedUrl: "http://localhost:5173/dashboard?mode=test#results",
}),
],
configuredUrls: [],
recentlySeenUrls: [],
configuredUrls: ["https://localhost:5173/dashboard?mode=test#results"],
});
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
});

it("overlays a configured path when an older server does not advertise path probing", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["https://localhost:5173/docs?mode=test#results"],
configuredUrlProbing: false,
});

expect(result[0]?.requestedUrl).toBe("https://localhost:5173/docs?mode=test#results");
});

it("does not overlay an unverified configured path when the server probes paths", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["http://localhost:5173/docs"],
configuredUrlProbing: true,
});

expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});

describe("PreviewableServer interface", () => {
it("preserves listening flag through enrichment", () => {
it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
}),
],
configuredUrls: [],
});
const merged: PreviewableServer | undefined = result[0];
expect(merged?.listening).toBe(true);
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
557 changes: 532 additions & 25 deletions apps/server/src/preview/PortScanner.test.ts

Large diffs are not rendered by default.

336 changes: 305 additions & 31 deletions apps/server/src/preview/PortScanner.ts

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions apps/server/src/ws.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2115,23 +2115,31 @@ const makeWsRpcLayer = (
observeRpcStream(WS_METHODS.subscribePreviewEvents, previewManager.events, {
"rpc.aggregate": "preview",
}),
[WS_METHODS.subscribeDiscoveredLocalServers]: (_input) =>
[WS_METHODS.subscribeDiscoveredLocalServers]: (input) =>
observeRpcStream(
WS_METHODS.subscribeDiscoveredLocalServers,
Stream.callback<DiscoveredLocalServerList>((queue) =>
Effect.gen(function* () {
const configuredUrls = input.configuredUrls ?? [];
yield* portDiscovery.retain;
const initial = yield* portDiscovery.scan();
const initial = yield* portDiscovery.scan(configuredUrls);
const initialScannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers: initial,
scannedAt: initialScannedAt,
configuredUrlProbing: true,
});
yield* portDiscovery.subscribe((servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, { servers, scannedAt });
}),
yield* portDiscovery.subscribe(
{ configuredUrls, initialSnapshot: initial },
(servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers,
scannedAt,
configuredUrlProbing: true,
});
}),
);
}),
),
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/preview/PreviewEmptyState.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
pid: number | null;
terminal: null;
source: "scanner";
listening: boolean;
}>,
}));

Expand All@@ -34,7 +33,6 @@ function server(port: number) {
pid: 1,
terminal: null,
source: "scanner" as const,
listening: true,
};
}

Expand Down
9 changes: 3 additions & 6 deletions apps/web/src/components/preview/PreviewEmptyState.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { useDiscoveredLocalServers } from "./useDiscoveredLocalServers";
interface Props {
environmentId: EnvironmentId;
configuredUrls?: ReadonlyArray<string> | undefined;
recentlySeenUrls?: ReadonlyArray<string> | undefined;
recentEntries: ReadonlyArray<BrowserHistoryEntry>;
onRemoveRecent: (url: string) => void;
onOpenUrl: (url: string) => void;
Expand All@@ -20,15 +19,13 @@ interface Props {
export function PreviewEmptyState({
environmentId,
configuredUrls,
recentlySeenUrls,
recentEntries,
onRemoveRecent,
onOpenUrl,
}: Props) {
const servers = useDiscoveredLocalServers({
environmentId,
configuredUrls,
recentlySeenUrls,
});
const recents = recentEntries.filter((entry) => URL.canParse(entry.url)).slice(0, 8);

Expand All@@ -40,7 +37,7 @@ export function PreviewEmptyState({
</EmptyMedia>
<EmptyTitle>No preview yet</EmptyTitle>
<EmptyDescription>
Type a URL above, or run a dev script. Listening localhost ports will show up here
Type a URL above, or run a dev script. Browser-ready localhost servers will show up here
automatically.
</EmptyDescription>
</Empty>
Expand All@@ -49,7 +46,7 @@ export function PreviewEmptyState({

return (
<div className="flex h-full min-h-0 overflow-y-auto px-5 py-8">
<div className="m-auto flex w-full max-w-xl flex-col gap-6">
<div className="mx-auto flex w-full max-w-xl flex-col gap-6">
{recents.length > 0 ? (
<div className="flex flex-col gap-3">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
Expand DownExpand Up@@ -84,7 +81,7 @@ export function PreviewEmptyState({
))}
</div>
<p className="px-1 text-xs text-muted-foreground">
Select a listening port to open it in this browser tab.
Select a live local server to open it in this browser tab.
</p>
</div>
) : null}
Expand Down
23 changes: 1 addition & 22 deletions apps/web/src/components/preview/PreviewLocalServerCard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,32 +21,11 @@ export function PreviewLocalServerCard({ server, onOpen }: Props) {
{server.host}:{server.port}
</span>
</div>
{server.listening ? <PulsingDot /> : <DimDot />}
</button>
);
}

function describeServer(server: PreviewableServer): string {
if (server.processName) return server.processName;
if (server.listening) return "Listening";
if (server.source === "configured") return "Configured";
return "Recently seen";
}

function PulsingDot() {
return (
<span aria-label="Listening" className="relative inline-flex size-2 shrink-0">
<span className="absolute inset-0 animate-status-ping rounded-full bg-success opacity-60" />
<span className="relative inline-flex size-2 rounded-full bg-success" />
</span>
);
}

function DimDot() {
return (
<span
aria-label="Not currently listening"
className="size-2 shrink-0 rounded-full bg-muted-foreground/40"
/>
);
return "Listening";
}
1 change: 0 additions & 1 deletion apps/web/src/components/preview/PreviewView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -712,7 +712,6 @@ export function PreviewView({
<PreviewEmptyState
environmentId={threadRef.environmentId}
configuredUrls={configuredUrls}
recentlySeenUrls={previewState.recentlySeenUrls}
recentEntries={recentHistoryEntries}
onRemoveRecent={(url) => removeUrlForThread(threadRef, url)}
onOpenUrl={(next) => void handleOpenServerUrl(next)}
Expand Down
113 changes: 60 additions & 53 deletions apps/web/src/components/preview/useDiscoveredLocalServers.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { DiscoveredLocalServer } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { mergeServers, type PreviewableServer } from "./useDiscoveredLocalServers";
import { mergeServers } from "./useDiscoveredLocalServers";

const scannerServer = (
overrides: Partial<DiscoveredLocalServer & { requestedUrl: string }>,
Expand All@@ -21,15 +21,13 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: [],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
host: "localhost",
port: 5173,
requestedUrl: "http://localhost:5173",
source: "scanner",
listening: true,
processName: "vite",
});
});
Expand All@@ -38,102 +36,111 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173, processName: "node", pid: 9999 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
port: 5173,
source: "configured",
listening: true,
processName: "node",
pid: 9999,
});
});

it("keeps configured entries that the scanner doesn't see, with listening=false", () => {
it("excludes configured entries that the live scanner doesn't see", () => {
const result = mergeServers({
scanner: [],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
source: "configured",
listening: false,
requestedUrl: "http://localhost:5173/",
});
});

it("dedupes recently-seen URLs against scanner+configured entries", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173 })],
configuredUrls: [],
recentlySeenUrls: ["http://localhost:5173/", "http://localhost:8080/"],
});
expect(result.map((s) => s.port)).toEqual([5173, 8080]);
expect(result.find((s) => s.port === 5173)?.source).toBe("scanner");
expect(result.find((s) => s.port === 8080)?.source).toBe("recent");
expect(result.find((s) => s.port === 8080)?.requestedUrl).toBe("http://localhost:8080/");
expect(result).toHaveLength(0);
});

it("ignores non-loopback URLs in configured/recent inputs", () => {
it("ignores non-loopback configured URLs", () => {
const result = mergeServers({
scanner: [],
scanner: [scannerServer({})],
configuredUrls: ["https://example.com", "ws://localhost:5173"],
recentlySeenUrls: ["https://api.example.com"],
});
expect(result).toHaveLength(0);
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("scanner");
});

it("sorts: configured before scanner before recent, then by port", () => {
it("sorts configured live servers before scanner-only servers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 8080 }), scannerServer({ port: 3000 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: ["http://localhost:9000/", "http://localhost:4321/"],
configuredUrls: ["http://localhost:8080"],
});
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual([
"configured:5173",
"scanner:3000",
"scanner:8080",
"recent:4321",
"recent:9000",
]);
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual(["configured:8080", "scanner:3000"]);
});

it("dedupes by lowercased host", () => {
const result = mergeServers({
scanner: [scannerServer({ host: "Localhost", port: 5173 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
});

it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
it.each(["127.0.0.1", "0.0.0.0", "[::1]"])(
"matches configured loopback alias %s to a live localhost server",
(host) => {
const result = mergeServers({
scanner: [
scannerServer({ requestedUrl: `http://localhost:5173/dashboard?mode=test#results` }),
],
configuredUrls: [`http://${host}:5173/dashboard?mode=test#results`],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
},
);

it("keeps the scanner-verified path and protocol", () => {
const result = mergeServers({
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
requestedUrl: "http://localhost:5173/dashboard?mode=test#results",
}),
],
configuredUrls: [],
recentlySeenUrls: [],
configuredUrls: ["https://localhost:5173/dashboard?mode=test#results"],
});
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
});

it("overlays a configured path when an older server does not advertise path probing", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["https://localhost:5173/docs?mode=test#results"],
configuredUrlProbing: false,
});

expect(result[0]?.requestedUrl).toBe("https://localhost:5173/docs?mode=test#results");
});

it("does not overlay an unverified configured path when the server probes paths", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["http://localhost:5173/docs"],
configuredUrlProbing: true,
});

expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});

describe("PreviewableServer interface", () => {
it("preserves listening flag through enrichment", () => {
it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
}),
],
configuredUrls: [],
});
const merged: PreviewableServer | undefined = result[0];
expect(merged?.listening).toBe(true);
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
557 changes: 532 additions & 25 deletions apps/server/src/preview/PortScanner.test.ts

Large diffs are not rendered by default.

336 changes: 305 additions & 31 deletions apps/server/src/preview/PortScanner.ts

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions apps/server/src/ws.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2115,23 +2115,31 @@ const makeWsRpcLayer = (
observeRpcStream(WS_METHODS.subscribePreviewEvents, previewManager.events, {
"rpc.aggregate": "preview",
}),
[WS_METHODS.subscribeDiscoveredLocalServers]: (_input) =>
[WS_METHODS.subscribeDiscoveredLocalServers]: (input) =>
observeRpcStream(
WS_METHODS.subscribeDiscoveredLocalServers,
Stream.callback<DiscoveredLocalServerList>((queue) =>
Effect.gen(function* () {
const configuredUrls = input.configuredUrls ?? [];
yield* portDiscovery.retain;
const initial = yield* portDiscovery.scan();
const initial = yield* portDiscovery.scan(configuredUrls);
const initialScannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers: initial,
scannedAt: initialScannedAt,
configuredUrlProbing: true,
});
yield* portDiscovery.subscribe((servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, { servers, scannedAt });
}),
yield* portDiscovery.subscribe(
{ configuredUrls, initialSnapshot: initial },
(servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers,
scannedAt,
configuredUrlProbing: true,
});
}),
);
}),
),
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/preview/PreviewEmptyState.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
pid: number | null;
terminal: null;
source: "scanner";
listening: boolean;
}>,
}));

Expand All@@ -34,7 +33,6 @@ function server(port: number) {
pid: 1,
terminal: null,
source: "scanner" as const,
listening: true,
};
}

Expand Down
9 changes: 3 additions & 6 deletions apps/web/src/components/preview/PreviewEmptyState.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { useDiscoveredLocalServers } from "./useDiscoveredLocalServers";
interface Props {
environmentId: EnvironmentId;
configuredUrls?: ReadonlyArray<string> | undefined;
recentlySeenUrls?: ReadonlyArray<string> | undefined;
recentEntries: ReadonlyArray<BrowserHistoryEntry>;
onRemoveRecent: (url: string) => void;
onOpenUrl: (url: string) => void;
Expand All@@ -20,15 +19,13 @@ interface Props {
export function PreviewEmptyState({
environmentId,
configuredUrls,
recentlySeenUrls,
recentEntries,
onRemoveRecent,
onOpenUrl,
}: Props) {
const servers = useDiscoveredLocalServers({
environmentId,
configuredUrls,
recentlySeenUrls,
});
const recents = recentEntries.filter((entry) => URL.canParse(entry.url)).slice(0, 8);

Expand All@@ -40,7 +37,7 @@ export function PreviewEmptyState({
</EmptyMedia>
<EmptyTitle>No preview yet</EmptyTitle>
<EmptyDescription>
Type a URL above, or run a dev script. Listening localhost ports will show up here
Type a URL above, or run a dev script. Browser-ready localhost servers will show up here
automatically.
</EmptyDescription>
</Empty>
Expand All@@ -49,7 +46,7 @@ export function PreviewEmptyState({

return (
<div className="flex h-full min-h-0 overflow-y-auto px-5 py-8">
<div className="m-auto flex w-full max-w-xl flex-col gap-6">
<div className="mx-auto flex w-full max-w-xl flex-col gap-6">
{recents.length > 0 ? (
<div className="flex flex-col gap-3">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
Expand DownExpand Up@@ -84,7 +81,7 @@ export function PreviewEmptyState({
))}
</div>
<p className="px-1 text-xs text-muted-foreground">
Select a listening port to open it in this browser tab.
Select a live local server to open it in this browser tab.
</p>
</div>
) : null}
Expand Down
23 changes: 1 addition & 22 deletions apps/web/src/components/preview/PreviewLocalServerCard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,32 +21,11 @@ export function PreviewLocalServerCard({ server, onOpen }: Props) {
{server.host}:{server.port}
</span>
</div>
{server.listening ? <PulsingDot /> : <DimDot />}
</button>
);
}

function describeServer(server: PreviewableServer): string {
if (server.processName) return server.processName;
if (server.listening) return "Listening";
if (server.source === "configured") return "Configured";
return "Recently seen";
}

function PulsingDot() {
return (
<span aria-label="Listening" className="relative inline-flex size-2 shrink-0">
<span className="absolute inset-0 animate-status-ping rounded-full bg-success opacity-60" />
<span className="relative inline-flex size-2 rounded-full bg-success" />
</span>
);
}

function DimDot() {
return (
<span
aria-label="Not currently listening"
className="size-2 shrink-0 rounded-full bg-muted-foreground/40"
/>
);
return "Listening";
}
1 change: 0 additions & 1 deletion apps/web/src/components/preview/PreviewView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -712,7 +712,6 @@ export function PreviewView({
<PreviewEmptyState
environmentId={threadRef.environmentId}
configuredUrls={configuredUrls}
recentlySeenUrls={previewState.recentlySeenUrls}
recentEntries={recentHistoryEntries}
onRemoveRecent={(url) => removeUrlForThread(threadRef, url)}
onOpenUrl={(next) => void handleOpenServerUrl(next)}
Expand Down
113 changes: 60 additions & 53 deletions apps/web/src/components/preview/useDiscoveredLocalServers.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { DiscoveredLocalServer } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { mergeServers, type PreviewableServer } from "./useDiscoveredLocalServers";
import { mergeServers } from "./useDiscoveredLocalServers";

const scannerServer = (
overrides: Partial<DiscoveredLocalServer & { requestedUrl: string }>,
Expand All@@ -21,15 +21,13 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: [],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
host: "localhost",
port: 5173,
requestedUrl: "http://localhost:5173",
source: "scanner",
listening: true,
processName: "vite",
});
});
Expand All@@ -38,102 +36,111 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173, processName: "node", pid: 9999 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
port: 5173,
source: "configured",
listening: true,
processName: "node",
pid: 9999,
});
});

it("keeps configured entries that the scanner doesn't see, with listening=false", () => {
it("excludes configured entries that the live scanner doesn't see", () => {
const result = mergeServers({
scanner: [],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
source: "configured",
listening: false,
requestedUrl: "http://localhost:5173/",
});
});

it("dedupes recently-seen URLs against scanner+configured entries", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173 })],
configuredUrls: [],
recentlySeenUrls: ["http://localhost:5173/", "http://localhost:8080/"],
});
expect(result.map((s) => s.port)).toEqual([5173, 8080]);
expect(result.find((s) => s.port === 5173)?.source).toBe("scanner");
expect(result.find((s) => s.port === 8080)?.source).toBe("recent");
expect(result.find((s) => s.port === 8080)?.requestedUrl).toBe("http://localhost:8080/");
expect(result).toHaveLength(0);
});

it("ignores non-loopback URLs in configured/recent inputs", () => {
it("ignores non-loopback configured URLs", () => {
const result = mergeServers({
scanner: [],
scanner: [scannerServer({})],
configuredUrls: ["https://example.com", "ws://localhost:5173"],
recentlySeenUrls: ["https://api.example.com"],
});
expect(result).toHaveLength(0);
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("scanner");
});

it("sorts: configured before scanner before recent, then by port", () => {
it("sorts configured live servers before scanner-only servers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 8080 }), scannerServer({ port: 3000 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: ["http://localhost:9000/", "http://localhost:4321/"],
configuredUrls: ["http://localhost:8080"],
});
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual([
"configured:5173",
"scanner:3000",
"scanner:8080",
"recent:4321",
"recent:9000",
]);
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual(["configured:8080", "scanner:3000"]);
});

it("dedupes by lowercased host", () => {
const result = mergeServers({
scanner: [scannerServer({ host: "Localhost", port: 5173 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
});

it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
it.each(["127.0.0.1", "0.0.0.0", "[::1]"])(
"matches configured loopback alias %s to a live localhost server",
(host) => {
const result = mergeServers({
scanner: [
scannerServer({ requestedUrl: `http://localhost:5173/dashboard?mode=test#results` }),
],
configuredUrls: [`http://${host}:5173/dashboard?mode=test#results`],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
},
);

it("keeps the scanner-verified path and protocol", () => {
const result = mergeServers({
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
requestedUrl: "http://localhost:5173/dashboard?mode=test#results",
}),
],
configuredUrls: [],
recentlySeenUrls: [],
configuredUrls: ["https://localhost:5173/dashboard?mode=test#results"],
});
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
});

it("overlays a configured path when an older server does not advertise path probing", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["https://localhost:5173/docs?mode=test#results"],
configuredUrlProbing: false,
});

expect(result[0]?.requestedUrl).toBe("https://localhost:5173/docs?mode=test#results");
});

it("does not overlay an unverified configured path when the server probes paths", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["http://localhost:5173/docs"],
configuredUrlProbing: true,
});

expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});

describe("PreviewableServer interface", () => {
it("preserves listening flag through enrichment", () => {
it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
}),
],
configuredUrls: [],
});
const merged: PreviewableServer | undefined = result[0];
expect(merged?.listening).toBe(true);
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
557 changes: 532 additions & 25 deletions apps/server/src/preview/PortScanner.test.ts

Large diffs are not rendered by default.

336 changes: 305 additions & 31 deletions apps/server/src/preview/PortScanner.ts

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions apps/server/src/ws.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2115,23 +2115,31 @@ const makeWsRpcLayer = (
observeRpcStream(WS_METHODS.subscribePreviewEvents, previewManager.events, {
"rpc.aggregate": "preview",
}),
[WS_METHODS.subscribeDiscoveredLocalServers]: (_input) =>
[WS_METHODS.subscribeDiscoveredLocalServers]: (input) =>
observeRpcStream(
WS_METHODS.subscribeDiscoveredLocalServers,
Stream.callback<DiscoveredLocalServerList>((queue) =>
Effect.gen(function* () {
const configuredUrls = input.configuredUrls ?? [];
yield* portDiscovery.retain;
const initial = yield* portDiscovery.scan();
const initial = yield* portDiscovery.scan(configuredUrls);
const initialScannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers: initial,
scannedAt: initialScannedAt,
configuredUrlProbing: true,
});
yield* portDiscovery.subscribe((servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, { servers, scannedAt });
}),
yield* portDiscovery.subscribe(
{ configuredUrls, initialSnapshot: initial },
(servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers,
scannedAt,
configuredUrlProbing: true,
});
}),
);
}),
),
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/preview/PreviewEmptyState.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
pid: number | null;
terminal: null;
source: "scanner";
listening: boolean;
}>,
}));

Expand All@@ -34,7 +33,6 @@ function server(port: number) {
pid: 1,
terminal: null,
source: "scanner" as const,
listening: true,
};
}

Expand Down
9 changes: 3 additions & 6 deletions apps/web/src/components/preview/PreviewEmptyState.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { useDiscoveredLocalServers } from "./useDiscoveredLocalServers";
interface Props {
environmentId: EnvironmentId;
configuredUrls?: ReadonlyArray<string> | undefined;
recentlySeenUrls?: ReadonlyArray<string> | undefined;
recentEntries: ReadonlyArray<BrowserHistoryEntry>;
onRemoveRecent: (url: string) => void;
onOpenUrl: (url: string) => void;
Expand All@@ -20,15 +19,13 @@ interface Props {
export function PreviewEmptyState({
environmentId,
configuredUrls,
recentlySeenUrls,
recentEntries,
onRemoveRecent,
onOpenUrl,
}: Props) {
const servers = useDiscoveredLocalServers({
environmentId,
configuredUrls,
recentlySeenUrls,
});
const recents = recentEntries.filter((entry) => URL.canParse(entry.url)).slice(0, 8);

Expand All@@ -40,7 +37,7 @@ export function PreviewEmptyState({
</EmptyMedia>
<EmptyTitle>No preview yet</EmptyTitle>
<EmptyDescription>
Type a URL above, or run a dev script. Listening localhost ports will show up here
Type a URL above, or run a dev script. Browser-ready localhost servers will show up here
automatically.
</EmptyDescription>
</Empty>
Expand All@@ -49,7 +46,7 @@ export function PreviewEmptyState({

return (
<div className="flex h-full min-h-0 overflow-y-auto px-5 py-8">
<div className="m-auto flex w-full max-w-xl flex-col gap-6">
<div className="mx-auto flex w-full max-w-xl flex-col gap-6">
{recents.length > 0 ? (
<div className="flex flex-col gap-3">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
Expand DownExpand Up@@ -84,7 +81,7 @@ export function PreviewEmptyState({
))}
</div>
<p className="px-1 text-xs text-muted-foreground">
Select a listening port to open it in this browser tab.
Select a live local server to open it in this browser tab.
</p>
</div>
) : null}
Expand Down
23 changes: 1 addition & 22 deletions apps/web/src/components/preview/PreviewLocalServerCard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,32 +21,11 @@ export function PreviewLocalServerCard({ server, onOpen }: Props) {
{server.host}:{server.port}
</span>
</div>
{server.listening ? <PulsingDot /> : <DimDot />}
</button>
);
}

function describeServer(server: PreviewableServer): string {
if (server.processName) return server.processName;
if (server.listening) return "Listening";
if (server.source === "configured") return "Configured";
return "Recently seen";
}

function PulsingDot() {
return (
<span aria-label="Listening" className="relative inline-flex size-2 shrink-0">
<span className="absolute inset-0 animate-status-ping rounded-full bg-success opacity-60" />
<span className="relative inline-flex size-2 rounded-full bg-success" />
</span>
);
}

function DimDot() {
return (
<span
aria-label="Not currently listening"
className="size-2 shrink-0 rounded-full bg-muted-foreground/40"
/>
);
return "Listening";
}
1 change: 0 additions & 1 deletion apps/web/src/components/preview/PreviewView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -712,7 +712,6 @@ export function PreviewView({
<PreviewEmptyState
environmentId={threadRef.environmentId}
configuredUrls={configuredUrls}
recentlySeenUrls={previewState.recentlySeenUrls}
recentEntries={recentHistoryEntries}
onRemoveRecent={(url) => removeUrlForThread(threadRef, url)}
onOpenUrl={(next) => void handleOpenServerUrl(next)}
Expand Down
113 changes: 60 additions & 53 deletions apps/web/src/components/preview/useDiscoveredLocalServers.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { DiscoveredLocalServer } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { mergeServers, type PreviewableServer } from "./useDiscoveredLocalServers";
import { mergeServers } from "./useDiscoveredLocalServers";

const scannerServer = (
overrides: Partial<DiscoveredLocalServer & { requestedUrl: string }>,
Expand All@@ -21,15 +21,13 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: [],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
host: "localhost",
port: 5173,
requestedUrl: "http://localhost:5173",
source: "scanner",
listening: true,
processName: "vite",
});
});
Expand All@@ -38,102 +36,111 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173, processName: "node", pid: 9999 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
port: 5173,
source: "configured",
listening: true,
processName: "node",
pid: 9999,
});
});

it("keeps configured entries that the scanner doesn't see, with listening=false", () => {
it("excludes configured entries that the live scanner doesn't see", () => {
const result = mergeServers({
scanner: [],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
source: "configured",
listening: false,
requestedUrl: "http://localhost:5173/",
});
});

it("dedupes recently-seen URLs against scanner+configured entries", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173 })],
configuredUrls: [],
recentlySeenUrls: ["http://localhost:5173/", "http://localhost:8080/"],
});
expect(result.map((s) => s.port)).toEqual([5173, 8080]);
expect(result.find((s) => s.port === 5173)?.source).toBe("scanner");
expect(result.find((s) => s.port === 8080)?.source).toBe("recent");
expect(result.find((s) => s.port === 8080)?.requestedUrl).toBe("http://localhost:8080/");
expect(result).toHaveLength(0);
});

it("ignores non-loopback URLs in configured/recent inputs", () => {
it("ignores non-loopback configured URLs", () => {
const result = mergeServers({
scanner: [],
scanner: [scannerServer({})],
configuredUrls: ["https://example.com", "ws://localhost:5173"],
recentlySeenUrls: ["https://api.example.com"],
});
expect(result).toHaveLength(0);
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("scanner");
});

it("sorts: configured before scanner before recent, then by port", () => {
it("sorts configured live servers before scanner-only servers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 8080 }), scannerServer({ port: 3000 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: ["http://localhost:9000/", "http://localhost:4321/"],
configuredUrls: ["http://localhost:8080"],
});
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual([
"configured:5173",
"scanner:3000",
"scanner:8080",
"recent:4321",
"recent:9000",
]);
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual(["configured:8080", "scanner:3000"]);
});

it("dedupes by lowercased host", () => {
const result = mergeServers({
scanner: [scannerServer({ host: "Localhost", port: 5173 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
});

it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
it.each(["127.0.0.1", "0.0.0.0", "[::1]"])(
"matches configured loopback alias %s to a live localhost server",
(host) => {
const result = mergeServers({
scanner: [
scannerServer({ requestedUrl: `http://localhost:5173/dashboard?mode=test#results` }),
],
configuredUrls: [`http://${host}:5173/dashboard?mode=test#results`],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
},
);

it("keeps the scanner-verified path and protocol", () => {
const result = mergeServers({
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
requestedUrl: "http://localhost:5173/dashboard?mode=test#results",
}),
],
configuredUrls: [],
recentlySeenUrls: [],
configuredUrls: ["https://localhost:5173/dashboard?mode=test#results"],
});
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
});

it("overlays a configured path when an older server does not advertise path probing", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["https://localhost:5173/docs?mode=test#results"],
configuredUrlProbing: false,
});

expect(result[0]?.requestedUrl).toBe("https://localhost:5173/docs?mode=test#results");
});

it("does not overlay an unverified configured path when the server probes paths", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["http://localhost:5173/docs"],
configuredUrlProbing: true,
});

expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});

describe("PreviewableServer interface", () => {
it("preserves listening flag through enrichment", () => {
it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
}),
],
configuredUrls: [],
});
const merged: PreviewableServer | undefined = result[0];
expect(merged?.listening).toBe(true);
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
557 changes: 532 additions & 25 deletions apps/server/src/preview/PortScanner.test.ts

Large diffs are not rendered by default.

336 changes: 305 additions & 31 deletions apps/server/src/preview/PortScanner.ts

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions apps/server/src/ws.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2115,23 +2115,31 @@ const makeWsRpcLayer = (
observeRpcStream(WS_METHODS.subscribePreviewEvents, previewManager.events, {
"rpc.aggregate": "preview",
}),
[WS_METHODS.subscribeDiscoveredLocalServers]: (_input) =>
[WS_METHODS.subscribeDiscoveredLocalServers]: (input) =>
observeRpcStream(
WS_METHODS.subscribeDiscoveredLocalServers,
Stream.callback<DiscoveredLocalServerList>((queue) =>
Effect.gen(function* () {
const configuredUrls = input.configuredUrls ?? [];
yield* portDiscovery.retain;
const initial = yield* portDiscovery.scan();
const initial = yield* portDiscovery.scan(configuredUrls);
const initialScannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers: initial,
scannedAt: initialScannedAt,
configuredUrlProbing: true,
});
yield* portDiscovery.subscribe((servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, { servers, scannedAt });
}),
yield* portDiscovery.subscribe(
{ configuredUrls, initialSnapshot: initial },
(servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers,
scannedAt,
configuredUrlProbing: true,
});
}),
);
}),
),
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/preview/PreviewEmptyState.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
pid: number | null;
terminal: null;
source: "scanner";
listening: boolean;
}>,
}));

Expand All@@ -34,7 +33,6 @@ function server(port: number) {
pid: 1,
terminal: null,
source: "scanner" as const,
listening: true,
};
}

Expand Down
9 changes: 3 additions & 6 deletions apps/web/src/components/preview/PreviewEmptyState.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { useDiscoveredLocalServers } from "./useDiscoveredLocalServers";
interface Props {
environmentId: EnvironmentId;
configuredUrls?: ReadonlyArray<string> | undefined;
recentlySeenUrls?: ReadonlyArray<string> | undefined;
recentEntries: ReadonlyArray<BrowserHistoryEntry>;
onRemoveRecent: (url: string) => void;
onOpenUrl: (url: string) => void;
Expand All@@ -20,15 +19,13 @@ interface Props {
export function PreviewEmptyState({
environmentId,
configuredUrls,
recentlySeenUrls,
recentEntries,
onRemoveRecent,
onOpenUrl,
}: Props) {
const servers = useDiscoveredLocalServers({
environmentId,
configuredUrls,
recentlySeenUrls,
});
const recents = recentEntries.filter((entry) => URL.canParse(entry.url)).slice(0, 8);

Expand All@@ -40,7 +37,7 @@ export function PreviewEmptyState({
</EmptyMedia>
<EmptyTitle>No preview yet</EmptyTitle>
<EmptyDescription>
Type a URL above, or run a dev script. Listening localhost ports will show up here
Type a URL above, or run a dev script. Browser-ready localhost servers will show up here
automatically.
</EmptyDescription>
</Empty>
Expand All@@ -49,7 +46,7 @@ export function PreviewEmptyState({

return (
<div className="flex h-full min-h-0 overflow-y-auto px-5 py-8">
<div className="m-auto flex w-full max-w-xl flex-col gap-6">
<div className="mx-auto flex w-full max-w-xl flex-col gap-6">
{recents.length > 0 ? (
<div className="flex flex-col gap-3">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
Expand DownExpand Up@@ -84,7 +81,7 @@ export function PreviewEmptyState({
))}
</div>
<p className="px-1 text-xs text-muted-foreground">
Select a listening port to open it in this browser tab.
Select a live local server to open it in this browser tab.
</p>
</div>
) : null}
Expand Down
23 changes: 1 addition & 22 deletions apps/web/src/components/preview/PreviewLocalServerCard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,32 +21,11 @@ export function PreviewLocalServerCard({ server, onOpen }: Props) {
{server.host}:{server.port}
</span>
</div>
{server.listening ? <PulsingDot /> : <DimDot />}
</button>
);
}

function describeServer(server: PreviewableServer): string {
if (server.processName) return server.processName;
if (server.listening) return "Listening";
if (server.source === "configured") return "Configured";
return "Recently seen";
}

function PulsingDot() {
return (
<span aria-label="Listening" className="relative inline-flex size-2 shrink-0">
<span className="absolute inset-0 animate-status-ping rounded-full bg-success opacity-60" />
<span className="relative inline-flex size-2 rounded-full bg-success" />
</span>
);
}

function DimDot() {
return (
<span
aria-label="Not currently listening"
className="size-2 shrink-0 rounded-full bg-muted-foreground/40"
/>
);
return "Listening";
}
1 change: 0 additions & 1 deletion apps/web/src/components/preview/PreviewView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -712,7 +712,6 @@ export function PreviewView({
<PreviewEmptyState
environmentId={threadRef.environmentId}
configuredUrls={configuredUrls}
recentlySeenUrls={previewState.recentlySeenUrls}
recentEntries={recentHistoryEntries}
onRemoveRecent={(url) => removeUrlForThread(threadRef, url)}
onOpenUrl={(next) => void handleOpenServerUrl(next)}
Expand Down
113 changes: 60 additions & 53 deletions apps/web/src/components/preview/useDiscoveredLocalServers.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { DiscoveredLocalServer } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { mergeServers, type PreviewableServer } from "./useDiscoveredLocalServers";
import { mergeServers } from "./useDiscoveredLocalServers";

const scannerServer = (
overrides: Partial<DiscoveredLocalServer & { requestedUrl: string }>,
Expand All@@ -21,15 +21,13 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: [],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
host: "localhost",
port: 5173,
requestedUrl: "http://localhost:5173",
source: "scanner",
listening: true,
processName: "vite",
});
});
Expand All@@ -38,102 +36,111 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173, processName: "node", pid: 9999 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
port: 5173,
source: "configured",
listening: true,
processName: "node",
pid: 9999,
});
});

it("keeps configured entries that the scanner doesn't see, with listening=false", () => {
it("excludes configured entries that the live scanner doesn't see", () => {
const result = mergeServers({
scanner: [],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
source: "configured",
listening: false,
requestedUrl: "http://localhost:5173/",
});
});

it("dedupes recently-seen URLs against scanner+configured entries", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173 })],
configuredUrls: [],
recentlySeenUrls: ["http://localhost:5173/", "http://localhost:8080/"],
});
expect(result.map((s) => s.port)).toEqual([5173, 8080]);
expect(result.find((s) => s.port === 5173)?.source).toBe("scanner");
expect(result.find((s) => s.port === 8080)?.source).toBe("recent");
expect(result.find((s) => s.port === 8080)?.requestedUrl).toBe("http://localhost:8080/");
expect(result).toHaveLength(0);
});

it("ignores non-loopback URLs in configured/recent inputs", () => {
it("ignores non-loopback configured URLs", () => {
const result = mergeServers({
scanner: [],
scanner: [scannerServer({})],
configuredUrls: ["https://example.com", "ws://localhost:5173"],
recentlySeenUrls: ["https://api.example.com"],
});
expect(result).toHaveLength(0);
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("scanner");
});

it("sorts: configured before scanner before recent, then by port", () => {
it("sorts configured live servers before scanner-only servers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 8080 }), scannerServer({ port: 3000 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: ["http://localhost:9000/", "http://localhost:4321/"],
configuredUrls: ["http://localhost:8080"],
});
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual([
"configured:5173",
"scanner:3000",
"scanner:8080",
"recent:4321",
"recent:9000",
]);
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual(["configured:8080", "scanner:3000"]);
});

it("dedupes by lowercased host", () => {
const result = mergeServers({
scanner: [scannerServer({ host: "Localhost", port: 5173 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
});

it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
it.each(["127.0.0.1", "0.0.0.0", "[::1]"])(
"matches configured loopback alias %s to a live localhost server",
(host) => {
const result = mergeServers({
scanner: [
scannerServer({ requestedUrl: `http://localhost:5173/dashboard?mode=test#results` }),
],
configuredUrls: [`http://${host}:5173/dashboard?mode=test#results`],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
},
);

it("keeps the scanner-verified path and protocol", () => {
const result = mergeServers({
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
requestedUrl: "http://localhost:5173/dashboard?mode=test#results",
}),
],
configuredUrls: [],
recentlySeenUrls: [],
configuredUrls: ["https://localhost:5173/dashboard?mode=test#results"],
});
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
});

it("overlays a configured path when an older server does not advertise path probing", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["https://localhost:5173/docs?mode=test#results"],
configuredUrlProbing: false,
});

expect(result[0]?.requestedUrl).toBe("https://localhost:5173/docs?mode=test#results");
});

it("does not overlay an unverified configured path when the server probes paths", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["http://localhost:5173/docs"],
configuredUrlProbing: true,
});

expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});

describe("PreviewableServer interface", () => {
it("preserves listening flag through enrichment", () => {
it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
}),
],
configuredUrls: [],
});
const merged: PreviewableServer | undefined = result[0];
expect(merged?.listening).toBe(true);
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
557 changes: 532 additions & 25 deletions apps/server/src/preview/PortScanner.test.ts

Large diffs are not rendered by default.

336 changes: 305 additions & 31 deletions apps/server/src/preview/PortScanner.ts

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions apps/server/src/ws.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2115,23 +2115,31 @@ const makeWsRpcLayer = (
observeRpcStream(WS_METHODS.subscribePreviewEvents, previewManager.events, {
"rpc.aggregate": "preview",
}),
[WS_METHODS.subscribeDiscoveredLocalServers]: (_input) =>
[WS_METHODS.subscribeDiscoveredLocalServers]: (input) =>
observeRpcStream(
WS_METHODS.subscribeDiscoveredLocalServers,
Stream.callback<DiscoveredLocalServerList>((queue) =>
Effect.gen(function* () {
const configuredUrls = input.configuredUrls ?? [];
yield* portDiscovery.retain;
const initial = yield* portDiscovery.scan();
const initial = yield* portDiscovery.scan(configuredUrls);
const initialScannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers: initial,
scannedAt: initialScannedAt,
configuredUrlProbing: true,
});
yield* portDiscovery.subscribe((servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, { servers, scannedAt });
}),
yield* portDiscovery.subscribe(
{ configuredUrls, initialSnapshot: initial },
(servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers,
scannedAt,
configuredUrlProbing: true,
});
}),
);
}),
),
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/preview/PreviewEmptyState.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
pid: number | null;
terminal: null;
source: "scanner";
listening: boolean;
}>,
}));

Expand All@@ -34,7 +33,6 @@ function server(port: number) {
pid: 1,
terminal: null,
source: "scanner" as const,
listening: true,
};
}

Expand Down
9 changes: 3 additions & 6 deletions apps/web/src/components/preview/PreviewEmptyState.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { useDiscoveredLocalServers } from "./useDiscoveredLocalServers";
interface Props {
environmentId: EnvironmentId;
configuredUrls?: ReadonlyArray<string> | undefined;
recentlySeenUrls?: ReadonlyArray<string> | undefined;
recentEntries: ReadonlyArray<BrowserHistoryEntry>;
onRemoveRecent: (url: string) => void;
onOpenUrl: (url: string) => void;
Expand All@@ -20,15 +19,13 @@ interface Props {
export function PreviewEmptyState({
environmentId,
configuredUrls,
recentlySeenUrls,
recentEntries,
onRemoveRecent,
onOpenUrl,
}: Props) {
const servers = useDiscoveredLocalServers({
environmentId,
configuredUrls,
recentlySeenUrls,
});
const recents = recentEntries.filter((entry) => URL.canParse(entry.url)).slice(0, 8);

Expand All@@ -40,7 +37,7 @@ export function PreviewEmptyState({
</EmptyMedia>
<EmptyTitle>No preview yet</EmptyTitle>
<EmptyDescription>
Type a URL above, or run a dev script. Listening localhost ports will show up here
Type a URL above, or run a dev script. Browser-ready localhost servers will show up here
automatically.
</EmptyDescription>
</Empty>
Expand All@@ -49,7 +46,7 @@ export function PreviewEmptyState({

return (
<div className="flex h-full min-h-0 overflow-y-auto px-5 py-8">
<div className="m-auto flex w-full max-w-xl flex-col gap-6">
<div className="mx-auto flex w-full max-w-xl flex-col gap-6">
{recents.length > 0 ? (
<div className="flex flex-col gap-3">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
Expand DownExpand Up@@ -84,7 +81,7 @@ export function PreviewEmptyState({
))}
</div>
<p className="px-1 text-xs text-muted-foreground">
Select a listening port to open it in this browser tab.
Select a live local server to open it in this browser tab.
</p>
</div>
) : null}
Expand Down
23 changes: 1 addition & 22 deletions apps/web/src/components/preview/PreviewLocalServerCard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,32 +21,11 @@ export function PreviewLocalServerCard({ server, onOpen }: Props) {
{server.host}:{server.port}
</span>
</div>
{server.listening ? <PulsingDot /> : <DimDot />}
</button>
);
}

function describeServer(server: PreviewableServer): string {
if (server.processName) return server.processName;
if (server.listening) return "Listening";
if (server.source === "configured") return "Configured";
return "Recently seen";
}

function PulsingDot() {
return (
<span aria-label="Listening" className="relative inline-flex size-2 shrink-0">
<span className="absolute inset-0 animate-status-ping rounded-full bg-success opacity-60" />
<span className="relative inline-flex size-2 rounded-full bg-success" />
</span>
);
}

function DimDot() {
return (
<span
aria-label="Not currently listening"
className="size-2 shrink-0 rounded-full bg-muted-foreground/40"
/>
);
return "Listening";
}
1 change: 0 additions & 1 deletion apps/web/src/components/preview/PreviewView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -712,7 +712,6 @@ export function PreviewView({
<PreviewEmptyState
environmentId={threadRef.environmentId}
configuredUrls={configuredUrls}
recentlySeenUrls={previewState.recentlySeenUrls}
recentEntries={recentHistoryEntries}
onRemoveRecent={(url) => removeUrlForThread(threadRef, url)}
onOpenUrl={(next) => void handleOpenServerUrl(next)}
Expand Down
113 changes: 60 additions & 53 deletions apps/web/src/components/preview/useDiscoveredLocalServers.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { DiscoveredLocalServer } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { mergeServers, type PreviewableServer } from "./useDiscoveredLocalServers";
import { mergeServers } from "./useDiscoveredLocalServers";

const scannerServer = (
overrides: Partial<DiscoveredLocalServer & { requestedUrl: string }>,
Expand All@@ -21,15 +21,13 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: [],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
host: "localhost",
port: 5173,
requestedUrl: "http://localhost:5173",
source: "scanner",
listening: true,
processName: "vite",
});
});
Expand All@@ -38,102 +36,111 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173, processName: "node", pid: 9999 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
port: 5173,
source: "configured",
listening: true,
processName: "node",
pid: 9999,
});
});

it("keeps configured entries that the scanner doesn't see, with listening=false", () => {
it("excludes configured entries that the live scanner doesn't see", () => {
const result = mergeServers({
scanner: [],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
source: "configured",
listening: false,
requestedUrl: "http://localhost:5173/",
});
});

it("dedupes recently-seen URLs against scanner+configured entries", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173 })],
configuredUrls: [],
recentlySeenUrls: ["http://localhost:5173/", "http://localhost:8080/"],
});
expect(result.map((s) => s.port)).toEqual([5173, 8080]);
expect(result.find((s) => s.port === 5173)?.source).toBe("scanner");
expect(result.find((s) => s.port === 8080)?.source).toBe("recent");
expect(result.find((s) => s.port === 8080)?.requestedUrl).toBe("http://localhost:8080/");
expect(result).toHaveLength(0);
});

it("ignores non-loopback URLs in configured/recent inputs", () => {
it("ignores non-loopback configured URLs", () => {
const result = mergeServers({
scanner: [],
scanner: [scannerServer({})],
configuredUrls: ["https://example.com", "ws://localhost:5173"],
recentlySeenUrls: ["https://api.example.com"],
});
expect(result).toHaveLength(0);
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("scanner");
});

it("sorts: configured before scanner before recent, then by port", () => {
it("sorts configured live servers before scanner-only servers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 8080 }), scannerServer({ port: 3000 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: ["http://localhost:9000/", "http://localhost:4321/"],
configuredUrls: ["http://localhost:8080"],
});
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual([
"configured:5173",
"scanner:3000",
"scanner:8080",
"recent:4321",
"recent:9000",
]);
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual(["configured:8080", "scanner:3000"]);
});

it("dedupes by lowercased host", () => {
const result = mergeServers({
scanner: [scannerServer({ host: "Localhost", port: 5173 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
});

it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
it.each(["127.0.0.1", "0.0.0.0", "[::1]"])(
"matches configured loopback alias %s to a live localhost server",
(host) => {
const result = mergeServers({
scanner: [
scannerServer({ requestedUrl: `http://localhost:5173/dashboard?mode=test#results` }),
],
configuredUrls: [`http://${host}:5173/dashboard?mode=test#results`],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
},
);

it("keeps the scanner-verified path and protocol", () => {
const result = mergeServers({
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
requestedUrl: "http://localhost:5173/dashboard?mode=test#results",
}),
],
configuredUrls: [],
recentlySeenUrls: [],
configuredUrls: ["https://localhost:5173/dashboard?mode=test#results"],
});
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
});

it("overlays a configured path when an older server does not advertise path probing", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["https://localhost:5173/docs?mode=test#results"],
configuredUrlProbing: false,
});

expect(result[0]?.requestedUrl).toBe("https://localhost:5173/docs?mode=test#results");
});

it("does not overlay an unverified configured path when the server probes paths", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["http://localhost:5173/docs"],
configuredUrlProbing: true,
});

expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});

describe("PreviewableServer interface", () => {
it("preserves listening flag through enrichment", () => {
it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
}),
],
configuredUrls: [],
});
const merged: PreviewableServer | undefined = result[0];
expect(merged?.listening).toBe(true);
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
557 changes: 532 additions & 25 deletions apps/server/src/preview/PortScanner.test.ts

Large diffs are not rendered by default.

336 changes: 305 additions & 31 deletions apps/server/src/preview/PortScanner.ts

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions apps/server/src/ws.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2115,23 +2115,31 @@ const makeWsRpcLayer = (
observeRpcStream(WS_METHODS.subscribePreviewEvents, previewManager.events, {
"rpc.aggregate": "preview",
}),
[WS_METHODS.subscribeDiscoveredLocalServers]: (_input) =>
[WS_METHODS.subscribeDiscoveredLocalServers]: (input) =>
observeRpcStream(
WS_METHODS.subscribeDiscoveredLocalServers,
Stream.callback<DiscoveredLocalServerList>((queue) =>
Effect.gen(function* () {
const configuredUrls = input.configuredUrls ?? [];
yield* portDiscovery.retain;
const initial = yield* portDiscovery.scan();
const initial = yield* portDiscovery.scan(configuredUrls);
const initialScannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers: initial,
scannedAt: initialScannedAt,
configuredUrlProbing: true,
});
yield* portDiscovery.subscribe((servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, { servers, scannedAt });
}),
yield* portDiscovery.subscribe(
{ configuredUrls, initialSnapshot: initial },
(servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers,
scannedAt,
configuredUrlProbing: true,
});
}),
);
}),
),
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/preview/PreviewEmptyState.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
pid: number | null;
terminal: null;
source: "scanner";
listening: boolean;
}>,
}));

Expand All@@ -34,7 +33,6 @@ function server(port: number) {
pid: 1,
terminal: null,
source: "scanner" as const,
listening: true,
};
}

Expand Down
9 changes: 3 additions & 6 deletions apps/web/src/components/preview/PreviewEmptyState.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { useDiscoveredLocalServers } from "./useDiscoveredLocalServers";
interface Props {
environmentId: EnvironmentId;
configuredUrls?: ReadonlyArray<string> | undefined;
recentlySeenUrls?: ReadonlyArray<string> | undefined;
recentEntries: ReadonlyArray<BrowserHistoryEntry>;
onRemoveRecent: (url: string) => void;
onOpenUrl: (url: string) => void;
Expand All@@ -20,15 +19,13 @@ interface Props {
export function PreviewEmptyState({
environmentId,
configuredUrls,
recentlySeenUrls,
recentEntries,
onRemoveRecent,
onOpenUrl,
}: Props) {
const servers = useDiscoveredLocalServers({
environmentId,
configuredUrls,
recentlySeenUrls,
});
const recents = recentEntries.filter((entry) => URL.canParse(entry.url)).slice(0, 8);

Expand All@@ -40,7 +37,7 @@ export function PreviewEmptyState({
</EmptyMedia>
<EmptyTitle>No preview yet</EmptyTitle>
<EmptyDescription>
Type a URL above, or run a dev script. Listening localhost ports will show up here
Type a URL above, or run a dev script. Browser-ready localhost servers will show up here
automatically.
</EmptyDescription>
</Empty>
Expand All@@ -49,7 +46,7 @@ export function PreviewEmptyState({

return (
<div className="flex h-full min-h-0 overflow-y-auto px-5 py-8">
<div className="m-auto flex w-full max-w-xl flex-col gap-6">
<div className="mx-auto flex w-full max-w-xl flex-col gap-6">
{recents.length > 0 ? (
<div className="flex flex-col gap-3">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
Expand DownExpand Up@@ -84,7 +81,7 @@ export function PreviewEmptyState({
))}
</div>
<p className="px-1 text-xs text-muted-foreground">
Select a listening port to open it in this browser tab.
Select a live local server to open it in this browser tab.
</p>
</div>
) : null}
Expand Down
23 changes: 1 addition & 22 deletions apps/web/src/components/preview/PreviewLocalServerCard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,32 +21,11 @@ export function PreviewLocalServerCard({ server, onOpen }: Props) {
{server.host}:{server.port}
</span>
</div>
{server.listening ? <PulsingDot /> : <DimDot />}
</button>
);
}

function describeServer(server: PreviewableServer): string {
if (server.processName) return server.processName;
if (server.listening) return "Listening";
if (server.source === "configured") return "Configured";
return "Recently seen";
}

function PulsingDot() {
return (
<span aria-label="Listening" className="relative inline-flex size-2 shrink-0">
<span className="absolute inset-0 animate-status-ping rounded-full bg-success opacity-60" />
<span className="relative inline-flex size-2 rounded-full bg-success" />
</span>
);
}

function DimDot() {
return (
<span
aria-label="Not currently listening"
className="size-2 shrink-0 rounded-full bg-muted-foreground/40"
/>
);
return "Listening";
}
1 change: 0 additions & 1 deletion apps/web/src/components/preview/PreviewView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -712,7 +712,6 @@ export function PreviewView({
<PreviewEmptyState
environmentId={threadRef.environmentId}
configuredUrls={configuredUrls}
recentlySeenUrls={previewState.recentlySeenUrls}
recentEntries={recentHistoryEntries}
onRemoveRecent={(url) => removeUrlForThread(threadRef, url)}
onOpenUrl={(next) => void handleOpenServerUrl(next)}
Expand Down
113 changes: 60 additions & 53 deletions apps/web/src/components/preview/useDiscoveredLocalServers.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { DiscoveredLocalServer } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { mergeServers, type PreviewableServer } from "./useDiscoveredLocalServers";
import { mergeServers } from "./useDiscoveredLocalServers";

const scannerServer = (
overrides: Partial<DiscoveredLocalServer & { requestedUrl: string }>,
Expand All@@ -21,15 +21,13 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: [],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
host: "localhost",
port: 5173,
requestedUrl: "http://localhost:5173",
source: "scanner",
listening: true,
processName: "vite",
});
});
Expand All@@ -38,102 +36,111 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173, processName: "node", pid: 9999 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
port: 5173,
source: "configured",
listening: true,
processName: "node",
pid: 9999,
});
});

it("keeps configured entries that the scanner doesn't see, with listening=false", () => {
it("excludes configured entries that the live scanner doesn't see", () => {
const result = mergeServers({
scanner: [],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
source: "configured",
listening: false,
requestedUrl: "http://localhost:5173/",
});
});

it("dedupes recently-seen URLs against scanner+configured entries", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173 })],
configuredUrls: [],
recentlySeenUrls: ["http://localhost:5173/", "http://localhost:8080/"],
});
expect(result.map((s) => s.port)).toEqual([5173, 8080]);
expect(result.find((s) => s.port === 5173)?.source).toBe("scanner");
expect(result.find((s) => s.port === 8080)?.source).toBe("recent");
expect(result.find((s) => s.port === 8080)?.requestedUrl).toBe("http://localhost:8080/");
expect(result).toHaveLength(0);
});

it("ignores non-loopback URLs in configured/recent inputs", () => {
it("ignores non-loopback configured URLs", () => {
const result = mergeServers({
scanner: [],
scanner: [scannerServer({})],
configuredUrls: ["https://example.com", "ws://localhost:5173"],
recentlySeenUrls: ["https://api.example.com"],
});
expect(result).toHaveLength(0);
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("scanner");
});

it("sorts: configured before scanner before recent, then by port", () => {
it("sorts configured live servers before scanner-only servers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 8080 }), scannerServer({ port: 3000 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: ["http://localhost:9000/", "http://localhost:4321/"],
configuredUrls: ["http://localhost:8080"],
});
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual([
"configured:5173",
"scanner:3000",
"scanner:8080",
"recent:4321",
"recent:9000",
]);
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual(["configured:8080", "scanner:3000"]);
});

it("dedupes by lowercased host", () => {
const result = mergeServers({
scanner: [scannerServer({ host: "Localhost", port: 5173 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
});

it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
it.each(["127.0.0.1", "0.0.0.0", "[::1]"])(
"matches configured loopback alias %s to a live localhost server",
(host) => {
const result = mergeServers({
scanner: [
scannerServer({ requestedUrl: `http://localhost:5173/dashboard?mode=test#results` }),
],
configuredUrls: [`http://${host}:5173/dashboard?mode=test#results`],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
},
);

it("keeps the scanner-verified path and protocol", () => {
const result = mergeServers({
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
requestedUrl: "http://localhost:5173/dashboard?mode=test#results",
}),
],
configuredUrls: [],
recentlySeenUrls: [],
configuredUrls: ["https://localhost:5173/dashboard?mode=test#results"],
});
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
});

it("overlays a configured path when an older server does not advertise path probing", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["https://localhost:5173/docs?mode=test#results"],
configuredUrlProbing: false,
});

expect(result[0]?.requestedUrl).toBe("https://localhost:5173/docs?mode=test#results");
});

it("does not overlay an unverified configured path when the server probes paths", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["http://localhost:5173/docs"],
configuredUrlProbing: true,
});

expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});

describe("PreviewableServer interface", () => {
it("preserves listening flag through enrichment", () => {
it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
}),
],
configuredUrls: [],
});
const merged: PreviewableServer | undefined = result[0];
expect(merged?.listening).toBe(true);
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
557 changes: 532 additions & 25 deletions apps/server/src/preview/PortScanner.test.ts

Large diffs are not rendered by default.

336 changes: 305 additions & 31 deletions apps/server/src/preview/PortScanner.ts

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions apps/server/src/ws.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2115,23 +2115,31 @@ const makeWsRpcLayer = (
observeRpcStream(WS_METHODS.subscribePreviewEvents, previewManager.events, {
"rpc.aggregate": "preview",
}),
[WS_METHODS.subscribeDiscoveredLocalServers]: (_input) =>
[WS_METHODS.subscribeDiscoveredLocalServers]: (input) =>
observeRpcStream(
WS_METHODS.subscribeDiscoveredLocalServers,
Stream.callback<DiscoveredLocalServerList>((queue) =>
Effect.gen(function* () {
const configuredUrls = input.configuredUrls ?? [];
yield* portDiscovery.retain;
const initial = yield* portDiscovery.scan();
const initial = yield* portDiscovery.scan(configuredUrls);
const initialScannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers: initial,
scannedAt: initialScannedAt,
configuredUrlProbing: true,
});
yield* portDiscovery.subscribe((servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, { servers, scannedAt });
}),
yield* portDiscovery.subscribe(
{ configuredUrls, initialSnapshot: initial },
(servers) =>
Effect.gen(function* () {
const scannedAt = DateTime.formatIso(yield* DateTime.now);
yield* Queue.offer(queue, {
servers,
scannedAt,
configuredUrlProbing: true,
});
}),
);
}),
),
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/preview/PreviewEmptyState.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
pid: number | null;
terminal: null;
source: "scanner";
listening: boolean;
}>,
}));

Expand All@@ -34,7 +33,6 @@ function server(port: number) {
pid: 1,
terminal: null,
source: "scanner" as const,
listening: true,
};
}

Expand Down
9 changes: 3 additions & 6 deletions apps/web/src/components/preview/PreviewEmptyState.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { useDiscoveredLocalServers } from "./useDiscoveredLocalServers";
interface Props {
environmentId: EnvironmentId;
configuredUrls?: ReadonlyArray<string> | undefined;
recentlySeenUrls?: ReadonlyArray<string> | undefined;
recentEntries: ReadonlyArray<BrowserHistoryEntry>;
onRemoveRecent: (url: string) => void;
onOpenUrl: (url: string) => void;
Expand All@@ -20,15 +19,13 @@ interface Props {
export function PreviewEmptyState({
environmentId,
configuredUrls,
recentlySeenUrls,
recentEntries,
onRemoveRecent,
onOpenUrl,
}: Props) {
const servers = useDiscoveredLocalServers({
environmentId,
configuredUrls,
recentlySeenUrls,
});
const recents = recentEntries.filter((entry) => URL.canParse(entry.url)).slice(0, 8);

Expand All@@ -40,7 +37,7 @@ export function PreviewEmptyState({
</EmptyMedia>
<EmptyTitle>No preview yet</EmptyTitle>
<EmptyDescription>
Type a URL above, or run a dev script. Listening localhost ports will show up here
Type a URL above, or run a dev script. Browser-ready localhost servers will show up here
automatically.
</EmptyDescription>
</Empty>
Expand All@@ -49,7 +46,7 @@ export function PreviewEmptyState({

return (
<div className="flex h-full min-h-0 overflow-y-auto px-5 py-8">
<div className="m-auto flex w-full max-w-xl flex-col gap-6">
<div className="mx-auto flex w-full max-w-xl flex-col gap-6">
{recents.length > 0 ? (
<div className="flex flex-col gap-3">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
Expand DownExpand Up@@ -84,7 +81,7 @@ export function PreviewEmptyState({
))}
</div>
<p className="px-1 text-xs text-muted-foreground">
Select a listening port to open it in this browser tab.
Select a live local server to open it in this browser tab.
</p>
</div>
) : null}
Expand Down
23 changes: 1 addition & 22 deletions apps/web/src/components/preview/PreviewLocalServerCard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,32 +21,11 @@ export function PreviewLocalServerCard({ server, onOpen }: Props) {
{server.host}:{server.port}
</span>
</div>
{server.listening ? <PulsingDot /> : <DimDot />}
</button>
);
}

function describeServer(server: PreviewableServer): string {
if (server.processName) return server.processName;
if (server.listening) return "Listening";
if (server.source === "configured") return "Configured";
return "Recently seen";
}

function PulsingDot() {
return (
<span aria-label="Listening" className="relative inline-flex size-2 shrink-0">
<span className="absolute inset-0 animate-status-ping rounded-full bg-success opacity-60" />
<span className="relative inline-flex size-2 rounded-full bg-success" />
</span>
);
}

function DimDot() {
return (
<span
aria-label="Not currently listening"
className="size-2 shrink-0 rounded-full bg-muted-foreground/40"
/>
);
return "Listening";
}
1 change: 0 additions & 1 deletion apps/web/src/components/preview/PreviewView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -712,7 +712,6 @@ export function PreviewView({
<PreviewEmptyState
environmentId={threadRef.environmentId}
configuredUrls={configuredUrls}
recentlySeenUrls={previewState.recentlySeenUrls}
recentEntries={recentHistoryEntries}
onRemoveRecent={(url) => removeUrlForThread(threadRef, url)}
onOpenUrl={(next) => void handleOpenServerUrl(next)}
Expand Down
113 changes: 60 additions & 53 deletions apps/web/src/components/preview/useDiscoveredLocalServers.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { DiscoveredLocalServer } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { mergeServers, type PreviewableServer } from "./useDiscoveredLocalServers";
import { mergeServers } from "./useDiscoveredLocalServers";

const scannerServer = (
overrides: Partial<DiscoveredLocalServer & { requestedUrl: string }>,
Expand All@@ -21,15 +21,13 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: [],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
host: "localhost",
port: 5173,
requestedUrl: "http://localhost:5173",
source: "scanner",
listening: true,
processName: "vite",
});
});
Expand All@@ -38,102 +36,111 @@ describe("mergeServers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173, processName: "node", pid: 9999 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
port: 5173,
source: "configured",
listening: true,
processName: "node",
pid: 9999,
});
});

it("keeps configured entries that the scanner doesn't see, with listening=false", () => {
it("excludes configured entries that the live scanner doesn't see", () => {
const result = mergeServers({
scanner: [],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
source: "configured",
listening: false,
requestedUrl: "http://localhost:5173/",
});
});

it("dedupes recently-seen URLs against scanner+configured entries", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 5173 })],
configuredUrls: [],
recentlySeenUrls: ["http://localhost:5173/", "http://localhost:8080/"],
});
expect(result.map((s) => s.port)).toEqual([5173, 8080]);
expect(result.find((s) => s.port === 5173)?.source).toBe("scanner");
expect(result.find((s) => s.port === 8080)?.source).toBe("recent");
expect(result.find((s) => s.port === 8080)?.requestedUrl).toBe("http://localhost:8080/");
expect(result).toHaveLength(0);
});

it("ignores non-loopback URLs in configured/recent inputs", () => {
it("ignores non-loopback configured URLs", () => {
const result = mergeServers({
scanner: [],
scanner: [scannerServer({})],
configuredUrls: ["https://example.com", "ws://localhost:5173"],
recentlySeenUrls: ["https://api.example.com"],
});
expect(result).toHaveLength(0);
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("scanner");
});

it("sorts: configured before scanner before recent, then by port", () => {
it("sorts configured live servers before scanner-only servers", () => {
const result = mergeServers({
scanner: [scannerServer({ port: 8080 }), scannerServer({ port: 3000 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: ["http://localhost:9000/", "http://localhost:4321/"],
configuredUrls: ["http://localhost:8080"],
});
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual([
"configured:5173",
"scanner:3000",
"scanner:8080",
"recent:4321",
"recent:9000",
]);
expect(result.map((s) => `${s.source}:${s.port}`)).toEqual(["configured:8080", "scanner:3000"]);
});

it("dedupes by lowercased host", () => {
const result = mergeServers({
scanner: [scannerServer({ host: "Localhost", port: 5173 })],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
});

it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
it.each(["127.0.0.1", "0.0.0.0", "[::1]"])(
"matches configured loopback alias %s to a live localhost server",
(host) => {
const result = mergeServers({
scanner: [
scannerServer({ requestedUrl: `http://localhost:5173/dashboard?mode=test#results` }),
],
configuredUrls: [`http://${host}:5173/dashboard?mode=test#results`],
});
expect(result).toHaveLength(1);
expect(result[0]?.source).toBe("configured");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
},
);

it("keeps the scanner-verified path and protocol", () => {
const result = mergeServers({
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
requestedUrl: "http://localhost:5173/dashboard?mode=test#results",
}),
],
configuredUrls: [],
recentlySeenUrls: [],
configuredUrls: ["https://localhost:5173/dashboard?mode=test#results"],
});
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/dashboard?mode=test#results");
});

it("overlays a configured path when an older server does not advertise path probing", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["https://localhost:5173/docs?mode=test#results"],
configuredUrlProbing: false,
});

expect(result[0]?.requestedUrl).toBe("https://localhost:5173/docs?mode=test#results");
});

it("does not overlay an unverified configured path when the server probes paths", () => {
const result = mergeServers({
scanner: [scannerServer({ requestedUrl: "http://localhost:5173/" })],
configuredUrls: ["http://localhost:5173/docs"],
configuredUrlProbing: true,
});

expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});

describe("PreviewableServer interface", () => {
it("preserves listening flag through enrichment", () => {
it("keeps a scanner entry's pre-resolution requestedUrl distinct from a resolved url", () => {
const result = mergeServers({
scanner: [scannerServer({})],
configuredUrls: ["http://localhost:5173"],
recentlySeenUrls: [],
scanner: [
scannerServer({
port: 5173,
url: "https://env-42.example.dev:5173/",
requestedUrl: "http://localhost:5173/",
}),
],
configuredUrls: [],
});
const merged: PreviewableServer | undefined = result[0];
expect(merged?.listening).toBe(true);
expect(result[0]?.url).toBe("https://env-42.example.dev:5173/");
expect(result[0]?.requestedUrl).toBe("http://localhost:5173/");
});
});
Loading
Loading