mirror of
https://github.com/slhaf/Partner.git
synced 2026-05-14 17:53:05 +08:00
Compare commits
8 Commits
release-ct
...
release-ct
| Author | SHA1 | Date | |
|---|---|---|---|
| 9054a9b4ad | |||
|
|
c8d5f577a1 | ||
| 7c82c4aea5 | |||
| 5491ad1747 | |||
| 1be6ed0198 | |||
| 01bfc3ee18 | |||
| 2d45adf8c3 | |||
| 707fddda79 |
5
.github/workflows/release-ctl.yml
vendored
5
.github/workflows/release-ctl.yml
vendored
@@ -130,6 +130,11 @@ jobs:
|
||||
echo "Ctl release tag: ${TAG}"
|
||||
echo "Ctl release version: ${VERSION}"
|
||||
|
||||
- name: Checkout release source
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ steps.release.outputs.tag }}
|
||||
|
||||
- name: Download release artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
|
||||
37
.idea/misc.xml
generated
37
.idea/misc.xml
generated
@@ -1,28 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="EntryPointsManager">
|
||||
<list size="21">
|
||||
<list size="22">
|
||||
<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="2" class="java.lang.String" itemvalue="picocli.CommandLine.Command" />
|
||||
<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="5" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore" />
|
||||
<item index="6" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod" />
|
||||
<item index="7" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.CoordinateManager" />
|
||||
<item index="8" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.capability.annotation.Coordinated" />
|
||||
<item index="9" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.component.annotation.Init" />
|
||||
<item index="10" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute" />
|
||||
<item index="11" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule" />
|
||||
<item index="12" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule" />
|
||||
<item index="13" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute" />
|
||||
<item index="14" class="java.lang.String" itemvalue="work.slhaf.partner.api.agent.factory.module.annotation.Init" />
|
||||
<item index="15" class="java.lang.String" itemvalue="work.slhaf.partner.api.capability.annotation.CapabilityMethod" />
|
||||
<item index="16" class="java.lang.String" itemvalue="work.slhaf.partner.api.capability.annotation.CoordinateManager" />
|
||||
<item index="17" class="java.lang.String" itemvalue="work.slhaf.partner.api.register.capability.annotation.Capability" />
|
||||
<item index="18" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore" />
|
||||
<item index="19" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod" />
|
||||
<item index="20" class="java.lang.String" itemvalue="work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent" />
|
||||
<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.Capability" />
|
||||
<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.CapabilityMethod" />
|
||||
<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.capability.annotation.Coordinated" />
|
||||
<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.AfterExecute" />
|
||||
<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.AgentSubModule" />
|
||||
<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.agent.factory.module.annotation.Init" />
|
||||
<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.capability.annotation.CoordinateManager" />
|
||||
<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.CapabilityCore" />
|
||||
<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>
|
||||
<writeAnnotations>
|
||||
<writeAnnotation name="work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability" />
|
||||
|
||||
@@ -6,10 +6,11 @@
|
||||
<parent>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>partner-core</artifactId>
|
||||
<version>0.5.0</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@@ -20,7 +21,7 @@
|
||||
<dependency>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner-framework</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>${partner.runtime.version}</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.nd4j/nd4j-api -->
|
||||
<dependency>
|
||||
|
||||
@@ -6,22 +6,23 @@
|
||||
<parent>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner-external-modules</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>partner-onebot-adapter</artifactId>
|
||||
<version>1.0.0</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<version>${partner.runtime.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner-framework</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<version>${partner.runtime.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
@@ -6,10 +6,11 @@
|
||||
<parent>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>partner-external-modules</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
|
||||
@@ -6,10 +6,11 @@
|
||||
<parent>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>partner-framework</artifactId>
|
||||
<version>0.5.0</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@@ -86,7 +87,7 @@
|
||||
<dependency>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner-interaction-api</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>${partner.interaction-api.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
@@ -6,10 +6,11 @@
|
||||
<parent>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>partner-interaction-api</artifactId>
|
||||
<version>1.0.0</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
|
||||
@@ -6,10 +6,11 @@
|
||||
<parent>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>partnerctl</artifactId>
|
||||
<version>1.0.0</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
@@ -44,7 +45,7 @@
|
||||
<dependency>
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner-interaction-api</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>${partner.interaction-api.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
@@ -64,7 +64,8 @@ fun configureExternalGateway(home: Path, prompt: Prompt, manifest: ModuleManifes
|
||||
text("configure.gateway.external.details.buildCommand") to manifest.source.buildCommand.joinToString(" "),
|
||||
text("configure.gateway.external.details.artifact") to "${manifest.source.artifactDirectory}/${manifest.source.artifactPattern}",
|
||||
text("configure.gateway.external.details.installTarget") to manifest.install.target,
|
||||
text("configure.gateway.external.details.configTarget") to (manifest.config?.target ?: text("configure.gateway.external.details.noConfig")),
|
||||
text("configure.gateway.external.details.configTarget") to (manifest.config?.target
|
||||
?: text("configure.gateway.external.details.noConfig")),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -138,18 +139,43 @@ private fun askField(prompt: Prompt, field: Field): JsonElement? {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("KotlinConstantConditions")
|
||||
private fun validateFieldValue(field: Field, value: String): String? {
|
||||
if (value.isBlank() && !field.required) return null
|
||||
|
||||
return when (field.type) {
|
||||
FieldType.STRING -> null
|
||||
FieldType.INT -> value.toIntOrNull()?.let { null } ?: text("configure.field.error.int", field.label)
|
||||
FieldType.NUMBER -> value.toDoubleOrNull()?.let { null } ?: text("configure.field.error.number", field.label)
|
||||
FieldType.BOOLEAN -> value.toBooleanStrictOrNull()?.let { null } ?: text("configure.field.error.boolean", field.label)
|
||||
FieldType.RAW_JSON -> runCatching { Json.parseToJsonElement(value) }
|
||||
.exceptionOrNull()
|
||||
?.let { text("configure.field.error.rawJson", field.label) }
|
||||
FieldType.INT -> {
|
||||
if (value.toIntOrNull() == null) {
|
||||
text("configure.field.error.int", field.label)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
FieldType.NUMBER -> {
|
||||
if (value.toDoubleOrNull() == null) {
|
||||
text("configure.field.error.number", field.label)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
FieldType.BOOLEAN -> {
|
||||
if (value.toBooleanStrictOrNull() == null) {
|
||||
text("configure.field.error.boolean", field.label)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
FieldType.RAW_JSON -> {
|
||||
val result = runCatching { Json.parseToJsonElement(value) }.exceptionOrNull()
|
||||
if (result == null) {
|
||||
text("configure.field.error.rawJson", field.label)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ import java.nio.file.Paths
|
||||
import kotlin.io.path.isDirectory
|
||||
import kotlin.io.path.name
|
||||
|
||||
private const val PARTNER_REPO_URL = "https://gitea.slhaf.work/slhaf/Partner.git"
|
||||
private const val PARTNER_REPO_URL = "https://github.com/slhaf/Partner.git"
|
||||
|
||||
fun buildFromSource(home: Path, prompt: Prompt) {
|
||||
buildAndInstallFromSource(
|
||||
|
||||
@@ -1,10 +1,20 @@
|
||||
package work.slhaf.partner.ctl.support
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.Json
|
||||
|
||||
private const val registryUrl = "https://raw.githubusercontent.com/slhaf/Partner/refs/heads/master/registry"
|
||||
private const val indexUrl = "$registryUrl/index.json"
|
||||
|
||||
private val registryIndex = run {
|
||||
Json.decodeFromString<RegistryIndex>(fetchText(indexUrl))
|
||||
}
|
||||
|
||||
private fun loadModules(): Set<ModuleManifest> {
|
||||
// TODO: 待实现具体加载逻辑
|
||||
return emptySet()
|
||||
return registryIndex.externalModules.map { indexItem ->
|
||||
val manifestStr = fetchText("$registryUrl/${indexItem.registryRef}")
|
||||
return@map Json.decodeFromString<ModuleManifest>(manifestStr)
|
||||
}.toSet()
|
||||
}
|
||||
|
||||
fun loadAvailableGateway(): Set<ModuleManifest> {
|
||||
@@ -92,3 +102,35 @@ enum class FieldType {
|
||||
BOOLEAN,
|
||||
RAW_JSON,
|
||||
}
|
||||
|
||||
@Serializable
|
||||
data class RegistryIndex(
|
||||
val partner: PartnerIndex,
|
||||
val externalModules: List<ModulesIndexItem>
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class PartnerIndex(
|
||||
val latestBuildable: Buildable,
|
||||
val latestRelease: Release
|
||||
) {
|
||||
@Serializable
|
||||
data class Buildable(
|
||||
val url: String,
|
||||
val ref: String
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class Release(
|
||||
val url: String,
|
||||
val version: String
|
||||
)
|
||||
}
|
||||
|
||||
@Serializable
|
||||
data class ModulesIndexItem(
|
||||
val name: String,
|
||||
val version: String,
|
||||
val withGateway: Boolean,
|
||||
val registryRef: String
|
||||
)
|
||||
@@ -0,0 +1,74 @@
|
||||
package work.slhaf.partner.ctl.support
|
||||
|
||||
import java.io.IOException
|
||||
import java.net.InetSocketAddress
|
||||
import java.net.ProxySelector
|
||||
import java.net.URI
|
||||
import java.net.http.*
|
||||
import java.time.Duration
|
||||
|
||||
private val httpClient: HttpClient = HttpClient.newBuilder()
|
||||
.connectTimeout(Duration.ofSeconds(20))
|
||||
.followRedirects(HttpClient.Redirect.NEVER)
|
||||
.apply {
|
||||
proxySelectorFromEnv()?.let(::proxy)
|
||||
}
|
||||
.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 {
|
||||
var lastError: Exception? = null
|
||||
|
||||
repeat(3) { attempt ->
|
||||
try {
|
||||
val request = HttpRequest.newBuilder()
|
||||
.uri(URI.create(url))
|
||||
.timeout(Duration.ofSeconds(60))
|
||||
.header("User-Agent", "partnerctl")
|
||||
.GET()
|
||||
.build()
|
||||
|
||||
val response = httpClient.send(
|
||||
request,
|
||||
HttpResponse.BodyHandlers.ofString()
|
||||
)
|
||||
|
||||
if (response.statusCode() !in 200..299) {
|
||||
throw IOException("Failed to fetch $url: HTTP ${response.statusCode()}")
|
||||
}
|
||||
|
||||
return response.body()
|
||||
} catch (e: HttpTimeoutException) {
|
||||
lastError = e
|
||||
} catch (e: HttpConnectTimeoutException) {
|
||||
lastError = e
|
||||
} catch (e: IOException) {
|
||||
lastError = e
|
||||
} catch (e: InterruptedException) {
|
||||
Thread.currentThread().interrupt()
|
||||
throw IOException("Interrupted while fetching $url", e)
|
||||
}
|
||||
|
||||
if (attempt < 2) {
|
||||
Thread.sleep(500L * (attempt + 1))
|
||||
}
|
||||
}
|
||||
|
||||
throw IOException("Failed to fetch $url after retries", lastError)
|
||||
}
|
||||
12
PartnerCtl/src/test/java/experimental/WebFetchTest.kt
Normal file
12
PartnerCtl/src/test/java/experimental/WebFetchTest.kt
Normal file
@@ -0,0 +1,12 @@
|
||||
package experimental
|
||||
|
||||
import kotlinx.serialization.json.Json
|
||||
import work.slhaf.partner.ctl.support.RegistryIndex
|
||||
import work.slhaf.partner.ctl.support.fetchText
|
||||
|
||||
|
||||
fun main() {
|
||||
val str = fetchText("https://raw.githubusercontent.com/slhaf/Partner/refs/heads/master/registry/index.json")
|
||||
val index = Json.decodeFromString<RegistryIndex>(str)
|
||||
println(index)
|
||||
}
|
||||
5
pom.xml
5
pom.xml
@@ -5,7 +5,7 @@
|
||||
|
||||
<groupId>work.slhaf.partner</groupId>
|
||||
<artifactId>partner</artifactId>
|
||||
<version>0.5.0</version>
|
||||
<version>1.0.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
@@ -26,6 +26,9 @@
|
||||
|
||||
<!-- 推荐仓库默认不跳测试;本地需要时再 -DskipTests=true -->
|
||||
<skipTests>false</skipTests>
|
||||
|
||||
<partner.runtime.version>0.5.0</partner.runtime.version>
|
||||
<partner.interaction-api.version>1.0.0</partner.interaction-api.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
"externalModules": [
|
||||
{
|
||||
"name": "OneBot Adapter",
|
||||
"version": "0.5.0",
|
||||
"version": "1.0.0",
|
||||
"withGateway": true,
|
||||
"registryRef": "modules/onebot-adapter.json"
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"id": "onebot_channel",
|
||||
"name": "OneBot Adapter",
|
||||
"version": "0.5.0",
|
||||
"version": "1.0.0",
|
||||
"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.",
|
||||
"source": {
|
||||
|
||||
Reference in New Issue
Block a user