Cloud plan handing

Cargo.toml

@@ -61,6 +61,7 @@ hypr-ws-utils = { path = "crates/ws-utils", package = "ws-utils" }
 
 hypr-auth-interface = { path = "plugins/auth-interface", package = "auth-interface" }
 hypr-listener-interface = { path = "plugins/listener-interface", package = "listener-interface" }
+hypr-membership-interface = { path = "plugins/membership-interface", package = "membership-interface" }
 
 tauri = "2"
 tauri-build = "2"
@@ -82,6 +83,7 @@ tauri-plugin-flags = { path = "plugins/flags" }
 tauri-plugin-listener = { path = "plugins/listener" }
 tauri-plugin-local-llm = { path = "plugins/local-llm" }
 tauri-plugin-local-stt = { path = "plugins/local-stt" }
+tauri-plugin-membership = { path = "plugins/membership" }
 tauri-plugin-misc = { path = "plugins/misc" }
 tauri-plugin-notification = { path = "plugins/notification" }
 tauri-plugin-sfx = { path = "plugins/sfx" }
@@ -112,7 +114,7 @@ derive_more = "2"
 dirs = "6.0.0"
 dotenv = "0.15.0"
 dotenvy = "0.15.7"
-dotenvy_macro = "0.15.7"
+envy = "0.4"
 include_url_macro = "0.1.0"
 indoc = "2"
 insta = "1.42"

Taskfile.yaml

@@ -10,7 +10,7 @@ tasks:
   py:init: POETRY_VIRTUALENVS_IN_PROJECT=true poetry install --no-cache --no-interaction --all-extras
   py:run: poetry run python3 {{.CLI_ARGS}}
 
-  stripe: stripe listen --skip-verify --forward-to http://localhost:5000/webhook/stripe
+  stripe: stripe listen --skip-verify --forward-to http://localhost:1234/webhook/stripe
   bacon: bacon {{.CLI_ARGS}}
 
   bump:

apps/app/server/Cargo.toml

@@ -9,6 +9,7 @@ dotenv = { workspace = true }
 [dependencies]
 hypr-auth-interface = { workspace = true }
 hypr-listener-interface = { workspace = true }
+hypr-membership-interface = { workspace = true }
 
 hypr-analytics = { workspace = true }
 hypr-buffer = { workspace = true }
@@ -49,6 +50,7 @@ bytes = { workspace = true }
 chrono = { workspace = true }
 codes-iso-639 = { workspace = true }
 dotenv = { workspace = true }
+envy = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 uuid = { workspace = true }

apps/app/server/openapi.gen.json

@@ -27,22 +27,6 @@
         }
       }
     },
-    "/api/desktop/subscription": {
-      "get": {
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Subscription"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/api/web/connect": {
       "post": {
         "requestBody": {
@@ -69,6 +53,18 @@
         }
       }
     },
+    "/api/web/checkout": {
+      "get": {
+        "responses": {
+          "200": {
+            "description": "plain text",
+            "content": {
+              "text/plain; charset=utf-8": {}
+            }
+          }
+        }
+      }
+    },
     "/api/web/session/{id}": {
       "get": {
         "parameters": [
@@ -1245,14 +1241,6 @@
           "mp3"
         ]
       },
-      "Membership": {
-        "type": "string",
-        "enum": [
-          "Trial",
-          "Basic",
-          "Pro"
-        ]
-      },
       "NangoConnectSessionRequest": {
         "type": "object",
         "required": [
@@ -1674,17 +1662,6 @@
           }
         ]
       },
-      "Subscription": {
-        "type": "object",
-        "required": [
-          "membership"
-        ],
-        "properties": {
-          "membership": {
-            "$ref": "#/components/schemas/Membership"
-          }
-        }
-      },
       "TranscriptChunk": {
         "type": "object",
         "required": [

apps/app/server/src/env.rs

@@ -0,0 +1,35 @@
+pub fn load() -> ENV {
+    #[cfg(debug_assertions)]
+    dotenv::from_filename(".env.local").ok();
+
+    envy::from_env::<ENV>().ok()
+}
+
+#[derive(Debug, serde::Deserialize)]
+pub struct ENV {
+    pub sentry_dsn: String,
+    pub turso_api_key: String,
+    pub turso_org_slug: String,
+    pub clerk_secret_key: String,
+    pub deepgram_api_key: String,
+    pub clova_api_key: String,
+    pub turso_admin_db_name: String,
+    pub nango_api_base: String,
+    pub nango_api_key: String,
+    pub posthog_api_key: String,
+    pub s3_endpoint_url: String,
+    pub s3_bucket_name: String,
+    pub s3_access_key_id: String,
+    pub s3_secret_access_key: String,
+    pub openai_api_key: String,
+    pub openai_api_base: String,
+    pub stripe_secret_key: String,
+    pub stripe_webhook_signing_secret: String,
+    pub app_static_dir: String,
+    #[serde(default = "default_port")]
+    pub port: String,
+}
+
+fn default_port() -> String {
+    "1234".to_string()
+}