增强Core.js,提供了模块名称功能;增强CGI,支持断线重连

这个提交包含在:
2023-01-28 22:23:26 +08:00
父节点 16a7e69ac6
当前提交 3bb59f5620
共有 6 个文件被更改,包括 284 次插入 和 177 次删除

353
CGI.js
查看文件

@ -9,12 +9,185 @@ console.log("["+new Date().toString()+"][./Core.js]服务器已启动");
global.DEBUG = {}; global.DEBUG = {};
global.DEBUG.Core = Core; global.DEBUG.Core = Core;
var last = {}; var last = {};
request.post({
exports.frame={
raw: function(u,MData){
var Req = new net.Socket();
var KData = MData.replace("@Session",Session);
var BData = Buffer.from(KData);
console.log(KData)
var MainData = `POST /${u} HTTP/1.1\r\nHost: 127.0.0.1:${ServicePort}\r\nContent-Type: application/json; charset=UTF-8;\r\nContent-Length:${KData.length}\r\n\r\n`;
console.log(MainData)
Req.connect(ServicePort,"127.0.0.1",()=>{
Req.write(MainData);
Req.write(BData);
Req.on("data",(data)=>{
console.log(data.toString());
});
Req.on("end",()=>{
Req.end();
});
Req.on("close",()=>{
Req.end();
})
});
},
SendImg: function(c,info,p){
this.SetHook(true);
if(info.group != undefined){
var Kdata = JSON.stringify({
sessionKey:Session,
group:info.group_id,
messageChain:[{
type:"Image",
path:p
}]
});
}else{
var Kdata = JSON.stringify({
sessionKey:Session,
qq:info.user_id,
messageChain:[{
type:"Image",
path:p
}]
});
}
var BData = Buffer.from(Kdata);
var Ret = "";
var To = "Friend";
if(info.group != undefined){
To = "Group"
}
var Req = new net.Socket();
console.log(Kdata);
console.log(Kdata);
var MainData = `POST /send${To}Message HTTP/1.1\r\nHost: 127.0.0.1:${ServicePort}\r\nContent-Type: application/json; charset=UTF-8;\r\nContent-Length:${BData.length}\r\n\r\n`;
Req.connect(ServicePort,"127.0.0.1",()=>{
Req.write(MainData);
Req.write(BData);
Req.on("data",(data)=>{
console.log(data.toString());
});
Req.on("end",()=>{
Req.end();
});
Req.on("close",()=>{
Req.end();
})
});
},
SendURLImg: function(c,info,p){
this.SetHook(true);
if(info.group != undefined){
var Kdata = JSON.stringify({
sessionKey:Session,
group:info.group_id,
messageChain:[{"type":"Plain","text":`IMG`},{
type:"Image",
url:p
}]
});
}else{
var Kdata = JSON.stringify({
sessionKey:Session,
qq:info.user_id,
messageChain:[{"type":"Plain","text":`IMG`},{
type:"Image",
url:p
}]
});
}
var BData = Buffer.from(Kdata);
var Ret = "";
var To = "Friend";
if(info.group != undefined){
To = "Group"
}
var Req = new net.Socket();
console.log(Kdata);
console.log(Kdata);
var MainData = `POST /send${To}Message HTTP/1.1\r\nHost: 127.0.0.1:${ServicePort}\r\nContent-Type: application/json; charset=UTF-8;\r\nContent-Length:${BData.length}\r\n\r\n`;
Req.connect(ServicePort,"127.0.0.1",()=>{
Req.write(MainData);
Req.write(BData);
Req.on("data",(data)=>{
console.log(data.toString());
});
Req.on("end",()=>{
Req.end();
});
Req.on("close",()=>{
Req.end();
})
});
},
SendMsg: function (connect, info, message) {
this.SetHook(true);
if(info.group != undefined){
var Kdata = JSON.stringify({
sessionKey:Session,
group:info.group_id,
messageChain:message
});
}else{
var Kdata = JSON.stringify({
sessionKey:Session,
qq:info.user_id,
messageChain:message
});
}
var BData = Buffer.from(Kdata);
var Ret = "";
var To = "Friend";
if(info.group != undefined){
To = "Group"
}
var Req = new net.Socket();
console.log(Kdata);
console.log(Kdata);
var MainData = `POST /send${To}Message HTTP/1.1\r\nHost: 127.0.0.1:${ServicePort}\r\nContent-Type: application/json; charset=UTF-8;\r\nContent-Length:${BData.length}\r\n\r\n`;
Req.connect(ServicePort,"127.0.0.1",()=>{
Req.write(MainData);
Req.write(BData);
Req.on("data",(data)=>{
console.log(data.toString());
});
Req.on("end",()=>{
Req.end();
});
Req.on("close",()=>{
Req.end();
})
});
},
SetHook:function(value){
exports.HOOK = value;
}
}
var Active = ((force=false)=>{
if(Session != "" && !force){
return
}
request.post({
url:`http://127.0.0.1:${ServicePort}/verify`, url:`http://127.0.0.1:${ServicePort}/verify`,
body:JSON.stringify({verifyKey:Key}) body:JSON.stringify({verifyKey:Key})
},(err,res)=>{ },(err,res)=>{
if(res == null){ if(res == null){
console.log("["+new Date().toString()+"][./Core.js]系统断线."); console.log("["+new Date().toString()+"][./Core.js]系统断线,十秒后重连");
setTimeout(()=>{
Active(true)
},10000)
return; return;
} }
Session = JSON.parse(res.body).session; Session = JSON.parse(res.body).session;
@ -28,169 +201,7 @@ request.post({
console.log("["+new Date().toString()+"][./Core.js]Session激活成功."); console.log("["+new Date().toString()+"][./Core.js]Session激活成功.");
console.log(Session); console.log(Session);
exports.HOOK = HOOK; exports.HOOK = HOOK;
exports.frame={ var STHandle = setInterval(()=>{
raw: function(u,MData){
var Req = new net.Socket();
var KData = MData.replace("@Session",Session);
var BData = Buffer.from(KData);
console.log(KData)
var MainData = `POST /${u} HTTP/1.1\r\nHost: 127.0.0.1:${ServicePort}\r\nContent-Type: application/json; charset=UTF-8;\r\nContent-Length:${KData.length}\r\n\r\n`;
console.log(MainData)
Req.connect(ServicePort,"127.0.0.1",()=>{
Req.write(MainData);
Req.write(BData);
Req.on("data",(data)=>{
console.log(data.toString());
});
Req.on("end",()=>{
Req.end();
});
Req.on("close",()=>{
Req.end();
})
});
},
SendImg: function(c,info,p){
this.SetHook(true);
if(info.group != undefined){
var Kdata = JSON.stringify({
sessionKey:Session,
group:info.group_id,
messageChain:[{
type:"Image",
path:p
}]
});
}else{
var Kdata = JSON.stringify({
sessionKey:Session,
qq:info.user_id,
messageChain:[{
type:"Image",
path:p
}]
});
}
var BData = Buffer.from(Kdata);
var Ret = "";
var To = "Friend";
if(info.group != undefined){
To = "Group"
}
var Req = new net.Socket();
console.log(Kdata);
console.log(Kdata);
var MainData = `POST /send${To}Message HTTP/1.1\r\nHost: 127.0.0.1:${ServicePort}\r\nContent-Type: application/json; charset=UTF-8;\r\nContent-Length:${BData.length}\r\n\r\n`;
Req.connect(ServicePort,"127.0.0.1",()=>{
Req.write(MainData);
Req.write(BData);
Req.on("data",(data)=>{
console.log(data.toString());
});
Req.on("end",()=>{
Req.end();
});
Req.on("close",()=>{
Req.end();
})
});
},
SendURLImg: function(c,info,p){
this.SetHook(true);
if(info.group != undefined){
var Kdata = JSON.stringify({
sessionKey:Session,
group:info.group_id,
messageChain:[{"type":"Plain","text":`IMG`},{
type:"Image",
url:p
}]
});
}else{
var Kdata = JSON.stringify({
sessionKey:Session,
qq:info.user_id,
messageChain:[{"type":"Plain","text":`IMG`},{
type:"Image",
url:p
}]
});
}
var BData = Buffer.from(Kdata);
var Ret = "";
var To = "Friend";
if(info.group != undefined){
To = "Group"
}
var Req = new net.Socket();
console.log(Kdata);
console.log(Kdata);
var MainData = `POST /send${To}Message HTTP/1.1\r\nHost: 127.0.0.1:${ServicePort}\r\nContent-Type: application/json; charset=UTF-8;\r\nContent-Length:${BData.length}\r\n\r\n`;
Req.connect(ServicePort,"127.0.0.1",()=>{
Req.write(MainData);
Req.write(BData);
Req.on("data",(data)=>{
console.log(data.toString());
});
Req.on("end",()=>{
Req.end();
});
Req.on("close",()=>{
Req.end();
})
});
},
SendMsg: function (connect, info, message) {
this.SetHook(true);
if(info.group != undefined){
var Kdata = JSON.stringify({
sessionKey:Session,
group:info.group_id,
messageChain:message
});
}else{
var Kdata = JSON.stringify({
sessionKey:Session,
qq:info.user_id,
messageChain:message
});
}
var BData = Buffer.from(Kdata);
var Ret = "";
var To = "Friend";
if(info.group != undefined){
To = "Group"
}
var Req = new net.Socket();
console.log(Kdata);
console.log(Kdata);
var MainData = `POST /send${To}Message HTTP/1.1\r\nHost: 127.0.0.1:${ServicePort}\r\nContent-Type: application/json; charset=UTF-8;\r\nContent-Length:${BData.length}\r\n\r\n`;
Req.connect(ServicePort,"127.0.0.1",()=>{
Req.write(MainData);
Req.write(BData);
Req.on("data",(data)=>{
console.log(data.toString());
});
Req.on("end",()=>{
Req.end();
});
Req.on("close",()=>{
Req.end();
})
});
},
SetHook:function(value){
exports.HOOK = value;
}
}
setInterval(()=>{
if(Session == ""){return} if(Session == ""){return}
request.get({ request.get({
url:`http://127.0.0.1:${ServicePort}/fetchLatestMessage?sessionKey=${Session}&count=1` url:`http://127.0.0.1:${ServicePort}/fetchLatestMessage?sessionKey=${Session}&count=1`
@ -201,13 +212,23 @@ request.post({
if(MainData == null || MainData == undefined){return}; if(MainData == null || MainData == undefined){return};
if(MainData.data == null||MainData.data == undefined){return}; if(MainData.data == null||MainData.data == undefined){return};
var data_obj = MainData.data[0]; var data_obj = MainData.data[0];
if(data_obj == undefined){return};
if(data_obj == last){ if(data_obj == last){
return return
}else{ }else{
if(data_obj["type"]=="BotOfflineEventActive"){
Session = "";
console.log("[CGI.JS]MIRAI端掉线")
clearInterval(STHandle);
Active();
}
Core.frame.CGI("",data_obj); Core.frame.CGI("",data_obj);
last = data_obj; last = data_obj;
} }
}); });
},50); },50);
}); });
}); });})
global.Active = Active;
Active();

27
Core.js
查看文件

@ -7,6 +7,8 @@ exports.LastMessage = LastMessage;
var Listeners = []; var Listeners = [];
exports.Listeners = Listeners exports.Listeners = Listeners
var At = []; var At = [];
var ListenerList = [];
global.LoadingModuleName = "";
exports.ServicePort = 8092; exports.ServicePort = 8092;
global.LoadMoudel = (() => { global.LoadMoudel = (() => {
Listeners = []; Listeners = [];
@ -18,6 +20,7 @@ global.LoadMoudel = (() => {
for (var i = 0; i < k.length; i++) { for (var i = 0; i < k.length; i++) {
if (data_obj[k[i]].Allow) { if (data_obj[k[i]].Allow) {
console.log(`[${new Date().toString()}][${k[i]}]服务正在初始化!`); console.log(`[${new Date().toString()}][${k[i]}]服务正在初始化!`);
global.LoadingModuleName = k[i];
if (data_obj[k[i]].FindIn == "fs" && fs.existsSync(require(process.cwd() + "/" + data_obj[k[i]].Path))) { if (data_obj[k[i]].FindIn == "fs" && fs.existsSync(require(process.cwd() + "/" + data_obj[k[i]].Path))) {
try{ try{
require(process.cwd() + "/" + data_obj[k[i]].Path); require(process.cwd() + "/" + data_obj[k[i]].Path);
@ -28,6 +31,7 @@ global.LoadMoudel = (() => {
} }
} }
} }
global.LoadingModuleName = "无名调试服务";
}); });
} else { } else {
fs.writeFile("./MoudelV2.json", JSON.stringify({}), (err) => { }); fs.writeFile("./MoudelV2.json", JSON.stringify({}), (err) => { });
@ -41,11 +45,17 @@ global.LoadMoudel = (() => {
fileList.forEach(e => { fileList.forEach(e => {
if(e.substr(-3,3)==".js"){ if(e.substr(-3,3)==".js"){
fs.readFile(`./inside/${e}`,{},(err,data)=>{ fs.readFile(`./inside/${e}`,{},(err,data)=>{
global.LoadingModuleName = `内部模块[${e}]`;
console.log(`[${new Date().toString()}][${e}]inside正在初始化!`); console.log(`[${new Date().toString()}][${e}]inside正在初始化!`);
eval(data.toString()); try{
eval(data.toString());
}catch(err){
console.log(err);
}
}) })
} }
}); });
global.LoadingModuleName = "无名调试服务";
})) }))
} }
}) })
@ -67,9 +77,10 @@ exports.GetUser=function(user_id){
} }
}; };
exports.HOOK = JSCGI.HOOK; exports.HOOK = JSCGI.HOOK;
exports.AddListener = ((callback)=>{ exports.AddListener = ((callback,name = global.LoadingModuleName)=>{
Listeners[Listeners.length] = callback; Listeners[Listeners.length] = callback;
console.log(`[${new Date().toString()}]新的服务注册。服务ID为${Listeners.length - 1}`); console.log(`[${new Date().toString()}]新的服务<${name}>注册。服务ID为${Listeners.length - 1}`);
ListenerList[Listeners.length] = name;
return (Listeners.length - 1); return (Listeners.length - 1);
}); });
exports.DelListener = ((callbackID)=>{ exports.DelListener = ((callbackID)=>{
@ -202,13 +213,7 @@ exports.frame={
CGI:function(connect,info){ CGI:function(connect,info){
At = []; At = [];
if(info == undefined){return};
console.log("["+new Date().toString()+"][./Core.js]收到新消息"); console.log("["+new Date().toString()+"][./Core.js]收到新消息");
console.log(info); console.log(info);
@ -278,7 +283,7 @@ exports.frame={
console.log(`[${new Date().toString()}][${package[i]}]处理完成`); console.log(`[${new Date().toString()}][${package[i]}]处理完成`);
} }
for(var i=0;i<Listeners.length;i++){ for(var i=0;i<Listeners.length;i++){
console.log(`[${new Date().toString()}]正在由服务解析消息。`); console.log(`[${new Date().toString()}]正在由服务<${ListenerList[i]}>解析消息。`);
Listeners[i](connect,info); Listeners[i](connect,info);
} }
if(require("./AI.js").add.Interfaces.GetAITalk("Core")){ if(require("./AI.js").add.Interfaces.GetAITalk("Core")){
@ -292,5 +297,7 @@ exports.frame={
} }
} }
require("repl").start()
global.DEBUG.CGI = JSCGI; global.DEBUG.CGI = JSCGI;
global.DEBUG.Debug = require("./Debug.js"); global.DEBUG.Debug = require("./Debug.js");

查看文件

@ -1 +1 @@
{"固定资产":{"80000000":10000,"862869995":1550,"927980270":377780,"1285908631":500,"2044792347":23245,"2284888681":899,"2645989614":550,"2868445034":1050,"3054331058":1100,"3162625498":57581,"3491504564":500,"3569808588":1000},"利息":{"862869995":"20206","927980270":"20230","2645989614":"20206","2868445034":"20206","3054331058":"20207","3162625498":"20220"},"领工资":{"862869995":"202063","927980270":"202306","2284888681":"202064","2868445034":"202064","3054331058":"202072","3162625498":"202205","3569808588":"202066"},"签到":{"862869995":"202063","927980270":"202306","1285908631":"202061","2044792347":"2022104","2284888681":"202064","2645989614":"202064","2868445034":"202061","3054331058":"202072","3162625498":"202206","3491504564":"202163","3569808588":"202066"},"RedPacketPool":20209,"SandBox":{"新春":"{\"927980270\":true,\"2044792347\":true,\"3162625498\":true}","a":"1"},"目标":{},"AITalk":{"927980270":true,"2868445034":false,"3491504564":false,"Core":false},"板砖":{"927980270":0,"2044792347":null},"公会系统":{"927980270":"共学社"},"AIEnable":{"545541668":true,"588932037":true,"776148636":true,"963936042":true,"966138955":true,"1012022482":true},"保镖[2022 0 3]":{"927980270":3},"保镖[2022 0 5]":{"927980270":5}} {"固定资产":{"80000000":10000,"862869995":1550,"927980270":377780,"1285908631":500,"2044792347":23245,"2284888681":899,"2645989614":550,"2868445034":1050,"3054331058":1100,"3162625498":58081,"3491504564":500,"3569808588":1000},"利息":{"862869995":"20206","927980270":"20230","2645989614":"20206","2868445034":"20206","3054331058":"20207","3162625498":"20220"},"领工资":{"862869995":"202063","927980270":"202306","2284888681":"202064","2868445034":"202064","3054331058":"202072","3162625498":"202205","3569808588":"202066"},"签到":{"862869995":"202063","927980270":"202306","1285908631":"202061","2044792347":"2022104","2284888681":"202064","2645989614":"202064","2868445034":"202061","3054331058":"202072","3162625498":"202306","3491504564":"202163","3569808588":"202066"},"RedPacketPool":20209,"SandBox":{"新春":"{\"927980270\":true,\"2044792347\":true,\"3162625498\":true}","a":"1"},"目标":{},"AITalk":{"927980270":true,"2868445034":false,"3491504564":false,"Core":false},"板砖":{"927980270":0,"2044792347":null},"公会系统":{"927980270":"共学社"},"AIEnable":{"545541668":true,"588932037":true,"776148636":true,"963936042":true,"966138955":true,"1012022482":true},"保镖[2022 0 3]":{"927980270":3},"保镖[2022 0 5]":{"927980270":5}}

3
inside/Heart.js 普通文件
查看文件

@ -0,0 +1,3 @@
(()=>{
return 0
})()

4
sdwebuiapic/api.ts 普通文件
查看文件

@ -0,0 +1,4 @@
export default (()=>{
var API = {};
return API;
})();

72
sdwebuiapic/def.d.ts vendored 普通文件
查看文件

@ -0,0 +1,72 @@
/**
* 分析出来的HTTP请求头
*/
declare type SamplerType = "Euler a"|"Eular"|"DDIM";
declare interface SDW_reqHeaders{
prompt:String;
all_negative_prompts:Array<String>;
all_prompts:Array<String>;
seed:Number;
all_seed:Array<Number>
subseed:Number;
all_subseed:Array<Number>;
width:Number;
height:Number;
sampler_name:SamplerType;
cfg_scale:Number;
steps:Number;
batch_size:Number;
restore_faces:Boolean;
face_restoration_model?:Object;
sd_model_hash:String;
seed_resize_from_w:Number;
seed_resize_from_h:Number;
denoising_strength:null;
extra_generation_params:{};
index_of_first_image:0;
infotexts:Array<String>;
styles:Array<String>
job_timestamp:String;
clip_skip:1;
is_using_inpainting_conditioning:Boolean
}
// {
// "prompt": "a blue-eye girl wearing long pink dress with white hair standing on grass",
// "all_prompts": [
// "a blue-eye girl wearing long pink dress with white hair standing on grass"
// ],
// "negative_prompt": "",
// "all_negative_prompts": [
// ""
// ],
// "seed": 1477165126,
// "all_seeds": [
// 1477165126
// ],
// "subseed": 3210583039,
// "all_subseeds": [
// 3210583039
// ],
// "subseed_strength": 0,
// "width": 512,
// "height": 768,
// "sampler_name": "Euler a",
// "cfg_scale": 7,
// "steps": 20,
// "batch_size": 1,
// "restore_faces": false,
// "face_restoration_model": null,
// "sd_model_hash": "18bcc837a2",
// "seed_resize_from_w": 0,
// "seed_resize_from_h": 0,
// "denoising_strength": null,
// "extra_generation_params": {},
// "index_of_first_image": 0,
// "infotexts": [
// "a blue-eye girl wearing long pink dress with white hair standing on grass\nSteps: 20, Sampler: Euler a, CFG scale: 7, Seed: 1477165126, Size: 512x768, Model hash: 18bcc837a2, Model: momoko-e"
// ],
// "styles": [],
// "job_timestamp": "20230128203742",
// "clip_skip": 1,
// "is_using_inpainting_conditioning": false
// }