Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: messageType and spaceId #314

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

feat: messageType and spaceId #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
80e378c
subscribe: messageType and spaceId
mohitpubnub Mar 7, 2023
6b65829
publish/signal: messageType and spaceId
mohitpubnub Mar 7, 2023
938899c
fetch_messages: messageType and spaceId
mohitpubnub Mar 7, 2023
becf78d
files: messageType and spaceId
mohitpubnub Mar 7, 2023
c16b0f4
subscribe: type field
mohitpubnub Mar 27, 2023
f7598b0
fetchMessages: type field
mohitpubnub Mar 27, 2023
34fd621
publish, signal, files_publish: type field
mohitpubnub Mar 27, 2023
376acea
signal - test with type
mohitpubnub Mar 27, 2023
cb07016
lib files
mohitpubnub Mar 27, 2023
0f0da8e
revert unncessary change
mohitpubnub Mar 27, 2023
aee5334
test cleanup
mohitpubnub Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 61 additions & 9 deletions dist/web/pubnub.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2203,6 +2203,12 @@
if (message.userMetadata) {
announce.userMetadata = message.userMetadata;
}
if (message.type) {
announce.type = message.type;
}
if (message.spaceId) {
announce.spaceId = message.spaceId;
}
announce.message = message.payload;
_this._listenerManager.announceSignal(announce);
}
Expand Down Expand Up @@ -2284,6 +2290,12 @@
channel: channel,
}),
};
if (message.type) {
announce.type = message.type;
}
if (message.spaceId) {
announce.spaceId = message.spaceId;
}
_this._listenerManager.announceFile(announce);
}
else {
Expand All @@ -2307,6 +2319,12 @@
else {
announce.message = message.payload;
}
if (message.type) {
announce.type = message.type;
}
if (message.spaceId) {
announce.spaceId = message.spaceId;
}
_this._listenerManager.announceMessage(announce);
}
});
Expand Down Expand Up @@ -4601,7 +4619,6 @@
}); },
};

/** */
var preparePayload = function (_a, payload) {
var crypto = _a.crypto, config = _a.config;
var stringifiedPayload = JSON.stringify(payload);
Expand Down Expand Up @@ -4652,6 +4669,12 @@
if (params.meta && typeof params.meta === 'object') {
outParams.meta = JSON.stringify(params.meta);
}
if (params.spaceId) {
outParams['space-id'] = params.spaceId;
}
if (params.type) {
outParams.type = params.type;
}
return outParams;
},
handleResponse: function (_, response) { return ({
Expand All @@ -4674,7 +4697,7 @@
var _this = this;
var generateUploadUrl = _a.generateUploadUrl, publishFile = _a.publishFile, _b = _a.modules, PubNubFile = _b.PubNubFile, config = _b.config, cryptography = _b.cryptography, networking = _b.networking;
return function (_a) {
var channel = _a.channel, input = _a.file, message = _a.message, cipherKey = _a.cipherKey, meta = _a.meta, ttl = _a.ttl, storeInHistory = _a.storeInHistory;
var channel = _a.channel, input = _a.file, message = _a.message, cipherKey = _a.cipherKey, meta = _a.meta, ttl = _a.ttl, storeInHistory = _a.storeInHistory, type = _a.type, spaceId = _a.spaceId;
return __awaiter(_this, void 0, void 0, function () {
var file, _b, _c, url, formFields, _d, id, name, formFieldsWithMimeType, result, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, e_1, errorBody, reason, retries, wasSuccessful, publishResult;
return __generator(this, function (_s) {
Expand Down Expand Up @@ -4772,6 +4795,8 @@
meta: meta,
storeInHistory: storeInHistory,
ttl: ttl,
type: type,
spaceId: spaceId,
})];
case 24:
/* eslint-disable-next-line no-await-in-loop */
Expand Down Expand Up @@ -6035,7 +6060,7 @@
return prepareMessagePayload$1(modules, message);
}
function prepareParams$7(modules, incomingParams) {
var meta = incomingParams.meta, _a = incomingParams.replicate, replicate = _a === void 0 ? true : _a, storeInHistory = incomingParams.storeInHistory, ttl = incomingParams.ttl;
var meta = incomingParams.meta, _a = incomingParams.replicate, replicate = _a === void 0 ? true : _a, storeInHistory = incomingParams.storeInHistory, ttl = incomingParams.ttl, spaceId = incomingParams.spaceId, type = incomingParams.type;
var params = {};
if (storeInHistory != null) {
if (storeInHistory) {
Expand All @@ -6054,6 +6079,12 @@
if (meta && typeof meta === 'object') {
params.meta = JSON.stringify(meta);
}
if (type) {
params.type = type;
}
if (spaceId) {
params['space-id'] = spaceId;
}
return params;
}
function handleResponse$7(modules, serverResponse) {
Expand Down Expand Up @@ -6105,8 +6136,15 @@
function isAuthSupported$6() {
return true;
}
function prepareParams$6() {
function prepareParams$6(_, incomingParams) {
var spaceId = incomingParams.spaceId, type = incomingParams.type;
var params = {};
if (type) {
params.type = type;
}
if (spaceId) {
params['space-id'] = spaceId;
}
return params;
}
function handleResponse$6(modules, serverResponse) {
Expand Down Expand Up @@ -6321,7 +6359,6 @@
handleResponse: handleResponse$3
});

/* */
function __processMessage(modules, message) {
var config = modules.config, crypto = modules.crypto;
if (!config.cipherKey)
Expand Down Expand Up @@ -6363,8 +6400,10 @@
return true;
}
function prepareParams$2(modules, incomingParams) {
var channels = incomingParams.channels, start = incomingParams.start, end = incomingParams.end, includeMessageActions = incomingParams.includeMessageActions, count = incomingParams.count, _a = incomingParams.stringifiedTimeToken, stringifiedTimeToken = _a === void 0 ? false : _a, _b = incomingParams.includeMeta, includeMeta = _b === void 0 ? false : _b, includeUuid = incomingParams.includeUuid, _c = incomingParams.includeUUID, includeUUID = _c === void 0 ? true : _c, _d = incomingParams.includeMessageType, includeMessageType = _d === void 0 ? true : _d;
var channels = incomingParams.channels, start = incomingParams.start, end = incomingParams.end, includeMessageActions = incomingParams.includeMessageActions, count = incomingParams.count, _a = incomingParams.stringifiedTimeToken, stringifiedTimeToken = _a === void 0 ? false : _a, _b = incomingParams.includeMeta, includeMeta = _b === void 0 ? false : _b, includeUuid = incomingParams.includeUuid, _c = incomingParams.includeUUID, includeUUID = _c === void 0 ? true : _c, _d = incomingParams.includeMessageType, includeMessageType = _d === void 0 ? true : _d, _e = incomingParams.includeType, includeType = _e === void 0 ? true : _e, _f = incomingParams.includeSpaceId, includeSpaceId = _f === void 0 ? false : _f;
var outgoingParams = {};
outgoingParams.include_message_type = 'true';
outgoingParams.include_type = 'true';
if (count) {
outgoingParams.max = count;
}
Expand All @@ -6381,8 +6420,14 @@
outgoingParams.include_meta = 'true';
if (includeUUID && includeUuid !== false)
outgoingParams.include_uuid = 'true';
if (includeMessageType)
outgoingParams.include_message_type = 'true';
if (!includeMessageType) {
outgoingParams.include_message_type = 'false';
}
if (!includeType) {
outgoingParams.include_type = 'false';
}
if (includeSpaceId)
outgoingParams.include_space_id = 'true';
return outgoingParams;
}
function handleResponse$2(modules, serverResponse) {
Expand All @@ -6406,6 +6451,12 @@
if (messageEnvelope.meta) {
announce.meta = messageEnvelope.meta;
}
if (messageEnvelope.type) {
announce.type = messageEnvelope.type;
}
if (messageEnvelope.space_id) {
announce.spaceId = messageEnvelope.space_id;
}
response.channels[channelName].push(announce);
});
});
Expand Down Expand Up @@ -6463,7 +6514,6 @@
validateParams: validateParams$1
});

/* */
function getOperation() {
return OPERATIONS.PNSubscribeOperation;
}
Expand Down Expand Up @@ -6526,6 +6576,8 @@
subscribeKey: rawMessage.k,
originationTimetoken: rawMessage.o,
userMetadata: rawMessage.u,
type: rawMessage.mt,
spaceId: rawMessage.si,
publishMetaData: publishMetaData,
};
messages.push(parsedMessage);
Expand Down
Loading