aux
/
mx-puppet-xmpp
mirror of https://github.com/plantroon/mx-puppet-xmpp.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

add some more logging

This commit is contained in:
Sorunome 2020-04-22 19:15:15 +02:00
parent 82bf74f145
commit fe31f07830
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/client.ts
View File

@ -156,10 +156,14 @@ export class Client extends EventEmitter {
} }
public async getContact(id: string): Promise<SkypeContact | null> { public async getContact(id: string): Promise<SkypeContact | null> {
log.debug(`Fetching contact ${id}`);
const hasStart = Boolean(id.match(/^\d+:/)); const hasStart = Boolean(id.match(/^\d+:/));
const fullId = hasStart ? id : `8:${id}`; const fullId = hasStart ? id : `8:${id}`;
if (this.contacts.has(fullId)) { if (this.contacts.has(fullId)) {
return this.contacts.get(fullId) || null; log.debug("Returning cached result");
const ret = this.contacts.get(fullId) || null;
log.silly(ret);
return ret;
} }
if (hasStart) { if (hasStart) {
id = id.substr(id.indexOf(":") + 1); id = id.substr(id.indexOf(":") + 1);
@ -185,15 +189,19 @@ export class Client extends EventEmitter {
}, },
}; };
this.contacts.set(contact.mri, contact || null); this.contacts.set(contact.mri, contact || null);
log.debug("Returning new result");
log.silly(contact);
return contact || null; return contact || null;
} catch (err) { } catch (err) {
// contact not found // contact not found
log.debug("No such contact found");
this.contacts.set(fullId, null); this.contacts.set(fullId, null);
return null; return null;
} }
} }
public async getConversation(room: IRemoteRoom): Promise<skypeHttp.Conversation | null> { public async getConversation(room: IRemoteRoom): Promise<skypeHttp.Conversation | null> {
log.debug(`Fetching conversation puppetId=${room.puppetId} roomId=${room.roomId}`);
let id = room.roomId; let id = room.roomId;
const match = id.match(/^dm-\d+-/); const match = id.match(/^dm-\d+-/);
if (match) { if (match) {
@ -204,14 +212,20 @@ export class Client extends EventEmitter {
id = id.substr(match[0].length); id = id.substr(match[0].length);
} }
if (this.conversations.has(id)) { if (this.conversations.has(id)) {
return this.conversations.get(id) || null; log.debug("Returning cached result");
const ret = this.conversations.get(id) || null;
log.silly(ret);
return ret;
} }
try { try {
const conversation = await this.api.getConversation(id); const conversation = await this.api.getConversation(id);
this.conversations.set(conversation.id, conversation || null); this.conversations.set(conversation.id, conversation || null);
log.debug("Returning new result");
log.silly(conversation);
return conversation || null; return conversation || null;
} catch (err) { } catch (err) {
// conversation not found // conversation not found
log.debug("No such conversation found");
this.conversations.set(id, null); this.conversations.set(id, null);
return null; return null;
} }