mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-07-19 12:03:37 +00:00
fix: 翻新网络重载
This commit is contained in:
手瓜一十雪
@@ -163,7 +163,7 @@ export class NapCatOneBot11Adapter {
|
|||||||
const prev = this.configLoader.configData;
|
const prev = this.configLoader.configData;
|
||||||
this.configLoader.save(newConfig);
|
this.configLoader.save(newConfig);
|
||||||
this.context.logger.log(`OneBot11 配置更改：${JSON.stringify(prev)} -> ${JSON.stringify(newConfig)}`);
|
this.context.logger.log(`OneBot11 配置更改：${JSON.stringify(prev)} -> ${JSON.stringify(newConfig)}`);
|
||||||
//await this.reloadNetwork(prev, newConfig);
|
await this.reloadNetwork(prev, newConfig);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,88 +180,87 @@ export class NapCatOneBot11Adapter {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// private async reloadNetwork(prev: OB11Config, now: OB11Config) {
|
private async reloadNetwork(prev: OneBotConfig, now: OneBotConfig) {
|
||||||
// const serviceInfo = `
|
const { added: addedHttpServers, removed: removedHttpServers } = this.findDifference(prev.network.httpServers, now.network.httpServers);
|
||||||
// HTTP服务 ${now.http.enable ? '已启动' : '未启动'}, ${now.http.host}:${now.http.port}
|
const { added: addedHttpClients, removed: removedHttpClients } = this.findDifference(prev.network.httpClients, now.network.httpClients);
|
||||||
// HTTP上报服务 ${now.http.enablePost ? '已启动' : '未启动'}, 上报地址: ${now.http.postUrls}
|
const { added: addedWebSocketServers, removed: removedWebSocketServers } = this.findDifference(prev.network.websocketServers, now.network.websocketServers);
|
||||||
// WebSocket服务 ${now.ws.enable ? '已启动' : '未启动'}, ${now.ws.host}:${now.ws.port}
|
const { added: addedWebSocketClients, removed: removedWebSocketClients } = this.findDifference(prev.network.websocketClients, now.network.websocketClients);
|
||||||
// WebSocket反向服务 ${now.reverseWs.enable ? '已启动' : '未启动'}, 反向地址: ${now.reverseWs.urls}`;
|
|
||||||
// this.context.logger.log(`[Notice] [OneBot11] 热重载 ${serviceInfo}`);
|
// 移除旧的 HTTP 服务器
|
||||||
|
for (const server of removedHttpServers) {
|
||||||
// // check difference in passive http (Http)
|
await this.networkManager.closeAdapterByPredicate((adapter) => adapter.name === server.name);
|
||||||
// if (prev.http.enable !== now.http.enable) {
|
}
|
||||||
// if (now.http.enable) {
|
|
||||||
// await this.networkManager.registerAdapterAndOpen(new OB11PassiveHttpAdapter(
|
// 移除旧的 HTTP 客户端
|
||||||
// now.http.port, now.token, this.core, this.actions,
|
for (const client of removedHttpClients) {
|
||||||
// ));
|
await this.networkManager.closeAdapterByPredicate((adapter) => adapter.name === client.name);
|
||||||
// } else {
|
}
|
||||||
// await this.networkManager.closeAdapterByPredicate(adapter => adapter instanceof OB11PassiveHttpAdapter);
|
|
||||||
// }
|
// 移除旧的 WebSocket 服务器
|
||||||
// }
|
for (const server of removedWebSocketServers) {
|
||||||
|
this.networkManager.closeAdapterByPredicate((adapter) => adapter.name === server.name);
|
||||||
// // check difference in active http (HttpPost)
|
}
|
||||||
// if (prev.http.enablePost !== now.http.enablePost) {
|
|
||||||
// if (now.http.enablePost) {
|
// 移除旧的 WebSocket 客户端
|
||||||
// now.http.postUrls.forEach(url => {
|
for (const client of removedWebSocketClients) {
|
||||||
// this.networkManager.registerAdapterAndOpen(new OB11ActiveHttpAdapter(
|
this.networkManager.closeAdapterByPredicate((adapter) => adapter.name === client.name);
|
||||||
// url, now.http.secret, this.core, this,
|
}
|
||||||
// ));
|
|
||||||
// });
|
// 注册新的 HTTP 服务器
|
||||||
// } else {
|
for (const server of addedHttpServers) {
|
||||||
// await this.networkManager.closeAdapterByPredicate(adapter => adapter instanceof OB11ActiveHttpAdapter);
|
if (server.enable) {
|
||||||
// }
|
this.networkManager.registerAdapter(
|
||||||
// } else if (now.http.enablePost) {
|
new OB11PassiveHttpAdapter(server.name, server.port, server.token, this.core, this.actions)
|
||||||
// const { added, removed } = this.findDifference<string>(prev.http.postUrls, now.http.postUrls);
|
);
|
||||||
// await this.networkManager.closeAdapterByPredicate(
|
}
|
||||||
// adapter => adapter instanceof OB11ActiveHttpAdapter && removed.includes(adapter.url),
|
}
|
||||||
// );
|
|
||||||
// for (const url of added) {
|
// 注册新的 HTTP 客户端
|
||||||
// await this.networkManager.registerAdapterAndOpen(new OB11ActiveHttpAdapter(
|
for (const client of addedHttpClients) {
|
||||||
// url, now.http.secret, this.core, this,
|
if (client.enable) {
|
||||||
// ));
|
this.networkManager.registerAdapter(
|
||||||
// }
|
new OB11ActiveHttpAdapter(client.name, client.url, client.token, this.core, this)
|
||||||
// }
|
);
|
||||||
|
}
|
||||||
// // check difference in passive websocket (Ws)
|
}
|
||||||
// if (prev.ws.enable !== now.ws.enable) {
|
|
||||||
// if (now.ws.enable) {
|
// 注册新的 WebSocket 服务器
|
||||||
// await this.networkManager.registerAdapterAndOpen(new OB11PassiveWebSocketAdapter(
|
for (const server of addedWebSocketServers) {
|
||||||
// now.ws.host, now.ws.port, now.heartInterval, now.token, this.core, this.actions,
|
if (server.enable) {
|
||||||
// ));
|
this.networkManager.registerAdapter(
|
||||||
// } else {
|
new OB11PassiveWebSocketAdapter(
|
||||||
// await this.networkManager.closeAdapterByPredicate(
|
server.name,
|
||||||
// adapter => adapter instanceof OB11PassiveWebSocketAdapter,
|
server.host,
|
||||||
// );
|
server.port,
|
||||||
// }
|
server.heartInterval,
|
||||||
// }
|
server.token,
|
||||||
|
this.core,
|
||||||
// // check difference in active websocket (ReverseWs)
|
this.actions
|
||||||
// if (prev.reverseWs.enable !== now.reverseWs.enable) {
|
)
|
||||||
// if (now.reverseWs.enable) {
|
);
|
||||||
// now.reverseWs.urls.forEach(url => {
|
}
|
||||||
// this.networkManager.registerAdapterAndOpen(new OB11ActiveWebSocketAdapter(
|
}
|
||||||
// url, 5000, now.heartInterval, now.token, this.core, this.actions,
|
|
||||||
// ));
|
// 注册新的 WebSocket 客户端
|
||||||
// });
|
for (const client of addedWebSocketClients) {
|
||||||
// } else {
|
if (client.enable) {
|
||||||
// await this.networkManager.closeAdapterByPredicate(
|
this.networkManager.registerAdapter(
|
||||||
// adapter => adapter instanceof OB11ActiveWebSocketAdapter,
|
new OB11ActiveWebSocketAdapter(
|
||||||
// );
|
client.name,
|
||||||
// }
|
client.url,
|
||||||
// } else if (now.reverseWs.enable) {
|
5000,
|
||||||
// const { added, removed } = this.findDifference<string>(prev.reverseWs.urls, now.reverseWs.urls);
|
client.heartInterval,
|
||||||
// await this.networkManager.closeAdapterByPredicate(
|
client.token,
|
||||||
// adapter => adapter instanceof OB11ActiveWebSocketAdapter && removed.includes(adapter.url),
|
this.core,
|
||||||
// );
|
this.actions
|
||||||
// for (const url of added) {
|
)
|
||||||
// await this.networkManager.registerAdapterAndOpen(new OB11ActiveWebSocketAdapter(
|
);
|
||||||
// url, 5000, now.heartInterval, now.token, this.core, this.actions,
|
}
|
||||||
// ));
|
}
|
||||||
// }
|
|
||||||
// }
|
// 打开所有新的网络适配器
|
||||||
|
await this.networkManager.openAllAdapters();
|
||||||
// }
|
}
|
||||||
|
|
||||||
private findDifference<T>(prev: T[], now: T[]): { added: T[]; removed: T[] } {
|
private findDifference<T>(prev: T[], now: T[]): { added: T[]; removed: T[] } {
|
||||||
const added = now.filter((item) => !prev.includes(item));
|
const added = now.filter((item) => !prev.includes(item));
|
||||||
const removed = prev.filter((item) => !now.includes(item));
|
const removed = prev.filter((item) => !now.includes(item));
|
||||||
|
|||||||
Reference in New Issue
Block a user