@viewberapp/chat 0.0.43 → 0.0.45
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 +29 -35
- package/dist/Chat.js.map +1 -1
- package/package.json +2 -2
package/dist/Chat.js
CHANGED
|
@@ -37,7 +37,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
const Ably = __importStar(require("ably"));
|
|
39
39
|
const API_1 = __importDefault(require("./API"));
|
|
40
|
-
const axios_1 = __importDefault(require("axios"));
|
|
41
40
|
const CachedChat_1 = __importDefault(require("./CachedChat"));
|
|
42
41
|
const logger_1 = require("./logger");
|
|
43
42
|
const ChatSubscription_1 = __importDefault(require("./ChatSubscription"));
|
|
@@ -65,17 +64,11 @@ const Chat = (function () {
|
|
|
65
64
|
getChatForAppointmentRoute: options.getChatForAppointmentRoute
|
|
66
65
|
});
|
|
67
66
|
logger = options.logger || new logger_1.ConsoleLogger;
|
|
68
|
-
|
|
67
|
+
ably = new Ably.Realtime({
|
|
68
|
+
autoConnect: false,
|
|
69
69
|
authCallback(tokenParams, callback) {
|
|
70
70
|
api.getAblyToken(Object.keys(chats).map(id => Number(id))).then(result => {
|
|
71
71
|
if (result.error) {
|
|
72
|
-
logger.error('api.getAblyToken error', {
|
|
73
|
-
error: result.error,
|
|
74
|
-
originalError: result.error.original,
|
|
75
|
-
originalErrorResponse: axios_1.default.isAxiosError(result.error.original)
|
|
76
|
-
? result.error.original.response
|
|
77
|
-
: undefined
|
|
78
|
-
});
|
|
79
72
|
callback(result.error.code, undefined);
|
|
80
73
|
}
|
|
81
74
|
else {
|
|
@@ -83,18 +76,42 @@ const Chat = (function () {
|
|
|
83
76
|
}
|
|
84
77
|
});
|
|
85
78
|
},
|
|
86
|
-
};
|
|
87
|
-
ably = new Ably.Realtime(ablyOptions);
|
|
79
|
+
});
|
|
88
80
|
ably.connection.on(handleAblyConnectionStateChange);
|
|
89
81
|
};
|
|
90
82
|
const isInitialized = () => {
|
|
91
83
|
return initialized;
|
|
92
84
|
};
|
|
85
|
+
const setJwtToken = (jwtToken) => {
|
|
86
|
+
if (options.jwtToken === jwtToken
|
|
87
|
+
|| ((options.jwtToken === null || typeof options.jwtToken === 'undefined')
|
|
88
|
+
&& (jwtToken === null || typeof jwtToken === 'undefined'))) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
options.jwtToken = jwtToken;
|
|
92
|
+
for (const chatId in chats) {
|
|
93
|
+
if (Object.prototype.hasOwnProperty.call(chats, chatId)) {
|
|
94
|
+
chats[chatId].cancelAllSubscriptions();
|
|
95
|
+
ably.channels.release(getChannelName(Number(chatId)));
|
|
96
|
+
delete chats[chatId];
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
api = new API_1.default({
|
|
100
|
+
axios: options.axios,
|
|
101
|
+
jwtToken: options.jwtToken,
|
|
102
|
+
getChatMessagesRoute: options.getChatMessagesRoute,
|
|
103
|
+
getChatAblyTokenRoute: options.getChatAblyTokenRoute,
|
|
104
|
+
getChatStoreMessageRoute: options.getChatStoreMessageRoute,
|
|
105
|
+
getChatForAppointmentRoute: options.getChatForAppointmentRoute
|
|
106
|
+
});
|
|
107
|
+
reauthorizeAbly();
|
|
108
|
+
};
|
|
93
109
|
const get = (id) => __awaiter(this, void 0, void 0, function* () {
|
|
94
110
|
const { chat, error } = getChat(id);
|
|
95
111
|
if (error) {
|
|
96
112
|
return { error };
|
|
97
113
|
}
|
|
114
|
+
reauthorizeAbly();
|
|
98
115
|
const subscription = new ChatSubscription_1.default(chat, {
|
|
99
116
|
status: 'active',
|
|
100
117
|
connectionStatus
|
|
@@ -132,31 +149,8 @@ const Chat = (function () {
|
|
|
132
149
|
chat.onConnectionStatusChange(connectionStatus);
|
|
133
150
|
});
|
|
134
151
|
};
|
|
135
|
-
const setJwtToken = (jwtToken) => {
|
|
136
|
-
if (options.jwtToken === jwtToken
|
|
137
|
-
|| ((options.jwtToken === null || typeof options.jwtToken === 'undefined')
|
|
138
|
-
&& (jwtToken === null || typeof jwtToken === 'undefined'))) {
|
|
139
|
-
return;
|
|
140
|
-
}
|
|
141
|
-
options.jwtToken = jwtToken;
|
|
142
|
-
for (const chatId in chats) {
|
|
143
|
-
if (Object.prototype.hasOwnProperty.call(chats, chatId)) {
|
|
144
|
-
chats[chatId].cancelAllSubscriptions();
|
|
145
|
-
ably.channels.release(getChannelName(Number(chatId)));
|
|
146
|
-
delete chats[chatId];
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
api = new API_1.default({
|
|
150
|
-
axios: options.axios,
|
|
151
|
-
jwtToken: options.jwtToken,
|
|
152
|
-
getChatMessagesRoute: options.getChatMessagesRoute,
|
|
153
|
-
getChatAblyTokenRoute: options.getChatAblyTokenRoute,
|
|
154
|
-
getChatStoreMessageRoute: options.getChatStoreMessageRoute,
|
|
155
|
-
getChatForAppointmentRoute: options.getChatForAppointmentRoute
|
|
156
|
-
});
|
|
157
|
-
reauthorizeAbly();
|
|
158
|
-
};
|
|
159
152
|
const logout = () => {
|
|
153
|
+
setJwtToken(undefined);
|
|
160
154
|
};
|
|
161
155
|
const getChannelName = (chatId) => {
|
|
162
156
|
return `viewber:chat:${chatId}`;
|
package/dist/Chat.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chat.js","sourceRoot":"","sources":["../src/Chat.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,gDAAwB;
|
|
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.45",
|
|
4
4
|
"description": "Viewber chat",
|
|
5
5
|
"author": "Jacob <jacob.chen@viewber.co.uk>",
|
|
6
6
|
"homepage": "https://bitbucket.org/ezadr/viewberjs#readme",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"react": "^16.14.0",
|
|
42
42
|
"rollbar": "^2.25.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "4310176c236429318a2c18aa98edd767e7512c9b"
|
|
45
45
|
}
|