fix nextjs CVE

cache planets for one minute so we dont spam ESI
update official instance url
2026-02-12 02:38:48 +01:00 · 2025-12-12 12:22:33 +02:00 · 2025-11-09 23:07:23 +02:00 · 2025-08-01 09:45:25 +03:00 · 2025-05-17 20:28:01 +03:00 · 2025-05-17 19:51:21 +03:00
17 changed files with 779 additions and 442 deletions
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@

 Simple tool to track your PI planet extractors. Login with your characters and enjoy the PI!

-Any questions, feedback or suggestions are welcome at [EVE PI Discord](https://discord.gg/GPtw5kfuJu)
+Any questions, feedback or suggestions are welcome at [EVE PI Discord](https://discord.gg/bCdXzU8PHK)

-## [Avanto hosted PI tool](https://pi.avanto.tk)
+## [Hosted PI tool](https://pi.calli.fi)

 ![Screenshot of PI tool](https://github.com/calli-eve/eve-pi/blob/main/images/eve-pi.png)
 ![3D render of a planet](https://github.com/calli-eve/eve-pi/blob/main/images/3dplanet.png)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
---
-version: "2.1"
 services:
  eve-pi:
    image: ghcr.io/calli-eve/eve-pi:latest
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
        "crypto-js": "^4.1.1",
        "eslint": "8.42.0",
        "luxon": "^3.6.1",
-        "next": "^14.2.23",
+        "next": "14.2.35",
        "next-plausible": "^3.12.0",
        "pino": "^9.6.0",
        "pino-pretty": "^13.0.0",
@@ -997,9 +997,9 @@
      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
    },
    "node_modules/@next/env": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.23.tgz",
-      "integrity": "sha512-CysUC9IO+2Bh0omJ3qrb47S8DtsTKbFidGm6ow4gXIG6reZybqxbkH2nhdEm1tC8SmgzDdpq3BIML0PWsmyUYA==",
+      "version": "14.2.35",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.35.tgz",
+      "integrity": "sha512-DuhvCtj4t9Gwrx80dmz2F4t/zKQ4ktN8WrMwOuVzkJfBilwAwGr6v16M5eI8yCuZ63H9TTuEU09Iu2HqkzFPVQ==",
      "license": "MIT"
    },
    "node_modules/@next/eslint-plugin-next": {
@@ -1072,9 +1072,9 @@
      }
    },
    "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.23.tgz",
-      "integrity": "sha512-WhtEntt6NcbABA8ypEoFd3uzq5iAnrl9AnZt9dXdO+PZLACE32z3a3qA5OoV20JrbJfSJ6Sd6EqGZTrlRnGxQQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.33.tgz",
+      "integrity": "sha512-HqYnb6pxlsshoSTubdXKu15g3iivcbsMXg4bYpjL2iS/V6aQot+iyF4BUc2qA/J/n55YtvE4PHMKWBKGCF/+wA==",
      "cpu": [
        "arm64"
      ],
@@ -1088,9 +1088,9 @@
      }
    },
    "node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.23.tgz",
-      "integrity": "sha512-vwLw0HN2gVclT/ikO6EcE+LcIN+0mddJ53yG4eZd0rXkuEr/RnOaMH8wg/sYl5iz5AYYRo/l6XX7FIo6kwbw1Q==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.33.tgz",
+      "integrity": "sha512-8HGBeAE5rX3jzKvF593XTTFg3gxeU4f+UWnswa6JPhzaR6+zblO5+fjltJWIZc4aUalqTclvN2QtTC37LxvZAA==",
      "cpu": [
        "x64"
      ],
@@ -1104,9 +1104,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.23.tgz",
-      "integrity": "sha512-uuAYwD3At2fu5CH1wD7FpP87mnjAv4+DNvLaR9kiIi8DLStWSW304kF09p1EQfhcbUI1Py2vZlBO2VaVqMRtpg==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.33.tgz",
+      "integrity": "sha512-JXMBka6lNNmqbkvcTtaX8Gu5by9547bukHQvPoLe9VRBx1gHwzf5tdt4AaezW85HAB3pikcvyqBToRTDA4DeLw==",
      "cpu": [
        "arm64"
      ],
@@ -1120,9 +1120,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.23.tgz",
-      "integrity": "sha512-Mm5KHd7nGgeJ4EETvVgFuqKOyDh+UMXHXxye6wRRFDr4FdVRI6YTxajoV2aHE8jqC14xeAMVZvLqYqS7isHL+g==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.33.tgz",
+      "integrity": "sha512-Bm+QulsAItD/x6Ih8wGIMfRJy4G73tu1HJsrccPW6AfqdZd0Sfm5Imhgkgq2+kly065rYMnCOxTBvmvFY1BKfg==",
      "cpu": [
        "arm64"
      ],
@@ -1136,9 +1136,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.23.tgz",
-      "integrity": "sha512-Ybfqlyzm4sMSEQO6lDksggAIxnvWSG2cDWnG2jgd+MLbHYn2pvFA8DQ4pT2Vjk3Cwrv+HIg7vXJ8lCiLz79qoQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.33.tgz",
+      "integrity": "sha512-FnFn+ZBgsVMbGDsTqo8zsnRzydvsGV8vfiWwUo1LD8FTmPTdV+otGSWKc4LJec0oSexFnCYVO4hX8P8qQKaSlg==",
      "cpu": [
        "x64"
      ],
@@ -1152,9 +1152,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.23.tgz",
-      "integrity": "sha512-OSQX94sxd1gOUz3jhhdocnKsy4/peG8zV1HVaW6DLEbEmRRtUCUQZcKxUD9atLYa3RZA+YJx+WZdOnTkDuNDNA==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.33.tgz",
+      "integrity": "sha512-345tsIWMzoXaQndUTDv1qypDRiebFxGYx9pYkhwY4hBRaOLt8UGfiWKr9FSSHs25dFIf8ZqIFaPdy5MljdoawA==",
      "cpu": [
        "x64"
      ],
@@ -1168,9 +1168,9 @@
      }
    },
    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.23.tgz",
-      "integrity": "sha512-ezmbgZy++XpIMTcTNd0L4k7+cNI4ET5vMv/oqNfTuSXkZtSA9BURElPFyarjjGtRgZ9/zuKDHoMdZwDZIY3ehQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.33.tgz",
+      "integrity": "sha512-nscpt0G6UCTkrT2ppnJnFsYbPDQwmum4GNXYTeoTIdsmMydSKFz9Iny2jpaRupTb+Wl298+Rh82WKzt9LCcqSQ==",
      "cpu": [
        "arm64"
      ],
@@ -1184,9 +1184,9 @@
      }
    },
    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.23.tgz",
-      "integrity": "sha512-zfHZOGguFCqAJ7zldTKg4tJHPJyJCOFhpoJcVxKL9BSUHScVDnMdDuOU1zPPGdOzr/GWxbhYTjyiEgLEpAoFPA==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.33.tgz",
+      "integrity": "sha512-pc9LpGNKhJ0dXQhZ5QMmYxtARwwmWLpeocFmVG5Z0DzWq5Uf0izcI8tLc+qOpqxO1PWqZ5A7J1blrUIKrIFc7Q==",
      "cpu": [
        "ia32"
      ],
@@ -1200,9 +1200,9 @@
      }
    },
    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.23.tgz",
-      "integrity": "sha512-xCtq5BD553SzOgSZ7UH5LH+OATQihydObTrCTvVzOro8QiWYKdBVwcB2Mn2MLMo6DGW9yH1LSPw7jS7HhgJgjw==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.33.tgz",
+      "integrity": "sha512-nOjfZMy8B94MdisuzZo9/57xuFVLHJaDj5e/xrduJp9CV2/HrfxTRH2fbyLe+K9QT41WBLUd4iXX3R7jBp0EUg==",
      "cpu": [
        "x64"
      ],
@@ -6719,12 +6719,12 @@
      "peer": true
    },
    "node_modules/next": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.2.23.tgz",
-      "integrity": "sha512-mjN3fE6u/tynneLiEg56XnthzuYw+kD7mCujgVqioxyPqbmiotUCGJpIZGS/VaPg3ZDT1tvWxiVyRzeqJFm/kw==",
+      "version": "14.2.35",
+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.35.tgz",
+      "integrity": "sha512-KhYd2Hjt/O1/1aZVX3dCwGXM1QmOV4eNM2UTacK5gipDdPN/oHHK/4oVGy7X8GMfPMsUTUEmGlsy0EY1YGAkig==",
      "license": "MIT",
      "dependencies": {
-        "@next/env": "14.2.23",
+        "@next/env": "14.2.35",
        "@swc/helpers": "0.5.5",
        "busboy": "1.6.0",
        "caniuse-lite": "^1.0.30001579",
@@ -6739,15 +6739,15 @@
        "node": ">=18.17.0"
      },
      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "14.2.23",
-        "@next/swc-darwin-x64": "14.2.23",
-        "@next/swc-linux-arm64-gnu": "14.2.23",
-        "@next/swc-linux-arm64-musl": "14.2.23",
-        "@next/swc-linux-x64-gnu": "14.2.23",
-        "@next/swc-linux-x64-musl": "14.2.23",
-        "@next/swc-win32-arm64-msvc": "14.2.23",
-        "@next/swc-win32-ia32-msvc": "14.2.23",
-        "@next/swc-win32-x64-msvc": "14.2.23"
+        "@next/swc-darwin-arm64": "14.2.33",
+        "@next/swc-darwin-x64": "14.2.33",
+        "@next/swc-linux-arm64-gnu": "14.2.33",
+        "@next/swc-linux-arm64-musl": "14.2.33",
+        "@next/swc-linux-x64-gnu": "14.2.33",
+        "@next/swc-linux-x64-musl": "14.2.33",
+        "@next/swc-win32-arm64-msvc": "14.2.33",
+        "@next/swc-win32-ia32-msvc": "14.2.33",
+        "@next/swc-win32-x64-msvc": "14.2.33"
      },
      "peerDependencies": {
        "@opentelemetry/api": "^1.1.0",
@@ -10258,9 +10258,9 @@
      }
    },
    "@next/env": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.23.tgz",
-      "integrity": "sha512-CysUC9IO+2Bh0omJ3qrb47S8DtsTKbFidGm6ow4gXIG6reZybqxbkH2nhdEm1tC8SmgzDdpq3BIML0PWsmyUYA=="
+      "version": "14.2.35",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.35.tgz",
+      "integrity": "sha512-DuhvCtj4t9Gwrx80dmz2F4t/zKQ4ktN8WrMwOuVzkJfBilwAwGr6v16M5eI8yCuZ63H9TTuEU09Iu2HqkzFPVQ=="
    },
    "@next/eslint-plugin-next": {
      "version": "14.2.23",
@@ -10311,57 +10311,57 @@
      }
    },
    "@next/swc-darwin-arm64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.23.tgz",
-      "integrity": "sha512-WhtEntt6NcbABA8ypEoFd3uzq5iAnrl9AnZt9dXdO+PZLACE32z3a3qA5OoV20JrbJfSJ6Sd6EqGZTrlRnGxQQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.33.tgz",
+      "integrity": "sha512-HqYnb6pxlsshoSTubdXKu15g3iivcbsMXg4bYpjL2iS/V6aQot+iyF4BUc2qA/J/n55YtvE4PHMKWBKGCF/+wA==",
      "optional": true
    },
    "@next/swc-darwin-x64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.23.tgz",
-      "integrity": "sha512-vwLw0HN2gVclT/ikO6EcE+LcIN+0mddJ53yG4eZd0rXkuEr/RnOaMH8wg/sYl5iz5AYYRo/l6XX7FIo6kwbw1Q==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.33.tgz",
+      "integrity": "sha512-8HGBeAE5rX3jzKvF593XTTFg3gxeU4f+UWnswa6JPhzaR6+zblO5+fjltJWIZc4aUalqTclvN2QtTC37LxvZAA==",
      "optional": true
    },
    "@next/swc-linux-arm64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.23.tgz",
-      "integrity": "sha512-uuAYwD3At2fu5CH1wD7FpP87mnjAv4+DNvLaR9kiIi8DLStWSW304kF09p1EQfhcbUI1Py2vZlBO2VaVqMRtpg==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.33.tgz",
+      "integrity": "sha512-JXMBka6lNNmqbkvcTtaX8Gu5by9547bukHQvPoLe9VRBx1gHwzf5tdt4AaezW85HAB3pikcvyqBToRTDA4DeLw==",
      "optional": true
    },
    "@next/swc-linux-arm64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.23.tgz",
-      "integrity": "sha512-Mm5KHd7nGgeJ4EETvVgFuqKOyDh+UMXHXxye6wRRFDr4FdVRI6YTxajoV2aHE8jqC14xeAMVZvLqYqS7isHL+g==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.33.tgz",
+      "integrity": "sha512-Bm+QulsAItD/x6Ih8wGIMfRJy4G73tu1HJsrccPW6AfqdZd0Sfm5Imhgkgq2+kly065rYMnCOxTBvmvFY1BKfg==",
      "optional": true
    },
    "@next/swc-linux-x64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.23.tgz",
-      "integrity": "sha512-Ybfqlyzm4sMSEQO6lDksggAIxnvWSG2cDWnG2jgd+MLbHYn2pvFA8DQ4pT2Vjk3Cwrv+HIg7vXJ8lCiLz79qoQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.33.tgz",
+      "integrity": "sha512-FnFn+ZBgsVMbGDsTqo8zsnRzydvsGV8vfiWwUo1LD8FTmPTdV+otGSWKc4LJec0oSexFnCYVO4hX8P8qQKaSlg==",
      "optional": true
    },
    "@next/swc-linux-x64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.23.tgz",
-      "integrity": "sha512-OSQX94sxd1gOUz3jhhdocnKsy4/peG8zV1HVaW6DLEbEmRRtUCUQZcKxUD9atLYa3RZA+YJx+WZdOnTkDuNDNA==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.33.tgz",
+      "integrity": "sha512-345tsIWMzoXaQndUTDv1qypDRiebFxGYx9pYkhwY4hBRaOLt8UGfiWKr9FSSHs25dFIf8ZqIFaPdy5MljdoawA==",
      "optional": true
    },
    "@next/swc-win32-arm64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.23.tgz",
-      "integrity": "sha512-ezmbgZy++XpIMTcTNd0L4k7+cNI4ET5vMv/oqNfTuSXkZtSA9BURElPFyarjjGtRgZ9/zuKDHoMdZwDZIY3ehQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.33.tgz",
+      "integrity": "sha512-nscpt0G6UCTkrT2ppnJnFsYbPDQwmum4GNXYTeoTIdsmMydSKFz9Iny2jpaRupTb+Wl298+Rh82WKzt9LCcqSQ==",
      "optional": true
    },
    "@next/swc-win32-ia32-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.23.tgz",
-      "integrity": "sha512-zfHZOGguFCqAJ7zldTKg4tJHPJyJCOFhpoJcVxKL9BSUHScVDnMdDuOU1zPPGdOzr/GWxbhYTjyiEgLEpAoFPA==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.33.tgz",
+      "integrity": "sha512-pc9LpGNKhJ0dXQhZ5QMmYxtARwwmWLpeocFmVG5Z0DzWq5Uf0izcI8tLc+qOpqxO1PWqZ5A7J1blrUIKrIFc7Q==",
      "optional": true
    },
    "@next/swc-win32-x64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.23.tgz",
-      "integrity": "sha512-xCtq5BD553SzOgSZ7UH5LH+OATQihydObTrCTvVzOro8QiWYKdBVwcB2Mn2MLMo6DGW9yH1LSPw7jS7HhgJgjw==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.33.tgz",
+      "integrity": "sha512-nOjfZMy8B94MdisuzZo9/57xuFVLHJaDj5e/xrduJp9CV2/HrfxTRH2fbyLe+K9QT41WBLUd4iXX3R7jBp0EUg==",
      "optional": true
    },
    "@nodelib/fs.scandir": {
@@ -14078,20 +14078,20 @@
      "peer": true
    },
    "next": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.2.23.tgz",
-      "integrity": "sha512-mjN3fE6u/tynneLiEg56XnthzuYw+kD7mCujgVqioxyPqbmiotUCGJpIZGS/VaPg3ZDT1tvWxiVyRzeqJFm/kw==",
+      "version": "14.2.35",
+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.35.tgz",
+      "integrity": "sha512-KhYd2Hjt/O1/1aZVX3dCwGXM1QmOV4eNM2UTacK5gipDdPN/oHHK/4oVGy7X8GMfPMsUTUEmGlsy0EY1YGAkig==",
      "requires": {
-        "@next/env": "14.2.23",
-        "@next/swc-darwin-arm64": "14.2.23",
-        "@next/swc-darwin-x64": "14.2.23",
-        "@next/swc-linux-arm64-gnu": "14.2.23",
-        "@next/swc-linux-arm64-musl": "14.2.23",
-        "@next/swc-linux-x64-gnu": "14.2.23",
-        "@next/swc-linux-x64-musl": "14.2.23",
-        "@next/swc-win32-arm64-msvc": "14.2.23",
-        "@next/swc-win32-ia32-msvc": "14.2.23",
-        "@next/swc-win32-x64-msvc": "14.2.23",
+        "@next/env": "14.2.35",
+        "@next/swc-darwin-arm64": "14.2.33",
+        "@next/swc-darwin-x64": "14.2.33",
+        "@next/swc-linux-arm64-gnu": "14.2.33",
+        "@next/swc-linux-arm64-musl": "14.2.33",
+        "@next/swc-linux-x64-gnu": "14.2.33",
+        "@next/swc-linux-x64-musl": "14.2.33",
+        "@next/swc-win32-arm64-msvc": "14.2.33",
+        "@next/swc-win32-ia32-msvc": "14.2.33",
+        "@next/swc-win32-x64-msvc": "14.2.33",
        "@swc/helpers": "0.5.5",
        "busboy": "1.6.0",
        "caniuse-lite": "^1.0.30001579",
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
    "crypto-js": "^4.1.1",
    "eslint": "8.42.0",
    "luxon": "^3.6.1",
-    "next": "^14.2.23",
+    "next": "14.2.35",
    "next-plausible": "^3.12.0",
    "pino": "^9.6.0",
    "pino-pretty": "^13.0.0",
--- a/src/app/components/Account/AccountCard.tsx
+++ b/src/app/components/Account/AccountCard.tsx
@@ -1,4 +1,4 @@
-import { AccessToken } from "@/types";
+import { AccessToken, PlanetWithInfo, Pin } from "@/types";
 import { Box, Stack, Typography, useTheme, Paper, IconButton, Divider } from "@mui/material";
 import { CharacterRow } from "../Characters/CharacterRow";
 import { PlanetaryInteractionRow } from "../PlanetaryInteraction/PlanetaryInteractionRow";
@@ -9,7 +9,9 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
 import { planetCalculations } from "@/planets";
 import { EvePraisalResult } from "@/eve-praisal";
-import { STORAGE_IDS } from "@/const";
+import { STORAGE_IDS, PI_SCHEMATICS, PI_PRODUCT_VOLUMES, STORAGE_CAPACITIES } from "@/const";
+import { DateTime } from "luxon";
+import { PlanetCalculations, AlertState, StorageContent, StorageInfo } from "@/types/planet";

 interface AccountTotals {
  monthlyEstimate: number;
@@ -20,6 +22,146 @@ interface AccountTotals {
  totalExtractors: number;
 }

+const calculateAlertState = (planetDetails: PlanetCalculations): AlertState => {
+  const hasLowStorage = planetDetails.storageInfo.some(storage => storage.fillRate > 60);
+  const hasLowImports = planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24);
+  
+  return {
+    expired: planetDetails.expired,
+    hasLowStorage,
+    hasLowImports,
+    hasLargeExtractorDifference: planetDetails.hasLargeExtractorDifference
+  };
+};
+
+const calculatePlanetDetails = (planet: PlanetWithInfo, piPrices: EvePraisalResult | undefined, balanceThreshold: number): PlanetCalculations => {
+  const { expired, extractors, localProduction: rawProduction, localImports, localExports: rawExports } = planetCalculations(planet);
+  
+  // Convert localProduction to include factoryCount
+  const localProduction = new Map(Array.from(rawProduction).map(([key, value]) => [
+    key,
+    {
+      ...value,
+      factoryCount: value.count || 1
+    }
+  ]));
+
+  // Calculate extractor averages and check for large differences
+  const extractorAverages = extractors
+    .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
+    .map(e => {
+      const cycleTime = e.extractor_details?.cycle_time || 3600;
+      const qtyPerCycle = e.extractor_details?.qty_per_cycle || 0;
+      return {
+        typeId: e.extractor_details!.product_type_id!,
+        averagePerHour: (qtyPerCycle * 3600) / cycleTime
+      };
+    });
+
+  const hasLargeExtractorDifference = extractorAverages.length === 2 && 
+    Math.abs(extractorAverages[0].averagePerHour - extractorAverages[1].averagePerHour) > balanceThreshold;
+
+  // Calculate storage info
+  const storageFacilities = planet.info.pins.filter((pin: Pin) => 
+    STORAGE_IDS().some(storage => storage.type_id === pin.type_id)
+  );
+
+  const storageInfo = storageFacilities.map((storage: Pin) => {
+    if (!storage || !storage.contents) return null;
+
+    const storageType = STORAGE_IDS().find(s => s.type_id === storage.type_id)?.name || 'Unknown';
+    const storageCapacity = STORAGE_CAPACITIES[storage.type_id] || 0;
+    
+    const totalVolume = (storage.contents || [])
+      .reduce((sum: number, item: StorageContent) => {
+        const volume = PI_PRODUCT_VOLUMES[item.type_id] || 0;
+        return sum + (item.amount * volume);
+      }, 0);
+
+    const totalValue = (storage.contents || [])
+      .reduce((sum: number, item: StorageContent) => {
+        const price = piPrices?.appraisal.items.find((a) => a.typeID === item.type_id)?.prices.sell.min ?? 0;
+        return sum + (item.amount * price);
+      }, 0);
+
+    const fillRate = storageCapacity > 0 ? (totalVolume / storageCapacity) * 100 : 0;
+
+    return {
+      type: storageType,
+      type_id: storage.type_id,
+      capacity: storageCapacity,
+      used: totalVolume,
+      fillRate: fillRate,
+      value: totalValue
+    };
+  }).filter(Boolean) as StorageInfo[];
+
+  // Calculate import depletion times
+  const importDepletionTimes = localImports.map(i => {
+    // Find all storage facilities containing this import
+    const storagesWithImport = storageFacilities.filter((storage: Pin) => 
+      storage.contents?.some((content: StorageContent) => content.type_id === i.type_id)
+    );
+    
+    // Get the total amount in all storage facilities
+    const totalAmount = storagesWithImport.reduce((sum: number, storage: Pin) => {
+      const content = storage.contents?.find((content: StorageContent) => content.type_id === i.type_id);
+      return sum + (content?.amount ?? 0);
+    }, 0);
+
+    // Calculate consumption rate per hour
+    const schematic = PI_SCHEMATICS.find(s => s.schematic_id === i.schematic_id);
+    const cycleTime = schematic?.cycle_time ?? 3600;
+    const consumptionPerHour = i.quantity * i.factoryCount * (3600 / cycleTime);
+
+    // Calculate time until depletion in hours, starting from last_update
+    const lastUpdate = DateTime.fromISO(planet.last_update);
+    const now = DateTime.now();
+    const hoursSinceUpdate = now.diff(lastUpdate, 'hours').hours;
+    const remainingAmount = Math.max(0, totalAmount - (consumptionPerHour * hoursSinceUpdate));
+    const hoursUntilDepletion = consumptionPerHour > 0 ? remainingAmount / consumptionPerHour : 0;
+
+    // Calculate monthly cost
+    const price = piPrices?.appraisal.items.find((a) => a.typeID === i.type_id)?.prices.sell.min ?? 0;
+    const monthlyCost = (consumptionPerHour * 24 * 30 * price) / 1000000; // Cost in millions
+
+    return {
+      typeId: i.type_id,
+      hoursUntilDepletion,
+      monthlyCost
+    };
+  });
+
+  // Convert localExports to match the LocalExport interface
+  const localExports = rawExports.map(e => {
+    const schematic = PI_SCHEMATICS.flatMap(s => s.outputs)
+      .find(s => s.type_id === e.typeId)?.schematic_id ?? 0;
+    const factoryCount = planet.info.pins
+      .filter(p => p.schematic_id === schematic)
+      .length;
+    
+    return {
+      type_id: e.typeId,
+      schematic_id: schematic,
+      quantity: e.amount / factoryCount, // Convert total amount back to per-factory quantity
+      factoryCount
+    };
+  });
+
+  return {
+    expired,
+    extractors,
+    localProduction,
+    localImports,
+    localExports,
+    storageInfo,
+    extractorAverages,
+    hasLargeExtractorDifference,
+    importDepletionTimes,
+    visibility: 'visible' as const
+  };
+};
+
 const calculateAccountTotals = (characters: AccessToken[], piPrices: EvePraisalResult | undefined): AccountTotals => {
  let totalMonthlyEstimate = 0;
  let totalStorageValue = 0;
@@ -86,14 +228,49 @@ const calculateAccountTotals = (characters: AccessToken[], piPrices: EvePraisalR
 export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { characters: AccessToken[], isCollapsed?: boolean }) => {
  const theme = useTheme();
  const [localIsCollapsed, setLocalIsCollapsed] = useState(false);
-  const { planMode, piPrices } = useContext(SessionContext);
+  const { planMode, piPrices, alertMode, balanceThreshold } = useContext(SessionContext);
  const { monthlyEstimate, storageValue, planetCount, characterCount, runningExtractors, totalExtractors } = calculateAccountTotals(characters, piPrices);

+  // Calculate planet details and alert states for each planet
+  const planetDetails = characters.reduce((acc, character) => {
+    character.planets.forEach(planet => {
+      const details = calculatePlanetDetails(planet, piPrices, balanceThreshold);
+      acc[`${character.character.characterId}-${planet.planet_id}`] = {
+        ...details,
+        alertState: calculateAlertState(details)
+      };
+    });
+    return acc;
+  }, {} as Record<string, PlanetCalculations & { alertState: AlertState }>);
+
  // Update local collapse state when prop changes
  useEffect(() => {
    setLocalIsCollapsed(propIsCollapsed ?? false);
  }, [propIsCollapsed]);

+  const getAlertVisibility = (alertState: AlertState) => {
+    if (!alertMode) return 'visible';
+    if (alertState.expired) return 'visible';
+    if (alertState.hasLowStorage) return 'visible';
+    if (alertState.hasLowImports) return 'visible';
+    if (alertState.hasLargeExtractorDifference) return 'visible';
+    return 'hidden';
+  };
+
+  // Check if any planet in the account has alerts
+  const hasAnyAlerts = Object.values(planetDetails).some(details => {
+    const alertState = calculateAlertState(details);
+    return alertState.expired || 
+           alertState.hasLowStorage || 
+           alertState.hasLowImports || 
+           alertState.hasLargeExtractorDifference;
+  });
+
+  // If in alert mode and no alerts, hide the entire card
+  if (alertMode && !hasAnyAlerts) {
+    return null;
+  }
+
  return (
    <Paper
      elevation={2}
@@ -199,6 +376,24 @@ export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { char
              >
                Extractors: {runningExtractors}/{totalExtractors}
              </Typography>
+              <Divider orientation="vertical" flexItem sx={{ height: 16, borderColor: theme.palette.divider }} />
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: Object.values(planetDetails).some(d => d.alertState.hasLowStorage) ? theme.palette.error.main : theme.palette.text.secondary,
+                }}
+              >
+                Storage Alerts: {Object.values(planetDetails).filter(d => d.alertState.hasLowStorage).length}
+              </Typography>
+              <Divider orientation="vertical" flexItem sx={{ height: 16, borderColor: theme.palette.divider }} />
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: Object.values(planetDetails).some(d => d.alertState.hasLargeExtractorDifference) ? theme.palette.error.main : theme.palette.text.secondary,
+                }}
+              >
+                Balance Alerts: {Object.values(planetDetails).filter(d => d.alertState.hasLargeExtractorDifference).length}
+              </Typography>
            </Box>
          </Box>
          <IconButton 
@@ -221,7 +416,17 @@ export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { char
            {planMode ? (
              <PlanRow character={c} />
            ) : (
-              <PlanetaryInteractionRow character={c} />
+              <PlanetaryInteractionRow 
+                character={c} 
+                planetDetails={c.planets.reduce((acc, planet) => {
+                  const details = planetDetails[`${c.character.characterId}-${planet.planet_id}`];
+                  acc[planet.planet_id] = {
+                    ...details,
+                    visibility: getAlertVisibility(details.alertState)
+                  };
+                  return acc;
+                }, {} as Record<number, PlanetCalculations & { visibility: string }>)}
+              />
            )}
          </Stack>
        ))}
--- a/src/app/components/Discord/DiscordButton.tsx
+++ b/src/app/components/Discord/DiscordButton.tsx
@@ -4,7 +4,7 @@ export const DiscordButton = () => {
    <Box>
      <Tooltip title="Come nerd out in discord about PI and this tool">
        <Button
-          href="https://discord.gg/GPtw5kfuJu"
+          href="https://discord.gg/bCdXzU8PHK"
          target="_blank"
          style={{ width: "100%" }}
          sx={{ color: "white", display: "block" }}
--- a/src/app/components/MainGrid.tsx
+++ b/src/app/components/MainGrid.tsx
@@ -48,7 +48,7 @@ declare module "@mui/material/styles" {
 }

 export const MainGrid = () => {
-  const { characters, updateCharacter } = useContext(CharacterContext);
+  const { characters } = useContext(CharacterContext);
  const { compactMode, toggleCompactMode, alertMode, toggleAlertMode, planMode, togglePlanMode, extractionTimeMode, toggleExtractionTimeMode } = useContext(SessionContext);
  const [accountOrder, setAccountOrder] = useState<string[]>([]);
  const [allCollapsed, setAllCollapsed] = useState(false);
@@ -170,7 +170,7 @@ export const MainGrid = () => {
              size="small"
              style={{
                backgroundColor: compactMode
-                  ? "rgba(144, 202, 249, 0.08)"
+                  ? "rgba(144, 202, 249, 0.16)"
                  : "inherit",
              }}
              onClick={toggleCompactMode}
@@ -183,7 +183,7 @@ export const MainGrid = () => {
              size="small"
              style={{
                backgroundColor: alertMode
-                  ? "rgba(144, 202, 249, 0.08)"
+                  ? "rgba(144, 202, 249, 0.16)"
                  : "inherit",
              }}
              onClick={toggleAlertMode}
@@ -196,7 +196,7 @@ export const MainGrid = () => {
              size="small"
              style={{
                backgroundColor: planMode
-                  ? "rgba(144, 202, 249, 0.08)"
+                  ? "rgba(144, 202, 249, 0.16)"
                  : "inherit",
              }}
              onClick={togglePlanMode}
@@ -209,7 +209,7 @@ export const MainGrid = () => {
              size="small"
              style={{
                backgroundColor: extractionTimeMode
-                  ? "rgba(144, 202, 249, 0.08)"
+                  ? "rgba(144, 202, 249, 0.16)"
                  : "inherit",
              }}
              onClick={toggleExtractionTimeMode}
--- a/src/app/components/PlanetConfig/PlanetConfigDialog.tsx
+++ b/src/app/components/PlanetConfig/PlanetConfigDialog.tsx
@@ -13,7 +13,7 @@ import {
 } from "@mui/material";
 import { DateTime } from "luxon";
 import Countdown from "react-countdown";
-import { timeColor } from "../PlanetaryInteraction/timeColors";
+import { timeColor } from "../PlanetaryInteraction/alerts";
 import Image from "next/image";
 import { ColorContext, SessionContext } from "@/app/context/Context";
 import { useContext } from "react";
--- a/src/app/components/PlanetaryInteraction/PlanetCard.tsx
+++ b/src/app/components/PlanetaryInteraction/PlanetCard.tsx
@@ -4,18 +4,21 @@ import {
  AccessToken,
  PlanetWithInfo,
 } from "@/types";
+import { PlanetCalculations } from "@/types/planet";
 import React, { useContext } from "react";
 import { DateTime } from "luxon";
-import { EXTRACTOR_TYPE_IDS } from "@/const";
 import Countdown from "react-countdown";
-import { getProgramOutputPrediction } from "./ExtractionSimulation";
-import {
-  alertModeVisibility,
-  extractorsHaveExpired,
-  timeColor,
-} from "./timeColors";
-import { ColorContext, SessionContext } from "@/app/context/Context";
+import { ColorContext } from "@/app/context/Context";
 import { ExtractionSimulationTooltip } from "./ExtractionSimulationTooltip";
+import { timeColor } from "./alerts";
+
+interface ExtractorConfig {
+  typeId: number;
+  baseValue: number;
+  cycleTime: number;
+  installTime: string;
+  expiryTime: string;
+}

 const StackItem = styled(Stack)(({ theme }) => ({
  ...theme.typography.body2,
@@ -29,82 +32,31 @@ const StackItem = styled(Stack)(({ theme }) => ({
 export const PlanetCard = ({
  character,
  planet,
+  planetDetails,
 }: {
  character: AccessToken;
  planet: PlanetWithInfo;
+  planetDetails: PlanetCalculations;
 }) => {
-  const { alertMode } = useContext(SessionContext);
-
-  const planetInfo = planet.info;
-  const planetInfoUniverse = planet.infoUniverse;
-
  const theme = useTheme();
-
-  const extractorsExpiryTime =
-    (planetInfo &&
-      planetInfo.pins
-        .filter((p) => EXTRACTOR_TYPE_IDS.some((e) => e === p.type_id))
-        .map((p) => p.expiry_time)) ??
-    [];
-
  const { colors } = useContext(ColorContext);
-  const expired = extractorsHaveExpired(extractorsExpiryTime);

-  const CYCLE_TIME = 30 * 60; // 30 minutes in seconds
-
-  const extractors = planetInfo?.pins
-    .filter((p) => EXTRACTOR_TYPE_IDS.some((e) => e === p.type_id))
-    .map((p) => ({
-      typeId: p.type_id,
-      baseValue: p.extractor_details?.qty_per_cycle || 0,
-      cycleTime: p.extractor_details?.cycle_time || 3600,
-      installTime: p.install_time || "",
-      expiryTime: p.expiry_time || "",
-      installedSchematicId: p.extractor_details?.product_type_id || undefined
-    })) || [];
-
-  // Calculate program duration and cycles for each extractor
-  const extractorPrograms = extractors.map(extractor => {
-    const installDate = new Date(extractor.installTime);
-    const expiryDate = new Date(extractor.expiryTime);
-    const programDuration = (expiryDate.getTime() - installDate.getTime()) / 1000; // Convert to seconds
-    return {
-      ...extractor,
-      programDuration,
-      cycles: Math.floor(programDuration / CYCLE_TIME)
-    };
-  });
-
-
-  // Get output predictions for each extractor
-  const extractorOutputs = extractorPrograms.map(extractor => ({
-    typeId: extractor.typeId,
-    cycleTime: CYCLE_TIME,
-    cycles: extractor.cycles,
-    prediction: getProgramOutputPrediction(
-      extractor.baseValue,
-      CYCLE_TIME,
-      extractor.cycles
-    )
-  }));
-
-  // Calculate average per hour for each extractor
-  const extractorAverages = extractorOutputs.map(extractor => {
-    const totalOutput = extractor.prediction.reduce((sum, val) => sum + val, 0);
-    const programDuration = extractor.cycles * CYCLE_TIME;
-    const averagePerHour = (totalOutput / programDuration) * 3600;
-    return {
-      typeId: extractor.typeId,
-      averagePerHour
-    };
-  });
+  const extractorConfigs: ExtractorConfig[] = planetDetails.extractors
+    .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
+    .map(e => ({
+      typeId: e.extractor_details!.product_type_id!,
+      baseValue: e.extractor_details!.qty_per_cycle!,
+      cycleTime: e.extractor_details?.cycle_time || 3600,
+      installTime: e.install_time ?? "",
+      expiryTime: e.expiry_time ?? ""
+    }));

  return (
    <Tooltip
      title={
-        extractors.length > 0 ? (
+        planetDetails.extractors.length > 0 ? (
          <ExtractionSimulationTooltip
-            extractors={extractors}
+            extractors={extractorConfigs}
          />
        ) : null
      }
@@ -121,14 +73,13 @@ export const PlanetCard = ({
        }
      }}
    >
-    <StackItem
-      alignItems="flex-start"
-      height="100%"
-      position="relative"
-      minHeight={theme.custom.cardMinHeight}
-      visibility={alertModeVisibility(alertMode, expired)}
-    >
-      
+      <StackItem
+        alignItems="flex-start"
+        height="100%"
+        position="relative"
+        minHeight={theme.custom.cardMinHeight}
+        style={{ visibility: planetDetails.visibility }}
+      >
        <div style={{ position: 'relative' }}>
          <Image
            unoptimized
@@ -153,55 +104,53 @@ export const PlanetCard = ({
            borderRadius: 8,
          }} />
        </div>
-     
-      {expired && (
-        <Image
-          width={32}
-          height={32}
-          src={`/stopped.png`}
-          alt=""
-          style={{ position: "absolute", top: theme.custom.stoppedPosition }}
-        />
-      )}
-      <div style={{ position: "absolute", top: 5, left: 10 }}>
-        <Typography fontSize={theme.custom.smallText}>
-          {planetInfoUniverse?.name}
-        </Typography>
-        {extractorsExpiryTime.map((e, idx) => {
-          const extractor = extractors[idx];
-          const average = extractorAverages[idx];
-          return (
-            <div key={`${e}-${idx}-${character.character.characterId}`}>
-              <Typography
-                color={timeColor(e, colors)}
-                fontSize={theme.custom.smallText}
-              >
-                {!expired && e && <Countdown
-                    overtime={true}
-                    date={DateTime.fromISO(e).toMillis()}
-                  />
-                }
-              </Typography>
-              {!expired && extractor && average && (
-                <div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
-                  <Image
-                    unoptimized
-                    src={`https://images.evetech.net/types/${extractor.installedSchematicId}/icon?size=32`}
-                    alt=""
-                    width={16}
-                    height={16}
-                    style={{ borderRadius: 4 }}
-                  />
-                  <Typography fontSize={theme.custom.smallText}>
-                    {average.averagePerHour.toFixed(1)}/h
-                  </Typography>
-                </div>
-              )}
-            </div>
-          );
-        })}
-      </div>
-    </StackItem>
+        {planetDetails.expired && (
+          <Image
+            width={32}
+            height={32}
+            src={`/stopped.png`}
+            alt=""
+            style={{ position: "absolute", top: theme.custom.stoppedPosition }}
+          />
+        )}
+        <div style={{ position: "absolute", top: 5, left: 10 }}>
+          <Typography fontSize={theme.custom.smallText}>
+            {planet.infoUniverse?.name}
+          </Typography>
+          {planetDetails.extractors.map((e, idx) => {
+            const average = planetDetails.extractorAverages[idx];
+            return (
+              <div key={`${e}-${idx}-${character.character.characterId}`}>
+                <Typography
+                  color={timeColor(e.expiry_time, colors)}
+                  fontSize={theme.custom.smallText}
+                >
+                  {!planetDetails.expired && e.expiry_time && <Countdown
+                      overtime={true}
+                      date={DateTime.fromISO(e.expiry_time).toMillis()}
+                    />
+                  }
+                </Typography>
+                {!planetDetails.expired && e && average && (
+                  <div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
+                    <Image
+                      unoptimized
+                      src={`https://images.evetech.net/types/${e.extractor_details?.product_type_id}/icon?size=32`}
+                      alt=""
+                      width={16}
+                      height={16}
+                      style={{ borderRadius: 4 }}
+                    />
+                    <Typography fontSize={theme.custom.smallText}>
+                      {average.averagePerHour.toFixed(1)}/h
+                    </Typography>
+                  </div>
+                )}
+              </div>
+            );
+          })}
+        </div>
+      </StackItem>
    </Tooltip>
  );
 };
--- a/src/app/components/PlanetaryInteraction/PlanetTableRow.tsx
+++ b/src/app/components/PlanetaryInteraction/PlanetTableRow.tsx
@@ -1,7 +1,7 @@
 import { ColorContext, SessionContext } from "@/app/context/Context";
-import { PI_TYPES_MAP, STORAGE_IDS, STORAGE_CAPACITIES, PI_PRODUCT_VOLUMES, EVE_IMAGE_URL, PI_SCHEMATICS } from "@/const";
-import { planetCalculations } from "@/planets";
+import { PI_TYPES_MAP, EVE_IMAGE_URL, LAUNCHPAD_IDS } from "@/const";
 import { AccessToken, PlanetWithInfo } from "@/types";
+import { PlanetCalculations, StorageInfo } from "@/types/planet";
 import CloseIcon from "@mui/icons-material/Close";
 import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { Button, Tooltip, Typography, useTheme, Menu, MenuItem, IconButton, Checkbox, FormControlLabel } from "@mui/material";
@@ -18,11 +18,13 @@ import React, { forwardRef, useContext, useState } from "react";
 import Countdown from "react-countdown";
 import { PlanetConfigDialog } from "../PlanetConfig/PlanetConfigDialog";
 import PinsCanvas3D from "./PinsCanvas3D";
-import { alertModeVisibility, timeColor } from "./timeColors";
+import { timeColor } from "./alerts";
 import { ExtractionSimulationDisplay } from './ExtractionSimulationDisplay';
 import { ExtractionSimulationTooltip } from './ExtractionSimulationTooltip';
-import { ProductionNode } from './ExtractionSimulation';
 import { Collapse, Box, Stack } from "@mui/material";
+import Table from "@mui/material/Table";
+import TableHead from "@mui/material/TableHead";
+import TableBody from "@mui/material/TableBody";

 const Transition = forwardRef(function Transition(
  props: TransitionProps & {
@@ -33,15 +35,28 @@ const Transition = forwardRef(function Transition(
  return <Slide direction="up" ref={ref} {...props} />;
 });

+interface SchematicInput {
+  type_id: number;
+  quantity: number;
+}
+
+interface SchematicOutput {
+  type_id: number;
+  quantity: number;
+}
+
 export const PlanetTableRow = ({
  planet,
  character,
+  planetDetails,
 }: {
  planet: PlanetWithInfo;
  character: AccessToken;
+  planetDetails: PlanetCalculations;
 }) => {
  const theme = useTheme();
-  const { showProductIcons, extractionTimeMode } = useContext(SessionContext);
+  const { showProductIcons, extractionTimeMode, alertMode } = useContext(SessionContext);
+  const { colors } = useContext(ColorContext);

  const [planetRenderOpen, setPlanetRenderOpen] = useState(false);
  const [planetConfigOpen, setPlanetConfigOpen] = useState(false);
@@ -72,80 +87,13 @@ export const PlanetTableRow = ({
    setPlanetConfigOpen(false);
  };

-  const { piPrices, alertMode, updatePlanetConfig, readPlanetConfig, balanceThreshold } = useContext(SessionContext);
+  const { piPrices, updatePlanetConfig, readPlanetConfig } = useContext(SessionContext);
  const planetInfo = planet.info;
  const planetInfoUniverse = planet.infoUniverse;
-  const { expired, extractors, localProduction, localImports, localExports } =
-    planetCalculations(planet);
  const planetConfig = readPlanetConfig({
    characterId: character.character.characterId,
    planetId: planet.planet_id,
  });
-  const { colors } = useContext(ColorContext);
-  // Convert local production to ProductionNode array for simulation
-  const productionNodes: ProductionNode[] = Array.from(localProduction).map(([schematicId, schematic]) => ({
-    schematicId: schematicId,
-    typeId: schematic.outputs[0].type_id,
-    name: schematic.name,
-    inputs: schematic.inputs.map(input => ({
-      typeId: input.type_id,
-      quantity: input.quantity
-    })),
-    outputs: schematic.outputs.map(output => ({
-      typeId: output.type_id,
-      quantity: output.quantity
-    })),
-    cycleTime: schematic.cycle_time,
-    factoryCount: schematic.count || 1
-  }));
-
-  // Calculate extractor averages and check for large differences
-  const extractorAverages = extractors
-    .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
-    .map(e => {
-      const cycleTime = e.extractor_details?.cycle_time || 3600;
-      const qtyPerCycle = e.extractor_details?.qty_per_cycle || 0;
-      return {
-        typeId: e.extractor_details!.product_type_id!,
-        averagePerHour: (qtyPerCycle * 3600) / cycleTime
-      };
-    });
-
-  const hasLargeExtractorDifference = extractorAverages.length === 2 && 
-    Math.abs(extractorAverages[0].averagePerHour - extractorAverages[1].averagePerHour) > balanceThreshold;
-
-  const storageFacilities = planetInfo.pins.filter(pin => 
-    STORAGE_IDS().some(storage => storage.type_id === pin.type_id)
-  );
-
-  const getStorageInfo = (pin: any) => {
-    if (!pin || !pin.contents) return null;
-
-    const storageType = PI_TYPES_MAP[pin.type_id].name;
-    const storageCapacity = STORAGE_CAPACITIES[pin.type_id] || 0;
-    
-    const totalVolume = (pin.contents || [])
-      .reduce((sum: number, item: any) => {
-        const volume = PI_PRODUCT_VOLUMES[item.type_id] || 0;
-        return sum + (item.amount * volume);
-      }, 0);
-
-    const totalValue = (pin.contents || [])
-      .reduce((sum: number, item: any) => {
-        const price = piPrices?.appraisal.items.find((a) => a.typeID === item.type_id)?.prices.sell.min ?? 0;
-        return sum + (item.amount * price);
-      }, 0);
-
-    const fillRate = storageCapacity > 0 ? (totalVolume / storageCapacity) * 100 : 0;
-
-    return {
-      type: storageType,
-      capacity: storageCapacity,
-      used: totalVolume,
-      fillRate: fillRate,
-      value: totalValue
-    };
-  };

  const handleExcludeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    updatePlanetConfig({
@@ -154,6 +102,19 @@ export const PlanetTableRow = ({
    });
  };

+  // Check if there are any alerts
+  const hasAlerts = alertMode && (
+    planetDetails.expired ||
+    planetDetails.storageInfo.some(storage => storage.fillRate > 60) ||
+    planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24) ||
+    planetDetails.hasLargeExtractorDifference
+  );
+
+  // If in alert mode and no alerts, hide the row
+  if (alertMode && !hasAlerts) {
+    return null;
+  }
+
  const renderProductDisplay = (typeId: number, amount?: number) => {
    if (!typeId || !PI_TYPES_MAP[typeId]) {
      return (
@@ -205,7 +166,7 @@ export const PlanetTableRow = ({
  return (
    <>
      <TableRow
-        style={{ visibility: alertModeVisibility(alertMode, expired) }}
+        style={{ visibility: planetDetails.visibility }}
        sx={{ 
          "&:last-child td, &:last-child th": { border: 0 },
          cursor: 'pointer',
@@ -213,7 +174,7 @@ export const PlanetTableRow = ({
            backgroundColor: 'action.hover'
          }
        }}
-        onClick={(e) => {
+        onClick={(e: React.MouseEvent<HTMLTableRowElement>) => {
          if (!(e.target as HTMLElement).closest('.clickable-cell')) return;
          setSimulationOpen(!simulationOpen);
        }}
@@ -236,9 +197,9 @@ export const PlanetTableRow = ({
              <Tooltip
                placement="right"
                title={
-                  extractors.length > 0 ? (
+                  planetDetails.extractors.length > 0 ? (
                    <ExtractionSimulationTooltip
-                      extractors={extractors
+                      extractors={planetDetails.extractors
                        .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
                        .map(e => ({
                          typeId: e.extractor_details!.product_type_id!,
@@ -266,11 +227,11 @@ export const PlanetTableRow = ({
                <Stack spacing={0}>
                  <Typography 
                    fontSize={theme.custom.smallText}
-                    color={hasLargeExtractorDifference ? 'error' : 'inherit'}
+                    color={planetDetails.hasLargeExtractorDifference ? 'error' : 'inherit'}
                  >
                    {planetInfoUniverse?.name}
                  </Typography>
-                  {hasLargeExtractorDifference && (
+                  {planetDetails.hasLargeExtractorDifference && (
                    <Typography 
                      fontSize={theme.custom.smallText}
                      color="error"
@@ -287,8 +248,8 @@ export const PlanetTableRow = ({
        <TableCell className="clickable-cell">{planet.upgrade_level}</TableCell>
        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {extractors.length === 0 &&<Typography fontSize={theme.custom.smallText}>No extractors</Typography>}
-            {extractors.map((e, idx) => {
+            {planetDetails.extractors.length === 0 &&<Typography fontSize={theme.custom.smallText}>No extractors</Typography>}
+            {planetDetails.extractors.map((e, idx) => {
              return (
                <div
                  key={`${e}-${idx}-${character.character.characterId}`}
@@ -320,7 +281,7 @@ export const PlanetTableRow = ({
        </TableCell>
        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {Array.from(localProduction).map((schematic, idx) => {
+            {Array.from(planetDetails.localProduction).map((schematic, idx) => {
              return (
                <div
                  key={`prod-${character.character.characterId}-${planet.planet_id}-${idx}`}
@@ -334,48 +295,32 @@ export const PlanetTableRow = ({
        </TableCell>
        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {localImports.map((i) => {
-              // Find all storage facilities (including launchpads) containing this import
-              const storagesWithImport = storageFacilities.filter(storage => 
-                storage.contents?.some(content => content.type_id === i.type_id)
-              );
-              
-              // Get the total amount in all storage facilities
-              const totalAmount = storagesWithImport.reduce((sum, storage) => {
-                const content = storage.contents?.find(content => content.type_id === i.type_id);
-                return sum + (content?.amount ?? 0);
-              }, 0);
-
-              // Calculate consumption rate per hour
-              const schematic = PI_SCHEMATICS.find(s => s.schematic_id === i.schematic_id);
-              const cycleTime = schematic?.cycle_time ?? 3600;
-              const consumptionPerHour = i.quantity * i.factoryCount * (3600 / cycleTime);
-
-              // Calculate time until depletion in hours
-              const hoursUntilDepletion = consumptionPerHour > 0 ? totalAmount / consumptionPerHour : 0;
-
+            {planetDetails.localImports.map((i) => {
+              const depletionTime = planetDetails.importDepletionTimes.find(d => d.typeId === i.type_id);
              return (
                <div
                  key={`import-${character.character.characterId}-${planet.planet_id}-${i.type_id}`}
                  style={{ display: "flex", alignItems: "center" }}
                >
-                  {renderProductDisplay(i.type_id, i.quantity * i.factoryCount)}
-                  {totalAmount > 0 && (
-                    <Tooltip title={
-                      <>
-                        <div>Total: {totalAmount.toFixed(1)} units</div>
-                        <div>Will be depleted in {hoursUntilDepletion.toFixed(1)} hours</div>
-                      </>
-                    }>
-                      <Typography 
-                        fontSize={theme.custom.smallText} 
-                        color={hoursUntilDepletion < 24 ? 'error' : hoursUntilDepletion < 48 ? 'warning' : 'success'}
-                        sx={{ ml: 1 }}
-                      >
-                        ({hoursUntilDepletion.toFixed(1)}h)
-                      </Typography>
-                    </Tooltip>
-                  )}
+                  <Tooltip title={
+                    <>
+                      <div>Will be depleted in {depletionTime?.hoursUntilDepletion.toFixed(1)} hours</div>
+                      <div>Monthly cost: {depletionTime?.monthlyCost.toFixed(2)}M ISK</div>
+                    </>
+                  }>
+                    <div style={{ display: "flex", alignItems: "center" }}>
+                      {renderProductDisplay(i.type_id, i.quantity * i.factoryCount)}
+                      {depletionTime && (
+                        <Typography 
+                          fontSize={theme.custom.smallText} 
+                          color={depletionTime.hoursUntilDepletion < 24 ? 'error' : depletionTime.hoursUntilDepletion < 48 ? 'warning' : 'success'}
+                          sx={{ ml: 1 }}
+                        >
+                          ({depletionTime.hoursUntilDepletion.toFixed(1)}h)
+                        </Typography>
+                      )}
+                    </div>
+                  </Tooltip>
                </div>
              );
            })}
@@ -383,21 +328,21 @@ export const PlanetTableRow = ({
        </TableCell>
        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
+            {planetDetails.localExports.map((exports) => (
              <div
-                key={`export-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
+                key={`export-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
                style={{ display: "flex", alignItems: "center" }}
              >
-                {renderProductDisplay(exports.typeId, exports.amount)}
+                {renderProductDisplay(exports.type_id, exports.quantity * exports.factoryCount)}
              </div>
            ))}
          </div>
        </TableCell>
        <TableCell>
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
+            {planetDetails.localExports.map((exports) => (
              <FormControlLabel
-                key={`export-excluded-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
+                key={`export-excluded-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
                control={
                  <Checkbox
                    checked={planetConfig.excludeFromTotals}
@@ -412,12 +357,12 @@ export const PlanetTableRow = ({
        </TableCell>
        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
+            {planetDetails.localExports.map((exports) => (
              <Typography
-                key={`export-uph-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
+                key={`export-uph-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
                fontSize={theme.custom.smallText}
              >
-                {exports.amount}
+                {exports.quantity * exports.factoryCount}
              </Typography>
            ))}
          </div>
@@ -431,11 +376,11 @@ export const PlanetTableRow = ({
              textAlign: "end",
            }}
          >
-            {localExports.map((e) => {
+            {planetDetails.localExports.map((e) => {
              const valueInMillions =
-                (((piPrices?.appraisal.items.find((a) => a.typeID === e.typeId)
+                (((piPrices?.appraisal.items.find((a) => a.typeID === e.type_id)
                  ?.prices.sell.min ?? 0) *
-                  e.amount) /
+                  e.quantity * e.factoryCount) /
                  1000000) *
                24 *
                30;
@@ -446,7 +391,7 @@ export const PlanetTableRow = ({

              return (
                <Typography
-                  key={`export-praisal-${character.character.characterId}-${planet.planet_id}-${e.typeId}`}
+                  key={`export-praisal-${character.character.characterId}-${planet.planet_id}-${e.type_id}`}
                  fontSize={theme.custom.smallText}
                >
                  {displayValue}
@@ -456,47 +401,119 @@ export const PlanetTableRow = ({
          </div>
        </TableCell>
        <TableCell className="clickable-cell">
-          <div style={{ display: "flex", flexDirection: "column" }}>
-            {storageFacilities.length === 0 &&<Typography fontSize={theme.custom.smallText}>No storage</Typography>}
-            {storageFacilities
-              .sort((a, b) => {
-                const isALaunchpad = a.type_id === 2256 || a.type_id === 2542 || a.type_id === 2543 || a.type_id === 2544 || a.type_id === 2552 || a.type_id === 2555 || a.type_id === 2556 || a.type_id === 2557;
-                const isBLaunchpad = b.type_id === 2256 || b.type_id === 2542 || b.type_id === 2543 || b.type_id === 2544 || b.type_id === 2552 || b.type_id === 2555 || b.type_id === 2556 || b.type_id === 2557;
-                return isALaunchpad === isBLaunchpad ? 0 : isALaunchpad ? -1 : 1;
-              })
-              .map((storage) => {
-                const storageInfo = getStorageInfo(storage);
-                if (!storageInfo) return null;
-                
-                const isLaunchpad = storage.type_id === 2256 || 
-                                  storage.type_id === 2542 || 
-                                  storage.type_id === 2543 || 
-                                  storage.type_id === 2544 || 
-                                  storage.type_id === 2552 || 
-                                  storage.type_id === 2555 || 
-                                  storage.type_id === 2556 || 
-                                  storage.type_id === 2557;
-                
-                const fillRate = storageInfo.fillRate;
-                const color = fillRate > 95 ? '#ff0000' : fillRate > 80 ? '#ffd700' : 'inherit';
-                
-                return (
-                  <div key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.pin_id}`} style={{ display: "flex", alignItems: "center" }}>
-                    <Typography fontSize={theme.custom.smallText} style={{ marginRight: "5px" }}>
-                      {isLaunchpad ? 'L' : 'S'}
-                    </Typography>
-                    <Typography fontSize={theme.custom.smallText} style={{ color }}>
-                      {fillRate.toFixed(1)}%
-                    </Typography>
-                    {storageInfo.value > 0 && (
-                      <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px" }}>
-                        ({Math.round(storageInfo.value / 1000000)}M)
+          <Tooltip
+            title={
+              <Box sx={{ p: 1 }}>
+                <Typography variant="subtitle2" sx={{ mb: 1 }}>
+                  Storage Facilities
+                </Typography>
+                <Table size="small">
+                  <TableHead>
+                    <TableRow>
+                      <TableCell>Type</TableCell>
+                      <TableCell align="right">Capacity</TableCell>
+                      <TableCell align="right">Used</TableCell>
+                      <TableCell align="right">Fill Rate</TableCell>
+                      <TableCell align="right">Value</TableCell>
+                    </TableRow>
+                  </TableHead>
+                  <TableBody>
+                    {planetDetails.storageInfo
+                      .map(storage => ({
+                        ...storage,
+                        isLaunchpad: LAUNCHPAD_IDS.includes(storage.type_id)
+                      }))
+                      .sort((a, b) => (b.isLaunchpad ? 1 : 0) - (a.isLaunchpad ? 1 : 0))
+                      .map((storage, idx) => {
+                        const fillRate = storage.fillRate;
+                        const color = fillRate > 90 ? '#ff0000' : fillRate > 80 ? '#ffa500' : fillRate > 60 ? '#ffd700' : 'inherit';
+                        const contents = planet.info.pins.find(p => p.type_id === storage.type_id)?.contents || [];
+                        
+                        return (
+                          <React.Fragment key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.type}-${idx}`}>
+                            <TableRow>
+                              <TableCell>{storage.isLaunchpad ? 'Launchpad' : 'Storage'}</TableCell>
+                              <TableCell align="right">{storage.capacity.toFixed(1)} m³</TableCell>
+                              <TableCell align="right">{storage.used.toFixed(1)} m³</TableCell>
+                              <TableCell align="right" sx={{ color }}>{fillRate.toFixed(1)}%</TableCell>
+                              <TableCell align="right">
+                                {storage.value > 0 ? (
+                                  storage.value >= 1000000000 
+                                    ? `${(storage.value / 1000000000).toFixed(2)} B` 
+                                    : `${(storage.value / 1000000).toFixed(0)} M`
+                                ) : '-'} ISK
+                              </TableCell>
+                            </TableRow>
+                            {contents.length > 0 && (
+                              <TableRow>
+                                <TableCell colSpan={5} sx={{ pt: 0, pb: 0 }}>
+                                  <Table size="small">
+                                    <TableBody>
+                                      {contents.map((content, idy) => (
+                                        <TableRow key={`content-${character.character.characterId}-${planet.planet_id}-${storage.type}-${content.type_id}-${idx}-${idy}`}>
+                                          <TableCell sx={{ pl: 2 }}>
+                                            {PI_TYPES_MAP[content.type_id]?.name}
+                                          </TableCell>
+                                          <TableCell align="right" colSpan={4}>
+                                            {content.amount.toFixed(1)} units
+                                          </TableCell>
+                                        </TableRow>
+                                      ))}
+                                    </TableBody>
+                                  </Table>
+                                </TableCell>
+                              </TableRow>
+                            )}
+                          </React.Fragment>
+                        );
+                      })}
+                  </TableBody>
+                </Table>
+              </Box>
+            }
+            componentsProps={{
+              tooltip: {
+                sx: {
+                  bgcolor: 'background.paper',
+                  '& .MuiTooltip-arrow': {
+                    color: 'background.paper',
+                  },
+                  maxWidth: 'none',
+                  width: 'fit-content'
+                }
+              }
+            }}
+          >
+            <div style={{ display: "flex", flexDirection: "column" }}>
+              {planetDetails.storageInfo.length === 0 &&<Typography fontSize={theme.custom.smallText}>No storage</Typography>}
+              {planetDetails.storageInfo
+                .map(storage => ({
+                  ...storage,
+                  isLaunchpad: LAUNCHPAD_IDS.includes(storage.type_id)
+                }))
+                .sort((a, b) => (b.isLaunchpad ? 1 : 0) - (a.isLaunchpad ? 1 : 0))
+                .map((storage, idx) => {
+                  const fillRate = storage.fillRate;
+                  const color = fillRate > 90 ? '#ff0000' : fillRate > 80 ? '#ffa500' : fillRate > 60 ? '#ffd700' : 'inherit';
+                  
+                  return (
+                    <div key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.type}-${idx}`} style={{ display: "flex", alignItems: "center" }}>
+                      <Typography fontSize={theme.custom.smallText} style={{ marginRight: "5px" }}>
+                        {storage.isLaunchpad ? 'L' : 'S'}
                      </Typography>
-                    )}
-                  </div>
-                );
-              })}
-          </div>
+                      <Typography fontSize={theme.custom.smallText} style={{ color }}>
+                        {fillRate.toFixed(1)}%
+                      </Typography>
+                      {storage.value > 0 && (
+                        <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px" }}>
+                          ({Math.round(storage.value / 1000000)}M)
+                        </Typography>
+                      )}
+                    </div>
+                  );
+                })}
+            </div>
+          </Tooltip>
        </TableCell>
        <TableCell className="menu-cell">
          <IconButton
@@ -534,7 +551,7 @@ export const PlanetTableRow = ({
          <Collapse in={simulationOpen} timeout="auto" unmountOnExit>
            <Box sx={{ my: 2 }}>
              <ExtractionSimulationDisplay
-                extractors={extractors
+                extractors={planetDetails.extractors
                  .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
                  .map(e => ({
                    typeId: e.extractor_details!.product_type_id!,
@@ -543,7 +560,21 @@ export const PlanetTableRow = ({
                    installTime: e.install_time ?? "",
                    expiryTime: e.expiry_time ?? ""
                  }))}
-                productionNodes={productionNodes}
+                productionNodes={Array.from(planetDetails.localProduction).map(([schematicId, schematic]) => ({
+                  schematicId: schematicId,
+                  typeId: schematic.outputs[0].type_id,
+                  name: schematic.name,
+                  inputs: schematic.inputs.map((input: SchematicInput) => ({
+                    typeId: input.type_id,
+                    quantity: input.quantity
+                  })),
+                  outputs: schematic.outputs.map((output: SchematicOutput) => ({
+                    typeId: output.type_id,
+                    quantity: output.quantity
+                  })),
+                  cycleTime: schematic.cycle_time,
+                  factoryCount: schematic.factoryCount || 1
+                }))}
              />
            </Box>
          </Collapse>
--- a/src/app/components/PlanetaryInteraction/PlanetaryInteractionRow.tsx
+++ b/src/app/components/PlanetaryInteraction/PlanetaryInteractionRow.tsx
@@ -1,5 +1,5 @@
 import { AccessToken } from "@/types";
-import { Icon, IconButton, Stack, Tooltip, Typography, styled, useTheme } from "@mui/material";
+import { IconButton, Stack, Tooltip, Typography, styled, useTheme } from "@mui/material";
 import { PlanetCard } from "./PlanetCard";
 import { NoPlanetCard } from "./NoPlanetCard";
 import Table from "@mui/material/Table";
@@ -11,6 +11,7 @@ import TableRow from "@mui/material/TableRow";
 import Paper from "@mui/material/Paper";
 import { PlanetTableRow } from "./PlanetTableRow";
 import { Settings } from "@mui/icons-material";
+import { PlanetCalculations } from "@/types/planet";

 const StackItem = styled(Stack)(({ theme }) => ({
  ...theme.typography.body2,
@@ -22,8 +23,10 @@ const StackItem = styled(Stack)(({ theme }) => ({

 const PlanetaryIteractionTable = ({
  character,
+  planetDetails,
 }: {
  character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
  const theme = useTheme();

@@ -117,6 +120,7 @@ const PlanetaryIteractionTable = ({
                key={`${character.character.characterId}-${planet.planet_id}`}
                planet={planet}
                character={character}
+                planetDetails={planetDetails[planet.planet_id]}
              />
            ))}
          </TableBody>
@@ -128,8 +132,10 @@ const PlanetaryIteractionTable = ({

 const PlanetaryInteractionIconsRow = ({
  character,
+  planetDetails,
 }: {
  character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
  return (
    <StackItem>
@@ -139,6 +145,7 @@ const PlanetaryInteractionIconsRow = ({
            key={`${character.character.characterId}-${planet.planet_id}`}
            planet={planet}
            character={character}
+            planetDetails={planetDetails[planet.planet_id]}
          />
        ))}
        {Array.from(Array(6 - character.planets.length).keys()).map((i, id) => (
@@ -153,14 +160,16 @@ const PlanetaryInteractionIconsRow = ({

 export const PlanetaryInteractionRow = ({
  character,
+  planetDetails,
 }: {
  character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
  const theme = useTheme();

  return theme.custom.compactMode ? (
-    <div style={{ marginTop: "1.2rem" }}><PlanetaryInteractionIconsRow character={character} /></div>
+    <div style={{ marginTop: "1.2rem" }}><PlanetaryInteractionIconsRow character={character} planetDetails={planetDetails} /></div>
  ) : (
-    <div style={{ marginTop: "1.4rem" }}><PlanetaryIteractionTable character={character} /></div>
+    <div style={{ marginTop: "1.4rem" }}><PlanetaryIteractionTable character={character} planetDetails={planetDetails} /></div>
  );
 };
--- a/src/app/components/PlanetaryInteraction/timeColors.ts
+++ b/src/app/components/PlanetaryInteraction/timeColors.ts
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -19,6 +19,21 @@ import { EvePraisalResult, fetchAllPrices } from "@/eve-praisal";
 import { getPlanet, getPlanetUniverse, getPlanets } from "@/planets";
 import { PlanetConfig } from "@/types";

+// Add batch processing utility
+const processInBatches = async <T, R>(
+  items: T[],
+  batchSize: number,
+  processFn: (item: T) => Promise<R>
+): Promise<R[]> => {
+  const results: R[] = [];
+  for (let i = 0; i < items.length; i += batchSize) {
+    const batch = items.slice(i, i + batchSize);
+    const batchResults = await Promise.all(batch.map(processFn));
+    results.push(...batchResults);
+  }
+  return results;
+};
+
 const Home = () => {
  const searchParams = useSearchParams();
  const [characters, setCharacters] = useState<AccessToken[]>([]);
@@ -63,15 +78,13 @@ const Home = () => {
  };

  const refreshSession = async (characters: AccessToken[]) => {
-    return Promise.all(
-      characters.map((c) => {
-        try {
-          return refreshToken(c);
-        } catch {
-          return { ...c, needsLogin: true };
-        }
-      }),
-    );
+    return processInBatches(characters, 50, async (c) => {
+      try {
+        return await refreshToken(c);
+      } catch {
+        return { ...c, needsLogin: true };
+      }
+    });
  };

  const handleCallback = async (
@@ -107,24 +120,24 @@ const Home = () => {
  const initializeCharacterPlanets = (
    characters: AccessToken[],
  ): Promise<AccessToken[]> =>
-    Promise.all(
-      characters.map(async (c) => {
-        if (c.needsLogin || c.character === undefined)
-          return { ...c, planets: [] };
-        const planets = await getPlanets(c);
-        const planetsWithInfo: PlanetWithInfo[] = await Promise.all(
-          planets.map(async (p) => ({
-            ...p,
-            info: await getPlanet(c, p),
-            infoUniverse: await getPlanetUniverse(p),
-          })),
-        );
-        return {
-          ...c,
-          planets: planetsWithInfo,
-        };
-      }),
-    );
+    processInBatches(characters, 50, async (c) => {
+      if (c.needsLogin || c.character === undefined)
+        return { ...c, planets: [] };
+      const planets = await getPlanets(c);
+      const planetsWithInfo: PlanetWithInfo[] = await processInBatches(
+        planets,
+        3,
+        async (p) => ({
+          ...p,
+          info: await getPlanet(c, p),
+          infoUniverse: await getPlanetUniverse(p),
+        })
+      );
+      return {
+        ...c,
+        planets: planetsWithInfo,
+      };
+    });

  const saveCharacters = (characters: AccessToken[]): AccessToken[] => {
    localStorage.setItem("characters", JSON.stringify(characters));
--- a/src/const.ts
+++ b/src/const.ts
@@ -1080,3 +1080,5 @@ export const STORAGE_CAPACITIES: Record<number, number> = {
  2556: 10000, // Plasma Launchpad
  2557: 10000, // Storm Launchpad
 };
+
+export const LAUNCHPAD_IDS = [2256, 2542, 2543, 2544, 2552, 2555, 2556, 2557];
--- a/src/planets.ts
+++ b/src/planets.ts
@@ -7,7 +7,7 @@ import {
 } from "@/types";
 import { Api } from "@/esi-api";
 import { EXTRACTOR_TYPE_IDS, FACTORY_IDS, PI_SCHEMATICS } from "@/const";
-import { extractorsHaveExpired } from "./app/components/PlanetaryInteraction/timeColors";
+import { extractorsHaveExpired } from "./app/components/PlanetaryInteraction/alerts";

 export const getPlanets = async (character: AccessToken): Promise<Planet[]> => {
  const api = new Api();
@@ -22,10 +22,51 @@ export const getPlanets = async (character: AccessToken): Promise<Planet[]> => {
  return planets;
 };

+interface CachedPlanetData {
+  data: PlanetInfo;
+  timestamp: number;
+}
+
+const CACHE_DURATION_MS = 60_000; // 1 minute
+const CACHE_STORAGE_KEY = "planet_cache";
+
+const loadCacheFromStorage = (): Map<string, CachedPlanetData> => {
+  try {
+    const stored = localStorage.getItem(CACHE_STORAGE_KEY);
+    if (stored) {
+      const parsed = JSON.parse(stored);
+      return new Map(Object.entries(parsed));
+    }
+  } catch (error) {
+    console.error("Failed to load planet cache from localStorage:", error);
+  }
+  return new Map();
+};
+
+const saveCacheToStorage = (cache: Map<string, CachedPlanetData>) => {
+  try {
+    const obj = Object.fromEntries(cache);
+    localStorage.setItem(CACHE_STORAGE_KEY, JSON.stringify(obj));
+  } catch (error) {
+    console.error("Failed to save planet cache to localStorage:", error);
+  }
+};
+
+const planetCache = loadCacheFromStorage();
+
 export const getPlanet = async (
  character: AccessToken,
  planet: Planet,
 ): Promise<PlanetInfo> => {
+  const cacheKey = `${character.character.characterId}-${planet.planet_id}`;
+  const cached = planetCache.get(cacheKey);
+
+  if (cached && Date.now() - cached.timestamp < CACHE_DURATION_MS) {
+    console.log(`[Cache HIT] Planet ${planet.planet_id} for character ${character.character.characterId}`);
+    return cached.data;
+  }
+
+  console.log(`[Cache MISS] Fetching planet ${planet.planet_id} for character ${character.character.characterId}`);
  const api = new Api();
  const planetInfo = (
    await api.v3.getCharactersCharacterIdPlanetsPlanetId(
@@ -36,6 +77,14 @@ export const getPlanet = async (
      },
    )
  ).data;
+
+  planetCache.set(cacheKey, {
+    data: planetInfo,
+    timestamp: Date.now(),
+  });
+
+  saveCacheToStorage(planetCache);
+
  return planetInfo;
 };

--- a/src/types/planet.ts
+++ b/src/types/planet.ts
@@ -0,0 +1,83 @@
+import { Pin, PlanetWithInfo } from '../types';
+
+export interface StorageContent {
+  type_id: number;
+  amount: number;
+}
+
+export interface StorageInfo {
+  type: string;
+  type_id: number;
+  capacity: number;
+  used: number;
+  fillRate: number;
+  value: number;
+}
+
+export interface PlanetCalculations {
+  expired: boolean;
+  extractors: Pin[];
+  localProduction: Map<number, LocalProductionInfo>;
+  localImports: LocalImport[];
+  localExports: LocalExport[];
+  storageInfo: StorageInfo[];
+  extractorAverages: ExtractorAverage[];
+  hasLargeExtractorDifference: boolean;
+  importDepletionTimes: ImportDepletionTime[];
+  visibility: 'visible' | 'hidden';
+}
+
+export interface AlertState {
+  expired: boolean;
+  hasLowStorage: boolean;
+  hasLowImports: boolean;
+  hasLargeExtractorDifference: boolean;
+}
+
+export interface ExtractorAverage {
+  typeId: number;
+  averagePerHour: number;
+}
+
+export interface ImportDepletionTime {
+  typeId: number;
+  hoursUntilDepletion: number;
+  monthlyCost: number;
+}
+
+export interface LocalProductionInfo {
+  name: string;
+  cycle_time: number;
+  schematic_id: number;
+  inputs: SchematicInput[];
+  outputs: SchematicOutput[];
+  factoryCount: number;
+}
+
+export interface LocalImport {
+  type_id: number;
+  schematic_id: number;
+  quantity: number;
+  factoryCount: number;
+}
+
+export interface LocalExport {
+  type_id: number;
+  schematic_id: number;
+  quantity: number;
+  factoryCount: number;
+}
+
+export interface SchematicInput {
+  schematic_id: number;
+  type_id: number;
+  quantity: number;
+  is_input: number;
+}
+
+export interface SchematicOutput {
+  schematic_id: number;
+  type_id: number;
+  quantity: number;
+  is_input: number;
+} 
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -2,14 +2,12 @@ import pino from 'pino';

 const logger = pino({
  level: process.env.LOG_LEVEL || 'info',
-  transport: {
-    target: 'pino-pretty',
-    options: {
-      colorize: true,
-      translateTime: 'SYS:standard',
-      ignore: 'pid,hostname',
+  formatters: {
+    level: (label) => {
+      return { level: label };
    },
  },
+  timestamp: () => `,"time":"${new Date().toISOString()}"`,
  base: {
    env: process.env.NODE_ENV,
  },
Author	SHA1	Message	Date
calli	e47c572423	fix nextjs CVE	2025-12-12 12:22:33 +02:00
calli	5c6f912721	cache planets for one minute so we dont spam ESI	2025-11-09 23:07:23 +02:00
calli	470935fe9d	update official instance url	2025-08-01 09:45:25 +03:00
calli	7ce238c9c7	increase batch from 5 to 50	2025-05-17 20:28:01 +03:00
calli	6523000e69	lets batch the requests for users with gazillion characters	2025-05-17 19:51:21 +03:00
calli	b993b28840	Add balance and storage alert counts to account card	2025-05-17 17:21:49 +03:00
calli	c036bc10e1	Sort storages	2025-05-17 17:21:37 +03:00
calli	b743193f46	update discord link	2025-05-17 17:10:58 +03:00
calli	02ebaf6e35	remove unused imports	2025-05-02 23:00:56 +03:00
calli	3a0843e54c	make keys unique for the new tooltip	2025-05-02 22:00:40 +03:00
calli	e43bd91bef	make active filters more visible	2025-05-02 21:54:22 +03:00
calli	cc76765278	add a storage tooltip	2025-05-02 21:54:09 +03:00
calli	73b54f6bf5	hoist calculations and alerts to accountCard level	2025-05-02 21:41:48 +03:00
calli	cbef0fd39b	rename timeColors to alerts to better describe the alert logic file	2025-04-30 17:57:52 +03:00
calli	e085fcd59b	add import tooltip to show import spesifics	2025-04-30 17:30:36 +03:00
calli	370400ce99	extract launchpad ids to const and recolor storage fill rates	2025-04-28 18:32:26 +03:00
calli	93507ea98e	add pino logger configuration correctly	2025-04-28 18:27:35 +03:00
calli	7915d2bd29	update docker compose file	2025-04-28 18:27:18 +03:00
calli	294720f776	use planets last_update to calculate the imports depletion	2025-04-28 18:10:32 +03:00