Compare commits
4 Commits
6bfa0f3f28
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0fb9be9dee | ||
|
|
b571180b89 | ||
|
|
108590443c | ||
| ea764f637e |
@@ -59,8 +59,8 @@ export function validateYonexusServerConfig(raw: unknown): YonexusServerConfig {
|
|||||||
.filter((value) => value.length > 0)
|
.filter((value) => value.length > 0)
|
||||||
: [];
|
: [];
|
||||||
|
|
||||||
if (!Array.isArray(rawIdentifiers) || followerIdentifiers.length === 0) {
|
if (!Array.isArray(rawIdentifiers)) {
|
||||||
issues.push("followerIdentifiers must contain at least one non-empty identifier");
|
issues.push("followerIdentifiers must be an array");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new Set(followerIdentifiers).size !== followerIdentifiers.length) {
|
if (new Set(followerIdentifiers).size !== followerIdentifiers.length) {
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import {
|
|||||||
type ClientRecord,
|
type ClientRecord,
|
||||||
type ServerRegistry
|
type ServerRegistry
|
||||||
} from "./persistence.js";
|
} from "./persistence.js";
|
||||||
import { verifySignature } from "../../../Yonexus.Client/plugin/crypto/keypair.js";
|
import { verifySignature } from "../../../Yonexus.Protocol/src/crypto.js";
|
||||||
import type { YonexusServerStore } from "./store.js";
|
import type { YonexusServerStore } from "./store.js";
|
||||||
import { type ClientConnection, type ServerTransport } from "./transport.js";
|
import { type ClientConnection, type ServerTransport } from "./transport.js";
|
||||||
import { createPairingService, type PairingService } from "../services/pairing.js";
|
import { createPairingService, type PairingService } from "../services/pairing.js";
|
||||||
|
|||||||
@@ -19,6 +19,6 @@
|
|||||||
"listenPort": { "type": "number" },
|
"listenPort": { "type": "number" },
|
||||||
"publicWsUrl": { "type": "string" }
|
"publicWsUrl": { "type": "string" }
|
||||||
},
|
},
|
||||||
"required": ["followerIdentifiers", "notifyBotToken", "adminUserId", "listenPort"]
|
"required": ["notifyBotToken", "adminUserId", "listenPort"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2
protocol
2
protocol
Submodule protocol updated: 2611304084...ccdf167daf
@@ -3,6 +3,7 @@
|
|||||||
import fs from "node:fs";
|
import fs from "node:fs";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import os from "node:os";
|
import os from "node:os";
|
||||||
|
import { execSync } from "node:child_process";
|
||||||
|
|
||||||
const args = process.argv.slice(2);
|
const args = process.argv.slice(2);
|
||||||
const mode = args.includes("--install") ? "install" : args.includes("--uninstall") ? "uninstall" : null;
|
const mode = args.includes("--install") ? "install" : args.includes("--uninstall") ? "uninstall" : null;
|
||||||
@@ -15,9 +16,42 @@ if (!mode) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const repoRoot = path.resolve(import.meta.dirname, "..");
|
const repoRoot = path.resolve(import.meta.dirname, "..");
|
||||||
const pluginName = "Yonexus.Server";
|
const pluginId = "yonexus-server";
|
||||||
const sourceDist = path.join(repoRoot, "dist");
|
const sourceDist = path.join(repoRoot, "dist");
|
||||||
const targetDir = path.join(profilePath, "plugins", pluginName);
|
const targetDir = path.join(profilePath, "plugins", pluginId);
|
||||||
|
|
||||||
|
function oc(cmd) {
|
||||||
|
try {
|
||||||
|
return execSync(`openclaw ${cmd}`, { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
|
||||||
|
} catch (e) {
|
||||||
|
console.error(` ⚠ openclaw ${cmd}: ${e.stderr?.trim() || e.message}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function ensureInArray(configKey, value) {
|
||||||
|
const raw = oc(`config get ${configKey}`);
|
||||||
|
if (!raw) return;
|
||||||
|
const arr = JSON.parse(raw);
|
||||||
|
if (!arr.includes(value)) {
|
||||||
|
arr.push(value);
|
||||||
|
oc(`config set ${configKey} '${JSON.stringify(arr)}' --json`);
|
||||||
|
console.log(` ✓ ${configKey} includes ${value}`);
|
||||||
|
} else {
|
||||||
|
console.log(` ✓ ${configKey} already includes ${value}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeFromArray(configKey, value) {
|
||||||
|
const raw = oc(`config get ${configKey}`);
|
||||||
|
if (!raw) return;
|
||||||
|
const arr = JSON.parse(raw);
|
||||||
|
const filtered = arr.filter(v => v !== value);
|
||||||
|
if (filtered.length !== arr.length) {
|
||||||
|
oc(`config set ${configKey} '${JSON.stringify(filtered)}' --json`);
|
||||||
|
console.log(` ✓ Removed ${value} from ${configKey}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (mode === "install") {
|
if (mode === "install") {
|
||||||
if (!fs.existsSync(sourceDist)) {
|
if (!fs.existsSync(sourceDist)) {
|
||||||
@@ -30,9 +64,16 @@ if (mode === "install") {
|
|||||||
fs.cpSync(sourceDist, path.join(targetDir, "dist"), { recursive: true });
|
fs.cpSync(sourceDist, path.join(targetDir, "dist"), { recursive: true });
|
||||||
fs.copyFileSync(path.join(repoRoot, "plugin", "openclaw.plugin.json"), path.join(targetDir, "openclaw.plugin.json"));
|
fs.copyFileSync(path.join(repoRoot, "plugin", "openclaw.plugin.json"), path.join(targetDir, "openclaw.plugin.json"));
|
||||||
fs.copyFileSync(path.join(repoRoot, "package.json"), path.join(targetDir, "package.json"));
|
fs.copyFileSync(path.join(repoRoot, "package.json"), path.join(targetDir, "package.json"));
|
||||||
console.log(`Installed ${pluginName} to ${targetDir}`);
|
console.log(` ✓ Plugin files → ${targetDir}`);
|
||||||
|
|
||||||
|
ensureInArray("plugins.load.paths", targetDir);
|
||||||
|
ensureInArray("plugins.allow", pluginId);
|
||||||
|
console.log(`Installed ${pluginId} to ${targetDir}`);
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// uninstall
|
||||||
fs.rmSync(targetDir, { recursive: true, force: true });
|
fs.rmSync(targetDir, { recursive: true, force: true });
|
||||||
console.log(`Removed ${pluginName} from ${targetDir}`);
|
removeFromArray("plugins.load.paths", targetDir);
|
||||||
|
removeFromArray("plugins.allow", pluginId);
|
||||||
|
console.log(`Removed ${pluginId} from ${targetDir}`);
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { createYonexusServerRuntime } from "../plugin/core/runtime.js";
|
|||||||
import type { ClientRecord } from "../plugin/core/persistence.js";
|
import type { ClientRecord } from "../plugin/core/persistence.js";
|
||||||
import type { YonexusServerStore } from "../plugin/core/store.js";
|
import type { YonexusServerStore } from "../plugin/core/store.js";
|
||||||
import type { ClientConnection, ServerTransport } from "../plugin/core/transport.js";
|
import type { ClientConnection, ServerTransport } from "../plugin/core/transport.js";
|
||||||
import { generateKeyPair, signMessage } from "../../Yonexus.Client/plugin/crypto/keypair.js";
|
import { generateKeyPair, signMessage } from "../../Yonexus.Protocol/src/crypto.js";
|
||||||
|
|
||||||
function createMockSocket() {
|
function createMockSocket() {
|
||||||
return { close: vi.fn() } as unknown as ClientConnection["ws"];
|
return { close: vi.fn() } as unknown as ClientConnection["ws"];
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import { createYonexusServerRuntime } from "../plugin/core/runtime.js";
|
|||||||
import type { ClientRecord } from "../plugin/core/persistence.js";
|
import type { ClientRecord } from "../plugin/core/persistence.js";
|
||||||
import type { YonexusServerStore } from "../plugin/core/store.js";
|
import type { YonexusServerStore } from "../plugin/core/store.js";
|
||||||
import type { ClientConnection, ServerTransport } from "../plugin/core/transport.js";
|
import type { ClientConnection, ServerTransport } from "../plugin/core/transport.js";
|
||||||
import { generateKeyPair, signMessage, verifySignature } from "../../Yonexus.Client/plugin/crypto/keypair.js";
|
import { generateKeyPair, signMessage, verifySignature } from "../../Yonexus.Protocol/src/crypto.js";
|
||||||
|
|
||||||
function createMockSocket() {
|
function createMockSocket() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user