Update server.js

server.js

@@ -14,8 +14,9 @@ const port = 7860;
 const baseUrl = getExternalUrl(process.env.SPACE_ID);
 
 let requestDetails = [];
-let apiKeyDetails = {};
+let apiKeyDetails = {}; // Track API key usage and first use timestamp
 
+// Allowed models array
 const allowedModels = [
     'gpt-3.5-turbo-0125',
     'gpt-3.5-turbo',
@@ -51,7 +52,7 @@ function authenticateApiKey(req, res, next) {
 
     const validApiKeys = (process.env.SECRET_API_KEYS || '').split(',');
     const apiKeyMatch = validApiKeys.find(key => `Bearer ${key.trim()}` === receivedApiKey);
-    
+
     if (!apiKeyMatch) {
         return res.status(401).send('Unauthorized: API key is invalid');
     }
@@ -70,46 +71,38 @@ function authenticateApiKey(req, res, next) {
     }
 
     apiKeyDetails[apiKeyMatch].count++;
+
     const logMessage = `API Key ${displayKey}... used ${apiKeyDetails[apiKeyMatch].count} times so far.`;
     logAndEmit(logMessage, true);
-    
+
     req.apiKey = apiKeyMatch;
     next();
 }
 
-app.use('/api/models/:model', authenticateApiKey, (req, res, next) => {
-    const modelRequested = req.params.model;
-    if (!allowedModels.includes(modelRequested)) {
-        return res.status(403).send('The requested model is not permitted.');
+function validateModel(req, res, next) {
+    const pathComponents = req.path.split('/');
+    const modelUsed = pathComponents.filter(component => allowedModels.includes(component))[0];
+
+    if (!modelUsed) {
+        return res.status(403).send("Access to this model is not allowed.");
     }
+
     next();
-}, proxy(targetUrl, {
+}
+
+app.use('/api', authenticateApiKey, validateModel, proxy(targetUrl, {
+    proxyReqPathResolver: function(req) {
+        return require('url').parse(req.url).path;
+    },
     proxyReqOptDecorator: function(proxyReqOpts, srcReq) {
         proxyReqOpts.headers['Authorization'] = 'Bearer ' + openaiKey;
         return proxyReqOpts;
     }
 }));
 
-app.get("/", (req, res) => {
-    let requestsInfo = requestDetails.map(detail =>
-        `Request ${detail.requestNumber} on ${detail.timestamp} from API Key ${detail.apiKey}... with text "${detail.text}"`).join('<br>');
-    res.send(`This is your OpenAI Reverse Proxy URL: ${baseUrl}.<br><br>Requests Overview:<br>${requestsInfo}`);
-});
-
-app.get('/logs', (req, res) => {
-    res.sendFile(__dirname + '/index.html');
-});
-
-function getExternalUrl(spaceId) {
-  try {
-    const [username, spacename] = spaceId.split("/");
-    return `https://${username}-${spacename.replace(/_/g, "-")}.hf.space/api/v1`;
-  } catch (e) {
-    return "Error generating external URL";
-  }
-}
+// Additional server endpoints remain unchanged
 
 server.listen(port, () => {
     const message = `Reverse proxy server and WebSocket running on port ${port}`;
-    logAndEmit(message, true);
+    logAndEmit(message, true); // true to include total requests in the log
 });