@rozek/nanoclaw 1.2.17
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/.claude/settings.json +1 -0
- package/.claude/skills/add-compact/SKILL.md +135 -0
- package/.claude/skills/add-discord/SKILL.md +203 -0
- package/.claude/skills/add-gmail/SKILL.md +220 -0
- package/.claude/skills/add-image-vision/SKILL.md +94 -0
- package/.claude/skills/add-ollama-tool/SKILL.md +153 -0
- package/.claude/skills/add-parallel/SKILL.md +290 -0
- package/.claude/skills/add-pdf-reader/SKILL.md +104 -0
- package/.claude/skills/add-reactions/SKILL.md +117 -0
- package/.claude/skills/add-slack/SKILL.md +207 -0
- package/.claude/skills/add-telegram/SKILL.md +222 -0
- package/.claude/skills/add-telegram-swarm/SKILL.md +384 -0
- package/.claude/skills/add-voice-transcription/SKILL.md +148 -0
- package/.claude/skills/add-whatsapp/SKILL.md +372 -0
- package/.claude/skills/convert-to-apple-container/SKILL.md +175 -0
- package/.claude/skills/customize/SKILL.md +110 -0
- package/.claude/skills/debug/SKILL.md +349 -0
- package/.claude/skills/get-qodo-rules/SKILL.md +122 -0
- package/.claude/skills/get-qodo-rules/references/output-format.md +41 -0
- package/.claude/skills/get-qodo-rules/references/pagination.md +33 -0
- package/.claude/skills/get-qodo-rules/references/repository-scope.md +26 -0
- package/.claude/skills/qodo-pr-resolver/SKILL.md +326 -0
- package/.claude/skills/qodo-pr-resolver/resources/providers.md +329 -0
- package/.claude/skills/setup/SKILL.md +218 -0
- package/.claude/skills/update-nanoclaw/SKILL.md +235 -0
- package/.claude/skills/update-skills/SKILL.md +130 -0
- package/.claude/skills/use-local-whisper/SKILL.md +152 -0
- package/.claude/skills/x-integration/SKILL.md +417 -0
- package/.claude/skills/x-integration/agent.ts +243 -0
- package/.claude/skills/x-integration/host.ts +159 -0
- package/.claude/skills/x-integration/lib/browser.ts +148 -0
- package/.claude/skills/x-integration/lib/config.ts +62 -0
- package/.claude/skills/x-integration/scripts/like.ts +56 -0
- package/.claude/skills/x-integration/scripts/post.ts +66 -0
- package/.claude/skills/x-integration/scripts/quote.ts +80 -0
- package/.claude/skills/x-integration/scripts/reply.ts +74 -0
- package/.claude/skills/x-integration/scripts/retweet.ts +62 -0
- package/.claude/skills/x-integration/scripts/setup.ts +87 -0
- package/.env.example +1 -0
- package/.github/CODEOWNERS +10 -0
- package/.github/PULL_REQUEST_TEMPLATE.md +14 -0
- package/.github/workflows/bump-version.yml +32 -0
- package/.github/workflows/ci.yml +25 -0
- package/.github/workflows/merge-forward-skills.yml +160 -0
- package/.github/workflows/update-tokens.yml +42 -0
- package/.husky/pre-commit +1 -0
- package/.mcp.json +3 -0
- package/.nvmrc +1 -0
- package/.prettierrc +3 -0
- package/CHANGELOG.md +8 -0
- package/CLAUDE.md +64 -0
- package/CONTRIBUTING.md +23 -0
- package/CONTRIBUTORS.md +15 -0
- package/LICENSE +21 -0
- package/NanoClaw_with_Web-Support.md +290 -0
- package/README.md +261 -0
- package/README_zh.md +200 -0
- package/assets/nanoclaw-favicon.png +0 -0
- package/assets/nanoclaw-icon.png +0 -0
- package/assets/nanoclaw-logo-dark.png +0 -0
- package/assets/nanoclaw-logo.png +0 -0
- package/assets/nanoclaw-profile.jpeg +0 -0
- package/assets/nanoclaw-sales.png +0 -0
- package/assets/social-preview.jpg +0 -0
- package/config-examples/mount-allowlist.json +25 -0
- package/container/Dockerfile +70 -0
- package/container/agent-runner/package-lock.json +1524 -0
- package/container/agent-runner/package.json +21 -0
- package/container/agent-runner/src/index.ts +558 -0
- package/container/agent-runner/src/ipc-mcp-stdio.ts +338 -0
- package/container/agent-runner/tsconfig.json +15 -0
- package/container/build.sh +23 -0
- package/container/skills/agent-browser/SKILL.md +159 -0
- package/container/skills/capabilities/SKILL.md +100 -0
- package/container/skills/status/SKILL.md +104 -0
- package/dist/channels/index.d.ts +2 -0
- package/dist/channels/index.d.ts.map +1 -0
- package/dist/channels/index.js +9 -0
- package/dist/channels/index.js.map +1 -0
- package/dist/channels/registry.d.ts +13 -0
- package/dist/channels/registry.d.ts.map +1 -0
- package/dist/channels/registry.js +11 -0
- package/dist/channels/registry.js.map +1 -0
- package/dist/channels/registry.test.d.ts +2 -0
- package/dist/channels/registry.test.d.ts.map +1 -0
- package/dist/channels/registry.test.js +32 -0
- package/dist/channels/registry.test.js.map +1 -0
- package/dist/channels/web.d.ts +2 -0
- package/dist/channels/web.d.ts.map +1 -0
- package/dist/channels/web.js +1738 -0
- package/dist/channels/web.js.map +1 -0
- package/dist/cli.d.ts +11 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +182 -0
- package/dist/cli.js.map +1 -0
- package/dist/config.d.ts +19 -0
- package/dist/config.d.ts.map +1 -0
- package/dist/config.js +36 -0
- package/dist/config.js.map +1 -0
- package/dist/container-runner.d.ts +44 -0
- package/dist/container-runner.d.ts.map +1 -0
- package/dist/container-runner.js +467 -0
- package/dist/container-runner.js.map +1 -0
- package/dist/container-runner.test.d.ts +2 -0
- package/dist/container-runner.test.d.ts.map +1 -0
- package/dist/container-runner.test.js +150 -0
- package/dist/container-runner.test.js.map +1 -0
- package/dist/container-runtime.d.ts +22 -0
- package/dist/container-runtime.d.ts.map +1 -0
- package/dist/container-runtime.js +96 -0
- package/dist/container-runtime.js.map +1 -0
- package/dist/container-runtime.test.d.ts +2 -0
- package/dist/container-runtime.test.d.ts.map +1 -0
- package/dist/container-runtime.test.js +93 -0
- package/dist/container-runtime.test.js.map +1 -0
- package/dist/credential-proxy.d.ts +21 -0
- package/dist/credential-proxy.d.ts.map +1 -0
- package/dist/credential-proxy.js +95 -0
- package/dist/credential-proxy.js.map +1 -0
- package/dist/credential-proxy.test.d.ts +2 -0
- package/dist/credential-proxy.test.d.ts.map +1 -0
- package/dist/credential-proxy.test.js +134 -0
- package/dist/credential-proxy.test.js.map +1 -0
- package/dist/db.d.ts +115 -0
- package/dist/db.d.ts.map +1 -0
- package/dist/db.js +549 -0
- package/dist/db.js.map +1 -0
- package/dist/db.test.d.ts +2 -0
- package/dist/db.test.d.ts.map +1 -0
- package/dist/db.test.js +360 -0
- package/dist/db.test.js.map +1 -0
- package/dist/env.d.ts +8 -0
- package/dist/env.d.ts.map +1 -0
- package/dist/env.js +42 -0
- package/dist/env.js.map +1 -0
- package/dist/formatting.test.d.ts +2 -0
- package/dist/formatting.test.d.ts.map +1 -0
- package/dist/formatting.test.js +183 -0
- package/dist/formatting.test.js.map +1 -0
- package/dist/group-folder.d.ts +5 -0
- package/dist/group-folder.d.ts.map +1 -0
- package/dist/group-folder.js +44 -0
- package/dist/group-folder.js.map +1 -0
- package/dist/group-folder.test.d.ts +2 -0
- package/dist/group-folder.test.d.ts.map +1 -0
- package/dist/group-folder.test.js +29 -0
- package/dist/group-folder.test.js.map +1 -0
- package/dist/group-queue.d.ts +34 -0
- package/dist/group-queue.d.ts.map +1 -0
- package/dist/group-queue.js +263 -0
- package/dist/group-queue.js.map +1 -0
- package/dist/group-queue.test.d.ts +2 -0
- package/dist/group-queue.test.d.ts.map +1 -0
- package/dist/group-queue.test.js +341 -0
- package/dist/group-queue.test.js.map +1 -0
- package/dist/index.d.ts +12 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +518 -0
- package/dist/index.js.map +1 -0
- package/dist/ipc-auth.test.d.ts +2 -0
- package/dist/ipc-auth.test.d.ts.map +1 -0
- package/dist/ipc-auth.test.js +434 -0
- package/dist/ipc-auth.test.js.map +1 -0
- package/dist/ipc.d.ts +32 -0
- package/dist/ipc.d.ts.map +1 -0
- package/dist/ipc.js +311 -0
- package/dist/ipc.js.map +1 -0
- package/dist/logger.d.ts +3 -0
- package/dist/logger.d.ts.map +1 -0
- package/dist/logger.js +14 -0
- package/dist/logger.js.map +1 -0
- package/dist/mount-security.d.ts +34 -0
- package/dist/mount-security.d.ts.map +1 -0
- package/dist/mount-security.js +325 -0
- package/dist/mount-security.js.map +1 -0
- package/dist/remote-control.d.ts +32 -0
- package/dist/remote-control.d.ts.map +1 -0
- package/dist/remote-control.js +185 -0
- package/dist/remote-control.js.map +1 -0
- package/dist/remote-control.test.d.ts +2 -0
- package/dist/remote-control.test.d.ts.map +1 -0
- package/dist/remote-control.test.js +321 -0
- package/dist/remote-control.test.js.map +1 -0
- package/dist/router.d.ts +8 -0
- package/dist/router.d.ts.map +1 -0
- package/dist/router.js +37 -0
- package/dist/router.js.map +1 -0
- package/dist/routing.test.d.ts +2 -0
- package/dist/routing.test.d.ts.map +1 -0
- package/dist/routing.test.js +81 -0
- package/dist/routing.test.js.map +1 -0
- package/dist/sender-allowlist.d.ts +14 -0
- package/dist/sender-allowlist.d.ts.map +1 -0
- package/dist/sender-allowlist.js +79 -0
- package/dist/sender-allowlist.js.map +1 -0
- package/dist/sender-allowlist.test.d.ts +2 -0
- package/dist/sender-allowlist.test.d.ts.map +1 -0
- package/dist/sender-allowlist.test.js +186 -0
- package/dist/sender-allowlist.test.js.map +1 -0
- package/dist/session-commands.d.ts +47 -0
- package/dist/session-commands.d.ts.map +1 -0
- package/dist/session-commands.js +102 -0
- package/dist/session-commands.js.map +1 -0
- package/dist/session-commands.test.d.ts +2 -0
- package/dist/session-commands.test.d.ts.map +1 -0
- package/dist/session-commands.test.js +190 -0
- package/dist/session-commands.test.js.map +1 -0
- package/dist/task-scheduler.d.ts +22 -0
- package/dist/task-scheduler.d.ts.map +1 -0
- package/dist/task-scheduler.js +210 -0
- package/dist/task-scheduler.js.map +1 -0
- package/dist/task-scheduler.test.d.ts +2 -0
- package/dist/task-scheduler.test.d.ts.map +1 -0
- package/dist/task-scheduler.test.js +107 -0
- package/dist/task-scheduler.test.js.map +1 -0
- package/dist/timezone.d.ts +6 -0
- package/dist/timezone.d.ts.map +1 -0
- package/dist/timezone.js +17 -0
- package/dist/timezone.js.map +1 -0
- package/dist/timezone.test.d.ts +2 -0
- package/dist/timezone.test.d.ts.map +1 -0
- package/dist/timezone.test.js +23 -0
- package/dist/timezone.test.js.map +1 -0
- package/dist/types.d.ts +78 -0
- package/dist/types.d.ts.map +1 -0
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -0
- package/docs/APPLE-CONTAINER-NETWORKING.md +90 -0
- package/docs/DEBUG_CHECKLIST.md +143 -0
- package/docs/REQUIREMENTS.md +196 -0
- package/docs/SDK_DEEP_DIVE.md +643 -0
- package/docs/SECURITY.md +122 -0
- package/docs/SPEC.md +785 -0
- package/docs/docker-sandboxes.md +359 -0
- package/docs/nanoclaw-architecture-final.md +1063 -0
- package/docs/nanorepo-architecture.md +168 -0
- package/docs/skills-as-branches.md +662 -0
- package/groups/global/CLAUDE.md +58 -0
- package/groups/main/CLAUDE.md +246 -0
- package/launchd/com.nanoclaw.plist +32 -0
- package/package.json +45 -0
- package/repo-tokens/README.md +113 -0
- package/repo-tokens/action.yml +186 -0
- package/repo-tokens/badge.svg +23 -0
- package/repo-tokens/examples/green.svg +14 -0
- package/repo-tokens/examples/red.svg +14 -0
- package/repo-tokens/examples/yellow-green.svg +14 -0
- package/repo-tokens/examples/yellow.svg +14 -0
- package/scripts/run-migrations.ts +105 -0
- package/setup/container.ts +144 -0
- package/setup/environment.test.ts +121 -0
- package/setup/environment.ts +94 -0
- package/setup/groups.ts +229 -0
- package/setup/index.ts +58 -0
- package/setup/mounts.ts +115 -0
- package/setup/platform.test.ts +120 -0
- package/setup/platform.ts +132 -0
- package/setup/register.test.ts +257 -0
- package/setup/register.ts +177 -0
- package/setup/service.test.ts +187 -0
- package/setup/service.ts +362 -0
- package/setup/status.ts +16 -0
- package/setup/verify.ts +192 -0
- package/setup.sh +161 -0
- package/src/channels/index.ts +12 -0
- package/src/channels/registry.test.ts +42 -0
- package/src/channels/registry.ts +32 -0
- package/src/channels/web.ts +1856 -0
- package/src/cli.ts +209 -0
- package/src/config.ts +73 -0
- package/src/container-runner.test.ts +210 -0
- package/src/container-runner.ts +707 -0
- package/src/container-runtime.test.ts +149 -0
- package/src/container-runtime.ts +127 -0
- package/src/credential-proxy.test.ts +192 -0
- package/src/credential-proxy.ts +125 -0
- package/src/db.test.ts +484 -0
- package/src/db.ts +803 -0
- package/src/env.ts +42 -0
- package/src/formatting.test.ts +256 -0
- package/src/group-folder.test.ts +43 -0
- package/src/group-folder.ts +44 -0
- package/src/group-queue.test.ts +484 -0
- package/src/group-queue.ts +365 -0
- package/src/index.ts +731 -0
- package/src/ipc-auth.test.ts +679 -0
- package/src/ipc.ts +461 -0
- package/src/logger.ts +16 -0
- package/src/mount-security.ts +419 -0
- package/src/remote-control.test.ts +397 -0
- package/src/remote-control.ts +224 -0
- package/src/router.ts +52 -0
- package/src/routing.test.ts +170 -0
- package/src/sender-allowlist.test.ts +216 -0
- package/src/sender-allowlist.ts +128 -0
- package/src/session-commands.test.ts +247 -0
- package/src/session-commands.ts +163 -0
- package/src/task-scheduler.test.ts +129 -0
- package/src/task-scheduler.ts +295 -0
- package/src/timezone.test.ts +29 -0
- package/src/timezone.ts +16 -0
- package/src/types.ts +107 -0
- package/tsconfig.json +20 -0
- package/vitest.config.ts +7 -0
- package/vitest.skills.config.ts +7 -0
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { ASSISTANT_NAME, TRIGGER_PATTERN } from './config.js';
|
|
3
|
+
import { escapeXml, formatMessages, formatOutbound, stripInternalTags, } from './router.js';
|
|
4
|
+
function makeMsg(overrides = {}) {
|
|
5
|
+
return {
|
|
6
|
+
id: '1',
|
|
7
|
+
chat_jid: 'group@g.us',
|
|
8
|
+
sender: '123@s.whatsapp.net',
|
|
9
|
+
sender_name: 'Alice',
|
|
10
|
+
content: 'hello',
|
|
11
|
+
timestamp: '2024-01-01T00:00:00.000Z',
|
|
12
|
+
...overrides,
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
// --- escapeXml ---
|
|
16
|
+
describe('escapeXml', () => {
|
|
17
|
+
it('escapes ampersands', () => {
|
|
18
|
+
expect(escapeXml('a & b')).toBe('a & b');
|
|
19
|
+
});
|
|
20
|
+
it('escapes less-than', () => {
|
|
21
|
+
expect(escapeXml('a < b')).toBe('a < b');
|
|
22
|
+
});
|
|
23
|
+
it('escapes greater-than', () => {
|
|
24
|
+
expect(escapeXml('a > b')).toBe('a > b');
|
|
25
|
+
});
|
|
26
|
+
it('escapes double quotes', () => {
|
|
27
|
+
expect(escapeXml('"hello"')).toBe('"hello"');
|
|
28
|
+
});
|
|
29
|
+
it('handles multiple special characters together', () => {
|
|
30
|
+
expect(escapeXml('a & b < c > d "e"')).toBe('a & b < c > d "e"');
|
|
31
|
+
});
|
|
32
|
+
it('passes through strings with no special chars', () => {
|
|
33
|
+
expect(escapeXml('hello world')).toBe('hello world');
|
|
34
|
+
});
|
|
35
|
+
it('handles empty string', () => {
|
|
36
|
+
expect(escapeXml('')).toBe('');
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
// --- formatMessages ---
|
|
40
|
+
describe('formatMessages', () => {
|
|
41
|
+
const TZ = 'UTC';
|
|
42
|
+
it('formats a single message as XML with context header', () => {
|
|
43
|
+
const result = formatMessages([makeMsg()], TZ);
|
|
44
|
+
expect(result).toContain('<context timezone="UTC" />');
|
|
45
|
+
expect(result).toContain('<message sender="Alice"');
|
|
46
|
+
expect(result).toContain('>hello</message>');
|
|
47
|
+
expect(result).toContain('Jan 1, 2024');
|
|
48
|
+
});
|
|
49
|
+
it('formats multiple messages', () => {
|
|
50
|
+
const msgs = [
|
|
51
|
+
makeMsg({
|
|
52
|
+
id: '1',
|
|
53
|
+
sender_name: 'Alice',
|
|
54
|
+
content: 'hi',
|
|
55
|
+
timestamp: '2024-01-01T00:00:00.000Z',
|
|
56
|
+
}),
|
|
57
|
+
makeMsg({
|
|
58
|
+
id: '2',
|
|
59
|
+
sender_name: 'Bob',
|
|
60
|
+
content: 'hey',
|
|
61
|
+
timestamp: '2024-01-01T01:00:00.000Z',
|
|
62
|
+
}),
|
|
63
|
+
];
|
|
64
|
+
const result = formatMessages(msgs, TZ);
|
|
65
|
+
expect(result).toContain('sender="Alice"');
|
|
66
|
+
expect(result).toContain('sender="Bob"');
|
|
67
|
+
expect(result).toContain('>hi</message>');
|
|
68
|
+
expect(result).toContain('>hey</message>');
|
|
69
|
+
});
|
|
70
|
+
it('escapes special characters in sender names', () => {
|
|
71
|
+
const result = formatMessages([makeMsg({ sender_name: 'A & B <Co>' })], TZ);
|
|
72
|
+
expect(result).toContain('sender="A & B <Co>"');
|
|
73
|
+
});
|
|
74
|
+
it('escapes special characters in content', () => {
|
|
75
|
+
const result = formatMessages([makeMsg({ content: '<script>alert("xss")</script>' })], TZ);
|
|
76
|
+
expect(result).toContain('<script>alert("xss")</script>');
|
|
77
|
+
});
|
|
78
|
+
it('handles empty array', () => {
|
|
79
|
+
const result = formatMessages([], TZ);
|
|
80
|
+
expect(result).toContain('<context timezone="UTC" />');
|
|
81
|
+
expect(result).toContain('<messages>\n\n</messages>');
|
|
82
|
+
});
|
|
83
|
+
it('converts timestamps to local time for given timezone', () => {
|
|
84
|
+
// 2024-01-01T18:30:00Z in America/New_York (EST) = 1:30 PM
|
|
85
|
+
const result = formatMessages([makeMsg({ timestamp: '2024-01-01T18:30:00.000Z' })], 'America/New_York');
|
|
86
|
+
expect(result).toContain('1:30');
|
|
87
|
+
expect(result).toContain('PM');
|
|
88
|
+
expect(result).toContain('<context timezone="America/New_York" />');
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
// --- TRIGGER_PATTERN ---
|
|
92
|
+
describe('TRIGGER_PATTERN', () => {
|
|
93
|
+
const name = ASSISTANT_NAME;
|
|
94
|
+
const lower = name.toLowerCase();
|
|
95
|
+
const upper = name.toUpperCase();
|
|
96
|
+
it('matches @name at start of message', () => {
|
|
97
|
+
expect(TRIGGER_PATTERN.test(`@${name} hello`)).toBe(true);
|
|
98
|
+
});
|
|
99
|
+
it('matches case-insensitively', () => {
|
|
100
|
+
expect(TRIGGER_PATTERN.test(`@${lower} hello`)).toBe(true);
|
|
101
|
+
expect(TRIGGER_PATTERN.test(`@${upper} hello`)).toBe(true);
|
|
102
|
+
});
|
|
103
|
+
it('does not match when not at start of message', () => {
|
|
104
|
+
expect(TRIGGER_PATTERN.test(`hello @${name}`)).toBe(false);
|
|
105
|
+
});
|
|
106
|
+
it('does not match partial name like @NameExtra (word boundary)', () => {
|
|
107
|
+
expect(TRIGGER_PATTERN.test(`@${name}extra hello`)).toBe(false);
|
|
108
|
+
});
|
|
109
|
+
it('matches with word boundary before apostrophe', () => {
|
|
110
|
+
expect(TRIGGER_PATTERN.test(`@${name}'s thing`)).toBe(true);
|
|
111
|
+
});
|
|
112
|
+
it('matches @name alone (end of string is a word boundary)', () => {
|
|
113
|
+
expect(TRIGGER_PATTERN.test(`@${name}`)).toBe(true);
|
|
114
|
+
});
|
|
115
|
+
it('matches with leading whitespace after trim', () => {
|
|
116
|
+
// The actual usage trims before testing: TRIGGER_PATTERN.test(m.content.trim())
|
|
117
|
+
expect(TRIGGER_PATTERN.test(`@${name} hey`.trim())).toBe(true);
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
// --- Outbound formatting (internal tag stripping + prefix) ---
|
|
121
|
+
describe('stripInternalTags', () => {
|
|
122
|
+
it('strips single-line internal tags', () => {
|
|
123
|
+
expect(stripInternalTags('hello <internal>secret</internal> world')).toBe('hello world');
|
|
124
|
+
});
|
|
125
|
+
it('strips multi-line internal tags', () => {
|
|
126
|
+
expect(stripInternalTags('hello <internal>\nsecret\nstuff\n</internal> world')).toBe('hello world');
|
|
127
|
+
});
|
|
128
|
+
it('strips multiple internal tag blocks', () => {
|
|
129
|
+
expect(stripInternalTags('<internal>a</internal>hello<internal>b</internal>')).toBe('hello');
|
|
130
|
+
});
|
|
131
|
+
it('returns empty string when text is only internal tags', () => {
|
|
132
|
+
expect(stripInternalTags('<internal>only this</internal>')).toBe('');
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
describe('formatOutbound', () => {
|
|
136
|
+
it('returns text with internal tags stripped', () => {
|
|
137
|
+
expect(formatOutbound('hello world')).toBe('hello world');
|
|
138
|
+
});
|
|
139
|
+
it('returns empty string when all text is internal', () => {
|
|
140
|
+
expect(formatOutbound('<internal>hidden</internal>')).toBe('');
|
|
141
|
+
});
|
|
142
|
+
it('strips internal tags from remaining text', () => {
|
|
143
|
+
expect(formatOutbound('<internal>thinking</internal>The answer is 42')).toBe('The answer is 42');
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
// --- Trigger gating with requiresTrigger flag ---
|
|
147
|
+
describe('trigger gating (requiresTrigger interaction)', () => {
|
|
148
|
+
// Replicates the exact logic from processGroupMessages and startMessageLoop:
|
|
149
|
+
// if (!isMainGroup && group.requiresTrigger !== false) { check trigger }
|
|
150
|
+
function shouldRequireTrigger(isMainGroup, requiresTrigger) {
|
|
151
|
+
return !isMainGroup && requiresTrigger !== false;
|
|
152
|
+
}
|
|
153
|
+
function shouldProcess(isMainGroup, requiresTrigger, messages) {
|
|
154
|
+
if (!shouldRequireTrigger(isMainGroup, requiresTrigger))
|
|
155
|
+
return true;
|
|
156
|
+
return messages.some((m) => TRIGGER_PATTERN.test(m.content.trim()));
|
|
157
|
+
}
|
|
158
|
+
it('main group always processes (no trigger needed)', () => {
|
|
159
|
+
const msgs = [makeMsg({ content: 'hello no trigger' })];
|
|
160
|
+
expect(shouldProcess(true, undefined, msgs)).toBe(true);
|
|
161
|
+
});
|
|
162
|
+
it('main group processes even with requiresTrigger=true', () => {
|
|
163
|
+
const msgs = [makeMsg({ content: 'hello no trigger' })];
|
|
164
|
+
expect(shouldProcess(true, true, msgs)).toBe(true);
|
|
165
|
+
});
|
|
166
|
+
it('non-main group with requiresTrigger=undefined requires trigger (defaults to true)', () => {
|
|
167
|
+
const msgs = [makeMsg({ content: 'hello no trigger' })];
|
|
168
|
+
expect(shouldProcess(false, undefined, msgs)).toBe(false);
|
|
169
|
+
});
|
|
170
|
+
it('non-main group with requiresTrigger=true requires trigger', () => {
|
|
171
|
+
const msgs = [makeMsg({ content: 'hello no trigger' })];
|
|
172
|
+
expect(shouldProcess(false, true, msgs)).toBe(false);
|
|
173
|
+
});
|
|
174
|
+
it('non-main group with requiresTrigger=true processes when trigger present', () => {
|
|
175
|
+
const msgs = [makeMsg({ content: `@${ASSISTANT_NAME} do something` })];
|
|
176
|
+
expect(shouldProcess(false, true, msgs)).toBe(true);
|
|
177
|
+
});
|
|
178
|
+
it('non-main group with requiresTrigger=false always processes (no trigger needed)', () => {
|
|
179
|
+
const msgs = [makeMsg({ content: 'hello no trigger' })];
|
|
180
|
+
expect(shouldProcess(false, false, msgs)).toBe(true);
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
//# sourceMappingURL=formatting.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formatting.test.js","sourceRoot":"","sources":["../src/formatting.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare function isValidGroupFolder(folder: string): boolean;
|
|
2
|
+
export declare function assertValidGroupFolder(folder: string): void;
|
|
3
|
+
export declare function resolveGroupFolderPath(folder: string): string;
|
|
4
|
+
export declare function resolveGroupIpcPath(folder: string): string;
|
|
5
|
+
//# sourceMappingURL=group-folder.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"group-folder.d.ts","sourceRoot":"","sources":["../src/group-folder.ts"],"names":[],"mappings":"AAOA,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQ1D;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAI3D;AASD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAK7D;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAM1D"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { DATA_DIR, GROUPS_DIR } from './config.js';
|
|
3
|
+
const GROUP_FOLDER_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/;
|
|
4
|
+
const RESERVED_FOLDERS = new Set(['global']);
|
|
5
|
+
export function isValidGroupFolder(folder) {
|
|
6
|
+
if (!folder)
|
|
7
|
+
return false;
|
|
8
|
+
if (folder !== folder.trim())
|
|
9
|
+
return false;
|
|
10
|
+
if (!GROUP_FOLDER_PATTERN.test(folder))
|
|
11
|
+
return false;
|
|
12
|
+
if (folder.includes('/') || folder.includes('\\'))
|
|
13
|
+
return false;
|
|
14
|
+
if (folder.includes('..'))
|
|
15
|
+
return false;
|
|
16
|
+
if (RESERVED_FOLDERS.has(folder.toLowerCase()))
|
|
17
|
+
return false;
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
export function assertValidGroupFolder(folder) {
|
|
21
|
+
if (!isValidGroupFolder(folder)) {
|
|
22
|
+
throw new Error(`Invalid group folder "${folder}"`);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function ensureWithinBase(baseDir, resolvedPath) {
|
|
26
|
+
const rel = path.relative(baseDir, resolvedPath);
|
|
27
|
+
if (rel.startsWith('..') || path.isAbsolute(rel)) {
|
|
28
|
+
throw new Error(`Path escapes base directory: ${resolvedPath}`);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
export function resolveGroupFolderPath(folder) {
|
|
32
|
+
assertValidGroupFolder(folder);
|
|
33
|
+
const groupPath = path.resolve(GROUPS_DIR, folder);
|
|
34
|
+
ensureWithinBase(GROUPS_DIR, groupPath);
|
|
35
|
+
return groupPath;
|
|
36
|
+
}
|
|
37
|
+
export function resolveGroupIpcPath(folder) {
|
|
38
|
+
assertValidGroupFolder(folder);
|
|
39
|
+
const ipcBaseDir = path.resolve(DATA_DIR, 'ipc');
|
|
40
|
+
const ipcPath = path.resolve(ipcBaseDir, folder);
|
|
41
|
+
ensureWithinBase(ipcBaseDir, ipcPath);
|
|
42
|
+
return ipcPath;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=group-folder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"group-folder.js","sourceRoot":"","sources":["../src/group-folder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,oBAAoB,GAAG,kCAAkC,CAAC;AAChE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE7C,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAC/C,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1B,IAAI,MAAM,KAAK,MAAM,CAAC,IAAI,EAAE;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IACrD,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAChE,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,GAAG,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe,EAAE,YAAoB;IAC7D,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACjD,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACnD,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACxC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACjD,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"group-folder.test.d.ts","sourceRoot":"","sources":["../src/group-folder.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { describe, expect, it } from 'vitest';
|
|
3
|
+
import { isValidGroupFolder, resolveGroupFolderPath, resolveGroupIpcPath, } from './group-folder.js';
|
|
4
|
+
describe('group folder validation', () => {
|
|
5
|
+
it('accepts normal group folder names', () => {
|
|
6
|
+
expect(isValidGroupFolder('main')).toBe(true);
|
|
7
|
+
expect(isValidGroupFolder('family-chat')).toBe(true);
|
|
8
|
+
expect(isValidGroupFolder('Team_42')).toBe(true);
|
|
9
|
+
});
|
|
10
|
+
it('rejects traversal and reserved names', () => {
|
|
11
|
+
expect(isValidGroupFolder('../../etc')).toBe(false);
|
|
12
|
+
expect(isValidGroupFolder('/tmp')).toBe(false);
|
|
13
|
+
expect(isValidGroupFolder('global')).toBe(false);
|
|
14
|
+
expect(isValidGroupFolder('')).toBe(false);
|
|
15
|
+
});
|
|
16
|
+
it('resolves safe paths under groups directory', () => {
|
|
17
|
+
const resolved = resolveGroupFolderPath('family-chat');
|
|
18
|
+
expect(resolved.endsWith(`${path.sep}groups${path.sep}family-chat`)).toBe(true);
|
|
19
|
+
});
|
|
20
|
+
it('resolves safe paths under data ipc directory', () => {
|
|
21
|
+
const resolved = resolveGroupIpcPath('family-chat');
|
|
22
|
+
expect(resolved.endsWith(`${path.sep}data${path.sep}ipc${path.sep}family-chat`)).toBe(true);
|
|
23
|
+
});
|
|
24
|
+
it('throws for unsafe folder names', () => {
|
|
25
|
+
expect(() => resolveGroupFolderPath('../../etc')).toThrow();
|
|
26
|
+
expect(() => resolveGroupIpcPath('/tmp')).toThrow();
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
//# sourceMappingURL=group-folder.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"group-folder.test.js","sourceRoot":"","sources":["../src/group-folder.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAE3B,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,QAAQ,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CACvE,IAAI,CACL,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACpD,MAAM,CACJ,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,aAAa,CAAC,CACzE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC5D,MAAM,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { ChildProcess } from 'child_process';
|
|
2
|
+
export declare class GroupQueue {
|
|
3
|
+
private groups;
|
|
4
|
+
private activeCount;
|
|
5
|
+
private waitingGroups;
|
|
6
|
+
private processMessagesFn;
|
|
7
|
+
private shuttingDown;
|
|
8
|
+
private getGroup;
|
|
9
|
+
setProcessMessagesFn(fn: (groupJid: string) => Promise<boolean>): void;
|
|
10
|
+
enqueueMessageCheck(groupJid: string): void;
|
|
11
|
+
enqueueTask(groupJid: string, taskId: string, fn: () => Promise<void>): void;
|
|
12
|
+
registerProcess(groupJid: string, proc: ChildProcess, containerName: string, groupFolder?: string): void;
|
|
13
|
+
/**
|
|
14
|
+
* Mark the container as idle-waiting (finished work, waiting for IPC input).
|
|
15
|
+
* If tasks are pending, preempt the idle container immediately.
|
|
16
|
+
*/
|
|
17
|
+
notifyIdle(groupJid: string): void;
|
|
18
|
+
/**
|
|
19
|
+
* Send a follow-up message to the active container via IPC file.
|
|
20
|
+
* Returns true if the message was written, false if no active container.
|
|
21
|
+
*/
|
|
22
|
+
sendMessage(groupJid: string, text: string): boolean;
|
|
23
|
+
/**
|
|
24
|
+
* Signal the active container to wind down by writing a close sentinel.
|
|
25
|
+
*/
|
|
26
|
+
closeStdin(groupJid: string): void;
|
|
27
|
+
private runForGroup;
|
|
28
|
+
private runTask;
|
|
29
|
+
private scheduleRetry;
|
|
30
|
+
private drainGroup;
|
|
31
|
+
private drainWaiting;
|
|
32
|
+
shutdown(_gracePeriodMs: number): Promise<void>;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=group-queue.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"group-queue.d.ts","sourceRoot":"","sources":["../src/group-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AA6B7C,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAiC;IAC/C,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,iBAAiB,CAClB;IACP,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,QAAQ;IAoBhB,oBAAoB,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI;IAItE,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IA4B3C,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IA0C5E,eAAe,CACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,YAAY,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI;IAOP;;;OAGG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAQlC;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAoBpD;;OAEG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;YAapB,WAAW;YAsCX,OAAO;IA6BrB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,UAAU;IAgClB,OAAO,CAAC,YAAY;IA6Bd,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBtD"}
|
|
@@ -0,0 +1,263 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { DATA_DIR, MAX_CONCURRENT_CONTAINERS } from './config.js';
|
|
4
|
+
import { logger } from './logger.js';
|
|
5
|
+
const MAX_RETRIES = 5;
|
|
6
|
+
const BASE_RETRY_MS = 5000;
|
|
7
|
+
export class GroupQueue {
|
|
8
|
+
groups = new Map();
|
|
9
|
+
activeCount = 0;
|
|
10
|
+
waitingGroups = [];
|
|
11
|
+
processMessagesFn = null;
|
|
12
|
+
shuttingDown = false;
|
|
13
|
+
getGroup(groupJid) {
|
|
14
|
+
let state = this.groups.get(groupJid);
|
|
15
|
+
if (!state) {
|
|
16
|
+
state = {
|
|
17
|
+
active: false,
|
|
18
|
+
idleWaiting: false,
|
|
19
|
+
isTaskContainer: false,
|
|
20
|
+
runningTaskId: null,
|
|
21
|
+
pendingMessages: false,
|
|
22
|
+
pendingTasks: [],
|
|
23
|
+
process: null,
|
|
24
|
+
containerName: null,
|
|
25
|
+
groupFolder: null,
|
|
26
|
+
retryCount: 0,
|
|
27
|
+
};
|
|
28
|
+
this.groups.set(groupJid, state);
|
|
29
|
+
}
|
|
30
|
+
return state;
|
|
31
|
+
}
|
|
32
|
+
setProcessMessagesFn(fn) {
|
|
33
|
+
this.processMessagesFn = fn;
|
|
34
|
+
}
|
|
35
|
+
enqueueMessageCheck(groupJid) {
|
|
36
|
+
if (this.shuttingDown)
|
|
37
|
+
return;
|
|
38
|
+
const state = this.getGroup(groupJid);
|
|
39
|
+
if (state.active) {
|
|
40
|
+
state.pendingMessages = true;
|
|
41
|
+
logger.debug({ groupJid }, 'Container active, message queued');
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
if (this.activeCount >= MAX_CONCURRENT_CONTAINERS) {
|
|
45
|
+
state.pendingMessages = true;
|
|
46
|
+
if (!this.waitingGroups.includes(groupJid)) {
|
|
47
|
+
this.waitingGroups.push(groupJid);
|
|
48
|
+
}
|
|
49
|
+
logger.debug({ groupJid, activeCount: this.activeCount }, 'At concurrency limit, message queued');
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
this.runForGroup(groupJid, 'messages').catch((err) => logger.error({ groupJid, err }, 'Unhandled error in runForGroup'));
|
|
53
|
+
}
|
|
54
|
+
enqueueTask(groupJid, taskId, fn) {
|
|
55
|
+
if (this.shuttingDown)
|
|
56
|
+
return;
|
|
57
|
+
const state = this.getGroup(groupJid);
|
|
58
|
+
// Prevent double-queuing: check both pending and currently-running task
|
|
59
|
+
if (state.runningTaskId === taskId) {
|
|
60
|
+
logger.debug({ groupJid, taskId }, 'Task already running, skipping');
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
if (state.pendingTasks.some((t) => t.id === taskId)) {
|
|
64
|
+
logger.debug({ groupJid, taskId }, 'Task already queued, skipping');
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
if (state.active) {
|
|
68
|
+
state.pendingTasks.push({ id: taskId, groupJid, fn });
|
|
69
|
+
if (state.idleWaiting) {
|
|
70
|
+
this.closeStdin(groupJid);
|
|
71
|
+
}
|
|
72
|
+
logger.debug({ groupJid, taskId }, 'Container active, task queued');
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
if (this.activeCount >= MAX_CONCURRENT_CONTAINERS) {
|
|
76
|
+
state.pendingTasks.push({ id: taskId, groupJid, fn });
|
|
77
|
+
if (!this.waitingGroups.includes(groupJid)) {
|
|
78
|
+
this.waitingGroups.push(groupJid);
|
|
79
|
+
}
|
|
80
|
+
logger.debug({ groupJid, taskId, activeCount: this.activeCount }, 'At concurrency limit, task queued');
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
// Run immediately
|
|
84
|
+
this.runTask(groupJid, { id: taskId, groupJid, fn }).catch((err) => logger.error({ groupJid, taskId, err }, 'Unhandled error in runTask'));
|
|
85
|
+
}
|
|
86
|
+
registerProcess(groupJid, proc, containerName, groupFolder) {
|
|
87
|
+
const state = this.getGroup(groupJid);
|
|
88
|
+
state.process = proc;
|
|
89
|
+
state.containerName = containerName;
|
|
90
|
+
if (groupFolder)
|
|
91
|
+
state.groupFolder = groupFolder;
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Mark the container as idle-waiting (finished work, waiting for IPC input).
|
|
95
|
+
* If tasks are pending, preempt the idle container immediately.
|
|
96
|
+
*/
|
|
97
|
+
notifyIdle(groupJid) {
|
|
98
|
+
const state = this.getGroup(groupJid);
|
|
99
|
+
state.idleWaiting = true;
|
|
100
|
+
if (state.pendingTasks.length > 0) {
|
|
101
|
+
this.closeStdin(groupJid);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* Send a follow-up message to the active container via IPC file.
|
|
106
|
+
* Returns true if the message was written, false if no active container.
|
|
107
|
+
*/
|
|
108
|
+
sendMessage(groupJid, text) {
|
|
109
|
+
const state = this.getGroup(groupJid);
|
|
110
|
+
if (!state.active || !state.groupFolder || state.isTaskContainer)
|
|
111
|
+
return false;
|
|
112
|
+
state.idleWaiting = false; // Agent is about to receive work, no longer idle
|
|
113
|
+
const inputDir = path.join(DATA_DIR, 'ipc', state.groupFolder, 'input');
|
|
114
|
+
try {
|
|
115
|
+
fs.mkdirSync(inputDir, { recursive: true });
|
|
116
|
+
const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 6)}.json`;
|
|
117
|
+
const filepath = path.join(inputDir, filename);
|
|
118
|
+
const tempPath = `${filepath}.tmp`;
|
|
119
|
+
fs.writeFileSync(tempPath, JSON.stringify({ type: 'message', text }));
|
|
120
|
+
fs.renameSync(tempPath, filepath);
|
|
121
|
+
return true;
|
|
122
|
+
}
|
|
123
|
+
catch {
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* Signal the active container to wind down by writing a close sentinel.
|
|
129
|
+
*/
|
|
130
|
+
closeStdin(groupJid) {
|
|
131
|
+
const state = this.getGroup(groupJid);
|
|
132
|
+
if (!state.active || !state.groupFolder)
|
|
133
|
+
return;
|
|
134
|
+
const inputDir = path.join(DATA_DIR, 'ipc', state.groupFolder, 'input');
|
|
135
|
+
try {
|
|
136
|
+
fs.mkdirSync(inputDir, { recursive: true });
|
|
137
|
+
fs.writeFileSync(path.join(inputDir, '_close'), '');
|
|
138
|
+
}
|
|
139
|
+
catch {
|
|
140
|
+
// ignore
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
async runForGroup(groupJid, reason) {
|
|
144
|
+
const state = this.getGroup(groupJid);
|
|
145
|
+
state.active = true;
|
|
146
|
+
state.idleWaiting = false;
|
|
147
|
+
state.isTaskContainer = false;
|
|
148
|
+
state.pendingMessages = false;
|
|
149
|
+
this.activeCount++;
|
|
150
|
+
logger.debug({ groupJid, reason, activeCount: this.activeCount }, 'Starting container for group');
|
|
151
|
+
try {
|
|
152
|
+
if (this.processMessagesFn) {
|
|
153
|
+
const success = await this.processMessagesFn(groupJid);
|
|
154
|
+
if (success) {
|
|
155
|
+
state.retryCount = 0;
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
this.scheduleRetry(groupJid, state);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
catch (err) {
|
|
163
|
+
logger.error({ groupJid, err }, 'Error processing messages for group');
|
|
164
|
+
this.scheduleRetry(groupJid, state);
|
|
165
|
+
}
|
|
166
|
+
finally {
|
|
167
|
+
state.active = false;
|
|
168
|
+
state.process = null;
|
|
169
|
+
state.containerName = null;
|
|
170
|
+
state.groupFolder = null;
|
|
171
|
+
this.activeCount--;
|
|
172
|
+
this.drainGroup(groupJid);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
async runTask(groupJid, task) {
|
|
176
|
+
const state = this.getGroup(groupJid);
|
|
177
|
+
state.active = true;
|
|
178
|
+
state.idleWaiting = false;
|
|
179
|
+
state.isTaskContainer = true;
|
|
180
|
+
state.runningTaskId = task.id;
|
|
181
|
+
this.activeCount++;
|
|
182
|
+
logger.debug({ groupJid, taskId: task.id, activeCount: this.activeCount }, 'Running queued task');
|
|
183
|
+
try {
|
|
184
|
+
await task.fn();
|
|
185
|
+
}
|
|
186
|
+
catch (err) {
|
|
187
|
+
logger.error({ groupJid, taskId: task.id, err }, 'Error running task');
|
|
188
|
+
}
|
|
189
|
+
finally {
|
|
190
|
+
state.active = false;
|
|
191
|
+
state.isTaskContainer = false;
|
|
192
|
+
state.runningTaskId = null;
|
|
193
|
+
state.process = null;
|
|
194
|
+
state.containerName = null;
|
|
195
|
+
state.groupFolder = null;
|
|
196
|
+
this.activeCount--;
|
|
197
|
+
this.drainGroup(groupJid);
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
scheduleRetry(groupJid, state) {
|
|
201
|
+
state.retryCount++;
|
|
202
|
+
if (state.retryCount > MAX_RETRIES) {
|
|
203
|
+
logger.error({ groupJid, retryCount: state.retryCount }, 'Max retries exceeded, dropping messages (will retry on next incoming message)');
|
|
204
|
+
state.retryCount = 0;
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
const delayMs = BASE_RETRY_MS * Math.pow(2, state.retryCount - 1);
|
|
208
|
+
logger.info({ groupJid, retryCount: state.retryCount, delayMs }, 'Scheduling retry with backoff');
|
|
209
|
+
setTimeout(() => {
|
|
210
|
+
if (!this.shuttingDown) {
|
|
211
|
+
this.enqueueMessageCheck(groupJid);
|
|
212
|
+
}
|
|
213
|
+
}, delayMs);
|
|
214
|
+
}
|
|
215
|
+
drainGroup(groupJid) {
|
|
216
|
+
if (this.shuttingDown)
|
|
217
|
+
return;
|
|
218
|
+
const state = this.getGroup(groupJid);
|
|
219
|
+
// Tasks first (they won't be re-discovered from SQLite like messages)
|
|
220
|
+
if (state.pendingTasks.length > 0) {
|
|
221
|
+
const task = state.pendingTasks.shift();
|
|
222
|
+
this.runTask(groupJid, task).catch((err) => logger.error({ groupJid, taskId: task.id, err }, 'Unhandled error in runTask (drain)'));
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
// Then pending messages
|
|
226
|
+
if (state.pendingMessages) {
|
|
227
|
+
this.runForGroup(groupJid, 'drain').catch((err) => logger.error({ groupJid, err }, 'Unhandled error in runForGroup (drain)'));
|
|
228
|
+
return;
|
|
229
|
+
}
|
|
230
|
+
// Nothing pending for this group; check if other groups are waiting for a slot
|
|
231
|
+
this.drainWaiting();
|
|
232
|
+
}
|
|
233
|
+
drainWaiting() {
|
|
234
|
+
while (this.waitingGroups.length > 0 &&
|
|
235
|
+
this.activeCount < MAX_CONCURRENT_CONTAINERS) {
|
|
236
|
+
const nextJid = this.waitingGroups.shift();
|
|
237
|
+
const state = this.getGroup(nextJid);
|
|
238
|
+
// Prioritize tasks over messages
|
|
239
|
+
if (state.pendingTasks.length > 0) {
|
|
240
|
+
const task = state.pendingTasks.shift();
|
|
241
|
+
this.runTask(nextJid, task).catch((err) => logger.error({ groupJid: nextJid, taskId: task.id, err }, 'Unhandled error in runTask (waiting)'));
|
|
242
|
+
}
|
|
243
|
+
else if (state.pendingMessages) {
|
|
244
|
+
this.runForGroup(nextJid, 'drain').catch((err) => logger.error({ groupJid: nextJid, err }, 'Unhandled error in runForGroup (waiting)'));
|
|
245
|
+
}
|
|
246
|
+
// If neither pending, skip this group
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
async shutdown(_gracePeriodMs) {
|
|
250
|
+
this.shuttingDown = true;
|
|
251
|
+
// Count active containers but don't kill them — they'll finish on their own
|
|
252
|
+
// via idle timeout or container timeout. The --rm flag cleans them up on exit.
|
|
253
|
+
// This prevents WhatsApp reconnection restarts from killing working agents.
|
|
254
|
+
const activeContainers = [];
|
|
255
|
+
for (const [jid, state] of this.groups) {
|
|
256
|
+
if (state.process && !state.process.killed && state.containerName) {
|
|
257
|
+
activeContainers.push(state.containerName);
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
logger.info({ activeCount: this.activeCount, detachedContainers: activeContainers }, 'GroupQueue shutting down (containers detached, not killed)');
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
//# sourceMappingURL=group-queue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"group-queue.js","sourceRoot":"","sources":["../src/group-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"group-queue.test.d.ts","sourceRoot":"","sources":["../src/group-queue.test.ts"],"names":[],"mappings":""}
|