@bprotsyk/aso-core 1.2.199 → 1.2.201

package/lib/utils/general.js

@@ -10,25 +10,22 @@ function convertMillisToDate(millis) {
 }
 exports.convertMillisToDate = convertMillisToDate;
 function getTimestampsForTodayAndYesterday() {
-    const now = new Date();
-    // Today's Start (00:00:00)
+    const offset = -2;
+    const now = new Date(new Date().getTime() + offset * 3600 * 1000);
     const todayStart = new Date(now);
-    todayStart.setHours(0, 0, 0, 0);
-    const todayStartTimestamp = todayStart.getTime();
-    // Today's End (23:59:59.999)
+    todayStart.setUTCHours(0, 0, 0, 0);
+    const todayStartTimestamp = todayStart.getTime() - offset * 3600 * 1000;
     const todayEnd = new Date(now);
-    todayEnd.setHours(23, 59, 59, 999);
-    const todayEndTimestamp = todayEnd.getTime();
-    // Yesterday's Start (00:00:00)
+    todayEnd.setUTCHours(23, 59, 59, 999);
+    const todayEndTimestamp = todayEnd.getTime() - offset * 3600 * 1000;
     const yesterdayStart = new Date(now);
-    yesterdayStart.setDate(now.getDate() - 1);
-    yesterdayStart.setHours(0, 0, 0, 0);
-    const yesterdayStartTimestamp = yesterdayStart.getTime();
-    // Yesterday's End (23:59:59.999)
+    yesterdayStart.setUTCDate(now.getUTCDate() - 1);
+    yesterdayStart.setUTCHours(0, 0, 0, 0);
+    const yesterdayStartTimestamp = yesterdayStart.getTime() - offset * 3600 * 1000;
     const yesterdayEnd = new Date(now);
-    yesterdayEnd.setDate(now.getDate() - 1);
-    yesterdayEnd.setHours(23, 59, 59, 999);
-    const yesterdayEndTimestamp = yesterdayEnd.getTime();
+    yesterdayEnd.setUTCDate(now.getUTCDate() - 1);
+    yesterdayEnd.setUTCHours(23, 59, 59, 999);
+    const yesterdayEndTimestamp = yesterdayEnd.getTime() - offset * 3600 * 1000;
     return {
         today: {
             start: todayStartTimestamp,

package/lib/utils/keitaro-utils.js

@@ -332,7 +332,7 @@ async function createFlashCampaigns(app) {
     // Upserting Flash Redirect campaign
     let redirectCampaign = await (0, exports.createOrFindFlashRedirectCampaign)(app);
     console.log(`Redirect campaign name:`);
-    console.log(`${redirectCampaign.domain}${redirectCampaign.alias}?uid=`);
+    console.log(`${redirectCampaign.domain}/${redirectCampaign.alias}?uid=`);
     // Upserting necessary streams
     let botProtectionStream = createBPStreamPartialPayload(app);
     let owStream = createOWStreamPartialPayload(app);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "1.2.199",
+  "version": "1.2.201",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {

package/src/utils/general.ts

@@ -1,35 +1,28 @@
 export function convertMillisToDate(millis: number): string {
-    const date = new Date(millis);
-    const year = date.getFullYear();
-    const month = (date.getMonth() + 1).toString().padStart(2, '0');
-    const day = date.getDate().toString().padStart(2, '0');
-    return `${year}-${month}-${day}`;
+    const date = new Date(millis)
+    const year = date.getFullYear()
+    const month = (date.getMonth() + 1).toString().padStart(2, '0')
+    const day = date.getDate().toString().padStart(2, '0')
+    return `${year}-${month}-${day}`
 }
 
 export function getTimestampsForTodayAndYesterday() {
-    const now = new Date();
-
-    // Today's Start (00:00:00)
-    const todayStart = new Date(now);
-    todayStart.setHours(0, 0, 0, 0);
-    const todayStartTimestamp = todayStart.getTime();
-
-    // Today's End (23:59:59.999)
-    const todayEnd = new Date(now);
-    todayEnd.setHours(23, 59, 59, 999);
-    const todayEndTimestamp = todayEnd.getTime();
-
-    // Yesterday's Start (00:00:00)
-    const yesterdayStart = new Date(now);
-    yesterdayStart.setDate(now.getDate() - 1);
-    yesterdayStart.setHours(0, 0, 0, 0);
-    const yesterdayStartTimestamp = yesterdayStart.getTime();
-
-    // Yesterday's End (23:59:59.999)
-    const yesterdayEnd = new Date(now);
-    yesterdayEnd.setDate(now.getDate() - 1);
-    yesterdayEnd.setHours(23, 59, 59, 999);
-    const yesterdayEndTimestamp = yesterdayEnd.getTime();
+    const offset = - 2
+    const now = new Date(new Date().getTime() + offset * 3600 * 1000)
+    const todayStart = new Date(now)
+    todayStart.setUTCHours(0, 0, 0, 0)
+    const todayStartTimestamp = todayStart.getTime() - offset * 3600 * 1000
+    const todayEnd = new Date(now)
+    todayEnd.setUTCHours(23, 59, 59, 999)
+    const todayEndTimestamp = todayEnd.getTime() - offset * 3600 * 1000
+    const yesterdayStart = new Date(now)
+    yesterdayStart.setUTCDate(now.getUTCDate() - 1)
+    yesterdayStart.setUTCHours(0, 0, 0, 0)
+    const yesterdayStartTimestamp = yesterdayStart.getTime() - offset * 3600 * 1000
+    const yesterdayEnd = new Date(now)
+    yesterdayEnd.setUTCDate(now.getUTCDate() - 1)
+    yesterdayEnd.setUTCHours(23, 59, 59, 999)
+    const yesterdayEndTimestamp = yesterdayEnd.getTime() - offset * 3600 * 1000
 
     return {
         today: {
@@ -40,5 +33,5 @@ export function getTimestampsForTodayAndYesterday() {
             start: yesterdayStartTimestamp,
             end: yesterdayEndTimestamp,
         },
-    };
+    }
 }

package/src/utils/keitaro-utils.ts

@@ -359,7 +359,7 @@ export async function createFlashCampaigns(app: IFlashApp) {
     // Upserting Flash Redirect campaign
     let redirectCampaign = await createOrFindFlashRedirectCampaign(app)
     console.log(`Redirect campaign name:`)
-    console.log(`${redirectCampaign.domain}${redirectCampaign.alias}?uid=`)
+    console.log(`${redirectCampaign.domain}/${redirectCampaign.alias}?uid=`)
 
     // Upserting necessary streams
     let botProtectionStream = createBPStreamPartialPayload(app)