test update json

This commit is contained in:
2025-06-15 15:31:53 +09:00
parent 095f6ec386
commit 8dac463345
19 changed files with 959 additions and 576 deletions

View File

@ -47,7 +47,8 @@
"Bash(git push:*)", "Bash(git push:*)",
"Bash(git tag:*)", "Bash(git tag:*)",
"Bash(../bin/ailog:*)", "Bash(../bin/ailog:*)",
"Bash(../target/release/ailog oauth build:*)" "Bash(../target/release/ailog oauth build:*)",
"Bash(ailog:*)"
], ],
"deny": [] "deny": []
} }

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ node_modules
package-lock.json package-lock.json
my-blog/static/assets/comment-atproto-* my-blog/static/assets/comment-atproto-*
bin/ailog bin/ailog
docs

Binary file not shown.

View File

@ -1,11 +1,11 @@
#!/bin/zsh #!/bin/zsh
#[collection] [pds] [did] [token]
set -e set -e
cb=ai.syui.log
cl=( $cb.chat $cb.chat.comment $cb.chat.lang )
f=~/.config/syui/ai/bot/token.json f=~/.config/syui/ai/bot/token.json
default_collection="ai.syui.log.chat" default_collection="ai.syui.log.chat.comment"
default_pds="bsky.social" default_pds="bsky.social"
default_did=`cat $f|jq -r .did` default_did=`cat $f|jq -r .did`
default_token=`cat $f|jq -r .accessJwt` default_token=`cat $f|jq -r .accessJwt`
@ -16,27 +16,15 @@ collection=${1:-$default_collection}
pds=${2:-$default_pds} pds=${2:-$default_pds}
did=${3:-$default_did} did=${3:-$default_did}
token=${4:-$default_token} token=${4:-$default_token}
req=com.atproto.repo.deleteRecord
url=https://$pds/xrpc/$req
delete_record() { for i in $cl; do
local rkey=$1 echo $i
local req="com.atproto.repo.deleteRecord" 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))
local url="https://$pds/xrpc/$req" for rkey in "${rkeys[@]}"; do
local json="{\"collection\":\"$collection\", \"rkey\":\"$rkey\", \"repo\":\"$did\"}"
curl -sL -X POST \
-H "Content-Type: application/json" \
-H "Authorization: Bearer $token" \
-d "$json" \
"$url"
if [ $? -eq 0 ]; then
echo " ✓ Deleted: $rkey"
else
echo " ✗ Failed: $rkey"
fi
}
rkeys=($(curl -sL "https://$default_pds/xrpc/com.atproto.repo.listRecords?repo=$did&collection=$collection&limit=100"|jq -r ".records[]?.uri"|cut -d '/' -f 5))
for rkey in "${rkeys[@]}"; do
echo $rkey echo $rkey
delete_record $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 done

View File

@ -1,5 +1,19 @@
# エコシステム統合設計書 # エコシステム統合設計書
## 注意事項
`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の探求
- **唯一性原則**: 現実の個人の唯一性をすべてのシステムで担保 - **唯一性原則**: 現実の個人の唯一性をすべてのシステムで担保

View File

@ -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-G86WWmu8.js"></script> <script type="module" crossorigin src="/assets/comment-atproto-C3utAhPv.js"></script>
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-FS0uZjXB.css"> <link rel="stylesheet" crossorigin href="/assets/comment-atproto-BH-72ESb.css">

31
my-blog/static/index.json Normal file
View File

@ -0,0 +1,31 @@
[
{
"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: &#39;3&#39; 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=&quot;$HOME/.cargo&quot; $ export RUSTUP_HOME=&quot;$HOME/.rustup&quot; $ export PATH=&quot;$HOME/.cargo/bin:$PATH&quot; --- $ which ailog $ ailog -h build deploy $ cd my-blog $ vim config.toml $ ailog new test $ vim content/posts/`date +&quot;%Y-%m-%d&quot;`.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です。 &lt;script type=&quot;module&quot; crossorigin src=&quot;/assets/comment-atproto-${hash}}.js&quot;&gt;&lt;/script&gt; &lt;link rel=&quot;stylesheet&quot; crossorigin href=&quot;/assets/comment-atproto-${hash}.css&quot;&gt; &lt;section class=&quot;comment-section&quot;&gt; &lt;div id=&quot;comment-atproto&quot;&gt;&lt;/div&gt; &lt;/section&gt; ただし、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!(&quot;Hello, world!&quot;); } // This is a comment console.log(&quot;Hello, world!&quot;);",
"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"
}
]

View File

@ -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-G86WWmu8.js"></script> <script type="module" crossorigin src="/assets/comment-atproto-C3utAhPv.js"></script>
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-FS0uZjXB.css"> <link rel="stylesheet" crossorigin href="/assets/comment-atproto-BH-72ESb.css">

View File

@ -4,9 +4,8 @@ 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 for OAuth app and ailog (all others are derived) # Base collection (all others are derived via getCollectionNames)
VITE_OAUTH_COLLECTION=ai.syui.log VITE_OAUTH_COLLECTION=ai.syui.log
# [user, chat, chat.lang, chat.comment]
# AI Configuration # AI Configuration
VITE_AI_ENABLED=true VITE_AI_ENABLED=true
@ -19,3 +18,4 @@ 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

View File

@ -194,6 +194,7 @@
padding: 10px !important; padding: 10px !important;
word-wrap: break-word !important; word-wrap: break-word !important;
overflow-wrap: break-word !important; overflow-wrap: break-word !important;
white-space: pre-wrap !important;
} }
.comment-header { .comment-header {
@ -323,6 +324,7 @@
/* 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;
@ -610,6 +612,8 @@
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 {

File diff suppressed because it is too large Load Diff

View File

@ -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 } from '../config/app'; import { appConfig, getCollectionNames } from '../config/app';
interface AIChatProps { interface AIChatProps {
user: User | null; user: User | null;
@ -14,26 +14,22 @@ 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 environment variables // Get AI settings from appConfig (unified configuration)
const aiConfig = { const aiConfig = {
enabled: import.meta.env.VITE_AI_ENABLED === 'true', enabled: appConfig.aiEnabled,
askAi: import.meta.env.VITE_AI_ASK_AI === 'true', askAi: appConfig.aiAskAi,
provider: import.meta.env.VITE_AI_PROVIDER || 'ollama', provider: appConfig.aiProvider,
model: import.meta.env.VITE_AI_MODEL || 'gemma3:4b', model: appConfig.aiModel,
host: import.meta.env.VITE_AI_HOST || 'https://ollama.syui.ai', host: appConfig.aiHost,
systemPrompt: import.meta.env.VITE_AI_SYSTEM_PROMPT || 'You are a helpful AI assistant trained on this blog\'s content.', systemPrompt: appConfig.aiSystemPrompt,
aiDid: import.meta.env.VITE_AI_DID || 'did:plc:uqzpqmrjnptsxezjx4xuh2mn', aiDid: appConfig.aiDid,
bskyPublicApi: import.meta.env.VITE_BSKY_PUBLIC_API || 'https://public.api.bsky.app', bskyPublicApi: appConfig.bskyPublicApi,
}; };
// 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;
} }
@ -41,9 +37,7 @@ 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,
@ -51,21 +45,17 @@ 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,
@ -73,21 +63,15 @@ 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();
@ -100,9 +84,6 @@ 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);
@ -114,7 +95,6 @@ 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'));
@ -134,40 +114,50 @@ 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: appConfig.collections.chat, $type: collections.chat,
question: question, post: {
url: window.location.href, url: currentUrl,
createdAt: now.toISOString(), slug: postSlug,
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,
}, },
context: { createdAt: now.toISOString(),
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: appConfig.collections.chat, collection: 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: appConfig.collections.chat, collection: collections.chat,
limit: 10, limit: 10,
}); });
@ -175,10 +165,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.question) { if (r.value.type === 'question') {
return `User: ${r.value.question}`; return `User: ${r.value.text}`;
} else if (r.value.answer) { } else if (r.value.type === 'answer') {
return `AI: ${r.value.answer}`; return `AI: ${r.value.text}`;
} }
return ''; return '';
}) })
@ -235,37 +225,38 @@ 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: appConfig.collections.chat, $type: collections.chat,
answer: aiAnswer, post: {
question_rkey: rkey, url: currentUrl,
url: window.location.href, slug: postSlug,
createdAt: now.toISOString(), title: postTitle,
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: appConfig.collections.chat, collection: collections.chat,
rkey: answerRkey, rkey: answerRkey,
record: answerRecord, record: answerRecord,
}).catch(err => { }).catch(err => {
console.error('Failed to save AI response to ATProto:', err); // Silent fail for AI response saving
}); });
} 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応答の生成に失敗しました' }
})); }));

View File

@ -1,6 +1,7 @@
// 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" base: string; // Base collection like "ai.syui.log"
}; };
@ -11,18 +12,27 @@ 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) // Collection name builders (similar to Rust implementation)
export function getCollectionNames(base: string) { export function getCollectionNames(base: string) {
return { if (!base) {
// Fallback to default
base = 'ai.syui.log';
}
const collections = {
comment: base, comment: base,
user: `${base}.user`, user: `${base}.user`,
chat: `${base}.chat`, chat: `${base}.chat`,
chatLang: `${base}.chat.lang`, chatLang: `${base}.chat.lang`,
chatComment: `${base}.chat.comment`, chatComment: `${base}.chat.comment`,
}; };
return collections;
} }
// Generate collection names from host // Generate collection names from host
@ -43,9 +53,9 @@ 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();
return reversedParts.join('.'); const result = reversedParts.join('.');
return result;
} catch (error) { } catch (error) {
console.warn('Failed to generate collection base from host:', host, error);
// Fallback to default // Fallback to default
return 'ai.syui.log'; return 'ai.syui.log';
} }
@ -63,11 +73,19 @@ function extractRkeyFromUrl(): string | undefined {
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 autoGeneratedBase = generateBaseCollectionFromHost(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: import.meta.env.VITE_OAUTH_COLLECTION || autoGeneratedBase, base: baseCollection,
}; };
const rkey = extractRkeyFromUrl(); const rkey = extractRkeyFromUrl();
@ -78,19 +96,14 @@ 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,
@ -99,7 +112,9 @@ export function getAppConfig(): AppConfig {
aiProvider, aiProvider,
aiModel, aiModel,
aiHost, aiHost,
bskyPublicApi aiSystemPrompt,
bskyPublicApi,
atprotoApi
}; };
} }

View File

@ -73,7 +73,6 @@ 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サーバーが必要です');
} }
}, },
@ -86,7 +85,6 @@ 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サーバーが必要です');
} }
}, },

View File

@ -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,39 +43,33 @@ 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
@ -83,36 +77,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;
@ -121,18 +115,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',
@ -145,7 +139,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 {
@ -154,11 +148,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
@ -169,18 +163,20 @@ 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: Hardcoded fallback for known DIDs // Method 3: Fallback for admin DID
if (did === 'did:plc:uqzpqmrjnptsxezjx4xuh2mn') { const adminDid = import.meta.env.VITE_ADMIN_DID;
handle = 'syui.ai'; if (did === adminDid) {
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');
} }
} }
@ -191,7 +187,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;
} }
@ -200,7 +196,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
} }
@ -209,7 +205,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 = {
@ -220,22 +216,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();
} }
@ -251,15 +247,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,
@ -267,20 +263,14 @@ 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({
@ -291,35 +281,30 @@ 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();
} }
@ -327,11 +312,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
@ -339,47 +324,42 @@ 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
@ -388,7 +368,7 @@ class AtprotoOAuthService {
return null; return null;
} catch (error) { } catch (error) {
console.error('Session check failed:', error);
return null; return null;
} }
} }
@ -398,13 +378,7 @@ 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) {
@ -414,7 +388,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;
} }
@ -426,11 +400,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;
} }
@ -450,28 +424,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
@ -492,11 +466,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(() => {
@ -504,7 +478,7 @@ class AtprotoOAuthService {
}, 100); }, 100);
} catch (error) { } catch (error) {
console.error('Logout failed:', error);
} }
} }
@ -519,8 +493,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) {
@ -550,13 +524,6 @@ 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({
@ -566,9 +533,9 @@ class AtprotoOAuthService {
record: record record: record
}); });
console.log('カードデータをai.card.boxに保存しました:', response);
} catch (error) { } catch (error) {
console.error('カードボックス保存エラー:', error);
throw error; throw error;
} }
} }
@ -584,8 +551,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) {
@ -598,7 +565,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 = {
@ -611,7 +578,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')) {
@ -633,8 +600,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) {
@ -647,33 +614,35 @@ 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: 'did:plc:uqzpqmrjnptsxezjx4xuh2mn', did: adminDid,
handle: 'syui.ai', handle: new URL(appHost).hostname,
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));
} }

View File

@ -53,7 +53,6 @@ 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' }
@ -62,7 +61,6 @@ 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
@ -136,6 +134,5 @@ 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);
} }
} }

View File

@ -37,7 +37,6 @@ 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');
} }
} }
@ -115,7 +114,6 @@ 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);
} }
} }

View File

@ -49,50 +49,47 @@ pub async fn build(project_dir: PathBuf) -> Result<()> {
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
.unwrap_or("ai.syui.log"); .unwrap_or("ai.syui.log");
// Extract AI config if present // Extract AI configuration from ai config if available
let ai_config = config.get("ai") let ai_config = config.get("ai").and_then(|v| v.as_table());
.and_then(|v| v.as_table());
let ai_enabled = ai_config
.and_then(|ai| ai.get("enabled"))
.and_then(|v| v.as_bool())
.unwrap_or(false);
let ai_ask_ai = ai_config
.and_then(|ai| ai.get("ask_ai"))
.and_then(|v| v.as_bool())
.unwrap_or(false);
let ai_provider = ai_config
.and_then(|ai| ai.get("provider"))
.and_then(|v| v.as_str())
.unwrap_or("ollama");
let ai_model = ai_config
.and_then(|ai| ai.get("model"))
.and_then(|v| v.as_str())
.unwrap_or("gemma2:2b");
let ai_host = ai_config
.and_then(|ai| ai.get("host"))
.and_then(|v| v.as_str())
.unwrap_or("https://ollama.syui.ai");
let ai_system_prompt = ai_config
.and_then(|ai| ai.get("system_prompt"))
.and_then(|v| v.as_str())
.unwrap_or("you are a helpful ai assistant");
let ai_did = ai_config let ai_did = ai_config
.and_then(|ai| ai.get("ai_did")) .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("did:plc:4hqjfn7m6n5hno3doamuhgef");
let ai_enabled = ai_config
.and_then(|ai_table| ai_table.get("enabled"))
.and_then(|v| v.as_bool())
.unwrap_or(true);
let ai_ask_ai = ai_config
.and_then(|ai_table| ai_table.get("ask_ai"))
.and_then(|v| v.as_bool())
.unwrap_or(true);
let ai_provider = ai_config
.and_then(|ai_table| ai_table.get("provider"))
.and_then(|v| v.as_str())
.unwrap_or("ollama");
let ai_model = ai_config
.and_then(|ai_table| ai_table.get("model"))
.and_then(|v| v.as_str())
.unwrap_or("gemma3:4b");
let ai_host = ai_config
.and_then(|ai_table| ai_table.get("host"))
.and_then(|v| v.as_str())
.unwrap_or("https://ollama.syui.ai");
let ai_system_prompt = ai_config
.and_then(|ai_table| ai_table.get("system_prompt"))
.and_then(|v| v.as_str())
.unwrap_or("あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。");
// 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!(
r#"# Production environment variables r#"# Production environment variables
@ -101,7 +98,7 @@ VITE_OAUTH_CLIENT_ID={}/{}
VITE_OAUTH_REDIRECT_URI={}/{} VITE_OAUTH_REDIRECT_URI={}/{}
VITE_ADMIN_DID={} VITE_ADMIN_DID={}
# Base collection for OAuth app and ailog (all others are derived) # Base collection (all others are derived via getCollectionNames)
VITE_OAUTH_COLLECTION={} VITE_OAUTH_COLLECTION={}
# AI Configuration # AI Configuration
@ -115,6 +112,7 @@ 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,
@ -128,7 +126,8 @@ VITE_BSKY_PUBLIC_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)

View File

@ -14,6 +14,29 @@ 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)] #[derive(Debug, Deserialize)]
#[allow(dead_code)] #[allow(dead_code)]
struct BlogPost { struct BlogPost {
@ -112,6 +135,83 @@ fn load_collection_config_from_project(project_dir: &Path) -> Result<(String, St
Ok((collection_base, collection_user)) 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())
.unwrap_or("https://syui.ai")
.to_string();
// Extract AI config
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)]
struct JetstreamMessage { struct JetstreamMessage {
collection: Option<String>, collection: Option<String>,
@ -432,6 +532,7 @@ 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));
@ -931,27 +1032,51 @@ pub async fn test_api() -> Result<()> {
} }
// AI content generation functions // AI content generation functions
async fn generate_ai_content(content: &str, prompt_type: &str, ollama_host: &str) -> Result<String> { async fn generate_ai_content(content: &str, prompt_type: &str, ai_config: &AiConfig) -> Result<String> {
let model = "gemma3:4b"; let model = &ai_config.model;
let system_prompt = &ai_config.system_prompt;
let prompt = match prompt_type { let prompt = match prompt_type {
"translate" => format!("Translate the following Japanese blog post to English. Keep the technical terms and code blocks intact:\n\n{}", content), "translate" => format!(
"comment" => format!("Read this blog post and provide an insightful comment about it. Focus on the key points and add your perspective:\n\n{}", content), "{}\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)), _ => 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 { let request = OllamaRequest {
model: model.to_string(), model: model.to_string(),
prompt, prompt,
stream: false, stream: false,
options: OllamaOptions { options: OllamaOptions {
temperature: 0.9, temperature: 0.7, // Lower temperature for more focused responses
top_p: 0.9, top_p: 0.8,
num_predict: 500, num_predict,
}, },
}; };
let client = reqwest::Client::new(); let client = reqwest::Client::builder()
.timeout(std::time::Duration::from_secs(120)) // 2 minute timeout
.build()?;
// Try localhost first (for same-server deployment) // Try localhost first (for same-server deployment)
let localhost_url = "http://localhost:11434/api/generate"; let localhost_url = "http://localhost:11434/api/generate";
@ -967,8 +1092,14 @@ async fn generate_ai_content(content: &str, prompt_type: &str, ollama_host: &str
} }
// Fallback to remote host // Fallback to remote host
let remote_url = format!("{}/api/generate", ollama_host); let remote_url = format!("{}/api/generate", ai_config.ollama_host);
let response = client.post(&remote_url).json(&request).send().await?; 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() { if !response.status().is_success() {
return Err(anyhow::anyhow!("Ollama API request failed: {}", response.status())); return Err(anyhow::anyhow!("Ollama API request failed: {}", response.status()));
@ -980,9 +1111,15 @@ async fn generate_ai_content(content: &str, prompt_type: &str, ollama_host: &str
} }
async fn run_ai_generation_monitor(config: &AuthConfig) -> Result<()> { async fn run_ai_generation_monitor(config: &AuthConfig) -> Result<()> {
let blog_host = "https://syui.ai"; // TODO: Load from config // Load AI config from project config.toml or use defaults
let ollama_host = "https://ollama.syui.ai"; // TODO: Load from config let ai_config = load_ai_config_from_project().unwrap_or_else(|e| {
let ai_did = "did:plc:4hqjfn7m6n5hno3doamuhgef"; // TODO: Load from config 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!("{}", "🤖 Starting AI content generation monitor...".cyan());
println!("📡 Blog host: {}", blog_host); println!("📡 Blog host: {}", blog_host);
@ -998,7 +1135,7 @@ async fn run_ai_generation_monitor(config: &AuthConfig) -> Result<()> {
println!("{}", "🔍 Checking for new blog posts...".blue()); println!("{}", "🔍 Checking for new blog posts...".blue());
match check_and_process_new_posts(&client, config, blog_host, ollama_host, ai_did).await { match check_and_process_new_posts(&client, config, &ai_config).await {
Ok(count) => { Ok(count) => {
if count > 0 { if count > 0 {
println!("{}", format!("✅ Processed {} new posts", count).green()); println!("{}", format!("✅ Processed {} new posts", count).green());
@ -1018,12 +1155,10 @@ async fn run_ai_generation_monitor(config: &AuthConfig) -> Result<()> {
async fn check_and_process_new_posts( async fn check_and_process_new_posts(
client: &reqwest::Client, client: &reqwest::Client,
config: &AuthConfig, config: &AuthConfig,
blog_host: &str, ai_config: &AiConfig,
ollama_host: &str,
ai_did: &str,
) -> Result<usize> { ) -> Result<usize> {
// Fetch blog index // Fetch blog index
let index_url = format!("{}/index.json", blog_host); let index_url = format!("{}/index.json", ai_config.blog_host);
let response = client.get(&index_url).send().await?; let response = client.get(&index_url).send().await?;
if !response.status().is_success() { if !response.status().is_success() {
@ -1042,25 +1177,57 @@ async fn check_and_process_new_posts(
for post in blog_posts { for post in blog_posts {
let post_slug = extract_slug_from_url(&post.href); let post_slug = extract_slug_from_url(&post.href);
// Check if translation already exists // Check if translation already exists (support both old and new format)
let translation_exists = existing_lang_records.iter().any(|record| { let translation_exists = existing_lang_records.iter().any(|record| {
record.get("value") 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(|v| v.get("post_slug"))
.and_then(|s| s.as_str()) .and_then(|s| s.as_str())
== Some(&post_slug) == Some(&post_slug);
new_format_match || old_format_match
}); });
// Check if comment already exists 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 comment_exists = existing_comment_records.iter().any(|record| {
record.get("value") 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(|v| v.get("post_slug"))
.and_then(|s| s.as_str()) .and_then(|s| s.as_str())
== Some(&post_slug) == 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 // Generate translation if not exists
if !translation_exists { if !translation_exists {
match generate_and_store_translation(client, config, &post, ollama_host, ai_did).await { match generate_and_store_translation(client, config, &post, ai_config).await {
Ok(_) => { Ok(_) => {
println!("{}", format!("✅ Generated translation for: {}", post.title).green()); println!("{}", format!("✅ Generated translation for: {}", post.title).green());
processed_count += 1; processed_count += 1;
@ -1069,11 +1236,13 @@ async fn check_and_process_new_posts(
println!("{}", format!("❌ Failed to generate translation for {}: {}", post.title, e).red()); 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 // Generate comment if not exists
if !comment_exists { if !comment_exists {
match generate_and_store_comment(client, config, &post, ollama_host, ai_did).await { match generate_and_store_comment(client, config, &post, ai_config).await {
Ok(_) => { Ok(_) => {
println!("{}", format!("✅ Generated comment for: {}", post.title).green()); println!("{}", format!("✅ Generated comment for: {}", post.title).green());
processed_count += 1; processed_count += 1;
@ -1082,6 +1251,8 @@ async fn check_and_process_new_posts(
println!("{}", format!("❌ Failed to generate comment for {}: {}", post.title, e).red()); println!("{}", format!("❌ Failed to generate comment for {}: {}", post.title, e).red());
} }
} }
} else {
println!("{}", format!("⏭️ Comment already exists for: {}", post.title).yellow());
} }
} }
@ -1120,25 +1291,76 @@ fn extract_slug_from_url(url: &str) -> String {
.to_string() .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( async fn generate_and_store_translation(
client: &reqwest::Client, client: &reqwest::Client,
config: &AuthConfig, config: &AuthConfig,
post: &BlogPost, post: &BlogPost,
ollama_host: &str, ai_config: &AiConfig,
ai_did: &str,
) -> Result<()> { ) -> Result<()> {
// Generate translation // Generate translation using post content instead of just title
let translation = generate_ai_content(&post.title, "translate", ollama_host).await?; let content_to_translate = format!("Title: {}\n\n{}", post.title, post.contents);
let translation = generate_ai_content(&content_to_translate, "translate", ai_config).await?;
// Store in ai.syui.log.chat.lang collection // 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!({ let record_data = serde_json::json!({
"post_slug": extract_slug_from_url(&post.href), "$type": "ai.syui.log.chat.lang",
"post_title": post.title, "post": {
"post_url": post.href, "url": post.href,
"lang": "en", "slug": post_slug,
"content": translation, "title": post.title,
"generated_at": chrono::Utc::now().to_rfc3339(), "date": post_date,
"ai_did": ai_did "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 store_atproto_record(client, config, &config.collections.chat_lang(), &record_data).await
@ -1148,20 +1370,39 @@ async fn generate_and_store_comment(
client: &reqwest::Client, client: &reqwest::Client,
config: &AuthConfig, config: &AuthConfig,
post: &BlogPost, post: &BlogPost,
ollama_host: &str, ai_config: &AiConfig,
ai_did: &str,
) -> Result<()> { ) -> Result<()> {
// Generate comment // Generate comment using limited post content for brevity
let comment = generate_ai_content(&post.title, "comment", ollama_host).await?; 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?;
// Store in ai.syui.log.chat.comment collection // 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!({ let record_data = serde_json::json!({
"post_slug": extract_slug_from_url(&post.href), "$type": "ai.syui.log.chat.comment",
"post_title": post.title, "post": {
"post_url": post.href, "url": post.href,
"content": comment, "slug": post_slug,
"generated_at": chrono::Utc::now().to_rfc3339(), "title": post.title,
"ai_did": ai_did "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 store_atproto_record(client, config, &config.collections.chat_comment(), &record_data).await
@ -1169,10 +1410,13 @@ async fn generate_and_store_comment(
async fn store_atproto_record( async fn store_atproto_record(
client: &reqwest::Client, client: &reqwest::Client,
config: &AuthConfig, _config: &AuthConfig,
collection: &str, collection: &str,
record_data: &serde_json::Value, record_data: &serde_json::Value,
) -> Result<()> { ) -> 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 url = format!("{}/xrpc/com.atproto.repo.putRecord", config.admin.pds);
let put_request = serde_json::json!({ let put_request = serde_json::json!({