Merge pull request #504 from darkiox/master

Fix Discord RPC Timestamp jitter
Merge pull request #515 from Mastermindzh/snyk-fix-82857ea1745fc2cfbc5f06a87a8ff0b8
2025-09-13 07:09:06 +02:00 · 2024-12-09 11:21:27 +01:00 · 2024-12-09 11:05:23 +01:00 · 2024-12-06 20:33:54 +00:00 · 2024-12-02 09:03:11 +01:00 · 2024-11-30 06:57:38 +00:00
3 changed files with 20 additions and 16 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,10 +12,10 @@
        "@electron/remote": "^2.1.2",
        "@types/swagger-jsdoc": "^6.0.4",
        "@xhayper/discord-rpc": "^1.2.0",
-        "axios": "^1.7.7",
+        "axios": "^1.7.8",
        "cors": "^2.8.5",
        "electron-store": "^8.2.0",
-        "express": "^4.21.1",
+        "express": "^4.21.2",
        "hotkeys-js": "^3.13.7",
        "mpris-service": "^2.1.2",
        "request": "^2.88.2",
@@ -2364,9 +2364,9 @@
      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
    },
    "node_modules/axios": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+      "version": "1.7.8",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz",
+      "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==",
      "license": "MIT",
      "dependencies": {
        "follow-redirects": "^1.15.6",
@@ -4167,9 +4167,9 @@
      }
    },
    "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
      "license": "MIT",
      "dependencies": {
        "accepts": "~1.3.8",
@@ -4191,7 +4191,7 @@
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
        "proxy-addr": "~2.0.7",
        "qs": "6.13.0",
        "range-parser": "~1.2.1",
@@ -4206,6 +4206,10 @@
      },
      "engines": {
        "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/express/node_modules/debug": {
@@ -6685,9 +6689,10 @@
      }
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "license": "MIT"
    },
    "node_modules/path-type": {
      "version": "4.0.0",
--- a/package.json
+++ b/package.json
@@ -43,10 +43,10 @@
    "@electron/remote": "^2.1.2",
    "@types/swagger-jsdoc": "^6.0.4",
    "@xhayper/discord-rpc": "^1.2.0",
-    "axios": "^1.7.7",
+    "axios": "^1.7.8",
    "cors": "^2.8.5",
    "electron-store": "^8.2.0",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
    "hotkeys-js": "^3.13.7",
    "mpris-service": "^2.1.2",
    "request": "^2.88.2",
--- a/src/scripts/discord.ts
+++ b/src/scripts/discord.ts
@@ -103,8 +103,7 @@ const getActivity = (): SetActivity => {
    if (includeTimestamps) {
      const currentSeconds = convertDurationToSeconds(mediaInfo.current);
      const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const date = new Date();
-      const now = Math.floor(date.getTime() / 1000);
+      const now = Math.trunc((Date.now() + 500) / 1000);
      presence.startTimestamp = now - currentSeconds;
      presence.endTimestamp = presence.startTimestamp + durationSeconds;
    }
Author	SHA1	Message	Date
Rick van Lieshout	aaf7a1b662	Merge pull request #504 from darkiox/master Fix Discord RPC Timestamp jitter	2024-12-09 11:21:27 +01:00
Rick van Lieshout	755be0ee30	Merge pull request #515 from Mastermindzh/snyk-fix-82857ea1745fc2cfbc5f06a87a8ff0b8 [Snyk] Security upgrade express from 4.21.1 to 4.21.2	2024-12-09 11:05:23 +01:00
snyk-bot	9d736b2bd9	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-PATHTOREGEXP-8482416	2024-12-06 20:33:54 +00:00
Rick van Lieshout	f4d4b1a1df	Merge pull request #508 from Mastermindzh/snyk-fix-a6630fbdb3c8f0161d0b939cf0ec3ca3 [Snyk] Security upgrade axios from 1.7.7 to 1.7.8	2024-12-02 09:03:11 +01:00
snyk-bot	0c27c815f5	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AXIOS-6671926	2024-11-30 06:57:38 +00:00
Darkiox	a3aa45a96b	fix: discord rpc timestamp jitter	2024-11-25 19:15:26 -03:00