Merge pull request #614 from jitsi/update_strophe

Update strophe and use it via imports.

JitsiConference.js

-/* global __filename, $, Strophe, Promise */
+/* global __filename, $, Promise */
+import { Strophe } from 'strophe.js';
 
 import AvgRTPStatsReporter from './modules/statistics/AvgRTPStatsReporter';
 import ComponentsVersions from './modules/version/ComponentsVersions';

JitsiConferenceEventManager.js

-/* global __filename, Strophe */
+/* global __filename */
+import { Strophe } from 'strophe.js';
 
 import AuthenticationEvents
     from './service/authentication/AuthenticationEvents';

JitsiParticipant.js

-/* global Strophe */
+
+import { Strophe } from 'strophe.js';
+
 import * as JitsiConferenceEvents from './JitsiConferenceEvents';
 import { ParticipantConnectionStatus }
     from './modules/connectivity/ParticipantConnectionStatus';

modules/videosipgw/JitsiVideoSIPGWSession.js

-/* global $, $iq */
+/* global $ */
 import { getLogger } from 'jitsi-meet-logger';
-const logger = getLogger(__filename);
+import { $iq } from 'strophe.js';
 
 import Listenable from '../util/Listenable';
 
 import * as VideoSIPGWConstants from './VideoSIPGWConstants';
 
+const logger = getLogger(__filename);
+
 /**
  * The event name for current sip video session state changed.
  * @type {string} event name for sip video session state changed.

modules/xmpp/Caps.js

-/* global $, b64_sha1, Strophe */
+/* global $ */
+
+import { b64_sha1, Strophe } from 'strophe.js'; // eslint-disable-line camelcase
+
 import XMPPEvents from '../../service/xmpp/XMPPEvents';
 import Listenable from '../util/Listenable';
 
         if (!this.disco) {
             throw new Error(
                 'Missing strophe-plugins '
-                + '(disco and caps plugins are required)!');
+                + '(disco plugin is required)!');
         }
 
         this.versionToCapabilities = Object.create(null);

modules/xmpp/ChatRoom.js

-/* global $, $pres, $iq, $msg, __filename, Strophe */
+/* global $, __filename */
 
 import { getLogger } from 'jitsi-meet-logger';
+import { $iq, $msg, $pres, Strophe } from 'strophe.js';
+
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
 import * as JitsiTranscriptionStatus from '../../JitsiTranscriptionStatus';
 import Listenable from '../util/Listenable';
+import Settings from '../settings/Settings';
 import * as MediaType from '../../service/RTC/MediaType';
+import XMPPEvents from '../../service/xmpp/XMPPEvents';
+
 import Moderator from './moderator';
 import Recorder from './recording';
-import Settings from '../settings/Settings';
-import XMPPEvents from '../../service/xmpp/XMPPEvents';
 
 const logger = getLogger(__filename);
 

modules/xmpp/JingleSessionPC.js

-/* global __filename, $, $iq, Strophe */
+/* global __filename, $ */
 
 import async from 'async';
 import { getLogger } from 'jitsi-meet-logger';
-import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
+import { $iq, Strophe } from 'strophe.js';
+
 import JingleSession from './JingleSession';
+import * as JingleSessionState from './JingleSessionState';
 import SDP from './SDP';
 import SDPDiffer from './SDPDiffer';
 import SDPUtil from './SDPUtil';
 import SignalingLayerImpl from './SignalingLayerImpl';
+
 import Statistics from '../statistics/statistics';
 import XMPPEvents from '../../service/xmpp/XMPPEvents';
-import * as JingleSessionState from './JingleSessionState';
+import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
 
 const logger = getLogger(__filename);
 

modules/xmpp/moderator.js

-/* global $, $iq, Promise, Strophe */
+/* global $, Promise */
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
+import { $iq, Strophe } from 'strophe.js';
+
 const XMPPEvents = require('../../service/xmpp/XMPPEvents');
 const AuthenticationEvents
     = require('../../service/authentication/AuthenticationEvents');

modules/xmpp/recording.js

-/* global $, $iq */
+/* global $ */
 
 import { getLogger } from 'jitsi-meet-logger';
-const logger = getLogger(__filename);
+import { $iq } from 'strophe.js';
+
 const XMPPEvents = require('../../service/xmpp/XMPPEvents');
 const JitsiRecorderErrors = require('../../JitsiRecorderErrors');
 const GlobalOnErrorHandler = require('../util/GlobalOnErrorHandler');
 
+const logger = getLogger(__filename);
+
 /**
  * Extracts the error details from given error element/node.
  *

modules/xmpp/strophe.emuc.js

-/* a simple MUC connection plugin
- * can only handle a single MUC room
- */
-
-/* global $, Strophe */
+/* global $ */
 
 import { getLogger } from 'jitsi-meet-logger';
-const logger = getLogger(__filename);
+import { Strophe } from 'strophe.js';
 
 import ChatRoom from './ChatRoom';
 import { ConnectionPluginListenable } from './ConnectionPlugin';
 import XMPPEvents from '../../service/xmpp/XMPPEvents';
 
+const logger = getLogger(__filename);
+
 /**
- *
+ * MUC connection plugin.
  */
 class MucConnectionPlugin extends ConnectionPluginListenable {
     /**

modules/xmpp/strophe.jingle.js

-/* global $, $iq, __filename, Strophe */
+/* global $, __filename */
 
 import { getLogger } from 'jitsi-meet-logger';
-const logger = getLogger(__filename);
+import { $iq, Strophe } from 'strophe.js';
 
-import JingleSessionPC from './JingleSessionPC';
 import XMPPEvents from '../../service/xmpp/XMPPEvents';
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
 import RandomUtil from '../util/RandomUtil';
 import Statistics from '../statistics/statistics';
+
+import JingleSessionPC from './JingleSessionPC';
 import ConnectionPlugin from './ConnectionPlugin';
 
+const logger = getLogger(__filename);
+
 // XXX Strophe is build around the idea of chaining function calls so allow long
 // function call chains.
 /* eslint-disable newline-per-chained-call */

modules/xmpp/strophe.logger.js

-/* global Strophe */
+import { Strophe } from 'strophe.js';
+
 import ConnectionPlugin from './ConnectionPlugin';
 
 /**

modules/xmpp/strophe.ping.js

-/* global $iq, Strophe */
-
 import { getLogger } from 'jitsi-meet-logger';
-const logger = getLogger(__filename);
+import { $iq, Strophe } from 'strophe.js';
 
-import ConnectionPlugin from './ConnectionPlugin';
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
 
+import ConnectionPlugin from './ConnectionPlugin';
+
+
+const logger = getLogger(__filename);
+
 /**
  * Ping every 10 sec
  */

modules/xmpp/strophe.rayo.js

-/* global $, $iq, Strophe */
+/* global $ */
 
 import { getLogger } from 'jitsi-meet-logger';
-const logger = getLogger(__filename);
+import { $iq, Strophe } from 'strophe.js';
 
 import ConnectionPlugin from './ConnectionPlugin';
 
+const logger = getLogger(__filename);
+
 const RAYO_XMLNS = 'urn:xmpp:rayo:1';
 
 /**

modules/xmpp/strophe.util.js

-/* global __filename, Strophe */
+/* global __filename */
 /**
  * Strophe logger implementation. Logs from level WARN and above.
  */
 import { getLogger } from 'jitsi-meet-logger';
-const logger = getLogger(__filename);
+import { Strophe } from 'strophe.js';
 
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
 
+const logger = getLogger(__filename);
+
 /**
  * This is the last HTTP error status captured from Strophe debug logs.
  * The purpose of storing it is to distinguish between the network and

modules/xmpp/xmpp.js

-/* global $, Strophe */
+/* global $ */
 
 import { getLogger } from 'jitsi-meet-logger';
-const logger = getLogger(__filename);
+import { Strophe } from 'strophe.js';
+import 'strophejs-plugin-disco';
 
 import RandomUtil from '../util/RandomUtil';
 import * as JitsiConnectionErrors from '../../JitsiConnectionErrors';
 import Listenable from '../util/Listenable';
 import Caps from './Caps';
 
+const logger = getLogger(__filename);
+
 /**
  *
  * @param token

package.json

     "sdp-interop": "0.1.12",
     "sdp-simulcast": "0.2.1",
     "sdp-transform": "2.3.0",
-    "strophe": "1.2.4",
-    "strophejs-plugins": "0.0.7",
+    "strophe.js": "1.2.14",
+    "strophejs-plugin-disco": "0.0.2",
     "yaeti": "1.0.1"
   },
   "devDependencies": {