goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cancel browsing if UI tab is closed

browse-v2
Zlatin Balevsky 2022-08-27 19:15:16 +01:00
parent e58391fbfb
commit 091a1c9a5b
No known key found for this signature in database
GPG Key ID: A72832072D525E41
5 changed files with 132 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
core/src/main/groovy/com/muwire/core/search/BrowseManager.groovy
View File

@ -21,8 +21,6 @@ import java.util.zip.GZIPInputStream
@Log
class BrowseManager {
private static final int BATCH_SIZE = 128
private final I2PConnector connector
private final EventBus eventBus
private final Persona me
@ -36,80 +34,6 @@ class BrowseManager {
}
void onUIBrowseEvent(UIBrowseEvent e) {
browserThread.execute({
Endpoint endpoint = null
try {
eventBus.publish(new BrowseStatusEvent(host : e.host, status : BrowseStatus.CONNECTING, uuid: e.uuid))
endpoint = connector.connect(e.host.destination)
OutputStream os = endpoint.getOutputStream()
os.write("BROWSE\r\n".getBytes(StandardCharsets.US_ASCII))
os.write("Persona:${me.toBase64()}\r\n".getBytes(StandardCharsets.US_ASCII))
os.write("Path:true\r\n".getBytes(StandardCharsets.US_ASCII))
os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
InputStream is = endpoint.getInputStream()
String code = DataUtil.readTillRN(is)
if (!code.startsWith("200"))
throw new IOException("Invalid code $code")
// parse all headers
Map<String,String> headers = DataUtil.readAllHeaders(is)
if (!headers.containsKey("Count"))
throw new IOException("No count header")
int results = Integer.parseInt(headers['Count'])
boolean chat = headers.containsKey("Chat") && Boolean.parseBoolean(headers['Chat'])
MWProfileHeader profileHeader = null
if (headers.containsKey("ProfileHeader")) {
byte [] profileHeaderBytes = Base64.decode(headers['ProfileHeader'])
profileHeader = new MWProfileHeader(new ByteArrayInputStream(profileHeaderBytes))
if (profileHeader.getPersona() != e.host)
throw new IOException("Sender profile mismatch")
}
// at this stage, start pulling the results
UUID uuid = e.uuid
eventBus.publish(new BrowseStatusEvent(host: e.host, status : BrowseStatus.FETCHING,
totalResults : results, uuid : uuid))
log.info("Starting to fetch $results results with uuid $uuid")
JsonSlurper slurper = new JsonSlurper()
DataInputStream dis = new DataInputStream(new GZIPInputStream(is))
UIResultEvent[] batch = new UIResultEvent[Math.min(BATCH_SIZE, results)]
int j = 0
for (int i = 0; i < results; i++) {
log.fine("parsing result $i at batch position $j")
int size = dis.readUnsignedShort()
byte [] tmp = new byte[size]
dis.readFully(tmp)
def json = slurper.parse(tmp)
UIResultEvent result = ResultsParser.parse(e.host, uuid, json)
result.chat = chat
result.profileHeader = profileHeader
batch[j++] = result
// publish piecemally
if (j == batch.length) {
eventBus.publish(new UIResultBatchEvent(results : batch, uuid : uuid))
j = 0
batch = new UIResultEvent[Math.min(results - i - 1, BATCH_SIZE)]
log.fine("publishing batch, next batch size ${batch.length}")
}
}
eventBus.publish(new BrowseStatusEvent(host: e.host, status : BrowseStatus.FINISHED, uuid : uuid))
} catch (Exception bad) {
log.log(Level.WARNING, "browse failed", bad)
eventBus.publish(new BrowseStatusEvent(host: e.host, status : BrowseStatus.FAILED, uuid : e.uuid))
} finally {
endpoint?.close()
}
} as Runnable)
browserThread.execute(new BrowseSession(eventBus, connector, e, me))
}
}

125
core/src/main/groovy/com/muwire/core/search/BrowseSession.groovy 100644
View File

@ -0,0 +1,125 @@
package com.muwire.core.search
import com.muwire.core.EventBus
import com.muwire.core.Persona
import com.muwire.core.connection.Endpoint
import com.muwire.core.connection.I2PConnector
import com.muwire.core.profile.MWProfileHeader
import com.muwire.core.util.DataUtil
import groovy.json.JsonSlurper
import groovy.util.logging.Log
import net.i2p.data.Base64
import java.nio.charset.StandardCharsets
import java.util.logging.Level
import java.util.zip.GZIPInputStream
@Log
class BrowseSession implements Runnable {
private static final int BATCH_SIZE = 128
private final UIBrowseEvent event
private final EventBus eventBus
private final I2PConnector connector
private final Persona me
private volatile Thread currentThrad
private volatile boolean closed
BrowseSession(EventBus eventBus, I2PConnector connector, UIBrowseEvent event, Persona me) {
this.event = event
this.eventBus = eventBus
this.connector = connector
this.me = me
}
void run() {
if (closed)
return
currentThrad = Thread.currentThread()
Endpoint endpoint = null
try {
eventBus.publish(new BrowseStatusEvent(host : event.host, status : BrowseStatus.CONNECTING,
uuid: event.uuid, session: this))
endpoint = connector.connect(event.host.destination)
OutputStream os = endpoint.getOutputStream()
os.write("BROWSE\r\n".getBytes(StandardCharsets.US_ASCII))
os.write("Persona:${me.toBase64()}\r\n".getBytes(StandardCharsets.US_ASCII))
os.write("Path:true\r\n".getBytes(StandardCharsets.US_ASCII))
os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
InputStream is = endpoint.getInputStream()
String code = DataUtil.readTillRN(is)
if (!code.startsWith("200"))
throw new IOException("Invalid code $code")
// parse all headers
Map<String,String> headers = DataUtil.readAllHeaders(is)
if (!headers.containsKey("Count"))
throw new IOException("No count header")
int results = Integer.parseInt(headers['Count'])
boolean chat = headers.containsKey("Chat") && Boolean.parseBoolean(headers['Chat'])
MWProfileHeader profileHeader = null
if (headers.containsKey("ProfileHeader")) {
byte [] profileHeaderBytes = Base64.decode(headers['ProfileHeader'])
profileHeader = new MWProfileHeader(new ByteArrayInputStream(profileHeaderBytes))
if (profileHeader.getPersona() != event.host)
throw new IOException("Sender profile mismatch")
}
// at this stage, start pulling the results
UUID uuid = event.uuid
eventBus.publish(new BrowseStatusEvent(host: event.host, status : BrowseStatus.FETCHING,
totalResults : results, uuid : uuid))
log.info("Starting to fetch $results results with uuid $uuid")
JsonSlurper slurper = new JsonSlurper()
DataInputStream dis = new DataInputStream(new GZIPInputStream(is))
UIResultEvent[] batch = new UIResultEvent[Math.min(BATCH_SIZE, results)]
int j = 0
for (int i = 0; i < results; i++) {
if (closed)
return
log.fine("parsing result $i at batch position $j")
int size = dis.readUnsignedShort()
byte [] tmp = new byte[size]
dis.readFully(tmp)
def json = slurper.parse(tmp)
UIResultEvent result = ResultsParser.parse(event.host, uuid, json)
result.chat = chat
result.profileHeader = profileHeader
batch[j++] = result
// publish piecemally
if (j == batch.length) {
eventBus.publish(new UIResultBatchEvent(results : batch, uuid : uuid))
j = 0
batch = new UIResultEvent[Math.min(results - i - 1, BATCH_SIZE)]
log.fine("publishing batch, next batch size ${batch.length}")
}
}
eventBus.publish(new BrowseStatusEvent(host: event.host, status : BrowseStatus.FINISHED, uuid : uuid))
} catch (Exception bad) {
if (!closed) {
log.log(Level.WARNING, "browse failed", bad)
eventBus.publish(new BrowseStatusEvent(host: event.host, status: BrowseStatus.FAILED, uuid: event.uuid))
}
} finally {
currentThrad = null
endpoint?.close()
}
}
void close() {
log.info("closing browse session for UUID ${event.uuid}")
closed = true
currentThrad?.interrupt()
}
}

1
core/src/main/groovy/com/muwire/core/search/BrowseStatusEvent.groovy
View File

@ -6,6 +6,7 @@ import com.muwire.core.Persona
class BrowseStatusEvent extends Event {
Persona host
BrowseStatus status
BrowseSession session
int totalResults
UUID uuid
}

3
gui/griffon-app/controllers/com/muwire/gui/BrowseController.groovy
View File

@ -48,6 +48,7 @@ class BrowseController {
void mvcGroupDestroy() {
timer.stop()
model.session?.close()
core.eventBus.unregister(BrowseStatusEvent.class, this)
core.eventBus.unregister(UIResultBatchEvent.class, this)
core.eventBus.unregister(DownloadStartedEvent.class, this)
@ -62,6 +63,8 @@ class BrowseController {
void onBrowseStatusEvent(BrowseStatusEvent e) {
if (e.uuid != model.uuid)
return
if (e.session != null)
model.session = e.session
model.pendingStatuses.add(e)
}

2
gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
View File

@ -1,6 +1,7 @@
package com.muwire.gui
import com.muwire.core.Persona
import com.muwire.core.search.BrowseSession
import com.muwire.core.search.BrowseStatusEvent
import com.muwire.core.search.UIResultBatchEvent
import com.muwire.core.search.UIResultEvent
@ -30,6 +31,7 @@ class BrowseModel {
@Observable boolean filterEnabled
@Observable boolean clearFilterEnabled
volatile UUID uuid
volatile BrowseSession session
def results = []
List<UIResultEvent> allResults = []