Mirroristas/pockethost
2
0
Fork 0
mirror of https://github.com/pockethost/pockethost.git synced 2025-03-30 15:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename APP_PROTOCOL to HTTP_PROTOCOL

Browse Source
This commit is contained in:
Ben Allfree 2023-10-11 05:07:33 -07:00
parent 994a0d2f4e
commit 5e5ff5d665
8 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env-template
View File

@ -2,7 +2,7 @@
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# https or http, as you wish
PUBLIC_APP_PROTOCOL=https
PUBLIC_HTTP_PROTOCOL=https
# The domain name the service lives on
PUBLIC_APP_DOMAIN=pockethost.test

4
packages/daemon/src/constants.ts
View File

@ -1,7 +1,7 @@
import { existsSync } from 'fs'
import { join } from 'path'
import { env, envb, envi } from './util/env'
export const PUBLIC_APP_PROTOCOL = env('PUBLIC_APP_PROTOCOL', 'https')
export const PUBLIC_HTTP_PROTOCOL = env('PUBLIC_HTTP_PROTOCOL', 'https')
export const PUBLIC_APP_DOMAIN = env('PUBLIC_APP_DOMAIN', `pockethost.test`)
export const PUBLIC_APP_DB = env('PUBLIC_APP_DB', `pockethost-central`)
@ -95,7 +95,7 @@ export const HOST_OS = env('HOST_OS', 'darwin')
export const DOCKER_ARCH = env('DOCKER_ARCH', 'arm64')
console.log({
PUBLIC_APP_PROTOCOL,
PUBLIC_HTTP_PROTOCOL,
PUBLIC_APP_DOMAIN,
PUBLIC_APP_DB,
DAEMON_PB_USERNAME,

4
packages/daemon/src/services/InstanceService/InstanceService.ts
View File

@ -2,7 +2,7 @@ import {
DAEMON_PB_IDLE_TTL,
PUBLIC_APP_DB,
PUBLIC_APP_DOMAIN,
PUBLIC_APP_PROTOCOL,
PUBLIC_HTTP_PROTOCOL,
} from '$constants'
import { clientService, proxyService } from '$services'
import { mkInternalUrl, now } from '$util'
@ -481,7 +481,7 @@ export const instanceService = mkSingleton(
dbg(`Checking for verified account`)
if (!owner?.verified) {
throw new Error(
`Log in at ${PUBLIC_APP_PROTOCOL}://${PUBLIC_APP_DOMAIN} to verify your account.`,
`Log in at ${PUBLIC_HTTP_PROTOCOL}://${PUBLIC_APP_DOMAIN} to verify your account.`,
)
}

4
packages/daemon/src/services/clientService/clientService.ts
View File

@ -3,7 +3,7 @@ import {
DAEMON_PB_USERNAME,
PUBLIC_APP_DB,
PUBLIC_APP_DOMAIN,
PUBLIC_APP_PROTOCOL,
PUBLIC_HTTP_PROTOCOL,
} from '$constants'
import { Logger, mkSingleton } from '@pockethost/common'
import { createPbClient } from './PbClient'
@ -31,7 +31,7 @@ export const clientService = mkSingleton(async (cfg: ClientServiceConfig) => {
dbg(`Logged in`)
} catch (e) {
error(
`CANNOT AUTHENTICATE TO ${PUBLIC_APP_PROTOCOL}://${PUBLIC_APP_DB}.${PUBLIC_APP_DOMAIN}/_/`,
`CANNOT AUTHENTICATE TO ${PUBLIC_HTTP_PROTOCOL}://${PUBLIC_APP_DB}.${PUBLIC_APP_DOMAIN}/_/`,
)
process.exit(-1)
}

4
packages/dashboard/src/components/helpers/Meta.svelte
View File

@ -1,7 +1,7 @@
<script>
import { PUBLIC_APP_DOMAIN, PUBLIC_APP_PROTOCOL } from '$src/env'
import { PUBLIC_APP_DOMAIN, PUBLIC_HTTP_PROTOCOL } from '$src/env'
const baseUrl = `${PUBLIC_APP_PROTOCOL}://${PUBLIC_APP_DOMAIN}/`
const baseUrl = `${PUBLIC_HTTP_PROTOCOL}://${PUBLIC_APP_DOMAIN}/`
const imageUrl = `${baseUrl}poster.png`
const tagline = `Get a PocketBase backend for your next app in under 10 seconds.`
</script>

2
packages/dashboard/src/env.ts
View File

@ -22,7 +22,7 @@ export const envb = (name: PublicEnvName, _default: boolean) =>
export const PUBLIC_APP_DB = env('PUBLIC_APP_DB', 'pockethost-central')
export const PUBLIC_APP_DOMAIN = env('PUBLIC_APP_DOMAIN', 'pockethost.io')
export const PUBLIC_APP_PROTOCOL = env('PUBLIC_APP_PROTOCOL', 'https')
export const PUBLIC_HTTP_PROTOCOL = env('PUBLIC_HTTP_PROTOCOL', 'https')
export const PUBLIC_DEBUG = envb('PUBLIC_DEBUG', dev)

8
packages/dashboard/src/pocketbase/index.ts
View File

@ -1,5 +1,9 @@
import { browser } from '$app/environment'
import { PUBLIC_APP_DB, PUBLIC_APP_DOMAIN, PUBLIC_APP_PROTOCOL } from '$src/env'
import {
PUBLIC_APP_DB,
PUBLIC_APP_DOMAIN,
PUBLIC_HTTP_PROTOCOL,
} from '$src/env'
import { logger } from '@pockethost/common'
import {
createPocketbaseClient,
@ -13,7 +17,7 @@ export const client = (() => {
if (clientInstance) return clientInstance
const { info } = logger()
info(`Initializing pocketbase client`)
const url = `${PUBLIC_APP_PROTOCOL}://${PUBLIC_APP_DB}.${PUBLIC_APP_DOMAIN}`
const url = `${PUBLIC_HTTP_PROTOCOL}://${PUBLIC_APP_DB}.${PUBLIC_APP_DOMAIN}`
clientInstance = createPocketbaseClient({ url })
return clientInstance
}

4
packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte
View File

@ -1,6 +1,6 @@
<script lang="ts">
import CodeSample from '$components/CodeSample.svelte'
import { PUBLIC_APP_DOMAIN, PUBLIC_APP_PROTOCOL } from '$src/env'
import { PUBLIC_APP_DOMAIN, PUBLIC_HTTP_PROTOCOL } from '$src/env'
import { instance } from './store'
import Card from '$components/cards/Card.svelte'
import CardHeader from '$components/cards/CardHeader.svelte'
@ -9,7 +9,7 @@
let connectionSnippet = ''
$: {
const url = `${PUBLIC_APP_PROTOCOL}://${$instance.subdomain}.${PUBLIC_APP_DOMAIN}`
const url = `${PUBLIC_HTTP_PROTOCOL}://${$instance.subdomain}.${PUBLIC_APP_DOMAIN}`
connectionSnippet = `import PocketBase from 'pocketbase';\n\nconst url = '${url}'\nconst client = new PocketBase(url)`
}