@viewberapp/chat 0.0.84 → 0.0.86
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Chat.js +66 -28
- package/dist/Chat.js.map +1 -1
- package/package.json +2 -2
package/dist/Chat.js
CHANGED
|
@@ -41,6 +41,7 @@ const CachedChat_1 = __importDefault(require("./CachedChat"));
|
|
|
41
41
|
const logger_1 = require("./logger");
|
|
42
42
|
const ChatSubscription_1 = __importDefault(require("./ChatSubscription"));
|
|
43
43
|
const jwtTokenChanged_1 = require("./util/jwtTokenChanged");
|
|
44
|
+
const util_1 = require("./util");
|
|
44
45
|
const Chat = (function () {
|
|
45
46
|
let initialized = false;
|
|
46
47
|
let axios;
|
|
@@ -103,6 +104,9 @@ const Chat = (function () {
|
|
|
103
104
|
for (const chatId in chats) {
|
|
104
105
|
if (Object.prototype.hasOwnProperty.call(chats, chatId)) {
|
|
105
106
|
const chat = chats[chatId];
|
|
107
|
+
if ((0, util_1.isNil)(chat)) {
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
106
110
|
chat.cancelAllSubscriptions();
|
|
107
111
|
delete chats[chatId];
|
|
108
112
|
chat.detachChannel(function (err) {
|
|
@@ -114,20 +118,29 @@ const Chat = (function () {
|
|
|
114
118
|
}
|
|
115
119
|
api = makeApi();
|
|
116
120
|
};
|
|
117
|
-
const get = (id) =>
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
121
|
+
const get = (id) => new Promise((resolve, reject) => {
|
|
122
|
+
getChat(id).then(({ chat, isFirstFetch, error }) => {
|
|
123
|
+
if (error) {
|
|
124
|
+
return resolve({ error });
|
|
125
|
+
}
|
|
126
|
+
const subscription = new ChatSubscription_1.default(chat, {
|
|
127
|
+
status: 'active',
|
|
128
|
+
channelStatus: chat.getChannelStatus(),
|
|
129
|
+
connectionStatus: chat.getConnectionStatus(),
|
|
130
|
+
getLatestMessagesStatus: chat.getGetLatestMessagesStatus()
|
|
131
|
+
});
|
|
132
|
+
chat.addSubscription(subscription);
|
|
133
|
+
if (isFirstFetch) {
|
|
134
|
+
chat.getLatestMessages();
|
|
135
|
+
}
|
|
136
|
+
resolve({ subscription });
|
|
137
|
+
}).catch(err => {
|
|
138
|
+
return resolve({ error: {
|
|
139
|
+
message: 'Failed to resolve the chat',
|
|
140
|
+
code: 'error',
|
|
141
|
+
error: err
|
|
142
|
+
} });
|
|
125
143
|
});
|
|
126
|
-
chat.addSubscription(subscription);
|
|
127
|
-
if (isFirstFetch) {
|
|
128
|
-
chat.getLatestMessages();
|
|
129
|
-
}
|
|
130
|
-
return { subscription };
|
|
131
144
|
});
|
|
132
145
|
const appointment = (appointmentId) => __awaiter(this, void 0, void 0, function* () {
|
|
133
146
|
try {
|
|
@@ -147,27 +160,52 @@ const Chat = (function () {
|
|
|
147
160
|
} };
|
|
148
161
|
}
|
|
149
162
|
});
|
|
150
|
-
const getChat = (chatId) => {
|
|
151
|
-
let isFirstFetch = false;
|
|
163
|
+
const getChat = (chatId) => new Promise((resolve, reject) => {
|
|
152
164
|
if (!(chatId.toString() in chats)) {
|
|
153
|
-
chats[chatId] =
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
165
|
+
chats[chatId] = undefined;
|
|
166
|
+
ably.auth.authorize(function (err, tokenDetails) {
|
|
167
|
+
if (err) {
|
|
168
|
+
return resolve({ error: {
|
|
169
|
+
message: err.toString(),
|
|
170
|
+
code: 'error'
|
|
171
|
+
} });
|
|
172
|
+
}
|
|
173
|
+
let chat = new CachedChat_1.default({
|
|
174
|
+
id: chatId,
|
|
175
|
+
api,
|
|
176
|
+
channel: ably.channels.get(getChannelName(chatId)),
|
|
177
|
+
connectionStatus,
|
|
178
|
+
logger
|
|
179
|
+
});
|
|
180
|
+
chats[chatId] = chat;
|
|
181
|
+
return resolve({
|
|
182
|
+
chat,
|
|
183
|
+
isFirstFetch: true
|
|
184
|
+
});
|
|
159
185
|
});
|
|
160
|
-
isFirstFetch = true;
|
|
161
186
|
}
|
|
162
|
-
|
|
163
|
-
chat
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
187
|
+
else {
|
|
188
|
+
let chat = chats[chatId];
|
|
189
|
+
if (!(0, util_1.isNil)(chat)) {
|
|
190
|
+
return resolve({
|
|
191
|
+
chat,
|
|
192
|
+
isFirstFetch: true
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
return resolve({ error: {
|
|
197
|
+
message: 'Error resolving to the chat.',
|
|
198
|
+
code: 'error'
|
|
199
|
+
} });
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
});
|
|
167
203
|
const handleAblyConnectionStateChange = (event) => {
|
|
168
204
|
connectionStatus = event.current;
|
|
169
205
|
Object.values(chats).forEach(chat => {
|
|
170
|
-
|
|
206
|
+
if (!(0, util_1.isNil)(chat)) {
|
|
207
|
+
chat.setConnectionStatus(connectionStatus);
|
|
208
|
+
}
|
|
171
209
|
});
|
|
172
210
|
};
|
|
173
211
|
const makeApi = () => new API_1.default({
|
package/dist/Chat.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chat.js","sourceRoot":"","sources":["../src/Chat.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,gDAAgD;AAEhD,8DAAsC;AAEtC,qCAAiD;AACjD,0EAAkD;AAClD,4DAAyD;
|
|
1
|
+
{"version":3,"file":"Chat.js","sourceRoot":"","sources":["../src/Chat.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@viewberapp/chat",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.86",
|
|
4
4
|
"description": "Viewber chat",
|
|
5
5
|
"author": "Jacob <jacob.chen@viewber.co.uk>",
|
|
6
6
|
"homepage": "https://bitbucket.org/ezadr/viewberjs#readme",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"react": "^16.14.0",
|
|
43
43
|
"rollbar": "^2.25.0"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "d0c07cfbce78f3007bc683dff630a6302b5d40c5"
|
|
46
46
|
}
|