mirror of
https://github.com/immich-app/immich.git
synced 2024-12-28 06:31:58 +00:00
feat: split ips; internal local ip when on LAN, external ip otherwise
This commit is contained in:
Min Idzelis
parent
ee186a40c2
commit
4fcb757cf5
5 changed files with 134 additions and 24 deletions
|
|
@ -7,6 +7,7 @@ COPY --chown=node:node package*.json ./
|
|||
RUN npm ci
|
||||
COPY --chown=node:node . .
|
||||
ENV CHOKIDAR_USEPOLLING=true
|
||||
ENV PUBLIC_SERVER_URLS=
|
||||
EXPOSE 24678
|
||||
EXPOSE 3000
|
||||
ENTRYPOINT ["/sbin/tini", "--", "/bin/sh"]
|
||||
|
|
|
|||
|
|
@ -14,6 +14,55 @@
|
|||
<link rel="icon" type="image/png" sizes="144x144" href="/favicon-144.png" />
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180.png" />
|
||||
%sveltekit.head%
|
||||
<style>
|
||||
/* prevent FOUC */
|
||||
html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
body,
|
||||
html {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
@keyframes delayedVisibility {
|
||||
to {
|
||||
visibility: visible;
|
||||
}
|
||||
}
|
||||
#stencil {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
color: rgb(156 163 175);
|
||||
fill: rgb(66, 80, 175);
|
||||
place-items: center;
|
||||
justify-content: center;
|
||||
overflow: hidden;
|
||||
visibility: hidden;
|
||||
animation: 0s linear 0.3s forwards delayedVisibility;
|
||||
}
|
||||
.dark #stencil {
|
||||
color: rgb(75 85 99);
|
||||
}
|
||||
@keyframes loadspin {
|
||||
100% {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
#stencil svg {
|
||||
fill: rgb(66, 80, 175);
|
||||
height: 100px;
|
||||
width: 100px;
|
||||
animation: loadspin 1s linear infinite;
|
||||
}
|
||||
.bg-immich-bg {
|
||||
background-color: white;
|
||||
}
|
||||
.dark .dark\:bg-immich-dark-bg {
|
||||
background-color: black;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
/**
|
||||
* Prevent FOUC on page load.
|
||||
|
|
@ -53,6 +102,18 @@
|
|||
</head>
|
||||
|
||||
<body class="bg-immich-bg dark:bg-immich-dark-bg">
|
||||
<div id="stencil">
|
||||
<svg role="status" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path
|
||||
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
|
||||
fill="currentColor"
|
||||
/>
|
||||
<path
|
||||
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
|
||||
fill="currentFill"
|
||||
/>
|
||||
</svg>
|
||||
</div>
|
||||
<div>%sveltekit.body%</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
38
web/src/lib/utils/server.ts
Normal file
38
web/src/lib/utils/server.ts
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
import { env } from '$env/dynamic/public';
|
||||
import { defaults } from '@immich/sdk';
|
||||
|
||||
const wait = (ms: number) => new Promise((_, reject) => setTimeout(reject, ms));
|
||||
|
||||
const tryServers = async (fetchFn: typeof fetch) => {
|
||||
const server_urls_env = env.PUBLIC_SERVER_URLS;
|
||||
if (server_urls_env) {
|
||||
const servers = server_urls_env.split(',');
|
||||
// servers are in priority order, try in parallel, use first success
|
||||
const fetchers = servers.map((url) => ({ url, fetcher: fetchFn(`${url}/server-info/config`) }));
|
||||
for (const { url, fetcher } of fetchers) {
|
||||
try {
|
||||
const response = (await Promise.race([fetcher, wait(1000)])) as Response;
|
||||
if (response?.ok) {
|
||||
defaults.basePath = url;
|
||||
return true;
|
||||
}
|
||||
} catch {
|
||||
// ignore, handled upstream
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
export async function initSDK(fetcher: typeof fetch) {
|
||||
// set event.fetch on the fetch-client used by @immich/sdk
|
||||
// https://kit.svelte.dev/docs/load#making-fetch-requests
|
||||
// https://github.com/oazapfts/oazapfts/blob/main/README.md#fetch-options
|
||||
defaults.fetch = fetcher;
|
||||
try {
|
||||
await Promise.race([tryServers(fetcher), wait(5000)]);
|
||||
} catch {
|
||||
throw 'Could not connect to any server';
|
||||
}
|
||||
}
|
||||
|
|
@ -51,6 +51,8 @@
|
|||
};
|
||||
|
||||
onMount(() => {
|
||||
const element = document.querySelector('#stencil');
|
||||
element?.remove();
|
||||
// if the browser theme changes, changes the Immich theme too
|
||||
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', handleChangeTheme);
|
||||
});
|
||||
|
|
@ -106,25 +108,29 @@
|
|||
{/if}
|
||||
</svelte:head>
|
||||
|
||||
<noscript
|
||||
class="absolute z-[1000] flex h-screen w-screen place-content-center place-items-center bg-immich-bg dark:bg-immich-dark-bg dark:text-immich-dark-fg"
|
||||
>
|
||||
<FullscreenContainer title={$t('welcome_to_immich')}>
|
||||
To use Immich, you must enable JavaScript or use a JavaScript compatible browser.
|
||||
</FullscreenContainer>
|
||||
</noscript>
|
||||
{#if $page.data.hasError}
|
||||
<FullscreenContainer title="Error connecting to Immich Server"></FullscreenContainer>
|
||||
{:else}
|
||||
<noscript
|
||||
class="absolute z-[1000] flex h-screen w-screen place-content-center place-items-center bg-immich-bg dark:bg-immich-dark-bg dark:text-immich-dark-fg"
|
||||
>
|
||||
<FullscreenContainer title={$t('welcome_to_immich')}>
|
||||
To use Immich, you must enable JavaScript or use a JavaScript compatible browser.
|
||||
</FullscreenContainer>
|
||||
</noscript>
|
||||
|
||||
<slot />
|
||||
<slot />
|
||||
|
||||
{#if showNavigationLoadingBar}
|
||||
<NavigationLoadingBar />
|
||||
{/if}
|
||||
|
||||
<DownloadPanel />
|
||||
<UploadPanel />
|
||||
<NotificationList />
|
||||
<DialogWrapper />
|
||||
|
||||
{#if $user?.isAdmin}
|
||||
<VersionAnnouncementBox />
|
||||
{#if showNavigationLoadingBar}
|
||||
<NavigationLoadingBar />
|
||||
{/if}
|
||||
|
||||
<DownloadPanel />
|
||||
<UploadPanel />
|
||||
<NotificationList />
|
||||
<DialogWrapper />
|
||||
|
||||
{#if $user?.isAdmin}
|
||||
<VersionAnnouncementBox />
|
||||
{/if}
|
||||
{/if}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import { defaultLang, langs } from '$lib/constants';
|
||||
import { lang } from '$lib/stores/preferences.store';
|
||||
import { defaults } from '@immich/sdk';
|
||||
import { initSDK } from '$lib/utils/server';
|
||||
import { init, register } from 'svelte-i18n';
|
||||
import { get } from 'svelte/store';
|
||||
import type { LayoutLoad } from './$types';
|
||||
|
|
@ -9,10 +9,13 @@ export const ssr = false;
|
|||
export const csr = true;
|
||||
|
||||
export const load = (async ({ fetch }) => {
|
||||
// set event.fetch on the fetch-client used by @immich/sdk
|
||||
// https://kit.svelte.dev/docs/load#making-fetch-requests
|
||||
// https://github.com/oazapfts/oazapfts/blob/main/README.md#fetch-options
|
||||
defaults.fetch = fetch;
|
||||
let hasError = false;
|
||||
try {
|
||||
await initSDK(fetch);
|
||||
} catch {
|
||||
// error pages use page layouts, so can't throw error - catch it and display error message in layout.
|
||||
hasError = true;
|
||||
}
|
||||
|
||||
for (const { code, loader } of langs) {
|
||||
register(code, loader);
|
||||
|
|
@ -23,6 +26,7 @@ export const load = (async ({ fetch }) => {
|
|||
await init({ fallbackLocale: preferenceLang === 'dev' ? 'dev' : defaultLang.code, initialLocale: preferenceLang });
|
||||
|
||||
return {
|
||||
hasError,
|
||||
meta: {
|
||||
title: 'Immich',
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue