Skip to content

C
converse.js
Commit 55fce912 authored by JC Brand's avatar JC Brand Committed by GitHub
Browse files
Options

Merge branch 'master' into async-await

parents 35b7dbe3 c583678c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1167 additions and 1175 deletions
CHANGES.md
View file @ 55fce912
# Changelog # Changelog
## 4.1.0 (Unreleased) ## 4.0.4 (Unreleased)
- Use [Lerna](https://lernajs.io/) to create the @converse/headless package - Use [Lerna](https://lernajs.io/) to create the @converse/headless package
- Use ES2015 modules instead of UMD. - Use ES2015 modules instead of UMD.
- #1257: Prefer 'probably' over 'maybe' when evaluating audio play support. - #1257 Prefer 'probably' over 'maybe' when evaluating audio play support.
- #1261 File upload not working
## 4.0.3 (2018-10-22) ## 4.0.3 (2018-10-22)
......
dist/converse.js
View file @ 55fce912
This diff is collapsed.
package-lock.json
View file @ 55fce912
...@@ -3178,16 +3178,13 @@ ...@@ -3178,16 +3178,13 @@
"version": "1.3.3", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz", "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz",
"integrity": "sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=", "integrity": "sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=",
"dev": true,
"requires": { "requires": {
"underscore": ">=1.8.3" "underscore": ">=1.8.3"
} }
}, },
"backbone.browserStorage": { "backbone.browserStorage": {
"version": "0.0.4", "version": "github:jcbrand/Backbone.browserStorage#03bfa13f68b71f97be361840adc5a5064f57b47e",
"resolved": "https://registry.npmjs.org/backbone.browserStorage/-/backbone.browserStorage-0.0.4.tgz", "from": "github:jcbrand/Backbone.browserStorage#03bfa13f68b71f97be361840adc5a5064f57b47e",
"integrity": "sha512-4LvDP2IkOu9Nt6kj6ft4moKmqKqm3c0WY3c/aie0Cf374wjFuO7vCh/afcKdu1YSuVsryM8yH90/J7yqWbaPHw==",
"dev": true,
"requires": { "requires": {
"backbone": "~1.x.x", "backbone": "~1.x.x",
"underscore": ">=1.4.0" "underscore": ">=1.4.0"
...@@ -15220,8 +15217,7 @@ ...@@ -15220,8 +15217,7 @@
"underscore": { "underscore": {
"version": "1.8.3", "version": "1.8.3",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
"dev": true
}, },
"underscore-contrib": { "underscore-contrib": {
"version": "0.3.0", "version": "0.3.0",
......
spec/chatbox.js
View file @ 55fce912
...@@ -1020,47 +1020,41 @@ ...@@ -1020,47 +1020,41 @@
it("will clear any other chat status notifications", it("will clear any other chat status notifications",
mock.initConverseWithPromises( mock.initConverseWithPromises(
null, ['rosterGroupsFetched', 'chatBoxesFetched'], {}, null, ['rosterGroupsFetched', 'chatBoxesFetched'], {},
function (done, _converse) { async function (done, _converse) {
test_utils.createContacts(_converse, 'current'); test_utils.createContacts(_converse, 'current');
_converse.emit('rosterContactsFetched'); _converse.emit('rosterContactsFetched');
test_utils.openControlBox(); test_utils.openControlBox();
const sender_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@localhost'; const sender_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@localhost';
let view;
// See XEP-0085 http://xmpp.org/extensions/xep-0085.html#definitions // See XEP-0085 http://xmpp.org/extensions/xep-0085.html#definitions
spyOn(_converse, 'emit'); spyOn(_converse, 'emit');
test_utils.openChatBoxFor(_converse, sender_jid) await test_utils.openChatBoxFor(_converse, sender_jid);
.then(() => { const view = _converse.chatboxviews.get(sender_jid);
view = _converse.chatboxviews.get(sender_jid); expect(view.el.querySelectorAll('.chat-event').length).toBe(0);
expect(view.el.querySelectorAll('.chat-event').length).toBe(0); // Insert <composing> message, to also check that
// Insert <composing> message, to also check that // text messages are inserted correctly with
// text messages are inserted correctly with // temporary chat events in the chat contents.
// temporary chat events in the chat contents. let msg = $msg({
const msg = $msg({ 'to': _converse.bare_jid,
'to': _converse.bare_jid, 'xmlns': 'jabber:client',
'xmlns': 'jabber:client', 'from': sender_jid,
'from': sender_jid, 'type': 'chat'})
'type': 'chat'}) .c('composing', {'xmlns': Strophe.NS.CHATSTATES}).up()
.c('composing', {'xmlns': Strophe.NS.CHATSTATES}).up() .tree();
.tree(); _converse.chatboxes.onMessage(msg);
_converse.chatboxes.onMessage(msg); await test_utils.waitUntil(() => view.model.messages.length);
return test_utils.waitUntil(() => view.model.messages.length); expect(view.el.querySelectorAll('.chat-state-notification').length).toBe(1);
}).then(() => { msg = $msg({
expect(view.el.querySelectorAll('.chat-state-notification').length).toBe(1); from: sender_jid,
const msg = $msg({ to: _converse.connection.jid,
from: sender_jid, type: 'chat',
to: _converse.connection.jid, id: (new Date()).getTime()
type: 'chat', }).c('body').c('inactive', {'xmlns': Strophe.NS.CHATSTATES}).tree();
id: (new Date()).getTime() _converse.chatboxes.onMessage(msg);
}).c('body').c('inactive', {'xmlns': Strophe.NS.CHATSTATES}).tree(); await test_utils.waitUntil(() => (view.model.messages.length > 1));
_converse.chatboxes.onMessage(msg); expect(_converse.emit).toHaveBeenCalledWith('message', jasmine.any(Object));
return test_utils.waitUntil(() => (view.model.messages.length > 1)); expect(view.el.querySelectorAll('.chat-state-notification').length).toBe(0);
}).then(() => { done();
expect(_converse.emit).toHaveBeenCalledWith('message', jasmine.any(Object));
expect($(view.el).find('.chat-state-notification').length).toBe(0);
done();
});
})); }));
}); });
......
spec/chatroom.js
View file @ 55fce912
...@@ -3737,9 +3737,9 @@ ...@@ -3737,9 +3737,9 @@
})); }));
it("contains a link to a modal which can list groupchats publically available on the server", it("contains a link to a modal which can list groupchats publically available on the server",
mock.initConverseWithPromises( mock.initConverseWithPromises(
null, ['rosterGroupsFetched', 'chatBoxesFetched'], {}, null, ['rosterGroupsFetched', 'chatBoxesFetched'], {},
function (done, _converse) { async function (done, _converse) {
var sendIQ = _converse.connection.sendIQ; var sendIQ = _converse.connection.sendIQ;
var sent_stanza, IQ_id; var sent_stanza, IQ_id;
...@@ -3753,53 +3753,49 @@ ...@@ -3753,53 +3753,49 @@
roomspanel.el.querySelector('.show-list-muc-modal').click(); roomspanel.el.querySelector('.show-list-muc-modal').click();
test_utils.closeControlBox(_converse); test_utils.closeControlBox(_converse);
const modal = roomspanel.list_rooms_modal; const modal = roomspanel.list_rooms_modal;
test_utils.waitUntil(() => u.isVisible(modal.el), 1000) await test_utils.waitUntil(() => u.isVisible(modal.el), 1000);
.then(() => { spyOn(_converse.ChatRoom.prototype, 'getRoomFeatures').and.callFake(() => Promise.resolve());
spyOn(_converse.ChatRoom.prototype, 'getRoomFeatures').and.callFake(() => Promise.resolve()); roomspanel.delegateEvents(); // We need to rebind all events otherwise our spy won't be called
roomspanel.delegateEvents(); // We need to rebind all events otherwise our spy won't be called
// See: http://xmpp.org/extensions/xep-0045.html#disco-rooms
// See: http://xmpp.org/extensions/xep-0045.html#disco-rooms expect(modal.el.querySelectorAll('.available-chatrooms li').length).toBe(0);
expect(modal.el.querySelectorAll('.available-chatrooms li').length).toBe(0);
const input = modal.el.querySelector('input[name="server"]').value = 'chat.shakespear.lit';
const input = modal.el.querySelector('input[name="server"]').value = 'chat.shakespear.lit'; modal.el.querySelector('input[type="submit"]').click();
modal.el.querySelector('input[type="submit"]').click(); await test_utils.waitUntil(() => _converse.chatboxes.length);
return test_utils.waitUntil(() => _converse.chatboxes.length); expect(sent_stanza.toLocaleString()).toBe(
}).then(() => { `<iq from="dummy@localhost/resource" id="${IQ_id}" to="chat.shakespear.lit" type="get" xmlns="jabber:client">`+
expect(sent_stanza.toLocaleString()).toBe( `<query xmlns="http://jabber.org/protocol/disco#items"/>`+
`<iq from="dummy@localhost/resource" id="${IQ_id}" to="chat.shakespear.lit" type="get" xmlns="jabber:client">`+ `</iq>`
`<query xmlns="http://jabber.org/protocol/disco#items"/>`+ );
`</iq>`
);
var iq = $iq({ const iq = $iq({
from:'muc.localhost', from:'muc.localhost',
to:'dummy@localhost/pda', to:'dummy@localhost/pda',
id: IQ_id, id: IQ_id,
type:'result' type:'result'
}).c('query') }).c('query')
.c('item', { jid:'heath@chat.shakespeare.lit', name:'A Lonely Heath'}).up() .c('item', { jid:'heath@chat.shakespeare.lit', name:'A Lonely Heath'}).up()
.c('item', { jid:'coven@chat.shakespeare.lit', name:'A Dark Cave'}).up() .c('item', { jid:'coven@chat.shakespeare.lit', name:'A Dark Cave'}).up()
.c('item', { jid:'forres@chat.shakespeare.lit', name:'The Palace'}).up() .c('item', { jid:'forres@chat.shakespeare.lit', name:'The Palace'}).up()
.c('item', { jid:'inverness@chat.shakespeare.lit', name:'Macbeth&apos;s Castle'}).nodeTree; .c('item', { jid:'inverness@chat.shakespeare.lit', name:'Macbeth&apos;s Castle'}).nodeTree;
_converse.connection._dataRecv(test_utils.createRequest(iq)); _converse.connection._dataRecv(test_utils.createRequest(iq));
expect(modal.el.querySelectorAll('.available-chatrooms li').length).toBe(5); await test_utils.waitUntil(() => modal.el.querySelectorAll('.available-chatrooms li').length === 5);
const rooms = modal.el.querySelectorAll('.available-chatrooms li'); const rooms = modal.el.querySelectorAll('.available-chatrooms li');
expect(rooms[0].textContent.trim()).toBe("Groupchats found:"); expect(rooms[0].textContent.trim()).toBe("Groupchats found:");
expect(rooms[1].textContent.trim()).toBe("A Lonely Heath"); expect(rooms[1].textContent.trim()).toBe("A Lonely Heath");
expect(rooms[2].textContent.trim()).toBe("A Dark Cave"); expect(rooms[2].textContent.trim()).toBe("A Dark Cave");
expect(rooms[3].textContent.trim()).toBe("The Palace"); expect(rooms[3].textContent.trim()).toBe("The Palace");
expect(rooms[4].textContent.trim()).toBe("Macbeth's Castle"); expect(rooms[4].textContent.trim()).toBe("Macbeth's Castle");
rooms[4].querySelector('.open-room').click(); rooms[4].querySelector('.open-room').click();
return test_utils.waitUntil(() => _converse.chatboxes.length > 1); await test_utils.waitUntil(() => _converse.chatboxes.length > 1);
}).then(() => { expect(sizzle('.chatroom', _converse.el).filter(u.isVisible).length).toBe(1); // There should now be an open chatroom
expect(sizzle('.chatroom', _converse.el).filter(u.isVisible).length).toBe(1); // There should now be an open chatroom var view = _converse.chatboxviews.get('inverness@chat.shakespeare.lit');
var view = _converse.chatboxviews.get('inverness@chat.shakespeare.lit'); expect(view.el.querySelector('.chat-head-chatroom').textContent.trim()).toBe("Macbeth's Castle");
expect(view.el.querySelector('.chat-head-chatroom').textContent.trim()).toBe("Macbeth's Castle"); done();
done();
}).catch(_.partial(console.error, _));
})); }));
it("shows the number of unread mentions received", it("shows the number of unread mentions received",
......
spec/mam.js
View file @ 55fce912
This diff is collapsed.
spec/protocol.js
View file @ 55fce912
This diff is collapsed.
spec/roster.js
View file @ 55fce912
This diff is collapsed.
src/converse-chatview.js
View file @ 55fce912
...@@ -533,6 +533,9 @@ converse.plugins.add('converse-chatview', { ...@@ -533,6 +533,9 @@ converse.plugins.add('converse-chatview', {
prev_msg_date = _.isNull(prev_msg_el) ? null : prev_msg_el.getAttribute('data-isodate'), prev_msg_date = _.isNull(prev_msg_el) ? null : prev_msg_el.getAttribute('data-isodate'),
next_msg_date = next_msg_el.getAttribute('data-isodate'); next_msg_date = next_msg_el.getAttribute('data-isodate');
if (_.isNull(prev_msg_date) && _.isNull(next_msg_date)) {
return;
}
if (_.isNull(prev_msg_date) || moment(next_msg_date).isAfter(prev_msg_date, 'day')) { if (_.isNull(prev_msg_date) || moment(next_msg_date).isAfter(prev_msg_date, 'day')) {
const day_date = moment(next_msg_date).startOf('day'); const day_date = moment(next_msg_date).startOf('day');
next_msg_el.insertAdjacentHTML('beforeBegin', next_msg_el.insertAdjacentHTML('beforeBegin',
...@@ -722,8 +725,15 @@ converse.plugins.add('converse-chatview', { ...@@ -722,8 +725,15 @@ converse.plugins.add('converse-chatview', {
*/ */
const view = new _converse.MessageView({'model': message}); const view = new _converse.MessageView({'model': message});
await view.render(); await view.render();
this.clearChatStateNotification(message); this.clearChatStateNotification(message);
if (!view.el.innerHTML) {
// An "inactive" CSN message (for example) will have an
// empty body. No need to then continue.
return _converse.log(
"Not inserting a message with empty element",
Strophe.LogLevel.INFO
);
}
this.insertMessage(view); this.insertMessage(view);
this.insertDayIndicator(view.el); this.insertDayIndicator(view.el);
this.setScrollPosition(view.el); this.setScrollPosition(view.el);
......
src/converse-message-view.js
View file @ 55fce912
...@@ -60,6 +60,10 @@ converse.plugins.add('converse-message-view', { ...@@ -60,6 +60,10 @@ converse.plugins.add('converse-message-view', {
if (this.model.isOnlyChatStateNotification()) { if (this.model.isOnlyChatStateNotification()) {
this.renderChatStateNotification() this.renderChatStateNotification()
} else if (this.model.get('file') && !this.model.get('oob_url')) { } else if (this.model.get('file') && !this.model.get('oob_url')) {
if (!this.model.file) {
_converse.log("Attempted to render a file upload message with no file data");
return this.el;
}
this.renderFileUploadProgresBar(); this.renderFileUploadProgresBar();
} else if (this.model.get('type') === 'error') { } else if (this.model.get('type') === 'error') {
this.renderErrorMessage(); this.renderErrorMessage();
...@@ -204,7 +208,7 @@ converse.plugins.add('converse-message-view', { ...@@ -204,7 +208,7 @@ converse.plugins.add('converse-message-view', {
renderFileUploadProgresBar () { renderFileUploadProgresBar () {
const msg = u.stringToElement(tpl_file_progress( const msg = u.stringToElement(tpl_file_progress(
_.extend(this.model.toJSON(), { _.extend(this.model.toJSON(), {
'filesize': filesize(this.model.get('file').size), 'filesize': filesize(this.model.file.size),
}))); })));
this.replaceElement(msg); this.replaceElement(msg);
this.renderAvatar(); this.renderAvatar();
......
src/converse-muc-views.js
View file @ 55fce912
...@@ -367,16 +367,14 @@ converse.plugins.add('converse-muc-views', { ...@@ -367,16 +367,14 @@ converse.plugins.add('converse-muc-views', {
updateRoomsList () { updateRoomsList () {
/* Send an IQ stanza to the server asking for all groupchats /* Send an IQ stanza to the server asking for all groupchats
*/ */
_converse.connection.sendIQ( const iq = $iq({
$iq({ 'to': this.model.get('muc_domain'),
'to': this.model.get('muc_domain'), 'from': _converse.connection.jid,
'from': _converse.connection.jid, 'type': "get"
'type': "get" }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS});
}).c("query", {xmlns: Strophe.NS.DISCO_ITEMS}), _converse.api.sendIQ(iq)
this.onRoomsFound.bind(this), .then(iq => this.onRoomsFound(iq))
this.informNoRoomsFound.bind(this), .catch(iq => this.informNoRoomsFound())
5000
);
}, },
showRooms (ev) { showRooms (ev) {
...@@ -805,7 +803,7 @@ converse.plugins.add('converse-muc-views', { ...@@ -805,7 +803,7 @@ converse.plugins.add('converse-muc-views', {
const item = $build("item", {nick, role}); const item = $build("item", {nick, role});
const iq = $iq({to: groupchat, type: "set"}).c("query", {xmlns: Strophe.NS.MUC_ADMIN}).cnode(item.node); const iq = $iq({to: groupchat, type: "set"}).c("query", {xmlns: Strophe.NS.MUC_ADMIN}).cnode(item.node);
if (reason !== null) { iq.c("reason", reason); } if (reason !== null) { iq.c("reason", reason); }
return _converse.connection.sendIQ(iq, onSuccess, onError); return _converse.api.sendIQ(iq).then(onSuccess).catch(onError);
}, },
verifyRoles (roles) { verifyRoles (roles) {
......
src/headless/converse-chatboxes.js
View file @ 55fce912
...@@ -68,10 +68,6 @@ converse.plugins.add('converse-chatboxes', { ...@@ -68,10 +68,6 @@ converse.plugins.add('converse-chatboxes', {
this.setVCard(); this.setVCard();
if (this.get('file')) { if (this.get('file')) {
this.on('change:put', this.uploadFile, this); this.on('change:put', this.uploadFile, this);
if (!_.includes([_converse.SUCCESS, _converse.FAILURE], this.get('upload'))) {
this.getRequestSlotURL();
}
} }
if (this.isOnlyChatStateNotification()) { if (this.isOnlyChatStateNotification()) {
window.setTimeout(this.destroy.bind(this), 20000); window.setTimeout(this.destroy.bind(this), 20000);
...@@ -132,20 +128,20 @@ converse.plugins.add('converse-chatboxes', { ...@@ -132,20 +128,20 @@ converse.plugins.add('converse-chatboxes', {
* *
* https://xmpp.org/extensions/xep-0363.html#request * https://xmpp.org/extensions/xep-0363.html#request
*/ */
const file = this.get('file'); if (_.isNil(this.file)) {
return new Promise((resolve, reject) => { return Promise.reject(new Error("file is undefined"));
const iq = converse.env.$iq({ }
'from': _converse.jid, const iq = converse.env.$iq({
'to': this.get('slot_request_url'), 'from': _converse.jid,
'type': 'get' 'to': this.get('slot_request_url'),
}).c('request', { 'type': 'get'
'xmlns': Strophe.NS.HTTPUPLOAD, }).c('request', {
'filename': file.name, 'xmlns': Strophe.NS.HTTPUPLOAD,
'size': file.size, 'filename': this.file.name,
'content-type': file.type 'size': this.file.size,
}) 'content-type': this.file.type
_converse.connection.sendIQ(iq, resolve, reject); })
}); return _converse.api.sendIQ(iq);
}, },
async getRequestSlotURL () { async getRequestSlotURL () {
...@@ -420,8 +416,8 @@ converse.plugins.add('converse-chatboxes', { ...@@ -420,8 +416,8 @@ converse.plugins.add('converse-chatboxes', {
async sendFiles (files) { async sendFiles (files) {
const result = await _converse.api.disco.supports(Strophe.NS.HTTPUPLOAD, _converse.domain); const result = await _converse.api.disco.supports(Strophe.NS.HTTPUPLOAD, _converse.domain),
const item = result.pop(), item = result.pop(),
data = item.dataforms.where({'FORM_TYPE': {'value': Strophe.NS.HTTPUPLOAD, 'type': "hidden"}}).pop(), data = item.dataforms.where({'FORM_TYPE': {'value': Strophe.NS.HTTPUPLOAD, 'type': "hidden"}}).pop(),
max_file_size = window.parseInt(_.get(data, 'attributes.max-file-size.value')), max_file_size = window.parseInt(_.get(data, 'attributes.max-file-size.value')),
slot_request_url = _.get(item, 'id'); slot_request_url = _.get(item, 'id');
...@@ -429,7 +425,7 @@ converse.plugins.add('converse-chatboxes', { ...@@ -429,7 +425,7 @@ converse.plugins.add('converse-chatboxes', {
if (!slot_request_url) { if (!slot_request_url) {
this.messages.create({ this.messages.create({
'message': __("Sorry, looks like file upload is not supported by your server."), 'message': __("Sorry, looks like file upload is not supported by your server."),
'type': 'error', 'type': 'error'
}); });
return; return;
} }
...@@ -438,17 +434,20 @@ converse.plugins.add('converse-chatboxes', { ...@@ -438,17 +434,20 @@ converse.plugins.add('converse-chatboxes', {
return this.messages.create({ return this.messages.create({
'message': __('The size of your file, %1$s, exceeds the maximum allowed by your server, which is %2$s.', 'message': __('The size of your file, %1$s, exceeds the maximum allowed by your server, which is %2$s.',
file.name, filesize(max_file_size)), file.name, filesize(max_file_size)),
'type': 'error', 'type': 'error'
}); });
} else { } else {
this.messages.create( const message = this.messages.create(
_.extend( _.extend(
this.getOutgoingMessageAttributes(), { this.getOutgoingMessageAttributes(), {
'file': file, 'file': file,
'progress': 0, 'progress': 0,
'slot_request_url': slot_request_url 'slot_request_url': slot_request_url
}) }), {'silent': true}
); );
message.file = file;
this.messages.trigger('add', message);
message.getRequestSlotURL();
} }
}); });
}, },
......
src/headless/converse-core.js
View file @ 55fce912
...@@ -1641,6 +1641,7 @@ _converse.api = { ...@@ -1641,6 +1641,7 @@ _converse.api = {
*/ */
'send' (stanza) { 'send' (stanza) {
_converse.connection.send(stanza); _converse.connection.send(stanza);
_converse.emit('send', stanza);
}, },
/** /**
...@@ -1650,9 +1651,10 @@ _converse.api = { ...@@ -1650,9 +1651,10 @@ _converse.api = {
* @returns {Promise} A promise which resolves when we receive a `result` stanza * @returns {Promise} A promise which resolves when we receive a `result` stanza
* or is rejected when we receive an `error` stanza. * or is rejected when we receive an `error` stanza.
*/ */
'sendIQ' (stanza) { 'sendIQ' (stanza, timeout) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
_converse.connection.sendIQ(stanza, resolve, reject, _converse.IQ_TIMEOUT); _converse.connection.sendIQ(stanza, resolve, reject, timeout || _converse.IQ_TIMEOUT);
_converse.emit('send', stanza);
}); });
} }
}; };
......
src/headless/converse-mam.js
View file @ 55fce912
...@@ -99,9 +99,8 @@ function queryForArchivedMessages (_converse, options, callback, errback) { ...@@ -99,9 +99,8 @@ function queryForArchivedMessages (_converse, options, callback, errback) {
return true; return true;
}, Strophe.NS.MAM); }, Strophe.NS.MAM);
_converse.connection.sendIQ( _converse.api.sendIQ(stanza, _converse.message_archiving_timeout)
stanza, .then(iq => {
function (iq) {
_converse.connection.deleteHandler(message_handler); _converse.connection.deleteHandler(message_handler);
if (_.isFunction(callback)) { if (_.isFunction(callback)) {
const set = iq.querySelector('set'); const set = iq.querySelector('set');
...@@ -112,13 +111,13 @@ function queryForArchivedMessages (_converse, options, callback, errback) { ...@@ -112,13 +111,13 @@ function queryForArchivedMessages (_converse, options, callback, errback) {
} }
callback(messages, rsm); callback(messages, rsm);
} }
}, }).catch(e => {
function () {
_converse.connection.deleteHandler(message_handler); _converse.connection.deleteHandler(message_handler);
if (_.isFunction(errback)) { errback.apply(this, arguments); } if (_.isFunction(errback)) {
}, errback.apply(this, arguments);
_converse.message_archiving_timeout }
); return;
});
} }
...@@ -333,7 +332,7 @@ converse.plugins.add('converse-mam', { ...@@ -333,7 +332,7 @@ converse.plugins.add('converse-mam', {
message_archiving_timeout: 8000, // Time (in milliseconds) to wait before aborting MAM request message_archiving_timeout: 8000, // Time (in milliseconds) to wait before aborting MAM request
}); });
_converse.onMAMError = function (model, iq) { _converse.onMAMError = function (iq) {
if (iq.querySelectorAll('feature-not-implemented').length) { if (iq.querySelectorAll('feature-not-implemented').length) {
_converse.log( _converse.log(
"Message Archive Management (XEP-0313) not supported by this server", "Message Archive Management (XEP-0313) not supported by this server",
...@@ -365,17 +364,14 @@ converse.plugins.add('converse-mam', { ...@@ -365,17 +364,14 @@ converse.plugins.add('converse-mam', {
'xmlns':Strophe.NS.MAM, 'xmlns':Strophe.NS.MAM,
'default':_converse.message_archiving 'default':_converse.message_archiving
}); });
_.each(preference.children, function (child) { _.each(preference.children, child => stanza.cnode(child).up());
stanza.cnode(child).up();
}); // XXX: Strictly speaking, the server should respond with the updated prefs
_converse.connection.sendIQ(stanza, _.partial(function (feature, iq) { // (see example 18: https://xmpp.org/extensions/xep-0313.html#config)
// XXX: Strictly speaking, the server should respond with the updated prefs // but Prosody doesn't do this, so we don't rely on it.
// (see example 18: https://xmpp.org/extensions/xep-0313.html#config) _converse.api.sendIQ(stanza)
// but Prosody doesn't do this, so we don't rely on it. .then(() => feature.save({'preferences': {'default':_converse.message_archiving}}))
feature.save({'preferences': {'default':_converse.message_archiving}}); .catch(_converse.onMAMError);
}, feature),
_converse.onMAMError
);
} else { } else {
feature.save({'preferences': {'default':_converse.message_archiving}}); feature.save({'preferences': {'default':_converse.message_archiving}});
} }
...@@ -388,11 +384,9 @@ converse.plugins.add('converse-mam', { ...@@ -388,11 +384,9 @@ converse.plugins.add('converse-mam', {
prefs['default'] !== _converse.message_archiving && // eslint-disable-line dot-notation prefs['default'] !== _converse.message_archiving && // eslint-disable-line dot-notation
!_.isUndefined(_converse.message_archiving) ) { !_.isUndefined(_converse.message_archiving) ) {
// Ask the server for archiving preferences // Ask the server for archiving preferences
_converse.connection.sendIQ( _converse.api.sendIQ($iq({'type': 'get'}).c('prefs', {'xmlns': Strophe.NS.MAM}))
$iq({'type': 'get'}).c('prefs', {'xmlns': Strophe.NS.MAM}), .then(_.partial(_converse.onMAMPreferences, feature))
_.partial(_converse.onMAMPreferences, feature), .catch(_converse.onMAMError);
_.partial(_converse.onMAMError, feature)
);
} }
}); });
......
src/headless/converse-muc.js
View file @ 55fce912
...@@ -618,16 +618,10 @@ converse.plugins.add('converse-muc', { ...@@ -618,16 +618,10 @@ converse.plugins.add('converse-muc', {
* Returns a promise which resolves once the response IQ * Returns a promise which resolves once the response IQ
* has been received. * has been received.
*/ */
return new Promise((resolve, reject) => { return _converse.api.sendIQ(
_converse.connection.sendIQ( $iq({'to': this.get('jid'), 'type': "get"})
$iq({ .c("query", {xmlns: Strophe.NS.MUC_OWNER})
'to': this.get('jid'), );
'type': "get"
}).c("query", {xmlns: Strophe.NS.MUC_OWNER}),
resolve,
reject
);
});
}, },
sendConfiguration (config, callback, errback) { sendConfiguration (config, callback, errback) {
...@@ -650,7 +644,7 @@ converse.plugins.add('converse-muc', { ...@@ -650,7 +644,7 @@ converse.plugins.add('converse-muc', {
_.each(config || [], function (node) { iq.cnode(node).up(); }); _.each(config || [], function (node) { iq.cnode(node).up(); });
callback = _.isUndefined(callback) ? _.noop : _.partial(callback, iq.nodeTree); callback = _.isUndefined(callback) ? _.noop : _.partial(callback, iq.nodeTree);
errback = _.isUndefined(errback) ? _.noop : _.partial(errback, iq.nodeTree); errback = _.isUndefined(errback) ? _.noop : _.partial(errback, iq.nodeTree);
return _converse.connection.sendIQ(iq, callback, errback); return _converse.api.sendIQ(iq).then(callback).catch(errback);
}, },
saveAffiliationAndRole (pres) { saveAffiliationAndRole (pres) {
...@@ -683,19 +677,17 @@ converse.plugins.add('converse-muc', { ...@@ -683,19 +677,17 @@ converse.plugins.add('converse-muc', {
* (Object) member: Map containing the member's jid and * (Object) member: Map containing the member's jid and
* optionally a reason and affiliation. * optionally a reason and affiliation.
*/ */
return new Promise((resolve, reject) => { const iq = $iq({to: this.get('jid'), type: "set"})
const iq = $iq({to: this.get('jid'), type: "set"}) .c("query", {xmlns: Strophe.NS.MUC_ADMIN})
.c("query", {xmlns: Strophe.NS.MUC_ADMIN}) .c("item", {
.c("item", { 'affiliation': member.affiliation || affiliation,
'affiliation': member.affiliation || affiliation, 'nick': member.nick,
'nick': member.nick, 'jid': member.jid
'jid': member.jid });
}); if (!_.isUndefined(member.reason)) {
if (!_.isUndefined(member.reason)) { iq.c("reason", member.reason);
iq.c("reason", member.reason); }
} return _converse.api.sendIQ(iq);
_converse.connection.sendIQ(iq, resolve, reject);
});
}, },
setAffiliations (members) { setAffiliations (members) {
......
src/headless/converse-roster.js
View file @ 55fce912
...@@ -329,7 +329,7 @@ converse.plugins.add('converse-roster', { ...@@ -329,7 +329,7 @@ converse.plugins.add('converse-roster', {
const iq = $iq({type: 'set'}) const iq = $iq({type: 'set'})
.c('query', {xmlns: Strophe.NS.ROSTER}) .c('query', {xmlns: Strophe.NS.ROSTER})
.c('item', {jid: this.get('jid'), subscription: "remove"}); .c('item', {jid: this.get('jid'), subscription: "remove"});
_converse.connection.sendIQ(iq, callback, errback); _converse.api.sendIQ(iq).then(callback).catch(errback);
return this; return this;
} }
}); });
...@@ -451,7 +451,7 @@ converse.plugins.add('converse-roster', { ...@@ -451,7 +451,7 @@ converse.plugins.add('converse-roster', {
this.addContactToRoster(jid, name, groups, attributes).then(handler, handler); this.addContactToRoster(jid, name, groups, attributes).then(handler, handler);
}, },
sendContactAddIQ (jid, name, groups, callback, errback) { sendContactAddIQ (jid, name, groups) {
/* Send an IQ stanza to the XMPP server to add a new roster contact. /* Send an IQ stanza to the XMPP server to add a new roster contact.
* *
* Parameters: * Parameters:
...@@ -462,14 +462,14 @@ converse.plugins.add('converse-roster', { ...@@ -462,14 +462,14 @@ converse.plugins.add('converse-roster', {
* (Function) errback - A function to call if an error occurred * (Function) errback - A function to call if an error occurred
*/ */
name = _.isEmpty(name)? jid: name; name = _.isEmpty(name)? jid: name;
const iq = $iq({type: 'set'}) const iq = $iq({'type': 'set'})
.c('query', {xmlns: Strophe.NS.ROSTER}) .c('query', {'xmlns': Strophe.NS.ROSTER})
.c('item', { jid, name }); .c('item', { jid, name });
_.each(groups, function (group) { iq.c('group').t(group).up(); }); _.each(groups, group => iq.c('group').t(group).up());
_converse.connection.sendIQ(iq, callback, errback); _converse.api.sendIQ(iq);
}, },
addContactToRoster (jid, name, groups, attributes) { async addContactToRoster (jid, name, groups, attributes) {
/* Adds a RosterContact instance to _converse.roster and /* Adds a RosterContact instance to _converse.roster and
* registers the contact on the XMPP server. * registers the contact on the XMPP server.
* Returns a promise which is resolved once the XMPP server has * Returns a promise which is resolved once the XMPP server has
...@@ -481,27 +481,22 @@ converse.plugins.add('converse-roster', { ...@@ -481,27 +481,22 @@ converse.plugins.add('converse-roster', {
* (Array of Strings) groups - Any roster groups the user might belong to * (Array of Strings) groups - Any roster groups the user might belong to
* (Object) attributes - Any additional attributes to be stored on the user's model. * (Object) attributes - Any additional attributes to be stored on the user's model.
*/ */
return new Promise((resolve, reject) => { groups = groups || [];
groups = groups || []; try {
this.sendContactAddIQ(jid, name, groups, await this.sendContactAddIQ(jid, name, groups);
() => { } catch (e) {
const contact = this.create(_.assignIn({ _converse.log(e, Strophe.LogLevel.ERROR);
'ask': undefined, alert(__('Sorry, there was an error while trying to add %1$s as a contact.', name));
'nickname': name, return e;
groups, }
jid, return this.create(_.assignIn({
'requesting': false, 'ask': undefined,
'subscription': 'none' 'nickname': name,
}, attributes), {sort: false}); groups,
resolve(contact); jid,
}, 'requesting': false,
function (err) { 'subscription': 'none'
alert(__('Sorry, there was an error while trying to add %1$s as a contact.', name)); }, attributes), {'sort': false});
_converse.log(err, Strophe.LogLevel.ERROR);
resolve(err);
}
);
});
}, },
subscribeBack (bare_jid, presence) { subscribeBack (bare_jid, presence) {
...@@ -570,24 +565,26 @@ converse.plugins.add('converse-roster', { ...@@ -570,24 +565,26 @@ converse.plugins.add('converse-roster', {
return _converse.api.disco.stream.getFeature('ver', 'urn:xmpp:features:rosterver') && this.data.get('version'); return _converse.api.disco.stream.getFeature('ver', 'urn:xmpp:features:rosterver') && this.data.get('version');
}, },
fetchFromServer () { async fetchFromServer () {
/* Fetch the roster from the XMPP server */ /* Fetch the roster from the XMPP server */
return new Promise((resolve, reject) => { const stanza = $iq({
const iq = $iq({ 'type': 'get',
'type': 'get', 'id': _converse.connection.getUniqueId('roster')
'id': _converse.connection.getUniqueId('roster') }).c('query', {xmlns: Strophe.NS.ROSTER});
}).c('query', {xmlns: Strophe.NS.ROSTER}); if (this.rosterVersioningSupported()) {
if (this.rosterVersioningSupported()) { stanza.attrs({'ver': this.data.get('version')});
iq.attrs({'ver': this.data.get('version')}); }
} let iq;
const callback = _.flow(this.onReceivedFromServer.bind(this), resolve); try {
const errback = function (iq) { iq = await _converse.api.sendIQ(stanza);
const errmsg = "Error while trying to fetch roster from the server"; } catch (e) {
_converse.log(errmsg, Strophe.LogLevel.ERROR); _converse.log(e, Strophe.LogLevel.ERROR);
reject(new Error(errmsg)); return _converse.log(
} "Error while trying to fetch roster from the server",
return _converse.connection.sendIQ(iq, callback, errback); Strophe.LogLevel.ERROR
}); );
}
return this.onReceivedFromServer(iq);
}, },
onReceivedFromServer (iq) { onReceivedFromServer (iq) {
...@@ -646,7 +643,7 @@ converse.plugins.add('converse-roster', { ...@@ -646,7 +643,7 @@ converse.plugins.add('converse-roster', {
createRequestingContact (presence) { createRequestingContact (presence) {
const bare_jid = Strophe.getBareJidFromJid(presence.getAttribute('from')), const bare_jid = Strophe.getBareJidFromJid(presence.getAttribute('from')),
nickname = _.get(sizzle(`nick[xmlns="${Strophe.NS.NICK}"]`, presence).pop(), 'textContent', null); nickname = _.get(sizzle(`nick[xmlns="${Strophe.NS.NICK}"]`, presence).pop(), 'textContent', null);
const user_data = { const user_data = {
'jid': bare_jid, 'jid': bare_jid,
'subscription': 'none', 'subscription': 'none',
......
src/headless/converse-vcard.js
View file @ 55fce912
...@@ -56,7 +56,7 @@ converse.plugins.add('converse-vcard', { ...@@ -56,7 +56,7 @@ converse.plugins.add('converse-vcard', {
}); });
function onVCardData (jid, iq, callback) { async function onVCardData (jid, iq) {
const vcard = iq.querySelector('vCard'); const vcard = iq.querySelector('vCard');
let result = {}; let result = {};
if (!_.isNull(vcard)) { if (!_.isNull(vcard)) {
...@@ -75,24 +75,10 @@ converse.plugins.add('converse-vcard', { ...@@ -75,24 +75,10 @@ converse.plugins.add('converse-vcard', {
} }
if (result.image) { if (result.image) {
const buffer = u.base64ToArrayBuffer(result['image']); const buffer = u.base64ToArrayBuffer(result['image']);
crypto.subtle.digest('SHA-1', buffer) const ab = await crypto.subtle.digest('SHA-1', buffer);
.then(ab => { result['image_hash'] = u.arrayBufferToHex(ab);
result['image_hash'] = u.arrayBufferToHex(ab);
if (callback) callback(result);
});
} else {
if (callback) callback(result);
}
}
function onVCardError (jid, iq, errback) {
if (errback) {
errback({
'stanza': iq,
'jid': jid,
'vcard_error': moment().format()
});
} }
return result;
} }
function createStanza (type, jid, vcard_el) { function createStanza (type, jid, vcard_el) {
...@@ -113,7 +99,7 @@ converse.plugins.add('converse-vcard', { ...@@ -113,7 +99,7 @@ converse.plugins.add('converse-vcard', {
return _converse.api.sendIQ(createStanza("set", jid, vcard_el)); return _converse.api.sendIQ(createStanza("set", jid, vcard_el));
} }
function getVCard (_converse, jid) { async function getVCard (_converse, jid) {
/* Request the VCard of another user. Returns a promise. /* Request the VCard of another user. Returns a promise.
* *
* Parameters: * Parameters:
...@@ -121,14 +107,17 @@ converse.plugins.add('converse-vcard', { ...@@ -121,14 +107,17 @@ converse.plugins.add('converse-vcard', {
* is being requested. * is being requested.
*/ */
const to = Strophe.getBareJidFromJid(jid) === _converse.bare_jid ? null : jid; const to = Strophe.getBareJidFromJid(jid) === _converse.bare_jid ? null : jid;
return new Promise((resolve, reject) => { let iq;
_converse.connection.sendIQ( try {
createStanza("get", to), iq = await _converse.api.sendIQ(createStanza("get", to))
_.partial(onVCardData, jid, _, resolve), } catch (iq) {
_.partial(onVCardError, jid, _, resolve), return {
_converse.IQ_TIMEOUT 'stanza': iq,
); 'jid': jid,
}); 'vcard_error': moment().format()
}
}
return onVCardData(jid, iq);
} }
/* Event handlers */ /* Event handlers */
......
src/headless/package-lock.json 0 → 100644
View file @ 55fce912
{
"name": "@converse/headless",
"version": "4.0.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"backbone.browserStorage": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/backbone.browserStorage/-/backbone.browserStorage-0.0.4.tgz",
"integrity": "sha512-4LvDP2IkOu9Nt6kj6ft4moKmqKqm3c0WY3c/aie0Cf374wjFuO7vCh/afcKdu1YSuVsryM8yH90/J7yqWbaPHw==",
"requires": {
"backbone": "~1.x.x",
"underscore": ">=1.4.0"
},
"dependencies": {
"backbone": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz",
"integrity": "sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=",
"requires": {
"underscore": ">=1.8.3"
}
},
"underscore": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
}
}
}
}
}
src/headless/package.json
View file @ 55fce912
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2", "gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2",
"dependencies": { "dependencies": {
"backbone": "1.3.3", "backbone": "1.3.3",
"backbone.browserStorage": "0.0.4", "backbone.browserStorage": "jcbrand/Backbone.browserStorage#03bfa13f68b71f97be361840adc5a5064f57b47e",
"es6-promise": "^4.1.0", "es6-promise": "^4.1.0",
"filesize": "^3.6.1", "filesize": "^3.6.1",
"lodash": "^4.17.10", "lodash": "^4.17.10",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7