use Google reader for gs:// URLs

weng-lab · Jul 18, 2019 · 2b7f755 · 2b7f755
1 parent 544c0e5
commit 2b7f755
Show file tree

Hide file tree

Showing 4 changed files with 562 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@types/graphql": "^14.2.0",
     "apollo-server-express": "^2.0.6",
-    "bigwig-reader": "^1.0.7",
+    "bigwig-reader": "^1.0.23",
     "express": "^4.16.3",
     "graphql": "^14.0.0"
   },

diff --git a/src/models/bigwigModel.ts b/src/models/bigwigModel.ts
@@ -6,6 +6,7 @@ export interface BigRequest {
     end: number;
     zoomLevel?: number;
     preRenderedWidth?: number;
+    googleProject?: string;
 }
 
 export interface BigError {

diff --git a/src/resolvers/bigwigResolver.ts b/src/resolvers/bigwigResolver.ts
@@ -1,5 +1,5 @@
 import { GraphQLScalarType } from "graphql";
-import { AxiosDataLoader, BigWigReader, HeaderData, FileType, ZoomLevelHeader } from "bigwig-reader";
+import { AxiosDataLoader, GoogleBucketDataLoader, BigWigReader, HeaderData, FileType, ZoomLevelHeader } from "bigwig-reader";
 import { BigResponse, BigResponseData, BigRequest, BigZoomData, PreRenderedBigWigData, BigWigData } from "../models/bigwigModel";
 
 /**
@@ -98,7 +98,13 @@ async function condensedZoomData(data: BigZoomData[], preRenderedWidth: number,
  * @param request the BigRequest to handle.
  */
 async function bigRequest(request: BigRequest): Promise<BigResponse> {
-    const loader = new AxiosDataLoader(request.url);
+    const loader = request.url.startsWith("gs://") ? (
+	new GoogleBucketDataLoader(
+	    request.url.split("gs://")[1].split('/')[0],
+	    request.url.split("gs://")[1].split('/').slice(1).join('/'),
+	    request.googleProject
+	)
+    ) : new AxiosDataLoader(request.url);
     const reader = new BigWigReader(loader);
     const header: HeaderData = await reader.getHeader();
     const zoomLevelIndex = getClosestZoomLevelIndex(request.zoomLevel, header.zoomLevelHeaders);