From c6b6ab8be61dd5463a7f6e378b2ed43751ea783a Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Wed, 26 Feb 2020 17:34:14 -0800 Subject: [PATCH 1/7] lint --- js/background.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/background.js b/js/background.js index 910c4b1bd..218acba75 100644 --- a/js/background.js +++ b/js/background.js @@ -259,6 +259,7 @@ window.initialisedAPI = true; if (storage.get('isSecondaryDevice')) { + window.log.info('Initialising as a secondary device'); window.lokiFileServerAPI.updateOurDeviceMapping(); } }; @@ -1365,6 +1366,7 @@ }); Whisper.events.on('deviceUnpairingRequested', async pubKey => { + window.log.info('unpairing device...'); await libloki.storage.removePairingAuthorisationForSecondaryPubKey( pubKey ); From 5b412f74ad8c338e245e9174a5d3b03a777a25af Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Wed, 26 Feb 2020 17:36:56 -0800 Subject: [PATCH 2/7] Revert "lint" This reverts commit c6b6ab8be61dd5463a7f6e378b2ed43751ea783a. --- js/background.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/background.js b/js/background.js index 218acba75..910c4b1bd 100644 --- a/js/background.js +++ b/js/background.js @@ -259,7 +259,6 @@ window.initialisedAPI = true; if (storage.get('isSecondaryDevice')) { - window.log.info('Initialising as a secondary device'); window.lokiFileServerAPI.updateOurDeviceMapping(); } }; @@ -1366,7 +1365,6 @@ }); Whisper.events.on('deviceUnpairingRequested', async pubKey => { - window.log.info('unpairing device...'); await libloki.storage.removePairingAuthorisationForSecondaryPubKey( pubKey ); From 97393ef25df7e299c4b44830e5cf57ad1bc260cb Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Wed, 26 Feb 2020 18:17:51 -0800 Subject: [PATCH 3/7] fix message order when mix multidevice messages, improve error logging --- js/modules/loki_app_dot_net_api.js | 63 ++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 8158a5bc2..d5e321cbf 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -627,6 +627,12 @@ class LokiAppDotNetServerAPI { url ); } + if (mode === '_sendToProxy') { + // if we can detect, certain types of failures, we can retry... + if (e.code === 'ECONNRESET') { + // retry with counter? + } + } return { err: e, }; @@ -1476,6 +1482,14 @@ class LokiPublicChannelAPI { }); if (res.err || !res.response) { + log.error( + 'Could not get messages from', + this.serverAPI.baseServerUrl, + this.baseChannelUrl + ); + if (res.err) { + log.error('pollOnceForMessages receive error', res.err); + } return; } @@ -1663,18 +1677,31 @@ class LokiPublicChannelAPI { // filter out invalid messages pendingMessages = pendingMessages.filter(messageData => !!messageData); // separate messages coming from primary and secondary devices - const [primaryMessages, slaveMessages] = _.partition( + let [primaryMessages, slaveMessages] = _.partition( pendingMessages, message => !(message.source in slavePrimaryMap) ); - // process primary devices' message directly - primaryMessages.forEach(message => - this.chatAPI.emit('publicMessage', { - message, - }) - ); - - pendingMessages = []; // allow memory to be freed + // get minimum ID for primaryMessages and slaveMessages + const firstPrimaryId = Math.min(...primaryMessages.map(msg => msg.serverId)); + const firstSlaveId = Math.min(...slaveMessages.map(msg => msg.serverId)); + if (firstPrimaryId < firstSlaveId) { + // early send + // split off count from pendingMessages + let sendNow = []; + ([sendNow, pendingMessages] = _.partition( + pendingMessages, + message => message.serverId < firstSlaveId + )); + sendNow.forEach(message => { + // send them out now + log.info('emitting primary message', message.serverId); + this.chatAPI.emit('publicMessage', { + message, + }); + }); + sendNow = false; + } + primaryMessages = false; // free memory // get actual chat server data (mainly the name rn) of primary device const verifiedDeviceResults = await this.serverAPI.getUsers( @@ -1731,11 +1758,25 @@ class LokiPublicChannelAPI { messageData.message.profileKey = profileKey; } } - /* eslint-enable no-param-reassign */ + }); + slaveMessages = false; // free memory + + // process all messages in the order received + pendingMessages.forEach(message => { + // if slave device + if (message.source in slavePrimaryMap) { + // prevent our own device sent messages from coming back in + if (message.source === ourNumberDevice) { + // we originally sent these + return; + } + } + log.info('emitting pending message', message.serverId); this.chatAPI.emit('publicMessage', { - message: messageData, + message, }); }); + /* eslint-enable no-param-reassign */ // if we received one of our own messages From c36fd8ae6278df356a50e321ab7d9a092f6457fe Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Thu, 27 Feb 2020 01:04:41 -0800 Subject: [PATCH 4/7] handle image/ avatar paths --- js/modules/loki_app_dot_net_api.js | 71 ++++++++++++++++++------------ 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 613ee25f8..5791b7347 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -5,6 +5,7 @@ const nodeFetch = require('node-fetch'); const { URL, URLSearchParams } = require('url'); const FormData = require('form-data'); const https = require('https'); +const path = require('path'); // Can't be less than 1200 if we have unauth'd requests const PUBLICCHAT_MSG_POLL_EVERY = 1.5 * 1000; // 1.5s @@ -1254,38 +1255,50 @@ class LokiPublicChannelAPI { this.conversation.setGroupName(note.value.name); } if (note.value && note.value.avatar) { - const avatarAbsUrl = this.serverAPI.baseServerUrl + note.value.avatar; - const { - writeNewAttachmentData, - deleteAttachmentData, - } = window.Signal.Migrations; - // do we already have this image? no, then - - // download a copy and save it - const imageData = await nodeFetch(avatarAbsUrl); - // eslint-disable-next-line no-inner-declarations - function toArrayBuffer(buf) { - const ab = new ArrayBuffer(buf.length); - const view = new Uint8Array(ab); - // eslint-disable-next-line no-plusplus - for (let i = 0; i < buf.length; i++) { - view[i] = buf[i]; + if (note.value.avatar.match(/^images\//)) { + // local file avatar + const resolvedAvatar = path.normalize(note.value.avatar); + const base = path.normalize('images/'); + const re = new RegExp(`^${base}`) + // do we at least ends up inside images/ somewhere? + if (re.test(resolvedAvatar)) { + this.conversation.set('avatar', resolvedAvatar); } - return ab; - } - // eslint-enable-next-line no-inner-declarations - - const buffer = await imageData.buffer(); - const newAttributes = await window.Signal.Types.Conversation.maybeUpdateAvatar( - this.conversation.attributes, - toArrayBuffer(buffer), - { + } else { + // relative URL avatar + const avatarAbsUrl = this.serverAPI.baseServerUrl + note.value.avatar; + const { writeNewAttachmentData, deleteAttachmentData, + } = window.Signal.Migrations; + // do we already have this image? no, then + + // download a copy and save it + const imageData = await nodeFetch(avatarAbsUrl); + // eslint-disable-next-line no-inner-declarations + function toArrayBuffer(buf) { + const ab = new ArrayBuffer(buf.length); + const view = new Uint8Array(ab); + // eslint-disable-next-line no-plusplus + for (let i = 0; i < buf.length; i++) { + view[i] = buf[i]; + } + return ab; } - ); - // update group - this.conversation.set('avatar', newAttributes.avatar); + // eslint-enable-next-line no-inner-declarations + + const buffer = await imageData.buffer(); + const newAttributes = await window.Signal.Types.Conversation.maybeUpdateAvatar( + this.conversation.attributes, + toArrayBuffer(buffer), + { + writeNewAttachmentData, + deleteAttachmentData, + } + ); + // update group + this.conversation.set('avatar', newAttributes.avatar); + } } // is it mutable? // who are the moderators? @@ -1420,7 +1433,7 @@ class LokiPublicChannelAPI { } if (quote) { - // TODO: Enable quote attachments again using proper ADN style + // Disable quote attachments quote.attachments = []; } From 3038a8c7d203dac834907c9cda0d23af5e4ef4c5 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Mar 2020 18:48:25 -0800 Subject: [PATCH 5/7] use lodash to reduce confusion --- js/modules/loki_app_dot_net_api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 5791b7347..c6f77a010 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -1737,8 +1737,8 @@ class LokiPublicChannelAPI { message => !(message.source in slavePrimaryMap) ); // get minimum ID for primaryMessages and slaveMessages - const firstPrimaryId = Math.min(...primaryMessages.map(msg => msg.serverId)); - const firstSlaveId = Math.min(...slaveMessages.map(msg => msg.serverId)); + const firstPrimaryId = _.min(primaryMessages.map(msg => msg.serverId)); + const firstSlaveId = _.min(slaveMessages.map(msg => msg.serverId)); if (firstPrimaryId < firstSlaveId) { // early send // split off count from pendingMessages From 2b29b76d66399998bba95613d23900346c599d4f Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Mar 2020 18:54:17 -0800 Subject: [PATCH 6/7] lint --- js/modules/loki_app_dot_net_api.js | 6 +- js/modules/loki_message_api.js | 7 +- js/modules/loki_public_chat_api2.js | 209 ++++++++++++++++++ js/modules/loki_rpc.js | 7 +- js/modules/loki_snode_api.js | 21 +- libtextsecure/message_receiver.js | 5 +- .../conversation/CreateGroupDialog.tsx | 6 +- 7 files changed, 249 insertions(+), 12 deletions(-) create mode 100644 js/modules/loki_public_chat_api2.js diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index c6f77a010..c4945fd76 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -1259,7 +1259,7 @@ class LokiPublicChannelAPI { // local file avatar const resolvedAvatar = path.normalize(note.value.avatar); const base = path.normalize('images/'); - const re = new RegExp(`^${base}`) + const re = new RegExp(`^${base}`); // do we at least ends up inside images/ somewhere? if (re.test(resolvedAvatar)) { this.conversation.set('avatar', resolvedAvatar); @@ -1743,10 +1743,10 @@ class LokiPublicChannelAPI { // early send // split off count from pendingMessages let sendNow = []; - ([sendNow, pendingMessages] = _.partition( + [sendNow, pendingMessages] = _.partition( pendingMessages, message => message.serverId < firstSlaveId - )); + ); sendNow.forEach(message => { // send them out now log.info('emitting primary message', message.serverId); diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js index 98411fd85..88b02b7af 100644 --- a/js/modules/loki_message_api.js +++ b/js/modules/loki_message_api.js @@ -217,7 +217,12 @@ class LokiMessageAPI { } return true; } catch (e) { - log.warn('Loki send message error:', e.code, e.message, `from ${address}`); + log.warn( + 'Loki send message error:', + e.code, + e.message, + `from ${address}` + ); if (e instanceof textsecure.WrongSwarmError) { const { newSwarm } = e; await lokiSnodeAPI.updateSwarmNodes(params.pubKey, newSwarm); diff --git a/js/modules/loki_public_chat_api2.js b/js/modules/loki_public_chat_api2.js new file mode 100644 index 000000000..b2b55c4e2 --- /dev/null +++ b/js/modules/loki_public_chat_api2.js @@ -0,0 +1,209 @@ +/* global log, textsecure */ +const EventEmitter = require('events'); +const nodeFetch = require('node-fetch'); +const { URL, URLSearchParams } = require('url'); + +const GROUPCHAT_POLL_EVERY = 1000; // 1 second + +// singleton to relay events to libtextsecure/message_receiver +class LokiPublicChatAPI extends EventEmitter { + constructor(ourKey) { + super(); + this.ourKey = ourKey; + this.lastGot = {}; + this.servers = []; + } + findOrCreateServer(hostport) { + let thisServer = null; + log.info(`LokiPublicChatAPI looking for ${hostport}`); + this.servers.some(server => { + // if we already have this hostport registered + if (server.server === hostport) { + thisServer = server; + return true; + } + return false; + }); + if (thisServer === null) { + thisServer = new LokiPublicServerAPI(this, hostport); + this.servers.push(thisServer); + } + return thisServer; + } +} + +class LokiPublicServerAPI { + constructor(chatAPI, hostport) { + this.chatAPI = chatAPI; + this.server = hostport; + this.channels = []; + } + findOrCreateChannel(channelId, conversationId) { + let thisChannel = null; + this.channels.forEach(channel => { + if ( + channel.channelId === channelId && + channel.conversationId === conversationId + ) { + thisChannel = channel; + } + }); + if (thisChannel === null) { + thisChannel = new LokiPublicChannelAPI(this, channelId, conversationId); + this.channels.push(thisChannel); + } + return thisChannel; + } + unregisterChannel(channelId) { + // find it, remove it + // if no channels left, request we deregister server + return channelId || this; // this is just to make eslint happy + } +} + +class LokiPublicChannelAPI { + constructor(serverAPI, channelId, conversationId) { + this.serverAPI = serverAPI; + this.channelId = channelId; + this.baseChannelUrl = `${serverAPI.server}/channels/${this.channelId}`; + this.groupName = 'unknown'; + this.conversationId = conversationId; + this.lastGot = 0; + log.info(`registered LokiPublicChannel ${channelId}`); + // start polling + this.pollForMessages(); + } + + async pollForChannel(source, endpoint) { + // groupName will be loaded from server + const url = new URL(this.baseChannelUrl); + /* + const params = { + include_annotations: 1, + }; + */ + let res; + let success = true; + try { + res = await nodeFetch(url); + } catch (e) { + success = false; + } + + const response = await res.json(); + if (response.meta.code !== 200) { + success = false; + } + // update this.groupId + return endpoint || success; + } + + async pollForDeletions() { + // let id = 0; + // read all messages from 0 to current + // delete local copies if server state has changed to delete + // run every minute + const url = new URL(this.baseChannelUrl); + /* + const params = { + include_annotations: 1, + }; + */ + let res; + let success = true; + try { + res = await nodeFetch(url); + } catch (e) { + success = false; + } + + const response = await res.json(); + if (response.meta.code !== 200) { + success = false; + } + return success; + } + + async pollForMessages() { + const url = new URL(`${this.baseChannelUrl}/messages`); + const params = { + include_annotations: 1, + count: -20, + }; + if (this.lastGot) { + params.since_id = this.lastGot; + } + url.search = new URLSearchParams(params); + + let res; + let success = true; + try { + res = await nodeFetch(url); + } catch (e) { + success = false; + } + + const response = await res.json(); + if (response.meta.code !== 200) { + success = false; + } + + if (success) { + let receivedAt = new Date().getTime(); + response.data.forEach(adnMessage => { + // FIXME: create proper message for this message.DataMessage.body + let timestamp = new Date(adnMessage.created_at).getTime(); + let from = adnMessage.user.username; + let source; + if (adnMessage.annotations.length) { + const noteValue = adnMessage.annotations[0].value; + ({ from, timestamp, source } = noteValue); + } + + const messageData = { + friendRequest: false, + source, + sourceDevice: 1, + timestamp, + serverTimestamp: timestamp, + receivedAt, + isPublic: true, + message: { + body: adnMessage.text, + attachments: [], + group: { + id: this.conversationId, + type: textsecure.protobuf.GroupContext.Type.DELIVER, + }, + flags: 0, + expireTimer: 0, + profileKey: null, + timestamp, + received_at: receivedAt, + sent_at: timestamp, + quote: null, + contact: [], + preview: [], + profile: { + displayName: from, + }, + }, + }; + receivedAt += 1; // Ensure different arrival times + + this.serverAPI.chatAPI.emit('publicMessage', { + message: messageData, + }); + this.lastGot = !this.lastGot + ? adnMessage.id + : Math.max(this.lastGot, adnMessage.id); + }); + } + + setTimeout(() => { + this.pollForMessages(); + }, GROUPCHAT_POLL_EVERY); + } +} + +module.exports = LokiPublicChatAPI; diff --git a/js/modules/loki_rpc.js b/js/modules/loki_rpc.js index 61fb83926..5f29f6c38 100644 --- a/js/modules/loki_rpc.js +++ b/js/modules/loki_rpc.js @@ -70,7 +70,10 @@ const sendToProxy = async (options = {}, targetNode) => { // detect SNode is not ready (not in swarm; not done syncing) if (response.status === 503) { const ciphertext = await response.text(); - log.error(`lokiRpc sendToProxy snode ${randSnode.ip}:${randSnode.port} error`, ciphertext); + log.error( + `lokiRpc sendToProxy snode ${randSnode.ip}:${randSnode.port} error`, + ciphertext + ); // mark as bad for this round (should give it some time and improve success rates) lokiSnodeAPI.markRandomNodeUnreachable(randSnode); // retry for a new working snode @@ -104,7 +107,7 @@ const sendToProxy = async (options = {}, targetNode) => { const textDecoder = new TextDecoder(); plaintext = textDecoder.decode(plaintextBuffer); - } catch(e) { + } catch (e) { log.error( 'lokiRpc sendToProxy decode error', e.code, diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js index 7bc2944ed..7d163a215 100644 --- a/js/modules/loki_snode_api.js +++ b/js/modules/loki_snode_api.js @@ -31,7 +31,10 @@ class LokiSnodeAPI { ]; } - async initialiseRandomPool(seedNodes = [...window.seedNodeList], consecutiveErrors = 0) { + async initialiseRandomPool( + seedNodes = [...window.seedNodeList], + consecutiveErrors = 0 + ) { const params = { limit: 20, active_only: true, @@ -71,7 +74,10 @@ class LokiSnodeAPI { if (consecutiveErrors < 3) { // retry after a possible delay setTimeout(() => { - log.info('Retrying initialising random snode pool, try #', consecutiveErrors); + log.info( + 'Retrying initialising random snode pool, try #', + consecutiveErrors + ); this.initialiseRandomPool(seedNodes, consecutiveErrors + 1); }, consecutiveErrors * consecutiveErrors * 5000); } else { @@ -181,7 +187,12 @@ class LokiSnodeAPI { const snodes = result.snodes.filter(tSnode => tSnode.ip !== '0.0.0.0'); return snodes; } catch (e) { - log.error('getSnodesForPubkey error', e.code, e.message, `for ${snode.ip}:${snode.port}`); + log.error( + 'getSnodesForPubkey error', + e.code, + e.message, + `for ${snode.ip}:${snode.port}` + ); this.markRandomNodeUnreachable(snode); return []; } @@ -197,7 +208,9 @@ class LokiSnodeAPI { const resList = await this.getSnodesForPubkey(rSnode, pubKey); // should we only activate entries that are in all results? resList.map(item => { - const hasItem = snodes.some(hItem => item.ip === hItem.ip && item.port === hItem.port); + const hasItem = snodes.some( + hItem => item.ip === hItem.ip && item.port === hItem.port + ); if (!hasItem) { snodes.push(item); } diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js index 0e6204016..b6b24f355 100644 --- a/libtextsecure/message_receiver.js +++ b/libtextsecure/message_receiver.js @@ -59,7 +59,10 @@ function MessageReceiver(username, password, signalingKey, options = {}) { lokiPublicChatAPI.removeAllListeners('publicMessage'); // we only need one MR in the system handling these // bind events - lokiPublicChatAPI.on('publicMessage', this.handleUnencryptedMessage.bind(this)); + lokiPublicChatAPI.on( + 'publicMessage', + this.handleUnencryptedMessage.bind(this) + ); openGroupBound = true; } } else { diff --git a/ts/components/conversation/CreateGroupDialog.tsx b/ts/components/conversation/CreateGroupDialog.tsx index ce853d4ce..482a35579 100644 --- a/ts/components/conversation/CreateGroupDialog.tsx +++ b/ts/components/conversation/CreateGroupDialog.tsx @@ -95,7 +95,11 @@ export class CreateGroupDialog extends React.Component { ); return ( - null}> + null} + >

{this.state.errorMessage}

From ce876a8024c3526189f80b27dd129241d1ac047d Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Mar 2020 19:03:15 -0800 Subject: [PATCH 7/7] not meant to include this --- js/modules/loki_public_chat_api2.js | 209 ---------------------------- 1 file changed, 209 deletions(-) delete mode 100644 js/modules/loki_public_chat_api2.js diff --git a/js/modules/loki_public_chat_api2.js b/js/modules/loki_public_chat_api2.js deleted file mode 100644 index b2b55c4e2..000000000 --- a/js/modules/loki_public_chat_api2.js +++ /dev/null @@ -1,209 +0,0 @@ -/* global log, textsecure */ -const EventEmitter = require('events'); -const nodeFetch = require('node-fetch'); -const { URL, URLSearchParams } = require('url'); - -const GROUPCHAT_POLL_EVERY = 1000; // 1 second - -// singleton to relay events to libtextsecure/message_receiver -class LokiPublicChatAPI extends EventEmitter { - constructor(ourKey) { - super(); - this.ourKey = ourKey; - this.lastGot = {}; - this.servers = []; - } - findOrCreateServer(hostport) { - let thisServer = null; - log.info(`LokiPublicChatAPI looking for ${hostport}`); - this.servers.some(server => { - // if we already have this hostport registered - if (server.server === hostport) { - thisServer = server; - return true; - } - return false; - }); - if (thisServer === null) { - thisServer = new LokiPublicServerAPI(this, hostport); - this.servers.push(thisServer); - } - return thisServer; - } -} - -class LokiPublicServerAPI { - constructor(chatAPI, hostport) { - this.chatAPI = chatAPI; - this.server = hostport; - this.channels = []; - } - findOrCreateChannel(channelId, conversationId) { - let thisChannel = null; - this.channels.forEach(channel => { - if ( - channel.channelId === channelId && - channel.conversationId === conversationId - ) { - thisChannel = channel; - } - }); - if (thisChannel === null) { - thisChannel = new LokiPublicChannelAPI(this, channelId, conversationId); - this.channels.push(thisChannel); - } - return thisChannel; - } - unregisterChannel(channelId) { - // find it, remove it - // if no channels left, request we deregister server - return channelId || this; // this is just to make eslint happy - } -} - -class LokiPublicChannelAPI { - constructor(serverAPI, channelId, conversationId) { - this.serverAPI = serverAPI; - this.channelId = channelId; - this.baseChannelUrl = `${serverAPI.server}/channels/${this.channelId}`; - this.groupName = 'unknown'; - this.conversationId = conversationId; - this.lastGot = 0; - log.info(`registered LokiPublicChannel ${channelId}`); - // start polling - this.pollForMessages(); - } - - async pollForChannel(source, endpoint) { - // groupName will be loaded from server - const url = new URL(this.baseChannelUrl); - /* - const params = { - include_annotations: 1, - }; - */ - let res; - let success = true; - try { - res = await nodeFetch(url); - } catch (e) { - success = false; - } - - const response = await res.json(); - if (response.meta.code !== 200) { - success = false; - } - // update this.groupId - return endpoint || success; - } - - async pollForDeletions() { - // let id = 0; - // read all messages from 0 to current - // delete local copies if server state has changed to delete - // run every minute - const url = new URL(this.baseChannelUrl); - /* - const params = { - include_annotations: 1, - }; - */ - let res; - let success = true; - try { - res = await nodeFetch(url); - } catch (e) { - success = false; - } - - const response = await res.json(); - if (response.meta.code !== 200) { - success = false; - } - return success; - } - - async pollForMessages() { - const url = new URL(`${this.baseChannelUrl}/messages`); - const params = { - include_annotations: 1, - count: -20, - }; - if (this.lastGot) { - params.since_id = this.lastGot; - } - url.search = new URLSearchParams(params); - - let res; - let success = true; - try { - res = await nodeFetch(url); - } catch (e) { - success = false; - } - - const response = await res.json(); - if (response.meta.code !== 200) { - success = false; - } - - if (success) { - let receivedAt = new Date().getTime(); - response.data.forEach(adnMessage => { - // FIXME: create proper message for this message.DataMessage.body - let timestamp = new Date(adnMessage.created_at).getTime(); - let from = adnMessage.user.username; - let source; - if (adnMessage.annotations.length) { - const noteValue = adnMessage.annotations[0].value; - ({ from, timestamp, source } = noteValue); - } - - const messageData = { - friendRequest: false, - source, - sourceDevice: 1, - timestamp, - serverTimestamp: timestamp, - receivedAt, - isPublic: true, - message: { - body: adnMessage.text, - attachments: [], - group: { - id: this.conversationId, - type: textsecure.protobuf.GroupContext.Type.DELIVER, - }, - flags: 0, - expireTimer: 0, - profileKey: null, - timestamp, - received_at: receivedAt, - sent_at: timestamp, - quote: null, - contact: [], - preview: [], - profile: { - displayName: from, - }, - }, - }; - receivedAt += 1; // Ensure different arrival times - - this.serverAPI.chatAPI.emit('publicMessage', { - message: messageData, - }); - this.lastGot = !this.lastGot - ? adnMessage.id - : Math.max(this.lastGot, adnMessage.id); - }); - } - - setTimeout(() => { - this.pollForMessages(); - }, GROUPCHAT_POLL_EVERY); - } -} - -module.exports = LokiPublicChatAPI;