Compare commits
7 Commits
59d5b26aff
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0fb9be9dee | ||
|
|
b571180b89 | ||
|
|
108590443c | ||
| ea764f637e | |||
| 6bfa0f3f28 | |||
| a8748f8c55 | |||
| 07c670c272 |
@@ -59,8 +59,8 @@ export function validateYonexusServerConfig(raw: unknown): YonexusServerConfig {
|
||||
.filter((value) => value.length > 0)
|
||||
: [];
|
||||
|
||||
if (!Array.isArray(rawIdentifiers) || followerIdentifiers.length === 0) {
|
||||
issues.push("followerIdentifiers must contain at least one non-empty identifier");
|
||||
if (!Array.isArray(rawIdentifiers)) {
|
||||
issues.push("followerIdentifiers must be an array");
|
||||
}
|
||||
|
||||
if (new Set(followerIdentifiers).size !== followerIdentifiers.length) {
|
||||
|
||||
@@ -38,7 +38,7 @@ import {
|
||||
type ClientRecord,
|
||||
type ServerRegistry
|
||||
} 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 ClientConnection, type ServerTransport } from "./transport.js";
|
||||
import { createPairingService, type PairingService } from "../services/pairing.js";
|
||||
|
||||
@@ -34,12 +34,18 @@ import path from "node:path";
|
||||
import fs from "node:fs";
|
||||
import { validateYonexusServerConfig } from "./core/config.js";
|
||||
import { createYonexusServerStore } from "./core/store.js";
|
||||
import { createServerTransport } from "./core/transport.js";
|
||||
import { createServerTransport, type ServerTransport } from "./core/transport.js";
|
||||
import { createYonexusServerRuntime } from "./core/runtime.js";
|
||||
import { createServerRuleRegistry } from "./core/rules.js";
|
||||
import { createServerRuleRegistry, YonexusServerRuleRegistry } from "./core/rules.js";
|
||||
import { encodeRuleMessage } from "../../Yonexus.Protocol/src/index.js";
|
||||
import type { ServerPersistenceData } from "./core/persistence.js";
|
||||
|
||||
const _G = globalThis as Record<string, unknown>;
|
||||
const _STARTED_KEY = "_yonexusServerStarted";
|
||||
const _TRANSPORT_KEY = "_yonexusServerTransport";
|
||||
const _REGISTRY_KEY = "_yonexusServerRegistry";
|
||||
const _CALLBACKS_KEY = "_yonexusServerOnAuthCallbacks";
|
||||
|
||||
export interface YonexusServerPluginManifest {
|
||||
readonly name: "Yonexus.Server";
|
||||
readonly version: string;
|
||||
@@ -52,8 +58,6 @@ const manifest: YonexusServerPluginManifest = {
|
||||
description: "Yonexus central hub plugin for cross-instance OpenClaw communication"
|
||||
};
|
||||
|
||||
let _serverStarted = false;
|
||||
|
||||
export function createYonexusServerPlugin(api: {
|
||||
rootDir: string;
|
||||
pluginConfig: unknown;
|
||||
@@ -138,15 +142,34 @@ export function createYonexusServerPlugin(api: {
|
||||
});
|
||||
}, { commands: ["yonexus-server"] });
|
||||
|
||||
if (_serverStarted) return;
|
||||
_serverStarted = true;
|
||||
// 1. Ensure shared state survives hot-reload — only initialise when absent
|
||||
if (!(_G[_REGISTRY_KEY] instanceof YonexusServerRuleRegistry)) {
|
||||
_G[_REGISTRY_KEY] = createServerRuleRegistry();
|
||||
}
|
||||
if (!Array.isArray(_G[_CALLBACKS_KEY])) {
|
||||
_G[_CALLBACKS_KEY] = [];
|
||||
}
|
||||
|
||||
const ruleRegistry = _G[_REGISTRY_KEY] as YonexusServerRuleRegistry;
|
||||
const onClientAuthenticatedCallbacks = _G[_CALLBACKS_KEY] as Array<(identifier: string) => void>;
|
||||
|
||||
// 2. Refresh the cross-plugin API object every call so that sendRule closure
|
||||
// always reads the live transport from globalThis.
|
||||
_G["__yonexusServer"] = {
|
||||
ruleRegistry,
|
||||
sendRule: (identifier: string, ruleId: string, content: string): boolean =>
|
||||
(_G[_TRANSPORT_KEY] as ServerTransport | undefined)?.send(identifier, encodeRuleMessage(ruleId, content)) ?? false,
|
||||
onClientAuthenticated: onClientAuthenticatedCallbacks
|
||||
};
|
||||
|
||||
// 3. Start the runtime only once — the globalThis flag survives hot-reload
|
||||
if (_G[_STARTED_KEY]) return;
|
||||
_G[_STARTED_KEY] = true;
|
||||
|
||||
const config = validateYonexusServerConfig(api.pluginConfig);
|
||||
const store = createYonexusServerStore(stateFilePath);
|
||||
|
||||
const ruleRegistry = createServerRuleRegistry();
|
||||
const onClientAuthenticatedCallbacks: Array<(identifier: string) => void> = [];
|
||||
|
||||
// runtimeRef is local; transport is stored in globalThis so sendRule closures stay valid
|
||||
let runtimeRef: ReturnType<typeof createYonexusServerRuntime> | null = null;
|
||||
const transport = createServerTransport({
|
||||
config,
|
||||
@@ -161,14 +184,7 @@ export function createYonexusServerPlugin(api: {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Expose registry and helpers for other plugins loaded in the same process
|
||||
(globalThis as Record<string, unknown>)["__yonexusServer"] = {
|
||||
ruleRegistry,
|
||||
sendRule: (identifier: string, ruleId: string, content: string): boolean =>
|
||||
transport.send(identifier, encodeRuleMessage(ruleId, content)),
|
||||
onClientAuthenticated: onClientAuthenticatedCallbacks
|
||||
};
|
||||
_G[_TRANSPORT_KEY] = transport;
|
||||
|
||||
const runtime = createYonexusServerRuntime({
|
||||
config,
|
||||
|
||||
@@ -19,6 +19,6 @@
|
||||
"listenPort": { "type": "number" },
|
||||
"publicWsUrl": { "type": "string" }
|
||||
},
|
||||
"required": ["followerIdentifiers", "notifyBotToken", "adminUserId", "listenPort"]
|
||||
"required": ["notifyBotToken", "adminUserId", "listenPort"]
|
||||
}
|
||||
}
|
||||
|
||||
2
protocol
2
protocol
Submodule protocol updated: 9232aa7c17...ccdf167daf
@@ -3,6 +3,7 @@
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import os from "node:os";
|
||||
import { execSync } from "node:child_process";
|
||||
|
||||
const args = process.argv.slice(2);
|
||||
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 pluginName = "Yonexus.Server";
|
||||
const pluginId = "yonexus-server";
|
||||
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 (!fs.existsSync(sourceDist)) {
|
||||
@@ -30,9 +64,16 @@ if (mode === "install") {
|
||||
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, "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);
|
||||
}
|
||||
|
||||
// uninstall
|
||||
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 { YonexusServerStore } from "../plugin/core/store.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() {
|
||||
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 { YonexusServerStore } from "../plugin/core/store.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() {
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user