chore: migrate MeetMe to ConfBridge (#16)

Author: edospadoni

lib/meetmeConfUser.js lib/confBridgeConfUser.jslib/meetmeConfUser.js renamed to lib/confBridgeConfUser.js

@@ -1,17 +1,17 @@
 /**
- * Abstraction of a meetme conference user.
+ * Abstraction of a ConfBridge conference user.
  *
  * **It can throw exception.**
  *
- * @class MeetmeConfUser
+ * @class ConfBridgeConfUser
  * @param {string} userId The user identifier in the conference
  * @param {string} extId The extension identifier
  * @param {string} ownerValue True if the user is the owner of the conference
- * @param {string} ch The asterisk channel of the extension
+ * @param {string} ch The Asterisk channel of the extension
  * @return {object} The conference user object.
  * @constructor
  */
-exports.MeetmeConfUser = function (userId, extId, ownerValue, ch) {
+exports.ConfBridgeConfUser = function (userId, extId, ownerValue, ch) {
   // check the parameters
   if (typeof userId !== 'string' ||
     typeof ownerValue !== 'boolean' ||
@@ -68,7 +68,7 @@ exports.MeetmeConfUser = function (userId, extId, ownerValue, ch) {
   var prefix;
 
   /**
-   * The asterisk channel of the extension.
+   * The Asterisk channel of the extension.
    *
    * @property channel
    * @type {string}
@@ -135,10 +135,10 @@ exports.MeetmeConfUser = function (userId, extId, ownerValue, ch) {
   }
 
   /**
-   * Returns the asterisk channel of the extension.
+   * Returns the Asterisk channel of the extension.
    *
    * @method getChannel
-   * @return {string} The asterisk channel of the extension.
+   * @return {string} The Asterisk channel of the extension.
    */
   function getChannel() {
     return channel;
@@ -211,7 +211,7 @@ exports.MeetmeConfUser = function (userId, extId, ownerValue, ch) {
    * @return {string} The readable description of the extension
    */
   function toString() {
-    return 'Meetme conference user: ' + getId() + ' - ' + getExtenId();
+    return 'ConfBridge conference user: ' + getId() + ' - ' + getExtenId();
   }
 
   /**

lib/meetmeConference.js lib/confBridgeConference.jslib/meetmeConference.js renamed to lib/confBridgeConference.js

@@ -1,14 +1,14 @@
 /**
- * Abstraction of a meetme conference.
+ * Abstraction of a ConfBridge conference.
  *
  * **It can throw exceptions.**
  *
- * @class MeetmeConference
+ * @class ConfBridgeConference
  * @param {string} extOwner The identifier of the extension owner
- * @return {object} The meetme conference object.
+ * @return {object} The ConfBridge conference object.
  * @constructor
  */
-exports.MeetmeConference = function (extOwner) {
+exports.ConfBridgeConference = function (extOwner) {
   // check the parameter
   if (typeof extOwner !== 'string') {
     throw new Error('wrong parameters: ' + JSON.stringify(arguments));
@@ -26,7 +26,7 @@ exports.MeetmeConference = function (extOwner) {
 
   /**
    * The user of the conference. They are extensions. Keys are user
-   * identifiers and the values are the _MeetmeConfUser_ object.
+   * identifiers and the values are the _ConfBridgeConfUser_ object.
    *
    * @property users
    * @type object
@@ -59,7 +59,7 @@ exports.MeetmeConference = function (extOwner) {
    * Adds a user to the conference.
    *
    * @method addUser
-   * @param {object} obj A _MeetmeConfUser_ object
+   * @param {object} obj A _ConfBridgeConfUser_ object
    */
   function addUser(obj) {
     var prefix = obj.getRemoteSitePrefix() ? obj.getRemoteSitePrefix() : '';
@@ -103,11 +103,11 @@ exports.MeetmeConference = function (extOwner) {
   }
 
   /**
-   * Returns true if the extension is into the conference.
+   * Returns true if the extension is in the conference.
    *
    * @method hasExten
    * @param  {string}  extenId The extension identifier
-   * @return {boolean} True if the extension is into the conference.
+   * @return {boolean} True if the extension is in the conference.
    */
   function hasExten(extenId) {
     if (users[extenId]) {
@@ -123,15 +123,15 @@ exports.MeetmeConference = function (extOwner) {
    * @return {string} The readable description of the conference
    */
   function toString() {
-    return 'MeetMe conference - owner "' + getOwnerId() + '" with ' + getUsersNum() + ' users';
+    return 'ConfBridge conference - owner "' + getOwnerId() + '" with ' + getUsersCount() + ' users';
   }
 
   /**
    * Returns the JSON representation of the object.
    *
    *     {
    *         id: "202",
-   *         users: { MeetmeConfUser.toJSON(), ... } // the keys is the meetme conference user identifiers
+   *         users: { ConfBridgeConfUser.toJSON(), ... } // the keys are the ConfBridge conference user identifiers
    *     }
    *
    * @method toJSON

…ugins_command_13/meetmeConfUserUnmute.js …ins_command_13/confBridgeConfUserMute.jslib/plugins_command_13/meetmeConfUserUnmute.js renamed to lib/plugins_command_13/confBridgeConfUserMute.js lib/plugins_command_13/meetmeConfUserUnmute.js renamed to lib/plugins_command_13/confBridgeConfUserMute.js

@@ -11,9 +11,9 @@ var action = require('../action');
  * @private
  * @final
  * @readOnly
- * @default [meetmeConfUserUnmute]
+ * @default [confBridgeConfUserMute]
  */
-var IDLOG = '[meetmeConfUserUnmute]';
+var IDLOG = '[confBridgeConfUserMute]';
 
 (function () {
 
@@ -39,22 +39,21 @@ var IDLOG = '[meetmeConfUserUnmute]';
     var map = {};
 
     /**
-     * Command plugin to unmute a meetme user.
+     * Command plugin to mute a ConfBridge user.
      *
      * Use it with _astproxy_ module as follow:
      *
-     *     astproxy.doCmd({ command: 'meetmeConfUserUnmute', confId: '6666202', usernum: '2', meetmeConfCode: '1234' }, function (res) {
+     *     astproxy.doCmd({ command: 'confBridgeConfUserMute', confId: '6666202', usernum: '2', confBridgeConfCode: '1234' }, function (res) {
      *         // some code
      *     });
      *
-     *
-     * @class meetmeConfUserUnmute
+     * @class confBridgeConfUserMute
      * @static
      */
-    var meetmeConfUserUnmute = {
+    var confBridgeConfUserMute = {
 
       /**
-       * Execute asterisk action to unmute a meetme user.
+       * Execute asterisk action to mute a ConfBridge user.
        *
        * @method execute
        * @param {object}   am   Asterisk manager to send the action
@@ -66,13 +65,13 @@ var IDLOG = '[meetmeConfUserUnmute]';
         try {
           // action for asterisk
           var act = {
-            Action: 'MeetmeUnmute',
-            Meetme: args.meetmeConfCode + args.confId,
+            Action: 'ConfBridgeMute',
+            ConfBridge: args.confBridgeConfCode + args.confId,
             Usernum: args.usernum
           };
 
           // set the action identifier
-          act.ActionID = action.getActionId('meetmeConfUserUnmute');
+          act.ActionID = action.getActionId('confBridgeConfUserMute');
 
           // add association ActionID-callback
           map[act.ActionID] = cb;
@@ -147,9 +146,9 @@ var IDLOG = '[meetmeConfUserUnmute]';
     };
 
     // public interface
-    exports.data = meetmeConfUserUnmute.data;
-    exports.execute = meetmeConfUserUnmute.execute;
-    exports.setLogger = meetmeConfUserUnmute.setLogger;
+    exports.data = confBridgeConfUserMute.data;
+    exports.execute = confBridgeConfUserMute.execute;
+    exports.setLogger = confBridgeConfUserMute.setLogger;
 
   } catch (err) {
     logger.error(IDLOG, err.stack);

…plugins_command_13/meetmeConfUserMute.js …s_command_13/confBridgeConfUserUnmute.jslib/plugins_command_13/meetmeConfUserMute.js renamed to lib/plugins_command_13/confBridgeConfUserUnmute.js lib/plugins_command_13/meetmeConfUserMute.js renamed to lib/plugins_command_13/confBridgeConfUserUnmute.js

@@ -11,9 +11,9 @@ var action = require('../action');
  * @private
  * @final
  * @readOnly
- * @default [meetmeConfUserMute]
+ * @default [confBridgeConfUserUnmute]
  */
-var IDLOG = '[meetmeConfUserMute]';
+var IDLOG = '[confBridgeConfUserUnmute]';
 
 (function () {
 
@@ -39,22 +39,21 @@ var IDLOG = '[meetmeConfUserMute]';
     var map = {};
 
     /**
-     * Command plugin to mute a meetme user.
+     * Command plugin to unmute a ConfBridge user.
      *
      * Use it with _astproxy_ module as follow:
      *
-     *     astproxy.doCmd({ command: 'meetmeConfUserMute', confId: '6666202', usernum: '2', meetmeConfCode: '1234' }, function (res) {
+     *     astproxy.doCmd({ command: 'confBridgeConfUserUnmute', confId: '6666202', usernum: '2', confBridgeConfCode: '1234' }, function (res) {
      *         // some code
      *     });
      *
-     *
-     * @class meetmeConfUserMute
+     * @class confBridgeConfUserUnmute
      * @static
      */
-    var meetmeConfUserMute = {
+    var confBridgeConfUserUnmute = {
 
       /**
-       * Execute asterisk action to mute a meetme user.
+       * Execute asterisk action to unmute a ConfBridge user.
        *
        * @method execute
        * @param {object}   am   Asterisk manager to send the action
@@ -66,13 +65,13 @@ var IDLOG = '[meetmeConfUserMute]';
         try {
           // action for asterisk
           var act = {
-            Action: 'MeetmeMute',
-            Meetme: args.meetmeConfCode + args.confId,
+            Action: 'ConfBridgeUnmute',
+            ConfBridge: args.confBridgeConfCode + args.confId,
             Usernum: args.usernum
           };
 
           // set the action identifier
-          act.ActionID = action.getActionId('meetmeConfUserMute');
+          act.ActionID = action.getActionId('confBridgeConfUserUnmute');
 
           // add association ActionID-callback
           map[act.ActionID] = cb;
@@ -147,9 +146,9 @@ var IDLOG = '[meetmeConfUserMute]';
     };
 
     // public interface
-    exports.data = meetmeConfUserMute.data;
-    exports.execute = meetmeConfUserMute.execute;
-    exports.setLogger = meetmeConfUserMute.setLogger;
+    exports.data = confBridgeConfUserUnmute.data;
+    exports.execute = confBridgeConfUserUnmute.execute;
+    exports.setLogger = confBridgeConfUserUnmute.setLogger;
 
   } catch (err) {
     logger.error(IDLOG, err.stack);

lib/plugins_command_13/meetmeList.js lib/plugins_command_13/confBridgeList.jslib/plugins_command_13/meetmeList.js renamed to lib/plugins_command_13/confBridgeList.js

@@ -11,9 +11,9 @@ var action = require('../action');
  * @private
  * @final
  * @readOnly
- * @default [meetmeList]
+ * @default [confBridgeList]
  */
-var IDLOG = '[meetmeList]';
+var IDLOG = '[confBridgeList]';
 
 (function () {
 
@@ -49,22 +49,21 @@ var IDLOG = '[meetmeList]';
     var list = {};
 
     /**
-     * Command plugin to mute a meetme user.
+     * Command plugin to list ConfBridge users.
      *
      * Use it with _astproxy_ module as follow:
      *
-     *     astproxy.doCmd({ command: 'meetmeList', confId: '200', meetmeConfCode: '987' }, function (res) {
+     *     astproxy.doCmd({ command: 'confBridgeList', confId: '200', confBridgeConfCode: '987' }, function (res) {
      *         // some code
      *     });
      *
-     *
-     * @class meetmeList
+     * @class confBridgeList
      * @static
      */
-    var meetmeList = {
+    var confBridgeList = {
 
       /**
-       * Execute asterisk action to mute a meetme user.
+       * Execute asterisk action to list ConfBridge users.
        *
        * @method execute
        * @param {object}   am   Asterisk manager to send the action
@@ -76,12 +75,12 @@ var IDLOG = '[meetmeList]';
         try {
           // action for asterisk
           var act = {
-            Action: 'MeetmeList',
-            Conference: args.meetmeConfCode + args.confId
+            Action: 'ConfBridgeList',
+            Conference: args.confBridgeConfCode + args.confId
           };
 
           // set the action identifier
-          act.ActionID = action.getActionId('meetmeList');
+          act.ActionID = action.getActionId('confBridgeList');
 
           // add association ActionID-callback
           map[act.ActionID] = cb;
@@ -105,7 +104,7 @@ var IDLOG = '[meetmeList]';
       data: function (data) {
         try {
           // store new member object
-          if (data.event === 'MeetmeList') {
+          if (data.event === 'ConfbridgeList') {
             var obj = {
               conference: data.conference,
               userNumber: data.usernumber,
@@ -119,12 +118,12 @@ var IDLOG = '[meetmeList]';
               muted: data.muted,
               talking: data.talking
             };
-            list[data.usernumber] = obj;
+            list[`${data.accountcode}-${data.calleridnum}`] = obj;
 
-          } else if (map[data.actionid] && data.event === 'MeetmeListComplete') {
+          } else if (map[data.actionid] && data.event === 'ConfbridgeListComplete') {
             map[data.actionid](null, list);
           }
-          if (data.event === 'MeetmeListComplete') {
+          if (data.event === 'ConfbridgeListComplete') {
             list = {};
             delete map[data.actionid];
           }
@@ -163,9 +162,9 @@ var IDLOG = '[meetmeList]';
     };
 
     // public interface
-    exports.data = meetmeList.data;
-    exports.execute = meetmeList.execute;
-    exports.setLogger = meetmeList.setLogger;
+    exports.data = confBridgeList.data;
+    exports.execute = confBridgeList.execute;
+    exports.setLogger = confBridgeList.setLogger;
 
   } catch (err) {
     logger.error(IDLOG, err.stack);

lib/plugins_command_13/listChannels.js

@@ -118,7 +118,7 @@ var IDLOG = '[listChannels]';
               callerName: data.calleridname,
               bridgedNum: data.connectedlinenum,
               bridgedName: data.connectedlinename,
-              inConference: data.application === 'MeetMe' ? true : false,
+              inConference: data.application === 'ConfBridge' ? true : false,
               channelExten: channelExten,
               linkedid: data.linkedid,
               bridgeid: data.bridgeid