Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uniform error handling in SciServer Files. Fixes #1665 #1666

Merged
merged 2 commits into from
Apr 20, 2020
Merged

Uniform error handling in SciServer Files. Fixes #1665 #1666

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b427ee
Uniform error handling in SciServer Files. Fixes #1665
brollb Apr 20, 2020
06e5ae2
WIP Add action name to `stat`
brollb Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/common/storage/backends/sciserver-files/Client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ define([
SciServerFiles.prototype.getFile = async function (dataInfo) {
let {volume, filename, volumePool='Storage'} = dataInfo.data;
const url = `file/${volumePool}/${volume}/${filename}`;
const response = await this.fetch(url);
const response = await this.fetch('download', url);
if (require.isBrowser) {
return await response.arrayBuffer();
} else {
Expand All @@ -39,12 +39,7 @@ define([
};

const url = `file/${this.volumePool}/${this.volume}/${filename}`;
try{
await this.fetch(url, opts);
} catch (errRes) {
const contents = await errRes.json();
throw new Error(`SciServerFiles.putFile failed: ${JSON.stringify(contents)}`);
}
await this.fetch('upload', url, opts, 'upload');
const metadata = {
filename: filename,
volume: this.volume,
Expand All @@ -57,14 +52,14 @@ define([
SciServerFiles.prototype.deleteDir = async function (dirname) {
const url = `data/${this.volumePool}/${this.volume}/${dirname}`;
const opts = {method: 'DELETE'};
return await this.fetch(url, opts);
return await this.fetch('delete directory', url, opts);
};

SciServerFiles.prototype.deleteFile = async function (dataInfo) {
const {volume, filename, volumePool} = dataInfo.data;
const url = `data/${volumePool}/${volume}/${filename}`;
const opts = {method: 'DELETE'};
return await this.fetch(url, opts);
return await this.fetch('delete', url, opts);
};

SciServerFiles.prototype.getMetadata = async function (dataInfo) {
Expand All @@ -77,11 +72,25 @@ define([
return `${this.id}/${volume}/${filename}`;
};

SciServerFiles.prototype.fetch = async function (url, opts = {}) {
SciServerFiles.prototype.fetch = async function (action, url, opts = {}) {
const token = await login(this.username, this.password);
opts.headers = opts.headers || {};
opts.headers['X-Auth-Token'] = token;
return StorageClient.prototype.fetch.call(this, url, opts);
try {
return StorageClient.prototype.fetch.call(this, url, opts);
} catch (errRes) {
const err = await this.getErrorMsg(errRes);
throw new Error(`SciServerFiles ${action} failed: ${err}`);
}
};

SciServerFiles.prototype.getErrorMsg = async function (response) {
try {
const contents = await response.json();
return JSON.stringify(contents);
} catch (err) {
return await response.text();
}
};

SciServerFiles.prototype.getURL = function (url) {
Expand All @@ -96,7 +105,7 @@ define([
const filename = splitPath.pop();
const parentDir = splitPath.join('/');
const url = `jsontree/${this.volumePool}/${this.volume}/${parentDir}?level=2`;
const response = await this.fetch(url);
const response = await this.fetch('stat', url);
const files = (await response.json()).root.files || [];
const metadata = files.find(file => file.name === filename);
if(metadata) {
Expand Down