@cytario/web 2.1.1 → 2.1.2

package/bin/cytario-web.mjs

@@ -76,9 +76,11 @@ async function runReactRouterPipeline(subcommand, forwardedArgs) {
 }
 
 function runStart(forwardedArgs) {
-  const serverEntry = resolve(PACKAGE_ROOT, "server.ts");
+  // Node 24 won't type-strip under `node_modules/`, so we spawn the
+  // precompiled `server.js` (emitted by `npm run build:server`).
+  const serverEntry = resolve(PACKAGE_ROOT, "server.js");
   if (!existsSync(serverEntry)) {
-    fail(`missing server entry at ${serverEntry}`);
+    fail(`missing server entry at ${serverEntry} — run \`npm run build:server\``);
   }
   const child = spawn(process.execPath, [serverEntry, ...forwardedArgs], {
     cwd: PACKAGE_ROOT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cytario/web",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Cytario Web — scientific imaging data browser and viewer for OME-TIFF, OME-Zarr, Parquet and GeoTIFF on S3-compatible storage.",
   "license": "AGPL-3.0",
   "sideEffects": false,
@@ -29,7 +29,8 @@
     "vite-plugins",
     "prisma.config.ts",
     "react-router.config.ts",
-    "server.ts",
+    "server.js",
+    "server.js.map",
     "tsconfig.json",
     "vite.config.ts",
     "!**/__tests__",
@@ -47,14 +48,17 @@
   },
   "scripts": {
     "prepare": "husky || true",
+    "prepublishOnly": "npm run build:server",
     "prebuild": "node scripts/prebuild.mjs",
     "build": "node bin/cytario-web.mjs build",
+    "build:server": "tsup --config tsup.server.config.ts",
     "codegen:check": "tsx scripts/codegen-check.ts",
     "dev": "node bin/cytario-web.mjs dev",
     "predev": "if [ -L node_modules/@cytario/design ]; then npm unlink @cytario/design --no-save 2>/dev/null && npm install @cytario/design --quiet; fi",
     "predev:design": "cd ../cytario-design && npm link --quiet && cd - > /dev/null && npm link @cytario/design --quiet && for p in react react-dom react-aria-components; do rm -rf ../cytario-design/node_modules/$p && ln -s \"$(pwd)/node_modules/$p\" ../cytario-design/node_modules/$p; done",
     "dev:design": "concurrently -n tsup,storybook,web -c blue,magenta,green \"cd ../cytario-design && npx tsup --watch\" \"cd ../cytario-design && npm run dev\" \"node bin/cytario-web.mjs dev\"",
     "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint .",
+    "prestart": "npm run build:server",
     "start": "node bin/cytario-web.mjs start",
     "typecheck": "react-router typegen && tsc",
     "test": "vitest",

package/{server.ts → server.js}

@@ -1,28 +1,17 @@
+// server.ts
 import "dotenv/config";
 import { createRequestHandler } from "@react-router/express";
 import compression from "compression";
 import express from "express";
 import morgan from "morgan";
-import path from "node:path";
-import url from "node:url";
-
-const BUILD_PATH = path.resolve("build/server/index.js");
-
-const buildModule = await import(url.pathToFileURL(BUILD_PATH).href);
-
-const app = express();
-
-// Trust the first proxy (Traefik) so req.protocol reflects X-Forwarded-Proto
-// and req.ip reflects X-Forwarded-For. This is critical for secure cookie
-// handling when TLS is terminated at the reverse proxy.
+import path from "path";
+import url from "url";
+var BUILD_PATH = path.resolve("build/server/index.js");
+var buildModule = await import(url.pathToFileURL(BUILD_PATH).href);
+var app = express();
 app.set("trust proxy", 1);
-
 app.disable("x-powered-by");
-
-let isShuttingDown = false;
-
-// Kubernetes readiness/liveness probe — before all middleware so it's fast and
-// never blocked by compression, static-file serving, or request logging.
+var isShuttingDown = false;
 app.get("/healthz", (_req, res) => {
   if (isShuttingDown) {
     res.status(503).send("shutting down");
@@ -30,54 +19,38 @@ app.get("/healthz", (_req, res) => {
     res.status(200).send("ok");
   }
 });
-
 app.use(compression());
-
-// Vite-fingerprinted assets — immutable, cache forever
 app.use(
   path.posix.join(buildModule.publicPath, "assets"),
   express.static(path.join(buildModule.assetsBuildDirectory, "assets"), {
     immutable: true,
-    maxAge: "1y",
-  }),
+    maxAge: "1y"
+  })
 );
-
-// Other build assets — short cache
 app.use(
   buildModule.publicPath,
-  express.static(buildModule.assetsBuildDirectory, { maxAge: "1h" }),
+  express.static(buildModule.assetsBuildDirectory, { maxAge: "1h" })
 );
-
-// Public static files (fonts, logos, etc.)
 app.use(express.static("public", { maxAge: "1h" }));
-
 app.use(morgan("tiny"));
-
 app.all(
   "*",
   createRequestHandler({
     build: buildModule,
-    mode: process.env.NODE_ENV,
-  }),
+    mode: process.env.NODE_ENV
+  })
 );
-
-const port = Number.parseInt(process.env.PORT || "3000", 10);
-const host = process.env.HOST || "0.0.0.0";
-
-const server = app.listen(port, host, () => {
+var port = Number.parseInt(process.env.PORT || "3000", 10);
+var host = process.env.HOST || "0.0.0.0";
+var server = app.listen(port, host, () => {
   console.log(`[cytario-web] http://${host}:${port}`);
 });
-
-// Graceful shutdown on SIGTERM/SIGINT
-const SHUTDOWN_DELAY_MS = 5_000;
-const DRAIN_TIMEOUT_MS = 15_000;
-
+var SHUTDOWN_DELAY_MS = 5e3;
+var DRAIN_TIMEOUT_MS = 15e3;
 for (const signal of ["SIGTERM", "SIGINT"]) {
   process.once(signal, () => {
     console.log(`[cytario-web] ${signal} received, shutting down gracefully`);
     isShuttingDown = true;
-
-    // Wait for load balancer to deregister the pod before closing connections
     setTimeout(() => {
       console.log("[cytario-web] closing server to new connections");
       server.close((err) => {
@@ -88,8 +61,6 @@ for (const signal of ["SIGTERM", "SIGINT"]) {
         }
         process.exit(err ? 1 : 0);
       });
-
-      // Force exit if connections don't drain in time
       setTimeout(() => {
         console.error("[cytario-web] drain timeout, forcing exit");
         process.exit(1);
@@ -97,3 +68,4 @@ for (const signal of ["SIGTERM", "SIGINT"]) {
     }, SHUTDOWN_DELAY_MS);
   });
 }
+//# sourceMappingURL=server.js.map

package/server.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["server.ts"],"sourcesContent":["import \"dotenv/config\";\nimport { createRequestHandler } from \"@react-router/express\";\nimport compression from \"compression\";\nimport express from \"express\";\nimport morgan from \"morgan\";\nimport path from \"node:path\";\nimport url from \"node:url\";\n\nconst BUILD_PATH = path.resolve(\"build/server/index.js\");\n\nconst buildModule = await import(url.pathToFileURL(BUILD_PATH).href);\n\nconst app = express();\n\n// Trust the first proxy (Traefik) so req.protocol reflects X-Forwarded-Proto\n// and req.ip reflects X-Forwarded-For. This is critical for secure cookie\n// handling when TLS is terminated at the reverse proxy.\napp.set(\"trust proxy\", 1);\n\napp.disable(\"x-powered-by\");\n\nlet isShuttingDown = false;\n\n// Kubernetes readiness/liveness probe — before all middleware so it's fast and\n// never blocked by compression, static-file serving, or request logging.\napp.get(\"/healthz\", (_req, res) => {\n  if (isShuttingDown) {\n    res.status(503).send(\"shutting down\");\n  } else {\n    res.status(200).send(\"ok\");\n  }\n});\n\napp.use(compression());\n\n// Vite-fingerprinted assets — immutable, cache forever\napp.use(\n  path.posix.join(buildModule.publicPath, \"assets\"),\n  express.static(path.join(buildModule.assetsBuildDirectory, \"assets\"), {\n    immutable: true,\n    maxAge: \"1y\",\n  }),\n);\n\n// Other build assets — short cache\napp.use(\n  buildModule.publicPath,\n  express.static(buildModule.assetsBuildDirectory, { maxAge: \"1h\" }),\n);\n\n// Public static files (fonts, logos, etc.)\napp.use(express.static(\"public\", { maxAge: \"1h\" }));\n\napp.use(morgan(\"tiny\"));\n\napp.all(\n  \"*\",\n  createRequestHandler({\n    build: buildModule,\n    mode: process.env.NODE_ENV,\n  }),\n);\n\nconst port = Number.parseInt(process.env.PORT || \"3000\", 10);\nconst host = process.env.HOST || \"0.0.0.0\";\n\nconst server = app.listen(port, host, () => {\n  console.log(`[cytario-web] http://${host}:${port}`);\n});\n\n// Graceful shutdown on SIGTERM/SIGINT\nconst SHUTDOWN_DELAY_MS = 5_000;\nconst DRAIN_TIMEOUT_MS = 15_000;\n\nfor (const signal of [\"SIGTERM\", \"SIGINT\"]) {\n  process.once(signal, () => {\n    console.log(`[cytario-web] ${signal} received, shutting down gracefully`);\n    isShuttingDown = true;\n\n    // Wait for load balancer to deregister the pod before closing connections\n    setTimeout(() => {\n      console.log(\"[cytario-web] closing server to new connections\");\n      server.close((err) => {\n        if (err) {\n          console.error(\"[cytario-web] error during close:\", err);\n        } else {\n          console.log(\"[cytario-web] all connections drained, exiting\");\n        }\n        process.exit(err ? 1 : 0);\n      });\n\n      // Force exit if connections don't drain in time\n      setTimeout(() => {\n        console.error(\"[cytario-web] drain timeout, forcing exit\");\n        process.exit(1);\n      }, DRAIN_TIMEOUT_MS).unref();\n    }, SHUTDOWN_DELAY_MS);\n  });\n}\n"],"mappings":";AAAA,OAAO;AACP,SAAS,4BAA4B;AACrC,OAAO,iBAAiB;AACxB,OAAO,aAAa;AACpB,OAAO,YAAY;AACnB,OAAO,UAAU;AACjB,OAAO,SAAS;AAEhB,IAAM,aAAa,KAAK,QAAQ,uBAAuB;AAEvD,IAAM,cAAc,MAAM,OAAO,IAAI,cAAc,UAAU,EAAE;AAE/D,IAAM,MAAM,QAAQ;AAKpB,IAAI,IAAI,eAAe,CAAC;AAExB,IAAI,QAAQ,cAAc;AAE1B,IAAI,iBAAiB;AAIrB,IAAI,IAAI,YAAY,CAAC,MAAM,QAAQ;AACjC,MAAI,gBAAgB;AAClB,QAAI,OAAO,GAAG,EAAE,KAAK,eAAe;AAAA,EACtC,OAAO;AACL,QAAI,OAAO,GAAG,EAAE,KAAK,IAAI;AAAA,EAC3B;AACF,CAAC;AAED,IAAI,IAAI,YAAY,CAAC;AAGrB,IAAI;AAAA,EACF,KAAK,MAAM,KAAK,YAAY,YAAY,QAAQ;AAAA,EAChD,QAAQ,OAAO,KAAK,KAAK,YAAY,sBAAsB,QAAQ,GAAG;AAAA,IACpE,WAAW;AAAA,IACX,QAAQ;AAAA,EACV,CAAC;AACH;AAGA,IAAI;AAAA,EACF,YAAY;AAAA,EACZ,QAAQ,OAAO,YAAY,sBAAsB,EAAE,QAAQ,KAAK,CAAC;AACnE;AAGA,IAAI,IAAI,QAAQ,OAAO,UAAU,EAAE,QAAQ,KAAK,CAAC,CAAC;AAElD,IAAI,IAAI,OAAO,MAAM,CAAC;AAEtB,IAAI;AAAA,EACF;AAAA,EACA,qBAAqB;AAAA,IACnB,OAAO;AAAA,IACP,MAAM,QAAQ,IAAI;AAAA,EACpB,CAAC;AACH;AAEA,IAAM,OAAO,OAAO,SAAS,QAAQ,IAAI,QAAQ,QAAQ,EAAE;AAC3D,IAAM,OAAO,QAAQ,IAAI,QAAQ;AAEjC,IAAM,SAAS,IAAI,OAAO,MAAM,MAAM,MAAM;AAC1C,UAAQ,IAAI,wBAAwB,IAAI,IAAI,IAAI,EAAE;AACpD,CAAC;AAGD,IAAM,oBAAoB;AAC1B,IAAM,mBAAmB;AAEzB,WAAW,UAAU,CAAC,WAAW,QAAQ,GAAG;AAC1C,UAAQ,KAAK,QAAQ,MAAM;AACzB,YAAQ,IAAI,iBAAiB,MAAM,qCAAqC;AACxE,qBAAiB;AAGjB,eAAW,MAAM;AACf,cAAQ,IAAI,iDAAiD;AAC7D,aAAO,MAAM,CAAC,QAAQ;AACpB,YAAI,KAAK;AACP,kBAAQ,MAAM,qCAAqC,GAAG;AAAA,QACxD,OAAO;AACL,kBAAQ,IAAI,gDAAgD;AAAA,QAC9D;AACA,gBAAQ,KAAK,MAAM,IAAI,CAAC;AAAA,MAC1B,CAAC;AAGD,iBAAW,MAAM;AACf,gBAAQ,MAAM,2CAA2C;AACzD,gBAAQ,KAAK,CAAC;AAAA,MAChB,GAAG,gBAAgB,EAAE,MAAM;AAAA,IAC7B,GAAG,iBAAiB;AAAA,EACtB,CAAC;AACH;","names":[]}