add information about compute server id to project upload POST

Author: williamstein

src/packages/frontend/file-upload.tsx

@@ -85,7 +85,14 @@ const Header = () => {
 
 function postUrl(project_id: string, path: string): string {
   const dest_dir = encode_path(path);
-  return join(appBasePath, project_id, `raw/.smc/upload?dest_dir=${dest_dir}`);
+  const compute_server_id = redux
+    .getProjectStore(project_id)
+    .get("compute_server_id");
+  return join(
+    appBasePath,
+    project_id,
+    `raw/.smc/upload?dest_dir=${dest_dir}&compute_server_id=${compute_server_id}`,
+  );
 }
 
 interface FileUploadProps {
@@ -98,7 +105,7 @@ interface FileUploadProps {
 
 export const FileUpload: React.FC<FileUploadProps> = (props) => {
   const student_project_functionality = useStudentProjectFunctionality(
-    props.project_id
+    props.project_id,
   );
 
   if (student_project_functionality.disableUploads) {
@@ -137,7 +144,7 @@ export const FileUpload: React.FC<FileUploadProps> = (props) => {
           eventHandlers={props.dropzone_handler}
           djsConfig={{
             previewTemplate: ReactDOMServer.renderToStaticMarkup(
-              dropzone_template()
+              dropzone_template(),
             ),
             ...UPLOAD_OPTIONS,
           }}
@@ -174,7 +181,7 @@ interface FileUploadWrapperProps {
 
 export const FileUploadWrapper: React.FC<FileUploadWrapperProps> = (props) => {
   const student_project_functionality = useStudentProjectFunctionality(
-    props.project_id
+    props.project_id,
   );
   const disabled =
     props.disabled || student_project_functionality.disableUploads;
@@ -196,12 +203,12 @@ export const FileUploadWrapper: React.FC<FileUploadWrapperProps> = (props) => {
             ? ReactDOM.findDOMNode(preview_ref.current)
             : undefined,
         previewTemplate: ReactDOMServer.renderToStaticMarkup(
-          preview_template()
+          preview_template(),
         ),
         addRemoveLinks: props.event_handlers.removedfile != null,
         ...UPLOAD_OPTIONS,
       },
-      true
+      true,
     );
     return merge(with_defaults, props.config);
   }
@@ -252,7 +259,7 @@ export const FileUploadWrapper: React.FC<FileUploadWrapperProps> = (props) => {
           true,
           {},
           dropzone.current.options,
-          get_djs_config()
+          get_djs_config(),
         );
       }
     }
@@ -270,7 +277,7 @@ export const FileUploadWrapper: React.FC<FileUploadWrapperProps> = (props) => {
   // from the dropzone.  This is true by default if there is
   // no "removedfile" handler, and false otherwise.
   function close_preview(
-    remove_all: boolean = props.event_handlers.removedfile == null
+    remove_all: boolean = props.event_handlers.removedfile == null,
   ) {
     if (typeof props.on_close === "function") {
       props.on_close();

src/packages/project/upload.ts

@@ -29,30 +29,34 @@ const { F_OK, W_OK, R_OK } = fs_constants;
 import ensureContainingDirectoryExists from "@cocalc/backend/misc/ensure-containing-directory-exists";
 import { getLogger } from "./logger";
 
+const logger = getLogger("project:upload");
+
 export default function init(): Router {
-  const winston = getLogger("upload");
-  winston.info("configuring the upload endpoint");
+  logger.info("configuring the upload endpoint");
 
   const router = Router();
 
   router.get("/.smc/upload", function (_, res) {
-    winston.http("upload GET");
+    logger.http("upload GET");
     return res.send("hello");
   });
 
   router.post("/.smc/upload", async function (req, res): Promise<void> {
     function dbg(...m): void {
-      winston.http("upload POST ", ...m);
+      logger.http("upload POST ", ...m);
     }
     // See https://github.com/felixge/node-formidable; user uploaded a file
-    dbg();
 
     // See http://stackoverflow.com/questions/14022353/how-to-change-upload-path-when-use-formidable-with-express-in-node-js
     // Important to set maxFileSize, since the default is 200MB!
     // See https://stackoverflow.com/questions/13374238/how-to-limit-upload-file-size-in-express-js
     const { dest_dir } = req.query;
+    const compute_server_id = getComputeServerId(req);
+
+    dbg({ dest_dir, compute_server_id });
+
     if (typeof dest_dir != "string") {
-      res.status(500).send("query parm dest_dir must be a string");
+      res.status(500).send("query param dest_dir must be a string");
       return;
     }
     const { HOME } = process.env;
@@ -63,7 +67,7 @@ export default function init(): Router {
     try {
       const uploadDir = join(HOME, dest_dir);
 
-      // ensure target path existsJS
+      // ensure target path exists
       dbg("ensure target path exists... ", uploadDir);
       await mkdir(uploadDir, { recursive: true });
 
@@ -140,6 +144,14 @@ export default function init(): Router {
   return router;
 }
 
+function getComputeServerId(req) {
+  try {
+    return parseInt(req.query.compute_server_id ?? "0");
+  } catch (_) {
+    return 0;
+  }
+}
+
 async function handle_chunk_data(
   index: number,
   total: number,