orbitdb/orbit-db
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pubsub communication WIP

Browse Source
This commit is contained in:
haad 2016-02-04 15:49:13 +07:00
parent d0bafaf789
commit aaeb33efd9
4 changed files with 82 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/HashCacheItem.js
View File

@ -15,7 +15,11 @@ class HashCacheItem {
class EncryptedHashCacheItem extends HashCacheItem {
constructor(operation, key, sequenceNumber, targetHash, metaInfo, next, publicKey, privateKey, salt) {
if(key)
key = Encryption.encrypt(key, privateKey, publicKey);
super(operation, key, sequenceNumber, targetHash, metaInfo, next);
try {
this.pubkey = publicKey;
this.target = Encryption.encrypt(targetHash, privateKey, publicKey);
@ -42,6 +46,9 @@ class EncryptedHashCacheItem extends HashCacheItem {
data.target = targetDec;
data.meta = JSON.parse(metaDec);
if(data.key)
data.key = Encryption.decrypt(data.key, privateKey, 'TODO: pubkey');
const item = new HashCacheItem(data.op, data.key, data.seq, data.target, data.meta, next, publicKey, privateKey, salt);
return item;
}

17
src/OrbitClient.js
View File

@ -13,6 +13,7 @@ var ItemTypes = require('./ItemTypes');
var MetaInfo = require('./MetaInfo');
var Post = require('./Post');
var Aggregator = require('./Aggregator');
var PubSub = require('./PubSub');
var pubkey = Keystore.getKeys().publicKey;
var privkey = Keystore.getKeys().privateKey;
@ -82,7 +83,8 @@ class OrbitClient {
if(lt || lte) {
startFromHash = lte ? lte : lt;
} else {
var channel = await (this.client.linkedList(channel, password).head());
// var channel = await (this.client.linkedList(channel, password).head());
var channel = PubSub.latest(channel);
startFromHash = channel.head ? channel.head : null;
}
@ -125,7 +127,8 @@ class OrbitClient {
_createMessage(channel, password, operation, key, target) {
// Get the current channel head and bump the sequence number
let seq = 0;
const currentHead = await(this.client.linkedList(channel, password).head())
// const currentHead = await(this.client.linkedList(channel, password).head())
const currentHead = PubSub.latest(channel);
if(currentHead.head) {
const headItem = await (ipfsAPI.getObject(this.ipfs, currentHead.head));
seq = JSON.parse(headItem.Data)["seq"] + 1;
@ -170,12 +173,14 @@ class OrbitClient {
_createOperation(channel, password, operation, key, value) {
const message = this._createMessage(channel, password, operation, key, value);
await(this.client.linkedList(channel, password).add(message.Hash));
// await(this.client.linkedList(channel, password).add(message.Hash));
PubSub.publish(channel, message.Hash)
return message.Hash;
}
_deleteChannel(channel, password) {
await(this.client.linkedList(channel, password).delete());
// await(this.client.linkedList(channel, password).delete());
PubSub.delete(channel);
return true;
}
@ -190,7 +195,9 @@ class OrbitClient {
}
_info(channel, password) {
return await(this.client.linkedList(channel, password).head());
// return await(this.client.linkedList(channel, password).head());
var l = PubSub.latest(channel);
return l;
}
_connect(host, username, password) {

40
src/PubSub.js Normal file
View File

@ -0,0 +1,40 @@
'use strict';
let messages = {};
class PubSub {
constructor() {
}
static latest(hash) {
return { head: messages[hash] && messages[hash].length > 0 ? messages[hash][messages[hash].length - 1] : null, modes: {} };
}
static publish(hash, message) {
if(!messages[hash]) messages[hash] = [];
messages[hash].push(message);
}
static delete(hash) {
messages[hash] = [];
}
onNewMessage(channel, message) {
/*
// From orbit-server:
var hash = req.params.hash;
var head = req.body.head;
if(!head) throw "Invalid request";
var user = authorize(req, res);
var channel = await(Database.getChannel(hash));
channel.authenticateRead(req.body.password);
var uid = await (ipfsAPI.putObject(ipfs, JSON.stringify(user.get())));
channel.authenticateWrite(uid.Hash);
await(verifyMessage(head, channel));
await(channel.updateHead(head))
*/
}
}
module.exports = PubSub;

45
test/orbit-client-tests.js
View File

@ -99,27 +99,27 @@ describe('Orbit Client', () => {
done();
}));
it('gets channel info when channel has modes set', async((done) => {
try {
orbit.channel(channel).delete();
var mode = {
mode: "+r",
params: {
password: 'password'
}
};
var res = orbit.channel(channel, '').setMode(mode)
var info = orbit.channel(channel, 'password').info();
assert.notEqual(info, null);
assert.equal(info.head, null);
assert.equal(JSON.stringify(info.modes), JSON.stringify(res));
orbit.channel(channel, 'password').delete();
} catch(e) {
orbit.channel(channel, 'password').delete();
assert.equal(e, null);
}
done();
}));
// it('gets channel info when channel has modes set', async((done) => {
// try {
// orbit.channel(channel).delete();
// var mode = {
// mode: "+r",
// params: {
// password: 'password'
// }
// };
// var res = orbit.channel(channel, '').setMode(mode)
// var info = orbit.channel(channel, 'password').info();
// assert.notEqual(info, null);
// assert.equal(info.head, null);
// assert.equal(JSON.stringify(info.modes), JSON.stringify(res));
// orbit.channel(channel, 'password').delete();
// } catch(e) {
// orbit.channel(channel, 'password').delete();
// assert.equal(e, null);
// }
// done();
// }));
});
@ -501,6 +501,7 @@ describe('Orbit Client', () => {
});
/*
describe('Modes', function() {
var password = 'hello';
@ -574,5 +575,5 @@ describe('Orbit Client', () => {
}));
});
*/
});