twilio-chat
Advanced tools
Comparing version 0.13.0-dev-build.378 to 0.13.0-dev-build.379
@@ -128,3 +128,3 @@ "use strict"; | ||
* @fires Channel#memberUpdated | ||
* @fires Channel#memberInfoUpdated | ||
* @fires Channel#userUpdated | ||
* @fires Channel#messageAdded | ||
@@ -173,7 +173,7 @@ * @fires Channel#messageRemoved | ||
_this.members = new _map2.default(); | ||
_this.membersEntity = new members_1.Members(_this, services.session, services.userInfos, _this.members); | ||
_this.membersEntity = new members_1.Members(_this, services.session, services.users, _this.members); | ||
_this.membersEntity.on('memberJoined', _this.emit.bind(_this, 'memberJoined')); | ||
_this.membersEntity.on('memberLeft', _this.emit.bind(_this, 'memberLeft')); | ||
_this.membersEntity.on('memberUpdated', _this.emit.bind(_this, 'memberUpdated')); | ||
_this.membersEntity.on('memberInfoUpdated', _this.emit.bind(_this, 'memberInfoUpdated')); | ||
_this.membersEntity.on('userUpdated', _this.emit.bind(_this, 'userUpdated')); | ||
_this.messages = []; | ||
@@ -180,0 +180,0 @@ _this.messagesEntity = new messages_1.Messages(_this, services.session, _this.messages); |
@@ -61,4 +61,4 @@ "use strict"; | ||
var configuration_1 = require("./configuration"); | ||
var userinfo_1 = require("./userinfo"); | ||
exports.UserInfo = userinfo_1.UserInfo; | ||
var user_1 = require("./user"); | ||
exports.User = user_1.User; | ||
var publicchannels_1 = require("./data/publicchannels"); | ||
@@ -74,3 +74,3 @@ var network_1 = require("./services/network"); | ||
var channels_1 = require("./data/channels"); | ||
var userinfos_1 = require("./data/userinfos"); | ||
var users_1 = require("./data/users"); | ||
var typingindicator_1 = require("./services/typingindicator"); | ||
@@ -80,14 +80,2 @@ var consumptionhorizon_1 = require("./services/consumptionhorizon"); | ||
var MSG_NO_TOKEN = 'A valid Twilio token should be provided'; | ||
/*export interface Options { | ||
logLevel?: LogLevel; | ||
productId?: string; | ||
twilsockClient?: TwilsockClient; | ||
transport?: Transport; | ||
emsClient?: EmsClient; | ||
notificationsClient?: NotificationClient; | ||
syncClient?: SyncClient; | ||
httpCacheLifetimeOverride?: number; | ||
typingIndicatorTimeoutOverride?: number; | ||
consumptionReportIntervalOverride?: string; | ||
}*/ | ||
/** | ||
@@ -103,3 +91,3 @@ * @classdesc A Client provides an interface for the local | ||
* {@link Client#getChannels}. | ||
* @property {UserInfo} userInfo - User information for logged in user | ||
* @property {User} user - Information for logged in user | ||
* @property {Client#connectionState} connectionState - Connection state info | ||
@@ -121,3 +109,3 @@ * | ||
* @fires Client#typingStarted | ||
* @fires Client#userInfoUpdated | ||
* @fires Client#userUpdated | ||
* @fires Client#connectionStateChanged | ||
@@ -169,4 +157,4 @@ */ | ||
_this.network = new network_1.Network(_this.config, _this.session, _this.transport); | ||
_this.userInfos = new userinfos_1.UserInfos(_this.session, _this.datasync); | ||
_this.userInfos.on('userInfoUpdated', _this.emit.bind(_this, 'userInfoUpdated')); | ||
_this.users = new users_1.Users(_this.session, _this.datasync); | ||
_this.users.on('userUpdated', _this.emit.bind(_this, 'userUpdated')); | ||
_this.consumptionHorizon = new consumptionhorizon_1.ConsumptionHorizon(_this.config, _this.session); | ||
@@ -176,3 +164,3 @@ _this.typingIndicator = new typingindicator_1.TypingIndicator(_this.config, _this.transport, _this.notifications, _this.getChannelBySid.bind(_this)); | ||
session: _this.session, | ||
userInfos: _this.userInfos, | ||
users: _this.users, | ||
typingIndicator: _this.typingIndicator, | ||
@@ -527,5 +515,5 @@ consumptionHorizon: _this.consumptionHorizon, | ||
}, { | ||
key: "userInfo", | ||
key: "user", | ||
get: function get() { | ||
return this.userInfos.myUserInfo; | ||
return this.users.myself; | ||
} | ||
@@ -532,0 +520,0 @@ }, { |
@@ -67,3 +67,3 @@ "use strict"; | ||
* @fires Members#memberUpdated | ||
* @fires Members#memberInfoUpdated | ||
* @fires Members#userUpdated | ||
*/ | ||
@@ -74,3 +74,3 @@ | ||
function Members(channel, session, userInfos, members) { | ||
function Members(channel, session, users, members) { | ||
(0, _classCallCheck3.default)(this, Members); | ||
@@ -82,3 +82,3 @@ | ||
_this.session = session; | ||
_this.userInfos = userInfos; | ||
_this.users = users; | ||
_this.members = members; | ||
@@ -162,3 +162,3 @@ _this.sync = session.datasync; | ||
var member, userInfo; | ||
var member, user; | ||
return _regenerator2.default.wrap(function _callee2$(_context2) { | ||
@@ -179,8 +179,8 @@ while (1) { | ||
_context2.next = 5; | ||
return this.userInfos.getUserInfo(data.identity, data.userInfo); | ||
return this.users.getUser(data.identity, data.userInfo); | ||
case 5: | ||
userInfo = _context2.sent; | ||
user = _context2.sent; | ||
member = new member_1.Member(this.channel, data, memberSid, userInfo); | ||
member = new member_1.Member(this.channel, data, memberSid, user); | ||
this.members.set(memberSid, member); | ||
@@ -190,4 +190,4 @@ member.on('updated', function () { | ||
}); | ||
member.on('userInfoUpdated', function () { | ||
return _this3.emit('memberInfoUpdated', member); | ||
member.on('userUpdated', function () { | ||
return _this3.emit('userUpdated', member); | ||
}); | ||
@@ -277,3 +277,3 @@ return _context2.abrupt("return", member); | ||
/** | ||
* Fired when member info updated | ||
* Fired when member updated | ||
* Note that event won't be fired if user haven't requested any member data | ||
@@ -285,5 +285,5 @@ * | ||
/** | ||
* Fired when userInfo for member is updated | ||
* @event Members#memberInfoUpdated | ||
* Fired when user for member is updated | ||
* @event Members#userUpdated | ||
* @type {Member} | ||
*/ |
@@ -35,3 +35,3 @@ "use strict"; | ||
* @property {String} identity - Deprecated: The identity of the remote Client. | ||
* @property {UserInfo} userInfo - UserInfo structure for member. | ||
* @property {User} user - user structure for member. | ||
* @property {Boolean} isTyping - Whether or not this Member is currently typing. | ||
@@ -44,3 +44,3 @@ * @property {Number} lastConsumedMessageIndex - Latest consumed Message index by this Member. | ||
* @fires Member#updated | ||
* @fires Member#userInfoUpdated | ||
* @fires Member#userUpdated | ||
*/ | ||
@@ -92,3 +92,3 @@ | ||
function Member(channel, data, sid, userInfo) { | ||
function Member(channel, data, sid, user) { | ||
(0, _classCallCheck3.default)(this, Member); | ||
@@ -99,3 +99,3 @@ | ||
_this.channel = channel; | ||
_this.userInfo = userInfo; | ||
_this.user = user; | ||
_this.state = { | ||
@@ -113,4 +113,4 @@ sid: sid, | ||
} | ||
userInfo.on('updated', function () { | ||
return _this.emit('userInfoUpdated', _this); | ||
user.on('updated', function (reason) { | ||
_this.emit('userUpdated', reason); | ||
}); | ||
@@ -216,5 +216,5 @@ return _this; | ||
/** | ||
* Fired when member's user info is updated | ||
* @event Member#userInfoUpdated | ||
* Fired when member's user is updated | ||
* @event Member#userUpdated | ||
* @type {Member} | ||
*/ |
@@ -347,7 +347,7 @@ "use strict"; | ||
}, { | ||
key: "getUserInfosData", | ||
value: function getUserInfosData() { | ||
key: "getUsersData", | ||
value: function getUsersData() { | ||
return this.sessionInfo.promise.then(function (info) { | ||
return { | ||
userInfo: info.userInfo, | ||
user: info.userInfo, | ||
identity: info.identity | ||
@@ -354,0 +354,0 @@ }; |
@@ -83,3 +83,3 @@ 'use strict'; | ||
'./lib/message.js', | ||
'./lib/userinfo.js', | ||
'./lib/user.js', | ||
'./lib/paginator.js', | ||
@@ -90,3 +90,3 @@ './lib/sessionerror.js', | ||
publicConstructors: ['Client'], | ||
privateConstructors: ['Channel', 'Member', 'Message', 'UserInfo', 'Paginator', | ||
privateConstructors: ['Channel', 'Member', 'Message', 'User', 'Paginator', | ||
'ChannelDescriptor', 'SessionError'] | ||
@@ -232,3 +232,3 @@ }; | ||
'<li><a href="Message.html">Message</a></li>', | ||
'<li><a href="UserInfo.html">UserInfo</a></li>', | ||
'<li><a href="User.html">User</a></li>', | ||
'<li><a href="Paginator.html">Paginator</a></li>', | ||
@@ -235,0 +235,0 @@ '</ul>', |
@@ -5,3 +5,3 @@ /// <reference types="node" /> | ||
session: any; | ||
userInfos: any; | ||
users: any; | ||
typingIndicator: any; | ||
@@ -43,3 +43,3 @@ consumptionHorizon: any; | ||
* @fires Channel#memberUpdated | ||
* @fires Channel#memberInfoUpdated | ||
* @fires Channel#userUpdated | ||
* @fires Channel#messageAdded | ||
@@ -54,3 +54,3 @@ * @fires Channel#messageRemoved | ||
readonly sid: string; | ||
private services; | ||
services: Services; | ||
private state; | ||
@@ -271,5 +271,5 @@ private entityPromise; | ||
/** | ||
* Fired when a Member's UserInfo fields has been updated. | ||
* Fired when a User fields has been updated. | ||
* @param {Member} member | ||
* @event Channel#memberInfoUpdated | ||
* @event Channel#userUpdated | ||
*/ | ||
@@ -276,0 +276,0 @@ /** |
@@ -66,3 +66,3 @@ "use strict"; | ||
* @fires Channel#memberUpdated | ||
* @fires Channel#memberInfoUpdated | ||
* @fires Channel#userUpdated | ||
* @fires Channel#messageAdded | ||
@@ -106,7 +106,7 @@ * @fires Channel#messageRemoved | ||
this.members = new Map(); | ||
this.membersEntity = new members_1.Members(this, services.session, services.userInfos, this.members); | ||
this.membersEntity = new members_1.Members(this, services.session, services.users, this.members); | ||
this.membersEntity.on('memberJoined', this.emit.bind(this, 'memberJoined')); | ||
this.membersEntity.on('memberLeft', this.emit.bind(this, 'memberLeft')); | ||
this.membersEntity.on('memberUpdated', this.emit.bind(this, 'memberUpdated')); | ||
this.membersEntity.on('memberInfoUpdated', this.emit.bind(this, 'memberInfoUpdated')); | ||
this.membersEntity.on('userUpdated', this.emit.bind(this, 'userUpdated')); | ||
this.messages = []; | ||
@@ -113,0 +113,0 @@ this.messagesEntity = new messages_1.Messages(this, services.session, this.messages); |
/// <reference types="node" /> | ||
import { EventEmitter } from 'events'; | ||
import { UserInfo } from './userinfo'; | ||
import { User } from './user'; | ||
import * as TwilsockClient from 'twilsock'; | ||
import * as NotificationClient from 'twilio-notifications'; | ||
import { Transport } from 'twilio-transport'; | ||
import { SyncClient } from 'twilio-sync'; | ||
import { EmsClient } from 'twilio-ems-client'; | ||
import { Channel } from './data/channels'; | ||
export declare type LogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'silent' | null; | ||
export interface Options { | ||
logLevel?: LogLevel; | ||
productId?: string; | ||
twilsockClient?: TwilsockClient; | ||
transport?: Transport; | ||
emsClient?: EmsClient; | ||
notificationsClient?: NotificationClient; | ||
syncClient?: SyncClient; | ||
httpCacheLifetimeOverride?: number; | ||
typingIndicatorTimeoutOverride?: number; | ||
consumptionReportIntervalOverride?: string; | ||
} | ||
/** | ||
@@ -16,3 +33,3 @@ * @classdesc A Client provides an interface for the local | ||
* {@link Client#getChannels}. | ||
* @property {UserInfo} userInfo - User information for logged in user | ||
* @property {User} user - Information for logged in user | ||
* @property {Client#connectionState} connectionState - Connection state info | ||
@@ -34,3 +51,3 @@ * | ||
* @fires Client#typingStarted | ||
* @fires Client#userInfoUpdated | ||
* @fires Client#userUpdated | ||
* @fires Client#connectionStateChanged | ||
@@ -49,3 +66,3 @@ */ | ||
private channelsPromise; | ||
private userInfos; | ||
private users; | ||
private readonly emsClient; | ||
@@ -65,4 +82,4 @@ private fpaToken; | ||
private static readonly supportedPushChannels; | ||
constructor(token: string, options?: any); | ||
readonly userInfo: UserInfo; | ||
constructor(token: string, options?: Options); | ||
readonly user: User; | ||
readonly reachabilityEnabled: boolean; | ||
@@ -244,5 +261,5 @@ /** | ||
/** | ||
* Fired when a userInfo has been updated. | ||
* @param {UserInfo} UserInfo | ||
* @event Client#userInfoUpdated | ||
* Fired when a user has been updated. | ||
* @param {User} User | ||
* @event Client#userUpdated | ||
*/ | ||
@@ -254,3 +271,3 @@ /** | ||
*/ | ||
export { UserInfo, Client }; | ||
export { User, Client }; | ||
export default Client; |
@@ -14,4 +14,4 @@ "use strict"; | ||
const configuration_1 = require("./configuration"); | ||
const userinfo_1 = require("./userinfo"); | ||
exports.UserInfo = userinfo_1.UserInfo; | ||
const user_1 = require("./user"); | ||
exports.User = user_1.User; | ||
const publicchannels_1 = require("./data/publicchannels"); | ||
@@ -27,3 +27,3 @@ const network_1 = require("./services/network"); | ||
const channels_1 = require("./data/channels"); | ||
const userinfos_1 = require("./data/userinfos"); | ||
const users_1 = require("./data/users"); | ||
const typingindicator_1 = require("./services/typingindicator"); | ||
@@ -33,14 +33,2 @@ const consumptionhorizon_1 = require("./services/consumptionhorizon"); | ||
const MSG_NO_TOKEN = 'A valid Twilio token should be provided'; | ||
/*export interface Options { | ||
logLevel?: LogLevel; | ||
productId?: string; | ||
twilsockClient?: TwilsockClient; | ||
transport?: Transport; | ||
emsClient?: EmsClient; | ||
notificationsClient?: NotificationClient; | ||
syncClient?: SyncClient; | ||
httpCacheLifetimeOverride?: number; | ||
typingIndicatorTimeoutOverride?: number; | ||
consumptionReportIntervalOverride?: string; | ||
}*/ | ||
/** | ||
@@ -56,3 +44,3 @@ * @classdesc A Client provides an interface for the local | ||
* {@link Client#getChannels}. | ||
* @property {UserInfo} userInfo - User information for logged in user | ||
* @property {User} user - Information for logged in user | ||
* @property {Client#connectionState} connectionState - Connection state info | ||
@@ -74,3 +62,3 @@ * | ||
* @fires Client#typingStarted | ||
* @fires Client#userInfoUpdated | ||
* @fires Client#userUpdated | ||
* @fires Client#connectionStateChanged | ||
@@ -116,4 +104,4 @@ */ | ||
this.network = new network_1.Network(this.config, this.session, this.transport); | ||
this.userInfos = new userinfos_1.UserInfos(this.session, this.datasync); | ||
this.userInfos.on('userInfoUpdated', this.emit.bind(this, 'userInfoUpdated')); | ||
this.users = new users_1.Users(this.session, this.datasync); | ||
this.users.on('userUpdated', this.emit.bind(this, 'userUpdated')); | ||
this.consumptionHorizon = new consumptionhorizon_1.ConsumptionHorizon(this.config, this.session); | ||
@@ -123,3 +111,3 @@ this.typingIndicator = new typingindicator_1.TypingIndicator(this.config, this.transport, this.notifications, this.getChannelBySid.bind(this)); | ||
session: this.session, | ||
userInfos: this.userInfos, | ||
users: this.users, | ||
typingIndicator: this.typingIndicator, | ||
@@ -168,3 +156,3 @@ consumptionHorizon: this.consumptionHorizon, | ||
} | ||
get userInfo() { return this.userInfos.myUserInfo; } | ||
get user() { return this.users.myself; } | ||
get reachabilityEnabled() { return this.session.reachabilityEnabled; } | ||
@@ -171,0 +159,0 @@ /** |
@@ -11,3 +11,3 @@ /// <reference types="node" /> | ||
* @fires Members#memberUpdated | ||
* @fires Members#memberInfoUpdated | ||
* @fires Members#userUpdated | ||
*/ | ||
@@ -17,7 +17,7 @@ declare class Members extends EventEmitter { | ||
session: any; | ||
userInfos: any; | ||
users: any; | ||
rosterEntityPromise: Promise<SyncMap>; | ||
readonly channel: Channel; | ||
readonly members: Map<string, Member>; | ||
constructor(channel: any, session: any, userInfos: any, members: Map<string, Member>); | ||
constructor(channel: any, session: any, users: any, members: Map<string, Member>); | ||
unsubscribe(): Promise<void>; | ||
@@ -24,0 +24,0 @@ subscribe(rosterObjectName: string): any; |
@@ -20,10 +20,10 @@ "use strict"; | ||
* @fires Members#memberUpdated | ||
* @fires Members#memberInfoUpdated | ||
* @fires Members#userUpdated | ||
*/ | ||
class Members extends events_1.EventEmitter { | ||
constructor(channel, session, userInfos, members) { | ||
constructor(channel, session, users, members) { | ||
super(); | ||
this.channel = channel; | ||
this.session = session; | ||
this.userInfos = userInfos; | ||
this.users = users; | ||
this.members = members; | ||
@@ -81,7 +81,7 @@ this.sync = session.datasync; | ||
} | ||
let userInfo = yield this.userInfos.getUserInfo(data.identity, data.userInfo); | ||
member = new member_1.Member(this.channel, data, memberSid, userInfo); | ||
let user = yield this.users.getUser(data.identity, data.userInfo); | ||
member = new member_1.Member(this.channel, data, memberSid, user); | ||
this.members.set(memberSid, member); | ||
member.on('updated', () => this.emit('memberUpdated', member)); | ||
member.on('userInfoUpdated', () => this.emit('memberInfoUpdated', member)); | ||
member.on('userUpdated', () => this.emit('userUpdated', member)); | ||
return member; | ||
@@ -144,3 +144,3 @@ }); | ||
/** | ||
* Fired when member info updated | ||
* Fired when member updated | ||
* Note that event won't be fired if user haven't requested any member data | ||
@@ -152,5 +152,5 @@ * | ||
/** | ||
* Fired when userInfo for member is updated | ||
* @event Members#memberInfoUpdated | ||
* Fired when user for member is updated | ||
* @event Members#userUpdated | ||
* @type {Member} | ||
*/ |
@@ -14,3 +14,3 @@ /// <reference types="node" /> | ||
* @property {String} identity - Deprecated: The identity of the remote Client. | ||
* @property {UserInfo} userInfo - UserInfo structure for member. | ||
* @property {User} user - user structure for member. | ||
* @property {Boolean} isTyping - Whether or not this Member is currently typing. | ||
@@ -23,3 +23,3 @@ * @property {Number} lastConsumedMessageIndex - Latest consumed Message index by this Member. | ||
* @fires Member#updated | ||
* @fires Member#userInfoUpdated | ||
* @fires Member#userUpdated | ||
*/ | ||
@@ -29,3 +29,3 @@ declare class Member extends EventEmitter { | ||
private channel; | ||
private userInfo; | ||
private user; | ||
identity: string; | ||
@@ -36,3 +36,3 @@ isTyping: boolean; | ||
roleSid: string; | ||
constructor(channel: any, data: MemberDescriptor, sid: string, userInfo: any); | ||
constructor(channel: any, data: MemberDescriptor, sid: string, user: any); | ||
/** | ||
@@ -39,0 +39,0 @@ * Private method used to start or reset the typing indicator timeout (with event emitting) |
@@ -8,3 +8,3 @@ "use strict"; | ||
* @property {String} identity - Deprecated: The identity of the remote Client. | ||
* @property {UserInfo} userInfo - UserInfo structure for member. | ||
* @property {User} user - user structure for member. | ||
* @property {Boolean} isTyping - Whether or not this Member is currently typing. | ||
@@ -17,3 +17,3 @@ * @property {Number} lastConsumedMessageIndex - Latest consumed Message index by this Member. | ||
* @fires Member#updated | ||
* @fires Member#userInfoUpdated | ||
* @fires Member#userUpdated | ||
*/ | ||
@@ -31,6 +31,6 @@ class Member extends events_1.EventEmitter { | ||
set roleSid(sid) { this.state.roleSid = sid; } | ||
constructor(channel, data, sid, userInfo) { | ||
constructor(channel, data, sid, user) { | ||
super(); | ||
this.channel = channel; | ||
this.userInfo = userInfo; | ||
this.user = user; | ||
this.state = { | ||
@@ -48,3 +48,5 @@ sid: sid, | ||
} | ||
userInfo.on('updated', () => this.emit('userInfoUpdated', this)); | ||
user.on('updated', (reason) => { | ||
this.emit('userUpdated', reason); | ||
}); | ||
} | ||
@@ -130,5 +132,5 @@ /** | ||
/** | ||
* Fired when member's user info is updated | ||
* @event Member#userInfoUpdated | ||
* Fired when member's user is updated | ||
* @event Member#userUpdated | ||
* @type {Member} | ||
*/ |
@@ -49,4 +49,4 @@ import { Configuration } from './configuration'; | ||
getMyChannelsId(): Promise<string>; | ||
getUserInfosData(): Promise<{ | ||
userInfo: string; | ||
getUsersData(): Promise<{ | ||
user: string; | ||
identity: string; | ||
@@ -53,0 +53,0 @@ }>; |
@@ -193,5 +193,5 @@ "use strict"; | ||
} | ||
getUserInfosData() { | ||
getUsersData() { | ||
return this.sessionInfo.promise.then(info => ({ | ||
userInfo: info.userInfo, | ||
user: info.userInfo, | ||
identity: info.identity | ||
@@ -198,0 +198,0 @@ })); |
{ | ||
"name": "twilio-chat", | ||
"version": "0.13.0-dev-build.378", | ||
"version": "0.13.0-dev-build.379", | ||
"description": "Twilio Chat service client library", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2036947
99
40587