Mirroristas/orbitdb
2
0
Fork 0
mirror of https://github.com/orbitdb/orbitdb.git synced 2025-05-19 21:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move aggregation to its own class

Browse Source
This commit is contained in:
haad 2016-01-21 11:55:05 +08:00
parent d66e3880d8
commit eff1b3a960
2 changed files with 88 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/Aggregator.js Normal file
View File

@ -0,0 +1,83 @@
'use strict';
var async = require('asyncawait/async');
var await = require('asyncawait/await');
var ipfsAPI = require('./ipfs-api-promised');
var HashCache = require('./HashCacheClient');
var HashCacheItem = require('./HashCacheItem').EncryptedHashCacheItem;
var HashCacheOps = require('./HashCacheItem').HashCacheOps;
var Keystore = require('./Keystore');
var Encryption = require('./Encryption');
var pubkey = Keystore.getKeys().publicKey;
var privkey = Keystore.getKeys().privateKey;
class Aggregator {
static fetchRecursive(ipfs, hash, password, options, currentDepth, deleted) {
const opts = {
amount: options.amount ? options.amount : 1,
last: options.last ? options.last : null,
key: options.key ? options.key : null
};
let res = [];
let handledItems = deleted ? deleted : [];
if(!currentDepth) currentDepth = 0;
const item = await (this._fetchOne(ipfs, hash, password));
if(item) {
if(item.op === HashCacheOps.Delete) {
handledItems.push(item.target);
} else if(item.op === HashCacheOps.Add && !this._contains(handledItems, hash)) {
res.push({ hash: hash, item: item });
currentDepth ++;
} else if(item.op === HashCacheOps.Put && !this._contains(handledItems, item.key)) {
if(!opts.key || opts.key && opts.key === item.key) {
res.push({ hash: hash, item: item });
currentDepth ++;
handledItems.push(item.key);
}
}
if(opts.key && item.key === opts.key)
return res;
if(opts.last && hash === opts.last)
return res;
if(!opts.last && opts.amount > -1 && currentDepth >= opts.amount)
return res;
if(item.next) {
const next = this.fetchRecursive(ipfs, item.next, password, opts, currentDepth, handledItems);
res = res.concat(next);
}
}
return res;
}
static _fetchOne(ipfs, hash, password) {
let data = await (ipfsAPI.getObject(ipfs, hash));
let item = HashCacheItem.fromEncrypted(data, pubkey, privkey, password);
// TODO: add possibility to fetch content separately
// fetch and decrypt content
if(item.op === HashCacheOps.Add || item.op === HashCacheOps.Put) {
const payload = await (ipfsAPI.getObject(ipfs, item.target));
const contentEnc = JSON.parse(payload.Data)["content"];
const contentDec = Encryption.decrypt(contentEnc, privkey, 'TODO: pubkey');
item.Payload = contentDec;
}
return item;
}
static _contains(src, e) {
return src.filter((f) => f.toString() === e.toString()).length > 0;
}
}
module.exports = Aggregator;

79
src/OrbitClient.js
View File

@ -7,10 +7,11 @@ var ipfsAPI = require('./ipfs-api-promised');
var HashCache = require('./HashCacheClient');
var HashCacheItem = require('./HashCacheItem').EncryptedHashCacheItem;
var HashCacheOps = require('./HashCacheItem').HashCacheOps;
var MetaInfo = require('./MetaInfo');
var ItemTypes = require('./ItemTypes');
var Keystore = require('./Keystore');
var MetaInfo = require('./MetaInfo');
var Post = require('./Post');
var Aggregator = require('./Aggregator');
var Keystore = require('./Keystore');
var Encryption = require('./Encryption');
var pubkey = Keystore.getKeys().publicKey;
@ -94,7 +95,8 @@ class OrbitClient {
last: gte ? gte : gt,
key: key
};
messages = this._fetchRecursive(startFromHash, password, opts);
// messages = this._fetchRecursive(startFromHash, password, opts);
messages = Aggregator.fetchRecursive(this.ipfs, startFromHash, password, opts);
// Slice the array
let startIndex = 0;
@ -114,77 +116,6 @@ class OrbitClient {
return messages;
}
_fetchOne(hash, password) {
let data = await (ipfsAPI.getObject(this.ipfs, hash));
let item = HashCacheItem.fromEncrypted(data, pubkey, privkey, password);
// TODO: add possibility to fetch content separately
// fetch and decrypt content
if(item.op === HashCacheOps.Add || item.op === HashCacheOps.Put) {
const payload = await (ipfsAPI.getObject(this.ipfs, item.target));
const contentEnc = JSON.parse(payload.Data)["content"];
const contentDec = Encryption.decrypt(contentEnc, privkey, 'TODO: pubkey');
item.Payload = contentDec;
}
return item;
}
// TEMP
_contains(src, e) {
let contains = false;
src.forEach((a) => {
if(a.toString() === e.toString()) contains = true;
});
return contains;
}
_fetchRecursive(hash, password, options, currentDepth, deleted) {
const opts = {
amount: options.amount ? options.amount : 1,
last: options.last ? options.last : null,
key: options.key ? options.key : null
};
let res = [];
let handledItems = deleted ? deleted : [];
if(!currentDepth) currentDepth = 0;
const item = await (this._fetchOne(hash, password));
if(item) {
if(item.op === HashCacheOps.Delete) {
handledItems.push(item.target);
} else if(item.op === HashCacheOps.Add && !this._contains(handledItems, hash)) {
res.push({ hash: hash, item: item });
currentDepth ++;
} else if(item.op === HashCacheOps.Put && !this._contains(handledItems, item.key)) {
if(!opts.key || opts.key && opts.key === item.key) {
res.push({ hash: hash, item: item });
currentDepth ++;
handledItems.push(item.key);
}
}
if(opts.key && item.key === opts.key)
return res;
if(opts.last && hash === opts.last)
return res;
if(!opts.last && opts.amount > -1 && currentDepth >= opts.amount)
return res;
if(item.next) {
const next = this._fetchRecursive(item.next, password, opts, currentDepth, handledItems);
res = res.concat(next);
}
}
return res;
}
_publish(data) {
let post = new Post(data);
post.encrypt(privkey, pubkey);