Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ just dev
| `just check` | Run linting and type checks |
| `just fix` | Auto-fix formatting and lint issues |
| `just build` | Build all packages |
| `just deploy <env>` | Deploy API and app to Cloudflare |
| `just deploy` | Deploy the live API and app to Cloudflare |
| `just native` | Run the native desktop app |

## MOQ (Media over QUIC)
Expand Down
6 changes: 3 additions & 3 deletions api/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ check:
fix:
bun wrangler types

deploy env="staging": build
bun wrangler d1 migrations apply DB --env "{{env}}" --remote
bun wrangler deploy --env "{{env}}"
deploy: build
bun wrangler d1 migrations apply DB --env live --remote
bun wrangler deploy --env live
20 changes: 10 additions & 10 deletions api/worker-configuration.d.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/* eslint-disable */
// Generated by Wrangler by running `wrangler types` (hash: be2048b211127b05f5ed3f0a7d1ef2eb)
// Wrangler runtime types with environment bindings updated for the live-only configuration.
// Runtime types generated with workerd@1.20250906.0 2025-07-09
declare namespace Cloudflare {
interface Env {
API_URL: "http://localhost:3000" | "https://api.hang.now" | "https://api.hang.live";
APP_URL: "http://localhost:1420" | "https://hang.now" | "https://hang.live";
GOOGLE_CLIENT_ID: "632186286103-6g3knqa8eof9p4bf1ndedgn9r6g68n73.apps.googleusercontent.com" | "1093943946174-915g0a9jpu7gih5emghmtabhge29qgg2.apps.googleusercontent.com" | "632186286103-p5k3rhlsq1bgkku7dluko4nlv4ca4hao.apps.googleusercontent.com";
DISCORD_CLIENT_ID: "1392633766010294494" | "1392629623812259940" | "1389725440020840548";
R2_PUBLIC_URL: "http://localhost:3000/public" | "https://public.hang.now" | "https://public.hang.live";
RELAY_URL: "http://localhost:4443" | "https://relay.moq.dev";
RELAY_PREFIX: "demo" | "staging" | "live";
APPLE_CLIENT_ID: "now.hang.api" | "live.hang.api";
API_URL: "http://localhost:3000" | "https://api.hang.live";
APP_URL: "http://localhost:1420" | "https://hang.live";
GOOGLE_CLIENT_ID: "632186286103-6g3knqa8eof9p4bf1ndedgn9r6g68n73.apps.googleusercontent.com" | "632186286103-p5k3rhlsq1bgkku7dluko4nlv4ca4hao.apps.googleusercontent.com";
DISCORD_CLIENT_ID: "1392633766010294494" | "1389725440020840548";
R2_PUBLIC_URL: "http://localhost:3000/public" | "https://public.hang.live";
RELAY_URL: "http://localhost:4443" | "https://cdn.moq.dev";
RELAY_PREFIX: "demo" | "hang";
APPLE_CLIENT_ID: "live.hang.api";
APPLE_TEAM_ID: "D7D5SDDB5Z";
APPLE_KEY_ID: "7BQ2ZQY943" | "Q7CN38JH2Z";
APPLE_KEY_ID: "Q7CN38JH2Z";
AUTH_SECRET: string;
GOOGLE_CLIENT_SECRET: string;
DISCORD_CLIENT_SECRET: string;
Expand Down
45 changes: 0 additions & 45 deletions api/wrangler.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -62,52 +62,7 @@
// "RELAY_SECRET": <stored in .dev.vars, set dynamically>
},

// Staging environment overrides
"env": {
"staging": {
"name": "api-hang-now",
"account_id": "dd618f5dbd5da77b8296f1613c301f5c",
"route": {
"pattern": "api.hang.now",
"custom_domain": true
},
"d1_databases": [
{
"binding": "DB",
"database_name": "db-hang-now",
"database_id": "6b0a56ab-3475-463d-8025-2e0e42779895"
}
],
"r2_buckets": [
{
"binding": "PUBLIC",
"bucket_name": "public-hang-now"
}
],
"vars": {
"API_URL": "https://api.hang.now",
"APP_URL": "https://hang.now",

// "AUTH_SECRET": npx wrangler secret put AUTH_SECRET --env staging

"GOOGLE_CLIENT_ID": "1093943946174-915g0a9jpu7gih5emghmtabhge29qgg2.apps.googleusercontent.com",
// "GOOGLE_CLIENT_SECRET": npx wrangler secret put GOOGLE_CLIENT_SECRET --env staging

"DISCORD_CLIENT_ID": "1392629623812259940",
// "DISCORD_CLIENT_SECRET": npx wrangler secret put DISCORD_CLIENT_SECRET --env staging

"APPLE_CLIENT_ID": "now.hang.api",
"APPLE_TEAM_ID": "D7D5SDDB5Z",
"APPLE_KEY_ID": "7BQ2ZQY943",
// "APPLE_CLIENT_SECRET": npx wrangler secret put APPLE_CLIENT_SECRET --env staging

"R2_PUBLIC_URL": "https://public.hang.now",

"RELAY_URL": "https://cdn.moq.dev",
"RELAY_PREFIX": "staging"
// "RELAY_SECRET": npx wrangler secret put RELAY_SECRET --env staging
}
},
// Live/production environment overrides
"live": {
"name": "api-hang-live",
Expand Down
8 changes: 4 additions & 4 deletions app/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ upgrade:
build env="development":
bun vite build --mode "{{env}}"

# Deploy the site to Cloudflare Pages
deploy env="staging":
just build "{{env}}"
bun wrangler deploy --env "{{env}}"
# Deploy the site to Cloudflare Workers
deploy:
just build live
bun wrangler deploy --env live

# Run the app in development mode
dev:
Expand Down
10 changes: 0 additions & 10 deletions app/wrangler.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,7 @@
"port": 1420
},

// Staging environment configuration
"env": {
"staging": {
"name": "hang-now",
"account_id": "dd618f5dbd5da77b8296f1613c301f5c",
"route": {
"pattern": "hang.now",
"custom_domain": true
}
},

// Production environment configuration
"live": {
"name": "hang-live",
Expand Down
6 changes: 3 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ build:
prod: build
bun run --filter='@hang/*' prod

deploy env="staging":
just api deploy "{{env}}"
just app deploy "{{env}}"
deploy:
just api deploy
just app deploy

# Run the Android build, using --open to open Android Studio
android *args:
Expand Down
28 changes: 0 additions & 28 deletions native/tauri.staging.json

This file was deleted.

Loading