Skip to content

Push v3 #6917

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

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

Push v3 #6917

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
976bff7
[push] Overwrite push plugin with the new version
Nov 3, 2025
eb2a09e
[push] Updated clear-message-results according to the new job system
Nov 4, 2025
5850afb
Merge branch 'newarchitecture' into push-v3
Nov 4, 2025
e445e5d
[push] huawei authentication test
Nov 4, 2025
9f784e4
[push] Remove parallelization from token recording
Nov 6, 2025
ebae3ce
[push] Using kafkajs from kafka plugin
Nov 6, 2025
c01cc67
[push] Message and Schedule collection types
Nov 6, 2025
aaff473
[push] Updated fix-message-states according to the new job system
Nov 6, 2025
e3e21b1
Merge branch 'newarchitecture' into push-v3
Nov 6, 2025
90dc8f7
Merge branch 'newarchitecture' into push-v3
cihadtekin Nov 6, 2025
71eed1f
[push] Fixed deepscan issues
Nov 6, 2025
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
246 changes: 60 additions & 186 deletions plugins/push/api/api-auto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,147 +1,51 @@
const { Audience, TriggerKind, Message, State } = require('./send'),
plugins = require('../../pluginManager'),
common = require('../../../api/utils/common'),
/**
* @typedef {import("mongodb").Db} MongoDb
* @typedef {import("mongodb").ObjectId} ObjectId
* @typedef {{ app_id: ObjectId; _id: string; name: string; }} Cohort
* @typedef {{ key: string; timestamp?: number; }} Event
*/
const common = require('../../../api/utils/common'),
log = common.log('push:api:auto'),
logCohorts = log.sub('cohorts'),
logEvents = log.sub('events');

const { cohortMessageExists, eventMessageExists } = require("./new/lib/message-cache.js");
const { sendAutoTriggerEvents } = require("./new/lib/kafka.js");

/**
* Handler function for /cohort/enter (/cohort/exit) hooks
*
* @param {boolean} entry true if it's cohort enter, false for exit
* @param {object} cohort cohort object
* @param {string[]} uids uids array
* @param {boolean} entry - true if it's cohort enter, false for exit
* @param {Cohort} cohort - cohort object
* @param {string[]} uids - array of uids
*/
module.exports.autoOnCohort = function(entry, cohort, uids) {
log.d('processing cohort %s (%s) %s for %d uids', cohort._id, cohort.name, entry ? 'entry' : 'exit', uids.length);

let now = Date.now(),
aid = cohort.app_id.toString(),
// query = {
// app: app._id,
// state: {$bitsAllSet: State.Streamable, $bitsAllClear: State.Deleted},
// triggers: {
// $elemMatch: {
// kind: TriggerKind.Cohort,
// cohorts: cohort._id,
// entry,
// start: {$lt: now},
// $or: [
// {end: {$exists: false}},
// {end: {$gt: now}}
// ],
// }
// },
// },
typ = entry ? 'enter' : 'exit';

plugins.getPluginsApis()?.push?.cache?.iterate((k, msg) => {
if (msg.app.toString() === aid) {
let trigger = msg.triggerFind(t =>
t.kind === TriggerKind.Cohort &&
t.cohorts.indexOf(cohort._id) !== -1 &&
t.entry === entry &&
t.start.getTime() < now &&
(!t.end || t.end.getTime() > now)),
audience = new Audience(logCohorts, msg);

// adding messages to queue
if (trigger) {
logCohorts.d('processing %s %s', typ, msg._id);
audience.getApp().then(() => {
audience.push(trigger).setUIDs(uids).setStart(new Date()).run().then(result => {
logCohorts.d('processing %s %s, result: %j', typ, msg._id, result);
if (result.total) {
return msg.update({$inc: {'result.total': result.total}}, () => {
msg.result.total += result.total;
});
}
}).then(() => {
logCohorts.d('done processing %s %s', typ, msg._id);
}).catch(error => {
logCohorts.e('Error while pushing users to cohorted message queue %s %s', typ, msg._id, error);
});
}).catch(error => {
logCohorts.e('Failed to load app %s for message %s', aid, msg._id, error);
});
}

// removing messages from queue on reverse trigger
let triggerOpposite = msg.triggerFind(t =>
t.kind === TriggerKind.Cohort &&
t.cohorts.indexOf(cohort._id) !== -1 &&
t.entry === !entry &&
t.cancels &&
t.start.getTime() < now &&
(!t.end || t.end.getTime() > now));

if (triggerOpposite) {
logCohorts.d('processing cancellation %s %s', typ, msg._id);

audience.getApp().then(() => {
audience.pop(triggerOpposite).setUIDs(uids).run().then(result => {
logCohorts.d('done processing cancellation %s %s', typ, msg._id, result);
}).catch(error => {
logCohorts.e('Error while processing cancellation %s %s', typ, msg._id, error);
});
}).catch(error => {
logCohorts.e('Failed to load app %s for message %s', aid, msg._id, error);
});
}
async function autoOnCohort(entry, cohort, uids) {
logCohorts.d("processing cohort %s (%s) %s for %d uids",
cohort._id, cohort.name, entry ? 'enter' : 'exit', uids.length);
const direction = entry ? "enter" : "exit";
if (cohortMessageExists(cohort.app_id, cohort._id, direction)) {
try {
await sendAutoTriggerEvents([{
kind: "cohort",
appId: cohort.app_id,
uids,
cohortId: cohort._id,
direction: entry ? "enter" : "exit",
}]);
logCohorts.d("Cohort auto triggers sent", cohort.app_id,
cohort._id, uids);
}
});


// // adding messages to queue
// let messages = await Message.findMany(query),
// next;
// log.d('processing %s for %d messages', typ, messages.length);

// for (let i = 0; i < messages.length; i++) {
// let msg = messages[i],
// audience = new Audience(app, msg);

// log.d('processing %s %s', typ, msg._id);

// let result = await audience.pushUIDs(uids);
// if (result.count) {
// await msg.update({$inc: {'result.total': result.count}});
// next = next ? Math.min(next, result.next) : result.next;
// }
// }

// if (next) {
// await Audience.resetQueue(result.next);
// }

// // removing messages from queue on reverse trigger
// query.triggers.$elemMatch.entry = !entry;
// query.triggers.$elemMatch.cancels = true;

// messages = await Message.findMany(query);
// log.d('processing cancelling %s for %d messages', typ, messages.length);

// for (let i = 0; i < messages.length; i++) {
// let msg = messages[i],
// audience = new Audience(app, msg);

// log.d('processing cancelling %s %s', typ, msg._id);
catch (err) {
logEvents.e("Error while sending auto trigger events", err);
}
}
}

// let result = await audience.popUIDs(uids);
// if (result.count) {
// await msg.update({$inc: {'result.total': -result.count}});
// }
// }

// log.d('processing cohort %s (%s) %s for %d uids is DONE', cohort._id, cohort.name, entry ? 'entry' : 'exit', uids.length);
};

/**
* Stop related auto messages or count them on cohort deletion
*
*
* @param {string} _id cohort id
* @param {boolean} ack true if stop, false if count
*/
module.exports.autoOnCohortDeletion = async function(_id, ack) {
if (ack) {
let msgs = await Message.findMany({'triggers.cohorts': _id, state: {$bitsAnySet: State.Streamable | State.Streaming | State.Paused | State.Scheduling}});
Expand All @@ -158,67 +62,37 @@ module.exports.autoOnCohortDeletion = async function(_id, ack) {
else {
return await Message.count({'triggers.cohorts': _id, state: {$bitsAnySet: State.Streamable | State.Streaming | State.Paused | State.Scheduling}});
}

};

*/
/**
* Handler function for /cohort/enter (/cohort/exit) hooks
*
* @param {ObjectID} appId app id
*
* @param {ObjectId} appId app id
* @param {string} uid user uid
* @param {string[]} keys unique event keys
* @param {object[]} events event objects
* @param {Event[]} _events event objects
*/
module.exports.autoOnEvent = function(appId, uid, keys, events) {
let now = Date.now(),
aid = appId.toString();

keys = keys.filter((k, i) => keys.indexOf(k) === i);

if (!keys.length) {
return;
async function autoOnEvent(appId, uid, keys, /* eslint-disable no-unused-vars */_events) {
logEvents.d('Checking event keys', keys);
const keySet = Array.from(new Set(keys));
const filteredKeys = keySet.filter(key => eventMessageExists(appId, key));
if (filteredKeys.length) {
try {
await sendAutoTriggerEvents([{
kind: "event",
appId,
eventKeys: filteredKeys,
uid,
}]);
logEvents.d("Event auto triggers sent", appId, filteredKeys, uid);
}
catch (err) {
logEvents.e("Error while sending auto trigger events", err);
}
}
}

logEvents.d('Checking event keys %j', keys);

plugins.getPluginsApis().push.cache.iterate((k, msg) => {
logEvents.d('Checking message %s (triggers %j)', k, msg.triggers.map(t => t.kind));
if (msg.app.toString() === aid) {
let trigger = msg.triggerFind(t =>
t.kind === TriggerKind.Event &&
t.events.filter(key => keys.indexOf(key) !== -1).length &&
t.start.getTime() < now &&
(!t.end || t.end.getTime() > now)),
event = trigger && events.filter(e => trigger.events.indexOf(e.key) !== -1)[0],
date;

if (event && event.timestamp) {
date = Math.floor(parseInt(event.timestamp));
if (date > 1000000000) {
date = new Date(date);
}
else {
date = new Date(date * 1000);
}
}
else {
date = new Date();
}

if (trigger) {
logEvents.d('Pushing %s to %s', uid, k);
let audience = new Audience(logEvents, msg);
audience.getApp().then(() => {
audience.push(trigger).setUIDs([uid]).setStart(trigger.actuals && date || new Date()).run().catch(e => {
logEvents.e('Error while pushing %s to %s on %j', uid, k, keys, e);
});
}).catch(error => {
logCohorts.e('Failed to load app %s for message %s', aid, msg._id, error);
});
}
else {
logEvents.d('Message %s doesn\'t have event trigger', k);
}
}
});
};
module.exports = {
autoOnCohort,
autoOnEvent
};
Loading
Loading