From f5a8a6e98223fac0c18e007571f3e4017bc68721 Mon Sep 17 00:00:00 2001 From: xis Date: Thu, 19 Oct 2023 17:53:36 +0200 Subject: [PATCH 1/2] UpnpService as bean --- build.gradle | 1 + .../support/IntegrationSpecification.groovy | 3 ++ .../groovy/support/beans/TestConfig.groovy | 7 +++ .../upnp/UpnpServiceConfigurationInt.groovy | 29 ++++++++++++ .../config/NextcloudAppPathProviderInt.groovy | 4 +- .../beans}/util/ServerInfoProviderInt.groovy | 3 +- .../beans}/util/ServerPortCustomizer.groovy | 2 +- .../net/schowek/nextclouddlna/DllnaService.kt | 47 ++----------------- .../nextclouddlna/dlna/upnp/MyUpnpService.kt | 14 ++++++ .../dlna/upnp/MyUpnpServiceConfiguration.kt | 44 +++++++++++++++++ .../transport/ApacheStreamClient.kt | 2 +- .../ApacheStreamClientConfiguration.kt | 2 +- .../transport/MyStreamServerConfiguration.kt | 2 +- .../transport/MyStreamServerImpl.kt | 2 +- 14 files changed, 110 insertions(+), 52 deletions(-) create mode 100644 src/integration/groovy/support/beans/TestConfig.groovy create mode 100644 src/integration/groovy/support/beans/dlna/upnp/UpnpServiceConfigurationInt.groovy rename src/integration/groovy/{net/schowek/nextclouddlna => support/beans}/nextcloud/config/NextcloudAppPathProviderInt.groovy (75%) rename src/integration/groovy/{net/schowek/nextclouddlna => support/beans}/util/ServerInfoProviderInt.groovy (88%) rename src/integration/groovy/{net/schowek/nextclouddlna => support/beans}/util/ServerPortCustomizer.groovy (94%) create mode 100644 src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpService.kt create mode 100644 src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpServiceConfiguration.kt rename src/main/kotlin/net/schowek/nextclouddlna/dlna/{ => upnp}/transport/ApacheStreamClient.kt (99%) rename src/main/kotlin/net/schowek/nextclouddlna/dlna/{ => upnp}/transport/ApacheStreamClientConfiguration.kt (90%) rename src/main/kotlin/net/schowek/nextclouddlna/dlna/{ => upnp}/transport/MyStreamServerConfiguration.kt (79%) rename src/main/kotlin/net/schowek/nextclouddlna/dlna/{ => upnp}/transport/MyStreamServerImpl.kt (90%) diff --git a/build.gradle b/build.gradle index c985f2e..d81cc9a 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,7 @@ dependencies { implementation 'org.jupnp:org.jupnp:2.7.1' implementation 'org.jupnp:org.jupnp.support:2.7.1' + implementation 'org.osgi:org.osgi.service.http:1.2.2' implementation 'org.apache.httpcomponents:httpclient:4.5.14' // to avoid snakeyaml-1.3 vulnerability CVE-2022-1471 implementation 'org.yaml:snakeyaml:2.2' diff --git a/src/integration/groovy/support/IntegrationSpecification.groovy b/src/integration/groovy/support/IntegrationSpecification.groovy index c248ad3..0f51d52 100644 --- a/src/integration/groovy/support/IntegrationSpecification.groovy +++ b/src/integration/groovy/support/IntegrationSpecification.groovy @@ -6,15 +6,18 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.context.annotation.Import import org.springframework.test.context.ActiveProfiles import org.springframework.test.context.ContextConfiguration import spock.lang.Specification +import support.beans.TestConfig import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT @ContextConfiguration(loader = SpringBootContextLoader, classes = NextcloudDLNAApp.class) @SpringBootTest(webEnvironment = DEFINED_PORT) @ActiveProfiles("integration") +@Import(TestConfig.class) class IntegrationSpecification extends Specification { @Autowired private TestRestTemplate restTemplate diff --git a/src/integration/groovy/support/beans/TestConfig.groovy b/src/integration/groovy/support/beans/TestConfig.groovy new file mode 100644 index 0000000..cebb120 --- /dev/null +++ b/src/integration/groovy/support/beans/TestConfig.groovy @@ -0,0 +1,7 @@ +package support.beans + +import org.springframework.context.annotation.ComponentScan + +@ComponentScan(["support", "net.schowek.nextclouddlna"]) +class TestConfig { +} \ No newline at end of file diff --git a/src/integration/groovy/support/beans/dlna/upnp/UpnpServiceConfigurationInt.groovy b/src/integration/groovy/support/beans/dlna/upnp/UpnpServiceConfigurationInt.groovy new file mode 100644 index 0000000..4d95c90 --- /dev/null +++ b/src/integration/groovy/support/beans/dlna/upnp/UpnpServiceConfigurationInt.groovy @@ -0,0 +1,29 @@ +package support.beans.dlna.upnp + +import org.jupnp.DefaultUpnpServiceConfiguration +import org.jupnp.transport.spi.DatagramIO +import org.jupnp.transport.spi.NetworkAddressFactory +import org.jupnp.transport.spi.StreamClient +import org.jupnp.transport.spi.StreamServer +import org.springframework.context.annotation.Profile +import org.springframework.stereotype.Component + +@Component +@Profile("integration") +class UpnpServiceConfigurationInt extends DefaultUpnpServiceConfiguration { + @Override + public StreamClient createStreamClient() { + return null + } + + + @Override + public StreamServer createStreamServer(NetworkAddressFactory networkAddressFactory) { + return null + } + +// @Override +// public DatagramIO createDatagramIO(NetworkAddressFactory networkAddressFactory) { +// +// } +} diff --git a/src/integration/groovy/net/schowek/nextclouddlna/nextcloud/config/NextcloudAppPathProviderInt.groovy b/src/integration/groovy/support/beans/nextcloud/config/NextcloudAppPathProviderInt.groovy similarity index 75% rename from src/integration/groovy/net/schowek/nextclouddlna/nextcloud/config/NextcloudAppPathProviderInt.groovy rename to src/integration/groovy/support/beans/nextcloud/config/NextcloudAppPathProviderInt.groovy index 2bd3b98..dfa76da 100644 --- a/src/integration/groovy/net/schowek/nextclouddlna/nextcloud/config/NextcloudAppPathProviderInt.groovy +++ b/src/integration/groovy/support/beans/nextcloud/config/NextcloudAppPathProviderInt.groovy @@ -1,6 +1,6 @@ -package net.schowek.nextclouddlna.nextcloud.config - +package support.beans.nextcloud.config +import net.schowek.nextclouddlna.nextcloud.config.NextcloudAppPathProvider import org.springframework.context.annotation.Profile import org.springframework.stereotype.Component diff --git a/src/integration/groovy/net/schowek/nextclouddlna/util/ServerInfoProviderInt.groovy b/src/integration/groovy/support/beans/util/ServerInfoProviderInt.groovy similarity index 88% rename from src/integration/groovy/net/schowek/nextclouddlna/util/ServerInfoProviderInt.groovy rename to src/integration/groovy/support/beans/util/ServerInfoProviderInt.groovy index 1a30d66..47b96ff 100644 --- a/src/integration/groovy/net/schowek/nextclouddlna/util/ServerInfoProviderInt.groovy +++ b/src/integration/groovy/support/beans/util/ServerInfoProviderInt.groovy @@ -1,5 +1,6 @@ -package net.schowek.nextclouddlna.util +package support.beans.util +import net.schowek.nextclouddlna.util.ServerInfoProvider import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Profile import org.springframework.stereotype.Component diff --git a/src/integration/groovy/net/schowek/nextclouddlna/util/ServerPortCustomizer.groovy b/src/integration/groovy/support/beans/util/ServerPortCustomizer.groovy similarity index 94% rename from src/integration/groovy/net/schowek/nextclouddlna/util/ServerPortCustomizer.groovy rename to src/integration/groovy/support/beans/util/ServerPortCustomizer.groovy index 4c997ad..5b5f23d 100644 --- a/src/integration/groovy/net/schowek/nextclouddlna/util/ServerPortCustomizer.groovy +++ b/src/integration/groovy/support/beans/util/ServerPortCustomizer.groovy @@ -1,4 +1,4 @@ -package net.schowek.nextclouddlna.util +package support.beans.util import org.springframework.beans.factory.annotation.Value import org.springframework.boot.web.server.ConfigurableWebServerFactory diff --git a/src/main/kotlin/net/schowek/nextclouddlna/DllnaService.kt b/src/main/kotlin/net/schowek/nextclouddlna/DllnaService.kt index 9b10166..4c76a91 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/DllnaService.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/DllnaService.kt @@ -3,36 +3,20 @@ package net.schowek.nextclouddlna import jakarta.annotation.PreDestroy import mu.KLogging import net.schowek.nextclouddlna.dlna.media.MediaServer -import net.schowek.nextclouddlna.dlna.transport.ApacheStreamClient -import net.schowek.nextclouddlna.dlna.transport.ApacheStreamClientConfiguration -import net.schowek.nextclouddlna.dlna.transport.MyStreamServerConfiguration -import net.schowek.nextclouddlna.dlna.transport.MyStreamServerImpl -import net.schowek.nextclouddlna.util.ServerInfoProvider -import org.jupnp.DefaultUpnpServiceConfiguration -import org.jupnp.UpnpServiceConfiguration -import org.jupnp.UpnpServiceImpl +import org.jupnp.UpnpService import org.jupnp.model.message.StreamRequestMessage import org.jupnp.model.message.StreamResponseMessage import org.jupnp.model.message.UpnpResponse -import org.jupnp.protocol.ProtocolFactory -import org.jupnp.registry.RegistryImpl -import org.jupnp.transport.impl.NetworkAddressFactoryImpl -import org.jupnp.transport.spi.NetworkAddressFactory import org.springframework.context.event.ContextRefreshedEvent import org.springframework.context.event.EventListener import org.springframework.stereotype.Component -import java.net.InetAddress -import java.net.NetworkInterface @Component class DlnaService( - private val mediaServer: MediaServer, - private val serverInfoProvider: ServerInfoProvider, + private val upnpService: UpnpService, + private val mediaServer: MediaServer ) { - private val addressesToBind: List = listOf(serverInfoProvider.host) - var upnpService = MyUpnpService(MyUpnpServiceConfiguration()) - fun start() { upnpService.startup() upnpService.registry.addDevice(mediaServer.device) @@ -61,30 +45,5 @@ class DlnaService( } } - inner class MyUpnpService( - configuration: UpnpServiceConfiguration - ) : UpnpServiceImpl(configuration) { - override fun createRegistry(pf: ProtocolFactory) = RegistryImpl(this) - } - - private inner class MyUpnpServiceConfiguration : DefaultUpnpServiceConfiguration(serverInfoProvider.port) { - override fun createStreamClient() = - ApacheStreamClient(ApacheStreamClientConfiguration(syncProtocolExecutorService)) - - override fun createStreamServer(networkAddressFactory: NetworkAddressFactory) = - MyStreamServerImpl(MyStreamServerConfiguration(networkAddressFactory.streamListenPort)) - - override fun createNetworkAddressFactory(streamListenPort: Int, multicastResponsePort: Int) = - MyNetworkAddressFactory(streamListenPort, multicastResponsePort) - } - - inner class MyNetworkAddressFactory( - streamListenPort: Int, - multicastResponsePort: Int - ) : NetworkAddressFactoryImpl(streamListenPort, multicastResponsePort) { - override fun isUsableAddress(iface: NetworkInterface, address: InetAddress) = - addressesToBind.contains(address.hostAddress) - } - companion object : KLogging() } diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpService.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpService.kt new file mode 100644 index 0000000..99996e9 --- /dev/null +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpService.kt @@ -0,0 +1,14 @@ +package net.schowek.nextclouddlna.dlna.upnp + +import org.jupnp.UpnpServiceConfiguration +import org.jupnp.UpnpServiceImpl +import org.jupnp.protocol.ProtocolFactory +import org.jupnp.registry.RegistryImpl +import org.springframework.stereotype.Component + +@Component +class MyUpnpService( + upnpServiceConfiguration: UpnpServiceConfiguration +) : UpnpServiceImpl(upnpServiceConfiguration) { + override fun createRegistry(pf: ProtocolFactory) = RegistryImpl(this) +} diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpServiceConfiguration.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpServiceConfiguration.kt new file mode 100644 index 0000000..9edff5c --- /dev/null +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpServiceConfiguration.kt @@ -0,0 +1,44 @@ +package net.schowek.nextclouddlna.dlna.upnp + +import net.schowek.nextclouddlna.dlna.upnp.transport.ApacheStreamClient +import net.schowek.nextclouddlna.dlna.upnp.transport.ApacheStreamClientConfiguration +import net.schowek.nextclouddlna.dlna.upnp.transport.MyStreamServerConfiguration +import net.schowek.nextclouddlna.dlna.upnp.transport.MyStreamServerImpl +import net.schowek.nextclouddlna.util.ServerInfoProvider +import org.jupnp.DefaultUpnpServiceConfiguration +import org.jupnp.transport.impl.NetworkAddressFactoryImpl +import org.jupnp.transport.spi.DatagramIO +import org.jupnp.transport.spi.NetworkAddressFactory +import org.springframework.context.annotation.Profile +import org.springframework.stereotype.Component +import java.net.InetAddress +import java.net.NetworkInterface + +@Component +@Profile("!integration") +class MyUpnpServiceConfiguration( + private val serverInfoProvider: ServerInfoProvider +) : DefaultUpnpServiceConfiguration(serverInfoProvider.port) { + val addressesToBind = listOf(serverInfoProvider.host) + + override fun createStreamClient() = + ApacheStreamClient(ApacheStreamClientConfiguration(syncProtocolExecutorService)) + + override fun createStreamServer(networkAddressFactory: NetworkAddressFactory) = + MyStreamServerImpl(MyStreamServerConfiguration(networkAddressFactory.streamListenPort)) + + override fun createDatagramIO(networkAddressFactory: NetworkAddressFactory): DatagramIO<*> { + return super.createDatagramIO(networkAddressFactory) + } + + override fun createNetworkAddressFactory(streamListenPort: Int, multicastResponsePort: Int) = + MyNetworkAddressFactory(serverInfoProvider, multicastResponsePort) + + inner class MyNetworkAddressFactory( + private val serverInfoProvider: ServerInfoProvider, + multicastResponsePort: Int + ) : NetworkAddressFactoryImpl(serverInfoProvider.port, multicastResponsePort) { + override fun isUsableAddress(iface: NetworkInterface, address: InetAddress) = + addressesToBind.contains(address.hostAddress) + } +} diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/ApacheStreamClient.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/ApacheStreamClient.kt similarity index 99% rename from src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/ApacheStreamClient.kt rename to src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/ApacheStreamClient.kt index 863b7ce..5e21fa4 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/ApacheStreamClient.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/ApacheStreamClient.kt @@ -1,4 +1,4 @@ -package net.schowek.nextclouddlna.dlna.transport +package net.schowek.nextclouddlna.dlna.upnp.transport import mu.KLogging import org.apache.http.HttpMessage diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/ApacheStreamClientConfiguration.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/ApacheStreamClientConfiguration.kt similarity index 90% rename from src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/ApacheStreamClientConfiguration.kt rename to src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/ApacheStreamClientConfiguration.kt index a05ca44..3d824ac 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/ApacheStreamClientConfiguration.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/ApacheStreamClientConfiguration.kt @@ -1,4 +1,4 @@ -package net.schowek.nextclouddlna.dlna.transport +package net.schowek.nextclouddlna.dlna.upnp.transport import org.jupnp.transport.spi.AbstractStreamClientConfiguration import java.util.concurrent.ExecutorService diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/MyStreamServerConfiguration.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/MyStreamServerConfiguration.kt similarity index 79% rename from src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/MyStreamServerConfiguration.kt rename to src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/MyStreamServerConfiguration.kt index 5df9171..e6fc950 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/MyStreamServerConfiguration.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/MyStreamServerConfiguration.kt @@ -1,4 +1,4 @@ -package net.schowek.nextclouddlna.dlna.transport +package net.schowek.nextclouddlna.dlna.upnp.transport import org.jupnp.transport.spi.StreamServerConfiguration diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/MyStreamServerImpl.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/MyStreamServerImpl.kt similarity index 90% rename from src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/MyStreamServerImpl.kt rename to src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/MyStreamServerImpl.kt index 5108ca7..e7d2eca 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/dlna/transport/MyStreamServerImpl.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/transport/MyStreamServerImpl.kt @@ -1,4 +1,4 @@ -package net.schowek.nextclouddlna.dlna.transport +package net.schowek.nextclouddlna.dlna.upnp.transport import mu.KLogging import org.jupnp.transport.Router From c3dadfd8455495ab6701f48d13fcf54214953050 Mon Sep 17 00:00:00 2001 From: xis Date: Thu, 19 Oct 2023 19:42:51 +0200 Subject: [PATCH 2/2] Multicast search request tested --- .../controller/UpnpControllerIntTest.groovy | 7 ++- .../dlna/DlnaServiceIntTest.groovy | 55 +++++++++++++++++++ .../support/IntegrationSpecification.groovy | 5 +- .../upnp/UpnpServiceConfigurationInt.groovy | 32 +++++++++-- .../controller/UpnpController.kt | 4 +- .../{DllnaService.kt => dlna/DlnaService.kt} | 5 +- .../dlna/{media => }/MediaServer.kt | 2 +- .../nextclouddlna/dlna/upnp/MyUpnpService.kt | 6 +- .../dlna/upnp/MyUpnpServiceConfiguration.kt | 6 +- .../nextcloud/content/ContentTreeProvider.kt | 19 +++---- .../nextcloud/{ => db}/NextcloudDB.kt | 3 +- .../content/ContentTreeProviderTest.groovy | 2 +- 12 files changed, 109 insertions(+), 37 deletions(-) create mode 100644 src/integration/groovy/net/schowek/nextclouddlna/dlna/DlnaServiceIntTest.groovy rename src/main/kotlin/net/schowek/nextclouddlna/{DllnaService.kt => dlna/DlnaService.kt} (92%) rename src/main/kotlin/net/schowek/nextclouddlna/dlna/{media => }/MediaServer.kt (97%) rename src/main/kotlin/net/schowek/nextclouddlna/nextcloud/{ => db}/NextcloudDB.kt (97%) diff --git a/src/integration/groovy/net/schowek/nextclouddlna/controller/UpnpControllerIntTest.groovy b/src/integration/groovy/net/schowek/nextclouddlna/controller/UpnpControllerIntTest.groovy index dcbfbbf..c41c7bd 100644 --- a/src/integration/groovy/net/schowek/nextclouddlna/controller/UpnpControllerIntTest.groovy +++ b/src/integration/groovy/net/schowek/nextclouddlna/controller/UpnpControllerIntTest.groovy @@ -1,7 +1,7 @@ package net.schowek.nextclouddlna.controller - -import net.schowek.nextclouddlna.dlna.media.MediaServer +import net.schowek.nextclouddlna.dlna.DlnaService +import net.schowek.nextclouddlna.dlna.MediaServer import org.jupnp.support.model.DIDLObject import org.springframework.beans.factory.annotation.Autowired import org.springframework.http.HttpStatus @@ -14,11 +14,14 @@ class UpnpControllerIntTest extends UpnpAwareSpecification { @Autowired private MediaServer mediaServer + @Autowired + private DlnaService dlnaService def uid def setup() { uid = mediaServer.serviceIdentifier + dlnaService.start() } def "should serve icon"() { diff --git a/src/integration/groovy/net/schowek/nextclouddlna/dlna/DlnaServiceIntTest.groovy b/src/integration/groovy/net/schowek/nextclouddlna/dlna/DlnaServiceIntTest.groovy new file mode 100644 index 0000000..f79b0de --- /dev/null +++ b/src/integration/groovy/net/schowek/nextclouddlna/dlna/DlnaServiceIntTest.groovy @@ -0,0 +1,55 @@ +package net.schowek.nextclouddlna.dlna + +import org.jupnp.UpnpService +import org.jupnp.model.message.discovery.OutgoingSearchRequest +import org.jupnp.model.message.header.HostHeader +import org.jupnp.model.message.header.MANHeader +import org.jupnp.model.message.header.STAllHeader +import org.jupnp.model.message.header.UpnpHeader +import org.jupnp.model.types.HostPort +import org.springframework.beans.factory.annotation.Autowired +import support.IntegrationSpecification +import support.beans.dlna.upnp.UpnpServiceConfigurationInt + +import static org.jupnp.model.Constants.IPV4_UPNP_MULTICAST_GROUP +import static org.jupnp.model.Constants.UPNP_MULTICAST_PORT +import static org.jupnp.model.message.UpnpRequest.Method.MSEARCH +import static org.jupnp.model.message.header.UpnpHeader.Type.* +import static org.jupnp.model.types.NotificationSubtype.ALL +import static org.jupnp.model.types.NotificationSubtype.DISCOVER + +class DlnaServiceIntTest extends IntegrationSpecification { + @Autowired + private UpnpService upnpService + @Autowired + private MediaServer mediaServer + + def "should send initial multicast Upnp datagrams on start"() { + given: + def configuration = upnpService.configuration as UpnpServiceConfigurationInt + def sut = new DlnaService(upnpService, mediaServer) + + expect: + configuration.outgoingDatagramMessages == [] + + when: + sut.start() + + then: + configuration.outgoingDatagramMessages.any() + configuration.outgoingDatagramMessages[0].class == OutgoingSearchRequest + with(configuration.outgoingDatagramMessages[0] as OutgoingSearchRequest) { + assert it.operation.method == MSEARCH + assert it.destinationAddress == InetAddress.getByName(IPV4_UPNP_MULTICAST_GROUP) + assert it.destinationPort == UPNP_MULTICAST_PORT + + assert header(it, MAN, MANHeader.class) == DISCOVER.headerString + assert header(it, ST, STAllHeader.class).headerString == ALL.headerString + assert header(it, HOST, HostHeader.class) == new HostPort(IPV4_UPNP_MULTICAST_GROUP, UPNP_MULTICAST_PORT) + } + } + + def T header(OutgoingSearchRequest request, UpnpHeader.Type type, Class> clazz) { + return clazz.cast(request.headers.get(type).find()).value + } +} diff --git a/src/integration/groovy/support/IntegrationSpecification.groovy b/src/integration/groovy/support/IntegrationSpecification.groovy index 0f51d52..ff4001d 100644 --- a/src/integration/groovy/support/IntegrationSpecification.groovy +++ b/src/integration/groovy/support/IntegrationSpecification.groovy @@ -7,17 +7,20 @@ import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.web.client.TestRestTemplate import org.springframework.context.annotation.Import +import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ActiveProfiles import org.springframework.test.context.ContextConfiguration import spock.lang.Specification import support.beans.TestConfig import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT +import static org.springframework.test.annotation.DirtiesContext.ClassMode.* @ContextConfiguration(loader = SpringBootContextLoader, classes = NextcloudDLNAApp.class) @SpringBootTest(webEnvironment = DEFINED_PORT) @ActiveProfiles("integration") @Import(TestConfig.class) +@DirtiesContext(classMode = AFTER_CLASS) class IntegrationSpecification extends Specification { @Autowired private TestRestTemplate restTemplate @@ -30,6 +33,6 @@ class IntegrationSpecification extends Specification { private ServerInfoProvider serverInfoProvider protected String urlWithPort(String uri = "") { - return "http://localhost:" + serverInfoProvider.port + uri; + return "http://" + serverInfoProvider.host + ":" + serverInfoProvider.port + uri; } } diff --git a/src/integration/groovy/support/beans/dlna/upnp/UpnpServiceConfigurationInt.groovy b/src/integration/groovy/support/beans/dlna/upnp/UpnpServiceConfigurationInt.groovy index 4d95c90..91b269e 100644 --- a/src/integration/groovy/support/beans/dlna/upnp/UpnpServiceConfigurationInt.groovy +++ b/src/integration/groovy/support/beans/dlna/upnp/UpnpServiceConfigurationInt.groovy @@ -1,6 +1,9 @@ package support.beans.dlna.upnp import org.jupnp.DefaultUpnpServiceConfiguration +import org.jupnp.model.message.OutgoingDatagramMessage +import org.jupnp.transport.impl.DatagramIOConfigurationImpl +import org.jupnp.transport.impl.DatagramIOImpl import org.jupnp.transport.spi.DatagramIO import org.jupnp.transport.spi.NetworkAddressFactory import org.jupnp.transport.spi.StreamClient @@ -11,19 +14,38 @@ import org.springframework.stereotype.Component @Component @Profile("integration") class UpnpServiceConfigurationInt extends DefaultUpnpServiceConfiguration { + List outgoingDatagramMessages = new ArrayList<>() + @Override public StreamClient createStreamClient() { return null } - @Override public StreamServer createStreamServer(NetworkAddressFactory networkAddressFactory) { return null } -// @Override -// public DatagramIO createDatagramIO(NetworkAddressFactory networkAddressFactory) { -// -// } + @Override + public DatagramIO createDatagramIO(NetworkAddressFactory networkAddressFactory) { + return new MockDatagramIO(this, new DatagramIOConfigurationImpl()) + } + + private void onOutgoingDatagramMessage(OutgoingDatagramMessage message) { + outgoingDatagramMessages.add(message) + } + + class MockDatagramIO extends DatagramIOImpl { + private final UpnpServiceConfigurationInt upnpServiceConfiguration + + MockDatagramIO(UpnpServiceConfigurationInt upnpServiceConfiguration, DatagramIOConfigurationImpl configuration) { + super(configuration) + this.upnpServiceConfiguration = upnpServiceConfiguration + } + + @Override + void send(OutgoingDatagramMessage message) { + upnpServiceConfiguration.onOutgoingDatagramMessage(message) + } + } } diff --git a/src/main/kotlin/net/schowek/nextclouddlna/controller/UpnpController.kt b/src/main/kotlin/net/schowek/nextclouddlna/controller/UpnpController.kt index 0aabcc8..3256c01 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/controller/UpnpController.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/controller/UpnpController.kt @@ -2,9 +2,9 @@ package net.schowek.nextclouddlna.controller import jakarta.servlet.http.HttpServletRequest import mu.KLogging -import net.schowek.nextclouddlna.DlnaService +import net.schowek.nextclouddlna.dlna.DlnaService import net.schowek.nextclouddlna.dlna.StreamMessageMapper -import net.schowek.nextclouddlna.dlna.media.MediaServer +import net.schowek.nextclouddlna.dlna.MediaServer import org.springframework.core.io.InputStreamResource import org.springframework.core.io.Resource import org.springframework.http.MediaType.APPLICATION_OCTET_STREAM_VALUE diff --git a/src/main/kotlin/net/schowek/nextclouddlna/DllnaService.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/DlnaService.kt similarity index 92% rename from src/main/kotlin/net/schowek/nextclouddlna/DllnaService.kt rename to src/main/kotlin/net/schowek/nextclouddlna/dlna/DlnaService.kt index 4c76a91..5e1c8e1 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/DllnaService.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/DlnaService.kt @@ -1,8 +1,7 @@ -package net.schowek.nextclouddlna +package net.schowek.nextclouddlna.dlna import jakarta.annotation.PreDestroy import mu.KLogging -import net.schowek.nextclouddlna.dlna.media.MediaServer import org.jupnp.UpnpService import org.jupnp.model.message.StreamRequestMessage import org.jupnp.model.message.StreamResponseMessage @@ -22,7 +21,7 @@ class DlnaService( upnpService.registry.addDevice(mediaServer.device) } - @EventListener + @EventListener(condition = "!@environment.acceptsProfiles('integration')") fun handleContextRefresh(event: ContextRefreshedEvent) { start() } diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/media/MediaServer.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/MediaServer.kt similarity index 97% rename from src/main/kotlin/net/schowek/nextclouddlna/dlna/media/MediaServer.kt rename to src/main/kotlin/net/schowek/nextclouddlna/dlna/MediaServer.kt index 5c0a1a6..208a64a 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/dlna/media/MediaServer.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/MediaServer.kt @@ -1,4 +1,4 @@ -package net.schowek.nextclouddlna.dlna.media +package net.schowek.nextclouddlna.dlna import mu.KLogging import net.schowek.nextclouddlna.util.ExternalUrls diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpService.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpService.kt index 99996e9..52051c7 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpService.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpService.kt @@ -2,13 +2,9 @@ package net.schowek.nextclouddlna.dlna.upnp import org.jupnp.UpnpServiceConfiguration import org.jupnp.UpnpServiceImpl -import org.jupnp.protocol.ProtocolFactory -import org.jupnp.registry.RegistryImpl import org.springframework.stereotype.Component @Component class MyUpnpService( upnpServiceConfiguration: UpnpServiceConfiguration -) : UpnpServiceImpl(upnpServiceConfiguration) { - override fun createRegistry(pf: ProtocolFactory) = RegistryImpl(this) -} +) : UpnpServiceImpl(upnpServiceConfiguration) diff --git a/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpServiceConfiguration.kt b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpServiceConfiguration.kt index 9edff5c..a8b65c4 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpServiceConfiguration.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/dlna/upnp/MyUpnpServiceConfiguration.kt @@ -32,12 +32,12 @@ class MyUpnpServiceConfiguration( } override fun createNetworkAddressFactory(streamListenPort: Int, multicastResponsePort: Int) = - MyNetworkAddressFactory(serverInfoProvider, multicastResponsePort) + MyNetworkAddressFactory(streamListenPort, multicastResponsePort) inner class MyNetworkAddressFactory( - private val serverInfoProvider: ServerInfoProvider, + streamListenPort: Int, multicastResponsePort: Int - ) : NetworkAddressFactoryImpl(serverInfoProvider.port, multicastResponsePort) { + ) : NetworkAddressFactoryImpl(streamListenPort, multicastResponsePort) { override fun isUsableAddress(iface: NetworkInterface, address: InetAddress) = addressesToBind.contains(address.hostAddress) } diff --git a/src/main/kotlin/net/schowek/nextclouddlna/nextcloud/content/ContentTreeProvider.kt b/src/main/kotlin/net/schowek/nextclouddlna/nextcloud/content/ContentTreeProvider.kt index a57e5e5..9712178 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/nextcloud/content/ContentTreeProvider.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/nextcloud/content/ContentTreeProvider.kt @@ -1,7 +1,7 @@ package net.schowek.nextclouddlna.nextcloud.content import mu.KLogging -import net.schowek.nextclouddlna.nextcloud.NextcloudDB +import net.schowek.nextclouddlna.nextcloud.db.NextcloudDB import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Component import java.time.Clock @@ -100,8 +100,8 @@ class ContentTreeProvider( } } - fun getItem(id: String): ContentItem? = tree.getItem(id) - fun getNode(id: String): ContentNode? = tree.getNode(id) + fun getItem(id: String) = tree.getItem(id) + fun getNode(id: String) = tree.getNode(id) companion object : KLogging() { const val REBUILD_TREE_DELAY_IN_MS = 1000 * 60L // 1m @@ -115,13 +115,11 @@ class ContentTree { private val nodes: MutableMap = HashMap() private val items: MutableMap = HashMap() - fun getNode(id: String): ContentNode? { - return nodes[id] - } + val itemsCount get() = items.size + val nodesCount get() = nodes.size - fun getItem(id: String): ContentItem? { - return items[id] - } + fun getNode(id: String) = nodes[id] + fun getItem(id: String) = items[id] fun addItem(item: ContentItem) { items["${item.id}"] = item @@ -130,8 +128,5 @@ class ContentTree { fun addNode(node: ContentNode) { nodes["${node.id}"] = node } - - val itemsCount get() = items.size - val nodesCount get() = nodes.size } diff --git a/src/main/kotlin/net/schowek/nextclouddlna/nextcloud/NextcloudDB.kt b/src/main/kotlin/net/schowek/nextclouddlna/nextcloud/db/NextcloudDB.kt similarity index 97% rename from src/main/kotlin/net/schowek/nextclouddlna/nextcloud/NextcloudDB.kt rename to src/main/kotlin/net/schowek/nextclouddlna/nextcloud/db/NextcloudDB.kt index 5eae2f2..8292cad 100644 --- a/src/main/kotlin/net/schowek/nextclouddlna/nextcloud/NextcloudDB.kt +++ b/src/main/kotlin/net/schowek/nextclouddlna/nextcloud/db/NextcloudDB.kt @@ -1,4 +1,4 @@ -package net.schowek.nextclouddlna.nextcloud +package net.schowek.nextclouddlna.nextcloud.db import jakarta.annotation.PostConstruct import mu.KLogging @@ -6,7 +6,6 @@ import net.schowek.nextclouddlna.nextcloud.config.NextcloudConfigDiscovery import net.schowek.nextclouddlna.nextcloud.content.ContentItem import net.schowek.nextclouddlna.nextcloud.content.ContentNode import net.schowek.nextclouddlna.nextcloud.content.MediaFormat -import net.schowek.nextclouddlna.nextcloud.db.* import net.schowek.nextclouddlna.nextcloud.db.Filecache.Companion.FOLDER_MIME_TYPE import org.springframework.dao.InvalidDataAccessResourceUsageException import org.springframework.stereotype.Component diff --git a/src/test/groovy/net/schowek/nextclouddlna/nextcloud/content/ContentTreeProviderTest.groovy b/src/test/groovy/net/schowek/nextclouddlna/nextcloud/content/ContentTreeProviderTest.groovy index 3bbecce..cd41fb7 100644 --- a/src/test/groovy/net/schowek/nextclouddlna/nextcloud/content/ContentTreeProviderTest.groovy +++ b/src/test/groovy/net/schowek/nextclouddlna/nextcloud/content/ContentTreeProviderTest.groovy @@ -1,6 +1,6 @@ package net.schowek.nextclouddlna.nextcloud.content -import net.schowek.nextclouddlna.nextcloud.NextcloudDB +import net.schowek.nextclouddlna.nextcloud.db.NextcloudDB import spock.lang.Specification import java.time.Clock import java.time.ZoneId