mirror of
https://github.com/slhaf/Partner.git
synced 2026-06-28 01:59:17 +08:00
Compare commits
7 Commits
2d45adf8c3
...
release-co
| Author | SHA1 | Date | |
|---|---|---|---|
| 8bb266a1c3 | |||
| 9054a9b4ad | |||
|
|
c8d5f577a1 | ||
| 7c82c4aea5 | |||
| 5491ad1747 | |||
| 1be6ed0198 | |||
| 01bfc3ee18 |
37
.idea/misc.xml
generated
37
.idea/misc.xml
generated
@@ -1,28 +1,29 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<list size="21">
|
<list size="22">
|
||||||
<item index="0" class="java.lang.String" itemvalue="lombok.Data" />
|
<item index="0" class="java.lang.String" itemvalue="lombok.Data" />
|
||||||
<item index="1" class="java.lang.String" itemvalue="net.bytebuddy.implementation.bind.annotation.RuntimeType" />
|
<item index="1" class="java.lang.String" itemvalue="net.bytebuddy.implementation.bind.annotation.RuntimeType" />
|
||||||
<item index="2" class="java.lang.String" itemvalue="picocli.CommandLine.Command" />
|
<item index="2" class="java.lang.String" itemvalue="picocli.CommandLine.Command" />
|
||||||
<item index="3" class="java.lang.String" itemvalue="picocli.CommandLine.Mixin" />
|
<item index="3" class="java.lang.String" itemvalue="picocli.CommandLine.Mixin" />
|
||||||
<item index="4" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.Capability" />
|
<item index="4" class="java.lang.String" itemvalue="picocli.CommandLine.Option" />
|
||||||
<item index="5" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore" />
|
<item index="5" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.Capability" />
|
||||||
<item index="6" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod" />
|
<item index="6" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore" />
|
||||||
<item index="7" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CoordinateManager" />
|
<item index="7" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod" />
|
||||||
<item index="8" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.Coordinated" />
|
<item index="8" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CoordinateManager" />
|
||||||
<item index="9" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.component.annotation.Init" />
|
<item index="9" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.Coordinated" />
|
||||||
<item index="10" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute" />
|
<item index="10" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.component.annotation.Init" />
|
||||||
<item index="11" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule" />
|
<item index="11" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute" />
|
||||||
<item index="12" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule" />
|
<item index="12" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule" />
|
||||||
<item index="13" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute" />
|
<item index="13" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule" />
|
||||||
<item index="14" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.Init" />
|
<item index="14" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute" />
|
||||||
<item index="15" class="java.lang.String" itemvalue="work.slhaf.partner.api.capability.annotation.CapabilityMethod" />
|
<item index="15" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.Init" />
|
||||||
<item index="16" class="java.lang.String" itemvalue="work.slhaf.partner.api.capability.annotation.CoordinateManager" />
|
<item index="16" class="java.lang.String" itemvalue="work.slhaf.partner.api.capability.annotation.CapabilityMethod" />
|
||||||
<item index="17" class="java.lang.String" itemvalue="work.slhaf.partner.api.register.capability.annotation.Capability" />
|
<item index="17" class="java.lang.String" itemvalue="work.slhaf.partner.api.capability.annotation.CoordinateManager" />
|
||||||
<item index="18" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore" />
|
<item index="18" class="java.lang.String" itemvalue="work.slhaf.partner.api.register.capability.annotation.Capability" />
|
||||||
<item index="19" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod" />
|
<item index="19" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore" />
|
||||||
<item index="20" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent" />
|
<item index="20" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod" />
|
||||||
|
<item index="21" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent" />
|
||||||
</list>
|
</list>
|
||||||
<writeAnnotations>
|
<writeAnnotations>
|
||||||
<writeAnnotation name="work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability" />
|
<writeAnnotation name="work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability" />
|
||||||
|
|||||||
@@ -6,10 +6,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner</artifactId>
|
<artifactId>partner</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>1.0.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>partner-core</artifactId>
|
<artifactId>partner-core</artifactId>
|
||||||
|
<version>0.9.0-preview</version>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -20,7 +21,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner-framework</artifactId>
|
<artifactId>partner-framework</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>${partner.runtime.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- https://mvnrepository.com/artifact/org.nd4j/nd4j-api -->
|
<!-- https://mvnrepository.com/artifact/org.nd4j/nd4j-api -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -6,22 +6,23 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner-external-modules</artifactId>
|
<artifactId>partner-external-modules</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>1.0.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>partner-onebot-adapter</artifactId>
|
<artifactId>partner-onebot-adapter</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner-core</artifactId>
|
<artifactId>partner-core</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${partner.runtime.version}</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner-framework</artifactId>
|
<artifactId>partner-framework</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${partner.runtime.version}</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@@ -6,10 +6,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner</artifactId>
|
<artifactId>partner</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>1.0.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>partner-external-modules</artifactId>
|
<artifactId>partner-external-modules</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
|||||||
@@ -6,10 +6,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner</artifactId>
|
<artifactId>partner</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>1.0.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>partner-framework</artifactId>
|
<artifactId>partner-framework</artifactId>
|
||||||
|
<version>0.9.0-preview</version>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -86,7 +87,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner-interaction-api</artifactId>
|
<artifactId>partner-interaction-api</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>${partner.interaction-api.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|||||||
@@ -6,10 +6,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner</artifactId>
|
<artifactId>partner</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>1.0.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>partner-interaction-api</artifactId>
|
<artifactId>partner-interaction-api</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>21</maven.compiler.source>
|
<maven.compiler.source>21</maven.compiler.source>
|
||||||
|
|||||||
@@ -6,10 +6,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner</artifactId>
|
<artifactId>partner</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>1.0.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>partnerctl</artifactId>
|
<artifactId>partnerctl</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>21</maven.compiler.source>
|
<maven.compiler.source>21</maven.compiler.source>
|
||||||
@@ -44,7 +45,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner-interaction-api</artifactId>
|
<artifactId>partner-interaction-api</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>${partner.interaction-api.version}</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package work.slhaf.partner.ctl.support
|
package work.slhaf.partner.ctl.support
|
||||||
|
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
|
import java.net.InetSocketAddress
|
||||||
|
import java.net.ProxySelector
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
import java.net.http.*
|
import java.net.http.*
|
||||||
import java.time.Duration
|
import java.time.Duration
|
||||||
@@ -8,8 +10,28 @@ import java.time.Duration
|
|||||||
private val httpClient: HttpClient = HttpClient.newBuilder()
|
private val httpClient: HttpClient = HttpClient.newBuilder()
|
||||||
.connectTimeout(Duration.ofSeconds(20))
|
.connectTimeout(Duration.ofSeconds(20))
|
||||||
.followRedirects(HttpClient.Redirect.NEVER)
|
.followRedirects(HttpClient.Redirect.NEVER)
|
||||||
|
.apply {
|
||||||
|
proxySelectorFromEnv()?.let(::proxy)
|
||||||
|
}
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
|
private fun proxySelectorFromEnv(): ProxySelector? {
|
||||||
|
val proxyText = System.getenv("HTTPS_PROXY")
|
||||||
|
?: System.getenv("https_proxy")
|
||||||
|
?: return null
|
||||||
|
|
||||||
|
val proxyUri = URI.create(proxyText)
|
||||||
|
val host = proxyUri.host
|
||||||
|
?: throw IllegalArgumentException("Invalid HTTPS_PROXY host: $proxyText")
|
||||||
|
|
||||||
|
val port = proxyUri.port
|
||||||
|
if (port == -1) {
|
||||||
|
throw IllegalArgumentException("HTTPS_PROXY must include port: $proxyText")
|
||||||
|
}
|
||||||
|
|
||||||
|
return ProxySelector.of(InetSocketAddress(host, port))
|
||||||
|
}
|
||||||
|
|
||||||
fun fetchText(url: String): String {
|
fun fetchText(url: String): String {
|
||||||
var lastError: Exception? = null
|
var lastError: Exception? = null
|
||||||
|
|
||||||
|
|||||||
5
pom.xml
5
pom.xml
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>work.slhaf.partner</groupId>
|
<groupId>work.slhaf.partner</groupId>
|
||||||
<artifactId>partner</artifactId>
|
<artifactId>partner</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>1.0.0</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -26,6 +26,9 @@
|
|||||||
|
|
||||||
<!-- 推荐仓库默认不跳测试;本地需要时再 -DskipTests=true -->
|
<!-- 推荐仓库默认不跳测试;本地需要时再 -DskipTests=true -->
|
||||||
<skipTests>false</skipTests>
|
<skipTests>false</skipTests>
|
||||||
|
|
||||||
|
<partner.runtime.version>0.9.0-preview</partner.runtime.version>
|
||||||
|
<partner.interaction-api.version>1.0.0</partner.interaction-api.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
"externalModules": [
|
"externalModules": [
|
||||||
{
|
{
|
||||||
"name": "OneBot Adapter",
|
"name": "OneBot Adapter",
|
||||||
"version": "0.5.0",
|
"version": "1.0.0",
|
||||||
"withGateway": true,
|
"withGateway": true,
|
||||||
"registryRef": "modules/onebot-adapter.json"
|
"registryRef": "modules/onebot-adapter.json"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"id": "onebot_channel",
|
"id": "onebot_channel",
|
||||||
"name": "OneBot Adapter",
|
"name": "OneBot Adapter",
|
||||||
"version": "0.5.0",
|
"version": "1.0.0",
|
||||||
"withGateway": true,
|
"withGateway": true,
|
||||||
"description": "OneBot v11 reverse WebSocket gateway adapter for Partner. It accepts reverse WebSocket connections from a OneBot implementation and converts private message events into Partner input events.",
|
"description": "OneBot v11 reverse WebSocket gateway adapter for Partner. It accepts reverse WebSocket connections from a OneBot implementation and converts private message events into Partner input events.",
|
||||||
"source": {
|
"source": {
|
||||||
|
|||||||
Reference in New Issue
Block a user