bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Broadcasts. Receiving seems to work, but there still seems to be a problem with sending them.

Browse Source
This commit is contained in:
Christian Basler
2015-06-09 22:45:24 +02:00
parent f76864eebd
commit b4683bba68
26 changed files with 466 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
View File

@ -22,9 +22,6 @@ import ch.dissem.bitmessage.entity.Plaintext;
import ch.dissem.bitmessage.entity.payload.Pubkey;
import ch.dissem.bitmessage.networking.NetworkNode;
import ch.dissem.bitmessage.repository.*;
import ch.dissem.bitmessage.utils.Strings;
import org.flywaydb.core.internal.util.logging.slf4j.Slf4jLog;
import org.flywaydb.core.internal.util.logging.slf4j.Slf4jLogCreator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -72,6 +69,7 @@ public class Application {
System.out.println("available commands:");
System.out.println("i) identities");
System.out.println("c) contacts");
System.out.println("s) subscriptions");
System.out.println("m) messages");
System.out.println("e) exit");
@ -85,6 +83,9 @@ public class Application {
case "c":
contacts();
break;
case "s":
subscriptions();
break;
case "m":
messages();
break;
@ -181,7 +182,7 @@ public class Application {
command = nextCommand();
switch (command) {
case "a":
addContact();
addContact(false);
contacts = ctx.addresses().getContacts();
break;
case "b":
@ -197,7 +198,7 @@ public class Application {
} while (!"b".equals(command));
}
private void addContact() {
private void addContact(boolean isSubscription) {
System.out.println();
System.out.println("Please enter the Bitmessage address you want to add");
try {
@ -207,12 +208,56 @@ public class Application {
if (alias.length() > 0) {
address.setAlias(alias);
}
if (isSubscription) {
ctx.addSubscribtion(address);
}
ctx.addContact(address);
} catch (IllegalArgumentException e) {
System.out.println(e.getMessage());
}
}
private void subscriptions() {
String command;
List<BitmessageAddress> subscriptions = ctx.addresses().getSubscriptions();
do {
System.out.println();
int i = 0;
for (BitmessageAddress contact : subscriptions) {
i++;
System.out.print(i + ") ");
if (contact.getAlias() != null) {
System.out.println(contact.getAlias() + " (" + contact.getAddress() + ")");
} else {
System.out.println(contact.getAddress());
}
}
if (i == 0) {
System.out.println("You have no subscriptions yet.");
}
System.out.println();
System.out.println("a) add subscription");
System.out.println("b) back");
command = nextCommand();
switch (command) {
case "a":
addContact(true);
subscriptions = ctx.addresses().getSubscriptions();
break;
case "b":
return;
default:
try {
int index = Integer.parseInt(command) - 1;
address(subscriptions.get(index));
} catch (NumberFormatException e) {
System.out.println("Unknown command. Please try again.");
}
}
} while (!"b".equals(command));
}
private void address(BitmessageAddress address) {
System.out.println();
if (address.getAlias() != null)
@ -244,12 +289,16 @@ public class Application {
}
System.out.println();
System.out.println("c) compose message");
System.out.println("s) compose broadcast");
System.out.println("b) back");
command = scanner.nextLine().trim();
switch (command) {
case "c":
compose();
compose(false);
break;
case "s":
compose(true);
break;
case "b":
return;
@ -272,7 +321,7 @@ public class Application {
System.out.println();
System.out.println(message.getText());
System.out.println();
System.out.println("Labels: "+ message.getLabels());
System.out.println("Labels: " + message.getLabels());
System.out.println();
String command;
do {
@ -294,10 +343,10 @@ public class Application {
} while (!"b".equalsIgnoreCase(command));
}
private void compose() {
private void compose(boolean broadcast) {
System.out.println();
BitmessageAddress from = selectAddress(true);
BitmessageAddress to = selectAddress(false);
BitmessageAddress to = (broadcast ? null : selectAddress(false));
compose(from, to, null);
}
@ -352,9 +401,12 @@ public class Application {
}
private void compose(BitmessageAddress from, BitmessageAddress to, String subject) {
boolean broadcast = (to == null);
System.out.println();
System.out.println("From: " + from);
System.out.println("To: " + to);
if (!broadcast) {
System.out.println("To: " + to);
}
if (subject != null) {
System.out.println("Subject: " + subject);
} else {
@ -368,7 +420,11 @@ public class Application {
line = nextCommand();
message.append(line).append('\n');
} while (line.length() > 0 || !yesNo("Send message?"));
ctx.send(from, to, subject, message.toString());
if (broadcast) {
ctx.broadcast(from, subject, message.toString());
} else {
ctx.send(from, to, subject, message.toString());
}
}
private boolean yesNo(String question) {

63
demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
View File

@ -16,71 +16,12 @@
package ch.dissem.bitmessage.demo;
import ch.dissem.bitmessage.BitmessageContext;
import ch.dissem.bitmessage.entity.BitmessageAddress;
import ch.dissem.bitmessage.entity.Plaintext;
import ch.dissem.bitmessage.networking.NetworkNode;
import ch.dissem.bitmessage.repository.JdbcAddressRepository;
import ch.dissem.bitmessage.repository.JdbcInventory;
import ch.dissem.bitmessage.repository.JdbcMessageRepository;
import ch.dissem.bitmessage.repository.JdbcNodeRegistry;
import ch.dissem.bitmessage.utils.Base58;
import ch.dissem.bitmessage.utils.Encode;
import ch.dissem.bitmessage.utils.Security;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Scanner;
/**
* Created by chris on 06.04.15.
*/
public class Main {
public static void main(String[] args) throws IOException {
final BitmessageAddress address = new BitmessageAddress("BM-87hJ99tPAXxtetvnje7Z491YSvbEtBJVc5e");
// System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "TRACE");
// System.setProperty("org.slf4j.simpleLogger.logFile", "./trace.log");
new Application();
//
//
// List<ObjectMessage> objects = new JdbcInventory().getObjects(address.getStream(), address.getVersion(), ObjectType.PUBKEY);
// System.out.println("Address version: " + address.getVersion());
// System.out.println("Address stream: " + address.getStream());
// for (ObjectMessage o : objects) {
//// if (!o.isSignatureValid()) System.out.println("Invalid signature.");
//// System.out.println(o.getPayload().getSignature().length);
// V4Pubkey pubkey = (V4Pubkey) o.getPayload();
// if (Arrays.equals(address.getTag(), pubkey.getTag())) {
// System.out.println("Pubkey found!");
// try {
// System.out.println("IV: " + o.getInventoryVector());
// address.setPubkey(pubkey);
// } catch (Exception ignore) {
// System.out.println("But setPubkey failed? " + address.getRipe().length + "/" + pubkey.getRipe().length);
// System.out.println("Failed address: " + generateAddress(address.getStream(), address.getVersion(), pubkey.getRipe()));
// if (Arrays.equals(address.getRipe(), pubkey.getRipe())) {
// ignore.printStackTrace();
// }
// }
// }
// }
}
public static String generateAddress(long stream, long version, byte[] ripe) {
try {
ByteArrayOutputStream os = new ByteArrayOutputStream();
Encode.varInt(version, os);
Encode.varInt(stream, os);
os.write(ripe);
byte[] checksum = Security.doubleSha512(os.toByteArray());
os.write(checksum, 0, 4);
return "BM-" + Base58.encode(os.toByteArray());
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}