Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Update dependencies and refactor session ID generation

Bill Yang82cdf4ec8115
diff --git a/server/package-lock.json b/server/package-lock.json
index d781a901b..cf22c4053 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "rybbit-backend",
- "version": "2.1.0",
+ "version": "2.2.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "rybbit-backend",
- "version": "2.1.0",
+ "version": "2.2.1",
"dependencies": {
"@aws-sdk/client-s3": "^3.842.0",
"@axiomhq/pino": "^1.3.1",
@@ -30,6 +30,7 @@
"ip-address": "^10.0.1",
"isbot": "^5.1.28",
"luxon": "3.6.1",
+ "nanoid": "^5.1.6",
"node-cache": "^5.1.2",
"node-cron": "4.0.6",
"pg": "8.16.0",
@@ -6988,20 +6989,21 @@
}
},
"node_modules/nanoid": {
- "version": "3.3.11",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
- "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz",
+ "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/ai"
}
],
+ "license": "MIT",
"bin": {
- "nanoid": "bin/nanoid.cjs"
+ "nanoid": "bin/nanoid.js"
},
"engines": {
- "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ "node": "^18 || >=20"
}
},
"node_modules/nanostores": {
@@ -7538,6 +7540,24 @@
"node": "^10 || ^12 || >=14"
}
},
+ "node_modules/postcss/node_modules/nanoid": {
+ "version": "3.3.11",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+ "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
+ },
"node_modules/postgres": {
"version": "3.4.5",
"resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.5.tgz",
diff --git a/server/package.json b/server/package.json
index baf94b216..de169c7ce 100644
--- a/server/package.json
+++ b/server/package.json
@@ -45,6 +45,7 @@
"ip-address": "^10.0.1",
"isbot": "^5.1.28",
"luxon": "3.6.1",
+ "nanoid": "^5.1.6",
"node-cache": "^5.1.2",
"node-cron": "4.0.6",
"pg": "8.16.0",
diff --git a/server/src/services/sessions/sessionsService.ts b/server/src/services/sessions/sessionsService.ts
index da356d402..29aa409e9 100644
--- a/server/src/services/sessions/sessionsService.ts
+++ b/server/src/services/sessions/sessionsService.ts
@@ -1,4 +1,5 @@
import { and, eq, lt } from "drizzle-orm";
+import { nanoid } from "nanoid";
import * as cron from "node-cron";
import { db } from "../../db/postgres/postgres.js";
import { activeSessions } from "../../db/postgres/schema.js";
@@ -53,7 +54,7 @@ class SessionsService {
}
const insertData = {
- sessionId: crypto.randomUUID(),
+ sessionId: nanoid(14),
siteId,
userId,
startTime: new Date(),