Skip to content
4 changes: 2 additions & 2 deletions src/lib/components/domains/cnameTable.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script lang="ts">
import { Link } from '$lib/elements';
import { consoleVariables } from '$routes/(console)/store';
import { IconInfo } from '@appwrite.io/pink-icons-svelte';
import {
Badge,
Expand All @@ -10,6 +9,7 @@
Icon,
InteractiveText
} from '@appwrite.io/pink-svelte';
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';

export let domain: string;
export let verified = false;
Expand Down Expand Up @@ -54,7 +54,7 @@
<InteractiveText
variant="copy"
isVisible
text={$consoleVariables._APP_DOMAIN_TARGET_CNAME} />
text={$regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME} />
</Table.Cell>
</Table.Row.Base>
</Table.Root>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/components/domains/nameserverTable.svelte
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<script lang="ts">
import { consoleVariables } from '$routes/(console)/store';
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';

import { Badge, Layout, Typography, Table, InteractiveText } from '@appwrite.io/pink-svelte';

export let domain: string;
export let verified = false;

const nameserverList = $consoleVariables?._APP_DOMAINS_NAMESERVERS
? $consoleVariables?._APP_DOMAINS_NAMESERVERS?.split(',')
const nameserverList = $regionalConsoleVariables?._APP_DOMAINS_NAMESERVERS
? $regionalConsoleVariables?._APP_DOMAINS_NAMESERVERS?.split(',')
: ['ns1.appwrite.io', 'ns2.appwrite.io'];
</script>

Expand Down
10 changes: 5 additions & 5 deletions src/lib/components/domains/recordTable.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script lang="ts">
import { Link } from '$lib/elements';
import { consoleVariables } from '$routes/(console)/store';
import {
Badge,
Layout,
Expand All @@ -9,6 +8,7 @@
InteractiveText,
Alert
} from '@appwrite.io/pink-svelte';
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';

export let domain: string;
export let verified = false;
Expand All @@ -21,12 +21,12 @@
switch (variant) {
case 'cname':
return service === 'general'
? $consoleVariables._APP_DOMAIN_TARGET_CNAME
: $consoleVariables._APP_DOMAIN_SITES;
? $regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME
: $regionalConsoleVariables._APP_DOMAIN_SITES;
case 'a':
return $consoleVariables._APP_DOMAIN_TARGET_A;
return $regionalConsoleVariables._APP_DOMAIN_TARGET_A;
case 'aaaa':
return $consoleVariables._APP_DOMAIN_TARGET_AAAA;
return $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA;
}
}
</script>
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/git/connectBehaviour.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script lang="ts">
import { LabelCard } from '$lib/components';
import { consoleVariables } from '$routes/(console)/store';
import { Layout } from '@appwrite.io/pink-svelte';
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';

const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
const isVcsEnabled = $regionalConsoleVariables?._APP_VCS_ENABLED === true;
export let connectBehaviour: 'now' | 'later' = isVcsEnabled ? 'now' : 'later';
</script>

Expand Down
8 changes: 4 additions & 4 deletions src/lib/components/git/connectGit.svelte
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<script lang="ts">
import { isSelfHosted } from '$lib/system';
import { connectGitHub } from '$lib/stores/git';
import Button from '$lib/elements/forms/button.svelte';
import { consoleVariables } from '$routes/(console)/store';
import { IconGithub } from '@appwrite.io/pink-icons-svelte';
import { Alert, Card, Empty, Icon, Layout } from '@appwrite.io/pink-svelte';
import { isSelfHosted } from '$lib/system';
import { connectGitHub } from '$lib/stores/git';
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';

export let callbackState: Record<string, string> = null;

let isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
let isVcsEnabled = $regionalConsoleVariables?._APP_VCS_ENABLED === true;
</script>

<Layout.Stack>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/components/git/deploymentDomains.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
import { Trim } from '$lib/components';
import { Link } from '$lib/elements';
import { Button } from '$lib/elements/forms';
import { protocol } from '$routes/(console)/store';
import type { Models } from '@appwrite.io/console';
import { IconExternalLink, IconQrcode } from '@appwrite.io/pink-icons-svelte';
import { ActionMenu, Icon, Layout, Popover, Tag, Typography } from '@appwrite.io/pink-svelte';
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';

let {
domains,
Expand All @@ -31,7 +31,7 @@

<Layout.Stack gap="xxs" direction="row" alignItems="center">
{#if domains?.total}
<Link external href={`${$protocol}${sortedDomains[0]?.domain}`} variant="muted">
<Link external href={`${$regionalProtocol}${sortedDomains[0]?.domain}`} variant="muted">
<Layout.Stack gap="xxs" direction="row" alignItems="center">
<Trim alternativeTrim>
<Typography.Text variant="m-400" color="--fgcolor-neutral-primary">
Expand All @@ -51,7 +51,7 @@
{#each sortedDomains as rule, i}
{#if i !== 0}
<ActionMenu.Item.Anchor
href={`${$protocol}${rule.domain}`}
href={`${$regionalProtocol}${rule.domain}`}
external
leadingIcon={IconExternalLink}>
<Trim alternativeTrim>
Expand Down
52 changes: 35 additions & 17 deletions src/lib/stores/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,39 @@ const getSubdomain = (region?: string) => {
}
};

function createConsoleSdk(client: Client) {
return {
client,
account: new Account(client),
avatars: new Avatars(client),
functions: new Functions(client),
health: new Health(client),
locale: new Locale(client),
projects: new Projects(client),
teams: new Teams(client),
users: new Users(client),
migrations: new Migrations(client),
console: new Console(client),
assistant: new Assistant(client),
billing: new Billing(client),
sources: new Sources(client),
sites: new Sites(client),
domains: new Domains(client)
};
}

const endpoint = getApiEndpoint();

const clientConsole = new Client();
const scopedConsoleClient = new Client();

const clientProject = new Client();
const clientRealtime = new Client();

if (!building) {
clientConsole.setEndpoint(endpoint).setProject('console');
scopedConsoleClient.setMode(endpoint).setProject('console');

clientRealtime.setEndpoint(endpoint).setProject('console');
clientProject.setEndpoint(endpoint).setMode('admin');
clientRealtime.setEndpoint(endpoint).setProject('console');
Expand Down Expand Up @@ -110,24 +135,17 @@ export const realtime = {
};

export const sdk = {
forConsole: {
client: clientConsole,
account: new Account(clientConsole),
avatars: new Avatars(clientConsole),
functions: new Functions(clientConsole),
health: new Health(clientConsole),
locale: new Locale(clientConsole),
projects: new Projects(clientConsole),
teams: new Teams(clientConsole),
users: new Users(clientConsole),
migrations: new Migrations(clientConsole),
console: new Console(clientConsole),
assistant: new Assistant(clientConsole),
billing: new Billing(clientConsole),
sources: new Sources(clientConsole),
sites: new Sites(clientConsole),
domains: new Domains(clientConsole)
forConsole: createConsoleSdk(clientConsole),

forConsoleIn(region: string) {
const regionAwareEndpoint = getApiEndpoint(region);
if (regionAwareEndpoint !== scopedConsoleClient.config.endpoint) {
scopedConsoleClient.setEndpoint(regionAwareEndpoint);
}

return createConsoleSdk(scopedConsoleClient);
},

forProject(region: string, projectId: string) {
const endpoint = getApiEndpoint(region);
if (endpoint !== clientProject.config.endpoint) {
Expand Down
4 changes: 3 additions & 1 deletion src/routes/(console)/project-[region]-[project]/+layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ export const load: LayoutLoad = async ({ params, depends }) => {

try {
const project = await sdk.forConsole.projects.get(params.project);
const [organization, prefs, _] = await Promise.all([
const [organization, prefs, regionalConsoleVariables, _] = await Promise.all([
sdk.forConsole.teams.get(project.teamId) as Promise<Organization>,
sdk.forConsole.account.getPrefs(),
sdk.forConsoleIn(project.region).console.variables(),
loadAvailableRegions(project.teamId)
]);
if (prefs?.organization !== project.teamId) {
Expand Down Expand Up @@ -54,6 +55,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
return {
project,
organization,
regionalConsoleVariables,
roles,
scopes,
currentPlan
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import { Click, trackEvent } from '$lib/actions/analytics';
import type { Models } from '@appwrite.io/console';
import { isSelfHosted } from '$lib/system';
import { consoleVariables } from '$routes/(console)/store';
import { afterNavigate, goto } from '$app/navigation';
import { installation, repository } from '$lib/stores/vcs';
import { Repositories } from '$lib/components/git';
Expand All @@ -22,10 +21,11 @@
import Wizard from '$lib/layout/wizard.svelte';
import { Link } from '$lib/elements';
import { Button } from '$lib/elements/forms';
import { regionalConsoleVariables } from '../../store';

export let data;

const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
const isVcsEnabled = $regionalConsoleVariables?._APP_VCS_ENABLED === true;
const wizardBase = `${base}/project-${page.params.region}-${page.params.project}/functions`;
let previousPage: string = wizardBase;
afterNavigate(({ from }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
import { get, writable } from 'svelte/store';
import { ID, Runtime } from '@appwrite.io/console';
import type { Models } from '@appwrite.io/console';
import { consoleVariables } from '$routes/(console)/store';
import Details from '../(components)/details.svelte';
import Aside from '../(components)/aside.svelte';
import { iconPath } from '$lib/stores/app';
import { Dependencies } from '$lib/constants';
import { IconInfo } from '@appwrite.io/pink-icons-svelte';
import Configuration from './configuration.svelte';
import { getIconFromRuntime } from '$lib/stores/runtimes';
import { regionalConsoleVariables } from '../../../store';
import { InvalidFileType, removeFile } from '$lib/helpers/files';
import { isCloud } from '$lib/system';
import { humanFileSize } from '$lib/helpers/sizeConvertion';
Expand Down Expand Up @@ -89,7 +89,7 @@
await sdk
.forProject(page.params.region, page.params.project)
.proxy.createFunctionRule(
`${ID.unique()}.${$consoleVariables._APP_DOMAIN_FUNCTIONS}`,
`${ID.unique()}.${$regionalConsoleVariables._APP_DOMAIN_FUNCTIONS}`,
func.$id
);

Expand Down Expand Up @@ -164,7 +164,7 @@
$: maxSize =
isCloud && $currentPlan
? $currentPlan.deploymentSize * 1000000
: $consoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB
: $regionalConsoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB

$: readableMaxSize = humanFileSize(maxSize);
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import { ID, Runtime, VCSDeploymentType } from '@appwrite.io/console';
import type { Models } from '@appwrite.io/console';
import { onMount } from 'svelte';
import { consoleVariables } from '$routes/(console)/store';
import Details from '../(components)/details.svelte';
import ProductionBranchFieldset from '$lib/components/git/productionBranchFieldset.svelte';
import Configuration from './configuration.svelte';
Expand All @@ -22,6 +21,7 @@
import { Dependencies } from '$lib/constants';
import RepoCard from './repoCard.svelte';
import { getIconFromRuntime } from '$lib/stores/runtimes';
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';

export let data;

Expand Down Expand Up @@ -92,7 +92,7 @@
await sdk
.forProject(page.params.region, page.params.project)
.proxy.createFunctionRule(
`${ID.unique()}.${$consoleVariables._APP_DOMAIN_FUNCTIONS}`,
`${ID.unique()}.${$regionalConsoleVariables._APP_DOMAIN_FUNCTIONS}`,
func.$id
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
Repositories,
RepositoryBehaviour
} from '$lib/components/git';
import { consoleVariables } from '$routes/(console)/store';
import Details from '../(components)/details.svelte';
import Aside from '../(components)/aside.svelte';
import { iconPath } from '$lib/stores/app';
Expand All @@ -31,6 +30,7 @@
import RepoCard from './repoCard.svelte';
import { Dependencies } from '$lib/constants';
import { getIconFromRuntime } from '$lib/stores/runtimes';
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';

export let data;

Expand Down Expand Up @@ -150,7 +150,7 @@
await sdk
.forProject(page.params.region, page.params.project)
.proxy.createFunctionRule(
`${ID.unique()}.${$consoleVariables._APP_DOMAIN_FUNCTIONS}`,
`${ID.unique()}.${$regionalConsoleVariables._APP_DOMAIN_FUNCTIONS}`,
func.$id
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import { goto, invalidate } from '$app/navigation';
import { Dependencies } from '$lib/constants';
import { sortBranches } from '$lib/stores/vcs';
import { protocol } from '$routes/(console)/store';
import { IconInfo } from '@appwrite.io/pink-icons-svelte';
import { LabelCard } from '$lib/components';
import { Runtime, StatusCode, type Models } from '@appwrite.io/console';
Expand All @@ -19,7 +18,7 @@
import { ConnectRepoModal } from '$lib/components/git/index.js';
import { isValueOfStringEnum } from '$lib/helpers/types.js';
import { isCloud } from '$lib/system';
import { project } from '$routes/(console)/project-[region]-[project]/store';
import { project, regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
import { getApexDomain } from '$lib/helpers/tlds';

const routeBase = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/domains`;
Expand Down Expand Up @@ -73,7 +72,7 @@
} else if (behaviour === 'REDIRECT') {
rule = await sdk
.forProject(page.params.region, page.params.project)
.proxy.createRedirectRule(domainName, $protocol + redirect, statusCode);
.proxy.createRedirectRule(domainName, $regionalProtocol + redirect, statusCode);
} else if (behaviour === 'ACTIVE') {
rule = await sdk
.forProject(page.params.region, page.params.project)
Expand Down
Loading