Canary ✨

.devcontainer/devcontainer.json

@@ -86,6 +86,7 @@
 		//   "install_deno": "curl -fsSL https://deno.land/install.sh | sh",
 		"install_xdg-utils": "bash ./.devcontainer/scripts/install_xdg-utils.sh",
 		"install_gcloud-cli": "bash ./.devcontainer/scripts/install_gcloud-cli.sh",
+		"install_firebase-cli": "bash ./.devcontainers/scripts/install_firebase-cli.sh",
 		"configure_pnpm-cli": "bash ./.devcontainer/scripts/install_gcloud-cli.sh",
 		"configure_git-repo": "bash ./.devcontainer/scripts/configure_git-repo.sh"
 	},

.devcontainer/scripts/install_firebase-cli.sh

@@ -0,0 +1 @@
+curl -sL https://firebase.tools | bash

.env.example

@@ -9,4 +9,7 @@ VITE_PROXY_URL=https://localhost:3000
 VITE_API_URL=https://localhost:3001
 
 # Advanced
-VITE_S3_PREFIX=https://s3.eu-west-3.amazonaws.com/meeting-baas-video
+VITE_S3_PREFIX=https://s3.eu-west-3.amazonaws.com/meeting-baas-video
+
+# Environment
+NODE_ENV=development

.gitignore

@@ -78,6 +78,7 @@ web_modules/
 .env.development.local
 .env.test.local
 .env.production.local
+.env.pre-production.local
 .env.local
 
 # parcel-bundler cache (https://parceljs.org/)

apps/api/.env.example

@@ -1,5 +1,5 @@
 # MeetingBaas Proxy Config
-MEETINGBAAS_API_URL="https://api.meeting-baas.com"
+MEETINGBAAS_API_URL="https://api.meetingbaas.com"
 MEETINGBAAS_S3_URL="https://s3.eu-west-3.amazonaws.com/meeting-baas-video"
 
 # Google Auth
@@ -14,11 +14,9 @@ TURSO_AUTH_TOKEN=""
 # Auth
 BETTER_AUTH_SECRET=""
 BETTER_AUTH_URL="http://localhost:3001"
-BETTER_AUTH_TRUSTED_ORIGINS="http://localhost:5173"
 
-# Keyless Config
-# This section is a work-in-progress
+# CORS
+API_TRUSTED_ORIGINS="http://localhost:5173"
 
-# Hono Firebase Compatability
-# https://github.com/honojs/hono/issues/1695
-# NODEJS_HELPERS="0"
+# Environment
+NODE_ENV=development

apps/api/package.json

@@ -20,7 +20,7 @@
   "dependencies": {
     "@hono/node-server": "^1.13.2",
     "@libsql/client": "^0.14.0",
-    "better-auth": "0.7.1-beta.6",
+    "better-auth": "0.7.3",
     "dotenv": "^16.4.5",
     "drizzle-orm": "^0.35.2",
     "firebase-admin": "^12.6.0",

apps/api/src/lib/auth.ts

@@ -9,6 +9,7 @@ export const auth = betterAuth({
   logger: {
     verboseLogging: true,
   },
+  trustedOrigins: process.env.API_TRUSTED_ORIGINS?.split(','),
   socialProviders: {
     google: {
       clientId: process.env.GOOGLE_CLIENT_ID!,

apps/api/src/routes/auth.ts

@@ -8,7 +8,7 @@ const authRouter = new Hono<Bindings>();
 authRouter.use(
   '/**',
   cors({
-    origin: process.env.BETTER_AUTH_TRUSTED_ORIGINS!,
+    origin: process.env.API_TRUSTED_ORIGINS?.split(',') ?? [],
     allowHeaders: ['Content-Type', 'Authorization'],
     allowMethods: ['POST', 'GET', 'OPTIONS'],
     exposeHeaders: ['Content-Length'],

apps/api/src/routes/calendars.ts

@@ -10,7 +10,7 @@ const calendars = new Hono<Bindings>();
 calendars.use(
   '/*',
   cors({
-    origin: process.env.BETTER_AUTH_TRUSTED_ORIGINS!,
+    origin: process.env.API_TRUSTED_ORIGINS?.split(',') ?? [],
     exposeHeaders: ['Content-Length'],
     maxAge: 600,
     credentials: true,

apps/docs/.env.example

@@ -1,2 +1,8 @@
 ORAMA_PRIVATE_API_KEY=""
-ORAMA_INDEX_ID=""
+ORAMA_INDEX_ID=""
+
+NEXT_PUBLIC_ORAMA_API_KEY=""
+NEXT_PUBLIC_ORAMA_ENDPOINT=""
+
+# Environment
+NODE_ENV=development

apps/docs/content/docs/concepts/environment-variables.mdx

@@ -184,7 +184,7 @@ Create a `.env.development.local` file in the below directory of your project an
 These values are used by the api to figure out the api url for baas servers.
 
 ```txt title=".env.development.local"
-MEETINGBAAS_API_URL="https://api.meeting-baas.com"
+MEETINGBAAS_API_URL="https://api.meetingbaas.com"
 MEETINGBAAS_S3_URL="https://s3.eu-west-3.amazonaws.com/meeting-baas-video"
 ```
 
@@ -247,13 +247,14 @@ Create a `.env.development.local` file in the below directory of your project an
 
 <Steps>
 <Step>
-### MeetingBaas Proxy Configuration
+### MeetingBaas Configuration
 
 These values are used by the api to figure out the api url for baas servers.
 
 ```txt title=".env.development.local"
-MEETINGBAAS_API_URL="https://api.meeting-baas.com"
-MEETINGBAAS_S3_URL="https://s3.eu-west-3.amazonaws.com/meeting-baas-video"
+NITRO_MEETINGBAAS_API_URL="https://api.meetingbaas.com"
+NITRO_MEETINGBAAS_S3_URL="https://s3.eu-west-3.amazonaws.com/meeting-baas-video"
+NITRO_TRUSTED_ORIGINS="http://localhost:5173" # comma separated list of trusted origins
 ```
 
 </Step>
@@ -285,16 +286,21 @@ TURSO_AUTH_TOKEN=""
 <Step>
 ### Authentication Configuration
 
+<Callout>
+  When deploying to Google Cloud Run with a custom domain, you should set the
+  `BETTER_AUTH_URL` environment variable to the custom domain.
+</Callout>
+
 These values are used by the api to perform authentication. Please follow the [guide](/docs/concepts/api/authentication) for more details:
 
 ```txt title=".env.development.local"
 BETTER_AUTH_SECRET=""
 BETTER_AUTH_URL="http://localhost:3001"
-BETTER_AUTH_TRUSTED_ORIGINS="http://localhost:5173"
+API_TRUSTED_ORIGINS="http://localhost:5173"
 ```
 
 <Callout>
-  The `BETTER_AUTH_TRUSTED_ORIGINS` is not only used for authentication but also
+  The `API_TRUSTED_ORIGINS` is not only used for authentication but also
   for CORS configuration.
 </Callout>
 

apps/docs/content/docs/guides/deployment/firebase.mdx

@@ -30,8 +30,7 @@ For more information on Firebase Hosting, refer to the official [Firebase Hostin
 If not already, create a Firebase project in the Firebase Console:
 
 1. Create a project named **Transcript Seeker**.
-2. Then, create two new web apps:
-   - `transcript-seeker-api`: Replace `transcript-seeker-api-c8419` in `firebase.json` and `.firebaserc` with this new ID.
+2. Then, create a new web app:
    - `transcript-seeker-proxy`: Replace `transcript-seeker-proxy` in `firebase.json` and `.firebaserc` with this new ID.
 3. Navigate to **Hosting** and click "Get Started."
 4. Finally, Replace `transcript-seeker-bdc29` in `firebase.json` and `.firebaserc` with your project id. (This is for firebase hosting, when you click on get started it automatically creates a hosting project with ur app id)
@@ -197,6 +196,10 @@ The command below builds and deploys the Cloud Run service. Modify the `SERVICE_
   can replace `COMMIT_SHA` with a unique identifier.
 </Callout>
 
+<Callout>
+  If you have already deployed the frontend and are encountering a CORS error, it may be due to the API being built for production. Once the build is complete, the CORS error should be resolved.
+</Callout>
+
 ```bash title="Terminal"
 export COMMIT_SHA=$(git rev-parse --short HEAD)
 export DEPLOY_REGION="us-central1"

apps/docs/next.config.mjs

@@ -10,16 +10,16 @@ const withMDX = createMDX();
 /** @type {import('next').NextConfig} */
 
 const config = {
-  output: "export",
+  // output: "export",
   reactStrictMode: true,
   eslint: {
     // Replaced by root workspace command
     ignoreDuringBuilds: true,
   },
-  serverExternalPackages: ["ts-morph", "typescript"],
-  images: {
-    unoptimized: true,
-  },
+  // serverExternalPackages: ["ts-morph", "typescript"],
+  // images: {
+  //   unoptimized: true,
+  // },
 };
 
 export default withAnalyzer(withMDX(config));

apps/proxy/.env.example

@@ -1,10 +1,16 @@
 # MeetingBaas Proxy Config
-NITRO_MEETINGBAAS_API_URL=https://api.meeting-baas.com
+NITRO_MEETINGBAAS_API_URL=https://api.meetingbaas.com
 NITRO_MEETINGBAAS_S3_URL=https://s3.eu-west-3.amazonaws.com/meeting-baas-video
 
 # Keyless Config
 # This section is a work-in-progress
 
 # Firebase Deployment Config
 # Advanced, only use if using firebase deployment
-# NITRO_PRESET=firebase
+# NITRO_PRESET=firebase
+
+# Cors
+NITRO_TRUSTED_ORIGINS="http://localhost:5173"
+
+# Environment
+NODE_ENV=development

apps/proxy/README.md

@@ -10,6 +10,7 @@ Once deployed, make sure to set the following environment variables:
 
 - `NITRO_MEETINGBAAS_API_URL` - The URL for the MeetingBaas API
 - `NITRO_MEETINGBAAS_S3_URL` - The URL for the MeetingBaas S3 bucket
+- `NITRO_TRUSTED_ORIGINS` - The trusted cors origins
 
 ### Local Development
 

apps/proxy/nitro.config.ts

@@ -1,20 +1,11 @@
 //https://nitro.unjs.io/config
-import process from 'node:process';
-
-const env = process.env;
-
-const MEETINGBAAS_API_URL = env.NITRO_MEETINGBAAS_API_URL || 'https://api.meeting-baas.com';
-const MEETINGBAAS_S3_URL =
-  env.NITRO_MEETINGBAAS_S3_URL || 'https://s3.eu-west-3.amazonaws.com/meeting-baas-video';
-
 export default defineNitroConfig({
   srcDir: 'server',
 
-  // https://github.com/unjs/rou3/tree/radix3#route-matcher
-  routeRules: {
-    '/api/meetingbaas/**': { proxy: `${MEETINGBAAS_API_URL}/**`, cors: true },
-    '/api/s3/**': { proxy: `${MEETINGBAAS_S3_URL}/**`, cors: true },
-    // '/proxy/**': { proxy: '/api/**' },
+  runtimeConfig: {
+    trustedOrigins: "https://app.transcriptseeker.com",
+    meetingbaasApiUrl: "https://api.meetingbaas.com",
+    meetingbaasS3Url: "https://s3.eu-west-3.amazonaws.com/meeting-baas-video",
   },
 
   firebase: {

apps/proxy/package.json

@@ -30,8 +30,6 @@
   },
   "prettier": "@meeting-baas/prettier-config",
   "dependencies": {
-    "firebase-admin": "^12.6.0",
-    "firebase-functions": "^6.0.1",
-    "firebase-functions-test": "^3.3.0"
+    "h3-proxy": "^1.13.0"
   }
 }

apps/proxy/server/middleware/cors.ts

@@ -0,0 +1,15 @@
+export default defineEventHandler((event) => {
+  const trustedOrigins = useRuntimeConfig(event).trustedOrigins.split(',');
+  const didHandleCors = handleCors(event, {
+    origin: trustedOrigins,
+    preflight: {
+      statusCode: 204,
+    },
+    credentials: true,
+    methods: '*',
+  });
+
+  if (didHandleCors) {
+    return;
+  }
+});

apps/proxy/server/middleware/meetingbaas-proxy.ts

@@ -0,0 +1,15 @@
+import { createProxyEventHandler } from 'h3-proxy'
+
+export default eventHandler((event) => {
+  const { meetingbaasApiUrl } = useRuntimeConfig(event);
+
+  const proxy = createProxyEventHandler({
+    target: meetingbaasApiUrl,
+    pathRewrite: {
+      '^/api/meetingbaas': '',
+    },
+    pathFilter: ['/api/meetingbaas/**']
+  })
+
+  return proxy(event);
+});

apps/proxy/server/middleware/s3-proxy.ts

@@ -0,0 +1,15 @@
+import { createProxyEventHandler } from 'h3-proxy'
+
+export default eventHandler((event) => {
+  const { meetingbaasS3Url } = useRuntimeConfig(event);
+
+  const proxy = createProxyEventHandler({
+    target: meetingbaasS3Url,
+    pathRewrite: {
+      '^/api/s3': '',
+    },
+    pathFilter: ['/api/s3/**']
+  })
+
+  return proxy(event);
+});

apps/web/package.json

@@ -29,7 +29,7 @@
     "@tanstack/react-table": "^8.19.2",
     "@vidstack/react": "^1.11.24",
     "assemblyai": "^4.6.1",
-    "better-auth": "0.7.1-beta.6",
+    "better-auth": "0.7.3",
     "date-fns": "^3.6.0",
     "dotenv-cli": "catalog:",
     "hls.js": "^1.5.13",