root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-2586): merge fusion/fn-2586

Browse Source
This commit is contained in:
gsxdsm
2026-04-26 11:49:43 -07:00
parent bf335dc1f5
commit b5200ba81b
23 changed files with 411 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/dashboard/app/api/legacy.ts
View File

@@ -410,6 +410,7 @@ export interface RemoteSettings {
remoteTailscaleTargetPort: number;
remoteTailscaleAcceptRoutes: boolean;
remoteCloudflareEnabled: boolean;
remoteCloudflareQuickTunnel: boolean;
remoteCloudflareTunnelName: string;
remoteCloudflareTunnelToken: string | null;
remoteCloudflareIngressUrl: string;

63
packages/dashboard/app/components/SettingsModal.tsx
View File

@@ -1262,6 +1262,7 @@ export function SettingsModal({
remoteTailscaleTargetPort: Number((form as Record<string, unknown>).remoteTailscaleTargetPort ?? 4040),
remoteTailscaleAcceptRoutes: Boolean((form as Record<string, unknown>).remoteTailscaleAcceptRoutes),
remoteCloudflareEnabled: Boolean((form as Record<string, unknown>).remoteCloudflareEnabled),
remoteCloudflareQuickTunnel: Boolean((form as Record<string, unknown>).remoteCloudflareQuickTunnel),
remoteCloudflareTunnelName: String((form as Record<string, unknown>).remoteCloudflareTunnelName ?? ""),
remoteCloudflareTunnelToken: (((form as Record<string, unknown>).remoteCloudflareTunnelToken as string | null) || null),
remoteCloudflareIngressUrl: String((form as Record<string, unknown>).remoteCloudflareIngressUrl ?? ""),
@@ -3501,30 +3502,44 @@ export function SettingsModal({
/>
Enable Cloudflare provider config
</label>
<label htmlFor="remoteCloudflareTunnelName">Tunnel name</label>
<input
id="remoteCloudflareTunnelName"
type="text"
placeholder="Tunnel name"
value={String(remoteForm.remoteCloudflareTunnelName ?? "")}
onChange={(e) => setForm((f) => ({ ...f, remoteCloudflareTunnelName: e.target.value } as SettingsFormState))}
/>
<label htmlFor="remoteCloudflareTunnelToken">Tunnel token</label>
<input
id="remoteCloudflareTunnelToken"
type="password"
placeholder="Tunnel token"
value={String(remoteForm.remoteCloudflareTunnelToken ?? "")}
onChange={(e) => setForm((f) => ({ ...f, remoteCloudflareTunnelToken: e.target.value } as SettingsFormState))}
/>
<label htmlFor="remoteCloudflareIngressUrl">Ingress URL</label>
<input
id="remoteCloudflareIngressUrl"
type="text"
placeholder="https://your-domain.example"
value={String(remoteForm.remoteCloudflareIngressUrl ?? "")}
onChange={(e) => setForm((f) => ({ ...f, remoteCloudflareIngressUrl: e.target.value } as SettingsFormState))}
/>
<label htmlFor="remoteCloudflareQuickTunnel" className="checkbox-label">
<input
id="remoteCloudflareQuickTunnel"
type="checkbox"
checked={Boolean(remoteForm.remoteCloudflareQuickTunnel)}
onChange={(e) => setForm((f) => ({ ...f, remoteCloudflareQuickTunnel: e.target.checked } as SettingsFormState))}
/>
Quick Tunnel
</label>
<small>Automatically creates a random trycloudflare.com URL — no account or token needed.</small>
{!remoteForm.remoteCloudflareQuickTunnel && (
<>
<label htmlFor="remoteCloudflareTunnelName">Tunnel name</label>
<input
id="remoteCloudflareTunnelName"
type="text"
placeholder="Tunnel name"
value={String(remoteForm.remoteCloudflareTunnelName ?? "")}
onChange={(e) => setForm((f) => ({ ...f, remoteCloudflareTunnelName: e.target.value } as SettingsFormState))}
/>
<label htmlFor="remoteCloudflareTunnelToken">Tunnel token</label>
<input
id="remoteCloudflareTunnelToken"
type="password"
placeholder="Tunnel token"
value={String(remoteForm.remoteCloudflareTunnelToken ?? "")}
onChange={(e) => setForm((f) => ({ ...f, remoteCloudflareTunnelToken: e.target.value } as SettingsFormState))}
/>
<label htmlFor="remoteCloudflareIngressUrl">Ingress URL</label>
<input
id="remoteCloudflareIngressUrl"
type="text"
placeholder="https://your-domain.example"
value={String(remoteForm.remoteCloudflareIngressUrl ?? "")}
onChange={(e) => setForm((f) => ({ ...f, remoteCloudflareIngressUrl: e.target.value } as SettingsFormState))}
/>
</>
)}
</div>
<div className="form-group">

30
packages/dashboard/app/components/__tests__/SettingsModal.test.tsx
View File

@@ -206,6 +206,7 @@ describe("SettingsModal", () => {
remoteTailscaleTargetPort: 4040,
remoteTailscaleAcceptRoutes: false,
remoteCloudflareEnabled: false,
remoteCloudflareQuickTunnel: false,
remoteCloudflareTunnelName: "",
remoteCloudflareTunnelToken: null,
remoteCloudflareIngressUrl: "",
@@ -226,6 +227,7 @@ describe("SettingsModal", () => {
remoteTailscaleTargetPort: 4040,
remoteTailscaleAcceptRoutes: false,
remoteCloudflareEnabled: false,
remoteCloudflareQuickTunnel: false,
remoteCloudflareTunnelName: "",
remoteCloudflareTunnelToken: null,
remoteCloudflareIngressUrl: "",
@@ -1394,6 +1396,7 @@ describe("SettingsModal", () => {
expect.objectContaining({
remoteTailscaleEnabled: true,
remoteCloudflareEnabled: true,
remoteCloudflareQuickTunnel: false,
remoteTailscaleHostname: "tail-new.ts.net",
remoteTailscaleTargetPort: 4242,
remoteCloudflareTunnelName: "cf-team",
@@ -1405,6 +1408,33 @@ describe("SettingsModal", () => {
);
});
it("toggles Cloudflare quick tunnel and hides manual cloudflare fields", async () => {
renderModal();
await waitForSettingsModalReady();
await openRemoteSection();
expect(screen.getByLabelText("Tunnel name")).toBeInTheDocument();
expect(screen.getByLabelText("Tunnel token")).toBeInTheDocument();
expect(screen.getByLabelText("Ingress URL")).toBeInTheDocument();
await userEvent.click(screen.getByLabelText("Quick Tunnel"));
expect(screen.queryByLabelText("Tunnel name")).not.toBeInTheDocument();
expect(screen.queryByLabelText("Tunnel token")).not.toBeInTheDocument();
expect(screen.queryByLabelText("Ingress URL")).not.toBeInTheDocument();
await userEvent.click(screen.getByRole("button", { name: "Save Remote Settings" }));
await waitFor(() => {
expect(mockUpdateRemoteSettings).toHaveBeenCalledWith(
expect.objectContaining({
remoteCloudflareQuickTunnel: true,
}),
undefined,
);
});
});
it("updates active provider selection and provider status affordance after activation", async () => {
mockFetchRemoteStatus
.mockResolvedValueOnce({ provider: null, state: "stopped", url: null, lastError: null })

1
packages/dashboard/src/__tests__/auth-middleware-integration.test.ts
View File

@@ -296,6 +296,7 @@ describe("Auth middleware integration with createServer", () => {
},
cloudflare: {
enabled: true,
quickTunnel: false,
tunnelName: "demo-tunnel",
tunnelToken: "cf-secret",
ingressUrl: "https://remote.example.com",

1
packages/dashboard/src/__tests__/remote-access-headless.test.ts
View File

@@ -85,6 +85,7 @@ describe("remote access headless parity", () => {
},
cloudflare: {
enabled: true,
quickTunnel: false,
tunnelName: "demo",
tunnelToken: "cf-secret-token",
ingressUrl: "https://demo.example.com",

1
packages/dashboard/src/__tests__/remote-access-routes.test.ts
View File

@@ -18,6 +18,7 @@ function buildRemoteAccessSettings(overrides: Record<string, unknown> = {}) {
},
cloudflare: {
enabled: true,
quickTunnel: false,
tunnelName: "demo-tunnel",
tunnelToken: "cf-secret-token",
ingressUrl: "https://remote.example.com",

1
packages/dashboard/src/__tests__/remote-auth.test.ts
View File

@@ -24,6 +24,7 @@ function createRemoteSettings(overrides: Partial<RemoteAccessProjectSettings> =
},
cloudflare: {
enabled: false,
quickTunnel: false,
tunnelName: "",
tunnelToken: null,
ingressUrl: "",

72
packages/dashboard/src/__tests__/routes-remote-access.test.ts
View File

@@ -18,6 +18,7 @@ function buildRemoteAccessSettings() {
},
cloudflare: {
enabled: true,
quickTunnel: false,
tunnelName: "demo-tunnel",
tunnelToken: "cf-secret-token",
ingressUrl: "https://remote.example.com",
@@ -98,12 +99,14 @@ describe("remote access API route contracts", () => {
settings: expect.objectContaining({
remoteEnabled: true,
remoteActiveProvider: "cloudflare",
remoteCloudflareQuickTunnel: false,
}),
});
const putRes = await REQUEST(app, "PUT", "/api/remote/settings", {
remoteEnabled: true,
remoteActiveProvider: "tailscale",
remoteCloudflareQuickTunnel: true,
remoteShortLivedEnabled: true,
remoteShortLivedTtlMs: 180000,
});
@@ -113,10 +116,19 @@ describe("remote access API route contracts", () => {
settings: expect.objectContaining({
remoteEnabled: true,
remoteActiveProvider: "tailscale",
remoteCloudflareQuickTunnel: true,
remoteShortLivedEnabled: true,
remoteShortLivedTtlMs: 180000,
}),
});
expect(store.updateSettings).toHaveBeenCalledWith(expect.objectContaining({
remoteAccess: expect.objectContaining({
providers: expect.objectContaining({
cloudflare: expect.objectContaining({ quickTunnel: true }),
}),
}),
}));
});
it("supports provider activation and tunnel lifecycle endpoints", async () => {
@@ -159,6 +171,66 @@ describe("remote access API route contracts", () => {
}));
});
it("uses live tunnel URL for cloudflare quick tunnel link generation", async () => {
const quickTunnelSettings = {
...buildRemoteAccessSettings(),
providers: {
...buildRemoteAccessSettings().providers,
cloudflare: {
...buildRemoteAccessSettings().providers.cloudflare,
quickTunnel: true,
ingressUrl: "",
tunnelToken: null,
tunnelName: "",
},
},
};
const store = createMockStore({
getSettings: vi.fn().mockResolvedValue({ remoteAccess: quickTunnelSettings }),
});
const engine = {
getRemoteTunnelManager: () => ({
getStatus: () => ({ url: "https://demo.trycloudflare.com" }),
}),
};
const { app } = createApp({ store, engine });
const urlRes = await REQUEST(app, "GET", "/api/remote/url?tokenType=persistent");
expect(urlRes.status).toBe(200);
expect(urlRes.body.url).toContain("https://demo.trycloudflare.com/remote-login?rt=");
});
it("returns 409 when quick tunnel URL is requested before cloudflared reports URL", async () => {
const quickTunnelSettings = {
...buildRemoteAccessSettings(),
providers: {
...buildRemoteAccessSettings().providers,
cloudflare: {
...buildRemoteAccessSettings().providers.cloudflare,
quickTunnel: true,
ingressUrl: "",
tunnelToken: null,
tunnelName: "",
},
},
};
const store = createMockStore({
getSettings: vi.fn().mockResolvedValue({ remoteAccess: quickTunnelSettings }),
});
const engine = {
getRemoteTunnelManager: () => ({
getStatus: () => ({ url: null }),
}),
};
const { app } = createApp({ store, engine });
const urlRes = await REQUEST(app, "GET", "/api/remote/url?tokenType=persistent");
expect(urlRes.status).toBe(409);
expect(urlRes.body.error).toContain("quick tunnel has not started yet");
});
it("supports persistent and short-lived token endpoints plus URL/QR contracts", async () => {
const { app } = createApp();

3
packages/dashboard/src/__tests__/routes.test.ts
View File

@@ -13207,6 +13207,7 @@ describe("PUT /settings", () => {
},
cloudflare: {
enabled: false,
quickTunnel: false,
tunnelName: "existing-tunnel",
tunnelToken: null,
ingressUrl: "",
@@ -13680,6 +13681,7 @@ describe("GET /settings/scopes", () => {
},
cloudflare: {
enabled: false,
quickTunnel: false,
tunnelName: "",
tunnelToken: null,
ingressUrl: "",
@@ -18031,6 +18033,7 @@ describe("remote access auth login-url endpoints", () => {
},
cloudflare: {
enabled: true,
quickTunnel: false,
tunnelName: "tunnel",
tunnelToken: "cf-secret",
ingressUrl: "https://remote.example.com",

3
packages/dashboard/src/__tests__/server.test.ts
View File

@@ -315,7 +315,7 @@ describe("createServer health and headless mode", () => {
activeProvider: "cloudflare",
providers: {
tailscale: { enabled: false, hostname: "", targetPort: 4040, acceptRoutes: false },
cloudflare: { enabled: true, tunnelName: "demo", tunnelToken: "cf-secret", ingressUrl: "https://remote.example.com" },
cloudflare: { enabled: true, quickTunnel: false, tunnelName: "demo", tunnelToken: "cf-secret", ingressUrl: "https://remote.example.com" },
},
tokenStrategy: {
persistent: { enabled: true, token: "frt_persistent_token" },
@@ -2206,6 +2206,7 @@ describe("GET /remote-login", () => {
},
cloudflare: {
enabled: true,
quickTunnel: false,
tunnelName: "tunnel",
tunnelToken: "secret",
ingressUrl: "https://remote.example.com",

47
packages/dashboard/src/routes/register-settings-memory-routes.ts
View File

@@ -50,20 +50,33 @@ export function registerSettingsMemoryRoutes(ctx: ApiRoutesContext, deps: Settin
const { router, options, store, runtimeLogger, getProjectContext, rethrowAsApiError } = ctx;
const { githubToken, validateModelPresets, sanitizeOverlapIgnorePaths, discoverDashboardPiExtensions } = deps;
function resolveRemoteBaseUrl(remoteAccess: NonNullable<Awaited<ReturnType<typeof store.getSettings>>["remoteAccess"]>): URL {
function resolveRemoteBaseUrl(
remoteAccess: NonNullable<Awaited<ReturnType<typeof store.getSettings>>["remoteAccess"]>,
tunnelUrl?: string | null,
): URL {
if (!remoteAccess.activeProvider) {
throw new ApiError(409, "No active remote provider configured", { code: "REMOTE_PROVIDER_NOT_CONFIGURED" });
}
if (remoteAccess.activeProvider === "cloudflare") {
const ingressUrl = remoteAccess.providers.cloudflare.ingressUrl?.trim();
if (!ingressUrl) {
const cloudflare = remoteAccess.providers.cloudflare;
const ingressUrl = cloudflare.ingressUrl?.trim();
const candidateUrl = cloudflare.quickTunnel === true && !ingressUrl
? (tunnelUrl?.trim() ?? "")
: ingressUrl;
if (!candidateUrl) {
if (cloudflare.quickTunnel === true) {
throw new ApiError(409, "Cloudflare quick tunnel has not started yet", {
code: "REMOTE_URL_NOT_READY",
});
}
throw new ApiError(409, "Cloudflare ingress URL is not configured", { code: "REMOTE_URL_NOT_CONFIGURED" });
}
let parsed: URL;
try {
parsed = new URL(ingressUrl);
parsed = new URL(candidateUrl);
} catch {
throw new ApiError(409, "Cloudflare ingress URL is invalid", { code: "REMOTE_URL_INVALID" });
}
@@ -115,9 +128,17 @@ export function registerSettingsMemoryRoutes(ctx: ApiRoutesContext, deps: Settin
return token;
}
function getCurrentTunnelUrl(engine: unknown): string | null {
const manager = (engine as {
getRemoteTunnelManager?: () => { getStatus?: () => { url?: string | null } } | undefined;
} | undefined)?.getRemoteTunnelManager?.();
return manager?.getStatus?.().url ?? null;
}
async function buildRemoteLoginUrlForTokenType(
scopedStore: typeof store,
mode: "persistent" | "short-lived",
tunnelUrl?: string | null,
): Promise<{ loginUrl: string; tokenType: "persistent" | "short-lived"; expiresAt: string | null }> {
const settings = await scopedStore.getSettings();
const remoteAccess = settings.remoteAccess;
@@ -126,7 +147,7 @@ export function registerSettingsMemoryRoutes(ctx: ApiRoutesContext, deps: Settin
throw new ApiError(409, "No remote provider is enabled", { code: "REMOTE_ACCESS_DISABLED" });
}
const baseUrl = resolveRemoteBaseUrl(remoteAccess);
const baseUrl = resolveRemoteBaseUrl(remoteAccess, tunnelUrl);
if (mode === "persistent") {
if (!remoteAccess.tokenStrategy.persistent.enabled) {
@@ -274,6 +295,7 @@ export function registerSettingsMemoryRoutes(ctx: ApiRoutesContext, deps: Settin
remoteTailscaleTargetPort: Number(remoteAccess.providers.tailscale.targetPort ?? 4040),
remoteTailscaleAcceptRoutes: Boolean(remoteAccess.providers.tailscale.acceptRoutes),
remoteCloudflareEnabled: Boolean(remoteAccess.providers.cloudflare.enabled),
remoteCloudflareQuickTunnel: Boolean(remoteAccess.providers.cloudflare.quickTunnel),
remoteCloudflareTunnelName: remoteAccess.providers.cloudflare.tunnelName,
remoteCloudflareTunnelToken: remoteAccess.providers.cloudflare.tunnelToken,
remoteCloudflareIngressUrl: remoteAccess.providers.cloudflare.ingressUrl,
@@ -330,6 +352,9 @@ export function registerSettingsMemoryRoutes(ctx: ApiRoutesContext, deps: Settin
cloudflare: {
...remoteAccess.providers.cloudflare,
enabled: body.remoteCloudflareEnabled === undefined ? remoteAccess.providers.cloudflare.enabled : Boolean(body.remoteCloudflareEnabled),
quickTunnel: body.remoteCloudflareQuickTunnel === undefined
? Boolean(remoteAccess.providers.cloudflare.quickTunnel)
: Boolean(body.remoteCloudflareQuickTunnel),
tunnelName: body.remoteCloudflareTunnelName === undefined ? remoteAccess.providers.cloudflare.tunnelName : String(body.remoteCloudflareTunnelName ?? ""),
tunnelToken: body.remoteCloudflareTunnelToken === undefined
? remoteAccess.providers.cloudflare.tunnelToken
@@ -553,8 +578,8 @@ export function registerSettingsMemoryRoutes(ctx: ApiRoutesContext, deps: Settin
throw new ApiError(400, "mode must be 'persistent' or 'short-lived'", { code: "INVALID_REMOTE_AUTH_MODE" });
}
const { store: scopedStore } = await getProjectContext(req);
const payload = await buildRemoteLoginUrlForTokenType(scopedStore, mode);
const { store: scopedStore, engine } = await getProjectContext(req);
const payload = await buildRemoteLoginUrlForTokenType(scopedStore, mode, getCurrentTunnelUrl(engine ?? options?.engine));
res.json({
loginUrl: payload.loginUrl,
tokenType: payload.tokenType,
@@ -568,9 +593,9 @@ export function registerSettingsMemoryRoutes(ctx: ApiRoutesContext, deps: Settin
router.get("/remote/url", async (req, res) => {
try {
const { store: scopedStore } = await getProjectContext(req);
const { store: scopedStore, engine } = await getProjectContext(req);
const tokenType = req.query.tokenType === "short-lived" ? "short-lived" : "persistent";
const payload = await buildRemoteLoginUrlForTokenType(scopedStore, tokenType);
const payload = await buildRemoteLoginUrlForTokenType(scopedStore, tokenType, getCurrentTunnelUrl(engine ?? options?.engine));
res.json({ url: payload.loginUrl, tokenType: payload.tokenType, expiresAt: payload.expiresAt });
} catch (err: unknown) {
if (err instanceof ApiError) throw err;
@@ -580,10 +605,10 @@ export function registerSettingsMemoryRoutes(ctx: ApiRoutesContext, deps: Settin
router.get("/remote/qr", async (req, res) => {
try {
const { store: scopedStore } = await getProjectContext(req);
const { store: scopedStore, engine } = await getProjectContext(req);
const tokenType = req.query.tokenType === "short-lived" ? "short-lived" : "persistent";
const format = req.query.format === "image/svg" ? "image/svg" : "text";
const payload = await buildRemoteLoginUrlForTokenType(scopedStore, tokenType);
const payload = await buildRemoteLoginUrlForTokenType(scopedStore, tokenType, getCurrentTunnelUrl(engine ?? options?.engine));
if (format === "image/svg") {
const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="320" height="80"><rect width="100%" height="100%" fill="white"/><text x="10" y="42" font-size="12" fill="black">${payload.loginUrl.replace(/&/g, "&amp;").replace(/</g, "&lt;")}</text></svg>`;
res.json({ url: payload.loginUrl, tokenType: payload.tokenType, expiresAt: payload.expiresAt, format, data: svg });