4.7

CHANGELOG.md

@@ -12,6 +12,10 @@
 </a>
 </div>
 
+# 4.7
+
+added multiple model options in case you subscribe to their plans. some based on their docs, some on rumors. stick to 2.1 if you're a free user
+
 # 4.6
 
 fixed major bug in the prompt build logic which was causing problems like the AI refering to old messages erroneously, ignoring your latest message, etc

clewd.js

@@ -7,19 +7,23 @@
 const {createServer: Server, IncomingMessage, ServerResponse} = require('node:http'), {createHash: Hash, randomUUID, randomInt, randomBytes} = require('node:crypto'), {TransformStream, ReadableStream} = require('node:stream/web'), {Readable, Writable} = require('node:stream'), {Blob} = require('node:buffer'), {existsSync: exists, writeFileSync: write, createWriteStream} = require('node:fs'), {join: joinP} = require('node:path'), {ClewdSuperfetch: Superfetch, SuperfetchAvailable} = require('./lib/clewd-superfetch'), {AI, fileName, genericFixes, bytesToSize, setTitle, checkResErr, Replacements, Main} = require('./lib/clewd-utils'), ClewdStream = require('./lib/clewd-stream');
 
 /******************************************************* */
-let currentIndex, Firstlogin = true, changeflag = 0, changetime = 0, totaltime, uuidOrgArray = [], model, tokens, apiKey;
+let currentIndex, Firstlogin = true, changeflag = 0, changing, changetime = 0, totaltime, invalidtime = 0, uuidOrgArray = [], model, reqModel, tokens, apiKey, timestamp = Date.now();
 
 const events = require('events'), CookieChanger = new events.EventEmitter();
 require('events').EventEmitter.defaultMaxListeners = 0;
 
 CookieChanger.on('ChangeCookie', () => {
-    changeflag = 0;
-    Proxy && Proxy.close();
-    console.log(`Changing Cookie...\n`);
-    Proxy.listen(Config.Port, Config.Ip, onListen);
-    Proxy.on('error', (err => {
-        console.error('Proxy error\n%o', err);
-    }));
+    setTimeout(() => {
+        changeflag = 0, changing = true;
+        Proxy && Proxy.close();
+        console.log(`Changing Cookie...\n`);
+        Proxy.listen(Config.Port, Config.Ip, onListen);
+        Proxy.on('error', (err => {
+            console.error('Proxy error\n%o', err);
+        }));
+        timestamp = Date.now();
+        invalidtime += 1;
+    }, !Config.rProxy || Config.rProxy === AI.end() ? 15000 + timestamp - Date.now() : 0);
 });
 
 const convertToType = value => {
@@ -32,32 +36,47 @@ const convertToType = value => {
     Config.Cookie = '';
     writeSettings(Config);
     currentIndex = (currentIndex - 1 + Config.CookieArray.length) % Config.CookieArray.length;
+}, ProModelConvert = model => {
+    if (/^claude-2\.0$/.test(model)) return AI.mdl()[7];
+    if (/1\.3/.test(model)) return AI.mdl()[5];
+    if (/^claude-v1\.\d$/.test(model)) return AI.mdl()[1];
+    if (/100k/.test(model)) return AI.mdl()[2];
+    if (/v1\.\d/.test(model)) return AI.mdl()[3];
+    return model;
 }, padtxt = content => {
     const {countTokens} = require('@anthropic-ai/tokenizer');
     const placeholder = Config.padtxt_placeholder || randomBytes(randomInt(5, 15)).toString('hex');
     tokens = countTokens(content);
-    const padding = placeholder.repeat(Math.floor(Math.max(1000, Config.Settings.padtxt - tokens) / countTokens(placeholder.trim())));
-    content = content.includes('<|padtxt|>') ? content.replace(/<\|padtxt\|>/, padding) : !apiKey ? padding + '\n\n\n' + content.trim() : content;
+    const padding = placeholder.repeat(Math.floor((/(?<=<\|padtxt.*?)\d+(?=.*?\|>)/.test(content) ? parseInt(/(?<=<\|padtxt.*?)\d+(?=.*?\|>)/.exec(content)[0]) : Math.max(1000, Config.Settings.padtxt - tokens)) / countTokens(placeholder.trim())));
+    content = /<\|padtxt.*?\|>/.test(content) ? content.replace(/<\|padtxt.*?\|>/, padding).replace(/\s*<\|padtxt.*?\|>\s*/g, '\n\n') : !apiKey ? padding + '\n\n\n' + content.trim() : content;
     return content;
-}, xmlPlot = (content, nonsys = false) => {
-    const card = content.includes('<card>') || content.includes('<|card|>');
-    //role合并
-    const MergeDisable = content.includes('<|Merge Disable|>');
-    const MergeHumanDisable = content.includes('<|Merge Human Disable|>');
-    const MergeAssistantDisable = content.includes('<|Merge Assistant Disable|>');
-    if (!MergeDisable) {
-        if (content.includes('<|Merge System Disable|>')) {
-            content = content.replace(/(\n\n|^\s*)xmlPlot:\s*/gm, '$1');
+}, xmlPlot_merge = (content, nonsys) => {
+    if (!content.includes('<|Merge Disable|>')) {
+        if (content.includes('<|System Role|>')) {
+            content = content.replace(/(?:\n\n|^\s*)(?:xmlPlot|System):(.*?(?:\n\n(Assistant|Human):|$))/gs, function(match, p1) {return '\n\nSystem:' + p1.replace(/(\n\n|^\s*)(xmlPlot|System):\s*/g, '\n\n')});
         }
-        if (!MergeHumanDisable) {
+        if (!content.includes('<|Merge Human Disable|>')) {
             nonsys ? content = content.replace(/(\n\n|^\s*)xmlPlot:/g, '\n\nHuman:') : content = content.replace(/(\n\n|^\s*)(?<!\n\n(Human|Assistant):.*?)xmlPlot:\s*/gs, '$1').replace(/(\n\n|^\s*)xmlPlot:/g, '\n\nHuman:');
             content = content.replace(/(?:\n\n|^\s*)Human:(.*?(?:\n\nAssistant:|$))/gs, function(match, p1) {return '\n\nHuman:' + p1.replace(/\n\nHuman:\s*/g, '\n\n')});
         }
-        if (!MergeAssistantDisable) {
+        if (!content.includes('<|Merge Assistant Disable|>')) {
             content = content.replace(/\n\nAssistant:(.*?(?:\n\nHuman:|$))/gs, function(match, p1) {return '\n\nAssistant:' + p1.replace(/\n\nAssistant:\s*/g, '\n\n')});
         }
     }
-    content = content.replace(/(\n\n|^\s*)xmlPlot:\s*/gm, '$1');
+    return content.replace(/(\n\n|^\s*)xmlPlot:\s*/gm, '$1');
+}, xmlPlot_regex = (content, order) => {
+    let match, regex = new RegExp(`<regex(?: +order *= *${order})${order === 2 ? '?' : ''}> *"(/?)(.*)\\1(.*?)" *: *"(.*?)" *</regex>`, 'gm');
+    while ((match = regex.exec(content)) !== null) {
+        try {
+            content = content.replace(new RegExp(match[2], match[3]), match[4].replace(/(\r\n|\r|\\n)/gm, '\n'));
+        } catch (err) {}
+    }
+    return content;
+}, xmlPlot = (content, nonsys = false) => {
+    //一次正则
+    content = xmlPlot_regex(content, 1);
+    //一次role合并
+    content = xmlPlot_merge(content, nonsys);
     //自定义插入
     content = content.replace(/(<\/?)PrevAssistant>/gm, '$1@1>').replace(/(<\/?)PrevHuman>/gm, '$1@2>');
     let splitContent = content.split(/\n\n(?=Assistant:|Human:)/g);
@@ -71,40 +90,25 @@ const convertToType = value => {
     }
     content = splitContent.join('\n\n');
     content = content.replace(/<@(\d+)>.*?<\/@\1>/gs, '');
-    //正则
-    while ((match = /<regex>"(\/?)(.*)\1(.*)" *: *"(.*?)"<\/regex>/gm.exec(content)) !== null) {
-        try {
-            content = content.replace(new RegExp(match[2], match[3]), match[4]);
-        } catch (error) {}
-        content = content.replace(match[0], '');
-    }
-    content = content.replace(/(\r\n|\r|\\n)/gm, '\n');
+    //二次正则
+    content = xmlPlot_regex(content, 2);
     //二次role合并
-    if (!MergeDisable) {
-        if (!MergeHumanDisable) {
-            content = content.replace(/(?:\n\n|^\s*)Human:(.*?(?:\n\nAssistant:|$))/gs, function(match, p1) {return '\n\nHuman:' + p1.replace(/\n\nHuman:\s*/g, '\n\n')});
-        }
-        if (!MergeAssistantDisable) {
-            content = content.replace(/\n\nAssistant:(.*?(?:\n\nHuman:|$))/gs, function(match, p1) {return '\n\nAssistant:' + p1.replace(/\n\nAssistant:\s*/g, '\n\n')});
-        }
-    }
+    content = xmlPlot_merge(content, nonsys);
     //Plain Prompt
     let segcontentHuman = content.split('\n\nHuman:');
     let segcontentlastIndex = segcontentHuman.length - 1;
     if (!apiKey && segcontentlastIndex >= 2 && segcontentHuman[segcontentlastIndex].includes('<|Plain Prompt Enable|>') && !content.includes('\n\nPlainPrompt:')) {
         content = segcontentHuman.slice(0, segcontentlastIndex).join('\n\nHuman:') + '\n\nPlainPrompt:' + segcontentHuman.slice(segcontentlastIndex).join('\n\nHuman:').replace(/\n\nHuman: *PlainPrompt:/, '\n\nPlainPrompt:');
     }
-    //<card>群组
-    if (!card) {
-        return content.replace(/(<reply>\n|\n<\/reply>)/g, '').replace(/<customname>(.*?)<\/customname>/gm, '$1');
-    } else {
-        content = content.replace(/(<reply>\n|\n<\/reply>)\1*/g, '$1').replace(/<customname>(.*?)<\/customname>:/gm, '$1:\n');
-    }
-    //<card>消除空XML tags、两端空白符和多余的\n
-    content = content.replace(/\s*<\|curtail\|>\s*/g, '\n')
+    //三次正则
+    content = xmlPlot_regex(content, 3);
+    //消除空XML tags、两端空白符和多余的\n
+    content = content.replace(/<regex>.*?<\/regex>/gm, '')
+        .replace(/(\r\n|\r|\\n)/gm, '\n')
+        .replace(/\s*<\|curtail\|>\s*/g, '\n')
         .replace(/\n<\/(card|hidden|META)>\s+?<\1>\n/g, '\n')
         .replace(/\n<(\/?card|example|hidden|plot|META)>\s+?<\1>/g, '\n<$1>')
-        .replace(/\n(?:<!--.*?-->|Here.*?:)?\n<(card|example|hidden|plot|META)>\s+?<\/\1>/g, '')
+        .replace(/(?:<!--.*?-->\n|.+?: ?\n)?<(card|example|hidden|plot|META)>\s+?<\/\1>\n*/g, '')
         .replace(/(?<=(: |\n)<(card|hidden|example|plot|META|EOT)>\n)\s*/g, '')
         .replace(/\s*(?=\n<\/(card|hidden|example|plot|META|EOT)>(\n|$))/g, '')
         .replace(/(?<=\n)\n(?=\n)/g, '');
@@ -112,7 +116,7 @@ const convertToType = value => {
     if (apiKey) {
         content = content.replace(/\n\n(Assistant|Human):(?!.*?\n\n(Assistant|Human):).*$/s, function(match, p1) {return p1 === 'Assistant' ? match : match + '\n\nAssistant: '}).replace(/\s*<\|noAssistant\|>\s*(.*?)(?:\n\nAssistant:\s*)?$/s, '\n\n$1');
         content.includes('<|reverseHA|>') && (content = content.replace(/\s*<\|reverseHA\|>\s*/g, '\n\n').replace(/Assistant|Human/g, function(match) {return match === 'Human' ? 'Assistant' : 'Human'}).replace(/\n(A|H): /g, function(match, p1) {return p1 === 'A' ? '\nH: ' : '\nA: '}));
-        return content.replace(Config.Settings.padtxt ? /\s*<\|(?!padtxt).*?\|>\s*/g : /\s*<\|.*?\|>\s*/g, '\n\n').trim().replace(/^(Human|Assistant):/, '\n\n$&').replace(/\n\n(Human|Assistant):$/, '$& ');
+        return content.replace(Config.Settings.padtxt ? /\s*<\|(?!padtxt).*?\|>\s*/g : /\s*<\|.*?\|>\s*/g, '\n\n').trim().replace(/^.+:/, '\n\n$&').replace(/\n\n.+:$/, '$& ');
     } else {
         return content.replace(Config.Settings.padtxt ? /\s*<\|(?!padtxt).*?\|>\s*/g : /\s*<\|.*?\|>\s*/g, '\n\n').trim().replace(/^Human:|\n\nAssistant:$/g, '');
     }
@@ -138,7 +142,7 @@ let uuidOrg, curPrompt = {}, prevPrompt = {}, prevMessages = [], prevImpersonate
     localtunnel: false,
     BufferSize: 1,
     SystemInterval: 3,
-    rProxy: AI.end(),
+    rProxy: '',
     api_rProxy: '',
     padtxt_placeholder: '',
     PromptExperimentFirst: '',
@@ -208,7 +212,7 @@ const updateParams = res => {
         return;
     }
     try { //
-        const res = await fetch(`${Config.rProxy}/api/organizations/${uuidOrg}/chat_conversations/${uuid}`, {
+        const res = await fetch(`${Config.rProxy || AI.end()}/api/organizations/${uuidOrg}/chat_conversations/${uuid}`, {
             headers: {
                 ...AI.hdr(),
                 Cookie: getCookies()
@@ -244,13 +248,13 @@ const updateParams = res => {
     }
     try {
 /***************************** */
-    if ('SET YOUR COOKIE HERE' === Config.Cookie || Config.Cookie?.length < 1) {
+    if ('SET YOUR COOKIE HERE' === Config.Cookie || Config.Cookie?.length < 1 || (Config.CookieArray?.length > 0 && invalidtime > totaltime)) { //if ('SET YOUR COOKIE HERE' === Config.Cookie || Config.Cookie?.length < 1) {
         return console.log(`No cookie available, apiKey-Only mode enabled.\n`); //throw Error('Set your cookie inside config.js');
     }
     updateCookies(Config.Cookie.replace(/^(sessionKey=)?/, 'sessionKey=')); //updateCookies(Config.Cookie);
     //console.log(`${Main}\nhttp://${Config.Ip}:${Config.Port}/v1\n\n${Object.keys(Config.Settings).map((setting => UnknownSettings.includes(setting) ? `??? ${setting}: ${Config.Settings[setting]}` : `${setting}: ${ChangedSettings.includes(setting) ? '' : ''}${Config.Settings[setting]}`)).sort().join('\n')}\n`);
     //Config.Settings.Superfetch && SuperfetchAvailable(true);
-    const accRes = await fetch(Config.rProxy + '/api/organizations', {
+    const accRes = await fetch((Config.rProxy || AI.end()) + '/api/organizations', {
         method: 'GET',
         headers: {
             ...AI.hdr(),
@@ -276,7 +280,7 @@ const updateParams = res => {
     setTitle('ok');
     updateParams(accRes);
 /**************************** */
-    const accountRes = await fetch(Config.rProxy + '/api/auth/current_account', {
+    const accountRes = await fetch((Config.rProxy || AI.end()) + '/api/auth/current_account', {
         method: 'GET',
         headers: {
             ...AI.hdr(),
@@ -285,33 +289,29 @@ const updateParams = res => {
     });
     await checkResErr(accountRes);
     const accountInfo = await accountRes.json();
+    model = accountInfo.account.statsig.values.dynamic_configs["6zA9wvTedwkzjLxWy9PVe7yydI00XDQ6L5Fejjq/2o8="]?.value?.model;
 /**************************** */
     console.log(Config.CookieArray?.length > 0 ? `(index: ${currentIndex || Config.CookieArray.length}) Logged in %o` : 'Logged in %o', { //console.log('Logged in %o', {
         name: accInfo.name?.split('@')?.[0],
         mail: accountInfo.account.email_address, //
+        model, //
         capabilities: accInfo.capabilities,
     });
     uuidOrg = accInfo?.uuid;
 /************************* */
-    model = accountInfo.account.statsig.values.dynamic_configs["6zA9wvTedwkzjLxWy9PVe7yydI00XDQ6L5Fejjq/2o8="]?.value?.model;
-    model != AI.mdl() && console.log(`${model}`);
-    if (model != AI.mdl() && Config.Cookiecounter === -2) {
-        CookieCleaner();
-        return CookieChanger.emit('ChangeCookie');
-    }
+    if (reqModel && reqModel != model && !Config.Settings.PassParams) return CookieChanger.emit('ChangeCookie');
     const Overlap = uuidOrgArray.includes(uuidOrg) && percentage <= 100 && Config.CookieArray?.length > 0;
     !Overlap && uuidOrgArray.push(uuidOrg);
     const Unverified = !accountInfo.account.completed_verification_at;
-    const abuseTag = accountInfo.account.statsig.values.feature_gates["4fDxNAVXgvks8yzKUoU+T+w3Qr3oYVqoJJVNYh04Mik="]?.secondary_exposures[0];
-    const Banned = abuseTag.gateValue === 'true' && abuseTag.gate === 'segment:abuse';
+    const Abused = accountInfo.account.statsig.values.feature_gates["4fDxNAVXgvks8yzKUoU+T+w3Qr3oYVqoJJVNYh04Mik="]?.secondary_exposures[0].gateValue === 'true' && accountInfo.account.statsig.values.feature_gates["4fDxNAVXgvks8yzKUoU+T+w3Qr3oYVqoJJVNYh04Mik="]?.secondary_exposures[0].gate === 'segment:abuse';
     const Remain = accountInfo.messageLimit?.remaining;
     const Exceededlimit = (accountInfo.messageLimit?.type === 'approaching_limit' && Remain === 0) || accountInfo.messageLimit?.type === 'exceeded_limit';
     if (Remain) {
         changeflag = Math.max(Config.Cookiecounter - Remain, changeflag);
         console.log(`ApproachingLimit!: Remain ${Remain}`);
     }
-    if ((Overlap || Unverified || Banned) && Config.CookieArray?.length > 0) {
-        Overlap ? console.log(`Overlap!`) : Unverified ? console.log(`Unverified!`) : Banned && console.log(`Banned!`);
+    if ((Overlap || Unverified || Abused) && Config.CookieArray?.length > 0) {
+        Overlap ? console.log(`Overlap!`) : Unverified ? console.log(`Unverified!`) : Abused && console.log(`Banned!`);
         CookieCleaner();
         Config.Cookiecounter < 0 && console.log(`[progress]: ${percentage.toFixed(2)}%\n[length]: ${Config.CookieArray.length}\n`);
         return CookieChanger.emit('ChangeCookie');
@@ -335,7 +335,7 @@ const updateParams = res => {
             if ('consumer_restricted_mode' === type || 'consumer_banned' === type) { //if ('consumer_restricted_mode' === type) {
                 return;
             }
-            const req = await (Config.Settings.Superfetch ? Superfetch : fetch)(`${Config.rProxy}/api/organizations/${uuidOrg}/flags/${type}/dismiss`, {
+            const req = await (Config.Settings.Superfetch ? Superfetch : fetch)(`${Config.rProxy || AI.end()}/api/organizations/${uuidOrg}/flags/${type}/dismiss`, {
                 headers: {
                     ...AI.hdr(),
                     Cookie: getCookies()
@@ -359,7 +359,7 @@ const updateParams = res => {
         return CookieChanger.emit('ChangeCookie');
 /***************************** */
     }
-    const convRes = await fetch(`${Config.rProxy}/api/organizations/${uuidOrg}/chat_conversations`, {
+    const convRes = await fetch(`${Config.rProxy || AI.end()}/api/organizations/${uuidOrg}/chat_conversations`, {
         method: 'GET',
         headers: {
             ...AI.hdr(),
@@ -369,6 +369,7 @@ const updateParams = res => {
     updateParams(convRes);
     conversations.length > 0 && await Promise.all(conversations.map((conv => deleteChat(conv.uuid))));
 /***************************** */
+    invalidtime = 0, changing = false;
     } catch (err) {
         console.error('Clewd:\n%o', err);
         Config.CookieArray?.length > 0 && CookieChanger.emit('ChangeCookie');
@@ -394,20 +395,19 @@ const updateParams = res => {
     switch (req.url) {
       case '/v1/models':
         res.json({
-            data: [ {
 /***************************** */
-                id: 'claude-2.1'                },{
-                id: 'claude-2.0'                },{
-                id: 'claude-v1.3'               },{
-                id: 'claude-v1.3-100k'          },{
-                id: 'claude-v1.2'               },{
-                id: 'claude-v1.0'               },{
-                id: 'claude-instant-1.2'        },{
-                id: 'claude-instant-v1.1'       },{
-                id: 'claude-instant-v1.1-100k'  },{
-                id: 'claude-instant-v1.0'       //id: AI.mdl()
+            data: [ //data: AI.mdl().map((name => ({
+                ...AI.mdl().slice(1).map((name => ({ id: name }))), {
+                    id: 'claude-2.0'                },{
+                    id: 'claude-v1.3'               },{
+                    id: 'claude-v1.3-100k'          },{
+                    id: 'claude-v1.2'               },{
+                    id: 'claude-v1.0'               },{
+                    id: 'claude-instant-v1.1'       },{
+                    id: 'claude-instant-v1.1-100k'  },{
+                    id: 'claude-instant-v1.0'       //id: name
+            }] //})))
 /***************************** */
-            } ]
         });
         break;
 
@@ -429,16 +429,18 @@ const updateParams = res => {
                     const body = JSON.parse(Buffer.concat(buffer).toString()), temperature = Math.max(.1, Math.min(1, body.temperature));
                     let {messages} = body;
 /************************* */
-                    apiKey = req.headers.authorization.match(/sk-ant-api\d\d-[\w-]{86}-[\w-]{6}AA/g);
-                    let api_max_tokens, api_model;
-                    if (apiKey) {
-                        api_max_tokens = body.max_tokens;
-                        api_model = body.model;
-                        if (!api_model.includes('claude')) throw Error('Please change to claude model in "External"');
-                    } else if (req.headers.authorization.includes('sk-ant-api')) {
-                        throw Error('apiKey Wrong');
-                    } else if (Config.ProxyPassword != '' && req.headers.authorization != 'Bearer ' + Config.ProxyPassword) {
-                        throw Error('ProxyPassword Wrong');
+                    apiKey = req.headers.authorization?.match(/sk-ant-api\d\d-[\w-]{86}-[\w-]{6}AA/g) || req.headers.authorization?.match(/(?<=3rdKey: *)[\S]*/);
+                    reqModel = /^claude-2.[01]$/.test(body.model) ? body.model : '';
+                    let max_tokens_to_sample, stop_sequences;
+                    if (apiKey || Config.Settings.PassParams) {
+                        stop_sequences = body.stop;
+                        max_tokens_to_sample = body.max_tokens;
+                        model = body.model;
+                    } else if (req.headers.authorization.includes('sk-ant-api') || Config.ProxyPassword != '' && req.headers.authorization != 'Bearer ' + Config.ProxyPassword) {
+                        throw Error(req.headers.authorization.includes('sk-ant-api') ? 'apiKey Wrong' : 'ProxyPassword Wrong');
+                    } else if (changing || Config.CookieArray?.length > 0 && invalidtime >= Config.CookieArray?.length || reqModel && reqModel != model && !Config.Settings.PassParams) {
+                        changing ? invalidtime = 0 : changeflag = -1;
+                        throw Error(reqModel && reqModel && !Config.Settings.PassParams != body.model ? 'Polling requset model...' : 'Changing Cookie...');
                     }
 /************************* */
                     if (messages?.length < 1) {
@@ -471,7 +473,13 @@ const updateParams = res => {
                         console.log('having AllSamples and NoSamples both set to true is not supported');
                         throw Error('Only one can be used at the same time: AllSamples/NoSamples');
                     }
-                    //const model = AI.mdl();
+                    //const model = body.model;
+                    if (!apiKey && Config.Settings.PassParams) { //if (model === AI.mdl()[0]) {
+                        model = ProModelConvert(model); //return;
+                    }
+                    if (!/claude-.*/.test(model)) {
+                        throw Error('Invalid model selected: ' + model);
+                    }
                     curPrompt = {
                         firstUser: messages.find((message => 'user' === message.role)),
                         firstSystem: messages.find((message => 'system' === message.role)),
@@ -504,7 +512,7 @@ const updateParams = res => {
                                 completion: {
                                     prompt: '',
                                     timezone: AI.zone(),
-                                    model: model || AI.mdl()
+                                    model
                                 },
                                 organization_uuid: uuidOrg,
                                 conversation_uuid: Conversation.uuid,
@@ -519,7 +527,7 @@ const updateParams = res => {
                                 const names = Object.keys(headers), values = Object.values(headers);
                                 headers = names.map(((header, idx) => `${header}: ${values[idx]}`));
                             }
-                            res = await (Config.Settings.Superfetch ? Superfetch : fetch)(Config.rProxy + '/api/retry_message', {
+                            res = await (Config.Settings.Superfetch ? Superfetch : fetch)((Config.rProxy || AI.end()) + '/api/retry_message', {
                                 stream: true,
                                 signal,
                                 method: 'POST',
@@ -535,7 +543,7 @@ const updateParams = res => {
                         fetchAPI = await (async signal => {
                             Conversation.uuid = randomUUID().toString();
                             Conversation.depth = 0;
-                            const res = await (Config.Settings.Superfetch ? Superfetch : fetch)(`${Config.rProxy}/api/organizations/${uuidOrg}/chat_conversations`, {
+                            const res = await (Config.Settings.Superfetch ? Superfetch : fetch)(`${Config.rProxy || AI.end()}/api/organizations/${uuidOrg}/chat_conversations`, {
                                 signal,
                                 headers: {
                                     ...AI.hdr(),
@@ -644,8 +652,8 @@ const updateParams = res => {
 /******************************** */
                             if (Config.Settings.xmlPlot) {
                                 idx > 0 && (spacing = '\n\n');
-                                const prefix = message.customname ? message.role + ': <customname>' + message.name + '</customname>: ' : 'system' !== message.role || message.name ? Replacements[message.name || message.role] + ': ' : 'xmlPlot: ' + Replacements[message.role];
-                                return `${spacing}${prefix}${message.customname ? '<reply>\n' + message.content.trim() + '\n</reply>' : message.content}`;
+                                const prefix = message.customname ? message.role + ': ' + message.name + ': ' : 'system' !== message.role || message.name ? Replacements[message.name || message.role] + ': ' : 'xmlPlot: ' + Replacements[message.role];
+                                return `${spacing}${message.strip ? '' : prefix}${message.content}`;
                             } else {
 /******************************** */
                                 idx > 0 && (spacing = systemMessages.includes(message) ? '\n' : '\n\n');
@@ -654,20 +662,20 @@ const updateParams = res => {
                             } //
                         }));
                         return {
-                            prompt: prompt.join('').trim(), //genericFixes(prompt.join('')).trim(),
+                            prompt: prompt.join(''), //genericFixes(prompt.join('')).trim(),
                             systems
                         };
                     })(messages, type);
-                    console.log(`${apiKey ? api_model : model} [${type}]${!retryRegen && systems.length > 0 ? ' ' + systems.join(' / ') : ''}`); //console.log(`${model} [${type}]${!retryRegen && systems.length > 0 ? ' ' + systems.join(' / ') : ''}`);
+                    console.log(`${model} [${type}]${!retryRegen && systems.length > 0 ? ' ' + systems.join(' / ') : ''}`); //console.log(`${model} [${type}]${!retryRegen && systems.length > 0 ? ' ' + systems.join(' / ') : ''}`);
                     'R' !== type || prompt || (prompt = '...regen...');
 /******************************** */
-                    prompt = Config.Settings.xmlPlot ? xmlPlot(prompt, api_model && api_model != 'claude-2.1') : apiKey ? `\n\nHuman: ${genericFixes(prompt)}\n\nAssistant: ` : genericFixes(prompt);
+                    prompt = Config.Settings.xmlPlot ? xmlPlot(prompt, model != 'claude-2.1') : apiKey ? `\n\nHuman: ${genericFixes(prompt)}\n\nAssistant: ` : genericFixes(prompt).trim();
                     Config.Settings.FullColon && (prompt = apiKey
-                        ? prompt.replace(/(\n\nAssistant|\n\nHuman):/, function(match, p1) {return p1 === '\n\nHuman' ? match : p1 + '：'}).replace(/(\n\nAssistant|\n\nHuman):(?!.*?\n\n(Assistant|Human):)/s, function(match, p1) {return p1 === '\n\nAssistant' ? match : p1 + '：'})
+                        ? prompt.replace(/(?<!\n\nHuman:.*)(\n\nAssistant):/gs, '$1：').replace(/(\n\nHuman):(?!.*\n\nAssistant:)/gs, '$1：')
                         : prompt.replace(/(?<=\n\n(H(?:uman)?|A(?:ssistant)?)):[ ]?/g, '： '));
                     Config.Settings.padtxt && (prompt = padtxt(prompt));
 /******************************** */
-                    Logger?.write(`\n\n-------\n[${(new Date).toLocaleString()}]\n####### ${apiKey ? api_model : model} PROMPT (${type}):\n${prompt}\n--\n####### [Tokens: ${tokens}] REPLY:\n`); //Logger?.write(`\n\n-------\n[${(new Date).toLocaleString()}]\n####### PROMPT (${type}):\n${prompt}\n--\n####### REPLY:\n`);
+                    Logger?.write(`\n\n-------\n[${(new Date).toLocaleString()}]\n####### ${model} (${type}) ${tokens}t PROMPT:\n${prompt}\n--\n####### REPLY:\n`); //Logger?.write(`\n\n-------\n[${(new Date).toLocaleString()}]\n####### MODEL: ${model}\n####### PROMPT (${type}):\n${prompt}\n--\n####### REPLY:\n`);
                     retryRegen || (fetchAPI = await (async (signal, model, prompt, temperature, type) => {
 /******************************** */
                         if (apiKey) {
@@ -680,8 +688,9 @@ const updateParams = res => {
                                     'anthropic-version': '2023-06-01'
                                 },
                                 body: JSON.stringify({
-                                    model: api_model,
-                                    max_tokens_to_sample: api_max_tokens,
+                                    ...stop_sequences && {stop_sequences},
+                                    model,
+                                    max_tokens_to_sample,
                                     stream: true,
                                     prompt,
                                     temperature
@@ -712,11 +721,11 @@ const updateParams = res => {
                                 },
                                 prompt: prompt || '',
                                 timezone: AI.zone(),
-                                model: model || AI.mdl()
+                                model
                             },
                             organization_uuid: uuidOrg,
                             conversation_uuid: Conversation.uuid,
-                            text: prompt,
+                            text: prompt || '',
                             attachments
                         };
                         let headers = {
@@ -724,7 +733,7 @@ const updateParams = res => {
                             Accept: 'text/event-stream',
                             Cookie: getCookies()
                         };
-                        res = await (Config.Settings.Superfetch ? Superfetch : fetch)(Config.rProxy + '/api/append_message', {
+                        res = await (Config.Settings.Superfetch ? Superfetch : fetch)((Config.rProxy || AI.end()) + '/api/append_message', {
                             stream: true,
                             signal,
                             method: 'POST',
@@ -747,7 +756,7 @@ const updateParams = res => {
                         version: Main,
                         minSize: Config.BufferSize,
                         model,
-                        streaming: body.stream,
+                        streaming: body.stream, //null != body.stream,
                         abortControl,
                         source: fetchAPI
                     }, Logger);
@@ -757,6 +766,7 @@ const updateParams = res => {
                     if ('AbortError' === err.name) {
                         res.end();
                     } else {
+                        changeflag -= 1; //
                         err.planned || console.error('Clewd:\n%o', err);
                         res.json({
                             error: {
@@ -780,7 +790,7 @@ const updateParams = res => {
                     await deleteChat(Conversation.uuid);
 /******************************** */
                     changeflag += 1;
-                    if (Config.CookieArray?.length > 0 && (429 == fetchAPI?.status || Config.Cookiecounter && changeflag >= Config.Cookiecounter)) {
+                    if (changeflag < 0 || Config.CookieArray?.length > 0 && (429 == fetchAPI?.status || Config.Cookiecounter > 0 && changeflag >= Config.Cookiecounter)) {
                         changeflag = 0;
                         CookieChanger.emit('ChangeCookie');
                     }
@@ -857,7 +867,7 @@ const updateParams = res => {
             Config[key] = process.env[key] ? convertToType(process.env[key]) : Config[key];
         }
     }
-    Config.rProxy = Config.rProxy ? Config.rProxy.replace(/\/$/, '') : AI.end();
+    Config.rProxy = Config.rProxy.replace(/\/$/, '');
     Config.CookieArray = [...new Set([Config.CookieArray].join('').match(/(sessionKey=)?sk-ant-sid01-[\w-]{86}-[\w-]{6}AA/g))];
     writeSettings(Config);
     currentIndex = Config.CookieIndex > 0 ? Config.CookieIndex - 1 : Config.Cookiecounter >= 0 ? Math.floor(Math.random() * Config.CookieArray.length) : 0;

lib/clewd-stream.js

@@ -19,7 +19,7 @@ class ClewdStream extends TransformStream {
         this.#logger = logger;
         this.#version = opts.version;
         this.#config = opts.config;
-        this.#model = opts.model || AI.mdl();
+        this.#model = opts.model;
         this.#streaming = opts.streaming || false;
         this.#minSize = opts.minSize || 8;
         this.#abortControl = opts.abortControl;
@@ -66,7 +66,7 @@ class ClewdStream extends TransformStream {
     }
     #err(err, controller) {
         this.#logger?.write(JSON.stringify(err, null, 4));
-        const message = `## ${this.#version}\n**${AI.mdl()} error**:\n${err.status || err.code || err.type}\n\n\`\`\`${err.message}\`\`\`\n\nFAQ: https://rentry.org/teralomaniac_clewd`;
+        const message = `## ${this.#version}\n**${this.#model} error**:\n${err.status || err.code || err.type}\n\n\`\`\`${err.message}\`\`\`\n\nFAQ: https://rentry.org/teralomaniac_clewd`;
         this.#enqueue(this.#build(message), controller);
         return this.#endEarly(controller);
     }

lib/clewd-utils.js

@@ -5,7 +5,7 @@
 'use strict';
 
 const {randomInt, randomBytes} = require('node:crypto'), {version: Version} = require('../package.json'), Encoder = (new TextDecoder, 
-new TextEncoder), Main = 'clewd修改版 v' + Version + '(12) by tera', Replacements = {
+new TextEncoder), Main = 'clewd修改版 v' + Version + '(1) by tera', Replacements = {
     user: 'Human',
     assistant: 'Assistant',
     system: '',
@@ -13,7 +13,7 @@ new TextEncoder), Main = 'clewd修改版 v' + Version + '(12) by tera', Replacem
     example_assistant: 'A'
 }, DangerChars = [ ...new Set([ ...Object.values(Replacements).join(''), ...'\n', ...':', ...'\\n' ]) ].filter((char => ' ' !== char)).sort(), AI = {
     end: () => Buffer.from([ 104, 116, 116, 112, 115, 58, 47, 47, 99, 108, 97, 117, 100, 101, 46, 97, 105 ]).toString(),
-    mdl: () => Buffer.from([ 99, 108, 97, 117, 100, 101, 45, 50, 46, 49 ]).toString(),
+    mdl: () => JSON.parse(Buffer.from([ 91, 34, 33, 32, 85, 83, 73, 78, 71, 32, 77, 79, 68, 69, 76, 83, 32, 79, 84, 72, 69, 82, 32, 84, 72, 65, 78, 32, 99, 108, 97, 117, 100, 101, 45, 50, 46, 49, 32, 42, 67, 79, 85, 76, 68, 42, 32, 71, 69, 84, 32, 89, 79, 85, 32, 66, 65, 78, 78, 69, 68, 32, 73, 70, 32, 89, 79, 85, 39, 82, 69, 32, 78, 79, 84, 32, 65, 32, 80, 82, 79, 32, 85, 83, 69, 82, 32, 33, 34, 44, 34, 99, 108, 97, 117, 100, 101, 45, 49, 34, 44, 34, 99, 108, 97, 117, 100, 101, 45, 105, 110, 115, 116, 97, 110, 116, 45, 49, 48, 48, 107, 34, 44, 34, 99, 108, 97, 117, 100, 101, 45, 105, 110, 115, 116, 97, 110, 116, 45, 49, 34, 44, 34, 99, 108, 97, 117, 100, 101, 45, 105, 110, 115, 116, 97, 110, 116, 45, 49, 46, 50, 34, 44, 34, 99, 108, 97, 117, 100, 101, 45, 49, 46, 51, 34, 44, 34, 99, 108, 97, 117, 100, 101, 45, 50, 46, 48, 45, 109, 97, 103, 101, 110, 116, 97, 34, 44, 34, 99, 108, 97, 117, 100, 101, 45, 50, 34, 44, 34, 99, 108, 97, 117, 100, 101, 45, 50, 46, 49, 34, 93 ]).toString()),
     zone: () => Buffer.from([ 65, 115, 105, 97, 47, 83, 104, 97, 110, 103, 104, 97, 105 ]).toString(), //Buffer.from([ 65, 109, 101, 114, 105, 99, 97, 47, 78, 101, 119, 95, 89, 111, 114, 107 ]).toString(),
     agent: () => Buffer.from([ 77, 111, 122, 105, 108, 108, 97, 47, 53, 46, 48, 32, 40, 77, 97, 99, 105, 110, 116, 111, 115, 104, 59, 32, 73, 110, 116, 101, 108, 32, 77, 97, 99, 32, 79, 83, 32, 88, 32, 49, 48, 95, 49, 53, 95, 55, 41, 32, 65, 112, 112, 108, 101, 87, 101, 98, 75, 105, 116, 47, 53, 51, 55, 46, 51, 54, 32, 40, 75, 72, 84, 77, 76, 44, 32, 108, 105, 107, 101, 32, 71, 101, 99, 107, 111, 41, 32, 67, 104, 114, 111, 109, 101, 47, 49, 49, 52, 46, 48, 46, 48, 46, 48, 32, 83, 97, 102, 97, 114, 105, 47, 53, 51, 55, 46, 51, 54, 32, 69, 100, 103, 47, 49, 49, 52, 46, 48, 46, 49, 56, 50, 51, 46, 55, 57 ]).toString(),
     cp: () => Buffer.from([ 55, 55, 49, 44, 52, 56, 54, 53, 45, 52, 56, 54, 54, 45, 52, 56, 54, 55, 45, 52, 57, 49, 57, 53, 45, 52, 57, 49, 57, 57, 45, 52, 57, 49, 57, 54, 45, 52, 57, 50, 48, 48, 45, 53, 50, 51, 57, 51, 45, 53, 50, 51, 57, 50, 45, 52, 57, 49, 55, 49, 45, 52, 57, 49, 55, 50, 45, 49, 53, 54, 45, 49, 53, 55, 45, 52, 55, 45, 53, 51, 44, 48, 45, 50, 51, 45, 54, 53, 50, 56, 49, 45, 49, 48, 45, 49, 49, 45, 51, 53, 45, 49, 54, 45, 53, 45, 49, 51, 45, 49, 56, 45, 53, 49, 45, 52, 53, 45, 52, 51, 45, 50, 55, 45, 49, 55, 53, 49, 51, 45, 50, 49, 44, 50, 57, 45, 50, 51, 45, 50, 52, 44, 48 ]).toString(),
@@ -75,13 +75,12 @@ module.exports.checkResErr = async (res, CookieChanger, throwIt = true) => { //m
     return err;
 };
 
-module.exports.bytesToSize = (bytes = 0) => {
-    const b = [ 'B', 'KB', 'MB', 'GB', 'TB' ];
+module.exports.bytesToSize = (bytes = 0, decimals = 2) => {
     if (0 === bytes) {
-        return '0 B';
+        return '0 Bytes';
     }
-    const c = Math.min(Math.floor(Math.log(bytes) / Math.log(1024)), 4);
-    return 0 === c ? `${bytes} ${b[c]}` : `${(bytes / 1024 ** c).toFixed(1)} ${b[c]}`;
+    const dm = decimals < 0 ? 0 : decimals, i = Math.round(Math.log(bytes) / Math.log(1024));
+    return `${(bytes / Math.pow(1024, i)).toFixed(dm)} ${[ 'Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ][i]}`;
 };
 
 module.exports.indexOfAny = (text, last = false) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clewd",
-  "version": "4.6",
+  "version": "4.7",
   "description": "<div align=\"center\"> <a href=\"https://github.com/teralomaniac/clewd\"> <h1>Clewd</h1>   <img     height=\"120\"     width=\"120\"     alt=\"Clewd\"     title=\"Clewd\"     src=\"https://gitgud.io/ahsk/clewd/-/raw/master/media/logo.png\"     align=\"left\"   />",
   "main": "clewd.js",
   "engines": {