fix: various tweaks -d

Author: arpowers

@fiction/admin/dashboard/OnboardSurvey.vue

@@ -16,8 +16,8 @@ const { card } = defineProps<{ card: Card }>()
 
 const { fictionUser } = useService<{ fictionUser: FictionUser }>()
 
-const TRIAL_PRODUCT = 'pro_month'
-const TRIAL_PRICE = 79
+const TRIAL_PRODUCT = 'standard_month'
+const TRIAL_PRICE = 9
 
 const form = vue.ref<{
   fullName?: string

@fiction/plugins/plugin-monitor/index.ts

@@ -42,15 +42,18 @@ export class FictionMonitor extends FictionPlugin<FictionMonitorSettings> {
       const { user, params } = event.detail
       if (!this.settings.fictionEnv?.isApp.value) {
         const { cityName, regionName, countryCode } = user.geo || {}
-        await this.slackNotify({
-          message: `user created: ${user.email}`,
-          data: {
-            name: user.fullName || 'No Name',
-            emailVerified: user.emailVerified ? 'Yes' : 'No',
-            location: `${cityName}, ${regionName}, ${countryCode}` || 'No Location',
-            ...params,
-          },
-        })
+
+        if (user.email?.includes('test') || user.email?.includes('fiction.com')) {
+          await this.slackNotify({
+            message: `user created: ${user.email}`,
+            data: {
+              name: user.fullName || 'No Name',
+              emailVerified: user.emailVerified ? 'Yes' : 'No',
+              location: `${cityName}, ${regionName}, ${countryCode}` || 'No Location',
+              ...params,
+            },
+          })
+        }
       }
     })
 

@fiction/plugins/plugin-stripe/test/utils.unit.test.ts

@@ -26,7 +26,7 @@ describe('processCustomerData', () => {
   })
 
   const mockProducts = [
-    { key: 'basic', tier: 1 },
+    { key: 'standard', tier: 1 },
     { key: 'pro', tier: 2 },
   ]
 

@fiction/themes/fiction/pages/pricing/index.ts

@@ -8,12 +8,20 @@ import type { CardFactory } from '@fiction/site/cardFactory'
 
 import { getCheckoutUrl } from '@fiction/plugin-stripe/utils.js'
 
-async function purchaseUrl(args: { priceLookupKey: string, fictionStripe?: FictionStripe }) {
-  const { fictionStripe } = args
+async function purchaseUrl(args: { priceLookupKey: string, site: Site }) {
+  const { site } = args
 
-  const loginPath = '/auth'
+  const { fictionStripe, fictionUser } = site.fictionSites.fictionEnv.getService<{ fictionStripe: FictionStripe }>()
 
-  if (!fictionStripe) {
+  const loginPath = '/app/auth?_reload=1'
+
+  if (typeof window === 'undefined') {
+    return loginPath
+  }
+
+  const user = await fictionUser.userInitialized()
+
+  if (!fictionStripe || !user) {
     return loginPath
   }
 
@@ -25,8 +33,6 @@ export async function getPricingPage(args: { factory: CardFactory, site: Site })
 
   const annualDiscountPercent = 30
 
-  const { fictionStripe } = site.fictionSites.fictionEnv.getService<{ fictionStripe: FictionStripe }>()
-
   const pricingCard = await factory.fromTemplate<typeof pricingTemplate>({
     templateId: 'cardPricingV1',
     userConfig: {
@@ -35,8 +41,8 @@ export async function getPricingPage(args: { factory: CardFactory, site: Site })
       layout: 'standard',
       prices: [
         {
-          title: 'Free',
-          price: 0,
+          title: 'Standard',
+          price: 9,
           description: `Start building your audience`,
           variant: 'muted',
           icon: { class: 'i-tabler-rocket' },
@@ -48,9 +54,10 @@ export async function getPricingPage(args: { factory: CardFactory, site: Site })
             { label: 'Email Support' },
           ],
           button: {
-            label: 'Start Free',
+            label: 'Start Standard',
             icon: { class: 'i-tabler-rocket' },
-            href: '#free-tier',
+            href: await purchaseUrl({ site, priceLookupKey: 'standard_month' }),
+            hrefAnnual: await purchaseUrl({ site, priceLookupKey: 'standard_year' }),
           },
         },
         {
@@ -73,8 +80,8 @@ export async function getPricingPage(args: { factory: CardFactory, site: Site })
           button: {
             label: 'Start Pro Trial',
             icon: { class: 'i-tabler-stars' },
-            href: await purchaseUrl({ fictionStripe, priceLookupKey: 'pro_month' }),
-            hrefAnnual: await purchaseUrl({ fictionStripe, priceLookupKey: 'pro_year' }),
+            href: await purchaseUrl({ site, priceLookupKey: 'pro_month' }),
+            hrefAnnual: await purchaseUrl({ site, priceLookupKey: 'pro_year' }),
           },
         },
         {
@@ -98,8 +105,8 @@ export async function getPricingPage(args: { factory: CardFactory, site: Site })
           button: {
             label: 'Start Workshop Trial',
             icon: { class: 'i-tabler-crown' },
-            href: await purchaseUrl({ fictionStripe, priceLookupKey: 'elite_month' }),
-            hrefAnnual: await purchaseUrl({ fictionStripe, priceLookupKey: 'elite_year' }),
+            href: await purchaseUrl({ site, priceLookupKey: 'elite_month' }),
+            hrefAnnual: await purchaseUrl({ site, priceLookupKey: 'elite_year' }),
           },
         },
       ],

fly/fiction.gateway.toml

@@ -1,6 +1,8 @@
-# fly.toml app configuration file generated for fiction-gateway
+# fly.toml for fiction-gateway
 app = 'fiction-gateway'
 primary_region = 'lax'
+kill_timeout = "5s"
+kill_signal = "SIGINT"
 
 [build]
 dockerfile = './Dockerfile'
@@ -9,32 +11,36 @@ build-target = 'fiction-gateway'
 [deploy]
 strategy = 'bluegreen'
 
-# Using services instead of http_service for TCP passthrough
+# HTTP Service (Port 80)
 [[services]]
-internal_port = 6565
 protocol = "tcp"
-auto_stop_machines = true
-auto_start_machines = true
-min_machines_running = 1
-processes = [ "app" ]
+internal_port = 6565
+auto_stop_machines = false # Changed to match example
+auto_start_machines = false # Changed to match example
+
+[services.concurrency]
+hard_limit = 170 # Adjusted to match example
+soft_limit = 150 # Adjusted to match example
 
-# TCP passthrough port
 [[services.ports]]
-port = 443
-handlers = [] # Empty handlers for TCP passthrough
+port = 80
+handlers = [ "http" ]
+
+# HTTPS Service (Port 443)
+[[services]]
+protocol = "tcp"
+internal_port = 6565
+auto_stop_machines = false
+auto_start_machines = false
 
 [services.concurrency]
-type = 'requests'
-hard_limit = 1000
-soft_limit = 500
+hard_limit = 170
+soft_limit = 150
 
-# Health check
-[[services.tcp_checks]]
-interval = "60s"
-timeout = "5s"
-grace_period = "10s"
+[[services.ports]]
+port = 443
+# No handlers for raw TCP mode
 
-# VM configuration remains the same
 [[vm]]
 size = 'performance-1x'
 memory = '8gb'

fly/proxy/Caddyfile

@@ -9,16 +9,12 @@
 		level INFO
 	}
 
+	# DNS challenge config - no resolvers needed
 	acme_dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	resolvers 1.1.1.1
 }
 
 :443 {
-	# Add health check endpoint
-	handle /healthz {
-		respond "OK" 200
-	}
-
+	# Main proxy config
 	reverse_proxy fiction-gateway.internal:6565 {
 		header_up Host {http.request.host}
 		header_up X-Real-IP {remote_ip}