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

SK-273 added sorting of messages by platform #10

Merged
merged 1 commit into from
Oct 30, 2024
Merged

SK-273 added sorting of messages by platform #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 39 additions & 27 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ const settings = {
const defaultPushMessage = { title: "Title", body: "Body", message: "payload" };

const pushNotificationProcess = async (job, done) => {
const { devices, message, platform } = job.data;
const registeredDevices = [];
const { devices, message } = job.data;
const registeredDevices = { ios: [], android: [], web: [] };

for (const device of devices) {
switch (platform) {
switch (device.platform) {
case "ios":
registeredDevices.push(device.device_token);
registeredDevices.ios.push(device.device_token);
break;
case "android":
registeredDevices.push(device.device_token);
registeredDevices.android.push(device.device_token);
break;
case "web":
default:
registeredDevices.push({
registeredDevices.web.push({
endpoint: device.web_endpoint,
expirationTime: null,
keys: { p256dh: device.web_key_p256dh, auth: device.web_key_auth },
Expand All @@ -74,38 +74,50 @@ const pushNotificationProcess = async (job, done) => {
}
}

//TODO: reed fields for notification from queue, also add list of allowed fileds for message
const decodedMessage = decodeBase64(message);
const pushMessage = decodedMessage || defaultPushMessage;

const push = new PushNotifications(settings);

const closeJob = () => {
job.progress(100);
done();
};

try {
const sentPushes = (await push.send(registeredDevices, pushMessage))[0];
for (const platform in registeredDevices) {
if (!registeredDevices[platform].length) continue;

for (let message of sentPushes.message) {
if (message.error) {
const pushSubscriptionRecord = await PushSubscription.findOne({
web_endpoint: message.regId.endpoint,
});
if (pushSubscriptionRecord) {
await pushSubscriptionRecord.delete();
console.log(
"[pushNotificationProcess] removed failed subscription",
message
);
closeJob();
let decodedMessage = decodeBase64(message);

switch (platform) {
case "android":
decodedMessage = { data: { ...decodedMessage } };
break;
}

const pushMessage = decodedMessage || defaultPushMessage;

try {
const sentPushes = (
await push.send(registeredDevices[platform], pushMessage)
)[0];

for (let message of sentPushes.message) {
if (message.error) {
const pushSubscriptionRecord = await PushSubscription.findOne({
web_endpoint: message.regId.endpoint,
});
if (pushSubscriptionRecord) {
await pushSubscriptionRecord.delete();
console.log(
`[pushNotificationProcess:${platform}] removed failed subscription`,
message
);
closeJob();
}
}
}
console.log(`[pushNotificationProcess:${platform}] DONE`);
} catch (error) {
console.error(`[pushNotificationProcess:${platform}] error`, error);
}
console.log("[pushNotificationProcess] DONE");
} catch (error) {
console.error(`[pushNotificationProcess] error`, error);
}
closeJob();
};
Expand Down