evolcore 0.0.41-test.0 → 0.0.41-test.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +62 -0
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/baseagent.js +88 -49
- package/dist/agents/claude-runner.js +177 -92
- package/dist/agents/codex-runner.js +146 -71
- package/dist/agents/ecagent-runner.js +1 -1
- package/dist/agents/gemini-runner.js +1 -1
- package/dist/aun/aid/agentmd.js +98 -11
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/aid/control-aid.js +26 -2
- package/dist/aun/aid/identity.js +91 -0
- package/dist/aun/aid/index.js +1 -1
- package/dist/aun/aid/managed-operation.js +1 -1
- package/dist/aun/aid/ownership-operation.js +23 -22
- package/dist/aun/group/fs-download.js +39 -0
- package/dist/aun/group/identity.js +36 -21
- package/dist/aun/group/operations.js +5 -0
- package/dist/aun/menu/client.js +27 -0
- package/dist/aun/msg/managed-operation.js +68 -7
- package/dist/aun/msg/p2p.js +8 -8
- package/dist/aun/service-proxy.js +53 -12
- package/dist/channels/aun.js +633 -32
- package/dist/channels/daemon.js +15 -1
- package/dist/cli/agent-command.js +5 -2
- package/dist/cli/agent-create.js +991 -233
- package/dist/cli/agent.js +49 -10
- package/dist/cli/aid-bind-command.js +48 -19
- package/dist/cli/aun-commands.js +48 -36
- package/dist/cli/daemon-commands.js +679 -697
- package/dist/cli/fs-command.js +64 -2
- package/dist/cli/index.js +72 -5
- package/dist/cli/init-channel.js +1 -1
- package/dist/cli/init.js +75 -1
- package/dist/cli/managed-command-guard.js +17 -1
- package/dist/cli/model.js +40 -40
- package/dist/cli/provider-command.js +57 -0
- package/dist/cli/proxy-command.js +92 -0
- package/dist/cli/restart-monitor.js +4 -2
- package/dist/cli/role.js +85 -0
- package/dist/cli/stats.js +10 -3
- package/dist/cli/task-context.js +19 -0
- package/dist/config/access-policy.js +7 -2
- package/dist/config/boot-log.js +39 -1
- package/dist/config/config-field-policy.js +17 -39
- package/dist/config/config-manager.js +183 -44
- package/dist/config/config-operation-service.js +5 -19
- package/dist/config/contact-book-store.js +47 -21
- package/dist/config/contact-book.js +18 -12
- package/dist/config/contact-operation-service.js +3 -4
- package/dist/config/contact-request-service.js +11 -0
- package/dist/config/daemon-services.js +11 -0
- package/dist/config/gateway-config.js +88 -594
- package/dist/config/owner-config.js +2 -2
- package/dist/config/peer-role-resolver.js +15 -12
- package/dist/config/provider-ipc-service.js +132 -0
- package/dist/config/provider-menu-request.js +58 -0
- package/dist/config/providers-config.js +12 -7
- package/dist/config/providers-import.js +3 -21
- package/dist/config/providers-management.js +78 -5
- package/dist/config/resolved-config-op.js +11 -1
- package/dist/config/role-command-service.js +166 -0
- package/dist/config/role-request-service.js +193 -0
- package/dist/config/schema-migration.js +1000 -25
- package/dist/config-store.js +89 -4
- package/dist/contracts/ecweb-instance.js +41 -0
- package/dist/contracts/ecweb-service-protocol.js +4 -1
- package/dist/core/agent-application-service.js +60 -11
- package/dist/core/agent-create-status.js +203 -0
- package/dist/core/agent-creation-claim.js +177 -0
- package/dist/core/agent-ipc-registration.js +39 -18
- package/dist/core/agent-runtime.js +194 -24
- package/dist/core/auth/agent-delegation.js +6 -3
- package/dist/core/auth/auth-gateway.js +67 -2
- package/dist/core/auth/authorization-audit.js +58 -11
- package/dist/core/auth/delegation-authorization.js +5 -2
- package/dist/core/auth/operation-authorizer.js +43 -6
- package/dist/core/auth/operation-catalog.js +45 -7
- package/dist/core/channel-loader.js +2 -0
- package/dist/core/command/agent-control.js +260 -21
- package/dist/core/command/agent-storage-menu.js +5 -3
- package/dist/core/command/cli-intent-parser.js +8 -3
- package/dist/core/command/command-handler.js +112 -154
- package/dist/core/command/connect-menu.js +11 -3
- package/dist/core/command/data-root-resolver.js +5 -4
- package/dist/core/command/memory-slash.js +16 -8
- package/dist/core/command/menu-catalog.js +10 -6
- package/dist/core/command/menu-handler.js +106 -73
- package/dist/core/command/menu-protocol.js +15 -1
- package/dist/core/command/provider-menu.js +46 -0
- package/dist/core/command/role-menu.js +147 -30
- package/dist/core/command/slash-handler.js +125 -255
- package/dist/core/daemon-control.js +26 -27
- package/dist/core/event-catalog.js +10 -0
- package/dist/core/evolagent-registry.js +7 -5
- package/dist/core/evolagent.js +10 -8
- package/dist/core/file-integrity/store.js +11 -0
- package/dist/core/handoff/ipc-registration.js +3 -0
- package/dist/core/inference/text-inference.js +31 -40
- package/dist/core/initialization/service.js +491 -0
- package/dist/core/ipc-registration.js +40 -24
- package/dist/core/memory/consolidation-context.js +51 -5
- package/dist/core/memory/consolidation-ops-records.js +96 -1
- package/dist/core/memory/consolidation-trigger.js +208 -191
- package/dist/core/memory/consolidation.js +333 -35
- package/dist/core/memory/index-manager.js +27 -5
- package/dist/core/memory/memory-admin.js +45 -5
- package/dist/core/memory/memory-writer.js +163 -18
- package/dist/core/memory/relation-idle-monitor.js +119 -58
- package/dist/core/memory/relation-sweep.js +55 -45
- package/dist/core/message/aun-ipc-sender.js +81 -69
- package/dist/core/message/im-renderer.js +25 -4
- package/dist/core/message/message-admission.js +89 -4
- package/dist/core/message/message-bridge.js +66 -21
- package/dist/core/message/response-engine.js +108 -35
- package/dist/core/model/catalog-service.js +5 -3
- package/dist/core/model/config-scope.js +29 -71
- package/dist/core/model/field-scope.js +1 -1
- package/dist/core/model/model-catalog.js +30 -41
- package/dist/core/model/model-diagnostics.js +4 -3
- package/dist/core/model/model-fallback.js +10 -7
- package/dist/core/model/model-permission.js +3 -2
- package/dist/core/ownership/owner-resolver.js +772 -158
- package/dist/core/permission/approval-gateway.js +103 -403
- package/dist/core/permission/ec-command-parser.js +62 -6
- package/dist/core/permission/index.js +1 -0
- package/dist/core/permission/permission-result.js +78 -0
- package/dist/core/permission/sandbox-runtime.js +18 -1
- package/dist/core/permission/tool-policy.js +21 -46
- package/dist/core/relation/peer-identity.js +64 -1
- package/dist/core/role/runtime-policy.js +72 -13
- package/dist/core/session/session-capsule.js +1 -1
- package/dist/core/session/session-idle-monitor.js +1 -1
- package/dist/core/session/session-manager.js +20 -0
- package/dist/core/session/session-renew.js +3 -3
- package/dist/core/skill/index-generator.js +15 -5
- package/dist/core/system-session/memory.js +43 -8
- package/dist/core/thread/thread-service.js +19 -6
- package/dist/directory/owner-directory-admission.js +95 -0
- package/dist/directory/owner-directory-authorization.js +309 -0
- package/dist/directory/owner-directory-cache.js +635 -0
- package/dist/eck/kit-renderer.js +2 -2
- package/dist/ecweb/basic-settings-service.js +33 -40
- package/dist/ecweb/init-menu.js +32 -0
- package/dist/ecweb/message-context-service.js +110 -0
- package/dist/index.js +93 -19
- package/dist/ipc.js +247 -29
- package/dist/paths.js +7 -0
- package/dist/proxy/command.js +122 -0
- package/dist/proxy/ipc-service.js +68 -0
- package/dist/proxy/manager.js +484 -0
- package/dist/proxy/service-supervisor.js +603 -0
- package/dist/response-system/engines/v1/proactive-flow.js +16 -6
- package/dist/trigger/authorization.js +27 -17
- package/dist/trigger/feedback.js +2 -3
- package/dist/trigger/ipc-service.js +105 -78
- package/dist/trigger/local-files.js +2 -1
- package/dist/trigger/manager.js +5 -3
- package/dist/trigger/scheduler.js +88 -6
- package/dist/utils/atomic-write.js +28 -0
- package/dist/utils/cross-platform.js +14 -0
- package/dist/utils/ecweb-supervisor.js +258 -83
- package/dist/utils/error-utils.js +26 -2
- package/dist/utils/logger.js +92 -6
- package/dist/utils/package-version-info.js +4 -2
- package/dist/utils/welcome.js +1 -1
- package/kits/docs/INDEX.md +1 -0
- package/kits/docs/aun/SDK.md +4 -1
- package/kits/docs/channels/aun.md +9 -0
- package/kits/docs/evolcore/INDEX.md +1 -0
- package/kits/docs/evolcore/agent.md +8 -1
- package/kits/docs/evolcore/aid.md +67 -17
- package/kits/docs/evolcore/config.md +28 -7
- package/kits/docs/evolcore/contact.md +3 -0
- package/kits/docs/evolcore/fs.md +11 -0
- package/kits/docs/evolcore/group.md +1 -1
- package/kits/docs/evolcore/memory-architecture.md +2 -2
- package/kits/docs/evolcore/memory-consolidation.md +32 -8
- package/kits/docs/evolcore/memory.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +4 -0
- package/kits/docs/evolcore/model.md +23 -20
- package/kits/docs/evolcore/msg.md +4 -7
- package/kits/docs/evolcore/provider.md +50 -0
- package/kits/docs/identity/AID_PROFILE_SPEC.md +52 -17
- package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
- package/kits/rules/01-overview.md +3 -0
- package/kits/rules/04-relation.md +1 -1
- package/kits/schemas/_meta.json +37 -4
- package/kits/schemas/agent-config.schema.13.json +8 -3
- package/kits/schemas/agent-config.schema.16.json +891 -0
- package/kits/schemas/daemon.schema.9.json +366 -0
- package/kits/schemas/defaults.schema.5.json +406 -127
- package/kits/schemas/relation-config.schema.11.json +277 -0
- package/kits/schemas/role-config.schema.1.json +7 -7
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ec-agent-create/SKILL.md +3 -0
- package/kits/skills/ec-identity/SKILL.md +2 -2
- package/kits/skills/ec-service-proxy/SKILL.md +118 -0
- package/kits/skills/ec-skill/scripts/skill.mjs +6 -0
- package/kits/skills/personal-assistant/SKILL.md +176 -0
- package/kits/skills/personal-assistant/references/01-workspace-spec.md +333 -0
- package/kits/skills/personal-assistant/references/02-bootstrap.md +205 -0
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +177 -0
- package/kits/skills/personal-assistant/references/04-frontend-contract.md +439 -0
- package/kits/skills/personal-assistant/references/05-directory-reference.md +292 -0
- package/kits/skills/personal-assistant/references/06-render-config.md +350 -0
- package/kits/skills/personal-assistant/schema/workspace.schema.json +85 -0
- package/kits/skills/personal-assistant/schema/workspace.v1.json +66 -0
- package/kits/skills/personal-assistant/scripts/archive.mjs +154 -0
- package/kits/skills/personal-assistant/scripts/check.mjs +114 -0
- package/kits/skills/personal-assistant/scripts/index-rebuild.mjs +252 -0
- package/kits/skills/personal-assistant/scripts/ingest.mjs +344 -0
- package/kits/skills/personal-assistant/scripts/init.mjs +270 -0
- package/kits/skills/personal-assistant/scripts/lib/apply.mjs +92 -0
- package/kits/skills/personal-assistant/scripts/lib/schema.mjs +96 -0
- package/kits/skills/personal-assistant/scripts/lib/time.mjs +28 -0
- package/kits/skills/personal-assistant/scripts/migrate.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/search.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/verify.mjs +196 -0
- package/kits/skills/personal-assistant/templates/INDEX.md.tpl +24 -0
- package/kits/skills/personal-assistant/templates/README.md.tpl +108 -0
- package/kits/skills/personal-assistant/triggers/ingest-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/memory-consolidate.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-weekly.json +23 -0
- package/kits/skills/thread-ops/SKILL.md +5 -0
- package/kits/templates/memory-consolidation/forget.md +19 -6
- package/kits/templates/memory-consolidation/notes.md +1 -1
- package/kits/templates/memory-consolidation/profile.md +2 -2
- package/kits/templates/memory-consolidation/promote.md +20 -3
- package/kits/templates/roles/member.json +8 -1
- package/kits/templates/system-fragments/baseagent.md +2 -2
- package/kits/templates/system-fragments/memory.md +4 -4
- package/kits/templates/system-fragments/venue.md +1 -1
- package/package.json +7 -3
- package/dist/core/message/create-status.js +0 -96
package/dist/aun/msg/p2p.js
CHANGED
|
@@ -82,6 +82,11 @@ function applyRoutingPayloadFields(payload, args, runtimeContext, includeRuntime
|
|
|
82
82
|
const refMessageId = runtimeRefMessageIdForMsgSend({ from: args.from, runtime: runtimeContext });
|
|
83
83
|
if (refMessageId && !payload.ref_message_id)
|
|
84
84
|
payload.ref_message_id = refMessageId;
|
|
85
|
+
// Mark the final user-visible text message so the wire ext carries isFinal.
|
|
86
|
+
// buildWireExt (daemon side) merges this into the outgoing ext dictionary.
|
|
87
|
+
if (payload.type === 'text') {
|
|
88
|
+
payload.ext = { isFinal: true, ...(payload.ext && typeof payload.ext === 'object' && !Array.isArray(payload.ext) ? payload.ext : {}) };
|
|
89
|
+
}
|
|
85
90
|
}
|
|
86
91
|
function msgSendThreadId(args, payload, runtimeContext) {
|
|
87
92
|
const payloadThreadId = typeof payload?.thread_id === 'string' && payload.thread_id.trim()
|
|
@@ -99,9 +104,7 @@ function msgSendLogMetadata(args, payload, runtimeContext) {
|
|
|
99
104
|
const isInSession = !!process.env.EVOLCORE_SESSION_ID || !!runtimeContext;
|
|
100
105
|
const source = isInSession ? 'msg' : 'cli';
|
|
101
106
|
const classified = payload === undefined ? undefined : classifyAunPayloadForLog(payload);
|
|
102
|
-
const threadId = args
|
|
103
|
-
? args.thread
|
|
104
|
-
: msgSendThreadId(args, payload && typeof payload === 'object' ? payload : undefined, runtimeContext);
|
|
107
|
+
const threadId = msgSendThreadId(args, payload && typeof payload === 'object' ? payload : undefined, runtimeContext);
|
|
105
108
|
const sessionId = runtimeContext?.channel === 'aun'
|
|
106
109
|
&& runtimeContext.chatType === 'private'
|
|
107
110
|
&& runtimeContext.selfAid === args.from
|
|
@@ -135,9 +138,7 @@ async function tryDaemonMsgSend(args, payload, runtimeContext, file) {
|
|
|
135
138
|
if (args.slotId || args.aunPath) {
|
|
136
139
|
return { ok: false, code: 'INVALID_DELEGATION', error: 'Task sends cannot override the daemon AUN connection' };
|
|
137
140
|
}
|
|
138
|
-
const thread = args.body.mode === 'payload'
|
|
139
|
-
? args.thread
|
|
140
|
-
: msgSendThreadId(args, payload, runtimeContext);
|
|
141
|
+
const thread = args.body.mode === 'payload' ? undefined : msgSendThreadId(args, payload, runtimeContext);
|
|
141
142
|
const response = await ipcQuery(resolvePaths().socket, {
|
|
142
143
|
type: 'aun-msg-send',
|
|
143
144
|
aid: args.from,
|
|
@@ -267,9 +268,8 @@ export async function msgSend(args) {
|
|
|
267
268
|
if (args.body.mode !== 'payload' && Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
|
|
268
269
|
payload.mentions = normalizeAunMentionEntries(payload.mentions);
|
|
269
270
|
}
|
|
270
|
-
if (args.body.mode !== 'payload')
|
|
271
|
+
if (args.body.mode !== 'payload')
|
|
271
272
|
applyRoutingPayloadFields(payload, args, runtimeContext, false);
|
|
272
|
-
}
|
|
273
273
|
const daemonResult = await tryDaemonMsgSend(args, payload, runtimeContext);
|
|
274
274
|
if (daemonResult)
|
|
275
275
|
return daemonMsgSendResult(args, payload, runtimeContext, daemonResult);
|
|
@@ -16,12 +16,16 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import fs from 'fs';
|
|
18
18
|
import path from 'path';
|
|
19
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
19
20
|
import { ServiceProxyClient, EndpointPolicy } from '@agentunion/fastaun';
|
|
20
21
|
import { resolvePaths } from '../paths.js';
|
|
21
22
|
import { logger } from '../utils/logger.js';
|
|
23
|
+
import { parseEcwebInstanceRecord } from '../contracts/ecweb-instance.js';
|
|
24
|
+
import { getProcessStartTime, startTimeMatches } from '../utils/process-introspect.js';
|
|
22
25
|
const LOG = '[ServiceProxy]';
|
|
23
26
|
const INSTANCE_DISCOVERY_TIMEOUT_MS = 10_000;
|
|
24
27
|
const INSTANCE_DISCOVERY_INTERVAL_MS = 250;
|
|
28
|
+
const CONTROL_CONNECTION_INTERVAL_MS = 250;
|
|
25
29
|
function sleep(ms) {
|
|
26
30
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
27
31
|
}
|
|
@@ -29,7 +33,7 @@ function sleep(ms) {
|
|
|
29
33
|
* 读 data/instance/ 下指定服务的存活实例端口。
|
|
30
34
|
* 取 startedAt 最新的一条(多实例保护下通常只有一条存活)。
|
|
31
35
|
*/
|
|
32
|
-
function discoverInstancePort(serviceName) {
|
|
36
|
+
function discoverInstancePort(serviceName, expectedPort) {
|
|
33
37
|
const dir = resolvePaths().instanceDir;
|
|
34
38
|
let files;
|
|
35
39
|
try {
|
|
@@ -47,7 +51,10 @@ function discoverInstancePort(serviceName) {
|
|
|
47
51
|
continue;
|
|
48
52
|
const filePid = Number(match[1]);
|
|
49
53
|
try {
|
|
50
|
-
const
|
|
54
|
+
const raw = JSON.parse(fs.readFileSync(path.join(dir, file), 'utf-8'));
|
|
55
|
+
const rec = serviceName === 'ecweb'
|
|
56
|
+
? parseEcwebInstanceRecord(raw, resolvePaths().root, file)
|
|
57
|
+
: raw;
|
|
51
58
|
if (rec
|
|
52
59
|
&& Number.isInteger(rec.pid)
|
|
53
60
|
&& rec.pid > 0
|
|
@@ -55,11 +62,13 @@ function discoverInstancePort(serviceName) {
|
|
|
55
62
|
&& isProcessAlive(rec.pid)
|
|
56
63
|
&& typeof rec.startedAt === 'number'
|
|
57
64
|
&& Number.isFinite(rec.startedAt)
|
|
65
|
+
&& (serviceName !== 'ecweb' || !('schemaVersion' in rec) || startTimeMatches(rec.startedAt, getProcessStartTime(rec.pid)))
|
|
58
66
|
&& rec.startedAt >= 0
|
|
59
67
|
&& Number.isInteger(rec.port)
|
|
60
68
|
&& rec.port >= 1
|
|
61
|
-
&& rec.port <= 65535
|
|
62
|
-
|
|
69
|
+
&& rec.port <= 65535
|
|
70
|
+
&& (expectedPort === undefined || rec.port === expectedPort)) {
|
|
71
|
+
records.push({ pid: rec.pid, port: rec.port, startedAt: rec.startedAt });
|
|
63
72
|
}
|
|
64
73
|
}
|
|
65
74
|
catch {
|
|
@@ -81,11 +90,11 @@ function isProcessAlive(pid) {
|
|
|
81
90
|
return e?.code === 'EPERM';
|
|
82
91
|
}
|
|
83
92
|
}
|
|
84
|
-
async function waitForInstancePort(serviceName) {
|
|
93
|
+
async function waitForInstancePort(serviceName, expectedPort) {
|
|
85
94
|
const deadline = Date.now() + INSTANCE_DISCOVERY_TIMEOUT_MS;
|
|
86
95
|
let loggedWait = false;
|
|
87
96
|
while (Date.now() <= deadline) {
|
|
88
|
-
const port = discoverInstancePort(serviceName);
|
|
97
|
+
const port = discoverInstancePort(serviceName, expectedPort);
|
|
89
98
|
if (port)
|
|
90
99
|
return port;
|
|
91
100
|
if (!loggedWait) {
|
|
@@ -101,7 +110,7 @@ async function waitForInstancePort(serviceName) {
|
|
|
101
110
|
*/
|
|
102
111
|
async function resolveEndpoint(svc) {
|
|
103
112
|
if (svc.proxy?.source === 'instance') {
|
|
104
|
-
const port = await waitForInstancePort(svc.name);
|
|
113
|
+
const port = await waitForInstancePort(svc.name, svc.port);
|
|
105
114
|
if (!port) {
|
|
106
115
|
logger.warn(`${LOG} 服务 "${svc.name}" source=instance 等待 ${INSTANCE_DISCOVERY_TIMEOUT_MS}ms 后仍未发现存活实例,跳过`);
|
|
107
116
|
return null;
|
|
@@ -131,8 +140,18 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
|
|
|
131
140
|
}
|
|
132
141
|
let stopped = false;
|
|
133
142
|
let proxyClient = null;
|
|
143
|
+
const startupAbort = new AbortController();
|
|
134
144
|
const run = async () => {
|
|
135
145
|
try {
|
|
146
|
+
// 控制 AID 与本地服务并行启动;等待认证连接完成,避免把正常启动阶段当作隧道故障。
|
|
147
|
+
if (!controlChannel.isConnected()) {
|
|
148
|
+
logger.info(`${LOG} 等待 AUN 控制通道就绪后启动代理`);
|
|
149
|
+
}
|
|
150
|
+
while (!stopped && !controlChannel.isConnected()) {
|
|
151
|
+
await delay(CONTROL_CONNECTION_INTERVAL_MS, undefined, { signal: startupAbort.signal, ref: false });
|
|
152
|
+
}
|
|
153
|
+
if (stopped)
|
|
154
|
+
return { registered: 0, gatewayRegistered: false };
|
|
136
155
|
// 动态解引用 facade:每次访问都读 channel 当前 client,规避重连换 client 的死引用问题。
|
|
137
156
|
const aunFacade = {
|
|
138
157
|
call: (method, params) => {
|
|
@@ -181,10 +200,10 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
|
|
|
181
200
|
let registered = 0;
|
|
182
201
|
for (const svc of services) {
|
|
183
202
|
if (stopped)
|
|
184
|
-
return;
|
|
203
|
+
return { registered: 0, gatewayRegistered: false };
|
|
185
204
|
const endpoint = await resolveEndpoint(svc);
|
|
186
205
|
if (stopped)
|
|
187
|
-
return;
|
|
206
|
+
return { registered: 0, gatewayRegistered: false };
|
|
188
207
|
if (!endpoint)
|
|
189
208
|
continue;
|
|
190
209
|
try {
|
|
@@ -202,10 +221,20 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
|
|
|
202
221
|
}
|
|
203
222
|
if (registered === 0) {
|
|
204
223
|
logger.warn(`${LOG} 没有成功注册任何服务,不启动隧道`);
|
|
205
|
-
return;
|
|
224
|
+
return { registered: 0, gatewayRegistered: false };
|
|
206
225
|
}
|
|
207
226
|
if (stopped)
|
|
208
|
-
return;
|
|
227
|
+
return { registered: 0, gatewayRegistered: false };
|
|
228
|
+
let gatewayRegistered = false;
|
|
229
|
+
try {
|
|
230
|
+
await proxyClient.registerServicesWithGateway();
|
|
231
|
+
gatewayRegistered = true;
|
|
232
|
+
}
|
|
233
|
+
catch (e) {
|
|
234
|
+
logger.warn(`${LOG} Gateway 登记暂不可用,隧道后台继续重试: ${e?.message || e}`);
|
|
235
|
+
}
|
|
236
|
+
if (stopped)
|
|
237
|
+
return { registered: 0, gatewayRegistered: false };
|
|
209
238
|
// 常驻持久隧道(内部自带指数退避重连 + client 缺失时自动等待)。
|
|
210
239
|
// 不 await:后台运行,不阻塞 daemon 启动。
|
|
211
240
|
proxyClient
|
|
@@ -217,15 +246,27 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
|
|
|
217
246
|
logger.error(`${LOG} serveForever 异常退出: ${e?.message || e}`);
|
|
218
247
|
});
|
|
219
248
|
logger.info(`${LOG} ✓ 已启动,provider=${providerAid},注册 ${registered} 个服务`);
|
|
249
|
+
return { registered, gatewayRegistered };
|
|
220
250
|
}
|
|
221
251
|
catch (e) {
|
|
252
|
+
if (stopped)
|
|
253
|
+
return { registered: 0, gatewayRegistered: false };
|
|
222
254
|
logger.warn(`${LOG} 启动失败(不影响 daemon 主流程): ${e?.message || e}`);
|
|
255
|
+
throw e;
|
|
223
256
|
}
|
|
224
257
|
};
|
|
225
|
-
|
|
258
|
+
const ready = run();
|
|
259
|
+
void ready.catch(() => { });
|
|
226
260
|
return {
|
|
261
|
+
ready,
|
|
262
|
+
unregister: async (serviceNames) => {
|
|
263
|
+
if (!proxyClient || serviceNames.length === 0)
|
|
264
|
+
return;
|
|
265
|
+
await proxyClient.unregisterServicesFromGateway(serviceNames);
|
|
266
|
+
},
|
|
227
267
|
stop: () => {
|
|
228
268
|
stopped = true;
|
|
269
|
+
startupAbort.abort();
|
|
229
270
|
try {
|
|
230
271
|
proxyClient?.stop();
|
|
231
272
|
}
|