From d53a7b3f5264b9b1cea9d38c816f68cd5c739170 Mon Sep 17 00:00:00 2001 From: e11sy <130844513+e11sy@users.noreply.github.com> Date: Thu, 3 Apr 2025 20:59:08 +0300 Subject: [PATCH 1/3] chore(events): move timestamp out of the event payload - Now timestamp would be stored for all of the events - Timestamp moved out of the payload to avoid events grouping bugs with timestamp rewrites of null values --- src/base/event/event.ts | 10 +--------- src/dbScheme/groupedEvent.ts | 7 +++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/base/event/event.ts b/src/base/event/event.ts index f246971..40c794d 100644 --- a/src/base/event/event.ts +++ b/src/base/event/event.ts @@ -52,16 +52,8 @@ export interface EventData { /** * Event accepted and processed by Collector. - * It sets the timestamp to the event payload. */ -export interface EventDataAccepted extends EventData { - /** - * Occurrence time - * Unix timestamp in seconds (example: 1567009247.576) - * (Set by the Collector) - */ - timestamp: number; -} +export interface EventDataAccepted extends EventData {}; /** diff --git a/src/dbScheme/groupedEvent.ts b/src/dbScheme/groupedEvent.ts index 14e5706..20098f8 100644 --- a/src/dbScheme/groupedEvent.ts +++ b/src/dbScheme/groupedEvent.ts @@ -41,6 +41,13 @@ export interface GroupedEventDBScheme { * Array of users who visited this event */ visitedBy: UserDBScheme[]; + + /** + * Occurrence time + * Unix timestamp in seconds (example: 1567009247.576) + * (Set by the Collector) + */ + timestamp: number; } /** From 6d1233117910c641facacd6320d9508a485563b7 Mon Sep 17 00:00:00 2001 From: e11sy <130844513+e11sy@users.noreply.github.com> Date: Thu, 3 Apr 2025 20:59:29 +0300 Subject: [PATCH 2/3] chore(): bump package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2a9b550..8b2b0f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hawk.so/types", - "version": "0.1.28", + "version": "0.1.29-rc1", "description": "TypeScript definitions for Hawk", "types": "build/index.d.ts", "main": "build/index.js", From 67986ecc50520bb0f1b2dc03c533a685445a951a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Apr 2025 18:01:17 +0000 Subject: [PATCH 3/3] Lint and build --- build/src/base/event/event.d.ts | 7 ------- build/src/dbScheme/groupedEvent.d.ts | 6 ++++++ src/base/event/event.ts | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build/src/base/event/event.d.ts b/build/src/base/event/event.d.ts index fd1c8cc..000fe75 100644 --- a/build/src/base/event/event.d.ts +++ b/build/src/base/event/event.d.ts @@ -43,15 +43,8 @@ export interface EventData { } /** * Event accepted and processed by Collector. - * It sets the timestamp to the event payload. */ export interface EventDataAccepted extends EventData { - /** - * Occurrence time - * Unix timestamp in seconds (example: 1567009247.576) - * (Set by the Collector) - */ - timestamp: number; } /** * Event data with decoded unsafe fields diff --git a/build/src/dbScheme/groupedEvent.d.ts b/build/src/dbScheme/groupedEvent.d.ts index 9238420..ccd4592 100644 --- a/build/src/dbScheme/groupedEvent.d.ts +++ b/build/src/dbScheme/groupedEvent.d.ts @@ -34,6 +34,12 @@ export interface GroupedEventDBScheme { * Array of users who visited this event */ visitedBy: UserDBScheme[]; + /** + * Occurrence time + * Unix timestamp in seconds (example: 1567009247.576) + * (Set by the Collector) + */ + timestamp: number; } /** * Grouped event with decoded event data diff --git a/src/base/event/event.ts b/src/base/event/event.ts index 40c794d..5762cd9 100644 --- a/src/base/event/event.ts +++ b/src/base/event/event.ts @@ -53,7 +53,7 @@ export interface EventData { /** * Event accepted and processed by Collector. */ -export interface EventDataAccepted extends EventData {}; +export interface EventDataAccepted extends EventData {} /**