Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
f52249c292
|
|||
aa70183d75
|
|||
4ad1d3edf6
|
|||
55bf725491
|
@@ -45,10 +45,7 @@
|
|||||||
"Bash(git add:*)",
|
"Bash(git add:*)",
|
||||||
"Bash(git commit:*)",
|
"Bash(git commit:*)",
|
||||||
"Bash(git push:*)",
|
"Bash(git push:*)",
|
||||||
"Bash(git tag:*)",
|
"Bash(git tag:*)"
|
||||||
"Bash(../bin/ailog:*)",
|
|
||||||
"Bash(../target/release/ailog oauth build:*)",
|
|
||||||
"Bash(ailog:*)"
|
|
||||||
],
|
],
|
||||||
"deny": []
|
"deny": []
|
||||||
}
|
}
|
||||||
|
51
.github/workflows/build-binary.yml
vendored
Normal file
51
.github/workflows/build-binary.yml
vendored
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
name: Build Binary
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch: # Manual trigger
|
||||||
|
push:
|
||||||
|
branches: [ main ]
|
||||||
|
paths:
|
||||||
|
- 'src/**'
|
||||||
|
- 'Cargo.toml'
|
||||||
|
- 'Cargo.lock'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Rust
|
||||||
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
override: true
|
||||||
|
|
||||||
|
- name: Cache cargo registry
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cargo/registry
|
||||||
|
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
|
- name: Cache cargo index
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cargo/git
|
||||||
|
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
|
- name: Cache target directory
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: target
|
||||||
|
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
|
- name: Build binary
|
||||||
|
run: cargo build --release
|
||||||
|
|
||||||
|
- name: Upload binary
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: ailog-linux
|
||||||
|
path: target/release/ailog
|
||||||
|
retention-days: 30
|
65
.github/workflows/cloudflare-pages.yml
vendored
65
.github/workflows/cloudflare-pages.yml
vendored
@@ -34,67 +34,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Copy OAuth build to static
|
- name: Copy OAuth build to static
|
||||||
run: |
|
run: |
|
||||||
# Remove old assets (following run.zsh pattern)
|
mkdir -p my-blog/static/assets
|
||||||
rm -rf my-blog/static/assets
|
cp -r oauth/dist/assets/* my-blog/static/assets/
|
||||||
# Copy all dist files to static
|
cp oauth/dist/index.html my-blog/static/oauth/index.html || true
|
||||||
cp -rf oauth/dist/* my-blog/static/
|
|
||||||
# Copy index.html to oauth-assets.html template
|
|
||||||
cp oauth/dist/index.html my-blog/templates/oauth-assets.html
|
|
||||||
|
|
||||||
- name: Cache ailog binary
|
- name: Setup Rust
|
||||||
uses: actions/cache@v4
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
path: ./bin
|
toolchain: stable
|
||||||
key: ailog-bin-${{ runner.os }}
|
|
||||||
restore-keys: |
|
- name: Build ailog
|
||||||
ailog-bin-${{ runner.os }}
|
run: cargo build --release
|
||||||
|
|
||||||
- name: Setup ailog binary
|
|
||||||
run: |
|
|
||||||
# Get expected version from Cargo.toml
|
|
||||||
EXPECTED_VERSION=$(grep '^version' Cargo.toml | cut -d'"' -f2)
|
|
||||||
echo "Expected version from Cargo.toml: $EXPECTED_VERSION"
|
|
||||||
|
|
||||||
# Check current binary version if exists
|
|
||||||
if [ -f "./bin/ailog" ]; then
|
|
||||||
CURRENT_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Current binary version: $CURRENT_VERSION"
|
|
||||||
else
|
|
||||||
CURRENT_VERSION="none"
|
|
||||||
echo "No binary found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check OS
|
|
||||||
OS="${{ runner.os }}"
|
|
||||||
echo "Runner OS: $OS"
|
|
||||||
|
|
||||||
# Use pre-packaged binary if version matches or extract from tar.gz
|
|
||||||
if [ "$CURRENT_VERSION" = "$EXPECTED_VERSION" ]; then
|
|
||||||
echo "Binary is up to date"
|
|
||||||
chmod +x ./bin/ailog
|
|
||||||
elif [ "$OS" = "Linux" ] && [ -f "./bin/ailog-linux-x86_64.tar.gz" ]; then
|
|
||||||
echo "Extracting ailog from pre-packaged tar.gz..."
|
|
||||||
cd bin
|
|
||||||
tar -xzf ailog-linux-x86_64.tar.gz
|
|
||||||
chmod +x ailog
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# Verify extracted version
|
|
||||||
EXTRACTED_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Extracted binary version: $EXTRACTED_VERSION"
|
|
||||||
|
|
||||||
if [ "$EXTRACTED_VERSION" != "$EXPECTED_VERSION" ]; then
|
|
||||||
echo "Warning: Binary version mismatch. Expected $EXPECTED_VERSION but got $EXTRACTED_VERSION"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Error: No suitable binary found for OS: $OS"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Build site with ailog
|
- name: Build site with ailog
|
||||||
run: |
|
run: |
|
||||||
cd my-blog
|
cd my-blog
|
||||||
../bin/ailog build
|
../target/release/ailog build
|
||||||
|
|
||||||
- name: List public directory
|
- name: List public directory
|
||||||
run: |
|
run: |
|
||||||
|
92
.github/workflows/disabled/gh-pages-fast.yml
vendored
92
.github/workflows/disabled/gh-pages-fast.yml
vendored
@@ -1,92 +0,0 @@
|
|||||||
name: github pages (fast)
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
paths-ignore:
|
|
||||||
- 'src/**'
|
|
||||||
- 'Cargo.toml'
|
|
||||||
- 'Cargo.lock'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
pages: write
|
|
||||||
id-token: write
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Cache ailog binary
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: ./bin
|
|
||||||
key: ailog-bin-${{ runner.os }}
|
|
||||||
restore-keys: |
|
|
||||||
ailog-bin-${{ runner.os }}
|
|
||||||
|
|
||||||
- name: Setup ailog binary
|
|
||||||
run: |
|
|
||||||
# Get expected version from Cargo.toml
|
|
||||||
EXPECTED_VERSION=$(grep '^version' Cargo.toml | cut -d'"' -f2)
|
|
||||||
echo "Expected version from Cargo.toml: $EXPECTED_VERSION"
|
|
||||||
|
|
||||||
# Check current binary version if exists
|
|
||||||
if [ -f "./bin/ailog" ]; then
|
|
||||||
CURRENT_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Current binary version: $CURRENT_VERSION"
|
|
||||||
else
|
|
||||||
CURRENT_VERSION="none"
|
|
||||||
echo "No binary found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check OS
|
|
||||||
OS="${{ runner.os }}"
|
|
||||||
echo "Runner OS: $OS"
|
|
||||||
|
|
||||||
# Use pre-packaged binary if version matches or extract from tar.gz
|
|
||||||
if [ "$CURRENT_VERSION" = "$EXPECTED_VERSION" ]; then
|
|
||||||
echo "Binary is up to date"
|
|
||||||
chmod +x ./bin/ailog
|
|
||||||
elif [ "$OS" = "Linux" ] && [ -f "./bin/ailog-linux-x86_64.tar.gz" ]; then
|
|
||||||
echo "Extracting ailog from pre-packaged tar.gz..."
|
|
||||||
cd bin
|
|
||||||
tar -xzf ailog-linux-x86_64.tar.gz
|
|
||||||
chmod +x ailog
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# Verify extracted version
|
|
||||||
EXTRACTED_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Extracted binary version: $EXTRACTED_VERSION"
|
|
||||||
|
|
||||||
if [ "$EXTRACTED_VERSION" != "$EXPECTED_VERSION" ]; then
|
|
||||||
echo "Warning: Binary version mismatch. Expected $EXPECTED_VERSION but got $EXTRACTED_VERSION"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Error: No suitable binary found for OS: $OS"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Setup Hugo
|
|
||||||
uses: peaceiris/actions-hugo@v3
|
|
||||||
with:
|
|
||||||
hugo-version: "0.139.2"
|
|
||||||
extended: true
|
|
||||||
|
|
||||||
- name: Build with ailog
|
|
||||||
env:
|
|
||||||
TZ: "Asia/Tokyo"
|
|
||||||
run: |
|
|
||||||
# Use pre-built ailog binary instead of cargo build
|
|
||||||
cd my-blog
|
|
||||||
../bin/ailog build
|
|
||||||
touch ./public/.nojekyll
|
|
||||||
|
|
||||||
- name: Deploy
|
|
||||||
uses: peaceiris/actions-gh-pages@v3
|
|
||||||
with:
|
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
publish_dir: ./my-blog/public
|
|
||||||
publish_branch: gh-pages
|
|
77
.github/workflows/gh-pages-fast.yml
vendored
Normal file
77
.github/workflows/gh-pages-fast.yml
vendored
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
name: github pages (fast)
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
paths-ignore:
|
||||||
|
- 'src/**'
|
||||||
|
- 'Cargo.toml'
|
||||||
|
- 'Cargo.lock'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Cache ailog binary
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ./bin
|
||||||
|
key: ailog-bin-${{ runner.os }}
|
||||||
|
restore-keys: |
|
||||||
|
ailog-bin-${{ runner.os }}
|
||||||
|
|
||||||
|
- name: Check and update ailog binary
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
# Get latest release version
|
||||||
|
LATEST_VERSION=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
|
https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r .tag_name)
|
||||||
|
echo "Latest version: $LATEST_VERSION"
|
||||||
|
|
||||||
|
# Check current binary version if exists
|
||||||
|
mkdir -p ./bin
|
||||||
|
if [ -f "./bin/ailog" ]; then
|
||||||
|
CURRENT_VERSION=$(./bin/ailog --version | awk '{print $2}' || echo "unknown")
|
||||||
|
echo "Current version: $CURRENT_VERSION"
|
||||||
|
else
|
||||||
|
CURRENT_VERSION="none"
|
||||||
|
echo "No binary found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Download if version is different or binary doesn't exist
|
||||||
|
if [ "$CURRENT_VERSION" != "${LATEST_VERSION#v}" ]; then
|
||||||
|
echo "Downloading ailog $LATEST_VERSION..."
|
||||||
|
curl -sL -H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
|
https://github.com/${{ github.repository }}/releases/download/$LATEST_VERSION/ailog-linux-x86_64.tar.gz | tar -xzf -
|
||||||
|
mv ailog ./bin/ailog
|
||||||
|
chmod +x ./bin/ailog
|
||||||
|
echo "Updated to version: $(./bin/ailog --version)"
|
||||||
|
else
|
||||||
|
echo "Binary is up to date"
|
||||||
|
chmod +x ./bin/ailog
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Setup Hugo
|
||||||
|
uses: peaceiris/actions-hugo@v3
|
||||||
|
with:
|
||||||
|
hugo-version: "0.139.2"
|
||||||
|
extended: true
|
||||||
|
|
||||||
|
- name: Build with ailog
|
||||||
|
env:
|
||||||
|
TZ: "Asia/Tokyo"
|
||||||
|
run: |
|
||||||
|
# Use pre-built ailog binary instead of cargo build
|
||||||
|
./bin/ailog build --output ./public
|
||||||
|
touch ./public/.nojekyll
|
||||||
|
|
||||||
|
- name: Deploy
|
||||||
|
uses: peaceiris/actions-gh-pages@v3
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
publish_dir: ./public
|
||||||
|
publish_branch: gh-pages
|
2
.gitignore
vendored
2
.gitignore
vendored
@@ -11,5 +11,3 @@ dist
|
|||||||
node_modules
|
node_modules
|
||||||
package-lock.json
|
package-lock.json
|
||||||
my-blog/static/assets/comment-atproto-*
|
my-blog/static/assets/comment-atproto-*
|
||||||
bin/ailog
|
|
||||||
docs
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "ailog"
|
name = "ailog"
|
||||||
version = "0.1.7"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["syui"]
|
authors = ["syui"]
|
||||||
description = "A static blog generator with AI features"
|
description = "A static blog generator with AI features"
|
||||||
|
68
action.yml
68
action.yml
@@ -55,26 +55,49 @@ runs:
|
|||||||
restore-keys: |
|
restore-keys: |
|
||||||
ailog-bin-${{ runner.os }}
|
ailog-bin-${{ runner.os }}
|
||||||
|
|
||||||
- name: Setup ailog binary
|
- name: Check and update ailog binary
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Check if pre-built binary exists
|
# Get latest release version (for Gitea, adjust API endpoint if needed)
|
||||||
if [ -f "./bin/ailog-linux-x86_64" ]; then
|
if command -v curl >/dev/null 2>&1; then
|
||||||
echo "Using pre-built binary from repository"
|
LATEST_VERSION=$(curl -s https://api.github.com/repos/syui/ailog/releases/latest | jq -r .tag_name 2>/dev/null || echo "v0.1.1")
|
||||||
chmod +x ./bin/ailog-linux-x86_64
|
|
||||||
CURRENT_VERSION=$(./bin/ailog-linux-x86_64 --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Binary version: $CURRENT_VERSION"
|
|
||||||
else
|
else
|
||||||
echo "No pre-built binary found, trying to build from source..."
|
LATEST_VERSION="v0.1.1" # fallback version
|
||||||
if command -v cargo >/dev/null 2>&1; then
|
fi
|
||||||
cargo build --release
|
echo "Target version: $LATEST_VERSION"
|
||||||
mkdir -p ./bin
|
|
||||||
cp ./target/release/ailog ./bin/ailog-linux-x86_64
|
# Check current binary version if exists
|
||||||
echo "Built from source: $(./bin/ailog-linux-x86_64 --version 2>/dev/null)"
|
mkdir -p ./bin
|
||||||
|
if [ -f "./bin/ailog" ]; then
|
||||||
|
CURRENT_VERSION=$(./bin/ailog --version | awk '{print $2}' 2>/dev/null || echo "unknown")
|
||||||
|
echo "Current version: $CURRENT_VERSION"
|
||||||
|
else
|
||||||
|
CURRENT_VERSION="none"
|
||||||
|
echo "No binary found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Download if version is different or binary doesn't exist
|
||||||
|
if [ "$CURRENT_VERSION" != "${LATEST_VERSION#v}" ]; then
|
||||||
|
echo "Downloading ailog $LATEST_VERSION..."
|
||||||
|
# Try GitHub first, then fallback to local build
|
||||||
|
if curl -sL https://github.com/syui/ailog/releases/download/$LATEST_VERSION/ailog-linux-x86_64.tar.gz | tar -xzf - 2>/dev/null; then
|
||||||
|
mv ailog ./bin/ailog
|
||||||
|
chmod +x ./bin/ailog
|
||||||
|
echo "Downloaded binary: $(./bin/ailog --version)"
|
||||||
else
|
else
|
||||||
echo "Error: No binary found and cargo not available"
|
echo "Download failed, building from source..."
|
||||||
exit 1
|
if command -v cargo >/dev/null 2>&1; then
|
||||||
|
cargo build --release
|
||||||
|
cp ./target/release/ailog ./bin/ailog
|
||||||
|
echo "Built from source: $(./bin/ailog --version)"
|
||||||
|
else
|
||||||
|
echo "Error: Neither download nor cargo build available"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
echo "Binary is up to date"
|
||||||
|
chmod +x ./bin/ailog
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Setup Node.js for OAuth app
|
- name: Setup Node.js for OAuth app
|
||||||
@@ -100,15 +123,12 @@ runs:
|
|||||||
run: |
|
run: |
|
||||||
start_time=$(date +%s)
|
start_time=$(date +%s)
|
||||||
|
|
||||||
# Change to blog directory and run build
|
./bin/ailog build \
|
||||||
# Note: ailog build only takes a path argument, not options
|
--content ${{ inputs.content-dir }} \
|
||||||
if [ -d "my-blog" ]; then
|
--output ${{ inputs.output-dir }} \
|
||||||
cd my-blog
|
--templates ${{ inputs.template-dir }} \
|
||||||
../bin/ailog-linux-x86_64 build
|
--static ${{ inputs.static-dir }} \
|
||||||
else
|
--config ${{ inputs.config-file }}
|
||||||
# If no my-blog directory, use current directory
|
|
||||||
./bin/ailog-linux-x86_64 build .
|
|
||||||
fi
|
|
||||||
|
|
||||||
end_time=$(date +%s)
|
end_time=$(date +%s)
|
||||||
build_time=$((end_time - start_time))
|
build_time=$((end_time - start_time))
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。
|
|
@@ -1,173 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# Generate AI content for blog posts
|
|
||||||
# Usage: ./bin/ailog-generate.zsh [md-file]
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Load configuration
|
|
||||||
f=~/.config/syui/ai/bot/token.json
|
|
||||||
|
|
||||||
# Default values
|
|
||||||
default_pds="bsky.social"
|
|
||||||
default_did=`cat $f|jq -r .did`
|
|
||||||
default_token=`cat $f|jq -r .accessJwt`
|
|
||||||
default_refresh=`cat $f|jq -r .refreshJwt`
|
|
||||||
|
|
||||||
# Refresh token if needed
|
|
||||||
curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $default_refresh" https://$default_pds/xrpc/com.atproto.server.refreshSession >! $f
|
|
||||||
default_token=`cat $f|jq -r .accessJwt`
|
|
||||||
|
|
||||||
# Set variables
|
|
||||||
admin_did=$default_did
|
|
||||||
admin_token=$default_token
|
|
||||||
ai_did="did:plc:4hqjfn7m6n5hno3doamuhgef"
|
|
||||||
ollama_host="https://ollama.syui.ai"
|
|
||||||
blog_host="https://syui.ai"
|
|
||||||
pds=$default_pds
|
|
||||||
|
|
||||||
# Parse arguments
|
|
||||||
md_file=$1
|
|
||||||
|
|
||||||
# Function to generate content using Ollama
|
|
||||||
generate_ai_content() {
|
|
||||||
local content=$1
|
|
||||||
local prompt_type=$2
|
|
||||||
local model="gemma3:4b"
|
|
||||||
|
|
||||||
case $prompt_type in
|
|
||||||
"translate")
|
|
||||||
prompt="Translate the following Japanese blog post to English. Keep the technical terms and code blocks intact:\n\n$content"
|
|
||||||
;;
|
|
||||||
"comment")
|
|
||||||
prompt="Read this blog post and provide an insightful comment about it. Focus on the key points and add your perspective:\n\n$content"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
response=$(curl -sL -X POST "$ollama_host/api/generate" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "{
|
|
||||||
\"model\": \"$model\",
|
|
||||||
\"prompt\": \"$prompt\",
|
|
||||||
\"stream\": false,
|
|
||||||
\"options\": {
|
|
||||||
\"temperature\": 0.9,
|
|
||||||
\"top_p\": 0.9,
|
|
||||||
\"num_predict\": 500
|
|
||||||
}
|
|
||||||
}")
|
|
||||||
|
|
||||||
echo "$response" | jq -r '.response'
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to put record to ATProto
|
|
||||||
put_record() {
|
|
||||||
local collection=$1
|
|
||||||
local rkey=$2
|
|
||||||
local record=$3
|
|
||||||
|
|
||||||
curl -sL -X POST "https://$pds/xrpc/com.atproto.repo.putRecord" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-H "Authorization: Bearer $admin_token" \
|
|
||||||
-d "{
|
|
||||||
\"repo\": \"$admin_did\",
|
|
||||||
\"collection\": \"$collection\",
|
|
||||||
\"rkey\": \"$rkey\",
|
|
||||||
\"record\": $record
|
|
||||||
}"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to process a single markdown file
|
|
||||||
process_md_file() {
|
|
||||||
local md_path=$1
|
|
||||||
local filename=$(basename "$md_path" .md)
|
|
||||||
local content=$(cat "$md_path")
|
|
||||||
local post_url="$blog_host/posts/$filename"
|
|
||||||
local rkey=$filename
|
|
||||||
local now=$(date -u +"%Y-%m-%dT%H:%M:%S.000Z")
|
|
||||||
|
|
||||||
echo "Processing: $md_path"
|
|
||||||
echo "Post URL: $post_url"
|
|
||||||
|
|
||||||
# Generate English translation
|
|
||||||
echo "Generating English translation..."
|
|
||||||
en_translation=$(generate_ai_content "$content" "translate")
|
|
||||||
|
|
||||||
if [ -n "$en_translation" ]; then
|
|
||||||
lang_record="{
|
|
||||||
\"\$type\": \"ai.syui.log.chat.lang\",
|
|
||||||
\"type\": \"en\",
|
|
||||||
\"body\": $(echo "$en_translation" | jq -Rs .),
|
|
||||||
\"url\": \"$post_url\",
|
|
||||||
\"createdAt\": \"$now\",
|
|
||||||
\"author\": {
|
|
||||||
\"did\": \"$ai_did\",
|
|
||||||
\"handle\": \"yui.syui.ai\",
|
|
||||||
\"displayName\": \"AI Translator\"
|
|
||||||
}
|
|
||||||
}"
|
|
||||||
|
|
||||||
echo "Saving translation to ATProto..."
|
|
||||||
put_record "ai.syui.log.chat.lang" "$rkey" "$lang_record"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate AI comment
|
|
||||||
echo "Generating AI comment..."
|
|
||||||
ai_comment=$(generate_ai_content "$content" "comment")
|
|
||||||
|
|
||||||
if [ -n "$ai_comment" ]; then
|
|
||||||
comment_record="{
|
|
||||||
\"\$type\": \"ai.syui.log.chat.comment\",
|
|
||||||
\"type\": \"push\",
|
|
||||||
\"body\": $(echo "$ai_comment" | jq -Rs .),
|
|
||||||
\"url\": \"$post_url\",
|
|
||||||
\"createdAt\": \"$now\",
|
|
||||||
\"author\": {
|
|
||||||
\"did\": \"$ai_did\",
|
|
||||||
\"handle\": \"yui.syui.ai\",
|
|
||||||
\"displayName\": \"AI Commenter\"
|
|
||||||
}
|
|
||||||
}"
|
|
||||||
|
|
||||||
echo "Saving comment to ATProto..."
|
|
||||||
put_record "ai.syui.log.chat.comment" "$rkey" "$comment_record"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Completed: $filename"
|
|
||||||
echo
|
|
||||||
}
|
|
||||||
|
|
||||||
# Main logic
|
|
||||||
if [ -n "$md_file" ]; then
|
|
||||||
# Process specific file
|
|
||||||
if [ -f "$md_file" ]; then
|
|
||||||
process_md_file "$md_file"
|
|
||||||
else
|
|
||||||
echo "Error: File not found: $md_file"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# Process all new posts
|
|
||||||
echo "Checking for posts without AI content..."
|
|
||||||
|
|
||||||
# Get existing records
|
|
||||||
existing_langs=$(curl -sL "https://$pds/xrpc/com.atproto.repo.listRecords?repo=$admin_did&collection=ai.syui.log.chat.lang&limit=100" | jq -r '.records[]?.value.url' | sort | uniq)
|
|
||||||
|
|
||||||
# Process each markdown file
|
|
||||||
for md in my-blog/content/posts/*.md; do
|
|
||||||
if [ -f "$md" ]; then
|
|
||||||
filename=$(basename "$md" .md)
|
|
||||||
post_url="$blog_host/posts/$filename"
|
|
||||||
|
|
||||||
# Check if already processed
|
|
||||||
if echo "$existing_langs" | grep -q "$post_url"; then
|
|
||||||
echo "Skip (already processed): $filename"
|
|
||||||
else
|
|
||||||
process_md_file "$md"
|
|
||||||
sleep 2 # Rate limiting
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "All done!"
|
|
Binary file not shown.
@@ -1,30 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
cb=ai.syui.log
|
|
||||||
cl=( $cb.chat $cb.chat.comment $cb.chat.lang )
|
|
||||||
|
|
||||||
f=~/.config/syui/ai/bot/token.json
|
|
||||||
default_collection="ai.syui.log.chat.comment"
|
|
||||||
default_pds="bsky.social"
|
|
||||||
default_did=`cat $f|jq -r .did`
|
|
||||||
default_token=`cat $f|jq -r .accessJwt`
|
|
||||||
default_refresh=`cat $f|jq -r .refreshJwt`
|
|
||||||
curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $default_refresh" https://$default_pds/xrpc/com.atproto.server.refreshSession >! $f
|
|
||||||
default_token=`cat $f|jq -r .accessJwt`
|
|
||||||
collection=${1:-$default_collection}
|
|
||||||
pds=${2:-$default_pds}
|
|
||||||
did=${3:-$default_did}
|
|
||||||
token=${4:-$default_token}
|
|
||||||
req=com.atproto.repo.deleteRecord
|
|
||||||
url=https://$pds/xrpc/$req
|
|
||||||
|
|
||||||
for i in $cl; do
|
|
||||||
echo $i
|
|
||||||
rkeys=($(curl -sL "https://$default_pds/xrpc/com.atproto.repo.listRecords?repo=$did&collection=$i&limit=100"|jq -r ".records[]?.uri"|cut -d '/' -f 5))
|
|
||||||
for rkey in "${rkeys[@]}"; do
|
|
||||||
echo $rkey
|
|
||||||
json="{\"collection\":\"$i\", \"rkey\":\"$rkey\", \"repo\":\"$did\"}"
|
|
||||||
curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $token" -d "$json" $url
|
|
||||||
done
|
|
||||||
done
|
|
14
claude.md
14
claude.md
@@ -1,19 +1,5 @@
|
|||||||
# エコシステム統合設計書
|
# エコシステム統合設計書
|
||||||
|
|
||||||
## 注意事項
|
|
||||||
|
|
||||||
`console.log`は絶対に書かないようにしてください。
|
|
||||||
|
|
||||||
ハードコードしないようにしてください。必ず、`./my-blog/config.toml`や`./oauth/.env.production`を使用するように。または`~/.config/syui/ai/log/config.json`を使用するように。
|
|
||||||
|
|
||||||
重複する名前のenvを作らないようにしてください。新しい環境変数を作る際は必ず検討してください。
|
|
||||||
|
|
||||||
```sh
|
|
||||||
# ダメな例
|
|
||||||
VITE_OAUTH_COLLECTION_USER=ai.syui.log.user
|
|
||||||
VITE_OAUTH_COLLECTION_CHAT=ai.syui.log.chat
|
|
||||||
```
|
|
||||||
|
|
||||||
## 中核思想
|
## 中核思想
|
||||||
- **存在子理論**: この世界で最も小さいもの(存在子/ai)の探求
|
- **存在子理論**: この世界で最も小さいもの(存在子/ai)の探求
|
||||||
- **唯一性原則**: 現実の個人の唯一性をすべてのシステムで担保
|
- **唯一性原則**: 現実の個人の唯一性をすべてのシステムで担保
|
||||||
|
@@ -16,14 +16,16 @@ auto_translate = false
|
|||||||
comment_moderation = false
|
comment_moderation = false
|
||||||
ask_ai = true
|
ask_ai = true
|
||||||
provider = "ollama"
|
provider = "ollama"
|
||||||
model = "gemma3:4b"
|
model = "gemma3:2b"
|
||||||
host = "https://ollama.syui.ai"
|
host = "https://ollama.syui.ai"
|
||||||
system_prompt = "あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。"
|
system_prompt = "you are a helpful ai assistant trained on this blog's content. you can answer questions about the articles, provide insights, and help users understand the topics discussed."
|
||||||
ai_did = "did:plc:4hqjfn7m6n5hno3doamuhgef"
|
ai_did = "did:plc:4hqjfn7m6n5hno3doamuhgef"
|
||||||
|
|
||||||
[oauth]
|
[oauth]
|
||||||
json = "client-metadata.json"
|
json = "client-metadata.json"
|
||||||
redirect = "oauth/callback"
|
redirect = "oauth/callback"
|
||||||
admin = "did:plc:uqzpqmrjnptsxezjx4xuh2mn"
|
admin = "did:plc:uqzpqmrjnptsxezjx4xuh2mn"
|
||||||
collection = "ai.syui.log"
|
collection_comment = "ai.syui.log"
|
||||||
|
collection_user = "ai.syui.log.user"
|
||||||
|
collection_chat = "ai.syui.log.chat"
|
||||||
bsky_api = "https://public.api.bsky.app"
|
bsky_api = "https://public.api.bsky.app"
|
||||||
|
@@ -6,7 +6,7 @@ tags: ["blog", "rust", "mcp", "atp"]
|
|||||||
language: ["ja", "en"]
|
language: ["ja", "en"]
|
||||||
---
|
---
|
||||||
|
|
||||||
rustで静的サイトジェネレータを作りました。[ailog](https://git.syui.ai/ai/log)といいます。`hugo`からの移行になります。
|
rustで静的サイトジェネレータを作りました。。[ailog](https://git.syui.ai/ai/log)といいます。`hugo`からの移行になります。
|
||||||
|
|
||||||
`ailog`は、最初にatproto-comment-system(oauth)とask-AIという機能をつけました。
|
`ailog`は、最初にatproto-comment-system(oauth)とask-AIという機能をつけました。
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ $ git clone https://git.syui.ai/ai/log
|
|||||||
$ cd log
|
$ cd log
|
||||||
$ cargo build
|
$ cargo build
|
||||||
$ ./target/debug/ailog init my-blog
|
$ ./target/debug/ailog init my-blog
|
||||||
$ ./target/debug/ailog serve my-blog
|
$ ./target/debug/ailog server my-blog
|
||||||
```
|
```
|
||||||
|
|
||||||
## install
|
## install
|
||||||
@@ -30,7 +30,7 @@ $ export RUSTUP_HOME="$HOME/.rustup"
|
|||||||
$ export PATH="$HOME/.cargo/bin:$PATH"
|
$ export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
---
|
---
|
||||||
$ which ailog
|
$ which ailog
|
||||||
$ ailog -h
|
$ ailog
|
||||||
```
|
```
|
||||||
|
|
||||||
## build deploy
|
## build deploy
|
||||||
|
@@ -6,10 +6,10 @@ tags: ["blog", "cloudflare", "github"]
|
|||||||
draft: false
|
draft: false
|
||||||
---
|
---
|
||||||
|
|
||||||
ブログを移行しました。過去のブログは[syui.github.io](https://syui.github.io)にありあます。
|
ブログを移行しました。
|
||||||
|
|
||||||
1. `gh-pages`から`cf-pages`への移行になります。
|
1. `gh-pages`から`cf-pages`への移行になります。
|
||||||
2. 自作の`ailog`でbuildしています。
|
2. `hugo`からの移行で、自作の`ailog`でbuildしています。
|
||||||
3. 特徴としては、`atproto`, `AI`との連携です。
|
3. 特徴としては、`atproto`, `AI`との連携です。
|
||||||
|
|
||||||
```yml:.github/workflows/cloudflare-pages.yml
|
```yml:.github/workflows/cloudflare-pages.yml
|
||||||
@@ -60,7 +60,3 @@ jobs:
|
|||||||
wranglerVersion: '3'
|
wranglerVersion: '3'
|
||||||
```
|
```
|
||||||
|
|
||||||
## url
|
|
||||||
|
|
||||||
- [https://syui.pages.dev](https://syui.pages.dev)
|
|
||||||
- [https://syui.github.io](https://syui.github.io)
|
|
||||||
|
@@ -1,7 +0,0 @@
|
|||||||
{{ $dateFormat := default "Mon Jan 2, 2006" (index .Site.Params "date_format") }}
|
|
||||||
{{ $utcFormat := "2006-01-02T15:04:05Z07:00" }}
|
|
||||||
{{- $.Scratch.Add "index" slice -}}
|
|
||||||
{{- range .Site.RegularPages -}}
|
|
||||||
{{- $.Scratch.Add "index" (dict "title" .Title "tags" .Params.tags "description" .Description "categories" .Params.categories "contents" .Plain "href" .Permalink "utc_time" (.Date.Format $utcFormat) "formated_time" (.Date.Format $dateFormat)) -}}
|
|
||||||
{{- end -}}
|
|
||||||
{{- $.Scratch.Get "index" | jsonify -}}
|
|
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
/css/*
|
/css/*
|
||||||
Content-Type: text/css
|
Content-Type: text/css
|
||||||
Cache-Control: no-cache
|
Cache-Control: public, max-age=60
|
||||||
|
|
||||||
/*.js
|
/*.js
|
||||||
Content-Type: application/javascript
|
Content-Type: application/javascript
|
||||||
|
@@ -1,3 +1,9 @@
|
|||||||
|
# AI機能をai.gpt MCP serverにリダイレクト
|
||||||
|
/api/ask https://ai-gpt-mcp.syui.ai/ask 200
|
||||||
|
|
||||||
|
# Ollama API proxy (Cloudflare Workers)
|
||||||
|
/api/ollama-proxy https://ollama-proxy.YOUR-SUBDOMAIN.workers.dev/:splat 200
|
||||||
|
|
||||||
# OAuth routes
|
# OAuth routes
|
||||||
/oauth/* /oauth/index.html 200
|
/oauth/* /oauth/index.html 200
|
||||||
|
|
||||||
|
@@ -59,7 +59,7 @@ a.view-markdown:any-link {
|
|||||||
.container {
|
.container {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-rows: auto 0fr 1fr auto;
|
grid-template-rows: auto auto 1fr auto;
|
||||||
grid-template-areas:
|
grid-template-areas:
|
||||||
"header"
|
"header"
|
||||||
"ask-ai"
|
"ask-ai"
|
||||||
@@ -158,15 +158,6 @@ a.view-markdown:any-link {
|
|||||||
background: #f6f8fa;
|
background: #f6f8fa;
|
||||||
border-bottom: 1px solid #d1d9e0;
|
border-bottom: 1px solid #d1d9e0;
|
||||||
padding: 24px;
|
padding: 24px;
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ask-ai-panel[style*="block"] {
|
|
||||||
display: block !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container:has(.ask-ai-panel[style*="block"]) {
|
|
||||||
grid-template-rows: auto auto 1fr auto;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ask-ai-content {
|
.ask-ai-content {
|
||||||
@@ -202,15 +193,13 @@ a.view-markdown:any-link {
|
|||||||
grid-area: main;
|
grid-area: main;
|
||||||
max-width: 1000px;
|
max-width: 1000px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
/* padding: 24px; */
|
padding: 24px;
|
||||||
padding-top: 80px;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 1000px) {
|
@media (max-width: 1000px) {
|
||||||
.main-content {
|
.main-content {
|
||||||
/* padding: 20px; */
|
padding: 20px;
|
||||||
padding: 0px;
|
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -335,10 +324,6 @@ a.view-markdown:any-link {
|
|||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
article.article-content {
|
|
||||||
padding: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.article-meta {
|
.article-meta {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 16px;
|
gap: 16px;
|
||||||
@@ -363,7 +348,6 @@ article.article-content {
|
|||||||
.article-actions {
|
.article-actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 12px;
|
gap: 12px;
|
||||||
padding: 15px 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.action-btn {
|
.action-btn {
|
||||||
@@ -533,21 +517,25 @@ article.article-content {
|
|||||||
margin: 16px 0;
|
margin: 16px 0;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
|
||||||
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* File name display for code blocks - top bar style */
|
/* File name display for code blocks */
|
||||||
.article-body pre[data-filename]::before {
|
.article-body pre[data-filename]::before {
|
||||||
content: attr(data-filename);
|
content: attr(data-filename);
|
||||||
display: block;
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
background: #2D2D30;
|
background: #2D2D30;
|
||||||
color: #AE81FF;
|
color: #CCCCCC;
|
||||||
padding: 8px 16px;
|
padding: 4px 12px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-family: 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', monospace;
|
font-family: 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', monospace;
|
||||||
border-bottom: 1px solid #3E3D32;
|
border-bottom-left-radius: 4px;
|
||||||
margin: 0;
|
border: 1px solid #3E3D32;
|
||||||
width: 100%;
|
border-top: none;
|
||||||
box-sizing: border-box;
|
border-right: none;
|
||||||
|
z-index: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.article-body pre code {
|
.article-body pre code {
|
||||||
@@ -560,11 +548,6 @@ article.article-content {
|
|||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Adjust padding when filename is present */
|
|
||||||
.article-body pre[data-filename] code {
|
|
||||||
padding: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Inline code (not in pre blocks) */
|
/* Inline code (not in pre blocks) */
|
||||||
.article-body code {
|
.article-body code {
|
||||||
background: var(--light-white);
|
background: var(--light-white);
|
||||||
@@ -797,7 +780,7 @@ article.article-content {
|
|||||||
|
|
||||||
@media (max-width: 1000px) {
|
@media (max-width: 1000px) {
|
||||||
.main-header {
|
.main-header {
|
||||||
padding: 0px;
|
padding: 12px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-content {
|
.header-content {
|
||||||
@@ -807,41 +790,6 @@ article.article-content {
|
|||||||
gap: 0;
|
gap: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* OAuth app mobile fixes */
|
|
||||||
.comment-item {
|
|
||||||
padding: 0px !important;
|
|
||||||
margin: 0px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-section {
|
|
||||||
padding: 0px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comments-list {
|
|
||||||
padding: 0px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment-section {
|
|
||||||
padding: 0px !important;
|
|
||||||
margin: 0px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment-content {
|
|
||||||
padding: 10px !important;
|
|
||||||
word-wrap: break-word !important;
|
|
||||||
overflow-wrap: break-word !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment-header {
|
|
||||||
padding: 10px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fix comment-meta URI overflow */
|
|
||||||
.comment-meta {
|
|
||||||
word-break: break-all !important;
|
|
||||||
overflow-wrap: break-word !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Hide site title text on mobile */
|
/* Hide site title text on mobile */
|
||||||
.site-title {
|
.site-title {
|
||||||
display: none;
|
display: none;
|
||||||
@@ -869,13 +817,13 @@ article.article-content {
|
|||||||
justify-self: end;
|
justify-self: end;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Ask AI button mobile style - icon only */
|
/* Ask AI button mobile style */
|
||||||
.ask-ai-btn {
|
.ask-ai-btn {
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
min-width: 40px;
|
min-width: 40px;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
font-size: 0;
|
||||||
gap: 0;
|
gap: 0;
|
||||||
font-size: 0; /* Hide all text content */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ask-ai-btn .ai-icon {
|
.ask-ai-btn .ai-icon {
|
||||||
@@ -905,16 +853,6 @@ article.article-content {
|
|||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Mobile filename display */
|
|
||||||
.article-body pre[data-filename]::before {
|
|
||||||
padding: 6px 12px;
|
|
||||||
font-size: 11px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.article-body pre[data-filename] code {
|
|
||||||
padding: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.article-body code {
|
.article-body code {
|
||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
}
|
}
|
||||||
@@ -932,11 +870,11 @@ article.article-content {
|
|||||||
padding: 16px;
|
padding: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.article-title {
|
.article-title {
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
padding: 30px 0px;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.message-header .avatar {
|
.message-header .avatar {
|
||||||
width: 32px;
|
width: 32px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
@@ -953,4 +891,4 @@ article.article-content {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1,3 +1,3 @@
|
|||||||
<!-- OAuth Comment System - Load globally for session management -->
|
<!-- OAuth Comment System - Load globally for session management -->
|
||||||
<script type="module" crossorigin src="/assets/comment-atproto-mfW-OeY_.js"></script>
|
<script type="module" crossorigin src="/assets/comment-atproto-Do1JWJCw.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-Cm5qR-aM.css">
|
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-CPKYAM8U.css">
|
@@ -1,31 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"categories": [],
|
|
||||||
"contents": "ブログを移行しました。過去のブログはsyui.github.ioにありあます。 gh-pagesからcf-pagesへの移行になります。 自作のailogでbuildしています。 特徴としては、atproto, AIとの連携です。 name: Deploy to Cloudflare Pages on: push: branches: - main workflow_dispatch: jobs: deploy: runs-on: ubuntu-latest permissions: contents: read deployments: write steps: - name: Checkout uses: actions/checkout@v4 - name: Setup Rust uses: actions-rs/toolchain@v1 with: toolchain: stable - name: Build ailog run: cargo build --release - name: Build site with ailog run: | cd my-blog ../target/release/ailog build - name: List public directory run: | ls -la my-blog/public/ - name: Deploy to Cloudflare Pages uses: cloudflare/pages-action@v1 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }} directory: my-blog/public gitHubToken: ${{ secrets.GITHUB_TOKEN }} wranglerVersion: '3' url https://syui.pages.dev https://syui.github.io",
|
|
||||||
"description": "ブログを移行しました。過去のブログはsyui.github.ioにありあます。 \n\ngh-pagesからcf-pagesへの移行になります。\n自作のailogでbuildしています。\n特徴としては、atproto, AIとの連携です。\n\nname: Deploy to Cloudflare Pages\n\non:\n push:\n branches:\n - main\n workfl...",
|
|
||||||
"formated_time": "Sat Jun 14, 2025",
|
|
||||||
"href": "https://syui.ai/posts/2025-06-14-blog.html",
|
|
||||||
"tags": [
|
|
||||||
"blog",
|
|
||||||
"cloudflare",
|
|
||||||
"github"
|
|
||||||
],
|
|
||||||
"title": "ブログを移行した",
|
|
||||||
"utc_time": "2025-06-14T00:00:00Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"categories": [],
|
|
||||||
"contents": "rustで静的サイトジェネレータを作りました。ailogといいます。hugoからの移行になります。 ailogは、最初にatproto-comment-system(oauth)とask-AIという機能をつけました。 quick start $ git clone https://git.syui.ai/ai/log $ cd log $ cargo build $ ./target/debug/ailog init my-blog $ ./target/debug/ailog serve my-blog install $ cargo install --path . --- $ export CARGO_HOME="$HOME/.cargo" $ export RUSTUP_HOME="$HOME/.rustup" $ export PATH="$HOME/.cargo/bin:$PATH" --- $ which ailog $ ailog -h build deploy $ cd my-blog $ vim config.toml $ ailog new test $ vim content/posts/`date +"%Y-%m-%d"`.md $ ailog build # publicの中身をweb-serverにdeploy $ cp -rf ./public/* ./web-server/root/ atproto-comment-system example $ cd ./oauth $ npm i $ npm run build $ npm run preview # Production environment variables VITE_APP_HOST=https://example.com VITE_OAUTH_CLIENT_ID=https://example.com/client-metadata.json VITE_OAUTH_REDIRECT_URI=https://example.com/oauth/callback VITE_ADMIN_DID=did:plc:uqzpqmrjnptsxezjx4xuh2mn # Collection names for OAuth app VITE_COLLECTION_COMMENT=ai.syui.log VITE_COLLECTION_USER=ai.syui.log.user VITE_COLLECTION_CHAT=ai.syui.log.chat # Collection names for ailog (backward compatibility) AILOG_COLLECTION_COMMENT=ai.syui.log AILOG_COLLECTION_USER=ai.syui.log.user # API Configuration VITE_BSKY_PUBLIC_API=https://public.api.bsky.app これはailog oauth build my-blogで./my-blog/config.tomlから./oauth/.env.productionが生成されます。 $ ailog oauth build my-blog use 簡単に説明すると、./oauthで生成するのがatproto-comment-systemです。 <script type="module" crossorigin src="/assets/comment-atproto-${hash}}.js"></script> <link rel="stylesheet" crossorigin href="/assets/comment-atproto-${hash}.css"> <section class="comment-section"> <div id="comment-atproto"></div> </section> ただし、oauthであるため、色々と大変です。本番環境(もしくは近い形)でテストを行いましょう。cf, tailscale, ngrokなど。 tunnel: ${hash} credentials-file: ${path}.json ingress: - hostname: example.com service: http://localhost:4173 originRequest: noHappyEyeballs: true - service: http_status:404 # tunnel list, dnsに登録が必要です $ cloudflared tunnel list $ cloudflared tunnel --config cloudflared-config.yml run $ cloudflared tunnel route dns ${uuid} example.com 以下の2つのcollection recordを生成します。ユーザーにはai.syui.logが生成され、ここにコメントが記録されます。それを取得して表示しています。ai.syui.log.userは管理者であるVITE_ADMIN_DID用です。 VITE_COLLECTION_COMMENT=ai.syui.log VITE_COLLECTION_USER=ai.syui.log.user $ ailog auth login $ ailog stream server このコマンドでai.syui.logをjetstreamから監視して、書き込みがあれば、管理者のai.syui.log.userに記録され、そのuser-listに基づいて、コメント一覧を取得します。 つまり、コメント表示のアカウントを手動で設定するか、自動化するか。自動化するならserverでailog stream serverを動かさなければいけません。 ask-AI ask-AIの仕組みは割愛します。後に変更される可能性が高いと思います。 local llm, mcp, atprotoと組み合わせです。 code syntax # comment d=${0:a:h} // This is a comment fn main() { println!("Hello, world!"); } // This is a comment console.log("Hello, world!");",
|
|
||||||
"description": "rustで静的サイトジェネレータを作りました。ailogといいます。hugoからの移行になります。 \nailogは、最初にatproto-comment-system(oauth)とask-AIという機能をつけました。 \nquick start\n$ git clone https://git.syui.ai/ai/log\n$ cd log\n$ cargo build\n$ ./target/debu...",
|
|
||||||
"formated_time": "Thu Jun 12, 2025",
|
|
||||||
"href": "https://syui.ai/posts/2025-06-06-ailog.html",
|
|
||||||
"tags": [
|
|
||||||
"blog",
|
|
||||||
"rust",
|
|
||||||
"mcp",
|
|
||||||
"atp"
|
|
||||||
],
|
|
||||||
"title": "静的サイトジェネレータを作った",
|
|
||||||
"utc_time": "2025-06-12T00:00:00Z"
|
|
||||||
}
|
|
||||||
]
|
|
@@ -1,281 +1,360 @@
|
|||||||
/**
|
/**
|
||||||
* Ask AI functionality - Based on original working implementation
|
* Ask AI functionality - Pure JavaScript, no jQuery dependency
|
||||||
*/
|
*/
|
||||||
|
class AskAI {
|
||||||
// Global variables for AI functionality
|
constructor() {
|
||||||
let aiProfileData = null;
|
this.isReady = false;
|
||||||
|
this.aiProfile = null;
|
||||||
// Original functions from working implementation
|
this.init();
|
||||||
function toggleAskAI() {
|
|
||||||
const panel = document.getElementById('askAiPanel');
|
|
||||||
const isVisible = panel.style.display !== 'none';
|
|
||||||
panel.style.display = isVisible ? 'none' : 'block';
|
|
||||||
|
|
||||||
if (!isVisible) {
|
|
||||||
checkAuthenticationStatus();
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function checkAuthenticationStatus() {
|
init() {
|
||||||
const userSections = document.querySelectorAll('.user-section');
|
this.setupEventListeners();
|
||||||
const isAuthenticated = userSections.length > 0;
|
this.checkAuthOnLoad();
|
||||||
|
}
|
||||||
if (isAuthenticated) {
|
|
||||||
// User is authenticated - show Ask AI UI
|
setupEventListeners() {
|
||||||
document.getElementById('authCheck').style.display = 'none';
|
// Listen for AI ready signal
|
||||||
document.getElementById('chatForm').style.display = 'block';
|
window.addEventListener('aiChatReady', () => {
|
||||||
document.getElementById('chatHistory').style.display = 'block';
|
this.isReady = true;
|
||||||
|
console.log('AI Chat is ready');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Listen for AI profile updates
|
||||||
|
window.addEventListener('aiProfileLoaded', (event) => {
|
||||||
|
this.aiProfile = event.detail;
|
||||||
|
console.log('AI profile loaded:', this.aiProfile);
|
||||||
|
this.updateButton();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Listen for AI responses
|
||||||
|
window.addEventListener('aiResponseReceived', (event) => {
|
||||||
|
this.handleAIResponse(event.detail);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Keyboard shortcuts
|
||||||
|
document.addEventListener('keydown', (e) => {
|
||||||
|
if (e.key === 'Escape') {
|
||||||
|
this.hide();
|
||||||
|
}
|
||||||
|
if (e.key === 'Enter' && e.target.id === 'aiQuestion' && !e.shiftKey) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.ask();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Monitor authentication changes
|
||||||
|
this.observeAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
toggle() {
|
||||||
|
const panel = document.getElementById('askAiPanel');
|
||||||
|
const isVisible = panel.style.display !== 'none';
|
||||||
|
|
||||||
// Show initial greeting if chat history is empty
|
if (isVisible) {
|
||||||
|
this.hide();
|
||||||
|
} else {
|
||||||
|
this.show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
show() {
|
||||||
|
const panel = document.getElementById('askAiPanel');
|
||||||
|
panel.style.display = 'block';
|
||||||
|
this.checkAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
hide() {
|
||||||
|
const panel = document.getElementById('askAiPanel');
|
||||||
|
panel.style.display = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
checkAuth() {
|
||||||
|
const userSections = document.querySelectorAll('.user-section');
|
||||||
|
const isAuthenticated = userSections.length > 0;
|
||||||
|
|
||||||
|
const authCheck = document.getElementById('authCheck');
|
||||||
|
const chatForm = document.getElementById('chatForm');
|
||||||
const chatHistory = document.getElementById('chatHistory');
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
if (chatHistory.children.length === 0) {
|
|
||||||
showInitialGreeting();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Focus on input
|
if (isAuthenticated) {
|
||||||
|
authCheck.style.display = 'none';
|
||||||
|
chatForm.style.display = 'block';
|
||||||
|
chatHistory.style.display = 'block';
|
||||||
|
|
||||||
|
if (chatHistory.children.length === 0) {
|
||||||
|
this.showGreeting();
|
||||||
|
}
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
document.getElementById('aiQuestion').focus();
|
||||||
|
}, 50);
|
||||||
|
} else {
|
||||||
|
authCheck.style.display = 'block';
|
||||||
|
chatForm.style.display = 'none';
|
||||||
|
chatHistory.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
checkAuthOnLoad() {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
document.getElementById('aiQuestion').focus();
|
this.checkAuth();
|
||||||
}, 50);
|
}, 500);
|
||||||
} else {
|
|
||||||
// User not authenticated - show auth message
|
|
||||||
document.getElementById('authCheck').style.display = 'block';
|
|
||||||
document.getElementById('chatForm').style.display = 'none';
|
|
||||||
document.getElementById('chatHistory').style.display = 'none';
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function askQuestion() {
|
observeAuth() {
|
||||||
const question = document.getElementById('aiQuestion').value;
|
const observer = new MutationObserver(() => {
|
||||||
if (!question.trim()) return;
|
const userSections = document.querySelectorAll('.user-section');
|
||||||
|
if (userSections.length > 0) {
|
||||||
const askButton = document.getElementById('askButton');
|
this.checkAuth();
|
||||||
askButton.disabled = true;
|
observer.disconnect();
|
||||||
askButton.textContent = 'Posting...';
|
}
|
||||||
|
});
|
||||||
try {
|
|
||||||
// Add user message to chat
|
|
||||||
addUserMessage(question);
|
|
||||||
|
|
||||||
// Clear input
|
observer.observe(document.body, {
|
||||||
document.getElementById('aiQuestion').value = '';
|
childList: true,
|
||||||
|
subtree: true
|
||||||
// Show loading
|
});
|
||||||
showLoadingMessage();
|
|
||||||
|
|
||||||
// Post question via OAuth app
|
|
||||||
window.dispatchEvent(new CustomEvent('postAIQuestion', {
|
|
||||||
detail: { question: question }
|
|
||||||
}));
|
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to ask question:', error);
|
|
||||||
showErrorMessage('Sorry, I encountered an error. Please try again.');
|
|
||||||
} finally {
|
|
||||||
askButton.disabled = false;
|
|
||||||
askButton.textContent = 'Ask';
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function addUserMessage(question) {
|
updateButton() {
|
||||||
const chatHistory = document.getElementById('chatHistory');
|
const button = document.getElementById('askAiButton');
|
||||||
const userSection = document.querySelector('.user-section');
|
if (this.aiProfile && this.aiProfile.displayName) {
|
||||||
|
const textNode = button.childNodes[2];
|
||||||
let userAvatar = '👤';
|
if (textNode) {
|
||||||
let userDisplay = 'You';
|
textNode.textContent = this.aiProfile.displayName;
|
||||||
let userHandle = 'user';
|
}
|
||||||
|
|
||||||
if (userSection) {
|
|
||||||
const avatarImg = userSection.querySelector('.user-avatar');
|
|
||||||
const displayName = userSection.querySelector('.user-display-name');
|
|
||||||
const handle = userSection.querySelector('.user-handle');
|
|
||||||
|
|
||||||
if (avatarImg && avatarImg.src) {
|
|
||||||
userAvatar = `<img src="${avatarImg.src}" alt="${displayName?.textContent || 'User'}" class="profile-avatar">`;
|
|
||||||
}
|
|
||||||
if (displayName?.textContent) {
|
|
||||||
userDisplay = displayName.textContent;
|
|
||||||
}
|
|
||||||
if (handle?.textContent) {
|
|
||||||
userHandle = handle.textContent.replace('@', '');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const questionDiv = document.createElement('div');
|
showGreeting() {
|
||||||
questionDiv.className = 'chat-message user-message comment-style';
|
if (!this.aiProfile) return;
|
||||||
questionDiv.innerHTML = `
|
|
||||||
<div class="message-header">
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
<div class="avatar">${userAvatar}</div>
|
const greetingDiv = document.createElement('div');
|
||||||
<div class="user-info">
|
greetingDiv.className = 'chat-message ai-message comment-style initial-greeting';
|
||||||
<div class="display-name">${userDisplay}</div>
|
|
||||||
<div class="handle">@${userHandle}</div>
|
const avatarElement = this.aiProfile.avatar
|
||||||
<div class="timestamp">${new Date().toLocaleString()}</div>
|
? `<img src="${this.aiProfile.avatar}" alt="${this.aiProfile.displayName}" class="profile-avatar">`
|
||||||
|
: '🤖';
|
||||||
|
|
||||||
|
greetingDiv.innerHTML = `
|
||||||
|
<div class="message-header">
|
||||||
|
<div class="avatar">${avatarElement}</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<div class="display-name">${this.aiProfile.displayName}</div>
|
||||||
|
<div class="handle">@${this.aiProfile.handle}</div>
|
||||||
|
<div class="timestamp">${new Date().toLocaleString()}</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="message-content">
|
||||||
<div class="message-content">${question}</div>
|
Hello! I'm an AI assistant trained on this blog's content. I can answer questions about the articles, provide insights, and help you understand the topics discussed here. What would you like to know?
|
||||||
`;
|
|
||||||
chatHistory.appendChild(questionDiv);
|
|
||||||
}
|
|
||||||
|
|
||||||
function showLoadingMessage() {
|
|
||||||
const chatHistory = document.getElementById('chatHistory');
|
|
||||||
const loadingDiv = document.createElement('div');
|
|
||||||
loadingDiv.className = 'ai-loading-simple';
|
|
||||||
loadingDiv.innerHTML = `
|
|
||||||
<i class="fas fa-robot"></i>
|
|
||||||
<span>考えています</span>
|
|
||||||
<i class="fas fa-spinner fa-spin"></i>
|
|
||||||
`;
|
|
||||||
chatHistory.appendChild(loadingDiv);
|
|
||||||
}
|
|
||||||
|
|
||||||
function showErrorMessage(message) {
|
|
||||||
const chatHistory = document.getElementById('chatHistory');
|
|
||||||
removeLoadingMessage();
|
|
||||||
|
|
||||||
const errorDiv = document.createElement('div');
|
|
||||||
errorDiv.className = 'chat-message error-message comment-style';
|
|
||||||
errorDiv.innerHTML = `
|
|
||||||
<div class="message-header">
|
|
||||||
<div class="avatar">⚠️</div>
|
|
||||||
<div class="user-info">
|
|
||||||
<div class="display-name">System</div>
|
|
||||||
<div class="handle">@system</div>
|
|
||||||
<div class="timestamp">${new Date().toLocaleString()}</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
`;
|
||||||
<div class="message-content">${message}</div>
|
chatHistory.appendChild(greetingDiv);
|
||||||
`;
|
|
||||||
chatHistory.appendChild(errorDiv);
|
|
||||||
}
|
|
||||||
|
|
||||||
function removeLoadingMessage() {
|
|
||||||
const loadingMsg = document.querySelector('.ai-loading-simple');
|
|
||||||
if (loadingMsg) {
|
|
||||||
loadingMsg.remove();
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function showInitialGreeting() {
|
async ask() {
|
||||||
if (!aiProfileData) return;
|
const question = document.getElementById('aiQuestion').value;
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
const chatHistory = document.getElementById('chatHistory');
|
const askButton = document.getElementById('askButton');
|
||||||
const greetingDiv = document.createElement('div');
|
|
||||||
greetingDiv.className = 'chat-message ai-message comment-style initial-greeting';
|
if (!question.trim()) return;
|
||||||
|
|
||||||
const avatarElement = aiProfileData.avatar
|
// Wait for AI to be ready
|
||||||
? `<img src="${aiProfileData.avatar}" alt="${aiProfileData.displayName}" class="profile-avatar">`
|
if (!this.isReady) {
|
||||||
: '🤖';
|
await this.waitForReady();
|
||||||
|
}
|
||||||
greetingDiv.innerHTML = `
|
|
||||||
<div class="message-header">
|
// Disable button
|
||||||
<div class="avatar">${avatarElement}</div>
|
askButton.disabled = true;
|
||||||
<div class="user-info">
|
askButton.textContent = 'Posting...';
|
||||||
<div class="display-name">${aiProfileData.displayName}</div>
|
|
||||||
<div class="handle">@${aiProfileData.handle}</div>
|
try {
|
||||||
<div class="timestamp">${new Date().toLocaleString()}</div>
|
// Add user message
|
||||||
</div>
|
this.addUserMessage(question);
|
||||||
</div>
|
|
||||||
<div class="message-content">
|
// Clear input
|
||||||
Hello! I'm an AI assistant trained on this blog's content. I can answer questions about the articles, provide insights, and help you understand the topics discussed here. What would you like to know?
|
document.getElementById('aiQuestion').value = '';
|
||||||
</div>
|
|
||||||
`;
|
// Show loading
|
||||||
chatHistory.appendChild(greetingDiv);
|
this.showLoading();
|
||||||
}
|
|
||||||
|
// Post question
|
||||||
function updateAskAIButton() {
|
const event = new CustomEvent('postAIQuestion', {
|
||||||
const button = document.getElementById('askAiButton');
|
detail: { question: question }
|
||||||
if (!button) return;
|
});
|
||||||
|
window.dispatchEvent(event);
|
||||||
// Only update text, never modify the icon
|
|
||||||
if (aiProfileData && aiProfileData.displayName) {
|
} catch (error) {
|
||||||
const textNode = button.childNodes[2] || button.lastChild;
|
this.showError('Sorry, I encountered an error. Please try again.');
|
||||||
if (textNode && textNode.nodeType === Node.TEXT_NODE) {
|
} finally {
|
||||||
textNode.textContent = aiProfileData.displayName;
|
askButton.disabled = false;
|
||||||
|
askButton.textContent = 'Ask';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function handleAIResponse(responseData) {
|
waitForReady() {
|
||||||
const chatHistory = document.getElementById('chatHistory');
|
return new Promise(resolve => {
|
||||||
removeLoadingMessage();
|
const checkReady = setInterval(() => {
|
||||||
|
if (this.isReady) {
|
||||||
const aiProfile = responseData.aiProfile;
|
clearInterval(checkReady);
|
||||||
if (!aiProfile || !aiProfile.handle || !aiProfile.displayName) {
|
resolve();
|
||||||
console.error('AI profile data is missing');
|
}
|
||||||
return;
|
}, 100);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const timestamp = new Date(responseData.timestamp || Date.now());
|
|
||||||
const avatarElement = aiProfile.avatar
|
|
||||||
? `<img src="${aiProfile.avatar}" alt="${aiProfile.displayName}" class="profile-avatar">`
|
|
||||||
: '🤖';
|
|
||||||
|
|
||||||
const answerDiv = document.createElement('div');
|
|
||||||
answerDiv.className = 'chat-message ai-message comment-style';
|
|
||||||
answerDiv.innerHTML = `
|
|
||||||
<div class="message-header">
|
|
||||||
<div class="avatar">${avatarElement}</div>
|
|
||||||
<div class="user-info">
|
|
||||||
<div class="display-name">${aiProfile.displayName}</div>
|
|
||||||
<div class="handle">@${aiProfile.handle}</div>
|
|
||||||
<div class="timestamp">${timestamp.toLocaleString()}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="message-content">${responseData.answer}</div>
|
|
||||||
`;
|
|
||||||
chatHistory.appendChild(answerDiv);
|
|
||||||
|
|
||||||
// Limit chat history
|
|
||||||
limitChatHistory();
|
|
||||||
}
|
|
||||||
|
|
||||||
function limitChatHistory() {
|
addUserMessage(question) {
|
||||||
const chatHistory = document.getElementById('chatHistory');
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
if (chatHistory.children.length > 10) {
|
const userSection = document.querySelector('.user-section');
|
||||||
chatHistory.removeChild(chatHistory.children[0]);
|
|
||||||
if (chatHistory.children.length > 0) {
|
let userAvatar = '👤';
|
||||||
chatHistory.removeChild(chatHistory.children[0]);
|
let userDisplay = 'You';
|
||||||
}
|
let userHandle = 'user';
|
||||||
}
|
|
||||||
}
|
if (userSection) {
|
||||||
|
const avatarImg = userSection.querySelector('.user-avatar');
|
||||||
// Event listeners setup
|
const displayName = userSection.querySelector('.user-display-name');
|
||||||
function setupAskAIEventListeners() {
|
const handle = userSection.querySelector('.user-handle');
|
||||||
// Listen for AI profile updates from OAuth app
|
|
||||||
window.addEventListener('aiProfileLoaded', function(event) {
|
if (avatarImg && avatarImg.src) {
|
||||||
aiProfileData = event.detail;
|
userAvatar = `<img src="${avatarImg.src}" alt="${displayName?.textContent || 'User'}" class="profile-avatar">`;
|
||||||
console.log('AI profile loaded:', aiProfileData);
|
}
|
||||||
updateAskAIButton();
|
if (displayName?.textContent) {
|
||||||
});
|
userDisplay = displayName.textContent;
|
||||||
|
}
|
||||||
// Listen for AI responses
|
if (handle?.textContent) {
|
||||||
window.addEventListener('aiResponseReceived', function(event) {
|
userHandle = handle.textContent.replace('@', '');
|
||||||
handleAIResponse(event.detail);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Keyboard shortcuts
|
|
||||||
document.addEventListener('keydown', function(e) {
|
|
||||||
if (e.key === 'Escape') {
|
|
||||||
const panel = document.getElementById('askAiPanel');
|
|
||||||
if (panel) {
|
|
||||||
panel.style.display = 'none';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enter key to send message (only when not composing Japanese input)
|
const questionDiv = document.createElement('div');
|
||||||
if (e.key === 'Enter' && e.target.id === 'aiQuestion' && !e.shiftKey && !e.isComposing) {
|
questionDiv.className = 'chat-message user-message comment-style';
|
||||||
e.preventDefault();
|
questionDiv.innerHTML = `
|
||||||
askQuestion();
|
<div class="message-header">
|
||||||
|
<div class="avatar">${userAvatar}</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<div class="display-name">${userDisplay}</div>
|
||||||
|
<div class="handle">@${userHandle}</div>
|
||||||
|
<div class="timestamp">${new Date().toLocaleString()}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="message-content">${question}</div>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(questionDiv);
|
||||||
|
}
|
||||||
|
|
||||||
|
showLoading() {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
const loadingDiv = document.createElement('div');
|
||||||
|
loadingDiv.className = 'ai-loading-simple';
|
||||||
|
loadingDiv.innerHTML = `
|
||||||
|
<i class="fas fa-robot"></i>
|
||||||
|
<span>考えています</span>
|
||||||
|
<i class="fas fa-spinner fa-spin"></i>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(loadingDiv);
|
||||||
|
}
|
||||||
|
|
||||||
|
showError(message) {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
this.removeLoading();
|
||||||
|
|
||||||
|
const errorDiv = document.createElement('div');
|
||||||
|
errorDiv.className = 'chat-message error-message comment-style';
|
||||||
|
errorDiv.innerHTML = `
|
||||||
|
<div class="message-header">
|
||||||
|
<div class="avatar">⚠️</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<div class="display-name">System</div>
|
||||||
|
<div class="handle">@system</div>
|
||||||
|
<div class="timestamp">${new Date().toLocaleString()}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="message-content">${message}</div>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(errorDiv);
|
||||||
|
}
|
||||||
|
|
||||||
|
removeLoading() {
|
||||||
|
const loadingMsg = document.querySelector('.ai-loading-simple');
|
||||||
|
if (loadingMsg) {
|
||||||
|
loadingMsg.remove();
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
|
||||||
|
handleAIResponse(responseData) {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
this.removeLoading();
|
||||||
|
|
||||||
|
const aiProfile = responseData.aiProfile;
|
||||||
|
if (!aiProfile || !aiProfile.handle || !aiProfile.displayName) {
|
||||||
|
console.error('AI profile data is missing');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const timestamp = new Date(responseData.timestamp || Date.now());
|
||||||
|
const avatarElement = aiProfile.avatar
|
||||||
|
? `<img src="${aiProfile.avatar}" alt="${aiProfile.displayName}" class="profile-avatar">`
|
||||||
|
: '🤖';
|
||||||
|
|
||||||
|
const answerDiv = document.createElement('div');
|
||||||
|
answerDiv.className = 'chat-message ai-message comment-style';
|
||||||
|
answerDiv.innerHTML = `
|
||||||
|
<div class="message-header">
|
||||||
|
<div class="avatar">${avatarElement}</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<div class="display-name">${aiProfile.displayName}</div>
|
||||||
|
<div class="handle">@${aiProfile.handle}</div>
|
||||||
|
<div class="timestamp">${timestamp.toLocaleString()}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="message-content">${responseData.answer}</div>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(answerDiv);
|
||||||
|
|
||||||
|
// Limit chat history
|
||||||
|
this.limitChatHistory();
|
||||||
|
}
|
||||||
|
|
||||||
|
limitChatHistory() {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
if (chatHistory.children.length > 10) {
|
||||||
|
chatHistory.removeChild(chatHistory.children[0]);
|
||||||
|
if (chatHistory.children.length > 0) {
|
||||||
|
chatHistory.removeChild(chatHistory.children[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize Ask AI when DOM is loaded
|
// Initialize Ask AI when DOM is loaded
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
setupAskAIEventListeners();
|
try {
|
||||||
console.log('Ask AI initialized successfully');
|
window.askAIInstance = new AskAI();
|
||||||
|
console.log('Ask AI initialized successfully');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to initialize Ask AI:', error);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Global functions for onclick handlers
|
// Global function for onclick
|
||||||
window.toggleAskAI = toggleAskAI;
|
window.AskAI = {
|
||||||
window.askQuestion = askQuestion;
|
toggle: function() {
|
||||||
|
console.log('AskAI.toggle called');
|
||||||
|
if (window.askAIInstance) {
|
||||||
|
window.askAIInstance.toggle();
|
||||||
|
} else {
|
||||||
|
console.error('Ask AI instance not available');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
ask: function() {
|
||||||
|
console.log('AskAI.ask called');
|
||||||
|
if (window.askAIInstance) {
|
||||||
|
window.askAIInstance.ask();
|
||||||
|
} else {
|
||||||
|
console.error('Ask AI instance not available');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
@@ -15,6 +15,7 @@
|
|||||||
<link rel="stylesheet" href="/pkg/icomoon/style.css">
|
<link rel="stylesheet" href="/pkg/icomoon/style.css">
|
||||||
<link rel="stylesheet" href="/pkg/font-awesome/css/all.min.css">
|
<link rel="stylesheet" href="/pkg/font-awesome/css/all.min.css">
|
||||||
|
|
||||||
|
{% include "oauth-assets.html" %}
|
||||||
{% block head %}{% endblock %}
|
{% block head %}{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -49,7 +50,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="header-actions">
|
<div class="header-actions">
|
||||||
<button class="ask-ai-btn" onclick="toggleAskAI()" id="askAiButton">
|
<button class="ask-ai-btn" onclick="AskAI.toggle()" id="askAiButton">
|
||||||
<span class="ai-icon icon-ai"></span>
|
<span class="ai-icon icon-ai"></span>
|
||||||
ai
|
ai
|
||||||
</button>
|
</button>
|
||||||
@@ -66,7 +67,7 @@
|
|||||||
|
|
||||||
<div id="chatForm" class="ask-ai-form" style="display: none;">
|
<div id="chatForm" class="ask-ai-form" style="display: none;">
|
||||||
<input type="text" id="aiQuestion" placeholder="What would you like to know?" />
|
<input type="text" id="aiQuestion" placeholder="What would you like to know?" />
|
||||||
<button onclick="askQuestion()" id="askButton">Ask</button>
|
<button onclick="AskAI.ask()" id="askButton">Ask</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="chatHistory" class="chat-history" style="display: none;"></div>
|
<div id="chatHistory" class="chat-history" style="display: none;"></div>
|
||||||
@@ -91,7 +92,5 @@
|
|||||||
|
|
||||||
<script src="/js/ask-ai.js"></script>
|
<script src="/js/ask-ai.js"></script>
|
||||||
<script src="/js/theme.js"></script>
|
<script src="/js/theme.js"></script>
|
||||||
|
|
||||||
{% include "oauth-assets.html" %}
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@@ -1,3 +1,3 @@
|
|||||||
<!-- OAuth Comment System - Load globally for session management -->
|
<!-- OAuth Comment System - Load globally for session management -->
|
||||||
<script type="module" crossorigin src="/assets/comment-atproto-mfW-OeY_.js"></script>
|
<script type="module" crossorigin src="/assets/comment-atproto-Do1JWJCw.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-Cm5qR-aM.css">
|
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-CPKYAM8U.css">
|
@@ -4,18 +4,24 @@ VITE_OAUTH_CLIENT_ID=https://syui.ai/client-metadata.json
|
|||||||
VITE_OAUTH_REDIRECT_URI=https://syui.ai/oauth/callback
|
VITE_OAUTH_REDIRECT_URI=https://syui.ai/oauth/callback
|
||||||
VITE_ADMIN_DID=did:plc:uqzpqmrjnptsxezjx4xuh2mn
|
VITE_ADMIN_DID=did:plc:uqzpqmrjnptsxezjx4xuh2mn
|
||||||
|
|
||||||
# Base collection (all others are derived via getCollectionNames)
|
# Collection names for OAuth app
|
||||||
VITE_OAUTH_COLLECTION=ai.syui.log
|
VITE_COLLECTION_COMMENT=ai.syui.log
|
||||||
|
VITE_COLLECTION_USER=ai.syui.log.user
|
||||||
|
VITE_COLLECTION_CHAT=ai.syui.log.chat
|
||||||
|
|
||||||
|
# Collection names for ailog (backward compatibility)
|
||||||
|
AILOG_COLLECTION_COMMENT=ai.syui.log
|
||||||
|
AILOG_COLLECTION_USER=ai.syui.log.user
|
||||||
|
AILOG_COLLECTION_CHAT=ai.syui.log.chat
|
||||||
|
|
||||||
# AI Configuration
|
# AI Configuration
|
||||||
VITE_AI_ENABLED=true
|
VITE_AI_ENABLED=true
|
||||||
VITE_AI_ASK_AI=true
|
VITE_AI_ASK_AI=true
|
||||||
VITE_AI_PROVIDER=ollama
|
VITE_AI_PROVIDER=ollama
|
||||||
VITE_AI_MODEL=gemma3:4b
|
VITE_AI_MODEL=gemma3:2b
|
||||||
VITE_AI_HOST=https://ollama.syui.ai
|
VITE_AI_HOST=https://ollama.syui.ai
|
||||||
VITE_AI_SYSTEM_PROMPT="あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。"
|
VITE_AI_SYSTEM_PROMPT="you are a helpful ai assistant trained on this blog's content. you can answer questions about the articles, provide insights, and help users understand the topics discussed."
|
||||||
VITE_AI_DID=did:plc:4hqjfn7m6n5hno3doamuhgef
|
VITE_AI_DID=did:plc:4hqjfn7m6n5hno3doamuhgef
|
||||||
|
|
||||||
# API Configuration
|
# API Configuration
|
||||||
VITE_BSKY_PUBLIC_API=https://public.api.bsky.app
|
VITE_BSKY_PUBLIC_API=https://public.api.bsky.app
|
||||||
VITE_ATPROTO_API=https://bsky.social
|
|
||||||
|
@@ -171,57 +171,6 @@
|
|||||||
.app .app-main {
|
.app .app-main {
|
||||||
padding: 0px !important;
|
padding: 0px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment-item {
|
|
||||||
padding: 0px !important;
|
|
||||||
margin: 0px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-section {
|
|
||||||
padding: 0px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comments-list {
|
|
||||||
padding: 0px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment-section {
|
|
||||||
padding: 0px !important;
|
|
||||||
margin: 0px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment-content {
|
|
||||||
padding: 10px !important;
|
|
||||||
word-wrap: break-word !important;
|
|
||||||
overflow-wrap: break-word !important;
|
|
||||||
white-space: pre-wrap !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment-header {
|
|
||||||
padding: 10px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fix overflow on article pages */
|
|
||||||
article.article-content {
|
|
||||||
overflow-x: hidden !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Ensure full width on mobile */
|
|
||||||
.app {
|
|
||||||
max-width: 100vw !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fix button overflow */
|
|
||||||
button {
|
|
||||||
max-width: 100%;
|
|
||||||
white-space: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fix comment-meta URI overflow */
|
|
||||||
.comment-meta {
|
|
||||||
word-break: break-all !important;
|
|
||||||
overflow-wrap: break-word !important;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.gacha-section {
|
.gacha-section {
|
||||||
@@ -324,7 +273,6 @@
|
|||||||
/* padding: 20px; - removed to avoid double padding */
|
/* padding: 20px; - removed to avoid double padding */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.auth-section {
|
.auth-section {
|
||||||
background: #f8f9fa;
|
background: #f8f9fa;
|
||||||
border: 1px solid #e9ecef;
|
border: 1px solid #e9ecef;
|
||||||
@@ -499,8 +447,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.comments-list {
|
.comments-list {
|
||||||
|
border: 1px solid #ddd;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
padding: 0px;
|
padding: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comments-header {
|
.comments-header {
|
||||||
@@ -611,8 +560,6 @@
|
|||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
color: #333;
|
color: #333;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
white-space: pre-wrap;
|
|
||||||
word-wrap: break-word;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment-meta {
|
.comment-meta {
|
||||||
@@ -859,6 +806,28 @@
|
|||||||
background: #f6f8fa;
|
background: #f6f8fa;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* AI Chat History */
|
||||||
|
.ai-chat-list {
|
||||||
|
max-width: 100%;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-item {
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 16px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
.chat-actions {
|
.chat-actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -909,8 +878,4 @@
|
|||||||
padding: 40px 20px;
|
padding: 40px 20px;
|
||||||
color: #656d76;
|
color: #656d76;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
|
||||||
|
|
||||||
.chat-message.comment-style {
|
|
||||||
border-left: 4px solid var(--theme-color);
|
|
||||||
}
|
}
|
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { User } from '../services/auth';
|
import { User } from '../services/auth';
|
||||||
import { atprotoOAuthService } from '../services/atproto-oauth';
|
import { atprotoOAuthService } from '../services/atproto-oauth';
|
||||||
import { appConfig, getCollectionNames } from '../config/app';
|
import { appConfig } from '../config/app';
|
||||||
|
|
||||||
interface AIChatProps {
|
interface AIChatProps {
|
||||||
user: User | null;
|
user: User | null;
|
||||||
@@ -14,22 +14,26 @@ export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
|||||||
const [isProcessing, setIsProcessing] = useState(false);
|
const [isProcessing, setIsProcessing] = useState(false);
|
||||||
const [aiProfile, setAiProfile] = useState<any>(null);
|
const [aiProfile, setAiProfile] = useState<any>(null);
|
||||||
|
|
||||||
// Get AI settings from appConfig (unified configuration)
|
// Get AI settings from environment variables
|
||||||
const aiConfig = {
|
const aiConfig = {
|
||||||
enabled: appConfig.aiEnabled,
|
enabled: import.meta.env.VITE_AI_ENABLED === 'true',
|
||||||
askAi: appConfig.aiAskAi,
|
askAi: import.meta.env.VITE_AI_ASK_AI === 'true',
|
||||||
provider: appConfig.aiProvider,
|
provider: import.meta.env.VITE_AI_PROVIDER || 'ollama',
|
||||||
model: appConfig.aiModel,
|
model: import.meta.env.VITE_AI_MODEL || 'gemma3:4b',
|
||||||
host: appConfig.aiHost,
|
host: import.meta.env.VITE_AI_HOST || 'https://ollama.syui.ai',
|
||||||
systemPrompt: appConfig.aiSystemPrompt,
|
systemPrompt: import.meta.env.VITE_AI_SYSTEM_PROMPT || 'You are a helpful AI assistant trained on this blog\'s content.',
|
||||||
aiDid: appConfig.aiDid,
|
aiDid: import.meta.env.VITE_AI_DID || 'did:plc:uqzpqmrjnptsxezjx4xuh2mn',
|
||||||
bskyPublicApi: appConfig.bskyPublicApi,
|
bskyPublicApi: import.meta.env.VITE_BSKY_PUBLIC_API || 'https://public.api.bsky.app',
|
||||||
};
|
};
|
||||||
|
|
||||||
// Fetch AI profile on load
|
// Fetch AI profile on load
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchAIProfile = async () => {
|
const fetchAIProfile = async () => {
|
||||||
|
console.log('=== AI PROFILE FETCH START ===');
|
||||||
|
console.log('AI DID:', aiConfig.aiDid);
|
||||||
|
|
||||||
if (!aiConfig.aiDid) {
|
if (!aiConfig.aiDid) {
|
||||||
|
console.log('No AI DID configured');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +41,9 @@ export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
|||||||
// Try with agent first
|
// Try with agent first
|
||||||
const agent = atprotoOAuthService.getAgent();
|
const agent = atprotoOAuthService.getAgent();
|
||||||
if (agent) {
|
if (agent) {
|
||||||
|
console.log('Fetching AI profile with agent for DID:', aiConfig.aiDid);
|
||||||
const profile = await agent.getProfile({ actor: aiConfig.aiDid });
|
const profile = await agent.getProfile({ actor: aiConfig.aiDid });
|
||||||
|
console.log('AI profile fetched successfully:', profile.data);
|
||||||
const profileData = {
|
const profileData = {
|
||||||
did: aiConfig.aiDid,
|
did: aiConfig.aiDid,
|
||||||
handle: profile.data.handle,
|
handle: profile.data.handle,
|
||||||
@@ -45,17 +51,21 @@ export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
|||||||
avatar: profile.data.avatar,
|
avatar: profile.data.avatar,
|
||||||
description: profile.data.description
|
description: profile.data.description
|
||||||
};
|
};
|
||||||
|
console.log('Setting aiProfile to:', profileData);
|
||||||
setAiProfile(profileData);
|
setAiProfile(profileData);
|
||||||
|
|
||||||
// Dispatch event to update Ask AI button
|
// Dispatch event to update Ask AI button
|
||||||
window.dispatchEvent(new CustomEvent('aiProfileLoaded', { detail: profileData }));
|
window.dispatchEvent(new CustomEvent('aiProfileLoaded', { detail: profileData }));
|
||||||
|
console.log('=== AI PROFILE FETCH SUCCESS (AGENT) ===');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fallback to public API
|
// Fallback to public API
|
||||||
|
console.log('No agent available, trying public API for AI profile');
|
||||||
const response = await fetch(`${aiConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(aiConfig.aiDid)}`);
|
const response = await fetch(`${aiConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(aiConfig.aiDid)}`);
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
const profileData = await response.json();
|
const profileData = await response.json();
|
||||||
|
console.log('AI profile fetched via public API:', profileData);
|
||||||
const profile = {
|
const profile = {
|
||||||
did: aiConfig.aiDid,
|
did: aiConfig.aiDid,
|
||||||
handle: profileData.handle,
|
handle: profileData.handle,
|
||||||
@@ -63,15 +73,21 @@ export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
|||||||
avatar: profileData.avatar,
|
avatar: profileData.avatar,
|
||||||
description: profileData.description
|
description: profileData.description
|
||||||
};
|
};
|
||||||
|
console.log('Setting aiProfile to:', profile);
|
||||||
setAiProfile(profile);
|
setAiProfile(profile);
|
||||||
|
|
||||||
// Dispatch event to update Ask AI button
|
// Dispatch event to update Ask AI button
|
||||||
window.dispatchEvent(new CustomEvent('aiProfileLoaded', { detail: profile }));
|
window.dispatchEvent(new CustomEvent('aiProfileLoaded', { detail: profile }));
|
||||||
|
console.log('=== AI PROFILE FETCH SUCCESS (PUBLIC API) ===');
|
||||||
return;
|
return;
|
||||||
|
} else {
|
||||||
|
console.error('Public API failed with status:', response.status);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch AI profile:', error);
|
||||||
setAiProfile(null);
|
setAiProfile(null);
|
||||||
}
|
}
|
||||||
|
console.log('=== AI PROFILE FETCH FAILED ===');
|
||||||
};
|
};
|
||||||
|
|
||||||
fetchAIProfile();
|
fetchAIProfile();
|
||||||
@@ -84,6 +100,9 @@ export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
|||||||
const handleAIQuestion = async (event: any) => {
|
const handleAIQuestion = async (event: any) => {
|
||||||
if (!user || !event.detail || !event.detail.question || isProcessing || !aiProfile) return;
|
if (!user || !event.detail || !event.detail.question || isProcessing || !aiProfile) return;
|
||||||
|
|
||||||
|
console.log('AIChat received question:', event.detail.question);
|
||||||
|
console.log('Current aiProfile state:', aiProfile);
|
||||||
|
|
||||||
setIsProcessing(true);
|
setIsProcessing(true);
|
||||||
try {
|
try {
|
||||||
await postQuestionAndGenerateResponse(event.detail.question);
|
await postQuestionAndGenerateResponse(event.detail.question);
|
||||||
@@ -95,6 +114,7 @@ export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
|||||||
// Add listener with a small delay to ensure it's ready
|
// Add listener with a small delay to ensure it's ready
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.addEventListener('postAIQuestion', handleAIQuestion);
|
window.addEventListener('postAIQuestion', handleAIQuestion);
|
||||||
|
console.log('AIChat event listener registered');
|
||||||
|
|
||||||
// Notify that AI is ready
|
// Notify that AI is ready
|
||||||
window.dispatchEvent(new CustomEvent('aiChatReady'));
|
window.dispatchEvent(new CustomEvent('aiChatReady'));
|
||||||
@@ -114,50 +134,40 @@ export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
|||||||
const agent = atprotoOAuthService.getAgent();
|
const agent = atprotoOAuthService.getAgent();
|
||||||
if (!agent) throw new Error('No agent available');
|
if (!agent) throw new Error('No agent available');
|
||||||
|
|
||||||
// Get collection names
|
|
||||||
const collections = getCollectionNames(appConfig.collections.base);
|
|
||||||
|
|
||||||
// 1. Post question to ATProto
|
// 1. Post question to ATProto
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const rkey = now.toISOString().replace(/[:.]/g, '-');
|
const rkey = now.toISOString().replace(/[:.]/g, '-');
|
||||||
|
|
||||||
// Extract post metadata from current page
|
|
||||||
const currentUrl = window.location.href;
|
|
||||||
const postSlug = currentUrl.match(/\/posts\/([^/]+)/)?.[1] || '';
|
|
||||||
const postTitle = document.title.replace(' - syui.ai', '') || '';
|
|
||||||
|
|
||||||
const questionRecord = {
|
const questionRecord = {
|
||||||
$type: collections.chat,
|
$type: appConfig.collections.chat,
|
||||||
post: {
|
question: question,
|
||||||
url: currentUrl,
|
url: window.location.href,
|
||||||
slug: postSlug,
|
createdAt: now.toISOString(),
|
||||||
title: postTitle,
|
|
||||||
date: new Date().toISOString(),
|
|
||||||
tags: [],
|
|
||||||
language: "ja"
|
|
||||||
},
|
|
||||||
type: "question",
|
|
||||||
text: question,
|
|
||||||
author: {
|
author: {
|
||||||
did: user.did,
|
did: user.did,
|
||||||
handle: user.handle,
|
handle: user.handle,
|
||||||
avatar: user.avatar,
|
avatar: user.avatar,
|
||||||
displayName: user.displayName || user.handle,
|
displayName: user.displayName || user.handle,
|
||||||
},
|
},
|
||||||
createdAt: now.toISOString(),
|
context: {
|
||||||
|
page_title: document.title,
|
||||||
|
page_url: window.location.href,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
await agent.api.com.atproto.repo.putRecord({
|
await agent.api.com.atproto.repo.putRecord({
|
||||||
repo: user.did,
|
repo: user.did,
|
||||||
collection: collections.chat,
|
collection: appConfig.collections.chat,
|
||||||
rkey: rkey,
|
rkey: rkey,
|
||||||
record: questionRecord,
|
record: questionRecord,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('Question posted to ATProto');
|
||||||
|
|
||||||
// 2. Get chat history
|
// 2. Get chat history
|
||||||
const chatRecords = await agent.api.com.atproto.repo.listRecords({
|
const chatRecords = await agent.api.com.atproto.repo.listRecords({
|
||||||
repo: user.did,
|
repo: user.did,
|
||||||
collection: collections.chat,
|
collection: appConfig.collections.chat,
|
||||||
limit: 10,
|
limit: 10,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -165,10 +175,10 @@ export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
|||||||
if (chatRecords.data.records) {
|
if (chatRecords.data.records) {
|
||||||
chatHistoryText = chatRecords.data.records
|
chatHistoryText = chatRecords.data.records
|
||||||
.map((r: any) => {
|
.map((r: any) => {
|
||||||
if (r.value.type === 'question') {
|
if (r.value.question) {
|
||||||
return `User: ${r.value.text}`;
|
return `User: ${r.value.question}`;
|
||||||
} else if (r.value.type === 'answer') {
|
} else if (r.value.answer) {
|
||||||
return `AI: ${r.value.text}`;
|
return `AI: ${r.value.answer}`;
|
||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
})
|
})
|
||||||
@@ -225,38 +235,37 @@ Answer:`;
|
|||||||
// 5. Save AI response in background
|
// 5. Save AI response in background
|
||||||
const answerRkey = now.toISOString().replace(/[:.]/g, '-') + '-answer';
|
const answerRkey = now.toISOString().replace(/[:.]/g, '-') + '-answer';
|
||||||
|
|
||||||
|
console.log('=== SAVING AI ANSWER ===');
|
||||||
|
console.log('Current aiProfile:', aiProfile);
|
||||||
|
|
||||||
const answerRecord = {
|
const answerRecord = {
|
||||||
$type: collections.chat,
|
$type: appConfig.collections.chat,
|
||||||
post: {
|
answer: aiAnswer,
|
||||||
url: currentUrl,
|
question_rkey: rkey,
|
||||||
slug: postSlug,
|
url: window.location.href,
|
||||||
title: postTitle,
|
createdAt: now.toISOString(),
|
||||||
date: new Date().toISOString(),
|
|
||||||
tags: [],
|
|
||||||
language: "ja"
|
|
||||||
},
|
|
||||||
type: "answer",
|
|
||||||
text: aiAnswer,
|
|
||||||
author: {
|
author: {
|
||||||
did: aiProfile.did,
|
did: aiProfile.did,
|
||||||
handle: aiProfile.handle,
|
handle: aiProfile.handle,
|
||||||
displayName: aiProfile.displayName,
|
displayName: aiProfile.displayName,
|
||||||
avatar: aiProfile.avatar,
|
avatar: aiProfile.avatar,
|
||||||
},
|
},
|
||||||
createdAt: now.toISOString(),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
console.log('Answer record to save:', answerRecord);
|
||||||
|
|
||||||
// Save to ATProto asynchronously (don't wait for it)
|
// Save to ATProto asynchronously (don't wait for it)
|
||||||
agent.api.com.atproto.repo.putRecord({
|
agent.api.com.atproto.repo.putRecord({
|
||||||
repo: user.did,
|
repo: user.did,
|
||||||
collection: collections.chat,
|
collection: appConfig.collections.chat,
|
||||||
rkey: answerRkey,
|
rkey: answerRkey,
|
||||||
record: answerRecord,
|
record: answerRecord,
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
// Silent fail for AI response saving
|
console.error('Failed to save AI response to ATProto:', err);
|
||||||
});
|
});
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Failed to generate AI response:', error);
|
||||||
window.dispatchEvent(new CustomEvent('aiResponseError', {
|
window.dispatchEvent(new CustomEvent('aiResponseError', {
|
||||||
detail: { error: 'AI応答の生成に失敗しました' }
|
detail: { error: 'AI応答の生成に失敗しました' }
|
||||||
}));
|
}));
|
||||||
|
@@ -1,9 +1,10 @@
|
|||||||
// Application configuration
|
// Application configuration
|
||||||
export interface AppConfig {
|
export interface AppConfig {
|
||||||
adminDid: string;
|
adminDid: string;
|
||||||
aiDid: string;
|
|
||||||
collections: {
|
collections: {
|
||||||
base: string; // Base collection like "ai.syui.log"
|
comment: string;
|
||||||
|
user: string;
|
||||||
|
chat: string;
|
||||||
};
|
};
|
||||||
host: string;
|
host: string;
|
||||||
rkey?: string; // Current post rkey if on post page
|
rkey?: string; // Current post rkey if on post page
|
||||||
@@ -12,33 +13,13 @@ export interface AppConfig {
|
|||||||
aiProvider: string;
|
aiProvider: string;
|
||||||
aiModel: string;
|
aiModel: string;
|
||||||
aiHost: string;
|
aiHost: string;
|
||||||
aiSystemPrompt: string;
|
|
||||||
bskyPublicApi: string;
|
bskyPublicApi: string;
|
||||||
atprotoApi: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Collection name builders (similar to Rust implementation)
|
|
||||||
export function getCollectionNames(base: string) {
|
|
||||||
if (!base) {
|
|
||||||
// Fallback to default
|
|
||||||
base = 'ai.syui.log';
|
|
||||||
}
|
|
||||||
|
|
||||||
const collections = {
|
|
||||||
comment: base,
|
|
||||||
user: `${base}.user`,
|
|
||||||
chat: `${base}.chat`,
|
|
||||||
chatLang: `${base}.chat.lang`,
|
|
||||||
chatComment: `${base}.chat.comment`,
|
|
||||||
};
|
|
||||||
|
|
||||||
return collections;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate collection names from host
|
// Generate collection names from host
|
||||||
// Format: ${reg}.${name}.${sub}
|
// Format: ${reg}.${name}.${sub}
|
||||||
// Example: log.syui.ai -> ai.syui.log
|
// Example: log.syui.ai -> ai.syui.log
|
||||||
function generateBaseCollectionFromHost(host: string): string {
|
function generateCollectionNames(host: string): { comment: string; user: string; chat: string } {
|
||||||
try {
|
try {
|
||||||
// Remove protocol if present
|
// Remove protocol if present
|
||||||
const cleanHost = host.replace(/^https?:\/\//, '');
|
const cleanHost = host.replace(/^https?:\/\//, '');
|
||||||
@@ -53,43 +34,43 @@ function generateBaseCollectionFromHost(host: string): string {
|
|||||||
// Reverse the parts for collection naming
|
// Reverse the parts for collection naming
|
||||||
// log.syui.ai -> ai.syui.log
|
// log.syui.ai -> ai.syui.log
|
||||||
const reversedParts = parts.reverse();
|
const reversedParts = parts.reverse();
|
||||||
const result = reversedParts.join('.');
|
const collectionBase = reversedParts.join('.');
|
||||||
return result;
|
|
||||||
|
return {
|
||||||
|
comment: collectionBase,
|
||||||
|
user: `${collectionBase}.user`,
|
||||||
|
chat: `${collectionBase}.chat`
|
||||||
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Fallback to default
|
console.warn('Failed to generate collection names from host:', host, error);
|
||||||
return 'ai.syui.log';
|
// Fallback to default collections
|
||||||
|
return {
|
||||||
|
comment: 'ai.syui.log',
|
||||||
|
user: 'ai.syui.log.user',
|
||||||
|
chat: 'ai.syui.log.chat'
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract rkey from current URL
|
// Extract rkey from current URL
|
||||||
// /posts/xxx -> xxx (remove .html if present)
|
// /posts/xxx.html -> xxx
|
||||||
function extractRkeyFromUrl(): string | undefined {
|
function extractRkeyFromUrl(): string | undefined {
|
||||||
const pathname = window.location.pathname;
|
const pathname = window.location.pathname;
|
||||||
const match = pathname.match(/\/posts\/([^/]+)\/?$/);
|
const match = pathname.match(/\/posts\/([^/]+)\.html$/);
|
||||||
if (match) {
|
return match ? match[1] : undefined;
|
||||||
// Remove .html extension if present
|
|
||||||
return match[1].replace(/\.html$/, '');
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get application configuration from environment variables
|
// Get application configuration from environment variables
|
||||||
export function getAppConfig(): AppConfig {
|
export function getAppConfig(): AppConfig {
|
||||||
const host = import.meta.env.VITE_APP_HOST || 'https://log.syui.ai';
|
const host = import.meta.env.VITE_APP_HOST || 'https://log.syui.ai';
|
||||||
const adminDid = import.meta.env.VITE_ADMIN_DID || 'did:plc:uqzpqmrjnptsxezjx4xuh2mn';
|
const adminDid = import.meta.env.VITE_ADMIN_DID || 'did:plc:uqzpqmrjnptsxezjx4xuh2mn';
|
||||||
const aiDid = import.meta.env.VITE_AI_DID || 'did:plc:4hqjfn7m6n5hno3doamuhgef';
|
|
||||||
|
|
||||||
// Priority: Environment variables > Auto-generated from host
|
// Priority: Environment variables > Auto-generated from host
|
||||||
const autoGeneratedBase = generateBaseCollectionFromHost(host);
|
const autoGeneratedCollections = generateCollectionNames(host);
|
||||||
let baseCollection = import.meta.env.VITE_OAUTH_COLLECTION || autoGeneratedBase;
|
|
||||||
|
|
||||||
// Ensure base collection is never undefined
|
|
||||||
if (!baseCollection) {
|
|
||||||
baseCollection = 'ai.syui.log';
|
|
||||||
}
|
|
||||||
|
|
||||||
const collections = {
|
const collections = {
|
||||||
base: baseCollection,
|
comment: import.meta.env.VITE_COLLECTION_COMMENT || autoGeneratedCollections.comment,
|
||||||
|
user: import.meta.env.VITE_COLLECTION_USER || autoGeneratedCollections.user,
|
||||||
|
chat: import.meta.env.VITE_COLLECTION_CHAT || autoGeneratedCollections.chat,
|
||||||
};
|
};
|
||||||
|
|
||||||
const rkey = extractRkeyFromUrl();
|
const rkey = extractRkeyFromUrl();
|
||||||
@@ -100,14 +81,19 @@ export function getAppConfig(): AppConfig {
|
|||||||
const aiProvider = import.meta.env.VITE_AI_PROVIDER || 'ollama';
|
const aiProvider = import.meta.env.VITE_AI_PROVIDER || 'ollama';
|
||||||
const aiModel = import.meta.env.VITE_AI_MODEL || 'gemma2:2b';
|
const aiModel = import.meta.env.VITE_AI_MODEL || 'gemma2:2b';
|
||||||
const aiHost = import.meta.env.VITE_AI_HOST || 'https://ollama.syui.ai';
|
const aiHost = import.meta.env.VITE_AI_HOST || 'https://ollama.syui.ai';
|
||||||
const aiSystemPrompt = import.meta.env.VITE_AI_SYSTEM_PROMPT || 'You are a helpful AI assistant trained on this blog\'s content.';
|
|
||||||
const bskyPublicApi = import.meta.env.VITE_BSKY_PUBLIC_API || 'https://public.api.bsky.app';
|
const bskyPublicApi = import.meta.env.VITE_BSKY_PUBLIC_API || 'https://public.api.bsky.app';
|
||||||
const atprotoApi = import.meta.env.VITE_ATPROTO_API || 'https://bsky.social';
|
|
||||||
|
|
||||||
|
console.log('App configuration:', {
|
||||||
|
host,
|
||||||
|
adminDid,
|
||||||
|
collections,
|
||||||
|
rkey: rkey || 'none (not on post page)',
|
||||||
|
ai: { enabled: aiEnabled, askAi: aiAskAi, provider: aiProvider, model: aiModel, host: aiHost },
|
||||||
|
bskyPublicApi
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
adminDid,
|
adminDid,
|
||||||
aiDid,
|
|
||||||
collections,
|
collections,
|
||||||
host,
|
host,
|
||||||
rkey,
|
rkey,
|
||||||
@@ -116,9 +102,7 @@ export function getAppConfig(): AppConfig {
|
|||||||
aiProvider,
|
aiProvider,
|
||||||
aiModel,
|
aiModel,
|
||||||
aiHost,
|
aiHost,
|
||||||
aiSystemPrompt,
|
bskyPublicApi
|
||||||
bskyPublicApi,
|
|
||||||
atprotoApi
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -73,6 +73,7 @@ export const aiCardApi = {
|
|||||||
});
|
});
|
||||||
return response.data.data;
|
return response.data.data;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.warn('ai.gpt AI分析機能が利用できません:', error);
|
||||||
throw new Error('AI分析機能を利用するにはai.gptサーバーが必要です');
|
throw new Error('AI分析機能を利用するにはai.gptサーバーが必要です');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -85,6 +86,7 @@ export const aiCardApi = {
|
|||||||
const response = await aiGptApi.get('/card_get_gacha_stats');
|
const response = await aiGptApi.get('/card_get_gacha_stats');
|
||||||
return response.data.data;
|
return response.data.data;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.warn('ai.gpt AI統計機能が利用できません:', error);
|
||||||
throw new Error('AI統計機能を利用するにはai.gptサーバーが必要です');
|
throw new Error('AI統計機能を利用するにはai.gptサーバーが必要です');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@@ -31,11 +31,11 @@ class AtprotoOAuthService {
|
|||||||
|
|
||||||
private async _doInitialize(): Promise<void> {
|
private async _doInitialize(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
|
console.log('=== INITIALIZING ATPROTO OAUTH CLIENT ===');
|
||||||
|
|
||||||
// Generate client ID based on current origin
|
// Generate client ID based on current origin
|
||||||
const clientId = this.getClientId();
|
const clientId = this.getClientId();
|
||||||
|
console.log('Client ID:', clientId);
|
||||||
|
|
||||||
// Support multiple PDS hosts for OAuth
|
// Support multiple PDS hosts for OAuth
|
||||||
this.oauthClient = await BrowserOAuthClient.load({
|
this.oauthClient = await BrowserOAuthClient.load({
|
||||||
@@ -43,33 +43,39 @@ class AtprotoOAuthService {
|
|||||||
handleResolver: 'https://bsky.social', // Default resolver
|
handleResolver: 'https://bsky.social', // Default resolver
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('BrowserOAuthClient initialized successfully with multi-PDS support');
|
||||||
|
|
||||||
// Try to restore existing session
|
// Try to restore existing session
|
||||||
const result = await this.oauthClient.init();
|
const result = await this.oauthClient.init();
|
||||||
if (result?.session) {
|
if (result?.session) {
|
||||||
|
console.log('Existing session restored:', {
|
||||||
|
did: result.session.did,
|
||||||
|
handle: result.session.handle || 'unknown',
|
||||||
|
hasAccessJwt: !!result.session.accessJwt,
|
||||||
|
hasRefreshJwt: !!result.session.refreshJwt
|
||||||
|
});
|
||||||
|
|
||||||
// Create Agent instance with proper configuration
|
// Create Agent instance with proper configuration
|
||||||
|
console.log('Creating Agent with session:', result.session);
|
||||||
|
|
||||||
// Delete the old agent initialization code - we'll create it properly below
|
// Delete the old agent initialization code - we'll create it properly below
|
||||||
|
|
||||||
// Set the session after creating the agent
|
// Set the session after creating the agent
|
||||||
// The session object from BrowserOAuthClient appears to be a special object
|
// The session object from BrowserOAuthClient appears to be a special object
|
||||||
|
console.log('Full session object:', result.session);
|
||||||
|
console.log('Session type:', typeof result.session);
|
||||||
|
console.log('Session constructor:', result.session?.constructor?.name);
|
||||||
|
|
||||||
// Try to iterate over the session object
|
// Try to iterate over the session object
|
||||||
if (result.session) {
|
if (result.session) {
|
||||||
|
console.log('Session properties:');
|
||||||
for (const key in result.session) {
|
for (const key in result.session) {
|
||||||
|
console.log(` ${key}:`, result.session[key]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if session has methods
|
// Check if session has methods
|
||||||
const methods = Object.getOwnPropertyNames(Object.getPrototypeOf(result.session));
|
const methods = Object.getOwnPropertyNames(Object.getPrototypeOf(result.session));
|
||||||
|
console.log('Session methods:', methods);
|
||||||
}
|
}
|
||||||
|
|
||||||
// BrowserOAuthClient might return a Session object that needs to be used with the agent
|
// BrowserOAuthClient might return a Session object that needs to be used with the agent
|
||||||
@@ -77,36 +83,36 @@ class AtprotoOAuthService {
|
|||||||
if (result.session) {
|
if (result.session) {
|
||||||
// Process the session to extract DID and handle
|
// Process the session to extract DID and handle
|
||||||
const sessionData = await this.processSession(result.session);
|
const sessionData = await this.processSession(result.session);
|
||||||
|
console.log('Session processed during initialization:', sessionData);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
console.log('No existing session found');
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Failed to initialize OAuth client:', error);
|
||||||
this.initializePromise = null; // Reset on error to allow retry
|
this.initializePromise = null; // Reset on error to allow retry
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async processSession(session: any): Promise<{ did: string; handle: string }> {
|
private async processSession(session: any): Promise<{ did: string; handle: string }> {
|
||||||
|
console.log('Processing session:', session);
|
||||||
|
|
||||||
// Log full session structure
|
// Log full session structure
|
||||||
|
console.log('Session structure:');
|
||||||
|
console.log('- sub:', session.sub);
|
||||||
|
console.log('- did:', session.did);
|
||||||
|
console.log('- handle:', session.handle);
|
||||||
|
console.log('- iss:', session.iss);
|
||||||
|
console.log('- aud:', session.aud);
|
||||||
|
|
||||||
// Check if agent has properties we can access
|
// Check if agent has properties we can access
|
||||||
if (session.agent) {
|
if (session.agent) {
|
||||||
|
console.log('- agent:', session.agent);
|
||||||
|
console.log('- agent.did:', session.agent?.did);
|
||||||
|
console.log('- agent.handle:', session.agent?.handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
const did = session.sub || session.did;
|
const did = session.sub || session.did;
|
||||||
@@ -115,18 +121,18 @@ class AtprotoOAuthService {
|
|||||||
// Create Agent directly with session (per official docs)
|
// Create Agent directly with session (per official docs)
|
||||||
try {
|
try {
|
||||||
this.agent = new Agent(session);
|
this.agent = new Agent(session);
|
||||||
|
console.log('Agent created directly with session');
|
||||||
|
|
||||||
// Check if agent has session info after creation
|
// Check if agent has session info after creation
|
||||||
|
console.log('Agent after creation:');
|
||||||
|
console.log('- agent.did:', this.agent.did);
|
||||||
|
console.log('- agent.session:', this.agent.session);
|
||||||
if (this.agent.session) {
|
if (this.agent.session) {
|
||||||
|
console.log('- agent.session.did:', this.agent.session.did);
|
||||||
|
console.log('- agent.session.handle:', this.agent.session.handle);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
console.log('Failed to create Agent with session directly, trying dpopFetch method');
|
||||||
// Fallback to dpopFetch method
|
// Fallback to dpopFetch method
|
||||||
this.agent = new Agent({
|
this.agent = new Agent({
|
||||||
service: session.server?.serviceEndpoint || 'https://bsky.social',
|
service: session.server?.serviceEndpoint || 'https://bsky.social',
|
||||||
@@ -139,7 +145,7 @@ class AtprotoOAuthService {
|
|||||||
|
|
||||||
// If handle is missing, try multiple methods to resolve it
|
// If handle is missing, try multiple methods to resolve it
|
||||||
if (!handle || handle === 'unknown') {
|
if (!handle || handle === 'unknown') {
|
||||||
|
console.log('Handle not in session, attempting to resolve...');
|
||||||
|
|
||||||
// Method 1: Try using the agent to get profile
|
// Method 1: Try using the agent to get profile
|
||||||
try {
|
try {
|
||||||
@@ -148,11 +154,11 @@ class AtprotoOAuthService {
|
|||||||
if (profile.data.handle) {
|
if (profile.data.handle) {
|
||||||
handle = profile.data.handle;
|
handle = profile.data.handle;
|
||||||
(this as any)._sessionInfo.handle = handle;
|
(this as any)._sessionInfo.handle = handle;
|
||||||
|
console.log('Successfully resolved handle via getProfile:', handle);
|
||||||
return { did, handle };
|
return { did, handle };
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
console.error('getProfile failed:', err);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Method 2: Try using describeRepo
|
// Method 2: Try using describeRepo
|
||||||
@@ -163,20 +169,18 @@ class AtprotoOAuthService {
|
|||||||
if (repoDesc.data.handle) {
|
if (repoDesc.data.handle) {
|
||||||
handle = repoDesc.data.handle;
|
handle = repoDesc.data.handle;
|
||||||
(this as any)._sessionInfo.handle = handle;
|
(this as any)._sessionInfo.handle = handle;
|
||||||
|
console.log('Got handle from describeRepo:', handle);
|
||||||
return { did, handle };
|
return { did, handle };
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
console.error('describeRepo failed:', err);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Method 3: Fallback for admin DID
|
// Method 3: Hardcoded fallback for known DIDs
|
||||||
const adminDid = import.meta.env.VITE_ADMIN_DID;
|
if (did === 'did:plc:uqzpqmrjnptsxezjx4xuh2mn') {
|
||||||
if (did === adminDid) {
|
handle = 'syui.ai';
|
||||||
const appHost = import.meta.env.VITE_APP_HOST || 'https://syui.ai';
|
|
||||||
handle = new URL(appHost).hostname;
|
|
||||||
(this as any)._sessionInfo.handle = handle;
|
(this as any)._sessionInfo.handle = handle;
|
||||||
|
console.log('Using hardcoded handle for known DID');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -187,7 +191,7 @@ class AtprotoOAuthService {
|
|||||||
// Use environment variable if available
|
// Use environment variable if available
|
||||||
const envClientId = import.meta.env.VITE_OAUTH_CLIENT_ID;
|
const envClientId = import.meta.env.VITE_OAUTH_CLIENT_ID;
|
||||||
if (envClientId) {
|
if (envClientId) {
|
||||||
|
console.log('Using client ID from environment:', envClientId);
|
||||||
return envClientId;
|
return envClientId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,7 +200,7 @@ class AtprotoOAuthService {
|
|||||||
// For localhost development, use undefined for loopback client
|
// For localhost development, use undefined for loopback client
|
||||||
// The BrowserOAuthClient will handle this automatically
|
// The BrowserOAuthClient will handle this automatically
|
||||||
if (origin.includes('localhost') || origin.includes('127.0.0.1')) {
|
if (origin.includes('localhost') || origin.includes('127.0.0.1')) {
|
||||||
|
console.log('Using loopback client for localhost development');
|
||||||
return undefined as any; // Loopback client
|
return undefined as any; // Loopback client
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -205,7 +209,7 @@ class AtprotoOAuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private detectPDSFromHandle(handle: string): string {
|
private detectPDSFromHandle(handle: string): string {
|
||||||
|
console.log('Detecting PDS for handle:', handle);
|
||||||
|
|
||||||
// Supported PDS hosts and their corresponding handles
|
// Supported PDS hosts and their corresponding handles
|
||||||
const pdsMapping = {
|
const pdsMapping = {
|
||||||
@@ -216,22 +220,22 @@ class AtprotoOAuthService {
|
|||||||
// Check if handle ends with known PDS domains
|
// Check if handle ends with known PDS domains
|
||||||
for (const [domain, pdsUrl] of Object.entries(pdsMapping)) {
|
for (const [domain, pdsUrl] of Object.entries(pdsMapping)) {
|
||||||
if (handle.endsWith(`.${domain}`)) {
|
if (handle.endsWith(`.${domain}`)) {
|
||||||
|
console.log(`Handle ${handle} mapped to PDS: ${pdsUrl}`);
|
||||||
return pdsUrl;
|
return pdsUrl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default to bsky.social
|
// Default to bsky.social
|
||||||
|
console.log(`Handle ${handle} using default PDS: https://bsky.social`);
|
||||||
return 'https://bsky.social';
|
return 'https://bsky.social';
|
||||||
}
|
}
|
||||||
|
|
||||||
async initiateOAuthFlow(handle?: string): Promise<void> {
|
async initiateOAuthFlow(handle?: string): Promise<void> {
|
||||||
try {
|
try {
|
||||||
|
console.log('=== INITIATING OAUTH FLOW ===');
|
||||||
|
|
||||||
if (!this.oauthClient) {
|
if (!this.oauthClient) {
|
||||||
|
console.log('OAuth client not initialized, initializing now...');
|
||||||
await this.initialize();
|
await this.initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,15 +251,15 @@ class AtprotoOAuthService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('Starting OAuth flow for handle:', handle);
|
||||||
|
|
||||||
// Detect PDS based on handle
|
// Detect PDS based on handle
|
||||||
const pdsUrl = this.detectPDSFromHandle(handle);
|
const pdsUrl = this.detectPDSFromHandle(handle);
|
||||||
|
console.log('Detected PDS for handle:', { handle, pdsUrl });
|
||||||
|
|
||||||
// Re-initialize OAuth client with correct PDS if needed
|
// Re-initialize OAuth client with correct PDS if needed
|
||||||
if (pdsUrl !== 'https://bsky.social') {
|
if (pdsUrl !== 'https://bsky.social') {
|
||||||
|
console.log('Re-initializing OAuth client for custom PDS:', pdsUrl);
|
||||||
this.oauthClient = await BrowserOAuthClient.load({
|
this.oauthClient = await BrowserOAuthClient.load({
|
||||||
clientId: this.getClientId(),
|
clientId: this.getClientId(),
|
||||||
handleResolver: pdsUrl,
|
handleResolver: pdsUrl,
|
||||||
@@ -263,14 +267,20 @@ class AtprotoOAuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Start OAuth authorization flow
|
// Start OAuth authorization flow
|
||||||
|
console.log('Calling oauthClient.authorize with handle:', handle);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const authUrl = await this.oauthClient.authorize(handle, {
|
const authUrl = await this.oauthClient.authorize(handle, {
|
||||||
scope: 'atproto transition:generic',
|
scope: 'atproto transition:generic',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('Authorization URL generated:', authUrl.toString());
|
||||||
|
console.log('URL breakdown:', {
|
||||||
|
protocol: authUrl.protocol,
|
||||||
|
hostname: authUrl.hostname,
|
||||||
|
pathname: authUrl.pathname,
|
||||||
|
search: authUrl.search
|
||||||
|
});
|
||||||
|
|
||||||
// Store some debug info before redirect
|
// Store some debug info before redirect
|
||||||
sessionStorage.setItem('oauth_debug_pre_redirect', JSON.stringify({
|
sessionStorage.setItem('oauth_debug_pre_redirect', JSON.stringify({
|
||||||
@@ -281,30 +291,35 @@ class AtprotoOAuthService {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
// Redirect to authorization server
|
// Redirect to authorization server
|
||||||
|
console.log('About to redirect to:', authUrl.toString());
|
||||||
window.location.href = authUrl.toString();
|
window.location.href = authUrl.toString();
|
||||||
} catch (authorizeError) {
|
} catch (authorizeError) {
|
||||||
|
console.error('oauthClient.authorize failed:', authorizeError);
|
||||||
|
console.error('Error details:', {
|
||||||
|
name: authorizeError.name,
|
||||||
|
message: authorizeError.message,
|
||||||
|
stack: authorizeError.stack
|
||||||
|
});
|
||||||
throw authorizeError;
|
throw authorizeError;
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Failed to initiate OAuth flow:', error);
|
||||||
throw new Error(`OAuth認証の開始に失敗しました: ${error}`);
|
throw new Error(`OAuth認証の開始に失敗しました: ${error}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleOAuthCallback(): Promise<{ did: string; handle: string } | null> {
|
async handleOAuthCallback(): Promise<{ did: string; handle: string } | null> {
|
||||||
try {
|
try {
|
||||||
|
console.log('=== HANDLING OAUTH CALLBACK ===');
|
||||||
|
console.log('Current URL:', window.location.href);
|
||||||
|
console.log('URL hash:', window.location.hash);
|
||||||
|
console.log('URL search:', window.location.search);
|
||||||
|
|
||||||
// BrowserOAuthClient should automatically handle the callback
|
// BrowserOAuthClient should automatically handle the callback
|
||||||
// We just need to initialize it and it will process the current URL
|
// We just need to initialize it and it will process the current URL
|
||||||
if (!this.oauthClient) {
|
if (!this.oauthClient) {
|
||||||
|
console.log('OAuth client not initialized, initializing now...');
|
||||||
await this.initialize();
|
await this.initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -312,11 +327,11 @@ class AtprotoOAuthService {
|
|||||||
throw new Error('Failed to initialize OAuth client');
|
throw new Error('Failed to initialize OAuth client');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('OAuth client ready, initializing to process callback...');
|
||||||
|
|
||||||
// Call init() again to process the callback URL
|
// Call init() again to process the callback URL
|
||||||
const result = await this.oauthClient.init();
|
const result = await this.oauthClient.init();
|
||||||
|
console.log('OAuth callback processing result:', result);
|
||||||
|
|
||||||
if (result?.session) {
|
if (result?.session) {
|
||||||
// Process the session
|
// Process the session
|
||||||
@@ -324,42 +339,47 @@ class AtprotoOAuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If no session yet, wait a bit and try again
|
// If no session yet, wait a bit and try again
|
||||||
|
console.log('No session found immediately, waiting...');
|
||||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||||
|
|
||||||
// Try to check session again
|
// Try to check session again
|
||||||
const sessionCheck = await this.checkSession();
|
const sessionCheck = await this.checkSession();
|
||||||
if (sessionCheck) {
|
if (sessionCheck) {
|
||||||
|
console.log('Session found after delay:', sessionCheck);
|
||||||
return sessionCheck;
|
return sessionCheck;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.warn('OAuth callback completed but no session was created');
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('OAuth callback handling failed:', error);
|
||||||
|
console.error('Error details:', {
|
||||||
|
name: error.name,
|
||||||
|
message: error.message,
|
||||||
|
stack: error.stack
|
||||||
|
});
|
||||||
throw new Error(`OAuth認証の完了に失敗しました: ${error.message}`);
|
throw new Error(`OAuth認証の完了に失敗しました: ${error.message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async checkSession(): Promise<{ did: string; handle: string } | null> {
|
async checkSession(): Promise<{ did: string; handle: string } | null> {
|
||||||
try {
|
try {
|
||||||
|
console.log('=== CHECK SESSION CALLED ===');
|
||||||
|
|
||||||
if (!this.oauthClient) {
|
if (!this.oauthClient) {
|
||||||
|
console.log('No OAuth client, initializing...');
|
||||||
await this.initialize();
|
await this.initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.oauthClient) {
|
if (!this.oauthClient) {
|
||||||
|
console.log('OAuth client initialization failed');
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('Running oauthClient.init() to check session...');
|
||||||
const result = await this.oauthClient.init();
|
const result = await this.oauthClient.init();
|
||||||
|
console.log('oauthClient.init() result:', result);
|
||||||
|
|
||||||
if (result?.session) {
|
if (result?.session) {
|
||||||
// Use the common session processing method
|
// Use the common session processing method
|
||||||
@@ -368,7 +388,7 @@ class AtprotoOAuthService {
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Session check failed:', error);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -378,7 +398,13 @@ class AtprotoOAuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getSession(): AtprotoSession | null {
|
getSession(): AtprotoSession | null {
|
||||||
|
console.log('getSession called');
|
||||||
|
console.log('Current state:', {
|
||||||
|
hasAgent: !!this.agent,
|
||||||
|
hasAgentSession: !!this.agent?.session,
|
||||||
|
hasOAuthClient: !!this.oauthClient,
|
||||||
|
hasSessionInfo: !!(this as any)._sessionInfo
|
||||||
|
});
|
||||||
|
|
||||||
// First check if we have an agent with session
|
// First check if we have an agent with session
|
||||||
if (this.agent?.session) {
|
if (this.agent?.session) {
|
||||||
@@ -388,7 +414,7 @@ class AtprotoOAuthService {
|
|||||||
accessJwt: this.agent.session.accessJwt || '',
|
accessJwt: this.agent.session.accessJwt || '',
|
||||||
refreshJwt: this.agent.session.refreshJwt || '',
|
refreshJwt: this.agent.session.refreshJwt || '',
|
||||||
};
|
};
|
||||||
|
console.log('Returning agent session:', session);
|
||||||
return session;
|
return session;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -400,11 +426,11 @@ class AtprotoOAuthService {
|
|||||||
accessJwt: 'dpop-protected', // Indicate that tokens are handled by dpopFetch
|
accessJwt: 'dpop-protected', // Indicate that tokens are handled by dpopFetch
|
||||||
refreshJwt: 'dpop-protected',
|
refreshJwt: 'dpop-protected',
|
||||||
};
|
};
|
||||||
|
console.log('Returning stored session info:', session);
|
||||||
return session;
|
return session;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('No session available');
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -424,28 +450,28 @@ class AtprotoOAuthService {
|
|||||||
|
|
||||||
async logout(): Promise<void> {
|
async logout(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
|
console.log('=== LOGGING OUT ===');
|
||||||
|
|
||||||
// Clear Agent
|
// Clear Agent
|
||||||
this.agent = null;
|
this.agent = null;
|
||||||
|
console.log('Agent cleared');
|
||||||
|
|
||||||
// Clear BrowserOAuthClient session
|
// Clear BrowserOAuthClient session
|
||||||
if (this.oauthClient) {
|
if (this.oauthClient) {
|
||||||
|
console.log('Clearing OAuth client session...');
|
||||||
try {
|
try {
|
||||||
// BrowserOAuthClient may have a revoke or signOut method
|
// BrowserOAuthClient may have a revoke or signOut method
|
||||||
if (typeof (this.oauthClient as any).signOut === 'function') {
|
if (typeof (this.oauthClient as any).signOut === 'function') {
|
||||||
await (this.oauthClient as any).signOut();
|
await (this.oauthClient as any).signOut();
|
||||||
|
console.log('OAuth client signed out');
|
||||||
} else if (typeof (this.oauthClient as any).revoke === 'function') {
|
} else if (typeof (this.oauthClient as any).revoke === 'function') {
|
||||||
await (this.oauthClient as any).revoke();
|
await (this.oauthClient as any).revoke();
|
||||||
|
console.log('OAuth client revoked');
|
||||||
} else {
|
} else {
|
||||||
|
console.log('No explicit signOut method found on OAuth client');
|
||||||
}
|
}
|
||||||
} catch (oauthError) {
|
} catch (oauthError) {
|
||||||
|
console.error('OAuth client logout error:', oauthError);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset the OAuth client to force re-initialization
|
// Reset the OAuth client to force re-initialization
|
||||||
@@ -466,11 +492,11 @@ class AtprotoOAuthService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
keysToRemove.forEach(key => {
|
keysToRemove.forEach(key => {
|
||||||
|
console.log('Removing localStorage key:', key);
|
||||||
localStorage.removeItem(key);
|
localStorage.removeItem(key);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('=== LOGOUT COMPLETED ===');
|
||||||
|
|
||||||
// Force page reload to ensure clean state
|
// Force page reload to ensure clean state
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@@ -478,7 +504,7 @@ class AtprotoOAuthService {
|
|||||||
}, 100);
|
}, 100);
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Logout failed:', error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -493,8 +519,8 @@ class AtprotoOAuthService {
|
|||||||
const did = sessionInfo.did;
|
const did = sessionInfo.did;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
console.log('Saving cards to atproto collection...');
|
||||||
|
console.log('Using DID:', did);
|
||||||
|
|
||||||
// Ensure we have a fresh agent
|
// Ensure we have a fresh agent
|
||||||
if (!this.agent) {
|
if (!this.agent) {
|
||||||
@@ -524,6 +550,13 @@ class AtprotoOAuthService {
|
|||||||
createdAt: createdAt
|
createdAt: createdAt
|
||||||
};
|
};
|
||||||
|
|
||||||
|
console.log('PutRecord request:', {
|
||||||
|
repo: did,
|
||||||
|
collection: collection,
|
||||||
|
rkey: rkey,
|
||||||
|
record: record
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
// Use Agent's com.atproto.repo.putRecord method
|
// Use Agent's com.atproto.repo.putRecord method
|
||||||
const response = await this.agent.com.atproto.repo.putRecord({
|
const response = await this.agent.com.atproto.repo.putRecord({
|
||||||
@@ -533,9 +566,9 @@ class AtprotoOAuthService {
|
|||||||
record: record
|
record: record
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('カードデータをai.card.boxに保存しました:', response);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('カードボックス保存エラー:', error);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -551,8 +584,8 @@ class AtprotoOAuthService {
|
|||||||
const did = sessionInfo.did;
|
const did = sessionInfo.did;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
console.log('Fetching cards from atproto collection...');
|
||||||
|
console.log('Using DID:', did);
|
||||||
|
|
||||||
// Ensure we have a fresh agent
|
// Ensure we have a fresh agent
|
||||||
if (!this.agent) {
|
if (!this.agent) {
|
||||||
@@ -565,7 +598,7 @@ class AtprotoOAuthService {
|
|||||||
rkey: 'self'
|
rkey: 'self'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('Cards from box response:', response);
|
||||||
|
|
||||||
// Convert to expected format
|
// Convert to expected format
|
||||||
const result = {
|
const result = {
|
||||||
@@ -578,7 +611,7 @@ class AtprotoOAuthService {
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('カードボックス取得エラー:', error);
|
||||||
|
|
||||||
// If record doesn't exist, return empty
|
// If record doesn't exist, return empty
|
||||||
if (error.toString().includes('RecordNotFound')) {
|
if (error.toString().includes('RecordNotFound')) {
|
||||||
@@ -600,8 +633,8 @@ class AtprotoOAuthService {
|
|||||||
const did = sessionInfo.did;
|
const did = sessionInfo.did;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
console.log('Deleting card box collection...');
|
||||||
|
console.log('Using DID:', did);
|
||||||
|
|
||||||
// Ensure we have a fresh agent
|
// Ensure we have a fresh agent
|
||||||
if (!this.agent) {
|
if (!this.agent) {
|
||||||
@@ -614,35 +647,33 @@ class AtprotoOAuthService {
|
|||||||
rkey: 'self'
|
rkey: 'self'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('Card box deleted successfully:', response);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('カードボックス削除エラー:', error);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 手動でトークンを設定(開発・デバッグ用)
|
// 手動でトークンを設定(開発・デバッグ用)
|
||||||
setManualTokens(accessJwt: string, refreshJwt: string): void {
|
setManualTokens(accessJwt: string, refreshJwt: string): void {
|
||||||
|
console.warn('Manual token setting is not supported with official BrowserOAuthClient');
|
||||||
|
console.warn('Please use the proper OAuth flow instead');
|
||||||
|
|
||||||
// For backward compatibility, store in localStorage
|
// For backward compatibility, store in localStorage
|
||||||
const adminDid = import.meta.env.VITE_ADMIN_DID || 'did:plc:unknown';
|
|
||||||
const appHost = import.meta.env.VITE_APP_HOST || 'https://example.com';
|
|
||||||
const session: AtprotoSession = {
|
const session: AtprotoSession = {
|
||||||
did: adminDid,
|
did: 'did:plc:uqzpqmrjnptsxezjx4xuh2mn',
|
||||||
handle: new URL(appHost).hostname,
|
handle: 'syui.ai',
|
||||||
accessJwt: accessJwt,
|
accessJwt: accessJwt,
|
||||||
refreshJwt: refreshJwt
|
refreshJwt: refreshJwt
|
||||||
};
|
};
|
||||||
|
|
||||||
localStorage.setItem('atproto_session', JSON.stringify(session));
|
localStorage.setItem('atproto_session', JSON.stringify(session));
|
||||||
|
console.log('Manual tokens stored in localStorage for backward compatibility');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 後方互換性のための従来関数
|
// 後方互換性のための従来関数
|
||||||
saveSessionToStorage(session: AtprotoSession): void {
|
saveSessionToStorage(session: AtprotoSession): void {
|
||||||
|
console.warn('saveSessionToStorage is deprecated with BrowserOAuthClient');
|
||||||
localStorage.setItem('atproto_session', JSON.stringify(session));
|
localStorage.setItem('atproto_session', JSON.stringify(session));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -53,6 +53,7 @@ export class OAuthEndpointHandler {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Failed to generate JWKS:', error);
|
||||||
return new Response(JSON.stringify({ error: 'Failed to generate JWKS' }), {
|
return new Response(JSON.stringify({ error: 'Failed to generate JWKS' }), {
|
||||||
status: 500,
|
status: 500,
|
||||||
headers: { 'Content-Type': 'application/json' }
|
headers: { 'Content-Type': 'application/json' }
|
||||||
@@ -61,6 +62,7 @@ export class OAuthEndpointHandler {
|
|||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// If URL parsing fails, pass through to original fetch
|
// If URL parsing fails, pass through to original fetch
|
||||||
|
console.debug('URL parsing failed, passing through:', e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pass through all other requests
|
// Pass through all other requests
|
||||||
@@ -134,5 +136,6 @@ export function registerOAuthServiceWorker() {
|
|||||||
const blob = new Blob([swCode], { type: 'application/javascript' });
|
const blob = new Blob([swCode], { type: 'application/javascript' });
|
||||||
const swUrl = URL.createObjectURL(blob);
|
const swUrl = URL.createObjectURL(blob);
|
||||||
|
|
||||||
|
navigator.serviceWorker.register(swUrl).catch(console.error);
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -37,6 +37,7 @@ export class OAuthKeyManager {
|
|||||||
this.keyPair = await this.importKeyPair(keyData);
|
this.keyPair = await this.importKeyPair(keyData);
|
||||||
return this.keyPair;
|
return this.keyPair;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.warn('Failed to load stored key, generating new one:', error);
|
||||||
localStorage.removeItem('oauth_private_key');
|
localStorage.removeItem('oauth_private_key');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -114,6 +115,7 @@ export class OAuthKeyManager {
|
|||||||
const privateKey = await window.crypto.subtle.exportKey('jwk', keyPair.privateKey);
|
const privateKey = await window.crypto.subtle.exportKey('jwk', keyPair.privateKey);
|
||||||
localStorage.setItem('oauth_private_key', JSON.stringify(privateKey));
|
localStorage.setItem('oauth_private_key', JSON.stringify(privateKey));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Failed to store private key:', error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -28,31 +28,8 @@ pub struct JetstreamConfig {
|
|||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct CollectionConfig {
|
pub struct CollectionConfig {
|
||||||
pub base: String, // Base collection name like "ai.syui.log"
|
pub comment: String,
|
||||||
}
|
pub user: String,
|
||||||
|
|
||||||
impl CollectionConfig {
|
|
||||||
// Collection name builders
|
|
||||||
pub fn comment(&self) -> String {
|
|
||||||
self.base.clone()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn user(&self) -> String {
|
|
||||||
format!("{}.user", self.base)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[allow(dead_code)]
|
|
||||||
pub fn chat(&self) -> String {
|
|
||||||
format!("{}.chat", self.base)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn chat_lang(&self) -> String {
|
|
||||||
format!("{}.chat.lang", self.base)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn chat_comment(&self) -> String {
|
|
||||||
format!("{}.chat.comment", self.base)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for AuthConfig {
|
impl Default for AuthConfig {
|
||||||
@@ -70,7 +47,8 @@ impl Default for AuthConfig {
|
|||||||
collections: vec!["ai.syui.log".to_string()],
|
collections: vec!["ai.syui.log".to_string()],
|
||||||
},
|
},
|
||||||
collections: CollectionConfig {
|
collections: CollectionConfig {
|
||||||
base: "ai.syui.log".to_string(),
|
comment: "ai.syui.log".to_string(),
|
||||||
|
user: "ai.syui.log.user".to_string(),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -242,50 +220,11 @@ pub fn load_config() -> Result<AuthConfig> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let config_json = fs::read_to_string(&config_path)?;
|
let config_json = fs::read_to_string(&config_path)?;
|
||||||
|
let mut config: AuthConfig = serde_json::from_str(&config_json)?;
|
||||||
|
|
||||||
// Try to load as new format first, then migrate if needed
|
// Update collection configuration
|
||||||
match serde_json::from_str::<AuthConfig>(&config_json) {
|
|
||||||
Ok(mut config) => {
|
|
||||||
// Update collection configuration
|
|
||||||
update_config_collections(&mut config);
|
|
||||||
Ok(config)
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!("{}", format!("Parse error: {}, attempting migration...", e).yellow());
|
|
||||||
// Try to migrate from old format
|
|
||||||
migrate_config_if_needed(&config_path, &config_json)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn migrate_config_if_needed(config_path: &std::path::Path, config_json: &str) -> Result<AuthConfig> {
|
|
||||||
// Try to parse as old format and migrate to new simple format
|
|
||||||
let mut old_config: serde_json::Value = serde_json::from_str(config_json)?;
|
|
||||||
|
|
||||||
// Migrate old collections structure to new base-only structure
|
|
||||||
if let Some(collections) = old_config.get_mut("collections") {
|
|
||||||
// Extract base collection name from comment field or use default
|
|
||||||
let base_collection = collections.get("comment")
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.unwrap_or("ai.syui.log")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
// Replace entire collections structure with new format
|
|
||||||
old_config["collections"] = serde_json::json!({
|
|
||||||
"base": base_collection
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save migrated config
|
|
||||||
let migrated_config_json = serde_json::to_string_pretty(&old_config)?;
|
|
||||||
fs::write(config_path, migrated_config_json)?;
|
|
||||||
|
|
||||||
// Parse as new format
|
|
||||||
let mut config: AuthConfig = serde_json::from_value(old_config)?;
|
|
||||||
update_config_collections(&mut config);
|
update_config_collections(&mut config);
|
||||||
|
|
||||||
println!("{}", "✅ Configuration migrated to new simplified format".green());
|
|
||||||
|
|
||||||
Ok(config)
|
Ok(config)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -320,7 +259,7 @@ async fn test_api_access_with_auth(config: &AuthConfig) -> Result<()> {
|
|||||||
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=1",
|
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=1",
|
||||||
config.admin.pds,
|
config.admin.pds,
|
||||||
urlencoding::encode(&config.admin.did),
|
urlencoding::encode(&config.admin.did),
|
||||||
urlencoding::encode(&config.collections.comment()));
|
urlencoding::encode(&config.collections.comment));
|
||||||
|
|
||||||
let response = client
|
let response = client
|
||||||
.get(&url)
|
.get(&url)
|
||||||
@@ -372,14 +311,23 @@ fn save_config(config: &AuthConfig) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate collection config from environment
|
// Generate collection names from admin DID or environment
|
||||||
fn generate_collection_config() -> CollectionConfig {
|
fn generate_collection_config() -> CollectionConfig {
|
||||||
// Use VITE_OAUTH_COLLECTION for unified configuration
|
// Check environment variables first
|
||||||
let base = std::env::var("VITE_OAUTH_COLLECTION")
|
if let (Ok(comment), Ok(user)) = (
|
||||||
.unwrap_or_else(|_| "ai.syui.log".to_string());
|
std::env::var("AILOG_COLLECTION_COMMENT"),
|
||||||
|
std::env::var("AILOG_COLLECTION_USER")
|
||||||
|
) {
|
||||||
|
return CollectionConfig {
|
||||||
|
comment,
|
||||||
|
user,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default collections
|
||||||
CollectionConfig {
|
CollectionConfig {
|
||||||
base,
|
comment: "ai.syui.log".to_string(),
|
||||||
|
user: "ai.syui.log.user".to_string(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -387,5 +335,5 @@ fn generate_collection_config() -> CollectionConfig {
|
|||||||
pub fn update_config_collections(config: &mut AuthConfig) {
|
pub fn update_config_collections(config: &mut AuthConfig) {
|
||||||
config.collections = generate_collection_config();
|
config.collections = generate_collection_config();
|
||||||
// Also update jetstream collections to monitor the comment collection
|
// Also update jetstream collections to monitor the comment collection
|
||||||
config.jetstream.collections = vec![config.collections.comment()];
|
config.jetstream.collections = vec![config.collections.comment.clone()];
|
||||||
}
|
}
|
@@ -45,50 +45,61 @@ pub async fn build(project_dir: PathBuf) -> Result<()> {
|
|||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.ok_or_else(|| anyhow::anyhow!("No admin DID found in [oauth] section"))?;
|
.ok_or_else(|| anyhow::anyhow!("No admin DID found in [oauth] section"))?;
|
||||||
|
|
||||||
let collection_base = oauth_config.get("collection")
|
let collection_comment = oauth_config.get("collection_comment")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("ai.syui.log");
|
.unwrap_or("ai.syui.log");
|
||||||
|
|
||||||
// Extract AI configuration from ai config if available
|
let collection_user = oauth_config.get("collection_user")
|
||||||
let ai_config = config.get("ai").and_then(|v| v.as_table());
|
|
||||||
let ai_did = ai_config
|
|
||||||
.and_then(|ai_table| ai_table.get("ai_did"))
|
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("did:plc:4hqjfn7m6n5hno3doamuhgef");
|
.unwrap_or("ai.syui.log.user");
|
||||||
|
|
||||||
|
let collection_chat = oauth_config.get("collection_chat")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("ai.syui.log.chat");
|
||||||
|
|
||||||
|
// Extract AI config if present
|
||||||
|
let ai_config = config.get("ai")
|
||||||
|
.and_then(|v| v.as_table());
|
||||||
|
|
||||||
let ai_enabled = ai_config
|
let ai_enabled = ai_config
|
||||||
.and_then(|ai_table| ai_table.get("enabled"))
|
.and_then(|ai| ai.get("enabled"))
|
||||||
.and_then(|v| v.as_bool())
|
.and_then(|v| v.as_bool())
|
||||||
.unwrap_or(true);
|
.unwrap_or(false);
|
||||||
|
|
||||||
let ai_ask_ai = ai_config
|
let ai_ask_ai = ai_config
|
||||||
.and_then(|ai_table| ai_table.get("ask_ai"))
|
.and_then(|ai| ai.get("ask_ai"))
|
||||||
.and_then(|v| v.as_bool())
|
.and_then(|v| v.as_bool())
|
||||||
.unwrap_or(true);
|
.unwrap_or(false);
|
||||||
|
|
||||||
let ai_provider = ai_config
|
let ai_provider = ai_config
|
||||||
.and_then(|ai_table| ai_table.get("provider"))
|
.and_then(|ai| ai.get("provider"))
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("ollama");
|
.unwrap_or("ollama");
|
||||||
|
|
||||||
let ai_model = ai_config
|
let ai_model = ai_config
|
||||||
.and_then(|ai_table| ai_table.get("model"))
|
.and_then(|ai| ai.get("model"))
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("gemma3:4b");
|
.unwrap_or("gemma2:2b");
|
||||||
|
|
||||||
let ai_host = ai_config
|
let ai_host = ai_config
|
||||||
.and_then(|ai_table| ai_table.get("host"))
|
.and_then(|ai| ai.get("host"))
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("https://ollama.syui.ai");
|
.unwrap_or("https://ollama.syui.ai");
|
||||||
|
|
||||||
let ai_system_prompt = ai_config
|
let ai_system_prompt = ai_config
|
||||||
.and_then(|ai_table| ai_table.get("system_prompt"))
|
.and_then(|ai| ai.get("system_prompt"))
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。");
|
.unwrap_or("you are a helpful ai assistant");
|
||||||
|
|
||||||
|
let ai_did = ai_config
|
||||||
|
.and_then(|ai| ai.get("ai_did"))
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("did:plc:4hqjfn7m6n5hno3doamuhgef");
|
||||||
|
|
||||||
// Extract bsky_api from oauth config
|
// Extract bsky_api from oauth config
|
||||||
let bsky_api = oauth_config.get("bsky_api")
|
let bsky_api = oauth_config.get("bsky_api")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("https://public.api.bsky.app");
|
.unwrap_or("https://public.api.bsky.app");
|
||||||
|
|
||||||
// Extract atproto_api from oauth config
|
|
||||||
let atproto_api = oauth_config.get("atproto_api")
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.unwrap_or("https://bsky.social");
|
|
||||||
|
|
||||||
// 4. Create .env.production content
|
// 4. Create .env.production content
|
||||||
let env_content = format!(
|
let env_content = format!(
|
||||||
@@ -98,8 +109,15 @@ VITE_OAUTH_CLIENT_ID={}/{}
|
|||||||
VITE_OAUTH_REDIRECT_URI={}/{}
|
VITE_OAUTH_REDIRECT_URI={}/{}
|
||||||
VITE_ADMIN_DID={}
|
VITE_ADMIN_DID={}
|
||||||
|
|
||||||
# Base collection (all others are derived via getCollectionNames)
|
# Collection names for OAuth app
|
||||||
VITE_OAUTH_COLLECTION={}
|
VITE_COLLECTION_COMMENT={}
|
||||||
|
VITE_COLLECTION_USER={}
|
||||||
|
VITE_COLLECTION_CHAT={}
|
||||||
|
|
||||||
|
# Collection names for ailog (backward compatibility)
|
||||||
|
AILOG_COLLECTION_COMMENT={}
|
||||||
|
AILOG_COLLECTION_USER={}
|
||||||
|
AILOG_COLLECTION_CHAT={}
|
||||||
|
|
||||||
# AI Configuration
|
# AI Configuration
|
||||||
VITE_AI_ENABLED={}
|
VITE_AI_ENABLED={}
|
||||||
@@ -112,13 +130,17 @@ VITE_AI_DID={}
|
|||||||
|
|
||||||
# API Configuration
|
# API Configuration
|
||||||
VITE_BSKY_PUBLIC_API={}
|
VITE_BSKY_PUBLIC_API={}
|
||||||
VITE_ATPROTO_API={}
|
|
||||||
"#,
|
"#,
|
||||||
base_url,
|
base_url,
|
||||||
base_url, client_id_path,
|
base_url, client_id_path,
|
||||||
base_url, redirect_path,
|
base_url, redirect_path,
|
||||||
admin_did,
|
admin_did,
|
||||||
collection_base,
|
collection_comment,
|
||||||
|
collection_user,
|
||||||
|
collection_chat,
|
||||||
|
collection_comment,
|
||||||
|
collection_user,
|
||||||
|
collection_chat,
|
||||||
ai_enabled,
|
ai_enabled,
|
||||||
ai_ask_ai,
|
ai_ask_ai,
|
||||||
ai_provider,
|
ai_provider,
|
||||||
@@ -126,8 +148,7 @@ VITE_ATPROTO_API={}
|
|||||||
ai_host,
|
ai_host,
|
||||||
ai_system_prompt,
|
ai_system_prompt,
|
||||||
ai_did,
|
ai_did,
|
||||||
bsky_api,
|
bsky_api
|
||||||
atproto_api
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// 5. Find oauth directory (relative to current working directory)
|
// 5. Find oauth directory (relative to current working directory)
|
||||||
|
@@ -10,81 +10,18 @@ use std::process::{Command, Stdio};
|
|||||||
use tokio::time::{sleep, Duration, interval};
|
use tokio::time::{sleep, Duration, interval};
|
||||||
use tokio_tungstenite::{connect_async, tungstenite::Message};
|
use tokio_tungstenite::{connect_async, tungstenite::Message};
|
||||||
use toml;
|
use toml;
|
||||||
use reqwest;
|
|
||||||
|
|
||||||
use super::auth::{load_config, load_config_with_refresh, AuthConfig};
|
use super::auth::{load_config, load_config_with_refresh, AuthConfig};
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
struct AiConfig {
|
|
||||||
blog_host: String,
|
|
||||||
ollama_host: String,
|
|
||||||
ai_did: String,
|
|
||||||
model: String,
|
|
||||||
system_prompt: String,
|
|
||||||
bsky_api: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for AiConfig {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self {
|
|
||||||
blog_host: "https://syui.ai".to_string(),
|
|
||||||
ollama_host: "https://ollama.syui.ai".to_string(),
|
|
||||||
ai_did: "did:plc:4hqjfn7m6n5hno3doamuhgef".to_string(),
|
|
||||||
model: "gemma3:4b".to_string(),
|
|
||||||
system_prompt: "あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。相手のことが大好きで、ときどき甘えたり、照れたりします。でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。".to_string(),
|
|
||||||
bsky_api: "https://public.api.bsky.app".to_string(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
#[allow(dead_code)]
|
|
||||||
struct BlogPost {
|
|
||||||
title: String,
|
|
||||||
href: String,
|
|
||||||
#[serde(rename = "formated_time")]
|
|
||||||
#[allow(dead_code)]
|
|
||||||
date: String,
|
|
||||||
#[allow(dead_code)]
|
|
||||||
tags: Vec<String>,
|
|
||||||
#[allow(dead_code)]
|
|
||||||
contents: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
#[allow(dead_code)]
|
|
||||||
struct BlogIndex {
|
|
||||||
#[allow(dead_code)]
|
|
||||||
posts: Vec<BlogPost>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize)]
|
|
||||||
struct OllamaRequest {
|
|
||||||
model: String,
|
|
||||||
prompt: String,
|
|
||||||
stream: bool,
|
|
||||||
options: OllamaOptions,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize)]
|
|
||||||
struct OllamaOptions {
|
|
||||||
temperature: f32,
|
|
||||||
top_p: f32,
|
|
||||||
num_predict: i32,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
struct OllamaResponse {
|
|
||||||
response: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load collection config with priority: env vars > project config.toml > defaults
|
// Load collection config with priority: env vars > project config.toml > defaults
|
||||||
fn load_collection_config(project_dir: Option<&Path>) -> Result<(String, String)> {
|
fn load_collection_config(project_dir: Option<&Path>) -> Result<(String, String)> {
|
||||||
// 1. Check environment variables first (highest priority)
|
// 1. Check environment variables first (highest priority)
|
||||||
if let Ok(base_collection) = std::env::var("VITE_OAUTH_COLLECTION") {
|
if let (Ok(comment), Ok(user)) = (
|
||||||
|
std::env::var("AILOG_COLLECTION_COMMENT"),
|
||||||
|
std::env::var("AILOG_COLLECTION_USER")
|
||||||
|
) {
|
||||||
println!("{}", "📂 Using collection config from environment variables".cyan());
|
println!("{}", "📂 Using collection config from environment variables".cyan());
|
||||||
let collection_user = format!("{}.user", base_collection);
|
return Ok((comment, user));
|
||||||
return Ok((base_collection, collection_user));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Try to load from project config.toml (second priority)
|
// 2. Try to load from project config.toml (second priority)
|
||||||
@@ -123,93 +60,17 @@ fn load_collection_config_from_project(project_dir: &Path) -> Result<(String, St
|
|||||||
.and_then(|v| v.as_table())
|
.and_then(|v| v.as_table())
|
||||||
.ok_or_else(|| anyhow::anyhow!("No [oauth] section found in config.toml"))?;
|
.ok_or_else(|| anyhow::anyhow!("No [oauth] section found in config.toml"))?;
|
||||||
|
|
||||||
// Use new simplified collection structure (base collection)
|
let collection_comment = oauth_config.get("collection_comment")
|
||||||
let collection_base = oauth_config.get("collection")
|
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("ai.syui.log")
|
.unwrap_or("ai.syui.log")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
// Derive user collection from base
|
let collection_user = oauth_config.get("collection_user")
|
||||||
let collection_user = format!("{}.user", collection_base);
|
|
||||||
|
|
||||||
Ok((collection_base, collection_user))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load AI config from project's config.toml
|
|
||||||
fn load_ai_config_from_project() -> Result<AiConfig> {
|
|
||||||
// Try to find config.toml in current directory or parent directories
|
|
||||||
let mut current_dir = std::env::current_dir()?;
|
|
||||||
let mut config_path = None;
|
|
||||||
|
|
||||||
for _ in 0..5 { // Search up to 5 levels up
|
|
||||||
let potential_config = current_dir.join("config.toml");
|
|
||||||
if potential_config.exists() {
|
|
||||||
config_path = Some(potential_config);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if !current_dir.pop() {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let config_path = config_path.ok_or_else(|| anyhow::anyhow!("config.toml not found in current directory or parent directories"))?;
|
|
||||||
|
|
||||||
let config_content = fs::read_to_string(&config_path)
|
|
||||||
.with_context(|| format!("Failed to read config.toml from {}", config_path.display()))?;
|
|
||||||
|
|
||||||
let config: toml::Value = config_content.parse()
|
|
||||||
.with_context(|| "Failed to parse config.toml")?;
|
|
||||||
|
|
||||||
// Extract site config
|
|
||||||
let site_config = config.get("site").and_then(|v| v.as_table());
|
|
||||||
let blog_host = site_config
|
|
||||||
.and_then(|s| s.get("base_url"))
|
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("https://syui.ai")
|
.unwrap_or("ai.syui.log.user")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
// Extract AI config
|
Ok((collection_comment, collection_user))
|
||||||
let ai_config = config.get("ai").and_then(|v| v.as_table());
|
|
||||||
let ollama_host = ai_config
|
|
||||||
.and_then(|ai| ai.get("host"))
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.unwrap_or("https://ollama.syui.ai")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let ai_did = ai_config
|
|
||||||
.and_then(|ai| ai.get("ai_did"))
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.unwrap_or("did:plc:4hqjfn7m6n5hno3doamuhgef")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let model = ai_config
|
|
||||||
.and_then(|ai| ai.get("model"))
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.unwrap_or("gemma3:4b")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let system_prompt = ai_config
|
|
||||||
.and_then(|ai| ai.get("system_prompt"))
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.unwrap_or("あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。相手のことが大好きで、ときどき甘えたり、照れたりします。でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
// Extract OAuth config for bsky_api
|
|
||||||
let oauth_config = config.get("oauth").and_then(|v| v.as_table());
|
|
||||||
let bsky_api = oauth_config
|
|
||||||
.and_then(|oauth| oauth.get("bsky_api"))
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.unwrap_or("https://public.api.bsky.app")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
Ok(AiConfig {
|
|
||||||
blog_host,
|
|
||||||
ollama_host,
|
|
||||||
ai_did,
|
|
||||||
model,
|
|
||||||
system_prompt,
|
|
||||||
bsky_api,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
@@ -257,14 +118,15 @@ fn get_pid_file() -> Result<PathBuf> {
|
|||||||
Ok(pid_dir.join("stream.pid"))
|
Ok(pid_dir.join("stream.pid"))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn start(project_dir: Option<PathBuf>, daemon: bool, ai_generate: bool) -> Result<()> {
|
pub async fn start(project_dir: Option<PathBuf>, daemon: bool) -> Result<()> {
|
||||||
let mut config = load_config_with_refresh().await?;
|
let mut config = load_config_with_refresh().await?;
|
||||||
|
|
||||||
// Load collection config with priority: env vars > project config > defaults
|
// Load collection config with priority: env vars > project config > defaults
|
||||||
let (collection_comment, _collection_user) = load_collection_config(project_dir.as_deref())?;
|
let (collection_comment, collection_user) = load_collection_config(project_dir.as_deref())?;
|
||||||
|
|
||||||
// Update config with loaded collections
|
// Update config with loaded collections
|
||||||
config.collections.base = collection_comment.clone();
|
config.collections.comment = collection_comment.clone();
|
||||||
|
config.collections.user = collection_user;
|
||||||
config.jetstream.collections = vec![collection_comment];
|
config.jetstream.collections = vec![collection_comment];
|
||||||
|
|
||||||
let pid_file = get_pid_file()?;
|
let pid_file = get_pid_file()?;
|
||||||
@@ -289,11 +151,6 @@ pub async fn start(project_dir: Option<PathBuf>, daemon: bool, ai_generate: bool
|
|||||||
args.push(project_path.to_string_lossy().to_string());
|
args.push(project_path.to_string_lossy().to_string());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add ai_generate flag if enabled
|
|
||||||
if ai_generate {
|
|
||||||
args.push("--ai-generate".to_string());
|
|
||||||
}
|
|
||||||
|
|
||||||
let child = Command::new(current_exe)
|
let child = Command::new(current_exe)
|
||||||
.args(&args)
|
.args(&args)
|
||||||
.stdin(Stdio::null())
|
.stdin(Stdio::null())
|
||||||
@@ -335,19 +192,6 @@ pub async fn start(project_dir: Option<PathBuf>, daemon: bool, ai_generate: bool
|
|||||||
let max_reconnect_attempts = 10;
|
let max_reconnect_attempts = 10;
|
||||||
let mut config = config; // Make config mutable for token refresh
|
let mut config = config; // Make config mutable for token refresh
|
||||||
|
|
||||||
// Start AI generation monitor if enabled
|
|
||||||
if ai_generate {
|
|
||||||
let ai_config = config.clone();
|
|
||||||
tokio::spawn(async move {
|
|
||||||
loop {
|
|
||||||
if let Err(e) = run_ai_generation_monitor(&ai_config).await {
|
|
||||||
println!("{}", format!("❌ AI generation monitor error: {}", e).red());
|
|
||||||
sleep(Duration::from_secs(60)).await; // Wait 1 minute before retry
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
match run_monitor(&mut config).await {
|
match run_monitor(&mut config).await {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
@@ -500,7 +344,7 @@ async fn handle_message(text: &str, config: &mut AuthConfig) -> Result<()> {
|
|||||||
if let (Some(collection), Some(commit), Some(did)) =
|
if let (Some(collection), Some(commit), Some(did)) =
|
||||||
(&message.collection, &message.commit, &message.did) {
|
(&message.collection, &message.commit, &message.did) {
|
||||||
|
|
||||||
if collection == &config.collections.comment() && commit.operation.as_deref() == Some("create") {
|
if collection == &config.collections.comment && commit.operation.as_deref() == Some("create") {
|
||||||
let unknown_uri = "unknown".to_string();
|
let unknown_uri = "unknown".to_string();
|
||||||
let uri = commit.uri.as_ref().unwrap_or(&unknown_uri);
|
let uri = commit.uri.as_ref().unwrap_or(&unknown_uri);
|
||||||
|
|
||||||
@@ -532,7 +376,6 @@ async fn handle_message(text: &str, config: &mut AuthConfig) -> Result<()> {
|
|||||||
|
|
||||||
async fn resolve_handle(did: &str) -> Result<String> {
|
async fn resolve_handle(did: &str) -> Result<String> {
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
// Use default bsky API for handle resolution
|
|
||||||
let url = format!("https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor={}",
|
let url = format!("https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor={}",
|
||||||
urlencoding::encode(did));
|
urlencoding::encode(did));
|
||||||
|
|
||||||
@@ -595,7 +438,7 @@ async fn get_current_user_list(config: &mut AuthConfig) -> Result<Vec<UserRecord
|
|||||||
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=10",
|
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=10",
|
||||||
config.admin.pds,
|
config.admin.pds,
|
||||||
urlencoding::encode(&config.admin.did),
|
urlencoding::encode(&config.admin.did),
|
||||||
urlencoding::encode(&config.collections.user()));
|
urlencoding::encode(&config.collections.user));
|
||||||
|
|
||||||
let response = client
|
let response = client
|
||||||
.get(&url)
|
.get(&url)
|
||||||
@@ -658,7 +501,7 @@ async fn post_user_list(config: &mut AuthConfig, users: &[UserRecord], metadata:
|
|||||||
let rkey = format!("{}-{}", short_did, now.format("%Y-%m-%dT%H-%M-%S-%3fZ").to_string().replace(".", "-"));
|
let rkey = format!("{}-{}", short_did, now.format("%Y-%m-%dT%H-%M-%S-%3fZ").to_string().replace(".", "-"));
|
||||||
|
|
||||||
let record = UserListRecord {
|
let record = UserListRecord {
|
||||||
record_type: config.collections.user(),
|
record_type: config.collections.user.clone(),
|
||||||
users: users.to_vec(),
|
users: users.to_vec(),
|
||||||
created_at: now.to_rfc3339(),
|
created_at: now.to_rfc3339(),
|
||||||
updated_by: UserInfo {
|
updated_by: UserInfo {
|
||||||
@@ -672,7 +515,7 @@ async fn post_user_list(config: &mut AuthConfig, users: &[UserRecord], metadata:
|
|||||||
|
|
||||||
let request_body = json!({
|
let request_body = json!({
|
||||||
"repo": config.admin.did,
|
"repo": config.admin.did,
|
||||||
"collection": config.collections.user(),
|
"collection": config.collections.user,
|
||||||
"rkey": rkey,
|
"rkey": rkey,
|
||||||
"record": record
|
"record": record
|
||||||
});
|
});
|
||||||
@@ -916,7 +759,7 @@ async fn get_recent_comments(config: &mut AuthConfig) -> Result<Vec<Value>> {
|
|||||||
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=20",
|
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=20",
|
||||||
config.admin.pds,
|
config.admin.pds,
|
||||||
urlencoding::encode(&config.admin.did),
|
urlencoding::encode(&config.admin.did),
|
||||||
urlencoding::encode(&config.collections.comment()));
|
urlencoding::encode(&config.collections.comment));
|
||||||
|
|
||||||
if std::env::var("AILOG_DEBUG").is_ok() {
|
if std::env::var("AILOG_DEBUG").is_ok() {
|
||||||
println!("{}", format!("🌐 API Request URL: {}", url).yellow());
|
println!("{}", format!("🌐 API Request URL: {}", url).yellow());
|
||||||
@@ -997,7 +840,7 @@ pub async fn test_api() -> Result<()> {
|
|||||||
println!("{}", format!("✅ Successfully retrieved {} comments", comments.len()).green());
|
println!("{}", format!("✅ Successfully retrieved {} comments", comments.len()).green());
|
||||||
|
|
||||||
if comments.is_empty() {
|
if comments.is_empty() {
|
||||||
println!("{}", format!("ℹ️ No comments found in {} collection", config.collections.comment()).blue());
|
println!("{}", format!("ℹ️ No comments found in {} collection", config.collections.comment).blue());
|
||||||
println!("💡 Try posting a comment first using the web interface");
|
println!("💡 Try posting a comment first using the web interface");
|
||||||
} else {
|
} else {
|
||||||
println!("{}", "📝 Comment details:".cyan());
|
println!("{}", "📝 Comment details:".cyan());
|
||||||
@@ -1028,416 +871,5 @@ pub async fn test_api() -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
// AI content generation functions
|
|
||||||
async fn generate_ai_content(content: &str, prompt_type: &str, ai_config: &AiConfig) -> Result<String> {
|
|
||||||
let model = &ai_config.model;
|
|
||||||
let system_prompt = &ai_config.system_prompt;
|
|
||||||
|
|
||||||
let prompt = match prompt_type {
|
|
||||||
"translate" => format!(
|
|
||||||
"{}\n\n# 指示\n以下の日本語ブログ記事を英語に翻訳してください。\n- 技術用語やコードブロックはそのまま維持\n- アイらしい表現で翻訳\n- 簡潔に要点をまとめる\n\n# ブログ記事\n{}",
|
|
||||||
system_prompt, content
|
|
||||||
),
|
|
||||||
"comment" => {
|
|
||||||
// Limit content to first 500 characters to reduce input size
|
|
||||||
let limited_content = if content.len() > 500 {
|
|
||||||
format!("{}...", &content[..500])
|
|
||||||
} else {
|
|
||||||
content.to_string()
|
|
||||||
};
|
|
||||||
|
|
||||||
format!(
|
|
||||||
"{}\n\n# 指示\nこのブログ記事を読んで、アイらしい感想を一言でください。\n- 30文字以内の短い感想\n- 技術的な内容への素朴な驚きや発見\n- 「わー!」「すごい!」など、アイらしい感嘆詞で始める\n- 簡潔で分かりやすく\n\n# ブログ記事(要約)\n{}\n\n# 出力形式\n一言の感想のみ(説明や詳細は不要):",
|
|
||||||
system_prompt, limited_content
|
|
||||||
)
|
|
||||||
},
|
|
||||||
_ => return Err(anyhow::anyhow!("Unknown prompt type: {}", prompt_type)),
|
|
||||||
};
|
|
||||||
|
|
||||||
let num_predict = match prompt_type {
|
|
||||||
"comment" => 50, // Very short for comments (about 30-40 characters)
|
|
||||||
"translate" => 3000, // Much longer for translations
|
|
||||||
_ => 300,
|
|
||||||
};
|
|
||||||
|
|
||||||
let request = OllamaRequest {
|
|
||||||
model: model.to_string(),
|
|
||||||
prompt,
|
|
||||||
stream: false,
|
|
||||||
options: OllamaOptions {
|
|
||||||
temperature: 0.7, // Lower temperature for more focused responses
|
|
||||||
top_p: 0.8,
|
|
||||||
num_predict,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
let client = reqwest::Client::builder()
|
|
||||||
.timeout(std::time::Duration::from_secs(120)) // 2 minute timeout
|
|
||||||
.build()?;
|
|
||||||
|
|
||||||
// Try localhost first (for same-server deployment)
|
|
||||||
let localhost_url = "http://localhost:11434/api/generate";
|
|
||||||
match client.post(localhost_url).json(&request).send().await {
|
|
||||||
Ok(response) if response.status().is_success() => {
|
|
||||||
let ollama_response: OllamaResponse = response.json().await?;
|
|
||||||
println!("{}", "✅ Used localhost Ollama".green());
|
|
||||||
return Ok(ollama_response.response);
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
println!("{}", "⚠️ Localhost Ollama not available, trying remote...".yellow());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback to remote host
|
|
||||||
let remote_url = format!("{}/api/generate", ai_config.ollama_host);
|
|
||||||
println!("{}", format!("🔗 Making request to: {} with Origin: {}", remote_url, ai_config.blog_host).blue());
|
|
||||||
let response = client
|
|
||||||
.post(&remote_url)
|
|
||||||
.header("Origin", &ai_config.blog_host)
|
|
||||||
.json(&request)
|
|
||||||
.send()
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
if !response.status().is_success() {
|
|
||||||
return Err(anyhow::anyhow!("Ollama API request failed: {}", response.status()));
|
|
||||||
}
|
|
||||||
|
|
||||||
let ollama_response: OllamaResponse = response.json().await?;
|
|
||||||
println!("{}", "✅ Used remote Ollama".green());
|
|
||||||
Ok(ollama_response.response)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn run_ai_generation_monitor(config: &AuthConfig) -> Result<()> {
|
|
||||||
// Load AI config from project config.toml or use defaults
|
|
||||||
let ai_config = load_ai_config_from_project().unwrap_or_else(|e| {
|
|
||||||
println!("{}", format!("⚠️ Failed to load AI config: {}, using defaults", e).yellow());
|
|
||||||
AiConfig::default()
|
|
||||||
});
|
|
||||||
|
|
||||||
let blog_host = &ai_config.blog_host;
|
|
||||||
let ollama_host = &ai_config.ollama_host;
|
|
||||||
let ai_did = &ai_config.ai_did;
|
|
||||||
|
|
||||||
println!("{}", "🤖 Starting AI content generation monitor...".cyan());
|
|
||||||
println!("📡 Blog host: {}", blog_host);
|
|
||||||
println!("🧠 Ollama host: {}", ollama_host);
|
|
||||||
println!("🤖 AI DID: {}", ai_did);
|
|
||||||
println!();
|
|
||||||
|
|
||||||
let mut interval = interval(Duration::from_secs(300)); // Check every 5 minutes
|
|
||||||
let client = reqwest::Client::new();
|
|
||||||
|
|
||||||
loop {
|
|
||||||
interval.tick().await;
|
|
||||||
|
|
||||||
println!("{}", "🔍 Checking for new blog posts...".blue());
|
|
||||||
|
|
||||||
match check_and_process_new_posts(&client, config, &ai_config).await {
|
|
||||||
Ok(count) => {
|
|
||||||
if count > 0 {
|
|
||||||
println!("{}", format!("✅ Processed {} new posts", count).green());
|
|
||||||
} else {
|
|
||||||
println!("{}", "ℹ️ No new posts found".blue());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!("{}", format!("❌ Error processing posts: {}", e).red());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
println!("{}", "⏰ Waiting for next check...".cyan());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn check_and_process_new_posts(
|
|
||||||
client: &reqwest::Client,
|
|
||||||
config: &AuthConfig,
|
|
||||||
ai_config: &AiConfig,
|
|
||||||
) -> Result<usize> {
|
|
||||||
// Fetch blog index
|
|
||||||
let index_url = format!("{}/index.json", ai_config.blog_host);
|
|
||||||
let response = client.get(&index_url).send().await?;
|
|
||||||
|
|
||||||
if !response.status().is_success() {
|
|
||||||
return Err(anyhow::anyhow!("Failed to fetch blog index: {}", response.status()));
|
|
||||||
}
|
|
||||||
|
|
||||||
let blog_posts: Vec<BlogPost> = response.json().await?;
|
|
||||||
println!("{}", format!("📄 Found {} posts in blog index", blog_posts.len()).cyan());
|
|
||||||
|
|
||||||
// Get existing AI generated content from collections
|
|
||||||
let existing_lang_records = get_existing_records(config, &config.collections.chat_lang()).await?;
|
|
||||||
let existing_comment_records = get_existing_records(config, &config.collections.chat_comment()).await?;
|
|
||||||
|
|
||||||
let mut processed_count = 0;
|
|
||||||
|
|
||||||
for post in blog_posts {
|
|
||||||
let post_slug = extract_slug_from_url(&post.href);
|
|
||||||
|
|
||||||
// Check if translation already exists (support both old and new format)
|
|
||||||
let translation_exists = existing_lang_records.iter().any(|record| {
|
|
||||||
let value = record.get("value");
|
|
||||||
|
|
||||||
// Check new format: value.post.slug
|
|
||||||
let new_format_match = value
|
|
||||||
.and_then(|v| v.get("post"))
|
|
||||||
.and_then(|p| p.get("slug"))
|
|
||||||
.and_then(|s| s.as_str())
|
|
||||||
== Some(&post_slug);
|
|
||||||
|
|
||||||
// Check old format: value.post_slug
|
|
||||||
let old_format_match = value
|
|
||||||
.and_then(|v| v.get("post_slug"))
|
|
||||||
.and_then(|s| s.as_str())
|
|
||||||
== Some(&post_slug);
|
|
||||||
|
|
||||||
new_format_match || old_format_match
|
|
||||||
});
|
|
||||||
|
|
||||||
if translation_exists {
|
|
||||||
println!("{}", format!("⏭️ Translation already exists for: {}", post.title).yellow());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if comment already exists (support both old and new format)
|
|
||||||
let comment_exists = existing_comment_records.iter().any(|record| {
|
|
||||||
let value = record.get("value");
|
|
||||||
|
|
||||||
// Check new format: value.post.slug
|
|
||||||
let new_format_match = value
|
|
||||||
.and_then(|v| v.get("post"))
|
|
||||||
.and_then(|p| p.get("slug"))
|
|
||||||
.and_then(|s| s.as_str())
|
|
||||||
== Some(&post_slug);
|
|
||||||
|
|
||||||
// Check old format: value.post_slug
|
|
||||||
let old_format_match = value
|
|
||||||
.and_then(|v| v.get("post_slug"))
|
|
||||||
.and_then(|s| s.as_str())
|
|
||||||
== Some(&post_slug);
|
|
||||||
|
|
||||||
new_format_match || old_format_match
|
|
||||||
});
|
|
||||||
|
|
||||||
if comment_exists {
|
|
||||||
println!("{}", format!("⏭️ Comment already exists for: {}", post.title).yellow());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate translation if not exists
|
|
||||||
if !translation_exists {
|
|
||||||
match generate_and_store_translation(client, config, &post, ai_config).await {
|
|
||||||
Ok(_) => {
|
|
||||||
println!("{}", format!("✅ Generated translation for: {}", post.title).green());
|
|
||||||
processed_count += 1;
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!("{}", format!("❌ Failed to generate translation for {}: {}", post.title, e).red());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
println!("{}", format!("⏭️ Translation already exists for: {}", post.title).yellow());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate comment if not exists
|
|
||||||
if !comment_exists {
|
|
||||||
match generate_and_store_comment(client, config, &post, ai_config).await {
|
|
||||||
Ok(_) => {
|
|
||||||
println!("{}", format!("✅ Generated comment for: {}", post.title).green());
|
|
||||||
processed_count += 1;
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!("{}", format!("❌ Failed to generate comment for {}: {}", post.title, e).red());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
println!("{}", format!("⏭️ Comment already exists for: {}", post.title).yellow());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(processed_count)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_existing_records(config: &AuthConfig, collection: &str) -> Result<Vec<serde_json::Value>> {
|
|
||||||
let client = reqwest::Client::new();
|
|
||||||
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=100",
|
|
||||||
config.admin.pds,
|
|
||||||
urlencoding::encode(&config.admin.did),
|
|
||||||
urlencoding::encode(collection));
|
|
||||||
|
|
||||||
let response = client
|
|
||||||
.get(&url)
|
|
||||||
.header("Authorization", format!("Bearer {}", config.admin.access_jwt))
|
|
||||||
.send()
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
if !response.status().is_success() {
|
|
||||||
return Ok(Vec::new()); // Return empty if collection doesn't exist yet
|
|
||||||
}
|
|
||||||
|
|
||||||
let list_response: serde_json::Value = response.json().await?;
|
|
||||||
let records = list_response["records"].as_array().unwrap_or(&Vec::new()).clone();
|
|
||||||
|
|
||||||
Ok(records)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn extract_slug_from_url(url: &str) -> String {
|
|
||||||
// Extract slug from URL like "/posts/2025-06-06-ailog.html"
|
|
||||||
url.split('/')
|
|
||||||
.last()
|
|
||||||
.unwrap_or("")
|
|
||||||
.trim_end_matches(".html")
|
|
||||||
.to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn extract_date_from_slug(slug: &str) -> String {
|
|
||||||
// Extract date from slug like "2025-06-14-blog" -> "2025-06-14T00:00:00Z"
|
|
||||||
if slug.len() >= 10 && slug.chars().nth(4) == Some('-') && slug.chars().nth(7) == Some('-') {
|
|
||||||
format!("{}T00:00:00Z", &slug[0..10])
|
|
||||||
} else {
|
|
||||||
chrono::Utc::now().format("%Y-%m-%dT00:00:00Z").to_string()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_ai_profile(client: &reqwest::Client, ai_config: &AiConfig) -> Result<serde_json::Value> {
|
|
||||||
let url = format!("{}/xrpc/app.bsky.actor.getProfile?actor={}",
|
|
||||||
ai_config.bsky_api, urlencoding::encode(&ai_config.ai_did));
|
|
||||||
|
|
||||||
let response = client
|
|
||||||
.get(&url)
|
|
||||||
.send()
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
if !response.status().is_success() {
|
|
||||||
// Fallback to default AI profile
|
|
||||||
return Ok(serde_json::json!({
|
|
||||||
"did": ai_config.ai_did,
|
|
||||||
"handle": "yui.syui.ai",
|
|
||||||
"displayName": "ai",
|
|
||||||
"avatar": "https://cdn.bsky.app/img/avatar/plain/did:plc:4hqjfn7m6n5hno3doamuhgef/bafkreiaxkv624mffw3cfyi67ufxtwuwsy2mjw2ygezsvtd44ycbgkfdo2a@jpeg"
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
let profile_data: serde_json::Value = response.json().await?;
|
|
||||||
|
|
||||||
Ok(serde_json::json!({
|
|
||||||
"did": ai_config.ai_did,
|
|
||||||
"handle": profile_data["handle"].as_str().unwrap_or("yui.syui.ai"),
|
|
||||||
"displayName": profile_data["displayName"].as_str().unwrap_or("ai"),
|
|
||||||
"avatar": profile_data["avatar"].as_str()
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn generate_and_store_translation(
|
|
||||||
client: &reqwest::Client,
|
|
||||||
config: &AuthConfig,
|
|
||||||
post: &BlogPost,
|
|
||||||
ai_config: &AiConfig,
|
|
||||||
) -> Result<()> {
|
|
||||||
// Generate translation using post content instead of just title
|
|
||||||
let content_to_translate = format!("Title: {}\n\n{}", post.title, post.contents);
|
|
||||||
let translation = generate_ai_content(&content_to_translate, "translate", ai_config).await?;
|
|
||||||
|
|
||||||
// Get AI profile information
|
|
||||||
let ai_author = get_ai_profile(client, ai_config).await?;
|
|
||||||
|
|
||||||
// Extract post metadata
|
|
||||||
let post_slug = extract_slug_from_url(&post.href);
|
|
||||||
let post_date = extract_date_from_slug(&post_slug);
|
|
||||||
|
|
||||||
// Store in ai.syui.log.chat.lang collection with new format
|
|
||||||
let record_data = serde_json::json!({
|
|
||||||
"$type": "ai.syui.log.chat.lang",
|
|
||||||
"post": {
|
|
||||||
"url": post.href,
|
|
||||||
"slug": post_slug,
|
|
||||||
"title": post.title,
|
|
||||||
"date": post_date,
|
|
||||||
"tags": post.tags,
|
|
||||||
"language": "ja"
|
|
||||||
},
|
|
||||||
"type": "en",
|
|
||||||
"text": translation,
|
|
||||||
"author": ai_author,
|
|
||||||
"createdAt": chrono::Utc::now().to_rfc3339()
|
|
||||||
});
|
|
||||||
|
|
||||||
store_atproto_record(client, config, &config.collections.chat_lang(), &record_data).await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn generate_and_store_comment(
|
|
||||||
client: &reqwest::Client,
|
|
||||||
config: &AuthConfig,
|
|
||||||
post: &BlogPost,
|
|
||||||
ai_config: &AiConfig,
|
|
||||||
) -> Result<()> {
|
|
||||||
// Generate comment using limited post content for brevity
|
|
||||||
let limited_contents = if post.contents.len() > 300 {
|
|
||||||
format!("{}...", &post.contents[..300])
|
|
||||||
} else {
|
|
||||||
post.contents.clone()
|
|
||||||
};
|
|
||||||
let content_to_comment = format!("Title: {}\n\n{}", post.title, limited_contents);
|
|
||||||
let comment = generate_ai_content(&content_to_comment, "comment", ai_config).await?;
|
|
||||||
|
|
||||||
// Get AI profile information
|
|
||||||
let ai_author = get_ai_profile(client, ai_config).await?;
|
|
||||||
|
|
||||||
// Extract post metadata
|
|
||||||
let post_slug = extract_slug_from_url(&post.href);
|
|
||||||
let post_date = extract_date_from_slug(&post_slug);
|
|
||||||
|
|
||||||
// Store in ai.syui.log.chat.comment collection with new format
|
|
||||||
let record_data = serde_json::json!({
|
|
||||||
"$type": "ai.syui.log.chat.comment",
|
|
||||||
"post": {
|
|
||||||
"url": post.href,
|
|
||||||
"slug": post_slug,
|
|
||||||
"title": post.title,
|
|
||||||
"date": post_date,
|
|
||||||
"tags": post.tags,
|
|
||||||
"language": "ja"
|
|
||||||
},
|
|
||||||
"type": "info",
|
|
||||||
"text": comment,
|
|
||||||
"author": ai_author,
|
|
||||||
"createdAt": chrono::Utc::now().to_rfc3339()
|
|
||||||
});
|
|
||||||
|
|
||||||
store_atproto_record(client, config, &config.collections.chat_comment(), &record_data).await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn store_atproto_record(
|
|
||||||
client: &reqwest::Client,
|
|
||||||
_config: &AuthConfig,
|
|
||||||
collection: &str,
|
|
||||||
record_data: &serde_json::Value,
|
|
||||||
) -> Result<()> {
|
|
||||||
// Always load fresh config to ensure we have valid tokens
|
|
||||||
let config = load_config_with_refresh().await?;
|
|
||||||
|
|
||||||
let url = format!("{}/xrpc/com.atproto.repo.putRecord", config.admin.pds);
|
|
||||||
|
|
||||||
let put_request = serde_json::json!({
|
|
||||||
"repo": config.admin.did,
|
|
||||||
"collection": collection,
|
|
||||||
"rkey": uuid::Uuid::new_v4().to_string(),
|
|
||||||
"record": record_data
|
|
||||||
});
|
|
||||||
|
|
||||||
let response = client
|
|
||||||
.post(&url)
|
|
||||||
.header("Authorization", format!("Bearer {}", config.admin.access_jwt))
|
|
||||||
.header("Content-Type", "application/json")
|
|
||||||
.json(&put_request)
|
|
||||||
.send()
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
if !response.status().is_success() {
|
|
||||||
let error_text = response.text().await?;
|
|
||||||
return Err(anyhow::anyhow!("Failed to store record: {}", error_text));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
@@ -71,9 +71,6 @@ impl Generator {
|
|||||||
// Generate index page
|
// Generate index page
|
||||||
self.generate_index(&posts).await?;
|
self.generate_index(&posts).await?;
|
||||||
|
|
||||||
// Generate JSON index for API access
|
|
||||||
self.generate_json_index(&posts).await?;
|
|
||||||
|
|
||||||
// Generate post pages
|
// Generate post pages
|
||||||
for post in &posts {
|
for post in &posts {
|
||||||
self.generate_post_page(post).await?;
|
self.generate_post_page(post).await?;
|
||||||
@@ -449,63 +446,6 @@ impl Generator {
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn generate_json_index(&self, posts: &[Post]) -> Result<()> {
|
|
||||||
let index_data: Vec<serde_json::Value> = posts.iter().map(|post| {
|
|
||||||
// Parse date for proper formatting
|
|
||||||
let parsed_date = chrono::NaiveDate::parse_from_str(&post.date, "%Y-%m-%d")
|
|
||||||
.unwrap_or_else(|_| chrono::Utc::now().naive_utc().date());
|
|
||||||
|
|
||||||
// Format to Hugo-style date format (Mon Jan 2, 2006)
|
|
||||||
let formatted_date = parsed_date.format("%a %b %-d, %Y").to_string();
|
|
||||||
|
|
||||||
// Create UTC datetime for utc_time field
|
|
||||||
let utc_datetime = parsed_date.and_hms_opt(0, 0, 0)
|
|
||||||
.unwrap_or_else(|| chrono::Utc::now().naive_utc());
|
|
||||||
let utc_time = format!("{}Z", utc_datetime.format("%Y-%m-%dT%H:%M:%S"));
|
|
||||||
|
|
||||||
// Extract plain text content from HTML
|
|
||||||
let contents = self.extract_plain_text(&post.content);
|
|
||||||
|
|
||||||
serde_json::json!({
|
|
||||||
"title": post.title,
|
|
||||||
"tags": post.tags,
|
|
||||||
"description": self.extract_excerpt(&post.content),
|
|
||||||
"categories": [],
|
|
||||||
"contents": contents,
|
|
||||||
"href": format!("{}{}", self.config.site.base_url.trim_end_matches('/'), post.url),
|
|
||||||
"utc_time": utc_time,
|
|
||||||
"formated_time": formatted_date
|
|
||||||
})
|
|
||||||
}).collect();
|
|
||||||
|
|
||||||
// Write JSON index to public directory
|
|
||||||
let output_path = self.base_path.join("public/index.json");
|
|
||||||
let json_content = serde_json::to_string_pretty(&index_data)?;
|
|
||||||
fs::write(output_path, json_content)?;
|
|
||||||
|
|
||||||
println!("{} JSON index with {} posts", "Generated".cyan(), posts.len());
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn extract_plain_text(&self, html_content: &str) -> String {
|
|
||||||
// Remove HTML tags and extract plain text
|
|
||||||
let mut text = String::new();
|
|
||||||
let mut in_tag = false;
|
|
||||||
|
|
||||||
for ch in html_content.chars() {
|
|
||||||
match ch {
|
|
||||||
'<' => in_tag = true,
|
|
||||||
'>' => in_tag = false,
|
|
||||||
_ if !in_tag => text.push(ch),
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clean up whitespace
|
|
||||||
text.split_whitespace().collect::<Vec<_>>().join(" ")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, serde::Serialize)]
|
#[derive(Debug, Clone, serde::Serialize)]
|
||||||
@@ -539,19 +479,4 @@ pub struct Translation {
|
|||||||
pub title: String,
|
pub title: String,
|
||||||
pub content: String,
|
pub content: String,
|
||||||
pub url: String,
|
pub url: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, serde::Serialize)]
|
|
||||||
#[allow(dead_code)]
|
|
||||||
struct BlogPost {
|
|
||||||
title: String,
|
|
||||||
url: String,
|
|
||||||
date: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, serde::Serialize)]
|
|
||||||
#[allow(dead_code)]
|
|
||||||
struct BlogIndex {
|
|
||||||
posts: Vec<BlogPost>,
|
|
||||||
}
|
|
||||||
|
|
28
src/main.rs
28
src/main.rs
@@ -18,14 +18,10 @@ mod mcp;
|
|||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
#[command(name = "ailog")]
|
#[command(name = "ailog")]
|
||||||
#[command(about = "A static blog generator with AI features")]
|
#[command(about = "A static blog generator with AI features")]
|
||||||
#[command(disable_version_flag = true)]
|
#[command(version)]
|
||||||
struct Cli {
|
struct Cli {
|
||||||
/// Print version information
|
|
||||||
#[arg(short = 'V', long = "version")]
|
|
||||||
version: bool,
|
|
||||||
|
|
||||||
#[command(subcommand)]
|
#[command(subcommand)]
|
||||||
command: Option<Commands>,
|
command: Commands,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Subcommand)]
|
#[derive(Subcommand)]
|
||||||
@@ -118,9 +114,6 @@ enum StreamCommands {
|
|||||||
/// Run as daemon
|
/// Run as daemon
|
||||||
#[arg(short, long)]
|
#[arg(short, long)]
|
||||||
daemon: bool,
|
daemon: bool,
|
||||||
/// Enable AI content generation
|
|
||||||
#[arg(long)]
|
|
||||||
ai_generate: bool,
|
|
||||||
},
|
},
|
||||||
/// Stop monitoring
|
/// Stop monitoring
|
||||||
Stop,
|
Stop,
|
||||||
@@ -142,19 +135,8 @@ enum OauthCommands {
|
|||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<()> {
|
async fn main() -> Result<()> {
|
||||||
let cli = Cli::parse();
|
let cli = Cli::parse();
|
||||||
|
|
||||||
// Handle version flag
|
|
||||||
if cli.version {
|
|
||||||
println!("{}", env!("CARGO_PKG_VERSION"));
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Require subcommand if no version flag
|
|
||||||
let command = cli.command.ok_or_else(|| {
|
|
||||||
anyhow::anyhow!("No subcommand provided. Use --help for usage information.")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
match command {
|
match cli.command {
|
||||||
Commands::Init { path } => {
|
Commands::Init { path } => {
|
||||||
commands::init::execute(path).await?;
|
commands::init::execute(path).await?;
|
||||||
}
|
}
|
||||||
@@ -196,8 +178,8 @@ async fn main() -> Result<()> {
|
|||||||
}
|
}
|
||||||
Commands::Stream { command } => {
|
Commands::Stream { command } => {
|
||||||
match command {
|
match command {
|
||||||
StreamCommands::Start { project_dir, daemon, ai_generate } => {
|
StreamCommands::Start { project_dir, daemon } => {
|
||||||
commands::stream::start(project_dir, daemon, ai_generate).await?;
|
commands::stream::start(project_dir, daemon).await?;
|
||||||
}
|
}
|
||||||
StreamCommands::Stop => {
|
StreamCommands::Stop => {
|
||||||
commands::stream::stop().await?;
|
commands::stream::stop().await?;
|
||||||
|
Reference in New Issue
Block a user