Skip to content

fix: setup.sh #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreazllin wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: setup.sh #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
440a8fc
chore: update packages
andreazllin May 24, 2025
85a7d23
fix: setup.sh
andreazllin May 24, 2025
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
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
"author": "",
"license": "MIT",
"devDependencies": {
"@cloudflare/workers-types": "^4.20250224.0",
"@types/mailparser": "^3.4.5",
"@cloudflare/workers-types": "^4.20250524.0",
"@types/mailparser": "^3.4.6",
"@types/rss": "^0.0.32",
"prettier": "^3.5.2",
"typescript": "^5.7.3",
"wrangler": "^3.111.0"
"prettier": "^3.5.3",
"typescript": "^5.8.3",
"wrangler": "^4.16.1"
},
"dependencies": {
"feed": "^4.2.2",
"hono": "^3.12.8",
"zod": "^3.22.4"
"feed": "^5.0.1",
"hono": "^4.7.10",
"zod": "^3.25.28"
}
}
58 changes: 29 additions & 29 deletions setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,79 +19,79 @@ fi

# Install dependencies
echo "📦 Installing dependencies..."
npm install
npm install &> /dev/null

# Check if user is logged in to Cloudflare
echo "🔒 Checking Cloudflare authentication..."
if ! npx wrangler whoami &>/dev/null; then
if npx wrangler whoami | grep -q "You are not authenticated"; then
echo "❌ You are not logged in to Cloudflare. Please run:"
echo "npx wrangler login"
echo "After login completes, run this setup script again."
echo "🔥 \`npx wrangler login\`"
echo "⚠️ After login completes, run this setup script again."
exit 1
fi
echo "✅ Cloudflare authentication verified"

# Function to get KV namespace IDs
get_kv_namespace_ids() {
echo "ℹ️ Retrieving KV namespace IDs..."
echo "🔍 Retrieving KV namespace IDs..."

# Get the complete KV namespace list
local output
output=$(npx wrangler kv:namespace list 2>/dev/null)
if [ $? -ne 0 ]; then
output=$(npx wrangler kv namespace list 2>/dev/null)

if [ -z "$output" ]; then
echo "❌ Error listing KV namespaces. Please check your Cloudflare authentication."
return 1
fi

# Try the direct approach first (most reliable)
MAIN_ID=$(echo "$output" | grep -o '"id": *"[^"]*"' | head -1 | cut -d'"' -f4)
PREVIEW_ID=$(echo "$output" | grep -o '"id": *"[^"]*"' | head -2 | tail -1 | cut -d'"' -f4)

# If the direct approach failed, try to match by namespace title
if [ -z "$MAIN_ID" ] || [ -z "$PREVIEW_ID" ]; then
# Save the output to a file for more complex processing
local temp_file=$(mktemp)
local temp_file
temp_file=$(mktemp)
echo "$output" > "$temp_file"

# Try with different patterns
if [ -z "$MAIN_ID" ]; then
MAIN_ID=$(grep -A3 "email-to-rss-EMAIL_STORAGE\"" "$temp_file" | grep -o '"id": "[^"]*"' | head -1 | cut -d'"' -f4)
if [ -z "$MAIN_ID" ]; then
MAIN_ID=$(grep -A3 "email-to-rss-EMAIL_STORAGE\"" "$temp_file" | grep -o '"id":"[^"]*"' | head -1 | cut -d'"' -f4)
fi
fi

if [ -z "$PREVIEW_ID" ]; then
PREVIEW_ID=$(grep -A3 "email-to-rss-EMAIL_STORAGE_preview\"" "$temp_file" | grep -o '"id": "[^"]*"' | head -1 | cut -d'"' -f4)
if [ -z "$PREVIEW_ID" ]; then
PREVIEW_ID=$(grep -A3 "email-to-rss-EMAIL_STORAGE_preview\"" "$temp_file" | grep -o '"id":"[^"]*"' | head -1 | cut -d'"' -f4)
fi
fi

# Clean up
rm -f "$temp_file"
fi

# Check if we found both IDs
if [ -z "$MAIN_ID" ] || [ -z "$PREVIEW_ID" ]; then
echo "❌ Failed to extract KV namespace IDs. Please run manually:"
echo "npx wrangler kv:namespace list"
echo "And update the IDs in wrangler.toml"
return 1
fi

return 0
}

# Create KV namespaces (suppressing output)
echo "🗄️ Creating KV namespaces..."
npx wrangler kv:namespace create EMAIL_STORAGE > /dev/null 2>&1 || true
npx wrangler kv:namespace create EMAIL_STORAGE --preview > /dev/null 2>&1 || true
npx wrangler kv namespace create EMAIL_STORAGE > /dev/null 2>&1 || true
npx wrangler kv namespace create EMAIL_STORAGE --preview > /dev/null 2>&1 || true

# Get KV namespace IDs
get_kv_namespace_ids
if [ $? -ne 0 ]; then
if ! get_kv_namespace_ids; then
echo "⚠️ Will continue without KV namespace IDs"
KV_ID=""
KV_PREVIEW_ID=""
Expand Down Expand Up @@ -119,7 +119,7 @@ fi

# Set up admin password
echo "🔐 Setting up admin password..."
read -p "Enter admin password: " admin_password
read -r -p "Enter admin password: " admin_password

echo "Setting admin password for production environment..."
# Initialize SETUP_SUCCESS if not already set
Expand All @@ -134,7 +134,7 @@ else
# Run the command and capture its output
SECRET_OUTPUT=$(echo "$admin_password" | npx wrangler secret put ADMIN_PASSWORD --env production --name email-to-rss 2>&1)
SECRET_STATUS=$?

if [ $SECRET_STATUS -ne 0 ]; then
echo "⚠️ Failed to set admin password for production environment"
echo "Error: $SECRET_OUTPUT"
Expand All @@ -145,7 +145,7 @@ else
fi

# Prompt for domain
read -p "Enter your domain (e.g., yourdomain.com): " domain
read -r -p "Enter your domain (e.g., yourdomain.com): " domain
if [ -z "$domain" ]; then
echo "❌ No domain provided. Cannot continue."
SETUP_SUCCESS=false
Expand All @@ -168,19 +168,19 @@ cp wrangler-example.toml wrangler.toml
if [[ "$OSTYPE" == "darwin"* ]]; then
# macOS requires empty string for -i
sed -i '' "s/REPLACE_WITH_YOUR_DOMAIN/$domain/g" wrangler.toml
if [ ! -z "$KV_ID" ]; then
if [ -n "$KV_ID" ]; then
sed -i '' "s/REPLACE_WITH_YOUR_KV_NAMESPACE_ID/$KV_ID/g" wrangler.toml
fi
if [ ! -z "$KV_PREVIEW_ID" ]; then
if [ -n "$KV_PREVIEW_ID" ]; then
sed -i '' "s/REPLACE_WITH_YOUR_PREVIEW_KV_NAMESPACE_ID/$KV_PREVIEW_ID/g" wrangler.toml
fi
else
# Linux and others
sed -i "s/REPLACE_WITH_YOUR_DOMAIN/$domain/g" wrangler.toml
if [ ! -z "$KV_ID" ]; then
if [ -n "$KV_ID" ]; then
sed -i "s/REPLACE_WITH_YOUR_KV_NAMESPACE_ID/$KV_ID/g" wrangler.toml
fi
if [ ! -z "$KV_PREVIEW_ID" ]; then
if [ -n "$KV_PREVIEW_ID" ]; then
sed -i "s/REPLACE_WITH_YOUR_PREVIEW_KV_NAMESPACE_ID/$KV_PREVIEW_ID/g" wrangler.toml
fi
fi
Expand All @@ -189,4 +189,4 @@ echo "✅ wrangler.toml has been created and configured successfully!"
echo ""
echo "✅ Setup complete! Next steps:"
echo "1. Set up MX records for your domain with ForwardEmail.net (see README for more details)"
echo "2. Deploy with 'npm run deploy'"
echo "2. Deploy with 'npm run deploy'"