Merge branch 'main' into main

Author: hank9999

app/api/config/route.ts

@@ -0,0 +1,22 @@
+import { NextResponse } from "next/server";
+import { initDatabase } from "@/lib/db/client";
+
+let initialized = false;
+
+export async function GET() {
+  if (!initialized) {
+    try {
+      await initDatabase();
+      initialized = true;
+      return NextResponse.json({ success: true, message: "数据库初始化成功" });
+    } catch (error) {
+      console.error("数据库初始化失败:", error);
+      return NextResponse.json(
+        { success: false, error: "数据库初始化失败" },
+        { status: 500 }
+      );
+    }
+  } else {
+    return NextResponse.json({ success: true, message: "数据库已初始化" });
+  }
+}

app/api/init/route.ts

@@ -1,7 +1,12 @@
 import { NextResponse } from "next/server";
-import { cookies } from "next/headers";
+import { verifyApiToken } from "@/lib/auth";
+
+export async function GET(req: Request) {
+  const authError = verifyApiToken(req);
+  if (authError) {
+    return authError;
+  }
 
-export async function GET() {
   const apiKey = process.env.API_KEY;
 
   if (!apiKey) {

app/api/config/key/route.ts renamed to app/api/v1/config/key/route.ts

@@ -0,0 +1,14 @@
+import { NextResponse } from "next/server";
+import { verifyApiToken } from "@/lib/auth";
+
+export async function GET(req: Request) {
+  const authError = verifyApiToken(req);
+  if (authError) {
+    return authError;
+  }
+
+  return NextResponse.json({
+    apiKey: process.env.API_KEY || "Unconfigured",
+    status: 200,
+  });
+}

app/api/v1/config/route.ts

@@ -9,7 +9,6 @@ export async function POST(req: Request) {
     const user = await getOrCreateUser(data.user);
     const modelId = data.body?.model;
 
-    // 如果用户被拉黑,返回余额为 -1
     if (user.deleted) {
       return NextResponse.json({
         success: true,
@@ -18,10 +17,8 @@ export async function POST(req: Request) {
       });
     }
 
-    // 获取预扣费金额
     const inletCost = getModelInletCost(modelId);
 
-    // 预扣费
     if (inletCost > 0) {
       const userResult = await query(
         `UPDATE users 

app/api/v1/inlet/route.ts

@@ -1,5 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
-import { updateModelPrice } from "@/lib/db";
+import { updateModelPrice } from "@/lib/db/client";
+import { verifyApiToken } from "@/lib/auth";
 
 interface PriceUpdate {
   id: string;
@@ -9,11 +10,15 @@ interface PriceUpdate {
 }
 
 export async function POST(request: NextRequest) {
+  const authError = verifyApiToken(request);
+  if (authError) {
+    return authError;
+  }
+
   try {
     const data = await request.json();
     console.log("Raw data received:", data);
 
-    // 从对象中提取模型数组
     const updates = data.updates || data;
     if (!Array.isArray(updates)) {
       console.error("Invalid data format - expected array:", updates);
@@ -23,7 +28,6 @@ export async function POST(request: NextRequest) {
       );
     }
 
-    // 验证并转换数据格式
     const validUpdates = updates
       .map((update: any) => ({
         id: update.id,
@@ -52,7 +56,6 @@ export async function POST(request: NextRequest) {
       `Successfully verified price updating requests of ${validUpdates.length} models`
     );
 
-    // 执行批量更新并收集结果
     const results = await Promise.all(
       validUpdates.map(async (update: PriceUpdate) => {
         try {

app/api/v1/models/price/route.ts

@@ -1,5 +1,6 @@
 import { NextResponse } from "next/server";
-import { ensureTablesExist, getOrCreateModelPrices } from "@/lib/db";
+import { ensureTablesExist, getOrCreateModelPrices } from "@/lib/db/client";
+import { verifyApiToken } from "@/lib/auth";
 
 interface ModelInfo {
   id: string;
@@ -21,17 +22,20 @@ interface ModelResponse {
   }[];
 }
 
-export async function GET() {
+export async function GET(req: Request) {
+  const authError = verifyApiToken(req);
+  if (authError) {
+    return authError;
+  }
+
   try {
-    // Ensure database is initialized
     await ensureTablesExist();
 
     const domain = process.env.OPENWEBUI_DOMAIN;
     if (!domain) {
       throw new Error("OPENWEBUI_DOMAIN environment variable is not set.");
     }
 
-    // Normalize API URL
     const apiUrl = domain.replace(/\/+$/, "") + "/api/models";
 
     const response = await fetch(apiUrl, {
@@ -47,9 +51,7 @@ export async function GET() {
       throw new Error(`Failed to fetch models: ${response.status}`);
     }
 
-    // Get response text for debugging
     const responseText = await response.text();
-    // console.log("API response:", responseText);
 
     let data: ModelResponse;
     try {
@@ -66,13 +68,10 @@ export async function GET() {
       throw new Error("Unexpected API response structure");
     }
 
-    // Get price information for all models
     const modelsWithPrices = await getOrCreateModelPrices(
       data.data.map((item) => {
-        // 处理形如 gemini_search.gemini-2.0-flash 的派生模型ID
         let baseModelId = item.info?.base_model_id;
 
-        // 如果没有明确的base_model_id，尝试从ID中提取
         if (!baseModelId && item.id) {
           const idParts = String(item.id).split(".");
           if (idParts.length > 1) {
@@ -89,10 +88,8 @@ export async function GET() {
     );
 
     const validModels = data.data.map((item, index) => {
-      // 处理形如 gemini_search.gemini-2.0-flash 的派生模型ID
       let baseModelId = item.info?.base_model_id || "";
 
-      // 如果没有明确的base_model_id，尝试从ID中提取
       if (!baseModelId && item.id) {
         const idParts = String(item.id).split(".");
         if (idParts.length > 1) {
@@ -126,19 +123,26 @@ export async function GET() {
   }
 }
 
-// Add inlet endpoint
 export async function POST(req: Request) {
+  const authError = verifyApiToken(req);
+  if (authError) {
+    return authError;
+  }
+
   const data = await req.json();
 
   return new Response("Inlet placeholder response", {
     headers: { "Content-Type": "application/json" },
   });
 }
 
-// Add outlet endpoint
 export async function PUT(req: Request) {
+  const authError = verifyApiToken(req);
+  if (authError) {
+    return authError;
+  }
+
   const data = await req.json();
-  // console.log("Outlet received:", JSON.stringify(data, null, 2));
 
   return new Response("Outlet placeholder response", {
     headers: { "Content-Type": "application/json" },

app/api/v1/models/route.ts

@@ -1,11 +1,16 @@
 import { NextRequest, NextResponse } from "next/server";
-import { pool } from "@/lib/db";
+import { pool } from "@/lib/db/client";
+import { verifyApiToken } from "@/lib/auth";
 
 export async function POST(request: NextRequest) {
+  const authError = verifyApiToken(request);
+  if (authError) {
+    return authError;
+  }
+
   try {
     const client = await pool.connect();
     try {
-      // 1. 获取所有有效的派生模型（base_model_id 存在且在数据库中有对应记录）
       const derivedModelsResult = await client.query(`
         SELECT d.id, d.name, d.base_model_id 
         FROM model_prices d
@@ -24,10 +29,8 @@ export async function POST(request: NextRequest) {
       const derivedModels = derivedModelsResult.rows;
       const syncResults = [];
 
-      // 2. 为每个派生模型同步价格
       for (const derivedModel of derivedModels) {
         try {
-          // 获取上游模型价格
           const baseModelResult = await client.query(
             `SELECT input_price, output_price, per_msg_price FROM model_prices WHERE id = $1`,
             [derivedModel.base_model_id]
@@ -45,7 +48,6 @@ export async function POST(request: NextRequest) {
 
           const baseModel = baseModelResult.rows[0];
 
-          // 更新派生模型价格
           const updateResult = await client.query(
             `UPDATE model_prices 
              SET 

app/api/v1/models/sync-all-prices/route.ts

@@ -1,7 +1,13 @@
 import { NextRequest, NextResponse } from "next/server";
-import { pool } from "@/lib/db";
+import { pool } from "@/lib/db/client";
+import { verifyApiToken } from "@/lib/auth";
 
 export async function POST(request: NextRequest) {
+  const authError = verifyApiToken(request);
+  if (authError) {
+    return authError;
+  }
+
   try {
     const data = await request.json();
     const { modelId } = data;
@@ -15,7 +21,6 @@ export async function POST(request: NextRequest) {
 
     const client = await pool.connect();
     try {
-      // 1. 获取派生模型信息
       const derivedModelResult = await client.query(
         `SELECT id, name, base_model_id FROM model_prices WHERE id = $1`,
         [modelId]
@@ -28,13 +33,11 @@ export async function POST(request: NextRequest) {
       const derivedModel = derivedModelResult.rows[0];
       let baseModelId = derivedModel.base_model_id;
 
-      // 如果数据库中没有base_model_id，尝试从ID中提取
       if (!baseModelId) {
         const idParts = modelId.split(".");
         if (idParts.length > 1) {
           baseModelId = idParts[idParts.length - 1];
 
-          // 更新数据库中的base_model_id
           await client.query(
             `UPDATE model_prices SET base_model_id = $2 WHERE id = $1`,
             [modelId, baseModelId]
@@ -49,7 +52,6 @@ export async function POST(request: NextRequest) {
         );
       }
 
-      // 2. 获取上游模型价格
       const baseModelResult = await client.query(
         `SELECT input_price, output_price, per_msg_price FROM model_prices WHERE id = $1`,
         [baseModelId]
@@ -64,7 +66,6 @@ export async function POST(request: NextRequest) {
 
       const baseModel = baseModelResult.rows[0];
 
-      // 3. 更新派生模型价格
       const updateResult = await client.query(
         `UPDATE model_prices 
          SET 

app/api/v1/models/sync-price/route.ts

@@ -1,6 +1,12 @@
 import { NextResponse } from "next/server";
+import { verifyApiToken } from "@/lib/auth";
 
 export async function POST(req: Request) {
+  const authError = verifyApiToken(req);
+  if (authError) {
+    return authError;
+  }
+
   try {
     const { modelId } = await req.json();