Skip to content

Commit 179a062

Browse files
CookiezaursCookiezaurs
authored
Merge branch 'master' into subdir-adjustments
2 parents 2e43d60 + c76e938 commit 179a062

File tree

79 files changed

+3179
-3210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3179
-3210
lines changed

‎CHANGELOG.md

+38
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
## Version 24.05.13
2+
Fixes:
3+
- [alerts] Fixed bugs related to NPS alerts
4+
- [crash] Reworked symbol files upload to support larger symbol files
5+
- [push] Fixed bug that would surface when sending Array or Object related payload
6+
7+
Enterprise fixes:
8+
- [ab-testing] Slight improvements to the UI and UX
9+
- [remote-config] Slight improvements to the UI and UX
10+
11+
Enterprise Features:
12+
- [ab-testing] Improved UI for selecting AB test expiration
13+
14+
## Version 24.05.12
15+
Fixes:
16+
- [dashboards] Fixes for dashboards grid
17+
- [dasboards] UI fix for dashboard widget action menu
18+
- [push] Refactored fcm API related code
19+
- [reports] Use config for encryption key in reports
20+
21+
Enterprise fixes:
22+
- [retention] Fixes for byval retention query calculation
23+
24+
## Version 24.05.11
25+
Fixes:
26+
- [cache] Use a cursor without timeout
27+
28+
## Version 24.05.10
29+
Fixes:
30+
- [alerts] Alerts improvements
31+
- [core] Various fixes for frontend to support running countly from subdirectory
32+
- [logs] Show collected problems on logger
33+
34+
Enterprise fixes:
35+
- [data-manager] Fixes n UI to allow events starting with "/"
36+
- [flows] Fixes for flows step generation
37+
- [surveys] Other is not allowed as a valid answer for required questions
38+
139
## Version 24.05.9
240
Fixes:
341
- [crashes] Fix crashes template paths and add data check

‎api/api.js

+13-5
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,18 @@ plugins.connectToAllDatabases().then(function() {
370370
}
371371

372372
const form = new formidable.IncomingForm(formidableOptions);
373-
req.body = '';
374-
req.on('data', (data) => {
375-
req.body += data;
376-
});
373+
if (/crash_symbols\/(add_symbol|upload_symbol)/.test(req.url)) {
374+
req.body = [];
375+
req.on('data', (data) => {
376+
req.body.push(data);
377+
});
378+
}
379+
else {
380+
req.body = '';
381+
req.on('data', (data) => {
382+
req.body += data;
383+
});
384+
}
377385

378386
let multiFormData = false;
379387
// Check if we have 'multipart/form-data'
@@ -432,4 +440,4 @@ plugins.connectToAllDatabases().then(function() {
432440

433441
plugins.loadConfigs(common.db);
434442
}
435-
});
443+
});

‎api/config.sample.js

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ var countlyConfig = {
9999
* @property {string} algorithm - name of the algorithm to use for encryption. The algorithm is dependent on OpenSSL, examples are 'aes192', etc. On recent OpenSSL releases, openssl list-cipher-algorithms will display the available cipher algorithms. Default value is aes-256-cbc
100100
* @property {string} input_encoding - how encryption input is encoded. Used as output for decrypting. Default utf-8.
101101
* @property {string} output_encoding - how encryption output is encoded. Used as input for decrypting. Default hex.
102+
* @property {string} reports_key - key used for encryption of reports links
102103
*/
103104
encryption: {},
104105

‎api/parts/data/fetch.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@ function fetchTimeObj(collection, params, isCustomEvent, options, callback) {
15891589
options = {};
15901590
}
15911591

1592-
if (typeof options === "undefined") {
1592+
if (!options) {
15931593
options = {};
15941594
}
15951595

@@ -1679,7 +1679,7 @@ function fetchTimeObj(collection, params, isCustomEvent, options, callback) {
16791679

16801680
var zeroDocs = [zeroIdToFetch];
16811681
var monthDocs = [monthIdToFetch];
1682-
if (!(options && options.dontBreak)) {
1682+
if (!options.dontBreak) {
16831683
for (let i = 0; i < common.base64.length; i++) {
16841684
zeroDocs.push(zeroIdToFetch + "_" + common.base64[i]);
16851685
monthDocs.push(monthIdToFetch + "_" + common.base64[i]);

‎api/parts/mgmt/cms.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,21 @@ function syncCMSDataToDB(params) {
157157
}
158158

159159
cmsApi.saveEntries = function(params) {
160+
161+
var entries = [];
162+
try {
163+
entries = JSON.parse(params.qstring.entries);
164+
}
165+
catch (ex) {
166+
log.e(params.qstring.entries);
167+
common.returnMessage(params, 400, 'Invalid entries parameter');
168+
return;
169+
}
170+
160171
transformAndStoreData(
161172
Object.assign({dataTransformed: true}, params),
162173
null,
163-
JSON.parse(params.qstring.entries),
174+
entries,
164175
function(err1) {
165176
if (err1) {
166177
log.e('An error occured while storing entries in DB: ' + err1);

‎api/utils/requestProcessor.js

+9
Original file line numberDiff line numberDiff line change
@@ -1824,6 +1824,9 @@ const processRequest = (params) => {
18241824
switch (paths[3]) {
18251825
case 'all':
18261826
validateRead(params, 'core', () => {
1827+
if (!params.qstring.query) {
1828+
params.qstring.query = {};
1829+
}
18271830
if (typeof params.qstring.query === "string") {
18281831
try {
18291832
params.qstring.query = JSON.parse(params.qstring.query);
@@ -1864,6 +1867,9 @@ const processRequest = (params) => {
18641867
break;
18651868
case 'count':
18661869
validateRead(params, 'core', () => {
1870+
if (!params.qstring.query) {
1871+
params.qstring.query = {};
1872+
}
18671873
if (typeof params.qstring.query === "string") {
18681874
try {
18691875
params.qstring.query = JSON.parse(params.qstring.query);
@@ -1896,6 +1902,9 @@ const processRequest = (params) => {
18961902
break;
18971903
case 'list':
18981904
validateRead(params, 'core', () => {
1905+
if (!params.qstring.query) {
1906+
params.qstring.query = {};
1907+
}
18991908
if (typeof params.qstring.query === "string") {
19001909
try {
19011910
params.qstring.query = JSON.parse(params.qstring.query);

‎bin/scripts/expire-data/countly_single_app_expireDataBatches.js

+98-11
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,77 @@ function prepareIterationList(collections, seconds) {
171171
return listed;
172172

173173
}
174+
175+
function processDrillCollection(collection, seconds, callback) {
176+
var listed = [];
177+
178+
if (start === 0) {
179+
getMinTs(function(err, minTs) {
180+
if (err) {
181+
console.log("ERROR: Could not fetch min ts for collection " + collection.collection);
182+
callback(err);
183+
}
184+
else {
185+
console.log("Min ts for collection " + collection.collection + ": " + minTs);
186+
generateIterationList(minTs);
187+
processCollection();
188+
}
189+
});
190+
}
191+
else {
192+
generateIterationList(start);
193+
processCollection();
194+
}
195+
196+
function getMinTs(cb) {
197+
collection.db.collection(collection.collection).findOne({}, { sort: { ts: 1 }, projection: { ts: 1 } }, function(err, doc) {
198+
if (err) {
199+
return callback(err);
200+
}
201+
if (doc && doc.ts) {
202+
cb(null, doc.ts);
203+
}
204+
else {
205+
cb(null, end);
206+
}
207+
});
208+
}
209+
210+
function generateIterationList(z) {
211+
z = (start === 0 && z) ? z : start;
212+
if (timeSpan === 0 && z === 0) {
213+
listed.push({"collection": collection.collection, "db": collection.db, "start": 0, "end": end, "query": {"ts": {"$lt": end}}});
214+
}
215+
else if (timeSpan === 0) {
216+
listed.push({"collection": collection.collection, "db": collection.db, "start": z, "end": end, "query": {"ts": {"$gte": z, "$lt": end}}});
217+
}
218+
else {
219+
if (seconds) {
220+
z = Math.floor(z / 1000);
221+
for (; z <= Math.floor(end / 1000); z += timeSpan) {
222+
listed.push({"collection": collection.collection, "db": collection.db, "start": z, "end": Math.min(z + timeSpan, end), "seconds": true});
223+
}
224+
}
225+
else {
226+
for (; z <= end; z += timeSpan * 1000) {
227+
listed.push({"collection": collection.collection, "db": collection.db, "start": z, "end": Math.min(z + timeSpan * 1000, end)});
228+
}
229+
}
230+
}
231+
}
232+
233+
function processCollection() {
234+
async.eachLimit(listed, paralelCn, eventIterator, function(err) {
235+
if (err) {
236+
console.log("ERROR: Error while processing drill collection: " + collection.collection);
237+
return callback(err);
238+
}
239+
console.log('Finished processing collection ' + collection.collection);
240+
callback();
241+
});
242+
}
243+
}
244+
174245
function processDrillCollections(db, drill_db, callback) {
175246
if (process && process.drill_events) {
176247
var collections = [];
@@ -192,10 +263,19 @@ function processDrillCollections(db, drill_db, callback) {
192263
collections.push({'db': drill_db, 'collection': "drill_events" + crypto.createHash('sha1').update(eventData.list[i] + APP_ID).digest('hex')});
193264
}
194265
}
195-
var iteratorList = prepareIterationList(collections);
196-
async.eachLimit(iteratorList, paralelCn, eventIterator, function() {
197-
console.log('Drill collections processed');
198-
callback();
266+
267+
async.eachSeries(collections, function(collection, done) {
268+
processDrillCollection(collection, false, function(err) {
269+
if (err) {
270+
console.log("ERROR: Error while processing drill collection: " + collection.collection);
271+
}
272+
done(err);
273+
});
274+
}, function(err) {
275+
if (err) {
276+
console.log("ERROR: Error processing collections.");
277+
}
278+
callback(err);
199279
});
200280
});
201281
}
@@ -224,15 +304,22 @@ Promise.all([plugins.dbConnection("countly"), plugins.dbConnection("countly_dril
224304
}
225305
}
226306
}
227-
var iteratorList = prepareIterationList(processCols, true);
228-
async.eachLimit(iteratorList, paralelCn, eventIterator, function() {
229-
if (errorCn > 0) {
230-
console.log("There were errors. Please recheck logs for those.");
231-
}
232-
console.log('finished');
307+
if (processCols.length === 0) {
308+
console.log("Finished");
233309
db.close();
234310
db_drill.close();
235-
});
311+
}
312+
else {
313+
var iteratorList = prepareIterationList(processCols, true);
314+
async.eachLimit(iteratorList, paralelCn, eventIterator, function() {
315+
if (errorCn > 0) {
316+
console.log("There were errors. Please recheck logs for those.");
317+
}
318+
console.log('finished');
319+
db.close();
320+
db_drill.close();
321+
});
322+
}
236323
});
237324
}
238325
});

0 commit comments

Comments
 (0)