Update server.js

server.js

@@ -1,3 +1,4 @@
+avatar
 const express = require('express');
 const proxy = require('express-http-proxy');
 const app = express();
@@ -7,72 +8,55 @@ const openaiKey = process.env.OPENAI_KEY;
 const port = 7860;
 const baseUrl = getExternalUrl(process.env.SPACE_ID);
 
-let requestDetails = [];
-let ipRequestCounts = {};
+let requestDetails = []; // Store details of each request
+let ipRequestCounts = {}; // Dictionary to keep track of requests per IP
 
-// Declare the proxy as middleware which can be reused
-const openAiProxy = proxy(targetUrl, {
-    proxyReqOptDecorator: (proxyReqOpts, srcReq) => {
-        proxyReqOpts.headers['Authorization'] = 'Bearer ' + openaiKey;
-        return proxyReqOpts;
-    },
-    userResDecorator: (proxyRes, proxyResData, userReq, userRes) => {
-        const data = proxyResData.toString('utf8');
-        if (proxyRes.statusCode === 429) {
-            // Handling at userResDecorator might be skipped based on your situation, thus handling it later
-            return data;
-        }
-        return data;  // Pass through all other non-429 responses
-    }
-});
-
-// Apply rate limiting and API proxying
 app.use('/api', (req, res, next) => {
-    const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
-    const currentCount = ipRequestCounts[ip] || 0;
-
-    if (currentCount >= 1) {
-        res.status(429).send('You have reached your request limit of 1 message. Please contact support for more details.');
-        return;
-    }
-
-    ipRequestCounts[ip] = currentCount + 1;
-    const timestamp = new Date().toISOString();
-    const requestData = {
-        requestNumber: ipRequestCounts[ip],
-        ip: ip,
-        timestamp: timestamp,
-        text: req.method + ' ' + req.url
-    };
-    requestDetails.push(requestData);
-    console.log(`Request ${requestData.requestNumber} from IP ${requestData.ip} on ${requestData.timestamp}`);
-
-    next();
-}, openAiProxy);
-
-// Modify proxy responses after the proxy has finished
-app.use('/api', function(req, res, next) {
-    res.on('finish', function() {
-        if (res.statusCode === 429 && !res.headersSent) {
-            res.status(429).json({
-                message: 'Custom message for 429 status.'
-            });
-        }
-    });
-    next();
-});
+  const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+  const currentCount = ipRequestCounts[ip] || 0;
+
+  if (currentCount >= 10) {
+    // Send a more generic message without mentioning IP-based limitation
+    return res.status(429).send('You reached 10 message limit. Contact me on reddit for more.');
+  }
+
+  // Increment request counter for the IP
+  ipRequestCounts[ip] = currentCount + 1;
+
+  // Log request with timestamp
+  const timestamp = new Date().toISOString();
+  const requestData = {
+    requestNumber: ipRequestCounts[ip],
+    ip: ip,
+    timestamp: timestamp,
+    text: req.method + ' ' + req.url
+  };
+  requestDetails.push(requestData);
+  console.log(`Request ${requestData.requestNumber} on ${requestData.timestamp} from IP ${requestData.ip} with method "${req.method}" and text "${requestData.text}"`);
+
+  next();
+}, proxy(targetUrl, {
+  proxyReqOptDecorator: (proxyReqOpts, srcReq) => {
+    proxyReqOpts.headers['Authorization'] = 'Bearer ' + openaiKey;
+    return proxyReqOpts;
+  },
+}));
 
 app.get("/", (req, res) => {
-    let requestsInfo = requestDetails.map(detail =>
-        `Request ${detail.requestNumber} from IP ${detail.ip} on ${detail.timestamp}`).join('<br>');
-    res.send(`This is your OpenAI Reverse Proxy URL: ${baseUrl}.<br><br>${requestsInfo}`);
+  let requestsInfo = requestDetails.map(detail =>
+    `Request ${detail.requestNumber} on ${detail.timestamp} from IP ${detail.ip} with text "${detail.text}"`).join('<br>');
+  res.send(`This is your OpenAI Reverse Proxy URL: ${baseUrl}.<br><br>${requestsInfo}`);
 });
 
 function getExternalUrl(spaceId) {
+  try {
     const [username, spacename] = spaceId.split("/");
     return `https://${username}-${spacename.replace(/_/g, "-")}.hf.space/api/v1`;
+  } catch (e) {
+    return "";
+  }
 }
 
 app.listen(port, () => {
-    console.log(`Reverse proxy server running on ${baseUrl}.`);
+  console.log(`Reverse proxy server running on ${baseUrl}.`);
 });