gregor/create-glstack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
gregor
2026-10-07 15:35:04 +02:00
parent c7e7e615c2
commit 8e3abca9d7
13 changed files with 179 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+6 -4
View File
@@ -19,7 +19,7 @@ bun create glstack
The CLI asks for:
- **Project name** -- used for the directory, the database and the `@<name>/rpc` package
- **Project name** -- lowercase letters, digits and dashes; used for the directory, the database and the `@<name>/rpc` package. An existing non-empty directory is never overwritten
- **Web frontend** -- SvelteKit, Solid Start or none
- **Mobile frontend** -- React Native + Expo or none
- **Bundle identifier** (Expo only) -- reverse-DNS id used as both the iOS bundle identifier and the Android package, e.g. `com.example.app`
@@ -58,15 +58,17 @@ devenv up
### Mobile (Expo)
`devenv up` creates an Android emulator matching your CPU (arm64 or x86_64), waits for it to boot and runs the app on it. On macOS it also builds and runs the app on the iOS simulator. Both apps share one Metro bundler, so saving a file reloads both.
`devenv up` starts Metro as its own process, creates an Android emulator matching your CPU (arm64 or x86_64), waits up to 5 minutes for it to boot and runs the app on it. On macOS it also builds and runs the app on the iOS simulator. Both apps use the same Metro bundler, so saving a file reloads both, and one platform failing to build doesn't stop the other.
The Android emulator reaches the API at `10.0.2.2:8080` and the iOS simulator at `127.0.0.1:8080`; the app picks the right one per platform.
The app reaches the API at `127.0.0.1:8080` everywhere: the iOS simulator shares the Mac's network, and `devenv up` runs `adb reverse` for the emulator and any Android phone connected over USB. Physical iPhones aren't covered, since the API only listens on localhost.
The example apps poll the API every 2 seconds, so a change made on one device or in the web app shows up on the others.
The native `ios/` and `android/` folders are generated from `app.json` and not committed. After changing native config or upgrading Expo, delete them and they are regenerated on the next run.
#### iOS on macOS
Nix can't provide Xcode, so the iOS simulator needs a few things installed on the Mac. Entering the devenv shell checks them and lists anything missing; run `ios-check` to check again. Until they are met, `devenv up` skips iOS and runs everything else.
Nix can't provide Xcode, so the iOS simulator needs a few things installed on the Mac. Entering the devenv shell checks them and lists anything missing (once they pass, at most once a day); run `ios-check` to check again. Until they are met, `devenv up` skips iOS and runs everything else. Set `SKIP_IOS_CHECK=1` to turn the check off, e.g. in `devenv.local.nix`.
| Requirement | How to fix |
| --- | --- |
index.ts
+37 -22
View File
@@ -1,21 +1,34 @@
#!/usr/bin/env bun
import * as p from "@clack/prompts";
import { initRenderer } from '@gregorlohaus/tdir'
import { initRenderer, TargetExistsError } from '@gregorlohaus/tdir'
import { z } from 'zod'
import path from "node:path";
import { readdir, rename } from "node:fs/promises";
import { existsSync, readdirSync, statSync } from "node:fs";
p.intro(`create-glstack ${process.env.GLSTACK_DEV && 'isDev'}`);
p.intro(`create-glstack${process.env.GLSTACK_DEV === 'true' ? ' (dev)' : ''}`);
const defaultName = "glstack-test"
// Java and Kotlin keywords can't be Android package segments.
const reservedWords = new Set(["abstract", "as", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "default", "do", "double", "else", "enum", "extends", "false", "final", "finally", "float", "for", "fun", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "is", "long", "native", "new", "null", "object", "package", "private", "protected", "public", "return", "short", "static", "strictfp", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "typealias", "typeof", "val", "var", "void", "volatile", "when", "while"])
const isNonEmptyPath = (target: string) =>
existsSync(target) && (!statSync(target).isDirectory() || readdirSync(target).length > 0)
const project = await p.group(
{
name: () =>
p.text({
message: "What would you like to name your project?",
placeholder: "glstack-test",
defaultValue: "glstack-test",
placeholder: defaultName,
defaultValue: defaultName,
validate: (value) => {
const name = value || defaultName
// Used as directory, npm scope, Go module path segment and database name.
if (!/^[a-z][a-z0-9-]*$/.test(name)) {
return "Use lowercase letters, digits and dashes, starting with a letter"
}
if (isNonEmptyPath(name)) return `./${name} already exists and is not empty`
return undefined
},
}),
@@ -41,15 +54,19 @@ const project = await p.group(
bundleid: async ({ results }) => {
if (results.mobile !== "expo") return ""
// Valid as both an iOS bundle identifier and an Android package name.
const fallback = `com.${String(results.name).toLowerCase().replace(/[^a-z0-9]/g, "").replace(/^[0-9]+/, "") || "app"}.mobile`
const nameSegment = String(results.name).replace(/[^a-z0-9]/g, "")
const fallback = `com.${reservedWords.has(nameSegment) ? `${nameSegment}app` : nameSegment}.mobile`
return await p.text({
message: "What bundle identifier should the mobile app use?",
placeholder: fallback,
defaultValue: fallback,
validate: (value) => {
if (value && !/^[a-zA-Z][a-zA-Z0-9]*(\.[a-zA-Z][a-zA-Z0-9]*)+$/.test(value)) {
if (!value) return undefined
if (!/^[a-zA-Z][a-zA-Z0-9]*(\.[a-zA-Z][a-zA-Z0-9]*)+$/.test(value)) {
return "Use reverse-DNS segments of letters and digits, e.g. com.example.app"
}
const reserved = value.split(".").find((segment) => reservedWords.has(segment))
if (reserved) return `"${reserved}" is a Java/Kotlin keyword and can't be part of an Android package`
return undefined
},
})
@@ -60,6 +77,9 @@ const project = await p.group(
placeholder: "github.com/glstack-test",
defaultValue: "github.com/glstack-test",
validate: (value) => {
if (value && !/^[a-zA-Z0-9._~-]+(\/[a-zA-Z0-9._~-]+)*$/.test(value)) {
return "Use a module path without scheme or trailing slash, e.g. github.com/you"
}
return undefined
},
}),
@@ -87,23 +107,18 @@ const render = createRenderer(z.object({
})
}))
const destDir = path.join("./", project.name);
try {
// `results` in the bundleid prompt makes group() infer it as unknown.
render(destDir, { project: { ...project, bundleid: project.bundleid as string } }, { reverseMap: true })
render(destDir, { project: { ...project, bundleid: project.bundleid as string } }, {
reverseMap: true,
overwrite: false,
// npm never publishes .gitignore/.npmrc, so the template stores them as _gitignore/_npmrc.
const dotfiles: Record<string, string> = { _gitignore: ".gitignore", _npmrc: ".npmrc" }
for (const file of await readdir(destDir, { recursive: true })) {
const dotname = dotfiles[path.basename(file)]
if (dotname) await rename(path.join(destDir, file), path.join(destDir, path.dirname(file), dotname))
}
const mapFile = Bun.file(path.join(destDir, ".tdir-map.json"))
if (await mapFile.exists()) {
const map = await mapFile.json()
for (const entry of map.files) {
const dotname = dotfiles[path.basename(entry.outputPath)]
if (dotname) entry.outputPath = path.join(path.dirname(entry.outputPath), dotname)
}
await Bun.write(mapFile, JSON.stringify(map, null, 2))
rename: { _gitignore: ".gitignore", _npmrc: ".npmrc" },
})
} catch (error) {
if (!(error instanceof TargetExistsError)) throw error
p.cancel(`./${project.name} already exists and is not empty.`)
process.exit(1)
}
const s = p.spinner();
package.json
+2 -2
View File
@@ -4,7 +4,7 @@
"type": "module",
"license": "MIT",
"bin": {
"create-glstack": "./dist/index.js"
"create-glstack": "dist/index.js"
},
"files": [
"dist",
@@ -22,7 +22,7 @@
},
"dependencies": {
"@clack/prompts": "^1.2.0",
"@gregorlohaus/tdir": "^0.2.0",
"@gregorlohaus/tdir": "^0.3.0",
"zod": "^4.3.6"
}
}
template/apps/<@if(eq(context.project.frontend,"solid-start"))>web/src/app.tsx
+24 -18
View File
@@ -1,48 +1,54 @@
import { createSignal, For } from "solid-js";
import { createSignal, For, onCleanup, onMount, Show } from "solid-js";
import { createRouter, Todo } from "@<@var(context.project.name)>/rpc"
import { createEffect } from 'solid-js'
import "./app.css";
export default function App() {
const router = createRouter("http://127.0.0.1:8080")
// Changes made elsewhere (another tab, the mobile app) show up within this interval.
const syncIntervalMs = 2000
export default function App() {
const [todos, setTodos] = createSignal<Todo[]>([]);
const [offline, setOffline] = createSignal(false);
const [todoToCreateTask, setTodoToCreateTask] = createSignal<string>("");
const fetchTodos = () => {
router.todos.listTodos({}).then((r) => {
setTodos(r.todos)
})
setOffline(false)
// Polling returns the same list most of the time; keep the old array so <For> keeps its rows.
if (JSON.stringify(todos()) !== JSON.stringify(r.todos)) setTodos(r.todos)
}).catch(() => setOffline(true))
}
createEffect(() => {
onMount(() => {
fetchTodos()
const interval = setInterval(fetchTodos, syncIntervalMs)
onCleanup(() => clearInterval(interval))
})
const setTodoDone = (id: string, task: string) => {
return async (event : Event & { currentTarget: HTMLInputElement }) => {
await router.todos.updateTodo({ todo: { id, task, done: event.currentTarget.checked } })
fetchTodos()
return (event: Event & { currentTarget: HTMLInputElement }) => {
router.todos.updateTodo({ todo: { id, task, done: event.currentTarget.checked } }).then(fetchTodos, () => setOffline(true))
}
}
const deleteTodo = (id: string) => {
return async () => {
await router.todos.deleteTodo({ todo: { id } })
fetchTodos()
return () => {
router.todos.deleteTodo({ todo: { id } }).then(fetchTodos, () => setOffline(true))
}
}
const createTodo = () => {
router.todos.createTodo({ todo: { id: crypto.randomUUID(), task: todoToCreateTask() } }).then((r) => {
console.log(r)
const task = todoToCreateTask().trim()
if (!task) return
router.todos.createTodo({ todo: { id: crypto.randomUUID(), task } }).then(() => {
setTodoToCreateTask("")
fetchTodos()
}).catch((e) => {
console.log(e)
})
}, () => setOffline(true))
}
return (
<div>
<p>Create Todo</p>
<input value={todoToCreateTask()} onInput={(e) => setTodoToCreateTask(e.currentTarget.value)} type="text"/>
<Show when={offline()}><p style={{ color: "#d32f2f" }}>Can't reach the API, retrying…</p></Show>
<input value={todoToCreateTask()} onInput={(e) => setTodoToCreateTask(e.currentTarget.value)} type="text" placeholder="What needs to be done?"/>
<button onclick={createTodo}> create </button>
<For each={todos()}>
{(item:Todo) =>
template/apps/<@if(eq(context.project.frontend,"svelte-kit"))>web/src/routes/+page.svelte
+21 -16
View File
@@ -1,50 +1,55 @@
<script lang="ts">
import { createRouter, type Todo } from "@<@var(context.project.name)>/rpc"
import type { ChangeEventHandler } from "svelte/elements";
const router = createRouter("http://127.0.0.1:8080");
// Changes made elsewhere (another tab, the mobile app) show up within this interval.
const syncIntervalMs = 2000
let todos = $state<Todo[]>([])
let offline = $state(false)
let todoToCreateTask = $state<string>("")
const fetchTodos = () => {
router.todos.listTodos({}).then((r) => {
todos = r.todos;
})
offline = false
// Polling returns the same list most of the time; skip re-rendering it.
if (JSON.stringify($state.snapshot(todos)) !== JSON.stringify(r.todos)) todos = r.todos
}).catch(() => offline = true)
}
$effect(() => {
fetchTodos()
const interval = setInterval(fetchTodos, syncIntervalMs)
return () => clearInterval(interval)
})
const setTodoDone = (id: string, task: string) => {
return async (event : Event & { currentTarget: HTMLInputElement }) => {
await router.todos.updateTodo({ todo: { id, task, done: event.currentTarget.checked } })
fetchTodos()
return (event: Event & { currentTarget: HTMLInputElement }) => {
router.todos.updateTodo({ todo: { id, task, done: event.currentTarget.checked } }).then(fetchTodos, () => offline = true)
}
}
const deleteTodo = (id: string) => {
return async () => {
await router.todos.deleteTodo({ todo: { id } })
fetchTodos()
return () => {
router.todos.deleteTodo({ todo: { id } }).then(fetchTodos, () => offline = true)
}
}
const createTodo = () => {
router.todos.createTodo({ todo: { id: crypto.randomUUID(), task: todoToCreateTask } }).then((r) => {
console.log(r)
const task = todoToCreateTask.trim()
if (!task) return
router.todos.createTodo({ todo: { id: crypto.randomUUID(), task } }).then(() => {
todoToCreateTask = ""
fetchTodos()
}).catch((e) => {
console.log(e)
})
}, () => offline = true)
}
</script>
<div>
<h1>Create Todo</h1>
<input bind:value={todoToCreateTask} type="text"/>
{#if offline}<p style="color: #d32f2f">Can't reach the API, retrying…</p>{/if}
<input bind:value={todoToCreateTask} type="text" placeholder="What needs to be done?"/>
<button onclick={createTodo}> create </button>
{#each todos as todo (todo.id)}
<div>
{todo.task}
<input type='checkbox' onchange={setTodoDone(todo.id || "",todo.task)}/>
<input type='checkbox' checked={todo.done} onchange={setTodoDone(todo.id || "",todo.task)}/>
<button onclick={deleteTodo(todo.id || "")}>delete</button>
</div>
{/each}
template/apps/<@if(eq(context.project.mobile,"expo"))>mobile/AGENTS.md
+1 -1
View File
@@ -1,3 +1,3 @@
# Expo HAS CHANGED
Read the exact versioned docs at https://docs.expo.dev/versions/v56.0.0/ before writing any code.
Read the exact versioned docs at https://docs.expo.dev/versions/v57.0.0/ before writing any code.
template/apps/<@if(eq(context.project.mobile,"expo"))>mobile/src/app/index.tsx
+20 -13
View File
@@ -8,8 +8,10 @@ import * as Crypto from "expo-crypto"
import { background, colorInvert, controlSize, padding as iosPadding, shapes } from "@expo/ui/swift-ui/modifiers";
// No numeric width() on Android: @expo/ui 57 can't convert it natively and crashes.
import { fillMaxWidth, padding, weight } from "@expo/ui/jetpack-compose/modifiers";
// The Android emulator reaches the host via 10.0.2.2; the iOS simulator shares the host's network.
const apiUrl = Platform.OS === "android" ? "http://10.0.2.2:8080" : "http://127.0.0.1:8080"
// The iOS simulator shares the host's network; devenv runs `adb reverse` so Android devices do too.
const router = createRouter("http://127.0.0.1:8080")
// Changes made elsewhere (another device, the web app) show up within this interval.
const syncIntervalMs = 2000
// SwiftUI clips a border to its corner radius, cutting off the corners, so on iOS the
// border is an outer rounded fill showing 1pt around an inner one.
@@ -38,38 +40,42 @@ function AnimatedRow({ children }: { children: React.ReactNode }) {
}
export default function Index() {
const router = createRouter(apiUrl)
const [todos, setTodos] = useState<Array<Todo>>([])
const [offline, setOffline] = useState(false)
const todoToCreateTask = useNativeState<string>("")
const colorScheme = useColorScheme()
const fetchTodos = () => {
router.todos.listTodos({}).then((r) => {
setTodos(r.todos)
})
setOffline(false)
// Polling returns the same list most of the time; keep the old array to skip re-rendering.
setTodos((current) => JSON.stringify(current) === JSON.stringify(r.todos) ? current : r.todos)
}).catch(() => setOffline(true))
}
useEffect(() => {
fetchTodos();
fetchTodos()
const interval = setInterval(fetchTodos, syncIntervalMs)
return () => clearInterval(interval)
}, [])
const setTodoDone = (id: string, task: string) => {
return (done: boolean) => {
router.todos.updateTodo({ todo: { id, task, done } }).then(fetchTodos)
router.todos.updateTodo({ todo: { id, task, done } }).then(fetchTodos, () => setOffline(true))
}
}
const deleteTodo = (id: string) => {
return () => {
router.todos.deleteTodo({ todo: { id } }).then(fetchTodos)
router.todos.deleteTodo({ todo: { id } }).then(fetchTodos, () => setOffline(true))
}
}
const createTodo = () => {
router.todos.createTodo({ todo: { id: Crypto.randomUUID(), task: todoToCreateTask.value } }).then((r) => {
console.log(r)
const task = todoToCreateTask.value.trim()
if (!task) return
router.todos.createTodo({ todo: { id: Crypto.randomUUID(), task } }).then(() => {
todoToCreateTask.value = ""
fetchTodos()
}).catch((e) => {
console.log(e)
})
}, () => setOffline(true))
}
const updateTodoToCreateTask = (task: string) => {
@@ -81,6 +87,7 @@ export default function Index() {
<Host matchContents={{ vertical: true }}>
<Column alignment="center" modifiers={[fillMaxWidth()]}>
<Text textStyle={{fontSize:30}}> Create Todo </Text>
{offline && <Text textStyle={{ color: "#FF3B30" }}>Can't reach the API, retrying…</Text>}
<TextInput
value={todoToCreateTask}
onChangeText={updateTodoToCreateTask}
template/bunfig.toml
+3
View File
@@ -0,0 +1,3 @@
[install]
# React Native expects one flat node_modules; isolated installs keep a copy per peer-dependency set.
linker = "hoisted"
template/devenv.nix
+40 -16
View File
@@ -1,6 +1,11 @@
{ pkgs, lib, config, inputs, ... }:
<@if(eq(context.project.mobile,"expo"))>
let
avdName = "Pixel_5_API36";
# Fixed console port, so scripts can address this emulator as emulator-5554 even when others run.
emulatorSerial = "emulator-5554";
# Apple's xcrun, for tools that need `xcrun simctl`, which the Nix SDK's xcrun lacks.
systemXcrun = pkgs.runCommand "system-xcrun" { } "mkdir -p $out/bin && ln -s /usr/bin/xcrun $out/bin/xcrun";
# Sets dev_dir to Xcode's developer dir. devenv points DEVELOPER_DIR at the Nix SDK,
# which xcode-select would echo back, so it is unset for the lookup.
xcodeDevDir = ''
@@ -22,14 +27,14 @@ in
pkgs.protoc-gen-connect-go
pkgs.protoc-gen-es
pkgs.cobra-cli
];
]<@if(eq(context.project.mobile,"expo"))> ++ lib.optionals pkgs.stdenv.isDarwin [ pkgs.cocoapods ]<@endif>;
<@if(eq(context.project.mobile,"expo"))>
android = {
enable = true;
emulator = {
enable = true;
};
buildTools.version = ["34.0.0" "35.0.0" "36.0.0" ]; # add 36.0.0
buildTools.version = [ "34.0.0" "35.0.0" "36.0.0" ];
reactNative.enable = true;
android-studio = {
enable = false;
@@ -43,12 +48,16 @@ in
enterShell = lib.optionalString pkgs.stdenv.isLinux ''
export LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$LD_LIBRARY_PATH
'' + lib.optionalString pkgs.stdenv.isDarwin ''
ios-check || true
# Re-check at most daily once the iOS requirements are met. SKIP_IOS_CHECK=1 turns this off.
ios_check_ok="$DEVENV_STATE/ios-check-ok"
if [ -z "''${SKIP_IOS_CHECK:-}" ] && [ -z "$(find "$ios_check_ok" -mtime -1 2>/dev/null)" ]; then
if ios-check; then touch "$ios_check_ok"; else echo "Set SKIP_IOS_CHECK=1 to hide this." >&2; fi
fi
'';
# Use a system image matching the host CPU (arm64 on Apple Silicon, x86_64 elsewhere).
scripts.create-avd.exec = ''
if ! avdmanager list avd -c | grep -qx "Pixel_5_API34"; then
echo no | avdmanager create avd -n "Pixel_5_API34" -k "system-images;android-34;google_apis_playstore;${if pkgs.stdenv.hostPlatform.isAarch64 then "arm64-v8a" else "x86_64"}" -d "pixel_5"
if ! avdmanager list avd -c | grep -qx "${avdName}"; then
echo no | avdmanager create avd -n "${avdName}" -k "system-images;android-36;google_apis_playstore;${if pkgs.stdenv.hostPlatform.isAarch64 then "arm64-v8a" else "x86_64"}" -d "pixel_5"
fi
'';
# macOS only: Nix can't provide Xcode, so report what the iOS build still needs.
@@ -140,27 +149,42 @@ in
exec = "create-avd";
};
emulator = {
exec = "emulator -avd Pixel_5_API34";
exec = "emulator -avd ${avdName} -port 5554";
after = ["devenv:processes:createavd@completed"];
};
# One Metro bundler serves both apps, so iOS doesn't depend on the Android build.
metro = {
exec = lib.optionalString pkgs.stdenv.isDarwin ''
# Expo's CLI calls `xcrun simctl` to talk to the iOS simulator.
${xcodeDevDir}
export DEVELOPER_DIR="$dev_dir" PATH="${systemXcrun}/bin:$PATH"
'' + "exec bunx expo start --dev-client";
cwd = "./apps/mobile";
ready.http.get = { port = 8081; path = "/status"; };
};
expodev = {
# Wait for the emulator to finish booting, otherwise expo tries to start a second copy of the AVD.
exec = ''
adb -e wait-for-device
until [ "$(adb -e shell getprop sys.boot_completed 2>/dev/null | tr -d '\r')" = 1 ]; do sleep 2; done
bunx expo run:android
# Wait for the emulator to boot, otherwise expo tries to start a second copy of the AVD.
for _ in $(seq 150); do
if [ "$(adb -s ${emulatorSerial} shell getprop sys.boot_completed 2>/dev/null | tr -d '\r')" = 1 ]; then
# Lets the emulator and USB-connected devices reach the API on the host at 127.0.0.1:8080.
for device in $(adb devices | awk 'NR > 1 && $2 == "device" { print $1 }'); do
adb -s "$device" reverse tcp:8080 tcp:8080
done
exec bunx expo run:android --no-bundler --device ${avdName}
fi
sleep 2
done
echo "The Android emulator didn't finish booting within 5 minutes, see the emulator log." >&2
exit 1
'';
cwd = "./apps/mobile";
after= ["devenv:processes:emulator@started"];
restart = {
on = "always";
after = [ "devenv:processes:emulator@started" "devenv:processes:metro" ];
};
};
# Reuses the Metro bundler started by expodev.
expoios = lib.mkIf pkgs.stdenv.isDarwin {
exec = "run-ios";
cwd = "./apps/mobile";
after = ["devenv:processes:expodev@started"];
after = [ "devenv:processes:metro" ];
};
<@endif>
sqlwatcher = {
template/package.json
+4 -1
View File
@@ -9,5 +9,8 @@
"scripts": {
"dev": "bun run --filter '*' dev",
"build": "bun run --filter '*' build"
}
}<@if(eq(context.project.mobile,"expo"))>,
"overrides": {
"react-native-screens": "~4.26.0"
}<@endif>
}
template/services/api/cmd/serve.go
+1 -3
View File
@@ -32,9 +32,7 @@ var serveCmd = &cobra.Command{
}
conf := *config.Conf
ctx := context.Background()
db_url := "postgres://" + conf.Database.User + ":" + conf.Database.Password + "@" + conf.Database.Host + ":" + strconv.Itoa(conf.Database.Port) + "/" + conf.Database.Name
db_url = db_url + "?sslmode=disable"
conn, err := pgxpool.New(ctx, db_url)
conn, err := pgxpool.New(ctx, conf.Database.URL().String())
if err != nil {
panic(err.Error())
}
template/services/api/config/config.go
+15 -1
View File
@@ -3,8 +3,11 @@ package config
import (
"github.com/adrg/xdg"
"github.com/pelletier/go-toml"
"net"
"net/url"
"os"
"path/filepath"
"strconv"
)
var confPath string
@@ -18,7 +21,7 @@ func init() {
Server: Server{
Host: "127.0.0.1",
Port: 8080,
FrontendUrls: []string{"http://localhost:5173"},
FrontendUrls: []string{"http://localhost:5173", "http://127.0.0.1:5173"},
},
Database: Database{
User: "pp",
@@ -75,6 +78,17 @@ type Database struct {
Name string
}
// URL returns the Postgres connection URL. The local dev database has no SSL.
func (d Database) URL() *url.URL {
return &url.URL{
Scheme: "postgres",
User: url.UserPassword(d.User, d.Password),
Host: net.JoinHostPort(d.Host, strconv.Itoa(d.Port)),
Path: "/" + d.Name,
RawQuery: "sslmode=disable",
}
}
type Config struct {
Server Server
Database Database
template/services/api/db/lib.go
+1 -20
View File
@@ -5,9 +5,6 @@ import (
"github.com/amacneil/dbmate/v2/pkg/dbmate"
_ "github.com/amacneil/dbmate/v2/pkg/driver/postgres"
"log"
"net/url"
"strconv"
"strings"
)
var Q *Queries
@@ -19,23 +16,7 @@ func RunDbMigrations() error {
return err
}
conf := *config.Conf
dbUrl, err := url.Parse(strings.Join([]string{
"postgresql://",
conf.Database.User,
":",
conf.Database.Password,
"@",
conf.Database.Host,
":",
strconv.Itoa(conf.Database.Port),
"/",
conf.Database.Name,
"?sslmode=disable",
}, ""))
if err != nil {
return err
}
db := dbmate.New(dbUrl)
db := dbmate.New(conf.Database.URL())
db.FS = MigrationsFs
db.MigrationsDir = []string{"migrations"}
migrations, err := db.FindMigrations()