keinBot/cuffeo
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- slack: bugfix

Browse Source 
- update flumm-fetch-cookies
- version bump to 1.0.5
This commit is contained in:
Flummi 2020-02-13 12:35:39 +01:00
parent f18d318334
commit a221ef715a
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "cuffeo", "name": "cuffeo",
"version": "1.0.4", "version": "1.0.5",
"description": "A multi-protocol chatbot library with nearly zero dependencies.", "description": "A multi-protocol chatbot library with nearly zero dependencies.",
"main": "src/index.mjs", "main": "src/index.mjs",
"scripts": {}, "scripts": {},
@ -17,7 +17,7 @@
"author": "Flummi & jkhsjdhjs", "author": "Flummi & jkhsjdhjs",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"flumm-fetch-cookies": "^1.1.1" "flumm-fetch-cookies": "^1.3.4"
}, },
"bugs": { "bugs": {
"url": "https://github.com/kein-Bot/cuffeo/issues" "url": "https://github.com/kein-Bot/cuffeo/issues"

35
src/clients/slack.mjs
View File

@ -31,15 +31,15 @@ export default class slack extends EventEmitter {
async connect() { async connect() {
const res = await (await fetch(`${this.api}/rtm.start?token=${this.token}`)).json(); const res = await (await fetch(`${this.api}/rtm.start?token=${this.token}`)).json();
if (!res.ok)
return this.emit("data", [ "error", res.description ]); // more infos
res.channels.forEach(channel => this.server.channel.set(channel.id, channel.name)); res.channels.forEach(channel => this.server.channel.set(channel.id, channel.name));
res.users.forEach(user => this.server.user.set(user.id, { res.users.forEach(user => this.server.user.set(user.id, {
account: user.name, account: user.name,
nickname: user.real_name nickname: user.real_name
})); }));
if (!res.ok)
return this.emit("data", [ "error", res.description ]); // more infos
this.server.wss.url = url.parse(res.url); this.server.wss.url = url.parse(res.url);
https.get({ https.get({
@ -60,26 +60,26 @@ export default class slack extends EventEmitter {
this.server.wss.socket.on("data", async data => { this.server.wss.socket.on("data", async data => {
try { try {
if(data.length < 2) if (data.length < 2)
throw "payload too short"; throw "payload too short";
if(data[1] & 0x80) if (data[1] & 0x80)
throw "we no accept masked data"; throw "we no accept masked data";
let offset = 2; let offset = 2;
let length = data[1] & 0x7F; let length = data[1] & 0x7F;
if(length === 126) { if (length === 126) {
offset = 4; offset = 4;
length = data.readUInt16BE(2); length = data.readUInt16BE(2);
} }
else if(length === 127) else if(length === 127)
throw "payload too long"; throw "payload too long";
if(data.length < length + offset) if (data.length < length + offset)
throw "payload shorter than given length"; throw "payload shorter than given length";
//console.log(data, offset, length); //console.log(data, offset, length);
data = JSON.parse(data.slice(offset, length + offset).toString().replace(/\0+$/, "")); // trim null bytes at the end data = JSON.parse(data.slice(offset, length + offset).toString().replace(/\0+$/, "")); // trim null bytes at the end
//console.log(data, data.type); //console.log(data, data.type);
if(data.type !== "message") if (data.type !== "message")
return false; return false;
await Promise.all([this.getChannel(data.channel), this.getUser(data.user)]); await Promise.all([this.getChannel(data.channel), this.getUser(data.user)]);
@ -90,25 +90,25 @@ export default class slack extends EventEmitter {
this.emit("data", [ "error", err ]); this.emit("data", [ "error", err ]);
} }
}) })
.on("end", () => { .on("end", async () => {
this.emit("data", [ "debug", "stream ended" ]); this.emit("data", [ "debug", "stream ended" ]);
this.reconnect(); await this.reconnect();
}) })
.on("error", err => { .on("error", async err => {
this.emit("data", [ "error", err ]); this.emit("data", [ "error", err ]);
this.reconnect(); await this.reconnect();
}); });
}); });
} }
reconnect() { async reconnect() {
this.server.wss.url = null; this.server.wss.url = null;
this.server.wss.socket = null; this.server.wss.socket = null;
this.connect(); await this.connect();
} }
async getChannel(channelId) { async getChannel(channelId) {
if(this.server.channel.has(channelId)) if (this.server.channel.has(channelId))
return this.server.channel.get(channelId); return this.server.channel.get(channelId);
const res = await (await fetch(`${this.api}/conversations.info?channel=${channelId}&token=${this.token}`)).json(); const res = await (await fetch(`${this.api}/conversations.info?channel=${channelId}&token=${this.token}`)).json();
@ -117,7 +117,7 @@ export default class slack extends EventEmitter {
} }
async getUser(userId) { async getUser(userId) {
if(this.server.user.has(userId)) if (this.server.user.has(userId))
return this.server.user.get(userId); return this.server.user.get(userId);
const res = await (await fetch(`${this.api}/users.info?user=${userId}&token=${this.token}`)).json(); const res = await (await fetch(`${this.api}/users.info?user=${userId}&token=${this.token}`)).json();
@ -167,6 +167,9 @@ export default class slack extends EventEmitter {
if(frame_length > 6) if(frame_length > 6)
frame.writeUInt16BE(payload.length, 2); frame.writeUInt16BE(payload.length, 2);
if (!this.server.wss.socket)
await this.reconnect();
this.server.wss.socket.cork(); this.server.wss.socket.cork();
this.server.wss.socket.write(frame); this.server.wss.socket.write(frame);
this.server.wss.socket.write(Buffer.from(msg)); this.server.wss.socket.write(Buffer.from(msg));