windmill-components 1.655.2 → 1.665.1

package/package/components/instanceSettings/WsConnectivityTest.svelte

@@ -0,0 +1,177 @@
+<script lang="ts">import { BROWSER } from 'esm-env';
+import Toggle from '../Toggle.svelte';
+import TextInput from '../text_input/TextInput.svelte';
+import { Button } from '../common';
+import { CheckCircle2, XCircle, Loader2 } from 'lucide-svelte';
+let { values } = $props();
+let enabled = $derived($values['ws_base_url'] != null);
+let testing = $state(false);
+let results = $state([]);
+const SERVICES = [
+    { name: 'LSP', httpPath: '/ws/health', wsPath: '/ws/ping' },
+    { name: 'Multiplayer', httpPath: '/ws_mp/health', wsPath: '/ws_mp/__ping__' },
+    { name: 'Debugger', httpPath: '/ws_debug/health', wsPath: '/ws_debug/ping' }
+];
+function buildTestUrl(path) {
+    const override = $values['ws_base_url'];
+    if (override) {
+        const base = override.endsWith('/') ? override.slice(0, -1) : override;
+        return `${base}${path}`;
+    }
+    if (!BROWSER)
+        return `ws://localhost:3003${path}`;
+    const wsProtocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
+    return `${wsProtocol}://${window.location.host}${path}`;
+}
+function wsToHttp(url) {
+    return url.replace(/^wss:/, 'https:').replace(/^ws:/, 'http:');
+}
+async function testHttp(wsUrl) {
+    try {
+        const httpUrl = wsToHttp(wsUrl);
+        const response = await fetch(httpUrl, { signal: AbortSignal.timeout(5000) });
+        if (!response.ok)
+            return false;
+        const text = await response.text();
+        // Accept plain text "ok"/"okay" (old services) or JSON {"status": "ok"} (new services)
+        if (text === 'ok' || text === 'okay')
+            return true;
+        try {
+            const data = JSON.parse(text);
+            return data.status === 'ok';
+        }
+        catch {
+            // Non-JSON, non-"ok" response (e.g. HTML from SPA fallback)
+            return false;
+        }
+    }
+    catch {
+        return false;
+    }
+}
+function testWs(url) {
+    return new Promise((resolve) => {
+        try {
+            const ws = new WebSocket(url);
+            const timeout = setTimeout(() => {
+                ws.close();
+                resolve(false);
+            }, 5000);
+            ws.onopen = () => {
+                // Connection established — service is reachable
+                // If a pong arrives via onmessage, great; otherwise onclose resolves
+                clearTimeout(timeout);
+                ws.close();
+                resolve(true);
+            };
+            ws.onerror = () => {
+                clearTimeout(timeout);
+                resolve(false);
+            };
+            ws.onclose = () => {
+                clearTimeout(timeout);
+                resolve(false);
+            };
+        }
+        catch {
+            resolve(false);
+        }
+    });
+}
+async function runTests() {
+    testing = true;
+    results = SERVICES.map((s) => ({
+        name: s.name,
+        http: 'pending',
+        ws: 'pending'
+    }));
+    await Promise.all(SERVICES.map(async (service, i) => {
+        const wsUrl = buildTestUrl(service.wsPath);
+        const healthUrl = buildTestUrl(service.httpPath);
+        // HTTP test first
+        const httpOk = await testHttp(healthUrl);
+        results[i] = { ...results[i], http: httpOk ? 'ok' : 'fail' };
+        // WebSocket test
+        const wsOk = await testWs(wsUrl);
+        results[i] = { ...results[i], ws: wsOk ? 'ok' : 'fail' };
+    }));
+    testing = false;
+}
+function toggleEnabled() {
+    if (enabled) {
+        $values['ws_base_url'] = null;
+    }
+    else {
+        $values['ws_base_url'] = '';
+    }
+}
+</script>
+
+<div class="flex flex-col gap-3">
+	<div>
+		<Button variant="default" unifiedSize="sm" onclick={runTests} disabled={testing}>
+			{#if testing}
+				Test connectivity...
+			{:else}
+				Test connectivity
+			{/if}
+		</Button>
+	</div>
+
+	{#if results.length > 0}
+		<div class="flex flex-col gap-1.5 text-xs">
+			{#each results as result (result.name)}
+				<div class="flex items-center gap-3">
+					<span class="w-20 font-medium text-primary">{result.name}</span>
+					<span class="flex items-center gap-1">
+						{#if result.http === 'pending'}
+							<Loader2 size={14} class="animate-spin text-tertiary" />
+						{:else if result.http === 'ok'}
+							<CheckCircle2 size={14} class="text-green-600" />
+						{:else}
+							<XCircle size={14} class="text-red-500" />
+						{/if}
+						<span class="text-secondary">HTTP</span>
+					</span>
+					<span class="flex items-center gap-1">
+						{#if result.ws === 'pending'}
+							<Loader2 size={14} class="animate-spin text-tertiary" />
+						{:else if result.ws === 'ok'}
+							<CheckCircle2 size={14} class="text-green-600" />
+						{:else}
+							<XCircle size={14} class="text-red-500" />
+						{/if}
+						<span class="text-secondary">WebSocket</span>
+					</span>
+				</div>
+			{/each}
+		</div>
+	{/if}
+
+	<div>
+		<Toggle
+			size="xs"
+			options={{ right: 'Custom websocket base url from frontend to multiplayer/lsp/debugger' }}
+			checked={enabled}
+			on:change={toggleEnabled}
+		/>
+	</div>
+
+	{#if enabled}
+		<TextInput
+			inputProps={{
+				type: 'text',
+				id: 'ws_base_url',
+				placeholder: 'wss://ws.example.com'
+			}}
+			bind:value={$values['ws_base_url']}
+			class="max-w-lg"
+		/>
+		{@const val = $values['ws_base_url']}
+		{#if val && (!val.startsWith('ws') || !val.includes('://') || val.endsWith('/') || val.endsWith(' '))}
+			<span class="text-red-600 dark:text-red-400 text-xs">
+				Must start with ws:// or wss:// and not end with / or a space
+			</span>
+		{/if}
+	{/if}
+</div>

package/package/components/instanceSettings/WsConnectivityTest.svelte.d.ts

@@ -0,0 +1,7 @@
+import type { Writable } from 'svelte/store';
+interface Props {
+    values: Writable<Record<string, any>>;
+}
+declare const WsConnectivityTest: import("svelte").Component<Props, {}, "">;
+type WsConnectivityTest = ReturnType<typeof WsConnectivityTest>;
+export default WsConnectivityTest;

package/package/components/instanceSettings.d.ts

@@ -13,7 +13,7 @@ export interface Setting {
         tooltip?: string;
         value?: string;
     }[];
-    fieldType: 'text' | 'number' | 'boolean' | 'password' | 'select' | 'select_python' | 'textarea' | 'codearea' | 'seconds' | 'email' | 'license_key' | 'object_store_config' | 'critical_error_channels' | 'critical_alerts_on_db_oversize' | 'slack_connect' | 'smtp_connect' | 'indexer_rates' | 'otel' | 'otel_tracing_proxy' | 'secret_backend';
+    fieldType: 'text' | 'number' | 'boolean' | 'password' | 'select' | 'select_python' | 'textarea' | 'codearea' | 'seconds' | 'email' | 'license_key' | 'object_store_config' | 'critical_error_channels' | 'critical_alerts_on_db_oversize' | 'slack_connect' | 'smtp_connect' | 'indexer_rates' | 'otel' | 'otel_tracing_proxy' | 'secret_backend' | 'github_enterprise_app' | 'ws_connectivity';
     storage: SettingStorage;
     advancedToggle?: {
         label: string;
@@ -89,3 +89,5 @@ export interface SearchableSettingItem {
  */
 export declare function extractMarkedLabel(marked: string | undefined, labelLength: number): string;
 export declare function buildSearchableSettingItems(navigationGroups?: typeof instanceSettingsNavigationGroups): SearchableSettingItem[];
+/** Registry settings that support per-workspace overrides. Excludes instance_python_version and uv_index_strategy which are instance-wide only. */
+export declare const WORKSPACE_REGISTRY_SETTINGS: Setting[];

package/package/components/instanceSettings.js

@@ -121,6 +121,15 @@ export const settings = {
             ee_only: '',
             hideInQuickSetup: true
         },
+        {
+            label: 'HTTP route workspace prefix',
+            description: 'When enabled HTTP routes will be accessible at /api/r/{workspace_id}/{route} instead of /api/r/{route} allowing you to define same route path in different workspaces without conflict',
+            key: 'http_route_workspaced_route',
+            fieldType: 'boolean',
+            storage: 'setting',
+            ee_only: '',
+            hideInQuickSetup: true
+        },
         {
             label: 'Audit log retention (days)',
             key: 'audit_log_retention_days',
@@ -518,6 +527,16 @@ export const settings = {
             ee_only: ''
         }
     ],
+    Webhooks: [
+        {
+            label: 'Instance Events Webhook',
+            description: 'URL to receive POST requests for instance events (user added, OAuth signup, user invited/added/joined workspace).',
+            key: 'instance_events_webhook',
+            fieldType: 'text',
+            placeholder: 'https://example.com/webhook',
+            storage: 'setting'
+        }
+    ],
     'OTEL/Prom': [
         {
             label: 'OpenTelemetry',
@@ -570,6 +589,37 @@ export const settings = {
             storage: 'setting',
             ee_only: 'HashiCorp Vault integration is an Enterprise Edition feature'
         }
+    ],
+    'GitHub App': [
+        {
+            label: 'GitHub App',
+            description: 'Configure a self-managed GitHub App to enable git sync without stats.windmill.dev.',
+            key: 'github_enterprise_app',
+            fieldType: 'github_enterprise_app',
+            storage: 'setting',
+            ee_only: '',
+            error: 'When self-managed mode is enabled, Base URL, App ID, App Slug, Client ID, and Private Key are required.',
+            isValid: (v) => {
+                if (!v?.self_managed)
+                    return true;
+                return !!(v?.base_url && v?.app_id && v?.app_slug && v?.client_id && v?.private_key);
+            }
+        }
+    ],
+    WebSocket: [
+        {
+            label: 'WebSocket connectivity',
+            description: 'Test connectivity to multiplayer, LSP, and debugger WebSocket services. Enable custom URL override for deployments where WebSocket traffic routes to a different host.',
+            key: 'ws_base_url',
+            fieldType: 'ws_connectivity',
+            storage: 'setting',
+            requiresReloadOnChange: true,
+            isValid: (value) => !value ||
+                (value.startsWith('ws') &&
+                    value.includes('://') &&
+                    !value.endsWith('/') &&
+                    !value.endsWith(' '))
+        }
     ]
 };
 export const settingsKeys = Object.keys(settings);
@@ -656,6 +706,12 @@ export const instanceSettingsNavigationGroups = [
                 aiDescription: 'Instance alerts settings',
                 isEE: true
             },
+            {
+                id: 'webhooks',
+                label: 'Webhooks',
+                aiId: 'instance-settings-webhooks',
+                aiDescription: 'Instance events webhook settings'
+            },
             {
                 id: 'otel_prom',
                 label: 'OTEL/Prometheus',
@@ -672,9 +728,27 @@ export const instanceSettingsNavigationGroups = [
             }
         ]
     },
+    {
+        title: 'AI',
+        items: [
+            {
+                id: 'ai',
+                label: 'AI',
+                aiId: 'instance-settings-ai',
+                aiDescription: 'Instance AI settings (providers, models, prompts)'
+            }
+        ]
+    },
     {
         title: 'Advanced',
         items: [
+            {
+                id: 'github_enterprise_app',
+                label: 'GitHub App',
+                aiId: 'instance-settings-github-enterprise-app',
+                aiDescription: 'Self-managed GitHub App for git sync',
+                isEE: true
+            },
             {
                 id: 'private_hub',
                 label: 'Private Hub',
@@ -693,25 +767,35 @@ export const instanceSettingsNavigationGroups = [
                 label: 'Secret Storage',
                 aiId: 'instance-settings-secret-storage',
                 aiDescription: 'Instance secret storage settings'
+            },
+            {
+                id: 'websocket',
+                label: 'WebSocket',
+                aiId: 'instance-settings-websocket',
+                aiDescription: 'WebSocket connectivity test and URL override'
             }
         ]
     }
 ];
 export const tabToCategoryMap = {
     general: 'Core',
+    ai: 'AI',
     sso: 'Auth/OAuth/SAML',
     oauth: 'Auth/OAuth/SAML',
     scim_saml: 'Auth/OAuth/SAML',
     smtp: 'SMTP',
     registries: 'Registries',
     alerts: 'Alerts',
+    webhooks: 'Webhooks',
     otel_prom: 'OTEL/Prom',
     indexer: 'Indexer',
     telemetry: 'Telemetry',
     secret_storage: 'Secret Storage',
     object_storage: 'Object Storage',
     jobs: 'Jobs',
-    private_hub: 'Private Hub'
+    private_hub: 'Private Hub',
+    github_enterprise_app: 'GitHub App',
+    websocket: 'WebSocket'
 };
 export const tabToAuthSubTab = {
     sso: 'sso',
@@ -727,17 +811,21 @@ export const setupNavigationGroups = instanceSettingsNavigationGroups
     .filter((group) => group.items.length > 0);
 export const categoryToTabMap = {
     Core: 'general',
+    AI: 'ai',
     SMTP: 'smtp',
     'Auth/OAuth/SAML': 'sso',
     Registries: 'registries',
     Alerts: 'alerts',
+    Webhooks: 'webhooks',
     'OTEL/Prom': 'otel_prom',
     Indexer: 'indexer',
     Telemetry: 'telemetry',
     'Secret Storage': 'secret_storage',
     'Object Storage': 'object_storage',
     Jobs: 'jobs',
-    'Private Hub': 'private_hub'
+    'Private Hub': 'private_hub',
+    'GitHub App': 'github_enterprise_app',
+    WebSocket: 'websocket'
 };
 /**
  * Extract the label portion from a uFuzzy marked/highlighted string.
@@ -809,3 +897,5 @@ export function buildSearchableSettingItems(navigationGroups = instanceSettingsN
     }
     return items;
 }
+/** Registry settings that support per-workspace overrides. Excludes instance_python_version and uv_index_strategy which are instance-wide only. */
+export const WORKSPACE_REGISTRY_SETTINGS = settings['Registries'].filter((s) => s.key !== 'instance_python_version' && s.key !== 'uv_index_strategy');