Merge branch 'express-5-8529' of github.com:sagemathinc/cocalc into express-5-8529

Author: haraldschilly

src/.claude/settings.json

@@ -32,7 +32,6 @@
       "Bash(pnpm i18n:*:*)",
       "Bash(pnpm info:*)",
       "Bash(pnpm list:*)",
-      "Bash(pnpm list:*)",
       "Bash(pnpm remove:*)",
       "Bash(pnpm run:*)",
       "Bash(pnpm test:*)",

src/packages/hub/proxy/handle-upgrade.ts

@@ -2,15 +2,14 @@
 
 import { createProxyServer, type ProxyServer } from "http-proxy-3";
 import LRU from "lru-cache";
-
-import basePath from "@cocalc/backend/base-path";
-import getLogger from "@cocalc/hub/logger";
 import { getEventListeners } from "node:events";
-import { proxyConatWebsocket } from "./proxy-conat";
+import getLogger from "@cocalc/hub/logger";
 import stripRememberMeCookie from "./strip-remember-me-cookie";
 import { getTarget } from "./target";
 import { stripBasePath } from "./util";
 import { versionCheckFails } from "./version";
+import { proxyConatWebsocket } from "./proxy-conat";
+import basePath from "@cocalc/backend/base-path";
 
 const LISTENERS_HACK = true;
 

src/packages/hub/proxy/index.ts

@@ -5,11 +5,11 @@
 
 import { Application } from "express";
 
-import base_path from "@cocalc/backend/base-path";
-import { ProjectControlFunction } from "@cocalc/server/projects/control";
 import getLogger from "../logger";
 import initRequest from "./handle-request";
 import initUpgrade from "./handle-upgrade";
+import base_path from "@cocalc/backend/base-path";
+import { ProjectControlFunction } from "@cocalc/server/projects/control";
 
 const logger = getLogger("proxy");
 

src/packages/hub/servers/app/next.ts

@@ -16,10 +16,10 @@ import basePath from "@cocalc/backend/base-path";
 import { getLogger } from "@cocalc/hub/logger";
 import handleRaw from "@cocalc/next/lib/share/handle-raw";
 import { callback2 } from "@cocalc/util/async-utils";
-import { separate_file_extension } from "@cocalc/util/misc";
 import { database } from "../database";
 import createLandingRedirect from "./landing-redirect";
 import shareRedirect from "./share-redirect";
+import { separate_file_extension } from "@cocalc/util/misc";
 
 export default async function init(app: Application) {
   const winston = getLogger("nextjs");

src/packages/project/directory-listing.ts

@@ -18,15 +18,14 @@ Browser client code only uses this through the websocket anyways.
 */
 
 import { Router } from "express";
-import { join } from "node:path";
 
 import getListing from "@cocalc/backend/get-listing";
 
 export default function init(): Router {
   const base = "/.smc/directory_listing/";
   const router = Router();
 
-  router.get(join(base, "{*splat}"), async (req, res) => {
+  router.get(base + "{*splat}", async (req, res) => {
     // decodeURIComponent because decodeURI(misc.encode_path('asdf/te #1/')) != 'asdf/te #1/'
     // https://github.com/sagemathinc/cocalc/issues/2400
     const path = decodeURIComponent(req.path.slice(base.length).trim());