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

Merge pull request #316 from filecoin-project/andrew/skip-getOrCreate

Browse Source 
fix(api): directly use thread client to generate bucket thread if not exit
This commit is contained in:
CAKE 2020-09-22 18:07:05 -07:00 committed by GitHub
commit 0e5a2b089d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
node_common/utilities.js
View File

@ -6,7 +6,7 @@ import * as Social from "~/node_common/social";
import JWT from "jsonwebtoken"; import JWT from "jsonwebtoken";
import BCrypt from "bcrypt"; import BCrypt from "bcrypt";
import { Buckets, PrivateKey, Pow } from "@textile/hub"; import { Buckets, PrivateKey, Pow, Client, ThreadID } from "@textile/hub";
const BUCKET_NAME = "data"; const BUCKET_NAME = "data";
@ -27,8 +27,22 @@ export const checkTextile = async () => {
if (response.status === 204) { if (response.status === 204) {
return true; return true;
} }
Social.sendTextileSlackMessage({
file: "/node_common/utilities.js",
user: { username: "UNDEFINED" },
message: "https://slate.textile.io/health is down",
code: "N/A",
functionName: `checkTextile`,
});
} catch (e) { } catch (e) {
console.log(e); Social.sendTextileSlackMessage({
file: "/node_common/utilities.js",
user: { username: "UNDEFINED" },
message: e.message,
code: e.code,
functionName: `checkTextile`,
});
} }
return false; return false;
@ -127,12 +141,37 @@ export const getBucketAPIFromUserToken = async (token, user) => {
const identity = await PrivateKey.fromString(token); const identity = await PrivateKey.fromString(token);
const buckets = await Buckets.withKeyInfo(TEXTILE_KEY_INFO); const buckets = await Buckets.withKeyInfo(TEXTILE_KEY_INFO);
await buckets.getToken(identity); await buckets.getToken(identity);
let root;
// TODO(jim): Put this call into a file for all Textile related calls. // TODO(jim): Put this call into a file for all Textile related calls.
let target;
console.log(`[buckets] getOrCreate`); console.log(`[buckets] getOrCreate`);
try { try {
target = await buckets.getOrCreate(BUCKET_NAME); // Create a threads client
const client = new Client(buckets.context);
try {
// Get a default thread to store our buckets
const res = await client.getThread("buckets");
buckets.withThread(res.id.toString());
console.log(`[buckets] getThread success`);
} catch (error) {
if (error.message !== "Thread not found") {
throw new Error(error.message);
}
const newId = ThreadID.fromRandom();
await client.newDB(newId, "buckets");
const threadID = newId.toString();
buckets.withThread(threadID);
console.log(`[buckets] newDB success`);
}
const roots = await buckets.list();
root = roots.find((bucket) => bucket.name === BUCKET_NAME);
if (!root) {
const created = await buckets.create(BUCKET_NAME);
root = created.root;
}
} catch (e) { } catch (e) {
Social.sendTextileSlackMessage({ Social.sendTextileSlackMessage({
file: "/node_common/utilities.js", file: "/node_common/utilities.js",
@ -144,12 +183,12 @@ export const getBucketAPIFromUserToken = async (token, user) => {
return { buckets: null, bucketKey: null, bucketRoot: null }; return { buckets: null, bucketKey: null, bucketRoot: null };
} }
console.log(`[buckets] getOrCreate succes!`);
console.log(`[buckets] getOrCreate success!`);
return { return {
buckets, buckets,
bucketKey: target.root.key, bucketKey: root.key,
bucketRoot: target, bucketRoot: root,
bucketName: BUCKET_NAME, bucketName: BUCKET_NAME,
}; };
}; };