@oneuptime/common 7.0.4142 → 7.0.4144

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -30,12 +30,98 @@ import UpdateBy from "../Types/Database/UpdateBy";
30
30
  import MonitorService from "./MonitorService";
31
31
  import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
32
32
  import { IsBillingEnabled } from "../EnvironmentConfig";
33
+ import GlobalCache from "../Infrastructure/GlobalCache";
33
34
 
34
35
  export class Service extends DatabaseService<Model> {
35
36
  public constructor() {
36
37
  super(Model);
37
38
  }
38
39
 
40
+ public async saveLastAliveInCache(
41
+ probeId: ObjectID,
42
+ lastAlive: Date,
43
+ ): Promise<void> {
44
+ if (!probeId) {
45
+ throw new BadDataException("probeId is required");
46
+ }
47
+
48
+ try {
49
+ await GlobalCache.setString(
50
+ "probe-last-alive",
51
+ probeId.toString(),
52
+ OneUptimeDate.toString(lastAlive),
53
+ );
54
+ } catch (err) {
55
+ logger.error("Error in saving last alive in cache");
56
+ logger.error(err);
57
+ }
58
+ }
59
+
60
+ public async shouldSaveLastAlive(probeId: ObjectID): Promise<boolean> {
61
+ const now: Date = OneUptimeDate.getCurrentDate();
62
+
63
+ try {
64
+ // before we hit the database, we need to check if the lastAlive was updated in Global Cache.
65
+ const previousLastAliveCheck: string | null = await GlobalCache.getString(
66
+ "probe-last-alive",
67
+ probeId.toString(),
68
+ );
69
+
70
+ if (!previousLastAliveCheck) {
71
+ return true;
72
+ }
73
+
74
+ const previousLastAliveCheckDate: Date | null = OneUptimeDate.fromString(
75
+ previousLastAliveCheck,
76
+ );
77
+
78
+ // if this date is within 30 seconds of current date, then we will not update the last alive.
79
+ if (previousLastAliveCheckDate) {
80
+ const diff: number = OneUptimeDate.getDifferenceInSeconds(
81
+ now,
82
+ previousLastAliveCheckDate,
83
+ );
84
+
85
+ if (diff < 30) {
86
+ return false;
87
+ }
88
+ }
89
+ } catch (err) {
90
+ // failed to hit the cache, so we will hit the database
91
+ logger.error("Error in getting last alive from cache");
92
+ logger.error(err);
93
+ }
94
+
95
+ return true;
96
+ }
97
+
98
+ public async updateLastAlive(probeId: ObjectID): Promise<void> {
99
+ if (!probeId) {
100
+ throw new BadDataException("probeId is required");
101
+ }
102
+
103
+ const shouldSaveLastAlive: boolean =
104
+ await this.shouldSaveLastAlive(probeId);
105
+
106
+ if (!shouldSaveLastAlive) {
107
+ return;
108
+ }
109
+
110
+ const now: Date = OneUptimeDate.getCurrentDate();
111
+
112
+ await this.updateOneById({
113
+ id: probeId,
114
+ data: {
115
+ lastAlive: now,
116
+ },
117
+ props: {
118
+ isRoot: true,
119
+ },
120
+ });
121
+
122
+ await this.saveLastAliveInCache(probeId, now);
123
+ }
124
+
39
125
  @CaptureSpan()
40
126
  protected override async onBeforeCreate(
41
127
  createBy: CreateBy<Model>,
@@ -27,10 +27,67 @@ import URL from "../../Types/API/URL";
27
27
  import MonitorService from "./MonitorService";
28
28
  import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
29
29
  import { IsBillingEnabled } from "../EnvironmentConfig";
30
+ import GlobalCache from "../Infrastructure/GlobalCache";
30
31
  export class Service extends DatabaseService {
31
32
  constructor() {
32
33
  super(Model);
33
34
  }
35
+ async saveLastAliveInCache(probeId, lastAlive) {
36
+ if (!probeId) {
37
+ throw new BadDataException("probeId is required");
38
+ }
39
+ try {
40
+ await GlobalCache.setString("probe-last-alive", probeId.toString(), OneUptimeDate.toString(lastAlive));
41
+ }
42
+ catch (err) {
43
+ logger.error("Error in saving last alive in cache");
44
+ logger.error(err);
45
+ }
46
+ }
47
+ async shouldSaveLastAlive(probeId) {
48
+ const now = OneUptimeDate.getCurrentDate();
49
+ try {
50
+ // before we hit the database, we need to check if the lastAlive was updated in Global Cache.
51
+ const previousLastAliveCheck = await GlobalCache.getString("probe-last-alive", probeId.toString());
52
+ if (!previousLastAliveCheck) {
53
+ return true;
54
+ }
55
+ const previousLastAliveCheckDate = OneUptimeDate.fromString(previousLastAliveCheck);
56
+ // if this date is within 30 seconds of current date, then we will not update the last alive.
57
+ if (previousLastAliveCheckDate) {
58
+ const diff = OneUptimeDate.getDifferenceInSeconds(now, previousLastAliveCheckDate);
59
+ if (diff < 30) {
60
+ return false;
61
+ }
62
+ }
63
+ }
64
+ catch (err) {
65
+ // failed to hit the cache, so we will hit the database
66
+ logger.error("Error in getting last alive from cache");
67
+ logger.error(err);
68
+ }
69
+ return true;
70
+ }
71
+ async updateLastAlive(probeId) {
72
+ if (!probeId) {
73
+ throw new BadDataException("probeId is required");
74
+ }
75
+ const shouldSaveLastAlive = await this.shouldSaveLastAlive(probeId);
76
+ if (!shouldSaveLastAlive) {
77
+ return;
78
+ }
79
+ const now = OneUptimeDate.getCurrentDate();
80
+ await this.updateOneById({
81
+ id: probeId,
82
+ data: {
83
+ lastAlive: now,
84
+ },
85
+ props: {
86
+ isRoot: true,
87
+ },
88
+ });
89
+ await this.saveLastAliveInCache(probeId, now);
90
+ }
34
91
  async onBeforeCreate(createBy) {
35
92
  if (!createBy.data.key) {
36
93
  createBy.data.key = ObjectID.generate().toString();
@@ -1 +1 @@
1
- {"version":3,"file":"ProbeService.js","sourceRoot":"","sources":["../../../../Server/Services/ProbeService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProbeService.js","sourceRoot":"","sources":["../../../../Server/Services/ProbeService.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oneuptime/common",
3
- "version": "7.0.4142",
3
+ "version": "7.0.4144",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -77,7 +77,7 @@
77
77
  "airtable": "^0.12.2",
78
78
  "axios": "^1.7.2",
79
79
  "bullmq": "^5.3.3",
80
- "Common": "npm:@oneuptime/common@7.0.4142",
80
+ "Common": "npm:@oneuptime/common@7.0.4144",
81
81
  "cookie-parser": "^1.4.7",
82
82
  "cors": "^2.8.5",
83
83
  "cron-parser": "^4.8.1",