Skip to content

Commit a16384c

Browse files
mohitpubnubmohitpubnub
committed
dist/lib
1 parent bc212b9 commit a16384c

File tree

5 files changed

+65
-39
lines changed

5 files changed

+65
-39
lines changed

‎dist/web/pubnub.js

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,9 +2354,7 @@
23542354
}
23552355
catch (e) {
23562356
decryptedPayload = null;
2357-
if (console && console.log) {
2358-
console.log('decryption error', e.message);
2359-
}
2357+
announce.error = "Error while decrypting message content: ".concat(e.message);
23602358
}
23612359
if (decryptedPayload !== null) {
23622360
msgPayload = decryptedPayload;
@@ -2401,10 +2399,7 @@
24012399
}
24022400
catch (e) {
24032401
decryptedPayload = null;
2404-
// eslint-disable-next-line
2405-
if (console && console.log) {
2406-
console.log('decryption error', e.message); //eslint-disable-line
2407-
}
2402+
announce.error = "Error while decrypting message content: ".concat(e.message);
24082403
}
24092404
if (decryptedPayload != null) {
24102405
announce.message = decryptedPayload;
@@ -6239,18 +6234,24 @@
62396234

62406235
/* */
62416236
function __processMessage$1(modules, message) {
6242-
if (!modules.cryptoModule)
6243-
return message;
6237+
var result = {};
6238+
if (!modules.cryptoModule) {
6239+
result.payload = message;
6240+
return result;
6241+
}
62446242
try {
62456243
var decryptedData = modules.cryptoModule.decrypt(message);
62466244
var decryptedPayload = decryptedData instanceof ArrayBuffer ? JSON.parse(new TextDecoder().decode(decryptedData)) : decryptedData;
6247-
return decryptedPayload;
6245+
result.payload = decryptedPayload;
6246+
return result;
62486247
}
62496248
catch (e) {
6250-
if (console && console.log)
6249+
if (modules.config.logVerbosity && console && console.log)
62516250
console.log('decryption error', e.message);
6252-
return message;
6251+
result.payload = message;
6252+
result.error = "Error while decrypting message content: ".concat(e.message);
62536253
}
6254+
return result;
62546255
}
62556256
function getOperation$5() {
62566257
return OPERATIONS.PNHistoryOperation;
@@ -6301,13 +6302,16 @@
63016302
};
63026303
if (Array.isArray(serverResponse[0])) {
63036304
serverResponse[0].forEach(function (serverHistoryItem) {
6305+
var processedMessgeResult = __processMessage$1(modules, serverHistoryItem.message);
63046306
var item = {
63056307
timetoken: serverHistoryItem.timetoken,
6306-
entry: __processMessage$1(modules, serverHistoryItem.message),
6308+
entry: processedMessgeResult.payload,
63076309
};
63086310
if (serverHistoryItem.meta) {
63096311
item.meta = serverHistoryItem.meta;
63106312
}
6313+
if (processedMessgeResult.error)
6314+
item.error = processedMessgeResult.error;
63116315
response.messages.push(item);
63126316
});
63136317
}
@@ -6438,18 +6442,24 @@
64386442

64396443
/* */
64406444
function __processMessage(modules, message) {
6441-
if (!modules.cryptoModule)
6442-
return message;
6445+
var result = {};
6446+
if (!modules.cryptoModule) {
6447+
result.payload = message;
6448+
return result;
6449+
}
64436450
try {
64446451
var decryptedData = modules.cryptoModule.decrypt(message);
64456452
var decryptedPayload = decryptedData instanceof ArrayBuffer ? JSON.parse(new TextDecoder().decode(decryptedData)) : decryptedData;
6446-
return decryptedPayload;
6453+
result.payload = decryptedPayload;
6454+
return result;
64476455
}
64486456
catch (e) {
6449-
if (console && console.log)
6457+
if (modules.config.logVerbosity && console && console.log)
64506458
console.log('decryption error', e.message);
6451-
return message;
6459+
result.payload = message;
6460+
result.error = "Error while decrypting message content: ".concat(e.message);
64526461
}
6462+
return result;
64536463
}
64546464
function getOperation$2() {
64556465
return OPERATIONS.PNFetchMessagesOperation;
@@ -6511,9 +6521,10 @@
65116521
response.channels[channelName] = [];
65126522
(serverResponse.channels[channelName] || []).forEach(function (messageEnvelope) {
65136523
var announce = {};
6524+
var processedMessgeResult = __processMessage(modules, messageEnvelope.message);
65146525
announce.channel = channelName;
65156526
announce.timetoken = messageEnvelope.timetoken;
6516-
announce.message = __processMessage(modules, messageEnvelope.message);
6527+
announce.message = processedMessgeResult.payload;
65176528
announce.messageType = messageEnvelope.message_type;
65186529
announce.uuid = messageEnvelope.uuid;
65196530
if (messageEnvelope.actions) {
@@ -6524,6 +6535,8 @@
65246535
if (messageEnvelope.meta) {
65256536
announce.meta = messageEnvelope.meta;
65266537
}
6538+
if (processedMessgeResult.error)
6539+
announce.error = processedMessgeResult.error;
65276540
response.channels[channelName].push(announce);
65286541
});
65296542
});

‎dist/web/pubnub.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/core/components/subscription_manager.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,7 @@ var default_1 = /** @class */ (function () {
534534
}
535535
catch (e) {
536536
decryptedPayload = null;
537-
if (console && console.log) {
538-
console.log('decryption error', e.message);
539-
}
537+
announce.error = "Error while decrypting message content: ".concat(e.message);
540538
}
541539
if (decryptedPayload !== null) {
542540
msgPayload = decryptedPayload;
@@ -581,10 +579,7 @@ var default_1 = /** @class */ (function () {
581579
}
582580
catch (e) {
583581
decryptedPayload = null;
584-
// eslint-disable-next-line
585-
if (console && console.log) {
586-
console.log('decryption error', e.message); //eslint-disable-line
587-
}
582+
announce.error = "Error while decrypting message content: ".concat(e.message);
588583
}
589584
if (decryptedPayload != null) {
590585
announce.message = decryptedPayload;

‎lib/core/endpoints/fetch_messages.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@ exports.handleResponse = exports.prepareParams = exports.isAuthSupported = expor
88
var operations_1 = __importDefault(require("../constants/operations"));
99
var utils_1 = __importDefault(require("../utils"));
1010
function __processMessage(modules, message) {
11-
if (!modules.cryptoModule)
12-
return message;
11+
var result = {};
12+
if (!modules.cryptoModule) {
13+
result.payload = message;
14+
return result;
15+
}
1316
try {
1417
var decryptedData = modules.cryptoModule.decrypt(message);
1518
var decryptedPayload = decryptedData instanceof ArrayBuffer ? JSON.parse(new TextDecoder().decode(decryptedData)) : decryptedData;
16-
return decryptedPayload;
19+
result.payload = decryptedPayload;
20+
return result;
1721
}
1822
catch (e) {
19-
if (console && console.log)
23+
if (modules.config.logVerbosity && console && console.log)
2024
console.log('decryption error', e.message);
21-
return message;
25+
result.payload = message;
26+
result.error = "Error while decrypting message content: ".concat(e.message);
2227
}
28+
return result;
2329
}
2430
function getOperation() {
2531
return operations_1.default.PNFetchMessagesOperation;
@@ -87,9 +93,10 @@ function handleResponse(modules, serverResponse) {
8793
response.channels[channelName] = [];
8894
(serverResponse.channels[channelName] || []).forEach(function (messageEnvelope) {
8995
var announce = {};
96+
var processedMessgeResult = __processMessage(modules, messageEnvelope.message);
9097
announce.channel = channelName;
9198
announce.timetoken = messageEnvelope.timetoken;
92-
announce.message = __processMessage(modules, messageEnvelope.message);
99+
announce.message = processedMessgeResult.payload;
93100
announce.messageType = messageEnvelope.message_type;
94101
announce.uuid = messageEnvelope.uuid;
95102
if (messageEnvelope.actions) {
@@ -100,6 +107,8 @@ function handleResponse(modules, serverResponse) {
100107
if (messageEnvelope.meta) {
101108
announce.meta = messageEnvelope.meta;
102109
}
110+
if (processedMessgeResult.error)
111+
announce.error = processedMessgeResult.error;
103112
response.channels[channelName].push(announce);
104113
});
105114
});

‎lib/core/endpoints/history/get_history.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@ exports.handleResponse = exports.prepareParams = exports.isAuthSupported = expor
88
var operations_1 = __importDefault(require("../../constants/operations"));
99
var utils_1 = __importDefault(require("../../utils"));
1010
function __processMessage(modules, message) {
11-
if (!modules.cryptoModule)
12-
return message;
11+
var result = {};
12+
if (!modules.cryptoModule) {
13+
result.payload = message;
14+
return result;
15+
}
1316
try {
1417
var decryptedData = modules.cryptoModule.decrypt(message);
1518
var decryptedPayload = decryptedData instanceof ArrayBuffer ? JSON.parse(new TextDecoder().decode(decryptedData)) : decryptedData;
16-
return decryptedPayload;
19+
result.payload = decryptedPayload;
20+
return result;
1721
}
1822
catch (e) {
19-
if (console && console.log)
23+
if (modules.config.logVerbosity && console && console.log)
2024
console.log('decryption error', e.message);
21-
return message;
25+
result.payload = message;
26+
result.error = "Error while decrypting message content: ".concat(e.message);
2227
}
28+
return result;
2329
}
2430
function getOperation() {
2531
return operations_1.default.PNHistoryOperation;
@@ -76,13 +82,16 @@ function handleResponse(modules, serverResponse) {
7682
};
7783
if (Array.isArray(serverResponse[0])) {
7884
serverResponse[0].forEach(function (serverHistoryItem) {
85+
var processedMessgeResult = __processMessage(modules, serverHistoryItem.message);
7986
var item = {
8087
timetoken: serverHistoryItem.timetoken,
81-
entry: __processMessage(modules, serverHistoryItem.message),
88+
entry: processedMessgeResult.payload,
8289
};
8390
if (serverHistoryItem.meta) {
8491
item.meta = serverHistoryItem.meta;
8592
}
93+
if (processedMessgeResult.error)
94+
item.error = processedMessgeResult.error;
8695
response.messages.push(item);
8796
});
8897
}

0 commit comments

Comments
 (0)