Update app.js

app.js

@@ -1,5 +1,4 @@
-const http = require('http');
-const url = require('url');
+const express = require('express');
 const fetch = require('node-fetch');
 
 const MODEL = 'claude-3-5-sonnet@20240620';
@@ -46,6 +45,7 @@ async function getAccessToken() {
       });
 
       const data = await response.json();
+      
       tokenCache.accessToken = data.access_token;
       tokenCache.expiry = now + data.expires_in;
     } finally {
@@ -63,150 +63,87 @@ function getLocation() {
 }
 
 function constructApiUrl(location) {
-  const url = `https://${location}-aiplatform.googleapis.com/v1/projects/${PROJECT_ID}/locations/${location}/publishers/anthropic/models/${MODEL}:streamRawPredict`;
-  console.log('Constructed URL:', url); // 打印URL以验证其正确性
-  return url;
+  return `https://${location}-aiplatform.googleapis.com/v1/projects/${PROJECT_ID}/locations/${location}/publishers/anthropic/models/${MODEL}:streamRawPredict`;
 }
 
-async function handleRequest(request) {
-  try {
-    if (request.method === 'OPTIONS') {
-      return handleOptions();
-    }
-
-    const apiKey = request.headers['x-api-key'];
-    if (apiKey !== API_KEY) {
-      return handleErrorResponse(403, {
-        type: "error",
-        error: {
-          type: "permission_error",
-          message: "Your API key does not have permission to use the specified resource."
-        }
-      });
-    }
-
-    const accessToken = await getAccessToken();
-    const location = getLocation();
-    const apiUrl = constructApiUrl(location);
+async function handleRequest(req, res) {
+  if (req.method === 'OPTIONS') {
+    return handleOptions(res);
+  }
 
-    let requestBody = JSON.parse(request.body);
-    
-    if (requestBody.anthropic_version) {
-      delete requestBody.anthropic_version;
-    }
-    
-    if (requestBody.model) {
-      delete requestBody.model;
-    }
-    
-    requestBody.anthropic_version = "vertex-2023-10-16";
-
-    const modifiedHeaders = {
-      ...request.headers,
-      'Authorization': `Bearer ${accessToken}`,
-      'Content-Type': 'application/json; charset=utf-8'
-    };
-    delete modifiedHeaders['anthropic-version'];
-
-    const modifiedRequest = {
-      headers: modifiedHeaders,
-      method: request.method,
-      body: JSON.stringify(requestBody),
-      redirect: 'manual'
-    };
-
-    const response = await fetch(apiUrl, modifiedRequest);
-    if (response.status === 301 || response.status === 302) {
-      const location = response.headers.get('location');
-      console.log('Redirected to:', location);
-      const redirectedResponse = await fetch(location, modifiedRequest);
-      return handleResponse(redirectedResponse);
-    }
-    return handleResponse(response);
-  } catch (error) {
-    console.error('Error handling request:', error);
-    return handleErrorResponse(500, {
+  const apiKey = req.headers['x-api-key'];
+  if (apiKey !== API_KEY) {
+    res.status(403).json({
       type: "error",
       error: {
-        type: "internal_error",
-        message: "Internal server error."
+        type: "permission_error",
+        message: "Your API key does not have permission to use the specified resource."
       }
     });
+    return;
   }
-}
 
-function handleResponse(response) {
-  return {
-    status: response.status,
-    headers: {
-      ...response.headers,
-      'Access-Control-Allow-Origin': '*',
-      'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
-      'Access-Control-Allow-Headers': 'Content-Type, Authorization, x-api-key, anthropic-version, model'
-    },
-    body: response.body
-  };
-}
-
-function handleErrorResponse(status, body) {
-  return {
-    status: status,
-    headers: {
-      'Content-Type': 'application/json',
-      'Access-Control-Allow-Origin': '*',
-      'Access-Control-Allow-Methods': 'POST, GET, OPTIONS, DELETE, HEAD',
-      'Access-Control-Allow-Headers': 'Content-Type, Authorization, x-api-key, anthropic-version, model'
-    },
-    body: JSON.stringify(body)
-  };
-}
+  const accessToken = await getAccessToken();
+  const location = getLocation();
+  const apiUrl = constructApiUrl(location);
 
-function handleOptions() {
-  const headers = {
-    'Access-Control-Allow-Origin': '*',
-    'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
-    'Access-Control-Allow-Headers': 'Content-Type, Authorization, x-api-key, anthropic-version, model'
-  };
-
-  return {
-    status: 204,
-    headers: headers
-  };
-}
-
-const server = http.createServer(async (req, res) => {
-  const parsedUrl = url.parse(req.url, true);
-  if (parsedUrl.pathname === '/ai/v1/messages') {
-    const request = {
-      method: req.method,
-      headers: req.headers,
-      body: await getRequestBody(req)
-    };
-
-    const response = await handleRequest(request);
-    res.writeHead(response.status, response.headers);
-    res.end(response.body);
-  } else {
-    res.writeHead(404, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ error: 'Not Found' }));
+  let requestBody = req.body;
+  
+  if (requestBody.anthropic_version) {
+    delete requestBody.anthropic_version;
   }
-});
+  
+  if (requestBody.model) {
+    delete requestBody.model;
+  }
+  
+  requestBody.anthropic_version = "vertex-2023-10-16";
 
-function getRequestBody(req) {
-  return new Promise((resolve, reject) => {
-    let body = '';
-    req.on('data', chunk => {
-      body += chunk.toString();
+  try {
+    const response = await fetch(apiUrl, {
+      method: 'POST',
+      headers: {
+        'Authorization': `Bearer ${accessToken}`,
+        'Content-Type': 'application/json; charset=utf-8'
+      },
+      body: JSON.stringify(requestBody)
     });
-    req.on('end', () => {
-      resolve(body);
+
+    res.status(response.status);
+    response.headers.forEach((value, name) => {
+      res.setHeader(name, value);
     });
-    req.on('error', err => {
-      reject(err);
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.setHeader('Access-Control-Allow-Methods', 'POST, GET, OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, x-api-key, anthropic-version, model');
+
+    response.body.pipe(res);
+  } catch (error) {
+    console.error('Error:', error);
+    res.status(500).json({
+      type: "error",
+      error: {
+        type: "internal_server_error",
+        message: "An unexpected error occurred while processing your request."
+      }
     });
-  });
+  }
 }
 
-server.listen(8080, () => {
-  console.log('Server is running on port 8080');
+function handleOptions(res) {
+  res.status(204);
+  res.setHeader('Access-Control-Allow-Origin', '*');
+  res.setHeader('Access-Control-Allow-Methods', 'POST, GET, OPTIONS');
+  res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, x-api-key, anthropic-version, model');
+  res.end();
+}
+
+const app = express();
+app.use(express.json());
+
+app.all('/ai/v1/messages', handleRequest);
+
+const PORT = 8080;
+app.listen(PORT, () => {
+  console.log(`Server is running on port ${PORT}`);
 });