* webui: Move static build output from `tools/server/public` to `build/ui` directory * refactor: Move to `tools/ui` * refactor: rename CMake variables and preprocessor defines - Rename LLAMA_BUILD_WEBUI -> LLAMA_BUILD_UI (old kept as deprecated) - Rename LLAMA_USE_PREBUILT_WEBUI -> LLAMA_USE_PREBUILT_UI (old kept as deprecated) - Backward compat: old vars auto-forward to new ones with DEPRECATION warning - Rename internal vars: WEBUI_SOURCE -> UI_SOURCE, WEBUI_SOURCE_DIR -> UI_SOURCE_DIR, etc. - Rename HF bucket: LLAMA_WEBUI_HF_BUCKET -> LLAMA_UI_HF_BUCKET - Emit both LLAMA_BUILD_WEBUI and LLAMA_BUILD_UI preprocessor defines - Emit both LLAMA_WEBUI_DEFAULT_ENABLED and LLAMA_UI_DEFAULT_ENABLED * refactor: rename CLI flags (--webui -> --ui) with backward compat - Add --ui/--no-ui (old --webui/--no-webui kept as deprecated aliases) - Add --ui-config (old --webui-config kept as deprecated alias) - Add --ui-config-file (old --webui-config-file kept as deprecated alias) - Add --ui-mcp-proxy/--no-ui-mcp-proxy (old --webui-mcp-proxy kept as deprecated) - Add new env vars: LLAMA_ARG_UI, LLAMA_ARG_UI_CONFIG, LLAMA_ARG_UI_CONFIG_FILE, LLAMA_ARG_UI_MCP_PROXY - C++ struct fields: params.ui, params.ui_config_json, params.ui_mcp_proxy added alongside old fields - Backward compat: old fields synced to new ones in g_params_to_internals * refactor: update C++ server internals with backward compat - Rename json_webui_settings -> json_ui_settings (both kept in server_context_meta) - Rename params.webui usage -> params.ui (both synced, old still works) - JSON API emits both "ui"/"ui_settings" and "webui"/"webui_settings" keys - Server routes use params.ui_mcp_proxy || params.webui_mcp_proxy - Preprocessor guards use #if defined(LLAMA_BUILD_UI) || defined(LLAMA_BUILD_WEBUI) * refactor: rename CI/CD workflows, artifacts, and build script - Rename webui-build.yml -> ui-build.yml; artifact webui-build -> ui-build - Rename webui-publish.yml -> ui-publish.yml; var HF_BUCKET_WEBUI_STATIC_OUTPUT -> HF_BUCKET_UI_STATIC_OUTPUT - Rename server-webui.yml -> server-ui.yml; job webui-build/checks -> ui-build/checks - Update server.yml: job/artifact refs webui-build -> ui-build - Update release.yml: all webui-build/publish refs -> ui-build/publish; HF_TOKEN_WEBUI_STATIC_OUTPUT -> HF_TOKEN_UI_STATIC_OUTPUT - Update server-self-hosted.yml: webui-build -> ui-build - Update build-self-hosted.yml: HF_WEBUI_VERSION -> HF_UI_VERSION - Rename webui-download.cmake -> ui-download.cmake (internal refs updated) - Update labeler.yml: server/webui -> server/ui path label * docs: update CODEOWNERS and server README docs - Update CODEOWNERS: team ggml-org/llama-webui -> ggml-org/llama-ui, path /tools/server/webui/ -> /tools/ui/ - Update server README.md: CLI tables show --ui flags with deprecated --webui aliases - Update server README-dev.md: "WebUI" -> "UI", paths updated to tools/ui/ * fix: Small fixes for UI build * fix: CMake.txt syntax * chore: Formatting * fix: `.editorconfig` for llama-ui * chore: Formatting * refactor: Use `APP_NAME` in Error route * refactor: Cleanup * refactor: Single migration service * make llama-ui a linkable target * fix: UI Build output * fix: Missing change * fix: separate llama-ui npm build output into build/tools/ui/dist subfolder + use cmake npm build instead of downloading ui-build.yml artifacts in CI * refactor: UI workflows cleanup --------- Co-authored-by: Xuan Son Nguyen <son@huggingface.co>
73 lines
1.8 KiB
TypeScript
73 lines
1.8 KiB
TypeScript
import { TWO_PART_PUBLIC_SUFFIXES, WILDCARD_PUBLIC_SUFFIXES } from '$lib/constants';
|
|
import { UrlProtocol } from '$lib/enums';
|
|
|
|
/**
|
|
* Check whether a hostname looks like an IPv4 or IPv6 address.
|
|
*/
|
|
function isIpAddress(hostname: string): boolean {
|
|
if (hostname.includes(':')) return true;
|
|
|
|
if (/^\d{1,3}(\.\d{1,3}){3}$/.test(hostname)) return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Extract the registrable root domain from a URL.
|
|
*
|
|
* @example
|
|
* 'mcp.example.com' -> 'example.com'
|
|
* 'www.example.co.uk' -> 'example.co.uk'
|
|
* 'bar.foo.nom.br' -> 'bar.foo.nom.br'
|
|
* '192.168.1.1' -> null
|
|
* 'localhost' -> null
|
|
*/
|
|
export function extractRootDomain(url: URL): string | null {
|
|
const hostname = url.hostname.toLowerCase();
|
|
if (!hostname || isIpAddress(hostname)) return null;
|
|
|
|
const parts = hostname.split('.');
|
|
|
|
if (parts.length < 2) return null;
|
|
|
|
if (parts.length >= 3) {
|
|
const suffix2 = `${parts[parts.length - 2]}.${parts[parts.length - 1]}`;
|
|
|
|
if (TWO_PART_PUBLIC_SUFFIXES.has(suffix2)) {
|
|
return parts.slice(-3).join('.');
|
|
}
|
|
}
|
|
|
|
for (let i = 2; i <= parts.length; i++) {
|
|
const candidate = parts.slice(-i).join('.');
|
|
|
|
if (WILDCARD_PUBLIC_SUFFIXES.has(candidate)) {
|
|
if (parts.length === i + 1) {
|
|
return hostname;
|
|
}
|
|
|
|
return parts.slice(-(i + 2)).join('.');
|
|
}
|
|
}
|
|
|
|
return parts.slice(-2).join('.');
|
|
}
|
|
|
|
/**
|
|
* Sanitize an external URL string for safe use in an `<a href>`.
|
|
* Only allows http: and https: schemes. Returns `null` for anything else.
|
|
*/
|
|
export function sanitizeExternalUrl(raw: string): string | null {
|
|
try {
|
|
const url = new URL(raw);
|
|
|
|
if (url.protocol !== UrlProtocol.HTTP && url.protocol !== UrlProtocol.HTTPS) {
|
|
return null;
|
|
}
|
|
|
|
return url.href;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|