astro-tractstack 2.0.0-rc.0 → 2.0.0-rc.2

package/README.md

@@ -1,9 +1,6 @@
 # Tract Stack
 
-create your own adaptive website or newsletter
-
-the "free web press"
-no-code community engine
+websites that adapt to the visitor
 
 by [At Risk Media](https://atriskmedia.com)
 
@@ -15,7 +12,7 @@ The `tractstack-go` package provides a backend server for the `astro-tractstack`
 
 Tract Stack makes it easy for non-technical people to build and grow adaptive websites that are fast, beautiful, SEO-ready, and accessible.
 
-Tract Stack is built on [Astro](https://astro.build/) with [HTMX](https://htmx.org/) and a [Golang](https://go.dev/) backend -- we recommend [Turso](https://app.turso.tech/) as database
+Tract Stack is built on [Astro](https://astro.build/) with [HTMX](https://htmx.org/) and a [Golang](https://go.dev/) backend -- uses SQLite by default with optional [Turso](https://app.turso.tech/) cloud database
 
 ## Documentation
 
@@ -23,30 +20,153 @@ Please visit [our docs](https://tractstack.org)
 
 For production deployment you'll need to prepare your server.
 
-_Quick Install_ in two steps:
+## Quick Install
 
-First install and run the go backend. It runs on port 8080 by default.
+**One-line installer (recommended for Linux):**
 
+```bash
+curl -fsSL https://install.tractstack.org | sh
 ```
-mkdir -p ~/src
-cd ~/src
+
+This will automatically install both the Go backend and create a new Astro project with TractStack.
+
+## Manual Installation
+
+**Prerequisites:**
+
+- Node.js 18
+- pnpm 9+ (recommended) or npm/yarn
+- Go 1.21+
+- Git
+
+### Platform Support
+
+**Linux:** Full native support - follow the steps below exactly as written.
+
+**macOS:** Full native support - follow the steps below exactly as written. The installation works the same as Linux.
+
+### Step 1: Install and run the Go backend
+
+**Linux/macOS:**
+
+```bash
+mkdir -p ~/t8k/src
+cd ~/t8k/src
 git clone https://github.com/AtRiskMedia/tractstack-go.git
 cd tractstack-go
-go build cmd/tractstack-go/main.go
+echo "GO_BACKEND_PATH=$HOME/t8k/t8k-go-server/" > .env
+echo "GIN_MODE=release" >> .env
+go build -o tractstack-go ./cmd/tractstack-go
 ./tractstack-go
 ```
 
-Next create an Astro starter then install Tract Stack as an integration:
+The backend runs on port 8080 by default.
 
-```
-cd ~/src
+### Step 2: Create your Astro frontend
+
+**Linux/macOS:**
+
+```bash
+cd ~/t8k
 pnpm create astro@latest my-tractstack --template minimal --typescript strict --install
 cd my-tractstack
 pnpm add astro-tractstack@latest
+echo "PRIVATE_GO_BACKEND_PATH=$HOME/t8k/t8k-go-server/" > .env
 npx create-tractstack
 pnpm dev
 ```
 
+### Step 3: Activate your Story Keep
+
+Visit https://127.0.0.1:4321 in your browser.
+
+TractStack works out of the box with local SQLite3 - no database setup required.
+
+**Optional:** You can choose to use [Turso](https://app.turso.tech/) cloud database:
+
+1. Create a database at [turso.tech](https://app.turso.tech/)
+2. Get your database URL and auth token
+3. Activate your database during site init
+
+## Development Workflow
+
+1. **Start the Go backend:**
+
+   ```bash
+   cd ~/t8k/src/tractstack-go
+   ./tractstack-go
+   ```
+
+2. **Start the Astro dev server:**
+
+   ```bash
+   cd ~/t8k/src/my-tractstack
+   pnpm dev
+   ```
+
+3. **Access your site:**
+   - Frontend: http://localhost:4321
+   - StoryKeep (CMS): http://localhost:4321/storykeep
+
+## Production Deployment
+
+For production, you'll need:
+
+1. **Deploy the Go backend** with proper environment variables
+2. **Build and deploy the Astro frontend** with `pnpm build`
+3. **Configure your database** connection
+4. **Set up SSL/TLS** for your domain
+
+See our [deployment guide](https://tractstack.org/docs/deployment) for detailed instructions.
+
+## Multi-Tenant Features
+
+TractStack supports multi-tenancy!
+
+## Project Structure
+
+```
+## Project Structure
+
+Installs in ~/t8k and scopes to tenantId=`default` when ENABLE_MULTI_TENANT=false
+
+For multiple Tract Stack sites on a single server see our production install recipes.
+
+```
+
+~/t8k/
+├── src/
+│ ├── tractstack-go/ # Go backend source
+│ │ ├── tractstack-go # Compiled binary
+│ │ └── ...
+│ └── my-tractstack/ # Astro frontend
+│ ├── src/
+│ │ ├── custom/ # Your custom components
+│ │ ├── pages/
+│ │ └── ...
+└── t8k-go-server/ # Backend data storage
+├── config/
+│ ├── t8k/
+│ │ └── tenants.json # Source of truth
+│ └── default/ # Default tenant config
+│ └── env.json # Critical config
+│ └── brand.json # Personalization
+│ └── media/ # Tenant media files
+├── db/
+│ └── default/
+│ └── tractstack.db # SQLite database
+└── log/
+├── system.log
+├── tenant.log
+├── database.log
+└── ...
+
+```
+
+```
+
+The Go backend stores data in `~/t8k/t8k-go-server/` by default (quick install).
+
 ## Queries?
 
 Reach out at hello -at- tractstack -dot- com

package/bin/create-tractstack.js

@@ -28,6 +28,56 @@ function detectPackageManager() {
   return 'pnpm';
 }
 
+// Parse existing .env file
+function parseExistingEnv() {
+  const defaults = {
+    goBackend: 'http://localhost:8080',
+    tenantId: 'default',
+    goBackendPath: `${homedir()}/t8k-go-server/`,
+    enableMultiTenant: false,
+  };
+
+  if (!existsSync('.env')) {
+    return defaults;
+  }
+
+  try {
+    const envContent = readFileSync('.env', 'utf-8');
+    const envVars = {};
+
+    envContent.split('\n').forEach((line) => {
+      line = line.trim();
+      if (line && !line.startsWith('#')) {
+        const [key, ...valueParts] = line.split('=');
+        if (key && valueParts.length > 0) {
+          // Remove surrounding quotes and trim
+          let value = valueParts.join('=').trim();
+          if (
+            (value.startsWith('"') && value.endsWith('"')) ||
+            (value.startsWith("'") && value.endsWith("'"))
+          ) {
+            value = value.slice(1, -1);
+          }
+          envVars[key.trim()] = value;
+        }
+      }
+    });
+
+    return {
+      goBackend: envVars.PUBLIC_GO_BACKEND || defaults.goBackend,
+      tenantId: envVars.PUBLIC_TENANTID || defaults.tenantId,
+      goBackendPath: envVars.PRIVATE_GO_BACKEND_PATH || defaults.goBackendPath,
+      enableMultiTenant:
+        envVars.ENABLE_MULTI_TENANT === 'true' || defaults.enableMultiTenant,
+    };
+  } catch (error) {
+    console.log(
+      kleur.yellow('⚠️ Found .env file but could not parse it, using defaults')
+    );
+    return defaults;
+  }
+}
+
 async function main() {
   // ASCII art
   console.log(
@@ -89,13 +139,25 @@ ${kleur.bold('Examples:')}
     process.exit(1);
   }
 
-  // Prompt for configuration
+  // Parse existing .env values
+  const envDefaults = parseExistingEnv();
+  const hasExistingEnv = existsSync('.env');
+
+  if (hasExistingEnv) {
+    console.log(
+      kleur.yellow(
+        '📁 Found existing .env file, using current values as defaults\n'
+      )
+    );
+  }
+
+  // Prompt for configuration with existing values as defaults
   const responses = await prompts([
     {
       type: 'text',
       name: 'goBackend',
       message: 'TractStack Go backend URL:',
-      initial: 'http://localhost:8080',
+      initial: envDefaults.goBackend,
       validate: (value) => {
         try {
           new URL(value);
@@ -106,22 +168,27 @@ ${kleur.bold('Examples:')}
       },
     },
     {
-      type: 'text',
+      type: 'confirm',
+      name: 'enableMultiTenant',
+      message: 'Enable multi-tenant functionality?',
+      initial: enableMultiTenant || envDefaults.enableMultiTenant,
+    },
+    {
+      type: (prev, values) => (values.enableMultiTenant ? 'text' : null),
       name: 'tenantId',
       message: 'Tenant ID:',
-      initial: 'default',
+      initial: envDefaults.tenantId,
       validate: (value) => value.length > 0 || 'Tenant ID is required',
     },
     {
       type: 'text',
       name: 'goBackendPath',
       message: 'TractStack Go backend path:',
-      initial: `${homedir()}/t8k-go-server/`,
+      initial: envDefaults.goBackendPath,
       validate: (value) => {
         if (!value || value.trim().length === 0) {
           return 'Backend path is required';
         }
-        // Ensure it ends with trailing slash for consistency
         return true;
       },
     },
@@ -132,29 +199,38 @@ ${kleur.bold('Examples:')}
         'Include CodeHook examples? (custom components, collections route)',
       initial: includeExamples,
     },
-    {
-      type: 'confirm',
-      name: 'enableMultiTenant',
-      message: 'Enable multi-tenant functionality?',
-      initial: enableMultiTenant,
-    },
   ]);
 
-  if (!responses.goBackend || !responses.tenantId) {
+  if (!responses.goBackend) {
     console.log(kleur.red('\n❌ Setup cancelled.'));
     process.exit(1);
   }
 
+  // Use existing tenantId if multi-tenant is disabled
+  const finalTenantId = responses.enableMultiTenant
+    ? responses.tenantId
+    : envDefaults.tenantId;
+
+  if (!finalTenantId) {
+    console.log(kleur.red('\n❌ Setup cancelled - Tenant ID is required.'));
+    process.exit(1);
+  }
+
   // Create .env file
   const envContent = `# TractStack Configuration
 PUBLIC_GO_BACKEND="${responses.goBackend}"
-PUBLIC_TENANTID="${responses.tenantId}"
+PUBLIC_TENANTID="${finalTenantId}"
 PRIVATE_GO_BACKEND_PATH="${responses.goBackendPath.endsWith('/') ? responses.goBackendPath : responses.goBackendPath + '/'}"
+${responses.enableMultiTenant ? 'ENABLE_MULTI_TENANT="true"' : ''}
 `;
 
   try {
     writeFileSync('.env', envContent);
-    console.log(kleur.green('✅ Created .env file'));
+    if (hasExistingEnv) {
+      console.log(kleur.green('✅ Updated .env file with new configuration'));
+    } else {
+      console.log(kleur.green('✅ Created .env file'));
+    }
   } catch (error) {
     console.log(kleur.red('❌ Failed to create .env file:', error.message));
     process.exit(1);

package/dist/index.js

@@ -1245,16 +1245,16 @@ async function w(t, e, c) {
     },
     // Client Scripts
     {
-      src: t("../templates/src/client/sse.ts"),
-      dest: "src/client/sse.ts"
+      src: t("../templates/src/client/sse.js"),
+      dest: "public/client/sse.js"
     },
     {
-      src: t("../templates/src/client/belief-events.ts"),
-      dest: "src/client/belief-events.ts"
+      src: t("../templates/src/client/belief-events.js"),
+      dest: "public/client/belief-events.js"
     },
     {
-      src: t("../templates/src/client/analytics-events.ts"),
-      dest: "src/client/analytics-events.ts"
+      src: t("../templates/src/client/analytics-events.js"),
+      dest: "public/client/analytics-events.js"
     },
     // StoryKeep Editor (add new section)
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-tractstack",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0-rc.2",
   "description": "Astro integration for TractStack - build adaptive websites with HTMX and Go",
   "type": "module",
   "main": "dist/index.js",
@@ -18,7 +18,7 @@
     "README.md"
   ],
   "bin": {
-    "create-tractstack": "./bin/create-tractstack.js"
+    "create-tractstack": "bin/create-tractstack.js"
   },
   "scripts": {
     "build": "vite build && tsc -p tsconfig.dts.json",
@@ -37,7 +37,7 @@
   "license": "FSL-1.1-MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/AtRiskMedia/astro-tractstack.git"
+    "url": "git+https://github.com/AtRiskMedia/astro-tractstack.git"
   },
   "publishConfig": {
     "access": "public",