@sjcrh/proteinpaint-server 2.99.0 → 2.99.1-0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.99.0",
+  "version": "2.99.1-0",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -61,7 +61,7 @@
     "@sjcrh/augen": "2.87.0",
     "@sjcrh/proteinpaint-rust": "2.99.0",
     "@sjcrh/proteinpaint-shared": "2.99.0",
-    "@sjcrh/proteinpaint-types": "2.99.0",
+    "@sjcrh/proteinpaint-types": "2.99.1-0",
     "better-sqlite3": "^9.4.1",
     "body-parser": "^1.15.2",
     "canvas": "~2.11.2",

package/routes/img.js

@@ -0,0 +1,46 @@
+import { imgPayload } from "#types/checkers";
+import path from "path";
+import fs from "fs";
+import * as utils from "../src/utils.js";
+import imagesize from "image-size";
+const api = {
+  endpoint: "img",
+  methods: {
+    get: {
+      ...imgPayload,
+      init
+    },
+    post: {
+      ...imgPayload,
+      init
+    }
+  }
+};
+function init() {
+  return async (req, res) => {
+    try {
+      sendImage(req, res);
+    } catch (e) {
+      res.send({ status: "error", error: e.message || e });
+    }
+  };
+}
+async function sendImage(req, res) {
+  const [e, file] = utils.fileurl(req, true);
+  try {
+    if (e)
+      throw "invalid image file";
+    const data = await fs.promises.readFile(file);
+    const ext = path.extname(file).substring(1);
+    const image = {
+      src: `data:image/${ext};base64,${Buffer.from(data).toString("base64")}`,
+      size: imagesize(file)
+    };
+    res.send({ ...image });
+  } catch (e2) {
+    res.send({ error: e2.message || e2 });
+  }
+}
+export {
+  api
+};

package/routes/termdb.config.js

@@ -219,6 +219,7 @@ function addNonDictionaryQueries(c, ds, genome) {
         sampleColumns: q.singleCell.samples.sampleColumns,
         experimentColumns: q.singleCell.samples.experimentColumns
       },
+      images: q.singleCell.images,
       data: {
         sameLegend: q.singleCell.data.sameLegend,
         refName: q.singleCell.data.refName,

package/routes/termdb.singlecellSamples.js

@@ -76,6 +76,17 @@ async function validate_query_singleCell(ds, genome) {
   if (q.DEgenes) {
     validate_query_singleCell_DEgenes(ds);
   }
+  if (q.images) {
+    validateImages(q.images);
+  }
+}
+function validateImages(images) {
+  if (!images.folder)
+    throw "images.folder missing";
+  if (!images.label)
+    images.label = "Images";
+  if (!images.fileName)
+    throw "images.fileName missing";
 }
 async function validateSamplesNative(S, D, ds) {
   const samples = /* @__PURE__ */ new Map();