Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
add distinct ID to session info, add logic for /undefined
Francis Caof522db44f947
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 4cf902864..145740c68 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -352,6 +352,45 @@ importers:specifier: ^5.5.3version: 5.8.3+ dist:+ dependencies:+ '@tanstack/react-query':+ specifier: ^4.33.0+ classnames:+ specifier: ^2.3.1+ version: 2.5.1+ colord:+ specifier: ^2.9.2+ version: 2.9.3+ date-fns-tz:+ specifier: ^1.1.4+ version: 1.3.8([email protected])+ immer:+ specifier: ^9.0.12+ version: 9.0.21+ moment-timezone:+ specifier: ^0.5.35+ version: 0.5.48+ next:+ specifier: ^13.4.0+ version: 13.5.11(@babel/[email protected])([email protected]([email protected]))([email protected])+ next-basics:+ specifier: ^0.36.0+ version: 0.36.0([email protected](@babel/[email protected])([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected])+ react:+ specifier: ^18.2.0+ version: 18.3.1+ react-dom:+ specifier: ^18.2.0+ version: 18.3.1([email protected])+ react-intl:+ specifier: ^5.24.7+ version: 5.25.1([email protected])([email protected])+ zustand:+ specifier: ^4.3.8+src/generated/prisma: {}packages:@@ -1508,6 +1547,9 @@ packages:'@formatjs/[email protected]':resolution: {integrity: sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==}+ '@formatjs/[email protected]':+ resolution: {integrity: sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==}+'@formatjs/[email protected]':resolution: {integrity: sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==}@@ -1523,9 +1565,15 @@ packages:'@formatjs/[email protected]':resolution: {integrity: sha512-vHwK3piXwamFcx5YQdCdJxUQ1WdTl6ANclt5xba5zLGDv5Bsur7qz8AD7BevaKxITwpgDeU0u8My3AIibW9ywA==}+ '@formatjs/[email protected]':+ resolution: {integrity: sha512-4r12A3mS5dp5hnSaQCWBuBNfi9Amgx2dzhU4lTFfhSxgb5DOAiAbMpg6+7gpWZgl4ahsj3l2r/iHIjdmdXOE2Q==}+'@formatjs/[email protected]':resolution: {integrity: sha512-85b+GdAKCsleS6cqVxf/Aw/uBd+20EM0wDpgaxzHo3RIR3bxF4xCJqH/Grbzx8CXurTgDDZHPdPdwJC+May41w==}+ '@formatjs/[email protected]':+ resolution: {integrity: sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==}+'@formatjs/[email protected]':resolution: {integrity: sha512-Wzes10SMNeYgnxYiKsda4rnHP3Q3II4XT2tZyOgnH5fWuHDtIkceuWlRQNsvrI3uiwP4hLqp2XdQTCsfkhXulg==}@@ -1546,6 +1594,14 @@ packages:typescript:optional: true+ '@formatjs/[email protected]':+ resolution: {integrity: sha512-vgvyUOOrzqVaOFYzTf2d3+ToSkH2JpR7x/4U1RyoHQLmvEaTQvXJ7A2qm1Iy3brGNXC/+/7bUlc3lpH+h/LOJA==}+ peerDependencies:+ typescript: ^4.5+ peerDependenciesMeta:+ typescript:+ optional: true+'@formatjs/[email protected]':resolution: {integrity: sha512-mu7sHXZk1NWZrQ3eUqugpSYo8x5/tXkrI4uIbFqCEC0eNgQaIcoKgVeDFgDAcgG+cEme2atAUYSFF+DFWC4org==}peerDependencies:@@ -1803,54 +1859,111 @@ packages:resolution: {integrity: sha512-j/Jt/MMFy70f1LIa6qkviNWVoEIoF9ZICdDC3TF/IvStxWHGAYHm8pkqqbi1VqzjUEDUNu1ZGjo+VElZyenRBg==}engines: {node: '>=18.0.0'}+ '@next/[email protected]':+ resolution: {integrity: sha512-fbb2C7HChgM7CemdCY+y3N1n8pcTKdqtQLbC7/EQtPdLvlMUT9JX/dBYl8MMZAtYG4uVMyPFHXckb68q/NRwqg==}+'@next/[email protected]':resolution: {integrity: sha512-6mDmHX24nWlHOlbwUiAOmMyY7KELimmi+ed8qWcJYjqXeC+G6JzPZ3QosOAfjNwgMIzwhXBiRiCgdh8axTTdTA==}'@next/[email protected]':resolution: {integrity: sha512-GQUPA1bTZy5qZdPV5MOHB18465azzhg8xm5o2SqxMF+h1rWNjB43y6xmIPHG5OV2OiU3WxuINpusXom49DdaIQ==}+ '@next/[email protected]':+ resolution: {integrity: sha512-pVyd8/1y1l5atQRvOaLOvfbmRwefxLhqQOzYo/M7FQ5eaRwA1+wuCn7t39VwEgDd7Aw1+AIWwd+MURXUeXhwDw==}+ engines: {node: '>= 10'}+ cpu: [arm64]+ os: [darwin]+'@next/[email protected]':resolution: {integrity: sha512-PDQcByT0ZfF2q7QR9d+PNj3wlNN4K6Q8JoHMwFyk252gWo4gKt7BF8Y2+KBgDjTFBETXZ/TkBEUY7NIIY7A/Kw==}engines: {node: '>= 10'}cpu: [arm64]os: [darwin]+ '@next/[email protected]':+ resolution: {integrity: sha512-DwdeJqP7v8wmoyTWPbPVodTwCybBZa02xjSJ6YQFIFZFZ7dFgrieKW4Eo0GoIcOJq5+JxkQyejmI+8zwDp3pwA==}+ engines: {node: '>= 10'}+ cpu: [x64]+ os: [darwin]+'@next/[email protected]':resolution: {integrity: sha512-m+eO21yg80En8HJ5c49AOQpFDq+nP51nu88ZOMCorvw3g//8g1JSUsEiPSiFpJo1KCTQ+jm9H0hwXK49H/RmXg==}engines: {node: '>= 10'}cpu: [x64]os: [darwin]+ '@next/[email protected]':+ resolution: {integrity: sha512-wdQsKsIsGSNdFojvjW3Ozrh8Q00+GqL3wTaMjDkQxVtRbAqfFBtrLPO0IuWChVUP2UeuQcHpVeUvu0YgOP00+g==}+ engines: {node: '>= 10'}+ cpu: [arm64]+ os: [linux]+'@next/[email protected]':resolution: {integrity: sha512-H0Kk04ZNzb6Aq/G6e0un4B3HekPnyy6D+eUBYPJv9Abx8KDYgNMWzKt4Qhj57HXV3sTTjsfc1Trc1SxuhQB+Tg==}engines: {node: '>= 10'}cpu: [arm64]os: [linux]+ '@next/[email protected]':+ resolution: {integrity: sha512-6VpS+bodQqzOeCwGxoimlRoosiWlSc0C224I7SQWJZoyJuT1ChNCo+45QQH+/GtbR/s7nhaUqmiHdzZC9TXnXA==}+ engines: {node: '>= 10'}+ cpu: [arm64]+ os: [linux]+'@next/[email protected]':resolution: {integrity: sha512-k8GVkdMrh/+J9uIv/GpnHakzgDQhrprJ/FbGQvwWmstaeFG06nnAoZCJV+wO/bb603iKV1BXt4gHG+s2buJqZA==}engines: {node: '>= 10'}cpu: [arm64]os: [linux]+ '@next/[email protected]':+ resolution: {integrity: sha512-XxG3yj61WDd28NA8gFASIR+2viQaYZEFQagEodhI/R49gXWnYhiflTeeEmCn7Vgnxa/OfK81h1gvhUZ66lozpw==}+ engines: {node: '>= 10'}+ cpu: [x64]+ os: [linux]+'@next/[email protected]':resolution: {integrity: sha512-ZMQ9yzDEts/vkpFLRAqfYO1wSpIJGlQNK9gZ09PgyjBJUmg8F/bb8fw2EXKgEaHbCc4gmqMpDfh+T07qUphp9A==}engines: {node: '>= 10'}cpu: [x64]os: [linux]+ '@next/[email protected]':+ resolution: {integrity: sha512-/dnscWqfO3+U8asd+Fc6dwL2l9AZDl7eKtPNKW8mKLh4Y4wOpjJiamhe8Dx+D+Oq0GYVjuW0WwjIxYWVozt2bA==}+ engines: {node: '>= 10'}+ cpu: [x64]+ os: [linux]+'@next/[email protected]':resolution: {integrity: sha512-RFwq5VKYTw9TMr4T3e5HRP6T4RiAzfDJ6XsxH8j/ZeYq2aLsBqCkFzwMI0FmnSsLaUbOb46Uov0VvN3UciHX5A==}engines: {node: '>= 10'}cpu: [x64]os: [linux]+ '@next/[email protected]':+ resolution: {integrity: sha512-T/iPnyurOK5a4HRUcxAlss8uzoEf5h9tkd+W2dSWAfzxv8WLKlUgbfk+DH43JY3Gc2xK5URLuXrxDZ2mGfk/jw==}+ engines: {node: '>= 10'}+ cpu: [arm64]+ os: [win32]+'@next/[email protected]':resolution: {integrity: sha512-a7kUbqa/k09xPjfCl0RSVAvEjAkYBYxUzSVAzk2ptXiNEL+4bDBo9wNC43G/osLA/EOGzG4CuNRFnQyIHfkRgQ==}engines: {node: '>= 10'}cpu: [arm64]os: [win32]+ '@next/[email protected]':+ resolution: {integrity: sha512-BLiPKJomaPrTAb7ykjA0LPcuuNMLDVK177Z1xe0nAem33+9FIayU4k/OWrtSn9SAJW/U60+1hoey5z+KCHdRLQ==}+ engines: {node: '>= 10'}+ cpu: [ia32]+ os: [win32]++ '@next/[email protected]':+ resolution: {integrity: sha512-/72/dZfjXXNY/u+n8gqZDjI6rxKMpYsgBBYNZKWOQw0BpBF7WCnPflRy3ZtvQ2+IYI3ZH2bPyj7K+6a6wNk90Q==}+ engines: {node: '>= 10'}+ cpu: [x64]+ os: [win32]+'@next/[email protected]':resolution: {integrity: sha512-vHUQS4YVGJPmpjn7r5lEZuMhK5UQBNBRSB+iGDvJjaNk649pTIcRluDWNb9siunyLLiu/LDPHfvxBtNamyuLTw==}engines: {node: '>= 10'}@@ -2125,9 +2238,27 @@ packages:'@swc/[email protected]':resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}+ '@swc/[email protected]':+ resolution: {integrity: sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==}++ '@tanstack/[email protected]':+ resolution: {integrity: sha512-DJSilV5+ytBP1FbFcEJovv4rnnm/CokuVvrBEtW/Va9DvuJ3HksbXUJEpI0aV1KtuL4ZoO9AVE6PyNLzF7tLeA==}+'@tanstack/[email protected]':resolution: {integrity: sha512-Mqk+5o3qTuAiZML248XpNH8r2cOzl15+LTbUsZQEwvSvn1GU4VQhvqzAbil36p+MBxpr/58oBSnRzhrBevDhfg==}+ '@tanstack/[email protected]':+ resolution: {integrity: sha512-y7ySVHFyyQblPl3J3eQBWpXZkliroki3ARnBKsdJchlgt7yJLRDUcf4B8soufgiYt3pEQIkBWBx1N9/ZPIeUWw==}+ peerDependencies:+ react: ^16.8.0 || ^17.0.0 || ^18.0.0+ react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0+ react-native: '*'+ peerDependenciesMeta:+ react-dom:+ optional: true+ react-native:+ optional: true+'@tanstack/[email protected]':resolution: {integrity: sha512-QrycUn0wxjVPzITvQvOxFRdhlAwIoOQSuav7qWD4SWCoKCdLbyRZ2vji2GuBq/glaxbF4wBx3fqcYRDOt8KDTA==}peerDependencies:@@ -3861,6 +3992,9 @@ packages:resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}engines: {node: '>=10.13.0'}+ resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}+resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==}engines: {node: '>=16 || 14 >=14.17'}@@ -4082,6 +4216,9 @@ packages:resolution: {integrity: sha512-F134jIoeYMro/3I0h08D0Yt4N9o9pjddU/4IIxMMURqbAtI2wu70X8hvG1V48W49zXHXv3RKSF/po+0fDfsGjA==}+ resolution: {integrity: sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==}+resolution: {integrity: sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==}engines: {node: '>= 10'}@@ -4872,6 +5009,12 @@ packages:resolution: {integrity: sha512-yx8H/1H5AfnufiLnzzPqPf4yr/dKU9IFT1rPVwSkrKWHsQEeVVd6+X+L0nUbXhlEFTu3y/7hu38CFmEVgzvyeg==}engines: {node: '>=10', npm: '>=6'}+ resolution: {integrity: sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==}++ resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}+resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}@@ -4886,6 +5029,28 @@ packages:resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}+ resolution: {integrity: sha512-Nwou8pCjFuoD/ZxUw9iKC7hhZeWbo/ng0ze74yck3W89MNc/CepwCDziflAHY5XcmIVNmpXOCu9OfmzTdVRPWQ==}+ peerDependencies:+ next: ^13.4.0+ react: ^18.2.0+ react-dom: ^18.2.0++ resolution: {integrity: sha512-WUPJ6WbAX9tdC86kGTu92qkrRdgRqVrY++nwM+shmWQwmyxt4zhZfR59moXSI4N8GDYCBY3lIAqhzjDd4rTC8Q==}+ engines: {node: '>=16.14.0'}+ hasBin: true+ peerDependencies:+ '@opentelemetry/api': ^1.1.0+ react: ^18.2.0+ react-dom: ^18.2.0+ sass: ^1.3.0+ peerDependenciesMeta:+ '@opentelemetry/api':+ optional: true+ sass:+ optional: true+resolution: {integrity: sha512-k0MgP6BsK8cZ73wRjMazl2y2UcXj49ZXLDEgx6BikWuby/CN+nh81qFFI16edgd7xYpe/jj2OZEIwCoqnzz0bQ==}engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}@@ -5657,6 +5822,11 @@ packages:react: ^18.2.0react-dom: ^18.2.0+ resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}+ peerDependencies:+ react: ^18.3.1+resolution: {integrity: sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==}peerDependencies:@@ -5673,6 +5843,15 @@ packages:peerDependencies:react: ^16.8.0 || ^17 || ^18 || ^19+ resolution: {integrity: sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==}+ peerDependencies:+ react: ^16.3.0 || 17 || 18+ typescript: ^4.5+ peerDependenciesMeta:+ typescript:+ optional: true+resolution: {integrity: sha512-TUfj5E7lyUDvz/GtovC9OMh441kBr08rtIbgh3p0R8iF3hVY+V2W9Am7rb8BpJ/29BH1utJOqOOhmvEVh3GfZg==}peerDependencies:@@ -5723,6 +5902,10 @@ packages:react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0+ resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==}engines: {node: '>=0.10.0'}@@ -5944,6 +6127,9 @@ packages:resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}+ resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}+resolution: {integrity: sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==}@@ -6196,6 +6382,19 @@ packages:resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}+ resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}+ engines: {node: '>= 12.0.0'}+ peerDependencies:+ '@babel/core': '*'+ babel-plugin-macros: '*'+ react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'+ peerDependenciesMeta:+ '@babel/core':+ optional: true+ babel-plugin-macros:+ optional: true+resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}engines: {node: '>= 12.0.0'}@@ -6585,6 +6784,10 @@ packages:resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}+ resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}+ engines: {node: '>=10.13.0'}+resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}engines: {node: '>= 8'}@@ -7962,6 +8165,10 @@ snapshots:'@formatjs/intl-localematcher': 0.5.8tslib: 2.8.1+ '@formatjs/[email protected]':+ dependencies:+ tslib: 2.8.1+'@formatjs/[email protected]':dependencies:tslib: 2.8.1@@ -7988,12 +8195,24 @@ snapshots:'@formatjs/ecma402-abstract': 2.2.4tslib: 2.8.1+ '@formatjs/[email protected]':+ dependencies:+ '@formatjs/ecma402-abstract': 1.11.4+ '@formatjs/intl-localematcher': 0.2.25+ tslib: 2.8.1+'@formatjs/[email protected]':dependencies:'@formatjs/ecma402-abstract': 2.2.4'@formatjs/intl-localematcher': 0.5.8tslib: 2.8.1+ '@formatjs/[email protected]':+ dependencies:+ '@formatjs/ecma402-abstract': 1.11.4+ '@formatjs/intl-localematcher': 0.2.25+ tslib: 2.8.1+'@formatjs/[email protected]':dependencies:'@formatjs/ecma402-abstract': 2.2.4@@ -8025,6 +8244,18 @@ snapshots:optionalDependencies:typescript: 5.8.3+ '@formatjs/[email protected]([email protected])':+ dependencies:+ '@formatjs/ecma402-abstract': 1.11.4+ '@formatjs/fast-memoize': 1.2.1+ '@formatjs/icu-messageformat-parser': 2.1.0+ '@formatjs/intl-displaynames': 5.4.3+ '@formatjs/intl-listformat': 6.5.3+ intl-messageformat: 9.13.0+ tslib: 2.8.1+ optionalDependencies:+ typescript: 4.9.5+'@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':dependencies:intl-messageformat-parser: 6.1.2@@ -8366,33 +8597,62 @@ snapshots:'@netlify/[email protected]': {}+ '@next/[email protected]': {}+'@next/[email protected]': {}'@next/[email protected]':dependencies:glob: 10.3.10+ '@next/[email protected]':+ optional: true+'@next/[email protected]':optional: true+ '@next/[email protected]':+ optional: true+'@next/[email protected]':optional: true+ '@next/[email protected]':+ optional: true+'@next/[email protected]':optional: true+ '@next/[email protected]':+ optional: true+'@next/[email protected]':optional: true+ '@next/[email protected]':+ optional: true+'@next/[email protected]':optional: true+ '@next/[email protected]':+ optional: true+'@next/[email protected]':optional: true+ '@next/[email protected]':+ optional: true+'@next/[email protected]':optional: true+ '@next/[email protected]':+ optional: true++ '@next/[email protected]':+ optional: true+'@next/[email protected]':optional: true@@ -8683,8 +8943,22 @@ snapshots:dependencies:tslib: 2.8.1+ '@swc/[email protected]':+ dependencies:+ tslib: 2.8.1++ '@tanstack/[email protected]': {}+'@tanstack/[email protected]': {}+ dependencies:+ '@tanstack/query-core': 4.36.1+ react: 18.3.1+ use-sync-external-store: 1.5.0([email protected])+ optionalDependencies:+ react-dom: 18.3.1([email protected])+'@tanstack/[email protected]([email protected])':dependencies:'@tanstack/query-core': 5.74.3@@ -10781,6 +11055,8 @@ snapshots:dependencies:is-glob: 4.0.3+ [email protected]: {}+dependencies:foreground-child: 3.3.1@@ -10990,6 +11266,13 @@ snapshots:'@formatjs/icu-messageformat-parser': 2.9.4tslib: 2.8.1+ dependencies:+ '@formatjs/ecma402-abstract': 1.11.4+ '@formatjs/fast-memoize': 1.2.1+ '@formatjs/icu-messageformat-parser': 2.1.0+ tslib: 2.8.1+@@ -11964,6 +12247,12 @@ snapshots:+ dependencies:+ moment: 2.30.1++ [email protected]: {}+@@ -11972,6 +12261,40 @@ snapshots:+ [email protected]([email protected](@babel/[email protected])([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected]):+ dependencies:+ bcryptjs: 2.4.3+ jsonwebtoken: 9.0.2+ pure-rand: 6.1.0+ react: 18.3.1+ react-dom: 18.3.1([email protected])++ [email protected](@babel/[email protected])([email protected]([email protected]))([email protected]):+ dependencies:+ '@next/env': 13.5.11+ '@swc/helpers': 0.5.2+ busboy: 1.6.0+ caniuse-lite: 1.0.30001714+ postcss: 8.4.31+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ styled-jsx: 5.1.1(@babel/[email protected])([email protected])+ watchpack: 2.4.0+ optionalDependencies:+ '@next/swc-darwin-arm64': 13.5.9+ '@next/swc-darwin-x64': 13.5.9+ '@next/swc-linux-arm64-gnu': 13.5.9+ '@next/swc-linux-arm64-musl': 13.5.9+ '@next/swc-linux-x64-gnu': 13.5.9+ '@next/swc-linux-x64-musl': 13.5.9+ '@next/swc-win32-arm64-msvc': 13.5.9+ '@next/swc-win32-ia32-msvc': 13.5.9+ '@next/swc-win32-x64-msvc': 13.5.9+ transitivePeerDependencies:+ - '@babel/core'+ - babel-plugin-macros+[email protected](@babel/[email protected])([email protected]([email protected]))([email protected]):dependencies:'@next/env': 15.3.0@@ -12735,6 +13058,12 @@ snapshots:react-hook-form: 7.55.0([email protected])+ dependencies:+ loose-envify: 1.4.0+ react: 18.3.1+ scheduler: 0.23.2+dependencies:react: 19.1.0@@ -12749,6 +13078,22 @@ snapshots:dependencies:react: 19.1.0+ dependencies:+ '@formatjs/ecma402-abstract': 1.11.4+ '@formatjs/icu-messageformat-parser': 2.1.0+ '@formatjs/intl': 2.2.1([email protected])+ '@formatjs/intl-displaynames': 5.4.3+ '@formatjs/intl-listformat': 6.5.3+ '@types/hoist-non-react-statics': 3.3.6+ '@types/react': 18.3.20+ hoist-non-react-statics: 3.3.2+ intl-messageformat: 9.13.0+ react: 18.3.1+ tslib: 2.8.1+ optionalDependencies:+ typescript: 4.9.5+dependencies:'@formatjs/ecma402-abstract': 2.2.4@@ -12801,6 +13146,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])+ dependencies:+ loose-envify: 1.4.0+@@ -13076,6 +13425,10 @@ snapshots:+ dependencies:+ loose-envify: 1.4.0+@@ -13389,6 +13742,13 @@ snapshots:+ dependencies:+ client-only: 0.0.1+ react: 18.3.1+ optionalDependencies:+ '@babel/core': 7.26.10+dependencies:client-only: 0.0.1@@ -13778,6 +14138,10 @@ snapshots:dependencies:react: 19.1.0+ dependencies:+ react: 18.3.1+dependencies:react: 19.1.0@@ -13823,6 +14187,11 @@ snapshots:dependencies:makeerror: 1.0.12+ dependencies:+ glob-to-regexp: 0.4.1+ graceful-fs: 4.2.11+@@ -13962,6 +14331,14 @@ snapshots:+ dependencies:+ use-sync-external-store: 1.5.0([email protected])+ optionalDependencies:+ '@types/react': 19.1.2+ immer: 9.0.21+ react: 18.3.1+dependencies:use-sync-external-store: 1.5.0([email protected])diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsxindex 0c7b96b89..fc69494f8 100644--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx@@ -18,7 +18,8 @@ export default function SessionInfo({ data }) {<dd>{data?.id} <CopyIcon value={data?.id} /></dd>-+ <dt>{formatMessage(labels.distinctId)}</dt>+ <dd>{data?.distinctId}</dd><dt>{formatMessage(labels.lastSeen)}</dt><dd>{formatTimezoneDate(data?.lastAt, 'PPPPpp')}</dd>diff --git a/src/app/api/send/route.ts b/src/app/api/send/route.tsindex d04a07cb8..b35a67b7e 100644--- a/src/app/api/send/route.ts+++ b/src/app/api/send/route.ts@@ -145,7 +145,7 @@ export async function POST(request: Request) {const base = hostname ? `https://${hostname}` : 'https://localhost';const currentUrl = new URL(url, base);- let urlPath = currentUrl.pathname;+ let urlPath = currentUrl.pathname === '/undefined' ? '' : currentUrl.pathname;const urlQuery = currentUrl.search.substring(1);const urlDomain = currentUrl.hostname.replace(/^www./, '');diff --git a/src/components/messages.ts b/src/components/messages.tsindex 8c4f5a32d..19912b057 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -131,6 +131,7 @@ export const labels = defineMessages({all: { id: 'label.all', defaultMessage: 'All' },session: { id: 'label.session', defaultMessage: 'Session' },sessions: { id: 'label.sessions', defaultMessage: 'Sessions' },+ distinctId: { id: 'label.distinct-id', defaultMessage: 'Distinct ID' },pageNotFound: { id: 'message.page-not-found', defaultMessage: 'Page not found' },activity: { id: 'label.activity', defaultMessage: 'Activity' },dismiss: { id: 'label.dismiss', defaultMessage: 'Dismiss' },diff --git a/src/queries/sql/sessions/getWebsiteSession.ts b/src/queries/sql/sessions/getWebsiteSession.tsindex d53ea3e5d..97850a2c1 100644--- a/src/queries/sql/sessions/getWebsiteSession.ts+++ b/src/queries/sql/sessions/getWebsiteSession.ts@@ -15,6 +15,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {return rawQuery(`select id,+ distinct_id as "distinctId",website_id as "websiteId",hostname,browser,@@ -33,6 +34,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {sum(${getTimestampDiffSQL('min_time', 'max_time')}) as "totaltime"from (selectsession.session_id as id,+ session.distinct_id,website_event.visit_id,session.website_id,website_event.hostname,@@ -52,8 +54,8 @@ async function relationalQuery(websiteId: string, sessionId: string) {join website_event on website_event.session_id = session.session_idwhere session.website_id = {{websiteId::uuid}}and session.session_id = {{sessionId::uuid}}- group by session.session_id, visit_id, session.website_id, website_event.hostname, session.browser, session.os, session.device, session.screen, session.language, session.country, session.region, session.city) t- group by id, website_id, hostname, browser, os, device, screen, language, country, region, city;+ group by session.session_id, session.distinct_id, visit_id, session.website_id, website_event.hostname, session.browser, session.os, session.device, session.screen, session.language, session.country, session.region, session.city) t+ group by id, distinct_id, website_id, hostname, browser, os, device, screen, language, country, region, city;`,{ websiteId, sessionId },).then(result => result?.[0]);@@ -66,6 +68,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {`select id,websiteId,+ distinctId,hostname,browser,os,@@ -83,6 +86,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {sum(max_time-min_time) as totaltimefrom (selectsession_id as id,+ distinct_id as distinctId,visit_id,website_id as websiteId,hostname,@@ -101,8 +105,8 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {from website_event_stats_hourlywhere website_id = {websiteId:UUID}and session_id = {sessionId:UUID}- group by session_id, visit_id, website_id, hostname, browser, os, device, screen, language, country, region, city) t- group by id, websiteId, hostname, browser, os, device, screen, language, country, region, city;+ group by session_id, distinct_id, visit_id, website_id, hostname, browser, os, device, screen, language, country, region, city) t+ group by id, websiteId, distinctId, hostname, browser, os, device, screen, language, country, region, city;`,{ websiteId, sessionId },).then(result => result?.[0]);