stanza 12.17.2 → 12.17.3

package/Client.js

@@ -220,6 +220,7 @@ class Client extends events_1.EventEmitter {
         });
     }
     updateConfig(opts = {}) {
+        var _a;
         const currConfig = this.config || {};
         this.config = {
             allowResumption: true,
@@ -229,6 +230,7 @@ class Client extends events_1.EventEmitter {
                 websocket: true
             },
             useStreamManagement: true,
+            transportPreferenceOrder: ['websocket', 'bosh'],
             ...currConfig,
             ...opts
         };
@@ -240,6 +242,9 @@ class Client extends events_1.EventEmitter {
             this.config.credentials.password = this.config.password;
             delete this.config.password;
         }
+        if (!this.config.transportPreferenceOrder) {
+            this.config.transportPreferenceOrder = Object.keys((_a = this.config.transports) !== null && _a !== void 0 ? _a : {});
+        }
     }
     get stream() {
         return this.transport ? this.transport.stream : undefined;
@@ -270,47 +275,60 @@ class Client extends events_1.EventEmitter {
         return this._getConfiguredCredentials();
     }
     async connect() {
+        var _a, _b, _c;
         this.sessionTerminating = false;
         this.sessionStarting = true;
         this.emit('--reset-stream-features');
         if (this.transport) {
             this.transport.disconnect(false);
         }
-        const transportPref = ['websocket', 'bosh'];
+        const transportPref = (_a = this.config.transportPreferenceOrder) !== null && _a !== void 0 ? _a : [];
         let endpoints;
         for (const name of transportPref) {
-            let conf = this.config.transports[name];
-            if (!conf) {
+            const settings = this.config.transports[name];
+            if (!settings || !this.transports[name]) {
                 continue;
             }
-            if (typeof conf === 'string') {
-                conf = { url: conf };
+            let config = {
+                acceptLanguages: this.config.acceptLanguages || [(_b = this.config.lang) !== null && _b !== void 0 ? _b : 'en'],
+                jid: this.config.jid,
+                lang: (_c = this.config.lang) !== null && _c !== void 0 ? _c : 'en',
+                server: this.config.server
+            };
+            const transport = new this.transports[name](this, this.sm, this.stanzas);
+            if (typeof settings === 'string') {
+                config.url = settings;
             }
-            else if (conf === true) {
-                if (!endpoints) {
-                    try {
-                        endpoints = await this.discoverBindings(this.config.server);
-                    }
-                    catch (err) {
-                        console.error(err);
+            else if (settings == true) {
+                if (transport.discoverBindings) {
+                    const discovered = await transport.discoverBindings(this.config.server);
+                    if (!discovered) {
                         continue;
                     }
+                    config = {
+                        ...config,
+                        ...discovered
+                    };
                 }
-                endpoints[name] = (endpoints[name] || []).filter(url => url.startsWith('wss:') || url.startsWith('https:'));
-                if (!endpoints[name] || !endpoints[name].length) {
-                    continue;
+                else {
+                    if (!endpoints) {
+                        try {
+                            endpoints = await this.discoverBindings(this.config.server);
+                        }
+                        catch (err) {
+                            console.error(err);
+                            continue;
+                        }
+                    }
+                    endpoints[name] = (endpoints[name] || []).filter(url => url.startsWith('wss:') || url.startsWith('https:'));
+                    if (!endpoints[name] || !endpoints[name].length) {
+                        continue;
+                    }
+                    config.url = endpoints[name][0];
                 }
-                conf = { url: endpoints[name][0] };
             }
-            this.transport = new this.transports[name](this, this.sm, this.stanzas);
-            this.transport.connect({
-                acceptLanguages: this.config.acceptLanguages || ['en'],
-                jid: this.config.jid,
-                lang: this.config.lang || 'en',
-                server: this.config.server,
-                url: conf.url,
-                ...conf
-            });
+            this.transport = transport;
+            this.transport.connect(config);
             return;
         }
         console.error('No endpoints found for the requested transports.');

package/Constants.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.directionToSenders = exports.sendersToDirection = exports.JINGLE_INFO_RECEIVED_5 = exports.JINGLE_INFO_CHECKSUM_5 = exports.JINGLE_INFO_RINGING = exports.JINGLE_INFO_ACTIVE = exports.JINGLE_INFO_UNHOLD = exports.JINGLE_INFO_HOLD = exports.JINGLE_INFO_UNMUTE = exports.JINGLE_INFO_MUTE = exports.JINGLE_INFO = exports.USER_ACTIVITY_SPECIFIC = exports.USER_ACTIVITY_GENERAL = exports.USER_MOODS = exports.JingleReasonCondition = exports.JingleErrorCondition = exports.JingleAction = exports.JingleContentSenders = exports.JingleApplicationDirection = exports.JingleSessionRole = exports.ChatState = exports.PubsubErrorCondition = exports.MUCStatusCode = exports.MUCRole = exports.MUCAffiliation = exports.DataFormFieldType = exports.DataFormType = exports.RosterSubscription = exports.PresenceShow = exports.IQType = exports.PresenceType = exports.MessageType = exports.StanzaErrorCondition = exports.StreamErrorCondition = exports.SASLFailureCondition = exports.StreamType = exports.VERSION = void 0;
 const Namespaces_1 = require("./Namespaces");
-exports.VERSION = '12.17.2';
+exports.VERSION = '12.17.3';
 // ====================================================================
 // Frequently Used Values
 // ====================================================================

package/index.d.ts

@@ -105,6 +105,9 @@ export interface Agent extends StrictEventEmitter<EventEmitter, AgentEvents> {
     sessionStarting: boolean;
     sessionStarted: boolean;
     sessionTerminating: boolean;
+    transports: {
+        [key: string]: new (client: Agent, sm: StreamManagement, registry: JXT.Registry) => Transport;
+    };
     use(plugin: (agent: Agent, registry: JXT.Registry, config: AgentConfig) => void): void;
     nextId(): string;
     updateConfig(opts?: AgentConfig): void;
@@ -177,14 +180,21 @@ export interface AgentConfig {
      *
      * If a transport is set to a string, that will be used as the connection URL.
      *
-     * If a transport is set to an object, it MUST include a <code>url</code> value for
-     * the connection URL.
-     *
      * @default { websocket: true, bosh: true }
      */
     transports?: {
         [key: string]: boolean | string | Partial<TransportConfig>;
     };
+    /**
+     * Transport Preference Order
+     *
+     * Specify the order in which transports should be tried when connecting.
+     *
+     * If a configured transport type is not listed, it will be skipped.
+     *
+     * @default ['websocket', 'bosh']
+     */
+    transportPreferenceOrder?: string[];
     /**
      * Account Password
      *
@@ -208,17 +218,18 @@ export interface Transport {
     hasStream?: boolean;
     stream?: Stream;
     authenticated?: boolean;
+    discoverBindings?(host: string): Promise<Partial<TransportConfig> | null>;
     connect(opts: TransportConfig): void;
     disconnect(cleanly?: boolean): void;
     restart(): void;
     send(name: string, data?: JXT.JSONData): Promise<void>;
 }
 export interface TransportConfig {
-    lang?: string;
-    acceptLanguages?: string[];
     server: string;
-    url: string;
     jid: string;
+    lang?: string;
+    acceptLanguages?: string[];
+    url?: string;
     sid?: string;
     rid?: number;
     maxRetries?: number;

package/module.js

@@ -4012,7 +4012,8 @@ class Hash extends Transform {
         let error = null;
         try {
             this.update(chunk, encoding);
-        } catch (err) {
+        }
+        catch (err) {
             error = err;
         }
         callback(error);
@@ -4021,7 +4022,8 @@ class Hash extends Transform {
         let error = null;
         try {
             this.push(this.digest());
-        } catch (err) {
+        }
+        catch (err) {
             error = err;
         }
         callback(error);
@@ -4035,7 +4037,7 @@ class Hash extends Transform {
         const blockSize = this._blockSize;
         const length = data.length;
         let accum = this._len;
-        for (let offset = 0; offset < length; ) {
+        for (let offset = 0; offset < length;) {
             const assigned = accum % blockSize;
             const remainder = Math.min(length - offset, blockSize - assigned);
             for (let i = 0; i < remainder; i++) {
@@ -4065,17 +4067,20 @@ class Hash extends Transform {
             if (this._bigEndian) {
                 this._block.writeUInt32BE(0, this._blockSize - 8);
                 this._block.writeUInt32BE(bits, this._blockSize - 4);
-            } else {
+            }
+            else {
                 this._block.writeUInt32LE(bits, this._blockSize - 8);
                 this._block.writeUInt32LE(0, this._blockSize - 4);
             }
-        } else {
+        }
+        else {
             const lowBits = (bits & 0xffffffff) >>> 0;
             const highBits = (bits - lowBits) / 0x100000000;
             if (this._bigEndian) {
                 this._block.writeUInt32BE(highBits, this._blockSize - 8);
                 this._block.writeUInt32BE(lowBits, this._blockSize - 4);
-            } else {
+            }
+            else {
                 this._block.writeUInt32LE(lowBits, this._blockSize - 8);
                 this._block.writeUInt32LE(highBits, this._blockSize - 4);
             }
@@ -4811,7 +4816,8 @@ function createHash(alg) {
     const HashImp = HASH_IMPLEMENTATIONS.get(alg);
     if (HashImp) {
         return new HashImp();
-    } else {
+    }
+    else {
         throw new Error('Unsupported hash algorithm: ' + alg);
     }
 }
@@ -4841,7 +4847,8 @@ class Hmac extends Transform {
             key = createHash(alg)
                 .update(key)
                 .digest();
-        } else if (key.length < blocksize) {
+        }
+        else if (key.length < blocksize) {
             key = Buffer.concat([key, ZEROS], blocksize);
         }
         this._ipad = Buffer.alloc(blocksize);
@@ -4856,9 +4863,11 @@ class Hmac extends Transform {
         let err;
         try {
             this.update(data, enc);
-        } catch (e) {
+        }
+        catch (e) {
             err = e;
-        } finally {
+        }
+        finally {
             next(err);
         }
     }
@@ -4866,7 +4875,8 @@ class Hmac extends Transform {
         let err;
         try {
             this.push(this._final());
-        } catch (e) {
+        }
+        catch (e) {
             err = e;
         }
         done(err);
@@ -4894,7 +4904,8 @@ class Hmac extends Transform {
 let root;
 if (typeof window !== 'undefined') {
     root = window;
-} else if (typeof global !== 'undefined') {
+}
+else if (typeof global !== 'undefined') {
     root = global;
 }
 function randomBytes(size) {
@@ -4910,7 +4921,7 @@ function getHashes() {
 function createHmac(alg, key) {
     return new Hmac(alg.toLowerCase(), key);
 }
-const nativeFetch = fetch;
+const nativeFetch = fetch.bind(window);
 const nativeWS = WebSocket;
 const nativeRTCPeerConnection = root.RTCPeerConnection;
 
@@ -6085,7 +6096,7 @@ function Disco (client) {
     });
 }
 
-const VERSION$1 = '12.17.2';
+const VERSION$1 = '12.17.3';
 // ====================================================================
 // Frequently Used Values
 // ====================================================================
@@ -9276,7 +9287,7 @@ function MUC (client) {
     }
     client.on('session:started', rejoinRooms);
     client.on('message', msg => {
-        if (msg.type === 'groupchat' && msg.hasSubject) {
+        if (msg.type === 'groupchat' && msg.hasSubject && !msg.body) {
             client.emit('muc:topic', {
                 from: msg.from,
                 room: toBare(msg.from),
@@ -14475,6 +14486,10 @@ class WSConnection extends Duplex {
         this.socket.onclose = () => {
             this.push(null);
         };
+        this.socket.onerror = (err) => {
+            console.error(err);
+            this.push(null);
+        };
     }
     disconnect(clean = true) {
         if (this.socket && !this.closing && this.hasStream && clean) {
@@ -14738,11 +14753,12 @@ class Client extends EventEmitter {
         });
     }
     updateConfig(opts = {}) {
+        var _a;
         const currConfig = this.config || {};
         this.config = Object.assign(Object.assign({ allowResumption: true, jid: '', transports: {
                 bosh: true,
                 websocket: true
-            }, useStreamManagement: true }, currConfig), opts);
+            }, useStreamManagement: true, transportPreferenceOrder: ['websocket', 'bosh'] }, currConfig), opts);
         if (!this.config.server) {
             this.config.server = getDomain(this.config.jid);
         }
@@ -14751,6 +14767,9 @@ class Client extends EventEmitter {
             this.config.credentials.password = this.config.password;
             delete this.config.password;
         }
+        if (!this.config.transportPreferenceOrder) {
+            this.config.transportPreferenceOrder = Object.keys((_a = this.config.transports) !== null && _a !== void 0 ? _a : {});
+        }
     }
     get stream() {
         return this.transport ? this.transport.stream : undefined;
@@ -14783,6 +14802,7 @@ class Client extends EventEmitter {
         });
     }
     connect() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             this.sessionTerminating = false;
             this.sessionStarting = true;
@@ -14790,34 +14810,50 @@ class Client extends EventEmitter {
             if (this.transport) {
                 this.transport.disconnect(false);
             }
-            const transportPref = ['websocket', 'bosh'];
+            const transportPref = (_a = this.config.transportPreferenceOrder) !== null && _a !== void 0 ? _a : [];
             let endpoints;
             for (const name of transportPref) {
-                let conf = this.config.transports[name];
-                if (!conf) {
+                const settings = this.config.transports[name];
+                if (!settings || !this.transports[name]) {
                     continue;
                 }
-                if (typeof conf === 'string') {
-                    conf = { url: conf };
-                }
-                else if (conf === true) {
-                    if (!endpoints) {
-                        try {
-                            endpoints = yield this.discoverBindings(this.config.server);
-                        }
-                        catch (err) {
-                            console.error(err);
+                let config = {
+                    acceptLanguages: this.config.acceptLanguages || [(_b = this.config.lang) !== null && _b !== void 0 ? _b : 'en'],
+                    jid: this.config.jid,
+                    lang: (_c = this.config.lang) !== null && _c !== void 0 ? _c : 'en',
+                    server: this.config.server
+                };
+                const transport = new this.transports[name](this, this.sm, this.stanzas);
+                if (typeof settings === 'string') {
+                    config.url = settings;
+                }
+                else if (settings == true) {
+                    if (transport.discoverBindings) {
+                        const discovered = yield transport.discoverBindings(this.config.server);
+                        if (!discovered) {
                             continue;
                         }
+                        config = Object.assign(Object.assign({}, config), discovered);
                     }
-                    endpoints[name] = (endpoints[name] || []).filter(url => url.startsWith('wss:') || url.startsWith('https:'));
-                    if (!endpoints[name] || !endpoints[name].length) {
-                        continue;
+                    else {
+                        if (!endpoints) {
+                            try {
+                                endpoints = yield this.discoverBindings(this.config.server);
+                            }
+                            catch (err) {
+                                console.error(err);
+                                continue;
+                            }
+                        }
+                        endpoints[name] = (endpoints[name] || []).filter(url => url.startsWith('wss:') || url.startsWith('https:'));
+                        if (!endpoints[name] || !endpoints[name].length) {
+                            continue;
+                        }
+                        config.url = endpoints[name][0];
                     }
-                    conf = { url: endpoints[name][0] };
                 }
-                this.transport = new this.transports[name](this, this.sm, this.stanzas);
-                this.transport.connect(Object.assign({ acceptLanguages: this.config.acceptLanguages || ['en'], jid: this.config.jid, lang: this.config.lang || 'en', server: this.config.server, url: conf.url }, conf));
+                this.transport = transport;
+                this.transport.connect(config);
                 return;
             }
             console.error('No endpoints found for the requested transports.');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stanza",
   "description": "Modern XMPP in the browser, with a JSON API",
-  "version": "12.17.2",
+  "version": "12.17.3",
   "author": "Lance Stout <lancestout@gmail.com>",
   "bugs": "https://github.com/legastero/stanza/issues",
   "contributors": [
@@ -14,7 +14,7 @@
     "@types/punycode": "^2.1.0",
     "@types/readable-stream": "^2.3.9",
     "@types/ws": "^7.4.0",
-    "async": "^3.0.1",
+    "async": "^3.2.1",
     "buffer": "^6.0.3",
     "node-fetch": "^2.6.1",
     "process": "^0.11.10",
@@ -22,7 +22,7 @@
     "react-native-randombytes": "^3.6.0",
     "readable-stream": "^2.3.6",
     "sdp": "^3.0.2",
-    "stanza-shims": "^1.1.1",
+    "stanza-shims": "^1.1.2",
     "tslib": "^2.2.0",
     "ws": "^7.4.4"
   },

package/plugins/muc.js

@@ -29,7 +29,7 @@ function default_1(client) {
     }
     client.on('session:started', rejoinRooms);
     client.on('message', msg => {
-        if (msg.type === 'groupchat' && msg.hasSubject) {
+        if (msg.type === 'groupchat' && msg.hasSubject && !msg.body) {
             client.emit('muc:topic', {
                 from: msg.from,
                 room: JID.toBare(msg.from),

package/transports/websocket.js

@@ -88,6 +88,10 @@ class WSConnection extends readable_stream_1.Duplex {
         this.socket.onclose = () => {
             this.push(null);
         };
+        this.socket.onerror = (err) => {
+            console.error(err);
+            this.push(null);
+        };
     }
     disconnect(clean = true) {
         if (this.socket && !this.closing && this.hasStream && clean) {