mirror of
https://github.com/orbitdb/orbitdb.git
synced 2025-06-22 14:02:30 +00:00
Pubsub proto (WIP)
This commit is contained in:
haad
parent
bfb7dfc311
commit
c39c8a9983
@ -8,12 +8,22 @@ var host = 'localhost:3006';
|
||||
var username = 'testrunner';
|
||||
var password = '';
|
||||
|
||||
var util = require('util');
|
||||
var exec = require('child_process').exec;
|
||||
|
||||
function clear(cb){
|
||||
exec('clear', function(error, stdout, stderr){
|
||||
util.puts(stdout);
|
||||
cb();
|
||||
});
|
||||
}
|
||||
|
||||
let run = (async(() => {
|
||||
try {
|
||||
// Connect
|
||||
var orbit = OrbitClient.connect(host, username, password);
|
||||
|
||||
var timer = new Timer(true);
|
||||
/* var timer = new Timer(true);
|
||||
|
||||
console.log("-------- KV store -------")
|
||||
var channel = 'keyspace1'
|
||||
@ -49,10 +59,44 @@ let run = (async(() => {
|
||||
return { key: e.item.key, val: e.item.Payload };
|
||||
});
|
||||
console.log(JSON.stringify(items, null, 2));
|
||||
*/
|
||||
const id = 'a';
|
||||
const c1 = 'c1';
|
||||
const cc = orbit.channel(c1);
|
||||
|
||||
let i = 0;
|
||||
let running = false;
|
||||
let missCount = 0;
|
||||
setInterval(async(() => {
|
||||
orbit.channel(c1).add("hello at " + new Date().getTime());
|
||||
}), 1234);
|
||||
if(!running) {
|
||||
let timer = new Timer(true);
|
||||
running = true;
|
||||
// orbit.channel(c1).add("hello at #" + i);
|
||||
cc.add(id + i);
|
||||
i ++;
|
||||
console.log(`Insert took ${timer.stop(true)} ms`);
|
||||
|
||||
let timer2 = new Timer(true);
|
||||
var items = cc.iterator({ limit: 10 }).collect();
|
||||
console.log("Iterator took " + timer2.stop(true) + " ms");
|
||||
items = items.map((e) => {
|
||||
return e.item;
|
||||
});
|
||||
|
||||
var g = items.filter((e) => e.Payload.startsWith(id))
|
||||
var prev = -1;
|
||||
g.reverse().forEach((e) => {
|
||||
var a = parseInt(e.Payload.replace(id, ''));
|
||||
if(prev > -1 && prev + 1 !== a) {
|
||||
console.log("Missing message: " + id, prev + 1)
|
||||
}
|
||||
prev = a;
|
||||
})
|
||||
console.log(JSON.stringify(items.map((e) => e.seq + " - " + e.Payload), null, 2));
|
||||
// console.log("\n\n");
|
||||
running = false;
|
||||
}
|
||||
}), 50);
|
||||
/*
|
||||
// You can also get the event based on its hash
|
||||
var value = orbit.channel(c1).get(hash2);
|
||||
|
||||
@ -5,12 +5,12 @@ var OrbitClient = require('../src/OrbitClient');
|
||||
var Timer = require('./Timer');
|
||||
|
||||
var host = 'localhost:3006';
|
||||
var username = 'testrunner';
|
||||
var username = 'LambOfGod';
|
||||
var password = '';
|
||||
|
||||
let run = (async(() => {
|
||||
try {
|
||||
var channel = 'hello-world-test1'
|
||||
/* var channel = 'hello-world-test1'
|
||||
|
||||
// Connect
|
||||
var orbit = OrbitClient.connect(host, username, password);
|
||||
@ -51,6 +51,47 @@ let run = (async(() => {
|
||||
// orbit.channel(channel, '').remove(items[items.length - 10].hash); // 11
|
||||
// orbit.channel(channel, '').remove(items[items.length - 9].hash); // 10
|
||||
// orbit.channel(channel, '').remove(items[items.length - 8].hash); // 9
|
||||
*/
|
||||
|
||||
var orbit = OrbitClient.connect(host, username, password);
|
||||
const c1 = 'c1';
|
||||
const cc = orbit.channel(c1);
|
||||
|
||||
let i = 0;
|
||||
let running = false;
|
||||
setInterval(async(() => {
|
||||
try {
|
||||
if(!running) {
|
||||
let timer = new Timer(true);
|
||||
running = true;
|
||||
|
||||
cc.add("b" + i);
|
||||
|
||||
let items = cc.iterator({ limit: 10 }).collect();
|
||||
|
||||
var g = items.filter((e) => e.item.Payload.startsWith('b'))
|
||||
var prev = -1;
|
||||
g.reverse().forEach((e) => {
|
||||
var a = parseInt(e.item.Payload.replace('b', ''));
|
||||
if(prev > -1 && prev + 1 !== a) {
|
||||
console.log("MISSSS!!!", prev + 1)
|
||||
}
|
||||
prev = a;
|
||||
})
|
||||
|
||||
items = items.map((e) => {
|
||||
return e.item.seq + " - " + e.item.Payload;
|
||||
});
|
||||
console.log(JSON.stringify(items, null, 2));
|
||||
console.log(`Query took ${timer.stop(true)} ms`);
|
||||
running = false;
|
||||
}
|
||||
// console.log("\n\n");
|
||||
} catch(e) {
|
||||
console.error(e);
|
||||
}
|
||||
i ++;
|
||||
}), 100);
|
||||
|
||||
} catch(e) {
|
||||
console.error("error:", e);
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
"bluebird": "^3.1.1",
|
||||
"bs58": "^3.0.0",
|
||||
"orbit-common": "^0.1.0",
|
||||
"redis": "^2.4.2",
|
||||
"unirest": "^0.4.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@ -18,6 +18,8 @@ var PubSub = require('./PubSub');
|
||||
var pubkey = Keystore.getKeys().publicKey;
|
||||
var privkey = Keystore.getKeys().privateKey;
|
||||
|
||||
let vvv = {};
|
||||
|
||||
class OrbitClient {
|
||||
constructor(ipfs) {
|
||||
this.ipfs = ipfs;
|
||||
@ -28,14 +30,7 @@ class OrbitClient {
|
||||
channel(hash, password) {
|
||||
if(password === undefined) password = '';
|
||||
|
||||
this._pubsub.subscribe(hash, password, (channel, message) => {
|
||||
const m = this._getMessages(hash, password, { gte: message });
|
||||
m.forEach((e) => {
|
||||
const userData = await(ipfsAPI.getObject(this.ipfs, e.item.meta.from))
|
||||
const user = JSON.parse(userData.Data)["user"];
|
||||
console.log(`${user}>`, e.item.Payload, `(op: ${e.item.op}, ${e.item.key})`);
|
||||
});
|
||||
});
|
||||
this._pubsub.subscribe(hash, password);
|
||||
|
||||
return {
|
||||
info: (options) => this._info(hash, password),
|
||||
@ -92,11 +87,8 @@ class OrbitClient {
|
||||
let startFromHash;
|
||||
if(lte || lt) {
|
||||
startFromHash = lte ? lte : lt;
|
||||
} else if (gte || gt) {
|
||||
startFromHash = gte ? gte : gt;
|
||||
} else {
|
||||
// var channel = await (this.client.linkedList(channel, password).head());
|
||||
var channel = this._pubsub.latest(channel);
|
||||
var channel = this._info(channel, password);
|
||||
startFromHash = channel.head ? channel.head : null;
|
||||
}
|
||||
|
||||
@ -137,19 +129,13 @@ 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 = this._pubsub.latest(channel);
|
||||
if(currentHead.head) {
|
||||
const headItem = await (ipfsAPI.getObject(this.ipfs, currentHead.head));
|
||||
seq = JSON.parse(headItem.Data)["seq"] + 1;
|
||||
}
|
||||
|
||||
// Create meta info
|
||||
const size = -1;
|
||||
const metaInfo = new MetaInfo(ItemTypes.Message, size, this.user.id, new Date().getTime());
|
||||
|
||||
// Get the current channel head and bump the sequence number
|
||||
let seq = this._info(channel, password).seq + 1;
|
||||
|
||||
// Create the hash cache item
|
||||
const hcItem = new HashCacheItem(operation, key, seq, target, metaInfo, null, pubkey, privkey, password);
|
||||
|
||||
@ -159,7 +145,7 @@ class OrbitClient {
|
||||
|
||||
// If this is not the first item in the channel, patch with the previous (ie. link as next)
|
||||
if(seq > 0)
|
||||
newHead = await (ipfsAPI.patchObject(this.ipfs, data.Hash, currentHead.head));
|
||||
newHead = await (ipfsAPI.patchObject(this.ipfs, data.Hash, this._info(channel, password).head));
|
||||
|
||||
return newHead;
|
||||
}
|
||||
@ -168,13 +154,13 @@ class OrbitClient {
|
||||
_add(channel, password, data) {
|
||||
const post = this._publish(data);
|
||||
const key = post.Hash;
|
||||
this._createOperation(channel, password, HashCacheOps.Add, key, post.Hash);
|
||||
await(this._createOperation(channel, password, HashCacheOps.Add, key, post.Hash));
|
||||
return key;
|
||||
}
|
||||
|
||||
_put(channel, password, key, data) {
|
||||
const post = this._publish(data);
|
||||
return this._createOperation(channel, password, HashCacheOps.Put, key, post.Hash);
|
||||
return await(this._createOperation(channel, password, HashCacheOps.Put, key, post.Hash));
|
||||
}
|
||||
|
||||
_remove(channel, password, options) {
|
||||
@ -184,15 +170,18 @@ 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));
|
||||
this._pubsub.publish(channel, message.Hash)
|
||||
let message, res = false;
|
||||
while(!res) {
|
||||
message = this._createMessage(channel, password, operation, key, value);
|
||||
res = await(this._pubsub.publish(channel, message));
|
||||
if(!res) console.log("Retry <-->")
|
||||
}
|
||||
// console.log("Posted!")
|
||||
return message.Hash;
|
||||
}
|
||||
|
||||
_deleteChannel(channel, password) {
|
||||
// await(this.client.linkedList(channel, password).delete());
|
||||
this._pubsub.delete(channel);
|
||||
this._pubsub.delete(channel, password);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -202,26 +191,26 @@ class OrbitClient {
|
||||
m.push(modes);
|
||||
else
|
||||
m = modes;
|
||||
const res = await(this.client.linkedList(channel, password).setMode(m));
|
||||
return res.modes;
|
||||
// const res = await(this.client.linkedList(channel, password).setMode(m));
|
||||
// return res.modes;
|
||||
return { todo: 'TODO!' }
|
||||
}
|
||||
|
||||
_info(channel, password) {
|
||||
// return await(this.client.linkedList(channel, password).head());
|
||||
var l = this._pubsub.latest(channel);
|
||||
var l = this._pubsub.latest(channel, password);
|
||||
return l;
|
||||
}
|
||||
|
||||
_connect(host, username, password) {
|
||||
this._pubsub = new PubSub(host, username, password);
|
||||
// this.client = await(HashCache.connect(host, username, password));
|
||||
this.client = this._pubsub._client;
|
||||
this.user = this.client.info.user;
|
||||
this.network = {
|
||||
id: this.client.info.networkId,
|
||||
name: this.client.info.name,
|
||||
config: this.client.info.config
|
||||
};
|
||||
this._pubsub = new PubSub(this.ipfs, host, username, password);
|
||||
// this.client = this._pubsub._client;
|
||||
// this.user = this.client.info.user;
|
||||
this.user = { id: 'hello' }
|
||||
// this.network = {
|
||||
// id: this.client.info.networkId,
|
||||
// name: this.client.info.name,
|
||||
// config: this.client.info.config
|
||||
// };
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
115
src/PubSub.js
115
src/PubSub.js
@ -2,68 +2,81 @@
|
||||
|
||||
var async = require('asyncawait/async');
|
||||
var await = require('asyncawait/await');
|
||||
var HashCache = require('./HashCacheClient');
|
||||
var redis = require("redis");
|
||||
var Aggregator = require('./Aggregator');
|
||||
|
||||
class PubSub {
|
||||
constructor(host, username, password) {
|
||||
this._subscriptions = [];
|
||||
this._messages = {};
|
||||
this._client = await(HashCache.connect(host, username, password));
|
||||
constructor(ipfs, host, username, password) {
|
||||
this.ipfs = ipfs;
|
||||
this._subscriptions = {};
|
||||
this.client1 = redis.createClient();
|
||||
this.client2 = redis.createClient();
|
||||
this.currentPost = null;
|
||||
|
||||
// Poll for the new head
|
||||
setInterval(async(() => {
|
||||
Object.keys(this._subscriptions).forEach(this._poll.bind(this));
|
||||
}), 500);
|
||||
this.client1.on("message", async((hash, message) => {
|
||||
const currentHead = this._subscriptions[hash] ? this._subscriptions[hash].head : null;
|
||||
if(this._subscriptions[hash]) {
|
||||
let item = Aggregator._fetchOne(this.ipfs, message, this._subscriptions[hash].password);
|
||||
|
||||
if(item.seq > this._subscriptions[hash].seq) {
|
||||
this._subscriptions[hash].seq = item.seq;
|
||||
|
||||
if(currentHead !== message)
|
||||
this._handleNewMessage(hash, message);
|
||||
|
||||
if(this.currentPost) {
|
||||
if(message === this.currentPost.hash) {
|
||||
this.currentPost.callback(true);
|
||||
this.currentPost = null;
|
||||
} else {
|
||||
this.currentPost.callback(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
_poll(hash) {
|
||||
const currentHead = this._subscriptions[hash].head;
|
||||
const channel = await(this._client.linkedList(hash, this._subscriptions[hash].password).head());
|
||||
const newHead = channel.head;
|
||||
if(currentHead !== newHead) {
|
||||
// console.log("NEW HEAD!", newHead);
|
||||
subscribe(hash, password, callback) {
|
||||
if(!this._subscriptions[hash] || this._subscriptions[hash].password !== password) {
|
||||
this._subscriptions[hash] = {
|
||||
topic: hash,
|
||||
password: password,
|
||||
head: null,
|
||||
callback: callback,
|
||||
seq: -1
|
||||
};
|
||||
this.client1.subscribe(hash);
|
||||
}
|
||||
}
|
||||
|
||||
unsubscribe(hash) {
|
||||
delete this._subscriptions[hash];
|
||||
this.client1.unsubscribe();
|
||||
this.client2.unsubscribe();
|
||||
}
|
||||
|
||||
publish(hash, message, callback) {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.currentPost = { hash: message.Hash, callback: resolve };
|
||||
this.client2.publish(hash, message.Hash);
|
||||
});
|
||||
}
|
||||
|
||||
latest(hash, password) {
|
||||
return { head: this._subscriptions[hash].head, modes: {}, seq: this._subscriptions[hash].seq };
|
||||
}
|
||||
|
||||
delete(hash, password) {
|
||||
delete this._subscriptions[hash];
|
||||
}
|
||||
|
||||
_handleNewMessage(hash, newHead) {
|
||||
this._subscriptions[hash].head = newHead;
|
||||
|
||||
if(!this._messages[hash])
|
||||
this._messages[hash] = [];
|
||||
|
||||
this._messages[hash].push(newHead);
|
||||
|
||||
if(this._subscriptions[hash].callback)
|
||||
this._subscriptions[hash].callback(hash, newHead);
|
||||
}
|
||||
}
|
||||
|
||||
subscribe(channel, password, callback) {
|
||||
if(!this._subscriptions[channel] || this._subscriptions[channel].password !== password) {
|
||||
console.log("SUBSCRIBE:", channel);
|
||||
this._subscriptions[channel] = {
|
||||
channel: channel,
|
||||
password: password,
|
||||
head: null,
|
||||
callback: callback
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
unsubscribe(channel) {
|
||||
delete this._subscriptions[channel];
|
||||
delete this._messages[channel];
|
||||
}
|
||||
|
||||
publish(hash, message) {
|
||||
if(!this._messages[hash]) this._messages[hash] = [];
|
||||
await(this._client.linkedList(hash, this._subscriptions[hash].password).add(message));
|
||||
}
|
||||
|
||||
latest(hash) {
|
||||
return { head: this._messages[hash] && this._messages[hash].length > 0 ? this._messages[hash][this._messages[hash].length - 1] : null, modes: {} };
|
||||
}
|
||||
|
||||
delete(hash) {
|
||||
this._messages[hash] = [];
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = PubSub;
|
||||
|
||||
@ -70,12 +70,12 @@ describe('Orbit Client', () => {
|
||||
describe('Connect', function() {
|
||||
it('connects to hash-cache-server', async((done) => {
|
||||
assert.notEqual(orbit, null);
|
||||
assert.notEqual(orbit.client, null);
|
||||
assert.equal(orbit.user.id, 'Qmf5A5RSTQmcfvigT3j29Fqh2fAHRANk5ooBYKdWsPtr8U');
|
||||
assert.equal(orbit.network.id, serverConfig.networkId);
|
||||
assert.equal(orbit.network.name, serverConfig.networkName);
|
||||
assert.notEqual(orbit.network.config.SupernodeRouting, null);
|
||||
assert.notEqual(orbit.network.config.Bootstrap.length, 0);
|
||||
// assert.notEqual(orbit.client, null);
|
||||
// assert.equal(orbit.user.id, 'hello');
|
||||
// assert.equal(orbit.network.id, serverConfig.networkId);
|
||||
// assert.equal(orbit.network.name, serverConfig.networkName);
|
||||
// assert.notEqual(orbit.network.config.SupernodeRouting, null);
|
||||
// assert.notEqual(orbit.network.config.Bootstrap.length, 0);
|
||||
done();
|
||||
}));
|
||||
});
|
||||
@ -389,6 +389,7 @@ describe('Orbit Client', () => {
|
||||
var iter = orbit.channel(channel, '').iterator({ gte: gte, limit: -1 });
|
||||
var messages = iter.collect().map((e) => e.hash);
|
||||
|
||||
// console.log(messages, all)
|
||||
assert.equal(messages.length, 2);
|
||||
assert.equal(messages[0], all[0].hash);
|
||||
assert.equal(messages[1], all[1].hash);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user