Mirroristas/pockethost
2
0
Fork 0
mirror of https://github.com/pockethost/pockethost.git synced 2025-06-06 14:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(pockethost): refactor instance URL maker

Browse Source
This commit is contained in:
Ben Allfree 2024-07-31 03:11:41 -04:00
parent e9247b0fda
commit 67d41d559c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/pockethost/src/constants.ts
View File

@ -296,10 +296,12 @@ export const mkContainerHomePath = (...path: string[]) =>
export const mkAppUrl = (path = '') => `${APP_URL()}${path}` export const mkAppUrl = (path = '') => `${APP_URL()}${path}`
export const mkBlogUrl = (path = '') => `${BLOG_URL()}${path}` export const mkBlogUrl = (path = '') => `${BLOG_URL()}${path}`
export const mkDocUrl = (path = '') => mkBlogUrl(join('/docs', path)) export const mkDocUrl = (path = '') => mkBlogUrl(join('/docs', path))
export const mkEdgeSubdomain = (subdomain: string) => export const mkInstanceCanonicalHostname = (instance: InstanceFields) =>
`${settings().HTTP_PROTOCOL}//${subdomain}.${settings().EDGE_APEX_DOMAIN}` `${instance.id}.${instance.region}.${APEX_DOMAIN()}`
export const mkEdgeUrl = (subdomain: string, path = '') => export const mkInstanceHostname = (instance: InstanceFields) =>
`${mkEdgeSubdomain(subdomain)}${path}` `${instance.subdomain}.${instance.region}.${APEX_DOMAIN()}`
export const mkInstanceUrl = (instance: InstanceFields, ...paths: string[]) =>
join(`${HTTP_PROTOCOL()}//${mkInstanceHostname(instance)}}`, ...paths)
export const mkInstanceDataPath = (instanceId: string, ...path: string[]) => export const mkInstanceDataPath = (instanceId: string, ...path: string[]) =>
join(settings().DATA_ROOT, instanceId, ...path) join(settings().DATA_ROOT, instanceId, ...path)

4
packages/pockethost/src/services/InstanceService/index.ts
View File

@ -24,7 +24,7 @@ import {
mkAppUrl, mkAppUrl,
mkContainerHomePath, mkContainerHomePath,
mkDocUrl, mkDocUrl,
mkEdgeUrl, mkInstanceUrl,
mkInternalUrl, mkInternalUrl,
mkSingleton, mkSingleton,
now, now,
@ -301,7 +301,7 @@ export const instanceService = mkSingleton(
env: { env: {
...instance.secrets, ...instance.secrets,
PH_APP_NAME: instance.subdomain, PH_APP_NAME: instance.subdomain,
PH_INSTANCE_URL: mkEdgeUrl(instance.subdomain), PH_INSTANCE_URL: mkInstanceUrl(instance),
}, },
version, version,
} }