Merge branch 'main' of https://github.com/kwaroran/RisuAI

src/ts/process/scripts.ts

@@ -197,7 +197,7 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
                 }
             }
             else{
-                data = risuChatParser(data.replace(reg, outScript))
+                data = risuChatParser(data.replace(reg, outScript), { chatID: chatID })
             }
         }
     }

src/ts/process/stableDiff.ts

@@ -413,6 +413,80 @@ export async function generateAIImage(genPrompt:string, currentChar:character, n
         return returnSdData
 
 
+    }
+    if(db.sdProvider === 'comfy'){
+        const {workflow, posNodeID, posInputName, negNodeID, negInputName} = db.comfyConfig
+        const baseUrl = new URL(db.comfyUiUrl)
+
+        const createUrl = (pathname: string, params: Record<string, string> = {}) => {
+            const url = new URL(pathname, baseUrl)
+            url.search = new URLSearchParams(params).toString()
+            return url.toString()
+        }
+
+        const fetchWrapper = async (url: string, options = {}) => {
+            console.log(url)
+            const response = await globalFetch(url, options)
+            if (!response.ok) {
+                console.log(JSON.stringify(response.data))
+                throw new Error(JSON.stringify(response.data))
+            }
+            return response.data
+        }
+
+        try {
+            const prompt = JSON.parse(workflow)
+            prompt[posNodeID].inputs[posInputName] = genPrompt
+            prompt[negNodeID].inputs[negInputName] = neg
+
+            const { prompt_id: id } = await fetchWrapper(createUrl('/prompt'), {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: { 'prompt': prompt }
+            })
+            console.log(`prompt id: ${id}`)
+
+            let item
+
+            const startTime = Date.now()
+            const timeout = db.comfyConfig.timeout * 1000
+            while (!(item = (await (await fetch(createUrl('/history'), {
+                headers: { 'Content-Type': 'application/json' },
+                method: 'GET'})).json())[id])) {
+                console.log("Checking /history...")
+                if (Date.now() - startTime >= timeout) {
+                    alertError("Error: Image generation took longer than expected.");
+                    return false
+                }
+                await new Promise(r => setTimeout(r, 1000))
+            } // Check history until the generation is complete.
+            const genImgInfo = Object.values(item.outputs).flatMap((output: any) => output.images)[0];
+
+            const imgResponse = await fetch(createUrl('/view', {
+                filename: genImgInfo.filename,
+                subfolder: genImgInfo.subfolder,
+                type: genImgInfo.type
+            }), {
+                headers: { 'Content-Type': 'application/json' }, 
+                method: 'GET'})
+            const img64 = Buffer.from(await imgResponse.arrayBuffer()).toString('base64')
+
+            if(returnSdData === 'inlay'){
+                return `data:image/png;base64,${img64}`
+            }
+            else {
+                let charemotions = get(CharEmotion)
+                const img = `data:image/png;base64,${img64}`
+                const emos:[string, string,number][] = [[img, img, Date.now()]]
+                charemotions[currentChar.chaId] = emos
+                CharEmotion.set(charemotions)
+            }
+
+            return returnSdData
+        } catch (error) {
+            alertError(error)
+            return false
+        }
     }
     return ''
-}
+}

src/ts/process/triggers.ts

@@ -403,6 +403,7 @@ export async function runTrigger(char:character,mode:triggerMode, arg:{
                         case 'input':{
                             const val = await alertInput(effectValue)
                             setVar(inputVar, val)
+                            break;
                         }
                         case 'select':{
                             const val = await alertSelect(effectValue.split('§'))