@zhin.js/agent 0.1.29 → 0.1.30
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/README.md +1 -1
- package/lib/agent-prompt/resolver.d.ts.map +1 -1
- package/lib/agent-prompt/resolver.js +0 -1
- package/lib/agent-prompt/resolver.js.map +1 -1
- package/lib/assistant/config.d.ts +67 -0
- package/lib/assistant/config.d.ts.map +1 -0
- package/lib/assistant/config.js +47 -0
- package/lib/assistant/config.js.map +1 -0
- package/lib/assistant/domains/home-assistant.d.ts +37 -0
- package/lib/assistant/domains/home-assistant.d.ts.map +1 -0
- package/lib/assistant/domains/home-assistant.js +113 -0
- package/lib/assistant/domains/home-assistant.js.map +1 -0
- package/lib/assistant/event-ingress.d.ts +28 -0
- package/lib/assistant/event-ingress.d.ts.map +1 -0
- package/lib/assistant/event-ingress.js +132 -0
- package/lib/assistant/event-ingress.js.map +1 -0
- package/lib/assistant/event-types.d.ts +28 -0
- package/lib/assistant/event-types.d.ts.map +1 -0
- package/lib/assistant/event-types.js +2 -0
- package/lib/assistant/event-types.js.map +1 -0
- package/lib/assistant/home-config.d.ts +36 -0
- package/lib/assistant/home-config.d.ts.map +1 -0
- package/lib/assistant/home-config.js +21 -0
- package/lib/assistant/home-config.js.map +1 -0
- package/lib/assistant/home-mcp-bridge.d.ts +12 -0
- package/lib/assistant/home-mcp-bridge.d.ts.map +1 -0
- package/lib/assistant/home-mcp-bridge.js +26 -0
- package/lib/assistant/home-mcp-bridge.js.map +1 -0
- package/lib/assistant/home-policy.d.ts +16 -0
- package/lib/assistant/home-policy.d.ts.map +1 -0
- package/lib/assistant/home-policy.js +46 -0
- package/lib/assistant/home-policy.js.map +1 -0
- package/lib/assistant/home-tools.d.ts +15 -0
- package/lib/assistant/home-tools.d.ts.map +1 -0
- package/lib/assistant/home-tools.js +141 -0
- package/lib/assistant/home-tools.js.map +1 -0
- package/lib/assistant/index.d.ts +31 -0
- package/lib/assistant/index.d.ts.map +1 -0
- package/lib/assistant/index.js +18 -0
- package/lib/assistant/index.js.map +1 -0
- package/lib/assistant/job-engine.d.ts +40 -0
- package/lib/assistant/job-engine.d.ts.map +1 -0
- package/lib/assistant/job-engine.js +155 -0
- package/lib/assistant/job-engine.js.map +1 -0
- package/lib/assistant/job-scheduler.d.ts +6 -0
- package/lib/assistant/job-scheduler.d.ts.map +1 -0
- package/lib/assistant/job-scheduler.js +59 -0
- package/lib/assistant/job-scheduler.js.map +1 -0
- package/lib/assistant/job-store.d.ts +55 -0
- package/lib/assistant/job-store.d.ts.map +1 -0
- package/lib/assistant/job-store.js +280 -0
- package/lib/assistant/job-store.js.map +1 -0
- package/lib/assistant/job-worker.d.ts +20 -0
- package/lib/assistant/job-worker.d.ts.map +1 -0
- package/lib/assistant/job-worker.js +73 -0
- package/lib/assistant/job-worker.js.map +1 -0
- package/lib/assistant/legacy-convert.d.ts +48 -0
- package/lib/assistant/legacy-convert.d.ts.map +1 -0
- package/lib/assistant/legacy-convert.js +108 -0
- package/lib/assistant/legacy-convert.js.map +1 -0
- package/lib/assistant/notification-router.d.ts +34 -0
- package/lib/assistant/notification-router.d.ts.map +1 -0
- package/lib/assistant/notification-router.js +96 -0
- package/lib/assistant/notification-router.js.map +1 -0
- package/lib/assistant/profile-loader.d.ts +29 -0
- package/lib/assistant/profile-loader.d.ts.map +1 -0
- package/lib/assistant/profile-loader.js +168 -0
- package/lib/assistant/profile-loader.js.map +1 -0
- package/lib/assistant/profile-types.d.ts +56 -0
- package/lib/assistant/profile-types.d.ts.map +1 -0
- package/lib/assistant/profile-types.js +9 -0
- package/lib/assistant/profile-types.js.map +1 -0
- package/lib/assistant/runtime-registry.d.ts +20 -0
- package/lib/assistant/runtime-registry.d.ts.map +1 -0
- package/lib/assistant/runtime-registry.js +19 -0
- package/lib/assistant/runtime-registry.js.map +1 -0
- package/lib/assistant/types.d.ts +75 -0
- package/lib/assistant/types.d.ts.map +1 -0
- package/lib/assistant/types.js +6 -0
- package/lib/assistant/types.js.map +1 -0
- package/lib/bootstrap.d.ts +1 -5
- package/lib/bootstrap.d.ts.map +1 -1
- package/lib/bootstrap.js +1 -34
- package/lib/bootstrap.js.map +1 -1
- package/lib/builtin/analyze-media-tool.d.ts +13 -0
- package/lib/builtin/analyze-media-tool.d.ts.map +1 -0
- package/lib/builtin/analyze-media-tool.js +100 -0
- package/lib/builtin/analyze-media-tool.js.map +1 -0
- package/lib/builtin/ask-user-tool.d.ts +1 -1
- package/lib/builtin/ask-user-tool.d.ts.map +1 -1
- package/lib/builtin/ask-user-tool.js +1 -1
- package/lib/builtin/ask-user-tool.js.map +1 -1
- package/lib/builtin/edit-file-tool.d.ts.map +1 -1
- package/lib/builtin/edit-file-tool.js +5 -1
- package/lib/builtin/edit-file-tool.js.map +1 -1
- package/lib/builtin/generate-image-tool.d.ts +21 -0
- package/lib/builtin/generate-image-tool.d.ts.map +1 -0
- package/lib/builtin/generate-image-tool.js +138 -0
- package/lib/builtin/generate-image-tool.js.map +1 -0
- package/lib/builtin/read-file-tool.d.ts +1 -1
- package/lib/builtin/read-file-tool.d.ts.map +1 -1
- package/lib/builtin/read-file-tool.js +2 -7
- package/lib/builtin/read-file-tool.js.map +1 -1
- package/lib/builtin/spawn-task-tool.d.ts +1 -1
- package/lib/builtin/spawn-task-tool.d.ts.map +1 -1
- package/lib/builtin/spawn-task-tool.js +25 -4
- package/lib/builtin/spawn-task-tool.js.map +1 -1
- package/lib/builtin/write-file-tool.d.ts.map +1 -1
- package/lib/builtin/write-file-tool.js +6 -1
- package/lib/builtin/write-file-tool.js.map +1 -1
- package/lib/builtin-tools.d.ts.map +1 -1
- package/lib/builtin-tools.js +2 -0
- package/lib/builtin-tools.js.map +1 -1
- package/lib/config/agent-binding-registry.d.ts +14 -0
- package/lib/config/agent-binding-registry.d.ts.map +1 -0
- package/lib/config/agent-binding-registry.js +30 -0
- package/lib/config/agent-binding-registry.js.map +1 -0
- package/lib/config/agent-bindings.d.ts +4 -0
- package/lib/config/agent-bindings.d.ts.map +1 -0
- package/lib/config/agent-bindings.js +16 -0
- package/lib/config/agent-bindings.js.map +1 -0
- package/lib/config/normalize-ai-config.d.ts +11 -0
- package/lib/config/normalize-ai-config.d.ts.map +1 -0
- package/lib/config/normalize-ai-config.js +55 -0
- package/lib/config/normalize-ai-config.js.map +1 -0
- package/lib/config/provider-instance.d.ts +5 -0
- package/lib/config/provider-instance.d.ts.map +1 -0
- package/lib/config/provider-instance.js +46 -0
- package/lib/config/provider-instance.js.map +1 -0
- package/lib/config/types.d.ts +35 -0
- package/lib/config/types.d.ts.map +1 -0
- package/lib/config/types.js +2 -0
- package/lib/config/types.js.map +1 -0
- package/lib/config/validate-ai-config.d.ts +3 -0
- package/lib/config/validate-ai-config.d.ts.map +1 -0
- package/lib/config/validate-ai-config.js +35 -0
- package/lib/config/validate-ai-config.js.map +1 -0
- package/lib/cron-engine.d.ts +20 -18
- package/lib/cron-engine.d.ts.map +1 -1
- package/lib/cron-engine.js +42 -18
- package/lib/cron-engine.js.map +1 -1
- package/lib/deferred-worker-runner.d.ts.map +1 -1
- package/lib/deferred-worker-runner.js +0 -1
- package/lib/deferred-worker-runner.js.map +1 -1
- package/lib/discovery/agents.d.ts +2 -0
- package/lib/discovery/agents.d.ts.map +1 -1
- package/lib/discovery/agents.js +5 -0
- package/lib/discovery/agents.js.map +1 -1
- package/lib/hooks.d.ts +0 -1
- package/lib/hooks.d.ts.map +1 -1
- package/lib/hooks.js.map +1 -1
- package/lib/index.d.ts +12 -4
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +7 -2
- package/lib/index.js.map +1 -1
- package/lib/init/create-zhin-agent.d.ts.map +1 -1
- package/lib/init/create-zhin-agent.js +164 -68
- package/lib/init/create-zhin-agent.js.map +1 -1
- package/lib/init/introspection-commands-format.d.ts +40 -0
- package/lib/init/introspection-commands-format.d.ts.map +1 -0
- package/lib/init/introspection-commands-format.js +93 -0
- package/lib/init/introspection-commands-format.js.map +1 -0
- package/lib/init/message-media.d.ts.map +1 -1
- package/lib/init/message-media.js +12 -0
- package/lib/init/message-media.js.map +1 -1
- package/lib/init/output-renderer.d.ts +4 -0
- package/lib/init/output-renderer.d.ts.map +1 -1
- package/lib/init/output-renderer.js +6 -0
- package/lib/init/output-renderer.js.map +1 -1
- package/lib/init/register-ai-trigger.d.ts.map +1 -1
- package/lib/init/register-ai-trigger.js +155 -8
- package/lib/init/register-ai-trigger.js.map +1 -1
- package/lib/init/register-builtin-tools.d.ts.map +1 -1
- package/lib/init/register-builtin-tools.js +13 -3
- package/lib/init/register-builtin-tools.js.map +1 -1
- package/lib/init/register-home-tools.d.ts +2 -0
- package/lib/init/register-home-tools.d.ts.map +1 -0
- package/lib/init/register-home-tools.js +51 -0
- package/lib/init/register-home-tools.js.map +1 -0
- package/lib/init/register-introspection-commands.d.ts +3 -0
- package/lib/init/register-introspection-commands.d.ts.map +1 -0
- package/lib/init/register-introspection-commands.js +97 -0
- package/lib/init/register-introspection-commands.js.map +1 -0
- package/lib/init/register-management-tools.d.ts +1 -1
- package/lib/init/register-management-tools.js +2 -2
- package/lib/init/register-management-tools.js.map +1 -1
- package/lib/init/register-mcp-memory-default.d.ts.map +1 -1
- package/lib/init/register-mcp-memory-default.js +1 -0
- package/lib/init/register-mcp-memory-default.js.map +1 -1
- package/lib/init/register-owner-approve-commands.d.ts.map +1 -1
- package/lib/init/register-owner-approve-commands.js +103 -111
- package/lib/init/register-owner-approve-commands.js.map +1 -1
- package/lib/init/register-typing-indicator.d.ts.map +1 -1
- package/lib/init/register-typing-indicator.js +111 -115
- package/lib/init/register-typing-indicator.js.map +1 -1
- package/lib/init.d.ts.map +1 -1
- package/lib/init.js +4 -0
- package/lib/init.js.map +1 -1
- package/lib/media/constants.d.ts +3 -0
- package/lib/media/constants.d.ts.map +1 -0
- package/lib/media/constants.js +3 -0
- package/lib/media/constants.js.map +1 -0
- package/lib/media/deliver-subagent-result.d.ts +15 -0
- package/lib/media/deliver-subagent-result.d.ts.map +1 -0
- package/lib/media/deliver-subagent-result.js +35 -0
- package/lib/media/deliver-subagent-result.js.map +1 -0
- package/lib/media/index.d.ts +14 -0
- package/lib/media/index.d.ts.map +1 -0
- package/lib/media/index.js +14 -0
- package/lib/media/index.js.map +1 -0
- package/lib/media/media-capabilities.d.ts +3 -0
- package/lib/media/media-capabilities.d.ts.map +1 -0
- package/lib/media/media-capabilities.js +15 -0
- package/lib/media/media-capabilities.js.map +1 -0
- package/lib/media/media-normalize.d.ts +10 -0
- package/lib/media/media-normalize.d.ts.map +1 -0
- package/lib/media/media-normalize.js +108 -0
- package/lib/media/media-normalize.js.map +1 -0
- package/lib/media/media-publisher.d.ts +8 -0
- package/lib/media/media-publisher.d.ts.map +1 -0
- package/lib/media/media-publisher.js +254 -0
- package/lib/media/media-publisher.js.map +1 -0
- package/lib/media/media-router.d.ts +7 -0
- package/lib/media/media-router.d.ts.map +1 -0
- package/lib/media/media-router.js +59 -0
- package/lib/media/media-router.js.map +1 -0
- package/lib/media/media-spool.d.ts +3 -0
- package/lib/media/media-spool.d.ts.map +1 -0
- package/lib/media/media-spool.js +25 -0
- package/lib/media/media-spool.js.map +1 -0
- package/lib/media/media-tool-bridge.d.ts +9 -0
- package/lib/media/media-tool-bridge.d.ts.map +1 -0
- package/lib/media/media-tool-bridge.js +61 -0
- package/lib/media/media-tool-bridge.js.map +1 -0
- package/lib/media/media-types.d.ts +50 -0
- package/lib/media/media-types.d.ts.map +1 -0
- package/lib/media/media-types.js +18 -0
- package/lib/media/media-types.js.map +1 -0
- package/lib/media/resolve-config.d.ts +3 -0
- package/lib/media/resolve-config.d.ts.map +1 -0
- package/lib/media/resolve-config.js +32 -0
- package/lib/media/resolve-config.js.map +1 -0
- package/lib/media/subagent-inbound.d.ts +20 -0
- package/lib/media/subagent-inbound.d.ts.map +1 -0
- package/lib/media/subagent-inbound.js +88 -0
- package/lib/media/subagent-inbound.js.map +1 -0
- package/lib/media/subagent-user-delivery.d.ts +23 -0
- package/lib/media/subagent-user-delivery.d.ts.map +1 -0
- package/lib/media/subagent-user-delivery.js +62 -0
- package/lib/media/subagent-user-delivery.js.map +1 -0
- package/lib/media/vision-capability.d.ts +5 -0
- package/lib/media/vision-capability.d.ts.map +1 -0
- package/lib/media/vision-capability.js +19 -0
- package/lib/media/vision-capability.js.map +1 -0
- package/lib/memory-layers.d.ts +57 -0
- package/lib/memory-layers.d.ts.map +1 -0
- package/lib/memory-layers.js +327 -0
- package/lib/memory-layers.js.map +1 -0
- package/lib/orchestrator/agent-dispatcher.d.ts.map +1 -1
- package/lib/orchestrator/agent-dispatcher.js +2 -0
- package/lib/orchestrator/agent-dispatcher.js.map +1 -1
- package/lib/orchestrator/mcp-lifecycle.d.ts +3 -0
- package/lib/orchestrator/mcp-lifecycle.d.ts.map +1 -1
- package/lib/orchestrator/mcp-lifecycle.js +34 -0
- package/lib/orchestrator/mcp-lifecycle.js.map +1 -1
- package/lib/orchestrator/resolve-subagent-tools.d.ts +20 -0
- package/lib/orchestrator/resolve-subagent-tools.d.ts.map +1 -0
- package/lib/orchestrator/resolve-subagent-tools.js +52 -0
- package/lib/orchestrator/resolve-subagent-tools.js.map +1 -0
- package/lib/orchestrator/task-queue.d.ts +4 -0
- package/lib/orchestrator/task-queue.d.ts.map +1 -1
- package/lib/orchestrator/task-queue.js +24 -0
- package/lib/orchestrator/task-queue.js.map +1 -1
- package/lib/orchestrator/tool-selection.d.ts +1 -1
- package/lib/orchestrator/tool-selection.d.ts.map +1 -1
- package/lib/orchestrator/tool-selection.js +2 -0
- package/lib/orchestrator/tool-selection.js.map +1 -1
- package/lib/routing/route-matcher.d.ts +12 -0
- package/lib/routing/route-matcher.d.ts.map +1 -0
- package/lib/routing/route-matcher.js +72 -0
- package/lib/routing/route-matcher.js.map +1 -0
- package/lib/routing/runtime-binding.d.ts +10 -0
- package/lib/routing/runtime-binding.d.ts.map +1 -0
- package/lib/routing/runtime-binding.js +6 -0
- package/lib/routing/runtime-binding.js.map +1 -0
- package/lib/routing/subagent-summarize.d.ts +6 -0
- package/lib/routing/subagent-summarize.d.ts.map +1 -0
- package/lib/routing/subagent-summarize.js +23 -0
- package/lib/routing/subagent-summarize.js.map +1 -0
- package/lib/security/file-policy.d.ts +7 -1
- package/lib/security/file-policy.d.ts.map +1 -1
- package/lib/security/file-policy.js +34 -1
- package/lib/security/file-policy.js.map +1 -1
- package/lib/service.d.ts +13 -3
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +45 -37
- package/lib/service.js.map +1 -1
- package/lib/subagent-ai-events.d.ts +30 -0
- package/lib/subagent-ai-events.d.ts.map +1 -0
- package/lib/subagent-ai-events.js +114 -0
- package/lib/subagent-ai-events.js.map +1 -0
- package/lib/subagent-goal-notify.d.ts +27 -6
- package/lib/subagent-goal-notify.d.ts.map +1 -1
- package/lib/subagent-goal-notify.js +46 -12
- package/lib/subagent-goal-notify.js.map +1 -1
- package/lib/subagent.d.ts +43 -3
- package/lib/subagent.d.ts.map +1 -1
- package/lib/subagent.js +167 -49
- package/lib/subagent.js.map +1 -1
- package/lib/task-executor.d.ts +10 -18
- package/lib/task-executor.d.ts.map +1 -1
- package/lib/task-executor.js +11 -34
- package/lib/task-executor.js.map +1 -1
- package/lib/typing-indicator/adapter-integration.d.ts.map +1 -1
- package/lib/typing-indicator/adapter-integration.js +2 -1
- package/lib/typing-indicator/adapter-integration.js.map +1 -1
- package/lib/typing-indicator/index.d.ts.map +1 -1
- package/lib/typing-indicator/index.js +18 -5
- package/lib/typing-indicator/index.js.map +1 -1
- package/lib/zhin-agent/config.d.ts +15 -12
- package/lib/zhin-agent/config.d.ts.map +1 -1
- package/lib/zhin-agent/config.js +16 -11
- package/lib/zhin-agent/config.js.map +1 -1
- package/lib/zhin-agent/event-emitter.d.ts.map +1 -1
- package/lib/zhin-agent/event-emitter.js +3 -2
- package/lib/zhin-agent/event-emitter.js.map +1 -1
- package/lib/zhin-agent/index.d.ts +10 -0
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +42 -0
- package/lib/zhin-agent/index.js.map +1 -1
- package/lib/zhin-agent/llm-runner.d.ts +3 -1
- package/lib/zhin-agent/llm-runner.d.ts.map +1 -1
- package/lib/zhin-agent/llm-runner.js +78 -0
- package/lib/zhin-agent/llm-runner.js.map +1 -1
- package/lib/zhin-agent/prompt-assembly.d.ts.map +1 -1
- package/lib/zhin-agent/prompt-assembly.js +0 -2
- package/lib/zhin-agent/prompt-assembly.js.map +1 -1
- package/lib/zhin-agent/prompt.d.ts.map +1 -1
- package/lib/zhin-agent/prompt.js +49 -16
- package/lib/zhin-agent/prompt.js.map +1 -1
- package/lib/zhin-agent/tool-calls-user-format.d.ts.map +1 -1
- package/lib/zhin-agent/tool-calls-user-format.js +5 -1
- package/lib/zhin-agent/tool-calls-user-format.js.map +1 -1
- package/lib/zhin-agent/tool-orchestration.d.ts.map +1 -1
- package/lib/zhin-agent/tool-orchestration.js +10 -7
- package/lib/zhin-agent/tool-orchestration.js.map +1 -1
- package/lib/zhin-agent/tool-runtime.d.ts +0 -2
- package/lib/zhin-agent/tool-runtime.d.ts.map +1 -1
- package/lib/zhin-agent/tool-runtime.js +1 -4
- package/lib/zhin-agent/tool-runtime.js.map +1 -1
- package/lib/zhin-agent/tool-search-orchestrator.d.ts +3 -0
- package/lib/zhin-agent/tool-search-orchestrator.d.ts.map +1 -1
- package/lib/zhin-agent/tool-search-orchestrator.js +8 -3
- package/lib/zhin-agent/tool-search-orchestrator.js.map +1 -1
- package/lib/zhin-agent/turn-pipeline.d.ts.map +1 -1
- package/lib/zhin-agent/turn-pipeline.js +78 -28
- package/lib/zhin-agent/turn-pipeline.js.map +1 -1
- package/lib/zhin-agent/turn-tracker.d.ts +2 -0
- package/lib/zhin-agent/turn-tracker.d.ts.map +1 -1
- package/lib/zhin-agent/turn-tracker.js +11 -6
- package/lib/zhin-agent/turn-tracker.js.map +1 -1
- package/lib/zhin-agent/zhin-agent-private.d.ts +7 -1
- package/lib/zhin-agent/zhin-agent-private.d.ts.map +1 -1
- package/lib/zhin-agent/zhin-agent-private.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"home-mcp-bridge.d.ts","sourceRoot":"","sources":["../../src/assistant/home-mcp-bridge.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG5D,wBAAgB,4BAA4B,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,CAOpE;AAED,uDAAuD;AACvD,wBAAgB,qBAAqB,CACnC,IAAI,CAAC,EAAE,mBAAmB,EAC1B,EAAE,CAAC,EAAE,QAAQ,GACZ,MAAM,GAAG,IAAI,CAOf;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAGjE"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { resolveAssistantHomeConfig } from './home-config.js';
|
|
2
|
+
export function listConfiguredMcpServerNames(ai) {
|
|
3
|
+
const names = new Set();
|
|
4
|
+
for (const entry of ai?.mcpServers ?? []) {
|
|
5
|
+
const name = entry.name?.trim();
|
|
6
|
+
if (name)
|
|
7
|
+
names.add(name);
|
|
8
|
+
}
|
|
9
|
+
return [...names];
|
|
10
|
+
}
|
|
11
|
+
/** 校验 mcpServer 已在 ai.mcpServers 注册;返回警告文案(无则 null) */
|
|
12
|
+
export function validateHomeMcpServer(home, ai) {
|
|
13
|
+
const cfg = resolveAssistantHomeConfig(home);
|
|
14
|
+
const name = cfg.mcpServer?.trim();
|
|
15
|
+
if (!name)
|
|
16
|
+
return null;
|
|
17
|
+
const registered = listConfiguredMcpServerNames(ai);
|
|
18
|
+
if (registered.includes(name))
|
|
19
|
+
return null;
|
|
20
|
+
return `assistant.home.mcpServer="${name}" 未在 ai.mcpServers 中注册;REST 仍可用,MCP 工具需补全配置`;
|
|
21
|
+
}
|
|
22
|
+
export function isHomeMcpMode(home) {
|
|
23
|
+
const cfg = resolveAssistantHomeConfig(home);
|
|
24
|
+
return Boolean(cfg.mcpServer?.trim() && !cfg.restUrl);
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=home-mcp-bridge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"home-mcp-bridge.js","sourceRoot":"","sources":["../../src/assistant/home-mcp-bridge.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,UAAU,4BAA4B,CAAC,EAAa;IACxD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,KAAK,IAAI,EAAE,EAAE,UAAU,IAAI,EAAE,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QAChC,IAAI,IAAI;YAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;AACpB,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,qBAAqB,CACnC,IAA0B,EAC1B,EAAa;IAEb,MAAM,GAAG,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,MAAM,UAAU,GAAG,4BAA4B,CAAC,EAAE,CAAC,CAAC;IACpD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3C,OAAO,6BAA6B,IAAI,6CAA6C,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAA0B;IACtD,MAAM,GAAG,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { ToolContext } from '@zhin.js/core';
|
|
2
|
+
import { type ToolRequesterRole } from '../security/owner-approve-always-store.js';
|
|
3
|
+
import type { HomePolicyConfig } from './home-config.js';
|
|
4
|
+
export interface HomeToolDecision {
|
|
5
|
+
allowed: boolean;
|
|
6
|
+
needsOwnerApproval?: boolean;
|
|
7
|
+
reason?: string;
|
|
8
|
+
role: ToolRequesterRole;
|
|
9
|
+
}
|
|
10
|
+
export declare function checkHomeToolAccess(operation: 'read' | 'write', entityId: string, context: ToolContext | undefined, policy: HomePolicyConfig & {
|
|
11
|
+
requireMaster: boolean;
|
|
12
|
+
confirmServices: string[];
|
|
13
|
+
}): HomeToolDecision;
|
|
14
|
+
export declare function toHomeOwnerSignal(decision: HomeToolDecision): string;
|
|
15
|
+
export declare function toHomeDenyError(decision: HomeToolDecision): string;
|
|
16
|
+
//# sourceMappingURL=home-policy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"home-policy.d.ts","sourceRoot":"","sources":["../../src/assistant/home-policy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,iBAAiB,CAAC;CACzB;AAcD,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,GAAG,OAAO,EAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,MAAM,EAAE,gBAAgB,GAAG;IAAE,aAAa,EAAE,OAAO,CAAC;IAAC,eAAe,EAAE,MAAM,EAAE,CAAA;CAAE,GAC/E,gBAAgB,CAsBlB;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAEpE;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAElE"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Home Domain 工具权限(M4)
|
|
3
|
+
*/
|
|
4
|
+
import { getPlugin } from '@zhin.js/core';
|
|
5
|
+
import { resolveToolRequesterRole, } from '../security/owner-approve-always-store.js';
|
|
6
|
+
import { parseEntityDomain } from './domains/home-assistant.js';
|
|
7
|
+
function resolveRole(context) {
|
|
8
|
+
if (!context?.platform || !context?.botId || !context?.senderId) {
|
|
9
|
+
return 'unknown';
|
|
10
|
+
}
|
|
11
|
+
try {
|
|
12
|
+
return resolveToolRequesterRole(getPlugin(), context);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
if (context.roles?.includes('master'))
|
|
16
|
+
return 'master';
|
|
17
|
+
return 'other';
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
export function checkHomeToolAccess(operation, entityId, context, policy) {
|
|
21
|
+
const role = resolveRole(context);
|
|
22
|
+
const domain = parseEntityDomain(entityId);
|
|
23
|
+
if (policy.requireMaster && role !== 'master') {
|
|
24
|
+
return {
|
|
25
|
+
allowed: false,
|
|
26
|
+
role,
|
|
27
|
+
reason: '智能家居操作仅允许 Bot Owner(master)调用。',
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
if (operation === 'write' && policy.confirmServices.includes(domain)) {
|
|
31
|
+
return {
|
|
32
|
+
allowed: false,
|
|
33
|
+
needsOwnerApproval: true,
|
|
34
|
+
role,
|
|
35
|
+
reason: `「${domain}」类设备操作需 Owner 确认后方可执行(entity: ${entityId})。`,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
return { allowed: true, role };
|
|
39
|
+
}
|
|
40
|
+
export function toHomeOwnerSignal(decision) {
|
|
41
|
+
return `ZHIN_NEEDS_OWNER:\n${decision.reason ?? '该智能家居操作需要 Master 确认。'}`;
|
|
42
|
+
}
|
|
43
|
+
export function toHomeDenyError(decision) {
|
|
44
|
+
return `Error: ${decision.reason ?? '智能家居操作被拒绝。'}`;
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=home-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"home-policy.js","sourceRoot":"","sources":["../../src/assistant/home-policy.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EACL,wBAAwB,GAEzB,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAShE,SAAS,WAAW,CAAC,OAAqB;IACxC,IAAI,CAAC,OAAO,EAAE,QAAQ,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC;QACH,OAAO,wBAAwB,CAAC,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAC;QACvD,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,SAA2B,EAC3B,QAAgB,EAChB,OAAgC,EAChC,MAAgF;IAEhF,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAE3C,IAAI,MAAM,CAAC,aAAa,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9C,OAAO;YACL,OAAO,EAAE,KAAK;YACd,IAAI;YACJ,MAAM,EAAE,gCAAgC;SACzC,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,OAAO,IAAI,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACrE,OAAO;YACL,OAAO,EAAE,KAAK;YACd,kBAAkB,EAAE,IAAI;YACxB,IAAI;YACJ,MAAM,EAAE,IAAI,MAAM,iCAAiC,QAAQ,IAAI;SAChE,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAA0B;IAC1D,OAAO,sBAAsB,QAAQ,CAAC,MAAM,IAAI,sBAAsB,EAAE,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,QAA0B;IACxD,OAAO,UAAU,QAAQ,CAAC,MAAM,IAAI,YAAY,EAAE,CAAC;AACrD,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* home_* 工具 — 薄封装 HomeAssistantService(M4)
|
|
3
|
+
*/
|
|
4
|
+
import { ZhinTool } from '@zhin.js/core';
|
|
5
|
+
import type { HomeAssistantService } from './domains/home-assistant.js';
|
|
6
|
+
import type { HomePolicyConfig } from './home-config.js';
|
|
7
|
+
export interface HomeToolsOptions {
|
|
8
|
+
service: HomeAssistantService;
|
|
9
|
+
policy: HomePolicyConfig & {
|
|
10
|
+
requireMaster: boolean;
|
|
11
|
+
confirmServices: string[];
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
export declare function createHomeTools(options: HomeToolsOptions): ZhinTool[];
|
|
15
|
+
//# sourceMappingURL=home-tools.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"home-tools.d.ts","sourceRoot":"","sources":["../../src/assistant/home-tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAUzD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,MAAM,EAAE,gBAAgB,GAAG;QAAE,aAAa,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAClF;AAsCD,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,QAAQ,EAAE,CA8FrE"}
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* home_* 工具 — 薄封装 HomeAssistantService(M4)
|
|
3
|
+
*/
|
|
4
|
+
import { ZhinTool } from '@zhin.js/core';
|
|
5
|
+
import { checkHomeToolAccess, toHomeDenyError, toHomeOwnerSignal, } from './home-policy.js';
|
|
6
|
+
import { getPlugin } from '@zhin.js/core';
|
|
7
|
+
import { resolveToolRequesterRole } from '../security/owner-approve-always-store.js';
|
|
8
|
+
function guard(operation, entityId, context, policy) {
|
|
9
|
+
const decision = checkHomeToolAccess(operation, entityId, context, policy);
|
|
10
|
+
return formatGuardResult(decision);
|
|
11
|
+
}
|
|
12
|
+
function guardMasterOnly(context, policy) {
|
|
13
|
+
if (!policy.requireMaster || !context?.platform || !context.botId || !context.senderId) {
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
try {
|
|
17
|
+
const role = resolveToolRequesterRole(getPlugin(), context);
|
|
18
|
+
if (role === 'master')
|
|
19
|
+
return null;
|
|
20
|
+
return toHomeDenyError({
|
|
21
|
+
allowed: false,
|
|
22
|
+
role,
|
|
23
|
+
reason: '智能家居操作仅允许 Bot Owner(master)调用。',
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
function formatGuardResult(decision) {
|
|
31
|
+
if (decision.allowed)
|
|
32
|
+
return null;
|
|
33
|
+
if (decision.needsOwnerApproval)
|
|
34
|
+
return toHomeOwnerSignal(decision);
|
|
35
|
+
return toHomeDenyError(decision);
|
|
36
|
+
}
|
|
37
|
+
export function createHomeTools(options) {
|
|
38
|
+
const { service, policy } = options;
|
|
39
|
+
const listAliases = new ZhinTool('home_list_aliases')
|
|
40
|
+
.desc('列出已配置的智能家居设备别名(不暴露原始 entity_id 给用户层)')
|
|
41
|
+
.keyword('智能家居', '设备列表', 'home list', '别名')
|
|
42
|
+
.tag('home', 'assistant')
|
|
43
|
+
.execute(async (_args, context) => {
|
|
44
|
+
const aliases = service.listAliases();
|
|
45
|
+
const names = Object.keys(aliases);
|
|
46
|
+
if (names.length === 0)
|
|
47
|
+
return { aliases: {}, message: '未配置任何设备别名' };
|
|
48
|
+
const listErr = guardMasterOnly(context, policy);
|
|
49
|
+
if (listErr)
|
|
50
|
+
return { error: listErr };
|
|
51
|
+
return { aliases: names, count: names.length };
|
|
52
|
+
});
|
|
53
|
+
const getState = new ZhinTool('home_get_state')
|
|
54
|
+
.desc('读取智能家居设备状态(使用配置别名,如「客厅灯」)')
|
|
55
|
+
.keyword('设备状态', '灯状态', 'home state', '查询')
|
|
56
|
+
.tag('home', 'assistant')
|
|
57
|
+
.param('alias', { type: 'string', description: '设备别名(zhin.config.yml assistant.home.aliases 中配置)' }, true)
|
|
58
|
+
.execute(async (args, context) => {
|
|
59
|
+
const alias = String(args.alias ?? '').trim();
|
|
60
|
+
if (!alias)
|
|
61
|
+
return { error: 'alias 必填' };
|
|
62
|
+
let entityId;
|
|
63
|
+
try {
|
|
64
|
+
entityId = service.resolveAlias(alias);
|
|
65
|
+
}
|
|
66
|
+
catch (e) {
|
|
67
|
+
return { error: e.message };
|
|
68
|
+
}
|
|
69
|
+
const err = guard('read', entityId, context, policy);
|
|
70
|
+
if (err)
|
|
71
|
+
return { error: err };
|
|
72
|
+
try {
|
|
73
|
+
const state = await service.getState(alias);
|
|
74
|
+
return {
|
|
75
|
+
alias,
|
|
76
|
+
state: state.state,
|
|
77
|
+
attributes: state.attributes,
|
|
78
|
+
lastUpdated: state.lastUpdated,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
catch (e) {
|
|
82
|
+
return { error: e.message };
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
const turnOn = new ZhinTool('home_turn_on')
|
|
86
|
+
.desc('打开/开启智能家居设备(别名,如「客厅灯」)')
|
|
87
|
+
.keyword('开灯', '打开', 'home on', 'turn on')
|
|
88
|
+
.tag('home', 'assistant')
|
|
89
|
+
.param('alias', { type: 'string', description: '设备别名' }, true)
|
|
90
|
+
.execute(async (args, context) => {
|
|
91
|
+
const alias = String(args.alias ?? '').trim();
|
|
92
|
+
if (!alias)
|
|
93
|
+
return { error: 'alias 必填' };
|
|
94
|
+
let entityId;
|
|
95
|
+
try {
|
|
96
|
+
entityId = service.resolveAlias(alias);
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
return { error: e.message };
|
|
100
|
+
}
|
|
101
|
+
const err = guard('write', entityId, context, policy);
|
|
102
|
+
if (err)
|
|
103
|
+
return { error: err };
|
|
104
|
+
try {
|
|
105
|
+
const result = await service.turnOn(alias);
|
|
106
|
+
return { success: true, ...result, message: `已执行 ${result.service}` };
|
|
107
|
+
}
|
|
108
|
+
catch (e) {
|
|
109
|
+
return { error: e.message };
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
const turnOff = new ZhinTool('home_turn_off')
|
|
113
|
+
.desc('关闭智能家居设备(别名,如「客厅灯」)')
|
|
114
|
+
.keyword('关灯', '关闭', 'home off', 'turn off')
|
|
115
|
+
.tag('home', 'assistant')
|
|
116
|
+
.param('alias', { type: 'string', description: '设备别名' }, true)
|
|
117
|
+
.execute(async (args, context) => {
|
|
118
|
+
const alias = String(args.alias ?? '').trim();
|
|
119
|
+
if (!alias)
|
|
120
|
+
return { error: 'alias 必填' };
|
|
121
|
+
let entityId;
|
|
122
|
+
try {
|
|
123
|
+
entityId = service.resolveAlias(alias);
|
|
124
|
+
}
|
|
125
|
+
catch (e) {
|
|
126
|
+
return { error: e.message };
|
|
127
|
+
}
|
|
128
|
+
const err = guard('write', entityId, context, policy);
|
|
129
|
+
if (err)
|
|
130
|
+
return { error: err };
|
|
131
|
+
try {
|
|
132
|
+
const result = await service.turnOff(alias);
|
|
133
|
+
return { success: true, ...result, message: `已执行 ${result.service}` };
|
|
134
|
+
}
|
|
135
|
+
catch (e) {
|
|
136
|
+
return { error: e.message };
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
return [listAliases, getState, turnOn, turnOff];
|
|
140
|
+
}
|
|
141
|
+
//# sourceMappingURL=home-tools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"home-tools.js","sourceRoot":"","sources":["../../src/assistant/home-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
export type { AssistantConfig, AssistantDefaultsConfig, AssistantEventsConfig, AssistantQueueConfig } from './config.js';
|
|
2
|
+
export type { AssistantHomeConfig, HomePolicyConfig } from './home-config.js';
|
|
3
|
+
export { resolveAssistantHomeConfig, isAssistantHomeActive, DEFAULT_HOME_POLICY, } from './home-config.js';
|
|
4
|
+
export { HomeAssistantService, parseEntityDomain } from './domains/home-assistant.js';
|
|
5
|
+
export type { HaEntityState, HaFetch } from './domains/home-assistant.js';
|
|
6
|
+
export { createHomeTools } from './home-tools.js';
|
|
7
|
+
export type { AssistantProfileConfig, AssistantProfile } from './profile-types.js';
|
|
8
|
+
export { ASSISTANT_PROFILE_VERSION, DEFAULT_PROFILE_FILENAME, DEFAULT_HEARTBEAT_PROMPT, PROFILE_HEARTBEAT_JOB_ID, PROFILE_MORNING_BRIEF_JOB_ID, PROFILE_BEDTIME_CHECK_JOB_ID, } from './profile-types.js';
|
|
9
|
+
export { loadAssistantProfileFile, loadBootstrapWithProfile, syncProfileHeartbeatToStore, syncProfileCronRoutinesToStore, mergeProfileDeviceAliases, validateAssistantProfile, resolveAssistantProfileConfig, buildHeartbeatJobFromRoutine, buildCronJobFromRoutine, } from './profile-loader.js';
|
|
10
|
+
export { registerJobSchedule, isRuntimeSchedulable } from './job-scheduler.js';
|
|
11
|
+
export { validateHomeMcpServer, listConfiguredMcpServerNames, isHomeMcpMode } from './home-mcp-bridge.js';
|
|
12
|
+
export type { ScheduleDispose } from './job-scheduler.js';
|
|
13
|
+
export { checkHomeToolAccess, toHomeOwnerSignal, toHomeDenyError } from './home-policy.js';
|
|
14
|
+
export { DEFAULT_ASSISTANT_CONFIG, DEFAULT_EVENTS_CONFIG, resolveAssistantConfig, resolveAssistantDefaultsConfig, resolveAssistantEventsConfig, resolveAssistantQueueConfig, isAssistantEventsActive, } from './config.js';
|
|
15
|
+
export type { AssistantEventRequest, AssistantEventResult, AssistantEventStatus } from './event-types.js';
|
|
16
|
+
export { AssistantEventIngress } from './event-ingress.js';
|
|
17
|
+
export type { AssistantEventIngressOptions } from './event-ingress.js';
|
|
18
|
+
export { setAssistantRuntime, getAssistantRuntime, isAssistantEventsEndpointActive, getAssistantEventsTokenFallback, } from './runtime-registry.js';
|
|
19
|
+
export type { AssistantRuntimeHandle } from './runtime-registry.js';
|
|
20
|
+
export type { AssistantJob, AssistantJobFile, AssistantJobState, JobAction, JobNotify, JobSchedule, } from './types.js';
|
|
21
|
+
export { ASSISTANT_JOBS_FILENAME, ASSISTANT_JOBS_VERSION } from './types.js';
|
|
22
|
+
export { assistantCronJobs, assistantToCronRecord, cronRecordToAssistant, schedulerRecordToAssistant, toolContextToImNotify, isCronSchedulable, jobPrompt, } from './legacy-convert.js';
|
|
23
|
+
export { AssistantJobStore, createAssistantJobStore, getAssistantJobsPath, } from './job-store.js';
|
|
24
|
+
export type { AssistantJobStoreOptions, MigrationResult } from './job-store.js';
|
|
25
|
+
export { JobWorker } from './job-worker.js';
|
|
26
|
+
export type { JobWorkerOptions } from './job-worker.js';
|
|
27
|
+
export { AssistantJobEngine } from './job-engine.js';
|
|
28
|
+
export type { AssistantJobEngineOptions } from './job-engine.js';
|
|
29
|
+
export { createNotificationRouter, resolveEffectiveNotify, notifyToSendOptions, mergeImNotify, } from './notification-router.js';
|
|
30
|
+
export type { NotificationRouter, NotificationRouterDeps, DeliverParams, DeliverResult, ImJobNotify, } from './notification-router.js';
|
|
31
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/assistant/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export { resolveAssistantHomeConfig, isAssistantHomeActive, DEFAULT_HOME_POLICY, } from './home-config.js';
|
|
2
|
+
export { HomeAssistantService, parseEntityDomain } from './domains/home-assistant.js';
|
|
3
|
+
export { createHomeTools } from './home-tools.js';
|
|
4
|
+
export { ASSISTANT_PROFILE_VERSION, DEFAULT_PROFILE_FILENAME, DEFAULT_HEARTBEAT_PROMPT, PROFILE_HEARTBEAT_JOB_ID, PROFILE_MORNING_BRIEF_JOB_ID, PROFILE_BEDTIME_CHECK_JOB_ID, } from './profile-types.js';
|
|
5
|
+
export { loadAssistantProfileFile, loadBootstrapWithProfile, syncProfileHeartbeatToStore, syncProfileCronRoutinesToStore, mergeProfileDeviceAliases, validateAssistantProfile, resolveAssistantProfileConfig, buildHeartbeatJobFromRoutine, buildCronJobFromRoutine, } from './profile-loader.js';
|
|
6
|
+
export { registerJobSchedule, isRuntimeSchedulable } from './job-scheduler.js';
|
|
7
|
+
export { validateHomeMcpServer, listConfiguredMcpServerNames, isHomeMcpMode } from './home-mcp-bridge.js';
|
|
8
|
+
export { checkHomeToolAccess, toHomeOwnerSignal, toHomeDenyError } from './home-policy.js';
|
|
9
|
+
export { DEFAULT_ASSISTANT_CONFIG, DEFAULT_EVENTS_CONFIG, resolveAssistantConfig, resolveAssistantDefaultsConfig, resolveAssistantEventsConfig, resolveAssistantQueueConfig, isAssistantEventsActive, } from './config.js';
|
|
10
|
+
export { AssistantEventIngress } from './event-ingress.js';
|
|
11
|
+
export { setAssistantRuntime, getAssistantRuntime, isAssistantEventsEndpointActive, getAssistantEventsTokenFallback, } from './runtime-registry.js';
|
|
12
|
+
export { ASSISTANT_JOBS_FILENAME, ASSISTANT_JOBS_VERSION } from './types.js';
|
|
13
|
+
export { assistantCronJobs, assistantToCronRecord, cronRecordToAssistant, schedulerRecordToAssistant, toolContextToImNotify, isCronSchedulable, jobPrompt, } from './legacy-convert.js';
|
|
14
|
+
export { AssistantJobStore, createAssistantJobStore, getAssistantJobsPath, } from './job-store.js';
|
|
15
|
+
export { JobWorker } from './job-worker.js';
|
|
16
|
+
export { AssistantJobEngine } from './job-engine.js';
|
|
17
|
+
export { createNotificationRouter, resolveEffectiveNotify, notifyToSendOptions, mergeImNotify, } from './notification-router.js';
|
|
18
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/assistant/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,EACxB,4BAA4B,EAC5B,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,2BAA2B,EAC3B,8BAA8B,EAC9B,yBAAyB,EACzB,wBAAwB,EACxB,6BAA6B,EAC7B,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1G,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE3F,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,EACtB,8BAA8B,EAC9B,4BAA4B,EAC5B,2BAA2B,EAC3B,uBAAuB,GACxB,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,+BAA+B,EAC/B,+BAA+B,GAChC,MAAM,uBAAuB,CAAC;AAW/B,OAAO,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,qBAAqB,EACrB,iBAAiB,EACjB,SAAS,GACV,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,mBAAmB,EACnB,aAAa,GACd,MAAM,0BAA0B,CAAC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import type { AddCronFn, CronJobRecord } from '../cron-engine.js';
|
|
2
|
+
import type { AssistantJobStore } from './job-store.js';
|
|
3
|
+
import type { JobWorker } from './job-worker.js';
|
|
4
|
+
import type { AssistantJob } from './types.js';
|
|
5
|
+
import type { NotificationRouter } from './notification-router.js';
|
|
6
|
+
export interface AssistantJobEngineOptions {
|
|
7
|
+
store: AssistantJobStore;
|
|
8
|
+
addCron: AddCronFn;
|
|
9
|
+
worker: JobWorker;
|
|
10
|
+
notifyOnFailure?: boolean;
|
|
11
|
+
router?: NotificationRouter;
|
|
12
|
+
defaultNotify?: import('./types.js').JobNotify;
|
|
13
|
+
}
|
|
14
|
+
export declare class AssistantJobEngine {
|
|
15
|
+
private store;
|
|
16
|
+
private addCron;
|
|
17
|
+
private worker;
|
|
18
|
+
private disposes;
|
|
19
|
+
private notifyOnFailure;
|
|
20
|
+
private router?;
|
|
21
|
+
private defaultNotify?;
|
|
22
|
+
constructor(options: AssistantJobEngineOptions);
|
|
23
|
+
getDataDir(): string;
|
|
24
|
+
load(): void;
|
|
25
|
+
registerOne(job: AssistantJob): void;
|
|
26
|
+
runJobNow(jobId: string): Promise<void>;
|
|
27
|
+
private runJob;
|
|
28
|
+
listJobs(): Promise<CronJobRecord[]>;
|
|
29
|
+
listAssistantJobs(): Promise<AssistantJob[]>;
|
|
30
|
+
addJob(record: Omit<CronJobRecord, 'createdAt'> & {
|
|
31
|
+
createdAt?: number;
|
|
32
|
+
}): Promise<CronJobRecord>;
|
|
33
|
+
removeJob(id: string): Promise<boolean>;
|
|
34
|
+
pauseJob(id: string): Promise<boolean>;
|
|
35
|
+
resumeJob(id: string): Promise<boolean>;
|
|
36
|
+
unload(): void;
|
|
37
|
+
updateJobStatus(id: string, status: 'ok' | 'error', error?: string): Promise<void>;
|
|
38
|
+
}
|
|
39
|
+
export type { AddCronFn } from '../cron-engine.js';
|
|
40
|
+
//# sourceMappingURL=job-engine.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-engine.d.ts","sourceRoot":"","sources":["../../src/assistant/job-engine.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACd,MAAM,mBAAmB,CAAC;AAO3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAKnE,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,iBAAiB,CAAC;IACzB,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,YAAY,EAAE,SAAS,CAAC;CAChD;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,MAAM,CAAC,CAAqB;IACpC,OAAO,CAAC,aAAa,CAAC,CAAiC;gBAE3C,OAAO,EAAE,yBAAyB;IAS9C,UAAU,IAAI,MAAM;IAIpB,IAAI,IAAI,IAAI;IAgBZ,WAAW,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAO9B,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAI/B,MAAM;IA6Bd,QAAQ,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAIpC,iBAAiB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI5C,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAgBjG,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWvC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAatC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW7C,MAAM,IAAI,IAAI;IAWR,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,GAAG,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOzF;AAED,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AssistantJobEngine — 基于 JobStore 的持久化调度(API 兼容 PersistentCronEngine)
|
|
3
|
+
*/
|
|
4
|
+
import { Logger } from '@zhin.js/core';
|
|
5
|
+
import { formatCompact } from '@zhin.js/logger';
|
|
6
|
+
import { assistantToCronRecord, cronRecordToAssistant, jobPrompt, } from './legacy-convert.js';
|
|
7
|
+
import { registerJobSchedule, isRuntimeSchedulable } from './job-scheduler.js';
|
|
8
|
+
import { resolveEffectiveNotify } from './notification-router.js';
|
|
9
|
+
const logger = new Logger(null, 'assistant-job-engine');
|
|
10
|
+
export class AssistantJobEngine {
|
|
11
|
+
store;
|
|
12
|
+
addCron;
|
|
13
|
+
worker;
|
|
14
|
+
disposes = new Map();
|
|
15
|
+
notifyOnFailure;
|
|
16
|
+
router;
|
|
17
|
+
defaultNotify;
|
|
18
|
+
constructor(options) {
|
|
19
|
+
this.store = options.store;
|
|
20
|
+
this.addCron = options.addCron;
|
|
21
|
+
this.worker = options.worker;
|
|
22
|
+
this.notifyOnFailure = options.notifyOnFailure === true;
|
|
23
|
+
this.router = options.router;
|
|
24
|
+
this.defaultNotify = options.defaultNotify;
|
|
25
|
+
}
|
|
26
|
+
getDataDir() {
|
|
27
|
+
return this.store.getDataDir();
|
|
28
|
+
}
|
|
29
|
+
load() {
|
|
30
|
+
this.store.migrateLegacyIfNeeded().then(() => this.store.listJobs()).then((jobs) => {
|
|
31
|
+
for (const job of jobs) {
|
|
32
|
+
if (isRuntimeSchedulable(job)) {
|
|
33
|
+
this.registerOne(job);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
const count = jobs.filter((j) => isRuntimeSchedulable(j)).length;
|
|
37
|
+
if (count > 0) {
|
|
38
|
+
logger.debug(formatCompact({ assistant_jobs: count }));
|
|
39
|
+
}
|
|
40
|
+
}).catch((e) => {
|
|
41
|
+
logger.warn('加载 Assistant Job 失败: ' + (e?.message || String(e)));
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
registerOne(job) {
|
|
45
|
+
const dispose = registerJobSchedule(job, this.addCron, (jobId) => this.runJob(jobId));
|
|
46
|
+
if (dispose) {
|
|
47
|
+
this.disposes.set(job.id, dispose);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
async runJobNow(jobId) {
|
|
51
|
+
await this.runJob(jobId);
|
|
52
|
+
}
|
|
53
|
+
async runJob(jobId) {
|
|
54
|
+
const job = await this.store.getJob(jobId);
|
|
55
|
+
if (!job || !job.enabled)
|
|
56
|
+
return;
|
|
57
|
+
if (job.action.kind !== 'agent' && job.action.kind !== 'heartbeat')
|
|
58
|
+
return;
|
|
59
|
+
const result = await this.worker.run(jobId, jobPrompt(job), {
|
|
60
|
+
notify: job.notify,
|
|
61
|
+
label: job.label || jobId,
|
|
62
|
+
});
|
|
63
|
+
await this.store.updateJobState(jobId, {
|
|
64
|
+
lastExecutedAt: Date.now(),
|
|
65
|
+
lastStatus: result.success ? 'ok' : 'error',
|
|
66
|
+
lastError: result.success ? undefined : result.error,
|
|
67
|
+
});
|
|
68
|
+
if (!result.success && this.router && (job.notifyOnFailure ?? this.notifyOnFailure)) {
|
|
69
|
+
const notify = resolveEffectiveNotify(job.notify, this.defaultNotify);
|
|
70
|
+
if (notify.channel !== 'silent' && notify.channel !== 'log') {
|
|
71
|
+
const msg = `[任务失败] ${job.label || jobId}: ${result.error || 'unknown error'}`;
|
|
72
|
+
await this.router.deliver({ notify, content: msg, jobId, label: job.label }).catch(() => { });
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
if (result.success && job.schedule.kind === 'at' && job.schedule.deleteAfterRun) {
|
|
76
|
+
await this.removeJob(jobId);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
async listJobs() {
|
|
80
|
+
return this.store.listCronCompatible();
|
|
81
|
+
}
|
|
82
|
+
async listAssistantJobs() {
|
|
83
|
+
return this.store.listJobs();
|
|
84
|
+
}
|
|
85
|
+
async addJob(record) {
|
|
86
|
+
const assistant = cronRecordToAssistant({
|
|
87
|
+
...record,
|
|
88
|
+
createdAt: record.createdAt ?? Date.now(),
|
|
89
|
+
enabled: record.enabled ?? true,
|
|
90
|
+
});
|
|
91
|
+
assistant.source = 'manual';
|
|
92
|
+
await this.store.upsertJob(assistant);
|
|
93
|
+
if (isRuntimeSchedulable(assistant)) {
|
|
94
|
+
this.registerOne(assistant);
|
|
95
|
+
}
|
|
96
|
+
const out = assistantToCronRecord(assistant);
|
|
97
|
+
if (!out)
|
|
98
|
+
throw new Error('Failed to convert assistant job to cron record');
|
|
99
|
+
return out;
|
|
100
|
+
}
|
|
101
|
+
async removeJob(id) {
|
|
102
|
+
const ok = await this.store.removeJob(id);
|
|
103
|
+
if (!ok)
|
|
104
|
+
return false;
|
|
105
|
+
const dispose = this.disposes.get(id);
|
|
106
|
+
if (dispose) {
|
|
107
|
+
dispose();
|
|
108
|
+
this.disposes.delete(id);
|
|
109
|
+
}
|
|
110
|
+
return true;
|
|
111
|
+
}
|
|
112
|
+
async pauseJob(id) {
|
|
113
|
+
const job = await this.store.getJob(id);
|
|
114
|
+
if (!job)
|
|
115
|
+
return false;
|
|
116
|
+
job.enabled = false;
|
|
117
|
+
await this.store.upsertJob(job);
|
|
118
|
+
const dispose = this.disposes.get(id);
|
|
119
|
+
if (dispose) {
|
|
120
|
+
dispose();
|
|
121
|
+
this.disposes.delete(id);
|
|
122
|
+
}
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
async resumeJob(id) {
|
|
126
|
+
const job = await this.store.getJob(id);
|
|
127
|
+
if (!job)
|
|
128
|
+
return false;
|
|
129
|
+
job.enabled = true;
|
|
130
|
+
await this.store.upsertJob(job);
|
|
131
|
+
if (isRuntimeSchedulable(job)) {
|
|
132
|
+
this.registerOne(job);
|
|
133
|
+
}
|
|
134
|
+
return true;
|
|
135
|
+
}
|
|
136
|
+
unload() {
|
|
137
|
+
for (const [id, dispose] of this.disposes) {
|
|
138
|
+
try {
|
|
139
|
+
dispose();
|
|
140
|
+
}
|
|
141
|
+
catch (e) {
|
|
142
|
+
logger.warn(`Assistant schedule dispose failed for ${id}:`, e);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
this.disposes.clear();
|
|
146
|
+
}
|
|
147
|
+
async updateJobStatus(id, status, error) {
|
|
148
|
+
await this.store.updateJobState(id, {
|
|
149
|
+
lastExecutedAt: Date.now(),
|
|
150
|
+
lastStatus: status,
|
|
151
|
+
lastError: status === 'error' ? error : undefined,
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
//# sourceMappingURL=job-engine.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-engine.js","sourceRoot":"","sources":["../../src/assistant/job-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { AddCronFn } from '../cron-engine.js';
|
|
2
|
+
import type { AssistantJob } from './types.js';
|
|
3
|
+
export type ScheduleDispose = () => void;
|
|
4
|
+
export declare function isRuntimeSchedulable(job: AssistantJob, now?: number): boolean;
|
|
5
|
+
export declare function registerJobSchedule(job: AssistantJob, addCron: AddCronFn, onRun: (jobId: string) => void | Promise<void>): ScheduleDispose | null;
|
|
6
|
+
//# sourceMappingURL=job-scheduler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-scheduler.d.ts","sourceRoot":"","sources":["../../src/assistant/job-scheduler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,MAAM,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC;AAEzC,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,SAAa,GAAG,OAAO,CAcjF;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,YAAY,EACjB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAC7C,eAAe,GAAG,IAAI,CAmCxB"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Assistant Job 非 cron 调度(every / at)+ cron 注册(M1.5)
|
|
3
|
+
*/
|
|
4
|
+
import { Cron } from '@zhin.js/core';
|
|
5
|
+
import { formatCompact, Logger } from '@zhin.js/logger';
|
|
6
|
+
const logger = new Logger(null, 'assistant-job-scheduler');
|
|
7
|
+
export function isRuntimeSchedulable(job, now = Date.now()) {
|
|
8
|
+
if (!job.enabled)
|
|
9
|
+
return false;
|
|
10
|
+
switch (job.schedule.kind) {
|
|
11
|
+
case 'cron':
|
|
12
|
+
return Boolean(job.schedule.expr);
|
|
13
|
+
case 'every':
|
|
14
|
+
return job.schedule.everyMs > 0;
|
|
15
|
+
case 'at':
|
|
16
|
+
return job.schedule.atMs > now;
|
|
17
|
+
case 'event':
|
|
18
|
+
return false;
|
|
19
|
+
default:
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
export function registerJobSchedule(job, addCron, onRun) {
|
|
24
|
+
const jobId = job.id;
|
|
25
|
+
try {
|
|
26
|
+
if (job.schedule.kind === 'cron') {
|
|
27
|
+
const cron = new Cron(job.schedule.expr, async () => {
|
|
28
|
+
await onRun(jobId);
|
|
29
|
+
});
|
|
30
|
+
cron.id = jobId;
|
|
31
|
+
return addCron(cron);
|
|
32
|
+
}
|
|
33
|
+
if (job.schedule.kind === 'every') {
|
|
34
|
+
const everyMs = job.schedule.everyMs;
|
|
35
|
+
const timer = setInterval(() => {
|
|
36
|
+
void onRun(jobId);
|
|
37
|
+
}, everyMs);
|
|
38
|
+
return () => clearInterval(timer);
|
|
39
|
+
}
|
|
40
|
+
if (job.schedule.kind === 'at') {
|
|
41
|
+
const delay = job.schedule.atMs - Date.now();
|
|
42
|
+
if (delay <= 0)
|
|
43
|
+
return null;
|
|
44
|
+
const timer = setTimeout(() => {
|
|
45
|
+
void onRun(jobId);
|
|
46
|
+
}, delay);
|
|
47
|
+
return () => clearTimeout(timer);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
catch (e) {
|
|
51
|
+
logger.warn(formatCompact({
|
|
52
|
+
op: 'register_schedule_failed',
|
|
53
|
+
jobId,
|
|
54
|
+
error: e?.message || String(e),
|
|
55
|
+
}));
|
|
56
|
+
}
|
|
57
|
+
return null;
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=job-scheduler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-scheduler.js","sourceRoot":"","sources":["../../src/assistant/job-scheduler.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIxD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;AAI3D,MAAM,UAAU,oBAAoB,CAAC,GAAiB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACtE,IAAI,CAAC,GAAG,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC/B,QAAQ,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC1B,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,KAAK,OAAO;YACV,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC;QAClC,KAAK,IAAI;YACP,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;QACjC,KAAK,OAAO;YACV,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,GAAiB,EACjB,OAAkB,EAClB,KAA8C;IAE9C,MAAM,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;IACrB,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;gBAClD,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;YAChB,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QAED,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;YACrC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;gBAC7B,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,CAAC,EAAE,OAAO,CAAC,CAAC;YACZ,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7C,IAAI,KAAK,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC5B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,CAAC,EAAE,KAAK,CAAC,CAAC;YACV,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACxB,EAAE,EAAE,0BAA0B;YAC9B,KAAK;YACL,KAAK,EAAG,CAAW,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC;SAC1C,CAAC,CAAC,CAAC;IACN,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|