Merge pull request #19 from wtlyu/master

support config host name and proxy address.

api/.env.example

@@ -1,7 +1,13 @@
 OPENAI_KEY=
+HOST=
 PORT=3080
 NODE_ENV=development
+
 # Change this to your MongoDB URI if different and I recommend appending chatgpt-clone
 MONGO_URI="mongodb://127.0.0.1:27017/chatgpt-clone"
+
+# Change this to proxy any request.
+PROXY=
+
 CHATGPT_TOKEN=""
 BING_TOKEN=""

api/app/chatgpt-browser.js

@@ -7,6 +7,7 @@ const clientOptions = {
   // Access token from https://chat.openai.com/api/auth/session
   accessToken: process.env.CHATGPT_TOKEN,
   // debug: true
+  proxy: process.env.PROXY || null,
 };
 
 const browserClient = async ({ text, progressCallback, convo }) => {

api/app/chatgpt-client.js

@@ -5,6 +5,7 @@ const clientOptions = {
   modelOptions: {
     model: 'gpt-3.5-turbo'
   },
+  proxy: process.env.PROXY || null,
   debug: false
 };
 

api/app/chatgpt-custom.js

@@ -5,6 +5,7 @@ const clientOptions = {
   modelOptions: {
     model: 'gpt-3.5-turbo'
   },
+  proxy: process.env.PROXY || null,
   debug: false
 };
 

api/server/index.js

@@ -5,6 +5,7 @@ const cors = require('cors');
 const routes = require('./routes');
 const app = express();
 const port = process.env.PORT || 3080;
+const host = process.env.HOST || 'localhost'
 const projectPath = path.join(__dirname, '..', '..', 'client');
 dbConnect().then(() => console.log('Connected to MongoDB'));
 
@@ -23,6 +24,6 @@ app.use('/api/convos', routes.convos);
 app.use('/api/customGpts', routes.customGpts);
 app.use('/api/prompts', routes.prompts);
 
-app.listen(port, () => {
-  console.log(`Server listening at http://localhost:${port}`);
-});
+app.listen(port, host,  () => {
+  console.log(`Server listening at http://${host}:${port}`);
+});

client/src/components/Conversations/Conversation.jsx

@@ -23,8 +23,8 @@ export default function Conversation({
   const { modelMap } = useSelector((state) => state.models);
   const inputRef = useRef(null);
   const dispatch = useDispatch();
-  const { trigger } = manualSWR(`http://localhost:3080/api/messages/${id}`, 'get');
-  const rename = manualSWR(`http://localhost:3080/api/convos/update`, 'post');
+  const { trigger } = manualSWR(`/api/messages/${id}`, 'get');
+  const rename = manualSWR(`/api/convos/update`, 'post');
 
   const clickHandler = async () => {
     if (conversationId === id) {

client/src/components/Conversations/DeleteButton.jsx

@@ -9,7 +9,7 @@ import { setMessages } from '~/store/messageSlice';
 export default function DeleteButton({ conversationId, renaming, cancelHandler }) {
   const dispatch = useDispatch();
   const { trigger } = manualSWR(
-    `http://localhost:3080/api/convos/clear`,
+    `/api/convos/clear`,
     'post',
     () => {
       dispatch(setMessages([]));

client/src/components/Models/ModelDialog.jsx

@@ -25,7 +25,7 @@ export default function ModelDialog({ mutate, setModelSave, handleSaveState }) {
   const [saveText, setSaveText] = useState('Save');
   const [required, setRequired] = useState(false);
   const inputRef = useRef(null);
-  const updateCustomGpt = manualSWR(`http://localhost:3080/api/customGpts/`, 'post');
+  const updateCustomGpt = manualSWR(`/api/customGpts/`, 'post');
 
   const submitHandler = (e) => {
     if (chatGptLabel.length === 0) {

client/src/components/Models/ModelItem.jsx

@@ -15,8 +15,8 @@ export default function ModelItem({ modelName, value, onSelect }) {
   const [currentName, setCurrentName] = useState(modelName);
   const [modelInput, setModelInput] = useState(modelName);
   const inputRef = useRef(null);
-  const rename = manualSWR(`http://localhost:3080/api/customGpts`, 'post');
-  const deleteCustom = manualSWR(`http://localhost:3080/api/customGpts/delete`, 'post');
+  const rename = manualSWR(`/api/customGpts`, 'post');
+  const deleteCustom = manualSWR(`/api/customGpts/delete`, 'post');
 
   if (value === 'chatgptCustom') {
     return (

client/src/components/Models/ModelMenu.jsx

@@ -27,7 +27,7 @@ export default function ModelMenu() {
   const [menuOpen, setMenuOpen] = useState(false);
   const { model, customModel } = useSelector((state) => state.submit);
   const { models, modelMap, initial } = useSelector((state) => state.models);
-  const { trigger } = manualSWR(`http://localhost:3080/api/customGpts`, 'get', (res) => {
+  const { trigger } = manualSWR(`/api/customGpts`, 'get', (res) => {
     const fetchedModels = res.map((modelItem) => ({
       ...modelItem,
       name: modelItem.chatGptLabel

client/src/components/Nav/ClearConvos.jsx

@@ -10,10 +10,10 @@ export default function ClearConvos() {
   const dispatch = useDispatch();
   const { mutate } = useSWRConfig();
 
-  const { trigger } = manualSWR(`http://localhost:3080/api/convos/clear`, 'post', () => {
+  const { trigger } = manualSWR(`/api/convos/clear`, 'post', () => {
     dispatch(setMessages([]));
     dispatch(setNewConvo());
-    mutate(`http://localhost:3080/api/convos`);
+    mutate(`/api/convos`);
   });
 
   const clickHandler = () => {

client/src/components/Nav/index.jsx

@@ -17,7 +17,7 @@ export default function Nav() {
   };
 
   const { data, isLoading, mutate } = swr(
-    `http://localhost:3080/api/convos?pageNumber=${pageNumber}`,
+    `/api/convos?pageNumber=${pageNumber}`,
     onSuccess
   );
   const containerRef = useRef(null);

client/src/utils/handleSubmit.js

@@ -11,7 +11,7 @@ export default function handleSubmit({
   chatGptLabel,
   promptPrefix
 }) {
-  const endpoint = `http://localhost:3080/api/ask`;
+  const endpoint = `/api/ask`;
   let payload = { model, text, chatGptLabel, promptPrefix };
   if (convo.conversationId && convo.parentMessageId) {
     payload = {