fix: add log and fix 400 error in GET /image (GPTGenius#53)

package.json

@@ -45,7 +45,7 @@
     "markdown-it": "^13.0.1",
     "markdown-it-highlightjs": "^4.0.1",
     "markdown-it-kbd": "^2.2.2",
-    "midjourney-fetch": "0.1.2",
+    "midjourney-fetch": "0.1.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "replicate-fetch": "^0.1.1",

src/modules/Content/index.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { FC, useContext, useEffect, useState } from 'react';
 import MessageBox from '@components/MessageBox';
 import { Message, ReactSetState } from '@interfaces';
@@ -240,16 +241,19 @@ const Content: FC<ContentProps> = ({ setActiveSetting }) => {
               await new Promise((resp) =>
                 setTimeout(resp, midjourneyConfigs.interval)
               );
-              const message: MessageItem = await (
+              const message: MessageItem & { msg?: string } = await (
                 await fetch(
                   `/api/images?model=Midjourney&prompt=${content}&serverId=${configs.discordServerId}&channelId=${configs.discordChannelId}&token=${configs.discordToken}`
                 )
               ).json();
-              if (message && !isInProgress(message)) {
+              console.log(count, JSON.stringify(message));
+              // msg means error message
+              if (message && !message.msg && !isInProgress(message)) {
                 [image] = message.attachments;
                 break;
               }
-            } catch {
+            } catch (e) {
+              console.log(count, e.message || e.stack || e);
               continue;
             }
           }

src/pages/api/images.ts

@@ -3,8 +3,6 @@ import type { APIRoute } from 'astro';
 import { loadBalancer } from '@utils/server';
 import { createOpenjourney } from 'replicate-fetch';
 import { SupportedImageModels } from '@configs';
-import { withPriceModel } from '@utils/priceModel';
-
 import { Midjourney, findMessageByPrompt } from 'midjourney-fetch';
 import {
   apiKeyStrategy,
@@ -19,14 +17,14 @@ import {
 
 export { config };
 
-export const get: APIRoute = withPriceModel(async ({ request }) => {
+export const get: APIRoute = async ({ request }) => {
   const { url } = request;
   const params = new URL(url).searchParams;
 
   const model = params.get('model') as SupportedImageModels;
   const serverId = params.get('serverId') ?? dicordServerId;
   const channelId = params.get('channelId') ?? discordChannelId;
-  const token = params.get('token') ?? discordToken;
+  const token = params.get('discordToken') ?? discordToken;
   const prompt = params.get('prompt');
 
   if (model === 'Midjourney') {
@@ -68,9 +66,9 @@ export const get: APIRoute = withPriceModel(async ({ request }) => {
   }
 
   return new Response(JSON.stringify({ data: {} }), { status: 200 });
-});
+};
 
-export const post: APIRoute = withPriceModel(async ({ request }) => {
+export const post: APIRoute = async ({ request }) => {
   const body = await request.json();
   const {
     prompt,
@@ -204,4 +202,6 @@ export const post: APIRoute = withPriceModel(async ({ request }) => {
       status: 500,
     });
   }
-});
+};
+
+export const post = withPriceModel(originalPost);