filecoin-project/slate
1
1
Fork 0
mirror of https://github.com/filecoin-project/slate.git synced 2024-12-24 09:33:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

buckets: elegant failure modes for bucket getOrCreate failures

Browse Source
This commit is contained in:
@wwwjim 2020-09-22 00:01:48 -07:00
parent 50e62a40be
commit 7b10703821
9 changed files with 89 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node_common/managers/viewer.js
View File

@ -122,6 +122,10 @@ export const getTextileById = async ({ id }) => {
bucketRoot,
} = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api, user);
if (!buckets) {
return null;
}
const {
power,
powerInfo,

38
node_common/upload-fs.js
View File

@ -54,15 +54,20 @@ export const formMultipart = (req, res, { user }) =>
const data = LibraryManager.createLocalDataIncomplete(target);
// TODO(jim): Put this call into a file for all Textile related calls.
let { buckets, bucketKey } = await Utilities.getBucketAPIFromUserToken(
user.data.tokens.api,
user
);
if (!buckets) {
return reject({
decorator: "SERVER_BUCKETS_INIT_ISSUE",
error: true,
});
}
let push;
try {
const {
buckets,
bucketKey,
} = await Utilities.getBucketAPIFromUserToken(
user.data.tokens.api,
user
);
push = await buckets.pushPath(bucketKey, data.name, readStream);
} catch (e) {
await FS.unlinkSync(tempPath);
@ -77,18 +82,23 @@ export const formMultipart = (req, res, { user }) =>
// Delete temporary local file,
await FS.unlinkSync(tempPath);
let { buckets, bucketKey } = await Utilities.getBucketAPIFromUserToken(
user.data.tokens.api,
user
);
if (!buckets) {
return reject({
decorator: "SERVER_BUCKETS_INIT_ISSUE",
error: true,
});
}
// NOTE(jim)
// Get remote file size from bucket.
// TODO(jim): Put this call into a file for all Textile related calls.
let ipfs = push.path.path;
try {
const {
buckets,
bucketKey,
} = await Utilities.getBucketAPIFromUserToken(
user.data.tokens.api,
user
);
const newUpload = await buckets.listIpfsPath(ipfs);
data.size = newUpload.size;
} catch (e) {

32
node_common/upload.js
View File

@ -28,14 +28,24 @@ export const formMultipart = async (req, res, { user }) => {
type: mime,
});
const token = user.data.tokens.api;
const {
buckets,
bucketKey,
} = await Utilities.getBucketAPIFromUserToken(token, user);
if (!buckets) {
return reject({
decorator: "SERVER_BUCKET_INIT_FAILURE",
error: true,
});
}
let push;
try {
const token = user.data.tokens.api;
const {
buckets,
bucketKey,
} = await Utilities.getBucketAPIFromUserToken(token, user);
console.log("[upload] pushing to textile");
push = await buckets.pushPath(bucketKey, data.id, stream);
console.log("[upload] finished pushing to textile");
} catch (e) {
Social.sendTextileSlackMessage({
file: "/node_common/upload.js",
@ -84,9 +94,17 @@ export const formMultipart = async (req, res, { user }) => {
}
// TODO(jim): Put this call into a file for all Textile related calls.
const token = user.data.tokens.api;
const { buckets } = await Utilities.getBucketAPIFromUserToken(token, user);
if (!buckets) {
return {
decorator: "SERVER_BUCKET_INIT_FAILURE",
error: true,
};
}
try {
const token = user.data.tokens.api;
const { buckets } = await Utilities.getBucketAPIFromUserToken(token, user);
const newUpload = await buckets.listIpfsPath(response.data);
data.size = newUpload.size;
} catch (e) {

4
node_common/utilities.js
View File

@ -130,6 +130,7 @@ export const getBucketAPIFromUserToken = async (token, user) => {
// TODO(jim): Put this call into a file for all Textile related calls.
let target;
console.log(`[buckets] getOrCreate`);
try {
target = await buckets.getOrCreate(BUCKET_NAME);
} catch (e) {
@ -141,8 +142,9 @@ export const getBucketAPIFromUserToken = async (token, user) => {
functionName: `buckets.getOrCreate`,
});
return null;
return { buckets: null, bucketKey: null, bucketRoot: null };
}
console.log(`[buckets] getOrCreate succes!`);
return {
buckets,

7
pages/api/data/archive.js
View File

@ -35,6 +35,13 @@ export default async (req, res) => {
bucketRoot,
} = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api, user);
if (!buckets) {
return res.status(500).send({
decorator: "SERVER_BUCKET_INIT_FAILURE",
error: true,
});
}
// bucketRoot.root.key
// bucketRoot.root.path

6
pages/api/data/get.js
View File

@ -26,6 +26,12 @@ export default async (req, res) => {
bucketName,
} = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api, user);
if (!buckets) {
return res
.status(500)
.send({ decorator: "SERVER_GET_BUCKET_INIT", error: true });
}
// TODO(jim): Put this call into a file for all Textile related calls.
let r = null;
try {

7
pages/api/data/remove-multiple.js
View File

@ -54,6 +54,13 @@ export default async (req, res) => {
bucketName,
} = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api, user);
if (!buckets) {
return res.status(500).send({
decorator: "SERVER_BUCKET_INIT_FAILURE",
error: true,
});
}
// TODO(jim): Put this call into a file for all Textile related calls.
let r = null;
try {

7
pages/api/data/remove.js
View File

@ -51,6 +51,13 @@ export default async (req, res) => {
bucketName,
} = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api, user);
if (!buckets) {
return res.status(500).send({
decorator: "SERVER_BUCKET_INIT_FAILURE",
error: true,
});
}
// TODO(jim): Put this call into a file for all Textile related calls.
let r = null;
try {

6
pages/api/users/create.js
View File

@ -54,6 +54,12 @@ export default async (req, res) => {
username: newUsername,
});
if (!buckets) {
return res
.status(500)
.send({ decorator: "SERVER_BUCKET_INIT_FAILURE", error: true });
}
const user = await Data.createUser({
password: hash,
salt,