enh: merging everything in a single endpoint

anibalsolon · May 8, 2022 · 39801fa · 39801fa
1 parent cd81bf5
commit 39801fa
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 211 deletions.
diff --git a/extension-vscode/provider.ts b/extension-vscode/provider.ts
diff --git a/extension-web/index.ts b/extension-web/index.ts
diff --git a/extension/fileserver.ts b/extension/fileserver.ts
diff --git a/extension-vscode/index.ts → extension/index.ts b/extension-vscode/index.ts → extension/index.ts
diff --git a/extension-web/provider.ts → extension/provider.ts b/extension-web/provider.ts → extension/provider.ts
@@ -47,7 +47,6 @@ export class NiftiEditorProvider implements vscode.CustomReadonlyEditorProvider<
     webviewPanel.webview.onDidReceiveMessage(async (e) => {
       if (e.type === 'ready') {
 
-        // TODO is there a way to simplify this?
         const stream = await document.data(0, 1);
         const chunks = [];
         for await (const chunk of stream) {
@@ -88,7 +87,6 @@ export class NiftiEditorProvider implements vscode.CustomReadonlyEditorProvider<
     });
     const html = await vscode.workspace.fs.readFile(uri);
     return Buffer.from(html).toString('utf8')
-      .replace(/\$\{webview\.cspSource\}/g, webview.cspSource)
       .replace(/\$\{scriptUri\}/g, scriptUri.toString());
   }
 }

diff --git a/webpack.config.js b/webpack.config.js
@@ -51,7 +51,7 @@ const extension = {
   ...general,
   target: 'node',
   entry: {
-    'extension-vscode': './extension-vscode/index.ts',
+    'extension-vscode': './extension/index.ts',
   },
   output: {
     ...general.output,
@@ -63,7 +63,7 @@ const webextension = {
   ...general,
   target: 'webworker',
   entry: {
-    'extension-web': './extension-web/index.ts',
+    'extension-web': './extension/index.ts',
   },
   output: {
     ...general.output,

diff --git a/webview/nifti/index.ts b/webview/nifti/index.ts
@@ -134,6 +134,8 @@ window.addEventListener('message', async (e) => {
         const header = body.header;
         let data = body.data;
 
+        console.log(data);
+
         const infoEl = document.getElementById('info');
         if (!infoEl) {
           return;
@@ -147,12 +149,6 @@ window.addEventListener('message', async (e) => {
         }
 
         message(messageEl, 'Loading');
-
-        if (!data) {
-          const res = await fetch(`${ws}${uuid}`);
-          const image = await res.arrayBuffer();
-          data = new Int16Array(image);
-        }
         prepareRender(ws, uuid, { header, data });
       }
       break;