@sjcrh/proteinpaint-server 2.108.1-0 → 2.108.6-0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.108.1-0",
+  "version": "2.108.6-0",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "@sjcrh/augen": "2.87.0",
-    "@sjcrh/proteinpaint-rust": "2.99.0",
+    "@sjcrh/proteinpaint-rust": "2.108.6-0",
     "@sjcrh/proteinpaint-shared": "2.108.0",
     "@sjcrh/proteinpaint-types": "2.108.0",
     "@types/express": "^5.0.0",

package/routes/gdc.mafBuild.js

@@ -1,6 +1,6 @@
 import ky from "ky";
 import { joinUrl } from "#shared/joinUrl.js";
-import { run_rust_stream } from "@sjcrh/proteinpaint-rust";
+import { stream_rust } from "@sjcrh/proteinpaint-rust";
 import { gdcMafPayload } from "#types/checkers";
 import { maxTotalSizeCompressed } from "./gdc.maf.ts";
 import { mayLog } from "#src/helpers.ts";
@@ -46,19 +46,38 @@ async function buildMaf(q, res, ds) {
     host: joinUrl(host.rest, "data")
     // must use the /data/ endpoint from current host
   };
-  const rustStream = run_rust_stream("gdcmaf", JSON.stringify(arg));
-  res.setHeader("Content-Type", "application/octet-stream");
-  res.setHeader("Content-Disposition", "attachment; filename=cohort.maf.gz");
-  rustStream.pipe(res);
-  rustStream.on("end", () => {
+  const boundary = "GDC_MAF_MULTIPART_BOUNDARY";
+  res.setHeader("content-type", `multipart/mixed; boundary=${boundary}`);
+  res.write(`--${boundary}`);
+  res.write("\ncontent-disposition: attachment; filename=cohort.maf.gz");
+  res.write("\ncontent-type: application/octet-stream\n\n");
+  res.flush();
+  try {
+    const rustStream = stream_rust("gdcmaf", JSON.stringify(arg), emitJson);
+    if (rustStream) {
+      rustStream.pipe(res, { end: false }).on("error", (e) => {
+        if (!e)
+          return;
+        console.log(e);
+      });
+    } else {
+      emitJson({ error: "server error: undefined rustStream" });
+    }
+  } catch (e) {
+    console.log(e);
+  }
+  function emitJson(data, end = true) {
+    res.write(`
+--${boundary}`);
+    res.write("\ncontent-type: application/json");
+    const json = typeof data === "string" ? data : JSON.stringify(data || { ok: true, status: "ok" });
+    res.write("\n\n" + json);
+    res.write(`
+--${boundary}--`);
     mayLog("rust gdcmaf", Date.now() - t0);
-    res.end();
-  });
-  rustStream.on("error", (err) => {
-    console.error(err);
-    res.statusCode = 500;
-    res.end("Internal Server Error");
-  });
+    if (end)
+      res.end();
+  }
 }
 async function getFileLstUnderSizeLimit(lst, host) {
   if (lst.length == 0)