X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterface.java;h=066747daf49918a724d3ad2853350d50f1a1675d;hb=d94da0780913f1dd37e1bddd575dcd759ecc3977;hp=7d1b007ea6ac4060dae2f0300f110832c5b85fb7;hpb=87630ec07d4de0e516133d29a3135f81716e5383;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index 7d1b007..066747d 100644
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -1,5 +1,5 @@
/*
- * Sone - FreenetInterface.java - Copyright © 2010â2016 David Roden
+ * Sone - FreenetInterface.java - Copyright © 2010â2020 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,10 +21,10 @@ import static freenet.keys.USK.create;
import static java.lang.String.format;
import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger;
-import static net.pterodactylus.sone.freenet.Key.routingKey;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -43,6 +43,8 @@ import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.TemporaryImage;
import com.google.common.base.Function;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
import com.google.common.eventbus.EventBus;
import com.google.inject.Singleton;
@@ -64,6 +66,7 @@ import freenet.client.async.ClientPutCallback;
import freenet.client.async.ClientPutter;
import freenet.client.async.SnoopMetadata;
import freenet.client.async.USKCallback;
+import freenet.client.async.USKManager;
import freenet.keys.FreenetURI;
import freenet.keys.InsertableClientSSK;
import freenet.keys.USK;
@@ -75,11 +78,10 @@ import freenet.support.api.Bucket;
import freenet.support.api.RandomAccessBucket;
import freenet.support.io.ArrayBucket;
import freenet.support.io.ResumeFailedException;
+import net.pterodactylus.sone.freenet.*;
/**
* Contains all necessary functionality for interacting with the Freenet node.
- *
- * @author David âBombeâ Roden
*/
@Singleton
public class FreenetInterface {
@@ -92,12 +94,17 @@ public class FreenetInterface {
/** The node to interact with. */
private final Node node;
+ private final USKManager uskManager;
+ private final ClientContext clientContext;
+
+ private final SoneUriCreator soneUriCreator;
/** The high-level client to use for requests. */
private final HighLevelSimpleClient client;
+ private final RequestClient requestClient = new RequestClientBuilder().realTime().build();
/** The USK callbacks. */
- private final Map soneUskCallbacks = new HashMap();
+ private final Multimap soneUskCallbacks = ArrayListMultimap.create();
/** The not-Sone-related USK callbacks. */
private final Map uriUskCallbacks = Collections.synchronizedMap(new HashMap());
@@ -105,19 +112,14 @@ public class FreenetInterface {
private final RequestClient imageInserts = new RequestClientBuilder().realTime().build();
private final RequestClient imageLoader = new RequestClientBuilder().realTime().build();
- /**
- * Creates a new Freenet interface.
- *
- * @param eventBus
- * The event bus
- * @param node
- * The node to interact with
- */
@Inject
- public FreenetInterface(EventBus eventBus, Node node) {
+ public FreenetInterface(EventBus eventBus, Node node, USKManager uskManager, ClientContext clientContext, SoneUriCreator soneUriCreator, HighLevelSimpleClientCreator highLevelSimpleClientCreator) {
this.eventBus = eventBus;
this.node = node;
- this.client = node.clientCore.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, true);
+ this.uskManager = uskManager;
+ this.clientContext = clientContext;
+ this.soneUriCreator = soneUriCreator;
+ this.client = highLevelSimpleClientCreator.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, true);
}
//
@@ -186,10 +188,11 @@ public class FreenetInterface {
}
};
FetchContext fetchContext = client.getFetchContext();
+ fetchContext.dontEnterImplicitArchives = false;
try {
ClientGetter clientGetter = client.fetch(uri, 2097152, callback, fetchContext, RequestStarter.INTERACTIVE_PRIORITY_CLASS);
clientGetter.setMetaSnoop(snoop);
- clientGetter.restart(uri, fetchContext.filterData, node.clientCore.clientContext);
+ clientGetter.restart(uri, fetchContext.filterData, clientContext);
} catch (FetchException fe) {
/* stupid exception that can not actually be thrown! */
}
@@ -256,9 +259,9 @@ public class FreenetInterface {
public void registerActiveUsk(FreenetURI requestUri,
USKCallback uskCallback) {
try {
- soneUskCallbacks.put(routingKey(requestUri), uskCallback);
- node.clientCore.uskManager.subscribe(create(requestUri),
- uskCallback, true, (RequestClient) client);
+ soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
+ uskManager.subscribe(create(requestUri),
+ uskCallback, true, requestClient);
} catch (MalformedURLException mue1) {
logger.log(WARNING, format("Could not subscribe USK â%sâ!",
requestUri), mue1);
@@ -268,11 +271,8 @@ public class FreenetInterface {
public void registerPassiveUsk(FreenetURI requestUri,
USKCallback uskCallback) {
try {
- soneUskCallbacks.put(routingKey(requestUri), uskCallback);
- node.clientCore
- .uskManager
- .subscribe(create(requestUri), uskCallback, false,
- (RequestClient) client);
+ soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
+ uskManager.subscribe(create(requestUri), uskCallback, false, requestClient);
} catch (MalformedURLException mue1) {
logger.log(WARNING,
format("Could not subscribe USK â%sâ!", requestUri),
@@ -287,16 +287,19 @@ public class FreenetInterface {
* The Sone to unregister
*/
public void unregisterUsk(Sone sone) {
- USKCallback uskCallback = soneUskCallbacks.remove(sone.getId());
- if (uskCallback == null) {
+ Collection uskCallbacks = soneUskCallbacks.removeAll(sone.getId());
+ if (uskCallbacks.isEmpty()) {
return;
}
- try {
- logger.log(Level.FINEST, String.format("Unsubscribing from USK for %sâ¦", sone));
- node.clientCore.uskManager.unsubscribe(USK.create(sone.getRequestUri()), uskCallback);
- } catch (MalformedURLException mue1) {
- logger.log(Level.FINE, String.format("Could not unsubscribe USK â%sâ!", sone.getRequestUri()), mue1);
- }
+ logger.log(Level.FINE, String.format("Unsubscribing %d from USK for %sâ¦", uskCallbacks.size(), sone));
+ logger.log(Level.FINEST, String.format("USKs left: %d", soneUskCallbacks.size()));
+ uskCallbacks.forEach(uskCallback -> {
+ try {
+ uskManager.unsubscribe(USK.create(soneUriCreator.getRequestUri(sone)), uskCallback);
+ } catch (MalformedURLException mue1) {
+ logger.log(Level.FINE, String.format("Could not unsubscribe USK â%sâ!", soneUriCreator.getRequestUri(sone)), mue1);
+ }
+ });
}
/**
@@ -328,8 +331,8 @@ public class FreenetInterface {
};
try {
- node.clientCore.uskManager.subscribe(USK.create(uri), uskCallback, true, (RequestClient) client);
- uriUskCallbacks.put(uri, uskCallback);
+ uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
+ uriUskCallbacks.put(USK.create(uri).clearCopy().getURI(), uskCallback);
} catch (MalformedURLException mue1) {
logger.log(Level.WARNING, String.format("Could not subscribe to USK: %s", uri), mue1);
}
@@ -342,72 +345,20 @@ public class FreenetInterface {
* The URI to unregister the USK watcher for
*/
public void unregisterUsk(FreenetURI uri) {
- USKCallback uskCallback = uriUskCallbacks.remove(uri);
- if (uskCallback == null) {
- logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri));
- return;
- }
try {
- node.clientCore.uskManager.unsubscribe(USK.create(uri), uskCallback);
+ USKCallback uskCallback = uriUskCallbacks.remove(USK.create(uri).clearCopy().getURI());
+ if (uskCallback == null) {
+ logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri));
+ return;
+ }
+ uskManager.unsubscribe(USK.create(uri), uskCallback);
} catch (MalformedURLException mue1) {
logger.log(Level.INFO, String.format("Could not unregister invalid USK: %s", uri), mue1);
}
}
/**
- * Container for a fetched URI and the {@link FetchResult}.
- *
- * @author David Roden
- */
- public static class Fetched {
-
- /** The fetched URI. */
- private final FreenetURI freenetUri;
-
- /** The fetch result. */
- private final FetchResult fetchResult;
-
- /**
- * Creates a new fetched URI.
- *
- * @param freenetUri
- * The URI that was fetched
- * @param fetchResult
- * The fetch result
- */
- public Fetched(FreenetURI freenetUri, FetchResult fetchResult) {
- this.freenetUri = freenetUri;
- this.fetchResult = fetchResult;
- }
-
- //
- // ACCESSORS
- //
-
- /**
- * Returns the fetched URI.
- *
- * @return The fetched URI
- */
- public FreenetURI getFreenetUri() {
- return freenetUri;
- }
-
- /**
- * Returns the fetch result.
- *
- * @return The fetch result
- */
- public FetchResult getFetchResult() {
- return fetchResult;
- }
-
- }
-
- /**
* Callback for USK watcher events.
- *
- * @author David âBombeâ Roden
*/
public static interface Callback {
@@ -435,7 +386,6 @@ public class FreenetInterface {
* @see ImageInsertStartedEvent
* @see ImageInsertFailedEvent
* @see ImageInsertFinishedEvent
- * @author David âBombeâ Roden
*/
public class InsertToken implements ClientPutCallback {
@@ -489,7 +439,7 @@ public class FreenetInterface {
*/
@SuppressWarnings("synthetic-access")
public void cancel() {
- clientPutter.cancel(node.clientCore.clientContext);
+ clientPutter.cancel(clientContext);
eventBus.post(new ImageInsertAbortedEvent(image));
bucket.free();
}