@leemour/cli-messaging 0.147.0 → 0.148.0
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/dist/background/index.d.ts +1 -1
- package/dist/background/index.d.ts.map +1 -1
- package/dist/background/index.js +1 -1
- package/dist/background/index.js.map +1 -1
- package/dist/background/lock.d.ts +6 -0
- package/dist/background/lock.d.ts.map +1 -1
- package/dist/background/lock.js +31 -1
- package/dist/background/lock.js.map +1 -1
- package/dist/cli/config-command.d.ts.map +1 -1
- package/dist/cli/config-command.js +17 -3
- package/dist/cli/config-command.js.map +1 -1
- package/dist/cli/index.d.ts +6 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +5 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/messenger/chats-command.d.ts.map +1 -1
- package/dist/cli/messenger/chats-command.js +2 -2
- package/dist/cli/messenger/chats-command.js.map +1 -1
- package/dist/cli/messenger/contacts-command.d.ts.map +1 -1
- package/dist/cli/messenger/contacts-command.js +45 -1
- package/dist/cli/messenger/contacts-command.js.map +1 -1
- package/dist/cli/messenger/context.d.ts +8 -1
- package/dist/cli/messenger/context.d.ts.map +1 -1
- package/dist/cli/messenger/context.js +21 -2
- package/dist/cli/messenger/context.js.map +1 -1
- package/dist/cli/messenger/conversations-command.d.ts.map +1 -1
- package/dist/cli/messenger/conversations-command.js +6 -20
- package/dist/cli/messenger/conversations-command.js.map +1 -1
- package/dist/cli/messenger/doctor-command.d.ts +14 -0
- package/dist/cli/messenger/doctor-command.d.ts.map +1 -1
- package/dist/cli/messenger/doctor-command.js +117 -6
- package/dist/cli/messenger/doctor-command.js.map +1 -1
- package/dist/cli/messenger/flood-command.d.ts +8 -0
- package/dist/cli/messenger/flood-command.d.ts.map +1 -0
- package/dist/cli/messenger/flood-command.js +31 -0
- package/dist/cli/messenger/flood-command.js.map +1 -0
- package/dist/cli/messenger/flooded.d.ts +12 -0
- package/dist/cli/messenger/flooded.d.ts.map +1 -0
- package/dist/cli/messenger/flooded.js +77 -0
- package/dist/cli/messenger/flooded.js.map +1 -0
- package/dist/cli/messenger/inbox.d.ts +1 -0
- package/dist/cli/messenger/inbox.d.ts.map +1 -1
- package/dist/cli/messenger/inbox.js +4 -3
- package/dist/cli/messenger/inbox.js.map +1 -1
- package/dist/cli/messenger/mcp-command.d.ts +12 -0
- package/dist/cli/messenger/mcp-command.d.ts.map +1 -1
- package/dist/cli/messenger/mcp-command.js +49 -3
- package/dist/cli/messenger/mcp-command.js.map +1 -1
- package/dist/cli/messenger/messages-search-command.d.ts +2 -0
- package/dist/cli/messenger/messages-search-command.d.ts.map +1 -1
- package/dist/cli/messenger/messages-search-command.js +46 -15
- package/dist/cli/messenger/messages-search-command.js.map +1 -1
- package/dist/cli/messenger/messages-stats-command.d.ts +2 -0
- package/dist/cli/messenger/messages-stats-command.d.ts.map +1 -1
- package/dist/cli/messenger/messages-stats-command.js +35 -11
- package/dist/cli/messenger/messages-stats-command.js.map +1 -1
- package/dist/cli/messenger/port.d.ts +25 -1
- package/dist/cli/messenger/port.d.ts.map +1 -1
- package/dist/cli/messenger/port.js.map +1 -1
- package/dist/cli/messenger/private-files.d.ts +25 -0
- package/dist/cli/messenger/private-files.d.ts.map +1 -0
- package/dist/cli/messenger/private-files.js +28 -0
- package/dist/cli/messenger/private-files.js.map +1 -0
- package/dist/cli/messenger/replies-command.d.ts +5 -0
- package/dist/cli/messenger/replies-command.d.ts.map +1 -0
- package/dist/cli/messenger/replies-command.js +78 -0
- package/dist/cli/messenger/replies-command.js.map +1 -0
- package/dist/cli/messenger/report.d.ts +5 -0
- package/dist/cli/messenger/report.d.ts.map +1 -1
- package/dist/cli/messenger/report.js +25 -7
- package/dist/cli/messenger/report.js.map +1 -1
- package/dist/cli/messenger/review.d.ts.map +1 -1
- package/dist/cli/messenger/review.js +5 -3
- package/dist/cli/messenger/review.js.map +1 -1
- package/dist/cli/messenger/searches-command.d.ts +5 -0
- package/dist/cli/messenger/searches-command.d.ts.map +1 -0
- package/dist/cli/messenger/searches-command.js +117 -0
- package/dist/cli/messenger/searches-command.js.map +1 -0
- package/dist/cli/messenger/serve-command.d.ts.map +1 -1
- package/dist/cli/messenger/serve-command.js +87 -8
- package/dist/cli/messenger/serve-command.js.map +1 -1
- package/dist/cli/messenger/server-command.d.ts.map +1 -1
- package/dist/cli/messenger/server-command.js +7 -0
- package/dist/cli/messenger/server-command.js.map +1 -1
- package/dist/cli/messenger/store-maintenance-command.d.ts.map +1 -1
- package/dist/cli/messenger/store-maintenance-command.js +105 -4
- package/dist/cli/messenger/store-maintenance-command.js.map +1 -1
- package/dist/cli/messenger/tags-command.d.ts +5 -0
- package/dist/cli/messenger/tags-command.d.ts.map +1 -0
- package/dist/cli/messenger/tags-command.js +76 -0
- package/dist/cli/messenger/tags-command.js.map +1 -0
- package/dist/cli/messenger/watch-command.d.ts +4 -1
- package/dist/cli/messenger/watch-command.d.ts.map +1 -1
- package/dist/cli/messenger/watch-command.js +2 -1
- package/dist/cli/messenger/watch-command.js.map +1 -1
- package/dist/cli/store-settings.d.ts +26 -0
- package/dist/cli/store-settings.d.ts.map +1 -0
- package/dist/cli/store-settings.js +59 -0
- package/dist/cli/store-settings.js.map +1 -0
- package/dist/domain/models.d.ts +1 -1
- package/dist/domain/models.d.ts.map +1 -1
- package/dist/domain/tags.d.ts +6 -0
- package/dist/domain/tags.d.ts.map +1 -0
- package/dist/domain/tags.js +15 -0
- package/dist/domain/tags.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/kit/contract.d.ts.map +1 -1
- package/dist/kit/contract.js +6 -2
- package/dist/kit/contract.js.map +1 -1
- package/dist/mcp/personal.d.ts.map +1 -1
- package/dist/mcp/personal.js +2 -1
- package/dist/mcp/personal.js.map +1 -1
- package/dist/mcp/tool.d.ts +5 -0
- package/dist/mcp/tool.d.ts.map +1 -1
- package/dist/mcp/tool.js +12 -1
- package/dist/mcp/tool.js.map +1 -1
- package/dist/mcp/tools/chats.js +3 -3
- package/dist/mcp/tools/chats.js.map +1 -1
- package/dist/mcp/tools/contacts.d.ts.map +1 -1
- package/dist/mcp/tools/contacts.js +21 -1
- package/dist/mcp/tools/contacts.js.map +1 -1
- package/dist/mcp/tools/conversations.d.ts.map +1 -1
- package/dist/mcp/tools/conversations.js +2 -7
- package/dist/mcp/tools/conversations.js.map +1 -1
- package/dist/mcp/tools/messages.d.ts.map +1 -1
- package/dist/mcp/tools/messages.js +8 -2
- package/dist/mcp/tools/messages.js.map +1 -1
- package/dist/mcp/tools/search.d.ts +6 -3
- package/dist/mcp/tools/search.d.ts.map +1 -1
- package/dist/mcp/tools/search.js +48 -11
- package/dist/mcp/tools/search.js.map +1 -1
- package/dist/mcp/tools/searches.d.ts +4 -0
- package/dist/mcp/tools/searches.d.ts.map +1 -0
- package/dist/mcp/tools/searches.js +77 -0
- package/dist/mcp/tools/searches.js.map +1 -0
- package/dist/mcp/tools/tags.d.ts +4 -0
- package/dist/mcp/tools/tags.d.ts.map +1 -0
- package/dist/mcp/tools/tags.js +57 -0
- package/dist/mcp/tools/tags.js.map +1 -0
- package/dist/mcp/tools.d.ts +2 -0
- package/dist/mcp/tools.d.ts.map +1 -1
- package/dist/mcp/tools.js +7 -0
- package/dist/mcp/tools.js.map +1 -1
- package/dist/replies/decide.d.ts +3 -0
- package/dist/replies/decide.d.ts.map +1 -1
- package/dist/replies/decide.js +3 -0
- package/dist/replies/decide.js.map +1 -1
- package/dist/replies/dry-run.d.ts +51 -0
- package/dist/replies/dry-run.d.ts.map +1 -0
- package/dist/replies/dry-run.js +116 -0
- package/dist/replies/dry-run.js.map +1 -0
- package/dist/replies/rules.d.ts +12 -0
- package/dist/replies/rules.d.ts.map +1 -1
- package/dist/replies/rules.js +15 -6
- package/dist/replies/rules.js.map +1 -1
- package/dist/replies/serve.d.ts +44 -0
- package/dist/replies/serve.d.ts.map +1 -0
- package/dist/replies/serve.js +70 -0
- package/dist/replies/serve.js.map +1 -0
- package/dist/search/lucene/automaton.d.ts +5 -0
- package/dist/search/lucene/automaton.d.ts.map +1 -1
- package/dist/search/lucene/automaton.js +116 -0
- package/dist/search/lucene/automaton.js.map +1 -1
- package/dist/search/lucene/parser.d.ts.map +1 -1
- package/dist/search/lucene/parser.js +6 -2
- package/dist/search/lucene/parser.js.map +1 -1
- package/dist/search/lucene/registry.d.ts +5 -5
- package/dist/search/lucene/registry.d.ts.map +1 -1
- package/dist/search/lucene/registry.js +12 -7
- package/dist/search/lucene/registry.js.map +1 -1
- package/dist/sends/flood.d.ts +57 -0
- package/dist/sends/flood.d.ts.map +1 -0
- package/dist/sends/flood.js +90 -0
- package/dist/sends/flood.js.map +1 -0
- package/dist/sends/guard.d.ts +4 -1
- package/dist/sends/guard.d.ts.map +1 -1
- package/dist/sends/guard.js +9 -1
- package/dist/sends/guard.js.map +1 -1
- package/dist/sends/index.d.ts +1 -0
- package/dist/sends/index.d.ts.map +1 -1
- package/dist/sends/index.js +1 -0
- package/dist/sends/index.js.map +1 -1
- package/dist/sends/journal.d.ts +2 -0
- package/dist/sends/journal.d.ts.map +1 -1
- package/dist/sends/journal.js.map +1 -1
- package/dist/sends/permissions.d.ts +1 -1
- package/dist/sends/permissions.d.ts.map +1 -1
- package/dist/sends/permissions.js +13 -1
- package/dist/sends/permissions.js.map +1 -1
- package/dist/services/chats.d.ts +3 -3
- package/dist/services/chats.d.ts.map +1 -1
- package/dist/services/chats.js +2 -2
- package/dist/services/chats.js.map +1 -1
- package/dist/services/deps.d.ts +2 -0
- package/dist/services/deps.d.ts.map +1 -1
- package/dist/services/deps.js.map +1 -1
- package/dist/services/inbox.d.ts +0 -2
- package/dist/services/inbox.d.ts.map +1 -1
- package/dist/services/inbox.js +13 -8
- package/dist/services/inbox.js.map +1 -1
- package/dist/services/index.d.ts +8 -0
- package/dist/services/index.d.ts.map +1 -1
- package/dist/services/index.js +6 -0
- package/dist/services/index.js.map +1 -1
- package/dist/services/messages-search.d.ts +2 -2
- package/dist/services/messages-search.d.ts.map +1 -1
- package/dist/services/messages-search.js +11 -3
- package/dist/services/messages-search.js.map +1 -1
- package/dist/services/messages.d.ts +10 -3
- package/dist/services/messages.d.ts.map +1 -1
- package/dist/services/messages.js +47 -4
- package/dist/services/messages.js.map +1 -1
- package/dist/services/people.d.ts +7 -0
- package/dist/services/people.d.ts.map +1 -1
- package/dist/services/people.js +18 -0
- package/dist/services/people.js.map +1 -1
- package/dist/services/person-context.d.ts +69 -0
- package/dist/services/person-context.d.ts.map +1 -0
- package/dist/services/person-context.js +130 -0
- package/dist/services/person-context.js.map +1 -0
- package/dist/services/searches.d.ts +50 -0
- package/dist/services/searches.d.ts.map +1 -0
- package/dist/services/searches.js +127 -0
- package/dist/services/searches.js.map +1 -0
- package/dist/services/tags.d.ts +40 -0
- package/dist/services/tags.d.ts.map +1 -0
- package/dist/services/tags.js +56 -0
- package/dist/services/tags.js.map +1 -0
- package/dist/store/index.d.ts +1 -1
- package/dist/store/index.d.ts.map +1 -1
- package/dist/store/index.js.map +1 -1
- package/dist/store/normalize.d.ts +2 -0
- package/dist/store/normalize.d.ts.map +1 -1
- package/dist/store/normalize.js +7 -5
- package/dist/store/normalize.js.map +1 -1
- package/dist/store/repair.d.ts +55 -0
- package/dist/store/repair.d.ts.map +1 -0
- package/dist/store/repair.js +313 -0
- package/dist/store/repair.js.map +1 -0
- package/dist/store/sqlite/accounts.d.ts.map +1 -1
- package/dist/store/sqlite/accounts.js +3 -1
- package/dist/store/sqlite/accounts.js.map +1 -1
- package/dist/store/sqlite/chats.d.ts.map +1 -1
- package/dist/store/sqlite/chats.js +3 -1
- package/dist/store/sqlite/chats.js.map +1 -1
- package/dist/store/sqlite/drizzle/bun.js +1 -1
- package/dist/store/sqlite/drizzle/core.d.ts +1 -1
- package/dist/store/sqlite/drizzle/core.d.ts.map +1 -1
- package/dist/store/sqlite/drizzle/core.js +3 -1
- package/dist/store/sqlite/drizzle/core.js.map +1 -1
- package/dist/store/sqlite/drizzle/node.js +1 -1
- package/dist/store/sqlite/drizzle/{shared-WZFJ4TMA.js → shared-IZ6QGA7N.js} +2 -1
- package/dist/store/sqlite/lucene.d.ts.map +1 -1
- package/dist/store/sqlite/lucene.js +17 -3
- package/dist/store/sqlite/lucene.js.map +1 -1
- package/dist/store/sqlite/manifest.d.ts.map +1 -1
- package/dist/store/sqlite/manifest.js +6 -0
- package/dist/store/sqlite/manifest.js.map +1 -1
- package/dist/store/sqlite/migrations.generated.d.ts.map +1 -1
- package/dist/store/sqlite/migrations.generated.js +53 -0
- package/dist/store/sqlite/migrations.generated.js.map +1 -1
- package/dist/store/sqlite/person-links.d.ts +18 -0
- package/dist/store/sqlite/person-links.d.ts.map +1 -0
- package/dist/store/sqlite/person-links.js +122 -0
- package/dist/store/sqlite/person-links.js.map +1 -0
- package/dist/store/sqlite/roster.d.ts +57 -0
- package/dist/store/sqlite/roster.d.ts.map +1 -0
- package/dist/store/sqlite/roster.js +179 -0
- package/dist/store/sqlite/roster.js.map +1 -0
- package/dist/store/sqlite/schema.d.ts +753 -0
- package/dist/store/sqlite/schema.d.ts.map +1 -1
- package/dist/store/sqlite/schema.js +99 -0
- package/dist/store/sqlite/schema.js.map +1 -1
- package/dist/store/sqlite/search-index.d.ts +3 -0
- package/dist/store/sqlite/search-index.d.ts.map +1 -1
- package/dist/store/sqlite/search-index.js +8 -6
- package/dist/store/sqlite/search-index.js.map +1 -1
- package/dist/store/sqlite/search.d.ts +2 -0
- package/dist/store/sqlite/search.d.ts.map +1 -1
- package/dist/store/sqlite/search.js +5 -0
- package/dist/store/sqlite/search.js.map +1 -1
- package/dist/store/sqlite/searches.d.ts +35 -0
- package/dist/store/sqlite/searches.d.ts.map +1 -0
- package/dist/store/sqlite/searches.js +77 -0
- package/dist/store/sqlite/searches.js.map +1 -0
- package/dist/store/sqlite/stems.d.ts +61 -0
- package/dist/store/sqlite/stems.d.ts.map +1 -0
- package/dist/store/sqlite/stems.js +215 -0
- package/dist/store/sqlite/stems.js.map +1 -0
- package/dist/store/sqlite/tags.d.ts +38 -0
- package/dist/store/sqlite/tags.d.ts.map +1 -0
- package/dist/store/sqlite/tags.js +85 -0
- package/dist/store/sqlite/tags.js.map +1 -0
- package/dist/store/store.d.ts +97 -0
- package/dist/store/store.d.ts.map +1 -1
- package/dist/store/store.js +106 -0
- package/dist/store/store.js.map +1 -1
- package/package.json +1 -1
- package/parity.json +238 -30
- /package/dist/store/sqlite/drizzle/{shared-WZFJ4TMA.js.map → shared-IZ6QGA7N.js.map} +0 -0
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { CliError } from "@leemour/cli-core";
|
|
2
|
+
import { isCliFailure } from "../failures.js";
|
|
3
|
+
import { providerErrorKey } from "../runs/events.js";
|
|
4
|
+
import { throughWrapper } from "./port.js";
|
|
5
|
+
const LONG_LIVED = new Set(["watch", "feed", "self", "newSendId", "close", "formatMarkdown"]);
|
|
6
|
+
const BLOCKING = new Set(["frozen", "limited"]);
|
|
7
|
+
const chatOf = (args) => typeof args[0] === "string" && /^-?\d+$/.test(args[0]) ? args[0] : undefined;
|
|
8
|
+
/**
|
|
9
|
+
* The adapter, refusing a call the messenger already said to hold off on, before it is asked again;
|
|
10
|
+
* remembering each new "wait" it answers; and stopping writes once it says the account may not write.
|
|
11
|
+
* Never repeats a call: a send is the caller's to repeat, with its own send id.
|
|
12
|
+
*/
|
|
13
|
+
export const flooded = (messenger, memory, { name, warn }) => {
|
|
14
|
+
const kept = (what) => {
|
|
15
|
+
try {
|
|
16
|
+
what();
|
|
17
|
+
}
|
|
18
|
+
catch (error) {
|
|
19
|
+
warn(`could not remember ${name}'s wait (${error instanceof Error ? error.message : String(error)})`);
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
const noted = (operation, chatId, error) => {
|
|
23
|
+
if (!isCliFailure(error))
|
|
24
|
+
return;
|
|
25
|
+
const details = error.details ?? {};
|
|
26
|
+
const standing = details.standing;
|
|
27
|
+
if (standing && BLOCKING.has(standing.state)) {
|
|
28
|
+
kept(() => {
|
|
29
|
+
const block = memory.block({
|
|
30
|
+
state: standing.state,
|
|
31
|
+
hint: standing.hint ?? error.message,
|
|
32
|
+
...(standing.until ? { until: standing.until } : {}),
|
|
33
|
+
});
|
|
34
|
+
warn(`writes from this profile are held until ${block.until}: ${block.hint}`);
|
|
35
|
+
});
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
const waitMs = Number(details.retryAfterMs);
|
|
39
|
+
if (error.code !== "rate_limited" || details.remembered === true || !Number.isFinite(waitMs) || waitMs <= 0)
|
|
40
|
+
return;
|
|
41
|
+
const providerError = providerErrorKey(details.providerError);
|
|
42
|
+
kept(() => {
|
|
43
|
+
const deadline = memory.remember({
|
|
44
|
+
operation,
|
|
45
|
+
...(chatId ? { chatId } : {}),
|
|
46
|
+
...(providerError ? { providerError } : {}),
|
|
47
|
+
waitMs,
|
|
48
|
+
});
|
|
49
|
+
warn(`${name} asked to wait before ${operation} again — until ${deadline.until}`);
|
|
50
|
+
});
|
|
51
|
+
};
|
|
52
|
+
return throughWrapper(messenger, {}, (operation, call) => {
|
|
53
|
+
if (LONG_LIVED.has(operation))
|
|
54
|
+
return call;
|
|
55
|
+
return (async (...args) => {
|
|
56
|
+
const chatId = chatOf(args);
|
|
57
|
+
const owed = memory.owed(operation, chatId);
|
|
58
|
+
if (owed) {
|
|
59
|
+
const waitMs = Math.max(0, Date.parse(owed.until) - Date.now());
|
|
60
|
+
throw new CliError("rate_limited", `${name} asked to wait before ${operation} again, ${Math.ceil(waitMs / 1000)} s are left — nothing was sent to ${name}`, {
|
|
61
|
+
retryAfterMs: waitMs,
|
|
62
|
+
retryAt: owed.until,
|
|
63
|
+
remembered: true,
|
|
64
|
+
...(owed.providerError ? { providerError: owed.providerError } : {}),
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
try {
|
|
68
|
+
return await call(...args);
|
|
69
|
+
}
|
|
70
|
+
catch (error) {
|
|
71
|
+
noted(operation, chatId, error);
|
|
72
|
+
throw error;
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
};
|
|
77
|
+
//# sourceMappingURL=flooded.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flooded.js","sourceRoot":"","sources":["../../../src/cli/messenger/flooded.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
2
|
import { type Messenger } from "./context.js";
|
|
3
|
+
export declare const PARTIAL_NOTE = "the messenger did not list every chat, and did not say how many it left out; one may have more";
|
|
3
4
|
/**
|
|
4
5
|
* Two questions, one command — max-cli's `inbox` (its `NEED-171`).
|
|
5
6
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AASnC,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,cAAc,CAAA;AAa/D;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,cAAe,SAAS,KAAG,
|
|
1
|
+
{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AASnC,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,cAAc,CAAA;AAa/D,eAAO,MAAM,YAAY,mGACyE,CAAA;AAElG;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,cAAe,SAAS,KAAG,OAqG9C,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
2
|
import { renderMessages } from "../../render/messages.js";
|
|
3
3
|
import { CHAT_KINDS } from "../../services/chats.js";
|
|
4
|
-
import {
|
|
4
|
+
import { kindsOf } from "../../services/inbox.js";
|
|
5
5
|
import { momentOf } from "../../services/moment.js";
|
|
6
6
|
import { modelWith } from "../../speech/hearing.js";
|
|
7
7
|
import { positiveCount } from "../paging.js";
|
|
@@ -10,6 +10,7 @@ import { messengerContext } from "./context.js";
|
|
|
10
10
|
import { heardItems, hearForCommand, hearingFields, MODEL_OPTION, spokenItems, TRANSCRIBE_OPTION, } from "./hearing-command.js";
|
|
11
11
|
import { checkPoints } from "./points.js";
|
|
12
12
|
const FIRST_LOOK_MS = 24 * 60 * 60 * 1000;
|
|
13
|
+
export const PARTIAL_NOTE = "the messenger did not list every chat, and did not say how many it left out; one may have more";
|
|
13
14
|
/**
|
|
14
15
|
* Two questions, one command — max-cli's `inbox` (its `NEED-171`).
|
|
15
16
|
*
|
|
@@ -65,12 +66,12 @@ export const inboxCommand = (messenger) => new Command("inbox")
|
|
|
65
66
|
}
|
|
66
67
|
if (inbox.skipped.length > 0) {
|
|
67
68
|
const names = inbox.skipped.map((chat) => chat.title ?? chat.id).join(", ");
|
|
68
|
-
renderer.note(`
|
|
69
|
+
renderer.note(`skipped ${inbox.skipped.length} chats — too many at once: ${names} — \`${app.command} messages list <chat>\` reads one`);
|
|
69
70
|
}
|
|
70
71
|
if (inbox.quiet > 0)
|
|
71
72
|
renderer.note(`${inbox.quiet} muted or archived chats left out — --all shows them`);
|
|
72
73
|
if (inbox.partial)
|
|
73
|
-
renderer.note(
|
|
74
|
+
renderer.note(PARTIAL_NOTE);
|
|
74
75
|
if (marked !== undefined)
|
|
75
76
|
renderer.note(`marked ${marked.length} chat(s) read up to the newest message shown`);
|
|
76
77
|
const messages = heardItems(read, hearing);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbox.js","sourceRoot":"","sources":["../../../src/cli/messenger/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"inbox.js","sourceRoot":"","sources":["../../../src/cli/messenger/inbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ChildProcessWithoutNullStreams } from "node:child_process";
|
|
1
2
|
import { Command } from "commander";
|
|
2
3
|
import { type AppIdentity } from "../app.js";
|
|
3
4
|
import { type BaseEnvironment } from "../context.js";
|
|
@@ -24,6 +25,17 @@ export interface McpFlags {
|
|
|
24
25
|
/** Where `mcp --http` keeps the hashes of the tokens it issued — per profile, in the state folder. */
|
|
25
26
|
export declare const httpTokenFile: (app: AppIdentity, profile: string, env: NodeJS.ProcessEnv) => string;
|
|
26
27
|
export declare const mcpCommand: (messenger: Messenger) => Command;
|
|
28
|
+
/**
|
|
29
|
+
* The server's own stderr, so a failed start says why rather than only that it exited. Read as it
|
|
30
|
+
* comes, which also keeps a chatty server from blocking on a full pipe. Only the end is kept, with the
|
|
31
|
+
* home folder hidden, terminal control codes made visible, and long digit runs — ids, phone numbers —
|
|
32
|
+
* and long token-like runs masked.
|
|
33
|
+
*/
|
|
34
|
+
export declare const stderrTail: () => {
|
|
35
|
+
start: (file: string, args: string[], env: NodeJS.ProcessEnv) => ChildProcessWithoutNullStreams;
|
|
36
|
+
tail: () => Promise<string>;
|
|
37
|
+
};
|
|
38
|
+
export declare const redactTail: (text: string, home: string | undefined) => string;
|
|
27
39
|
/**
|
|
28
40
|
* `node` and the script by full path, on every platform: a client started from the desktop does
|
|
29
41
|
* not see the PATH a terminal has, and on Windows the command is a `.cmd` file that a client which
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-command.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/mcp-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-command.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/mcp-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,8BAA8B,EAAS,MAAM,oBAAoB,CAAA;AAM/E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,KAAK,WAAW,EAAW,MAAM,WAAW,CAAA;AACrD,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,cAAc,CAAA;AAE/D,mEAAmE;AACnE,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,GAAG,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACjD;AAED,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAID,sGAAsG;AACtG,eAAO,MAAM,aAAa,QAAS,WAAW,WAAW,MAAM,OAAO,MAAM,CAAC,UAAU,KAAG,MACqB,CAAA;AAmD/G,eAAO,MAAM,UAAU,cAAe,SAAS,KAAG,OAiJjD,CAAA;AAMD;;;;;GAKG;AACH,eAAO,MAAM,UAAU;kBAIA,MAAM,QAAQ,MAAM,EAAE,OAAO,MAAM,CAAC,UAAU,KAAG,8BAA8B;gBAc7E,OAAO,CAAC,MAAM,CAAC;CAKvC,CAAA;AAED,eAAO,MAAM,UAAU,SAAU,MAAM,QAAQ,MAAM,GAAG,SAAS,KAAG,MAMnE,CAAA;AAID;;;;;;;GAOG;AACH,eAAO,MAAM,WAAW,QACjB,WAAW,kDAOb;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,KACrG;IAAE,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAiCpE,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
1
2
|
import { realpathSync } from "node:fs";
|
|
2
3
|
import { join } from "node:path";
|
|
3
|
-
import { CliError, resolvePaths } from "@leemour/cli-core";
|
|
4
|
+
import { CliError, resolvePaths, visibleControls } from "@leemour/cli-core";
|
|
4
5
|
import { annotate } from "@leemour/cli-core/commands";
|
|
5
6
|
import { installerOf } from "@leemour/cli-core/update";
|
|
6
7
|
import { Command } from "commander";
|
|
@@ -154,8 +155,11 @@ export const mcpCommand = (messenger) => {
|
|
|
154
155
|
if (!entry)
|
|
155
156
|
throw new CliError("validation_error", "the MCP entry is empty");
|
|
156
157
|
const { probeStdio } = await import("@leemour/cli-core/mcp");
|
|
158
|
+
const stderr = stderrTail();
|
|
157
159
|
try {
|
|
158
|
-
const { tools, potentialWrites } = await probeStdio(entry
|
|
160
|
+
const { tools, potentialWrites } = await probeStdio(entry, {
|
|
161
|
+
start: stderr.start,
|
|
162
|
+
});
|
|
159
163
|
renderer.result({
|
|
160
164
|
healthy: true,
|
|
161
165
|
profile: settings.profile,
|
|
@@ -164,11 +168,53 @@ export const mcpCommand = (messenger) => {
|
|
|
164
168
|
});
|
|
165
169
|
}
|
|
166
170
|
catch (error) {
|
|
167
|
-
|
|
171
|
+
const tail = await stderr.tail();
|
|
172
|
+
throw new CliError("validation_error", `${error instanceof Error ? error.message : "MCP doctor failed"}${tail ? ` — its last words on stderr:\n${tail}` : ""}`, tail ? { stderr: tail } : undefined);
|
|
168
173
|
}
|
|
169
174
|
}));
|
|
170
175
|
return command;
|
|
171
176
|
};
|
|
177
|
+
const TAIL_LINES = 20;
|
|
178
|
+
const TAIL_BYTES = 2_000;
|
|
179
|
+
const TAIL_WAIT_MS = 500;
|
|
180
|
+
/**
|
|
181
|
+
* The server's own stderr, so a failed start says why rather than only that it exited. Read as it
|
|
182
|
+
* comes, which also keeps a chatty server from blocking on a full pipe. Only the end is kept, with the
|
|
183
|
+
* home folder hidden, terminal control codes made visible, and long digit runs — ids, phone numbers —
|
|
184
|
+
* and long token-like runs masked.
|
|
185
|
+
*/
|
|
186
|
+
export const stderrTail = () => {
|
|
187
|
+
let kept = "";
|
|
188
|
+
let home;
|
|
189
|
+
let ended = Promise.resolve();
|
|
190
|
+
const start = (file, args, env) => {
|
|
191
|
+
home = env.HOME ?? env.USERPROFILE;
|
|
192
|
+
const child = spawn(file, args, { env, stdio: "pipe" });
|
|
193
|
+
child.stderr.setEncoding("utf8");
|
|
194
|
+
child.stderr.on("data", (chunk) => {
|
|
195
|
+
kept = (kept + chunk).slice(-TAIL_BYTES * 4);
|
|
196
|
+
});
|
|
197
|
+
ended = new Promise((resolve) => {
|
|
198
|
+
child.stderr.once("close", resolve);
|
|
199
|
+
child.once("error", () => resolve());
|
|
200
|
+
});
|
|
201
|
+
return child;
|
|
202
|
+
};
|
|
203
|
+
// The exit that fails the probe can arrive before the last stderr chunk, and the last lines say why.
|
|
204
|
+
const tail = async () => {
|
|
205
|
+
await Promise.race([ended, new Promise((resolve) => setTimeout(resolve, TAIL_WAIT_MS).unref())]);
|
|
206
|
+
return redactTail(kept, home);
|
|
207
|
+
};
|
|
208
|
+
return { start, tail };
|
|
209
|
+
};
|
|
210
|
+
export const redactTail = (text, home) => {
|
|
211
|
+
let out = visibleControls(text);
|
|
212
|
+
if (home)
|
|
213
|
+
out = out.split(home).join("~");
|
|
214
|
+
out = out.replace(/[A-Za-z0-9_\-+=]{32,}/g, "[hidden]").replace(/\+?\d[\d ]{5,}\d/g, "[number]");
|
|
215
|
+
const lines = out.split("\n").filter((line) => line.trim() !== "");
|
|
216
|
+
return lines.slice(-TAIL_LINES).join("\n").slice(-TAIL_BYTES);
|
|
217
|
+
};
|
|
172
218
|
const VERSION_MANAGER = /[\\/](\.nvm|nvm|\.fnm|fnm|fnm_multishells|\.volta|volta|\.asdf|mise)[\\/]/i;
|
|
173
219
|
/**
|
|
174
220
|
* `node` and the script by full path, on every platform: a client started from the desktop does
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-command.js","sourceRoot":"","sources":["../../../src/cli/messenger/mcp-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mcp-command.js","sourceRoot":"","sources":["../../../src/cli/messenger/mcp-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
2
|
import { type Messenger } from "./context.js";
|
|
3
3
|
export declare const messagesSearchCommand: (messenger: Messenger) => Command;
|
|
4
|
+
export declare const wholeCount: (value: string) => number;
|
|
5
|
+
export declare const languageOf: (value: string) => "lucene" | "legacy";
|
|
4
6
|
//# sourceMappingURL=messages-search-command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages-search-command.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/messages-search-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAKnC,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,cAAc,CAAA;AAE/D,eAAO,MAAM,qBAAqB,cAAe,SAAS,KAAG,
|
|
1
|
+
{"version":3,"file":"messages-search-command.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/messages-search-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAKnC,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,cAAc,CAAA;AAE/D,eAAO,MAAM,qBAAqB,cAAe,SAAS,KAAG,OA2IvD,CAAA;AAUN,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,MAK1C,CAAA;AAED,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,QAAQ,GAAG,QAIrD,CAAA"}
|
|
@@ -7,7 +7,7 @@ import { positiveCount } from "../paging.js";
|
|
|
7
7
|
import { messengerContext } from "./context.js";
|
|
8
8
|
export const messagesSearchCommand = (messenger) => new Command("search")
|
|
9
9
|
.description("search the local store — what was read, fetched or kept by serve; never asks the messenger")
|
|
10
|
-
.argument("
|
|
10
|
+
.argument("[query...]", 'strict Lucene query: words, "phrases", AND/OR/NOT, field groups and date ranges; --language legacy keeps discovery; with --saved, more words AND-ed to it')
|
|
11
11
|
.option("--chat <chat>", `only this chat — the same as chat: in the query; ${messenger.chatArgument}`)
|
|
12
12
|
.option("--source <messenger>", "every account of this messenger held in the store; personal, bots or all — the same as in: in the query")
|
|
13
13
|
.option("--limit <n>", "how many", positiveCount("--limit"))
|
|
@@ -17,26 +17,57 @@ export const messagesSearchCommand = (messenger) => new Command("search")
|
|
|
17
17
|
.option("--timezone <zone>", "the IANA timezone for calendar date boundaries")
|
|
18
18
|
.addHelpText("after", "Search guide: https://github.com/leemour/cli-messaging/blob/main/docs/search/query-language.md")
|
|
19
19
|
.option("--regex", "the words are one regular expression, case-insensitive, tested against every stored text")
|
|
20
|
+
.option("--saved <name|id>", "run a saved search or an earlier run; options typed here replace its own")
|
|
20
21
|
.action(async function (words) {
|
|
21
22
|
const context = messengerContext(this, messenger);
|
|
22
|
-
const { chat, source, regex, language, timezone, newest, context: around, } = this.opts();
|
|
23
|
+
const { chat, source, regex, language, timezone, newest, context: around, limit: typedLimit, saved, } = this.opts();
|
|
24
|
+
if (saved === undefined && words.length === 0)
|
|
25
|
+
throw new CliError("validation_error", "give a query, or --saved <name> to run a saved search");
|
|
26
|
+
if (saved !== undefined && regex)
|
|
27
|
+
throw new CliError("validation_error", "--regex is kept with the saved search; not with --saved");
|
|
23
28
|
const controller = new AbortController();
|
|
24
29
|
context.track({ close: async () => controller.abort() });
|
|
25
30
|
const external = environmentOf(this).signal;
|
|
26
31
|
const signal = external ? AbortSignal.any([external, controller.signal]) : controller.signal;
|
|
27
|
-
const
|
|
28
|
-
const pattern = regex ? patternOf(words.join(" ")) : undefined;
|
|
29
|
-
const found = await context.withServices((services) => services.messages.search({
|
|
30
|
-
...(pattern ? { pattern } : { text: words.join(" ") }),
|
|
31
|
-
limit,
|
|
32
|
-
signal,
|
|
33
|
-
language: language ?? (pattern ? "legacy" : "lucene"),
|
|
34
|
-
...(timezone === undefined ? {} : { timezone }),
|
|
35
|
-
newest: newest === true,
|
|
36
|
-
context: around ?? (context.format === "pretty" ? 2 : 0),
|
|
32
|
+
const typed = {
|
|
37
33
|
...(chat === undefined ? {} : { chat }),
|
|
38
34
|
...(source === undefined ? {} : { source }),
|
|
39
|
-
|
|
35
|
+
...(language === undefined ? {} : { language }),
|
|
36
|
+
...(timezone === undefined ? {} : { timezone }),
|
|
37
|
+
...(newest ? { newest: true } : {}),
|
|
38
|
+
...(around === undefined ? {} : { context: around }),
|
|
39
|
+
...(typedLimit === undefined ? {} : { limit: typedLimit }),
|
|
40
|
+
};
|
|
41
|
+
let limit = context.settings.limit;
|
|
42
|
+
const found = await context.withServices(async (services) => {
|
|
43
|
+
if (saved === undefined) {
|
|
44
|
+
const pattern = regex ? patternOf(words.join(" ")) : undefined;
|
|
45
|
+
return services.messages.search({
|
|
46
|
+
...typed,
|
|
47
|
+
...(pattern ? { pattern } : { text: words.join(" ") }),
|
|
48
|
+
limit,
|
|
49
|
+
signal,
|
|
50
|
+
language: language ?? (pattern ? "legacy" : "lucene"),
|
|
51
|
+
newest: newest === true,
|
|
52
|
+
context: around ?? (context.format === "pretty" ? 2 : 0),
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
const { id, params, pattern } = await services.searches.resolve(saved, { ...typed, text: words.join(" ") });
|
|
56
|
+
limit = params.limit ?? limit;
|
|
57
|
+
return services.messages.search({
|
|
58
|
+
...(pattern ? { pattern } : params.text === undefined ? {} : { text: params.text }),
|
|
59
|
+
...(params.ast === undefined ? {} : { ast: params.ast }),
|
|
60
|
+
...(params.chat === undefined ? {} : { chat: params.chat }),
|
|
61
|
+
...(params.source === undefined ? {} : { source: params.source }),
|
|
62
|
+
...(params.timezone === undefined ? {} : { timezone: params.timezone }),
|
|
63
|
+
limit,
|
|
64
|
+
signal,
|
|
65
|
+
language: params.language ?? (pattern ? "legacy" : "lucene"),
|
|
66
|
+
newest: params.newest === true,
|
|
67
|
+
context: params.context ?? (context.format === "pretty" ? 2 : 0),
|
|
68
|
+
saved: id,
|
|
69
|
+
});
|
|
70
|
+
});
|
|
40
71
|
const { command } = messenger.app;
|
|
41
72
|
for (const { from, to } of found.corrections)
|
|
42
73
|
context.renderer.note(`${from} → ${to.join(", ")}`);
|
|
@@ -87,13 +118,13 @@ const patternOf = (source) => {
|
|
|
87
118
|
throw new CliError("validation_error", "not a regular expression — check JavaScript syntax or use Lucene regex");
|
|
88
119
|
}
|
|
89
120
|
};
|
|
90
|
-
const wholeCount = (value) => {
|
|
121
|
+
export const wholeCount = (value) => {
|
|
91
122
|
if (!/^\d+$/.test(value.trim())) {
|
|
92
123
|
throw new CliError("validation_error", `--context takes a whole number from 0 upwards, not "${value}"`);
|
|
93
124
|
}
|
|
94
125
|
return Number(value);
|
|
95
126
|
};
|
|
96
|
-
const languageOf = (value) => {
|
|
127
|
+
export const languageOf = (value) => {
|
|
97
128
|
if (value !== "lucene" && value !== "legacy")
|
|
98
129
|
throw new CliError("validation_error", "--language takes lucene or legacy");
|
|
99
130
|
return value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages-search-command.js","sourceRoot":"","sources":["../../../src/cli/messenger/messages-search-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAkB,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAoB,EAAW,EAAE,CACrE,IAAI,OAAO,CAAC,QAAQ,CAAC;KAClB,WAAW,CAAC,4FAA4F,CAAC;KACzG,QAAQ,CACP,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"messages-search-command.js","sourceRoot":"","sources":["../../../src/cli/messenger/messages-search-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAkB,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAoB,EAAW,EAAE,CACrE,IAAI,OAAO,CAAC,QAAQ,CAAC;KAClB,WAAW,CAAC,4FAA4F,CAAC;KACzG,QAAQ,CACP,YAAY,EACZ,2JAA2J,CAC5J;KACA,MAAM,CAAC,eAAe,EAAE,oDAAoD,SAAS,CAAC,YAAY,EAAE,CAAC;KACrG,MAAM,CACL,sBAAsB,EACtB,yGAAyG,CAC1G;KACA,MAAM,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;KAC3D,MAAM,CAAC,UAAU,EAAE,oCAAoC,CAAC;KACxD,MAAM,CAAC,eAAe,EAAE,oEAAoE,EAAE,UAAU,CAAC;KACzG,MAAM,CAAC,4BAA4B,EAAE,uDAAuD,EAAE,UAAU,CAAC;KACzG,MAAM,CAAC,mBAAmB,EAAE,gDAAgD,CAAC;KAC7E,WAAW,CACV,OAAO,EACP,gGAAgG,CACjG;KACA,MAAM,CAAC,SAAS,EAAE,0FAA0F,CAAC;KAC7G,MAAM,CAAC,mBAAmB,EAAE,0EAA0E,CAAC;KACvG,MAAM,CAAC,KAAK,WAA0B,KAAe;IACpD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IACjD,MAAM,EACJ,IAAI,EACJ,MAAM,EACN,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,UAAU,EACjB,KAAK,GACN,GAAG,IAAI,CAAC,IAAI,EAUT,CAAA;IACJ,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAC3C,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,uDAAuD,CAAC,CAAA;IACjG,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK;QAC9B,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,yDAAyD,CAAC,CAAA;IACnG,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;IAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAA;IAC5F,MAAM,KAAK,GAAG;QACZ,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3C,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;QAC/C,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;QAC/C,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QACpD,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;KAC3D,CAAA;IACD,IAAI,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAA;IAClC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC1D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAC9D,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC9B,GAAG,KAAK;gBACR,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtD,KAAK;gBACL,MAAM;gBACN,QAAQ,EAAE,QAAQ,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACrD,MAAM,EAAE,MAAM,KAAK,IAAI;gBACvB,OAAO,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACzD,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAC3G,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,KAAK,CAAA;QAC7B,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC9B,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;YACnF,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;YACxD,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;YACjE,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvE,KAAK;YACL,MAAM;YACN,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC5D,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,IAAI;YAC9B,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,KAAK,EAAE,EAAE;SACV,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC,GAAG,CAAA;IACjC,KAAK,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,KAAK,CAAC,WAAW;QAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACjG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CACnB,KAAK,CAAC,KAAK;YACT,CAAC,CAAC,2EAA2E,OAAO,8BAA8B;YAClH,CAAC,CAAC,2FAA2F,OAAO,8BAA8B,CACrI,CAAA;IACH,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,MAAM,CAAA;IACxF,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,CAAC,QAAQ,CAAC,IAAI,CACnB,GAAG,UAAU,mDAAmD,OAAO,mCAAmC,CAC3G,CAAA;IACH,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG;YACd,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;YAClC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,YAAY;YAC3C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM;SAC7B,CAAA;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;QAC/E,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAA;QACpF,OAAO,CAAC,OAAO,CAAC,IAAI,CAClB,IAAI;aACD,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE;YACnB,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,MAAM,CAAA;YACzC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,KAAK,cAAc,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,CAAA;QAC3H,CAAC,CAAC;aACD,IAAI,CAAC,MAAM,CAAC,CAChB,CAAA;QACD,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC7G,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CACnB,WAAW,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,2EAA2E,CAC3G,CAAA;QACH,CAAC;QACD,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAA;QACtF,OAAM;IACR,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO;QAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;;QAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AAC5D,CAAC,CAAC,CAAA;AAEN,MAAM,SAAS,GAAG,CAAC,MAAc,EAAU,EAAE;IAC3C,IAAI,CAAC;QACH,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,wEAAwE,CAAC,CAAA;IAClH,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE;IAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,uDAAuD,KAAK,GAAG,CAAC,CAAA;IACzG,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAuB,EAAE;IAC/D,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ;QAC1C,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,mCAAmC,CAAC,CAAA;IAC7E,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
|
+
import type { StatsGrouping } from "../../services/messages-search.js";
|
|
2
3
|
import { type Messenger } from "./context.js";
|
|
3
4
|
export declare const messagesStatsCommand: (messenger: Messenger) => Command;
|
|
5
|
+
export declare const groupingOf: (value: string) => StatsGrouping;
|
|
4
6
|
//# sourceMappingURL=messages-stats-command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages-stats-command.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/messages-stats-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"messages-stats-command.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/messages-stats-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAEtE,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,cAAc,CAAA;AAI/D,eAAO,MAAM,oBAAoB,cAAe,SAAS,KAAG,OA+FtD,CAAA;AAEN,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,aAI1C,CAAA"}
|
|
@@ -5,26 +5,50 @@ import { messengerContext } from "./context.js";
|
|
|
5
5
|
const GROUPINGS = ["chat", "sender", "day", "hour"];
|
|
6
6
|
export const messagesStatsCommand = (messenger) => new Command("stats")
|
|
7
7
|
.description("how many stored messages match, by chat, sender, day or hour — the local store only; never asks the messenger")
|
|
8
|
-
.argument("[query...]", "a strict Lucene query, as for messages search; none counts every stored message")
|
|
8
|
+
.argument("[query...]", "a strict Lucene query, as for messages search; none counts every stored message; with --saved, more words AND-ed to it")
|
|
9
9
|
.option("--by <chat|sender|day|hour>", "what to count by (default: chat)", groupingOf)
|
|
10
10
|
.option("--chat <chat>", `only this chat — the same as chat: in the query; ${messenger.chatArgument}`)
|
|
11
11
|
.option("--source <messenger>", "every account of this messenger held in the store; personal, bots or all — the same as in: in the query")
|
|
12
12
|
.option("--limit <n>", "how many rows", positiveCount("--limit"))
|
|
13
13
|
.option("--timezone <zone>", "the IANA timezone for calendar days and hours")
|
|
14
|
+
.option("--saved <name|id>", "count what a saved search or an earlier run matches; options typed here replace its own")
|
|
14
15
|
.addHelpText("after", "Search guide: https://github.com/leemour/cli-messaging/blob/main/docs/search/query-language.md")
|
|
15
16
|
.action(async function (words) {
|
|
16
17
|
const context = messengerContext(this, messenger);
|
|
17
|
-
const { by, chat, source, timezone } = this.opts();
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
...(words.length ? { text: words.join(" ") } : {}),
|
|
21
|
-
by: by ?? "chat",
|
|
22
|
-
limit,
|
|
23
|
-
language: "lucene",
|
|
24
|
-
...(timezone === undefined ? {} : { timezone }),
|
|
18
|
+
const { by, chat, source, timezone, limit: typedLimit, saved, } = this.opts();
|
|
19
|
+
const typed = {
|
|
20
|
+
...(by === undefined ? {} : { by }),
|
|
25
21
|
...(chat === undefined ? {} : { chat }),
|
|
26
22
|
...(source === undefined ? {} : { source }),
|
|
27
|
-
|
|
23
|
+
...(timezone === undefined ? {} : { timezone }),
|
|
24
|
+
...(typedLimit === undefined ? {} : { limit: typedLimit }),
|
|
25
|
+
};
|
|
26
|
+
let limit = context.settings.limit;
|
|
27
|
+
const stats = await context.withServices(async (services) => {
|
|
28
|
+
if (saved === undefined)
|
|
29
|
+
return services.messages.stats({
|
|
30
|
+
...typed,
|
|
31
|
+
...(words.length ? { text: words.join(" ") } : {}),
|
|
32
|
+
by: by ?? "chat",
|
|
33
|
+
limit,
|
|
34
|
+
language: "lucene",
|
|
35
|
+
});
|
|
36
|
+
const { id, params } = await services.searches.resolve(saved, { ...typed, text: words.join(" ") });
|
|
37
|
+
if (params.regex || params.language === "legacy")
|
|
38
|
+
throw new CliError("validation_error", "messages stats counts strict Lucene queries; this saved search is legacy");
|
|
39
|
+
limit = params.limit ?? limit;
|
|
40
|
+
return services.messages.stats({
|
|
41
|
+
...(params.text === undefined ? {} : { text: params.text }),
|
|
42
|
+
...(params.ast === undefined ? {} : { ast: params.ast }),
|
|
43
|
+
...(params.chat === undefined ? {} : { chat: params.chat }),
|
|
44
|
+
...(params.source === undefined ? {} : { source: params.source }),
|
|
45
|
+
...(params.timezone === undefined ? {} : { timezone: params.timezone }),
|
|
46
|
+
by: params.by ?? "chat",
|
|
47
|
+
limit,
|
|
48
|
+
language: "lucene",
|
|
49
|
+
saved: id,
|
|
50
|
+
});
|
|
51
|
+
});
|
|
28
52
|
const incomplete = stats.completeness.filter((one) => one.state !== "complete").length;
|
|
29
53
|
if (incomplete > 0)
|
|
30
54
|
context.renderer.note(`${incomplete} of the chats counted are not held in full, so these are lower bounds — \`${messenger.app.command} store fetch <chat>\` fetches one`);
|
|
@@ -41,7 +65,7 @@ export const messagesStatsCommand = (messenger) => new Command("stats")
|
|
|
41
65
|
else
|
|
42
66
|
context.renderer.result({ ...stats, page: 1, limit });
|
|
43
67
|
});
|
|
44
|
-
const groupingOf = (value) => {
|
|
68
|
+
export const groupingOf = (value) => {
|
|
45
69
|
if (!GROUPINGS.includes(value))
|
|
46
70
|
throw new CliError("validation_error", `--by takes ${GROUPINGS.join(", ")}`);
|
|
47
71
|
return value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages-stats-command.js","sourceRoot":"","sources":["../../../src/cli/messenger/messages-stats-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAkB,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/D,MAAM,SAAS,GAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;AAEpE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,SAAoB,EAAW,EAAE,CACpE,IAAI,OAAO,CAAC,OAAO,CAAC;KACjB,WAAW,CACV,+GAA+G,CAChH;KACA,QAAQ,
|
|
1
|
+
{"version":3,"file":"messages-stats-command.js","sourceRoot":"","sources":["../../../src/cli/messenger/messages-stats-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -325,6 +325,30 @@ export interface ChatFolders {
|
|
|
325
325
|
/** The chats in it stay. */
|
|
326
326
|
deleteFolder(folderId: string): Promise<void>;
|
|
327
327
|
}
|
|
328
|
+
/**
|
|
329
|
+
* A state the messenger put the account in, where it is not simply logged in. An adapter reports
|
|
330
|
+
* `frozen` from `health`; the others come as `details.standing` on the error its requests throw.
|
|
331
|
+
* `limited` is a write refused as spam, with no end the messenger reports. Dates are ISO 8601.
|
|
332
|
+
*/
|
|
333
|
+
export interface AccountStanding {
|
|
334
|
+
state: "frozen" | "limited" | "banned" | "deactivated" | "revoked";
|
|
335
|
+
since?: string;
|
|
336
|
+
until?: string;
|
|
337
|
+
appealUrl?: string;
|
|
338
|
+
hint?: string;
|
|
339
|
+
}
|
|
340
|
+
/** What `doctor --online` asks beyond the login. Reads only. */
|
|
341
|
+
export interface AccountHealth {
|
|
342
|
+
health(): Promise<{
|
|
343
|
+
/** Milliseconds since the epoch, as the messenger reported it during this call. */
|
|
344
|
+
serverTime?: number;
|
|
345
|
+
/** 1000 when the messenger counts whole seconds; the round trip adds to it. */
|
|
346
|
+
serverTimeResolutionMs?: number;
|
|
347
|
+
/** False when the messenger could not say whether the account is restricted; it is then `unknown`, never `active`. */
|
|
348
|
+
standingChecked: boolean;
|
|
349
|
+
standing?: AccountStanding;
|
|
350
|
+
}>;
|
|
351
|
+
}
|
|
328
352
|
/**
|
|
329
353
|
* What a messenger does for the shared commands. Each CLI implements it over its own library, and
|
|
330
354
|
* nothing of that library's shape crosses it. A chat is passed as typed — a title, an id, a handle —
|
|
@@ -336,7 +360,7 @@ export interface ChatFolders {
|
|
|
336
360
|
* be held to all of it. A method added from now on goes into a group, never the core, and returns a
|
|
337
361
|
* promise: the wrappers time and pass it through without being told about it (`throughWrapper`).
|
|
338
362
|
*/
|
|
339
|
-
export interface MessengerAdapter extends MessengerCore, Partial<MarkdownFormatting>, Partial<ServerReads>, Partial<ChatReading>, Partial<MessageEditing>, Partial<MessagePins>, Partial<MessageReactions>, Partial<ReadState>, Partial<MessagePolls>, Partial<ThreadAddressing>, Partial<ForumControl>, Partial<LiveUpdates>, Partial<PushedHistory>, Partial<MessageMedia>, Partial<ScheduledMessages>, Partial<MessagePermalinks>, Partial<GroupModeration>, Partial<AccountTools>, Partial<GroupAdmin>, Partial<ChatFolders>, Partial<ContactBook>, Partial<AccountEditing> {
|
|
363
|
+
export interface MessengerAdapter extends MessengerCore, Partial<MarkdownFormatting>, Partial<ServerReads>, Partial<ChatReading>, Partial<MessageEditing>, Partial<MessagePins>, Partial<MessageReactions>, Partial<ReadState>, Partial<MessagePolls>, Partial<ThreadAddressing>, Partial<ForumControl>, Partial<LiveUpdates>, Partial<PushedHistory>, Partial<MessageMedia>, Partial<ScheduledMessages>, Partial<MessagePermalinks>, Partial<GroupModeration>, Partial<AccountTools>, Partial<GroupAdmin>, Partial<ChatFolders>, Partial<ContactBook>, Partial<AccountEditing>, Partial<AccountHealth> {
|
|
340
364
|
}
|
|
341
365
|
type Method = (...args: never[]) => unknown;
|
|
342
366
|
/**
|