From 995badacb52c53dbb6a73c719a4231fb9acaa5a0 Mon Sep 17 00:00:00 2001
From: Kwaroran <amasio1234@proton.me>
Date: Sat, 24 May 2025 20:15:33 +0900
Subject: [PATCH] Fix escape and add escape option

---
 src/lang/en.ts                     |  1 +
 src/lang/ko.ts                     |  1 +
 src/lib/SideBars/CharConfig.svelte |  4 +++
 src/ts/parser.svelte.ts            | 39 ++++++++++++------------------
 src/ts/process/index.svelte.ts     |  3 ++-
 src/ts/process/request.ts          | 17 ++++++++++---
 src/ts/storage/database.svelte.ts  |  1 +
 7 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index 19ebe0f8..af7c9475 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -1128,5 +1128,6 @@ export const languageEnglish = {
     promptInfoEmptyMessage: "No prompt information is available for this message.",
     promptInfoEmptyToggle: "No custom toggles are currently active.",
     promptInfoEmptyText: "No prompt text has been saved.",
+    escapeOutput: "Escape Output",
     
 }
diff --git a/src/lang/ko.ts b/src/lang/ko.ts
index aa96a8a5..d41d1207 100644
--- a/src/lang/ko.ts
+++ b/src/lang/ko.ts
@@ -995,4 +995,5 @@ export const languageKorean = {
     "promptInfoEmptyMessage": "이 메시지에 대한 프롬프트 정보가 없습니다.",
     "promptInfoEmptyToggle": "활성화된 커스텀 토글이 없습니다.",
     "promptInfoEmptyText": "저장된 프롬프트 텍스트가 없습니다.",
+    "escapeOutput": "출력 이스케이프",
 }
diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index 3fa58c3f..a91f7015 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -1089,6 +1089,10 @@
             <span> <Help key="utilityBot" name={language.utilityBot}/></span>
         </div>
 
+        <div class="flex items-center mt-4">
+            <Check bind:check={DBState.db.characters[$selectedCharID].escapeOutput} name={language.escapeOutput}/>
+        </div>
+
         {#if DBState.db.supaModelType !== 'none' && DBState.db.hypav2}
             <Button
                 onclick={() => {
diff --git a/src/ts/parser.svelte.ts b/src/ts/parser.svelte.ts
index 5915c503..3a79c286 100644
--- a/src/ts/parser.svelte.ts
+++ b/src/ts/parser.svelte.ts
@@ -104,19 +104,31 @@ const replacements = [
     ';', //0xE9BF
 ]
 
-export function unescape(text:string){
+export function risuUnescape(text:string){
     return text.replace(/[\uE9b8-\uE9bf]/g, (f) => {
         const index = f.charCodeAt(0) - 0xE9B8
         return replacements[index]
     })
 }
 
+export function risuEscape(text:string){
+    return text.replace(/[{}()]/g, (f) => {
+        switch(f){
+            case '{': return '\uE9B8'
+            case '}': return '\uE9B9'
+            case '(': return '\uE9BA'
+            case ')': return '\uE9BB'
+            default: return f
+        }
+    })
+}
+
 function renderMarkdown(md:markdownit, data:string){
     let quotes = ['“', '”', '‘', '’']
     if(DBState.db?.customQuotes){
         quotes = DBState.db.customQuotesData ?? quotes
     }
-    let text = unescape(md.render(data.replace(/“|”/g, '"').replace(/‘|’/g, "'")))
+    let text = risuUnescape(md.render(data.replace(/“|”/g, '"').replace(/‘|’/g, "'")))
 
     if(DBState.db?.unformatQuotes){
         text = text.replace(/\uE9b0/gu, quotes[0]).replace(/\uE9b1/gu, quotes[1])
@@ -2210,28 +2222,7 @@ function blockEndMatcher(p1:string,type:{type:blockMatch,type2?:string},matcherA
             })
         }
         case 'escape':{
-            return p1Trimed.replace(/[\{\}\<\>\(\)\:\;]/g,(m) => {
-                switch(m){
-                    case '{':
-                        return '\uE9B8'
-                    case '}':
-                        return '\uE9B9'
-                    case '<':
-                        return '\uE9BC'
-                    case '>':
-                        return '\uE9BD'
-                    case '(':
-                        return '\uE9BA'
-                    case ')':
-                        return '\uE9BB'
-                    case ':':
-                        return '\uE9BE'
-                    case ';':
-                        return '\uE9BF'
-                    default:
-                        return m
-                }
-            })
+            return risuEscape(p1Trimed)
         }
         default:{
             return ''
diff --git a/src/ts/process/index.svelte.ts b/src/ts/process/index.svelte.ts
index 5b10df9e..acce0169 100644
--- a/src/ts/process/index.svelte.ts
+++ b/src/ts/process/index.svelte.ts
@@ -1374,7 +1374,8 @@ export async function sendChat(chatProcessIndex = -1,arg:{
         continue: arg.continue,
         chatId: generationId,
         imageResponse: DBState.db.outputImageModal,
-        previewBody: arg.previewPrompt
+        previewBody: arg.previewPrompt,
+        escape: nowChatroom.type === 'character' && nowChatroom.escapeOutput
     }, 'model', abortSignal)
 
     console.log(req)
diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index b390b80b..3702b159 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -7,7 +7,7 @@ import { addFetchLog, fetchNative, globalFetch, isNodeServer, isTauri, textifyRe
 import { sleep } from "../util";
 import { NovelAIBadWordIds, stringlizeNAIChat } from "./models/nai";
 import { strongBan, tokenize, tokenizeNum } from "../tokenizer";
-import { risuChatParser } from "../parser.svelte";
+import { risuChatParser, risuEscape } from "../parser.svelte";
 import { SignatureV4 } from "@smithy/signature-v4";
 import { HttpRequest } from "@smithy/protocol-http";
 import { Sha256 } from "@aws-crypto/sha256-js";
@@ -23,8 +23,7 @@ import { getModelInfo, LLMFlags, LLMFormat, type LLMModel } from "../model/model
 import { runTrigger } from "./triggers";
 import { registerClaudeObserver } from "../observer.svelte";
 import { v4 } from "uuid";
-import { DBState } from "../stores.svelte";
-import { unescape } from "lodash";
+import { risuUnescape } from "../parser.svelte";
 
 
 
@@ -48,6 +47,7 @@ interface requestDataArgument{
     imageResponse?:boolean
     previewBody?:boolean
     staticModel?: string
+    escape?:boolean
 }
 
 interface RequestDataArgumentExtended extends requestDataArgument{
@@ -275,8 +275,13 @@ export async function requestChatData(arg:requestDataArgument, model:ModelModeEx
     fallBackModels.push('')
     let da:requestDataResponse
 
+    if(arg.escape){
+        arg.useStreaming = false
+        console.warn('Escape is enabled, disabling streaming')
+    }
+
     const originalFormated = safeStructuredClone(arg.formated).map(m => {
-        m.content = unescape(m.content)
+        m.content = risuUnescape(m.content)
         return m
     })
 
@@ -337,6 +342,10 @@ export async function requestChatData(arg:requestDataArgument, model:ModelModeEx
                     result: 'Aborted'
                 }
             }
+
+            if(da.type === 'success' && arg.escape){
+                da.result = risuEscape(da.result)
+            }
     
             if(da.type === 'success' && pluginV2.replacerafterRequest.size > 0){
                 for(const replacer of pluginV2.replacerafterRequest){
diff --git a/src/ts/storage/database.svelte.ts b/src/ts/storage/database.svelte.ts
index 6557e05e..5ebcea3b 100644
--- a/src/ts/storage/database.svelte.ts
+++ b/src/ts/storage/database.svelte.ts
@@ -1210,6 +1210,7 @@ export interface character{
     lastInteraction?:number
     translatorNote?:string
     doNotChangeSeperateModels?:boolean
+    escapeOutput?:boolean
 }