@leemour/cli-messaging 0.97.0 → 0.99.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/README.md +8 -7
- package/dist/cli/bot/admins.d.ts +10 -0
- package/dist/cli/bot/admins.d.ts.map +1 -0
- package/dist/cli/bot/admins.js +114 -0
- package/dist/cli/bot/admins.js.map +1 -0
- package/dist/cli/bot/command.d.ts.map +1 -1
- package/dist/cli/bot/command.js +17 -15
- package/dist/cli/bot/command.js.map +1 -1
- package/dist/cli/bot/context.d.ts +2 -0
- package/dist/cli/bot/context.d.ts.map +1 -1
- package/dist/cli/bot/context.js +7 -0
- package/dist/cli/bot/context.js.map +1 -1
- package/dist/cli/bot/messages.d.ts.map +1 -1
- package/dist/cli/bot/messages.js +20 -10
- package/dist/cli/bot/messages.js.map +1 -1
- package/dist/cli/bot/port.d.ts +128 -2
- package/dist/cli/bot/port.d.ts.map +1 -1
- package/dist/cli/bot/port.js.map +1 -1
- package/dist/cli/bot/registry.d.ts +2 -0
- package/dist/cli/bot/registry.d.ts.map +1 -1
- package/dist/cli/bot/registry.js +2 -0
- package/dist/cli/bot/registry.js.map +1 -1
- package/dist/cli/bot/setup.d.ts +9 -0
- package/dist/cli/bot/setup.d.ts.map +1 -0
- package/dist/cli/bot/setup.js +155 -0
- package/dist/cli/bot/setup.js.map +1 -0
- package/dist/cli/bot/updates.d.ts +23 -0
- package/dist/cli/bot/updates.d.ts.map +1 -0
- package/dist/cli/bot/updates.js +61 -0
- package/dist/cli/bot/updates.js.map +1 -0
- package/dist/cli/bot/watch.d.ts +9 -0
- package/dist/cli/bot/watch.d.ts.map +1 -0
- package/dist/cli/bot/watch.js +197 -0
- package/dist/cli/bot/watch.js.map +1 -0
- package/dist/cli/config-command.js +1 -1
- package/dist/cli/config-command.js.map +1 -1
- package/dist/cli/deadline.d.ts.map +1 -1
- package/dist/cli/deadline.js +11 -2
- package/dist/cli/deadline.js.map +1 -1
- package/dist/cli/index.d.ts +5 -2
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +2 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/messenger/admin-moderation-command.js +2 -2
- package/dist/cli/messenger/admin-moderation-command.js.map +1 -1
- package/dist/cli/messenger/context.d.ts +18 -2
- package/dist/cli/messenger/context.d.ts.map +1 -1
- package/dist/cli/messenger/context.js +30 -8
- package/dist/cli/messenger/context.js.map +1 -1
- package/dist/cli/messenger/download-command.d.ts.map +1 -1
- package/dist/cli/messenger/download-command.js +97 -30
- package/dist/cli/messenger/download-command.js.map +1 -1
- package/dist/cli/messenger/guard-commands.js +3 -3
- package/dist/cli/messenger/guard-commands.js.map +1 -1
- package/dist/cli/messenger/messages-command.d.ts.map +1 -1
- package/dist/cli/messenger/messages-command.js +45 -11
- package/dist/cli/messenger/messages-command.js.map +1 -1
- package/dist/cli/messenger/models-command.d.ts +1 -1
- package/dist/cli/messenger/models-command.d.ts.map +1 -1
- package/dist/cli/messenger/models-command.js +64 -3
- package/dist/cli/messenger/models-command.js.map +1 -1
- package/dist/cli/messenger/observed.d.ts.map +1 -1
- package/dist/cli/messenger/observed.js +27 -10
- package/dist/cli/messenger/observed.js.map +1 -1
- package/dist/cli/messenger/port.d.ts +26 -9
- package/dist/cli/messenger/port.d.ts.map +1 -1
- package/dist/cli/messenger/port.js.map +1 -1
- package/dist/cli/messenger/stored.d.ts +3 -2
- package/dist/cli/messenger/stored.d.ts.map +1 -1
- package/dist/cli/messenger/stored.js +75 -33
- package/dist/cli/messenger/stored.js.map +1 -1
- package/dist/cli/messenger/watch-command.d.ts +2 -1
- package/dist/cli/messenger/watch-command.d.ts.map +1 -1
- package/dist/cli/messenger/watch-command.js +11 -2
- package/dist/cli/messenger/watch-command.js.map +1 -1
- package/dist/embeddings/embed.d.ts +22 -0
- package/dist/embeddings/embed.d.ts.map +1 -0
- package/dist/embeddings/embed.js +69 -0
- package/dist/embeddings/embed.js.map +1 -0
- package/dist/embeddings/models.d.ts +33 -0
- package/dist/embeddings/models.d.ts.map +1 -0
- package/dist/embeddings/models.js +85 -0
- package/dist/embeddings/models.js.map +1 -0
- package/dist/index.d.ts +0 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/kit/contract.d.ts +39 -0
- package/dist/kit/contract.d.ts.map +1 -0
- package/dist/kit/contract.js +449 -0
- package/dist/kit/contract.js.map +1 -0
- package/dist/kit/fake.d.ts +16 -0
- package/dist/kit/fake.d.ts.map +1 -0
- package/dist/kit/fake.js +457 -0
- package/dist/kit/fake.js.map +1 -0
- package/dist/kit/index.d.ts +4 -0
- package/dist/kit/index.d.ts.map +1 -0
- package/dist/kit/index.js +4 -0
- package/dist/kit/index.js.map +1 -0
- package/dist/kit/seed.d.ts +38 -0
- package/dist/kit/seed.d.ts.map +1 -0
- package/dist/kit/seed.js +83 -0
- package/dist/kit/seed.js.map +1 -0
- package/dist/mcp/resources.d.ts +6 -1
- package/dist/mcp/resources.d.ts.map +1 -1
- package/dist/mcp/resources.js +15 -5
- package/dist/mcp/resources.js.map +1 -1
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +3 -0
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/tool.d.ts +12 -2
- package/dist/mcp/tool.d.ts.map +1 -1
- package/dist/mcp/tool.js +15 -8
- 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.js +3 -3
- package/dist/mcp/tools/contacts.js.map +1 -1
- package/dist/mcp/tools/inbox.d.ts.map +1 -1
- package/dist/mcp/tools/inbox.js +3 -4
- package/dist/mcp/tools/inbox.js.map +1 -1
- package/dist/mcp/tools/messages.d.ts.map +1 -1
- package/dist/mcp/tools/messages.js +19 -12
- package/dist/mcp/tools/messages.js.map +1 -1
- package/dist/mcp/tools/review.d.ts.map +1 -1
- package/dist/mcp/tools/review.js +3 -4
- package/dist/mcp/tools/review.js.map +1 -1
- package/dist/moderation/check.d.ts +3 -1
- package/dist/moderation/check.d.ts.map +1 -1
- package/dist/moderation/check.js +3 -2
- package/dist/moderation/check.js.map +1 -1
- package/dist/parity/audit.d.ts +11 -9
- package/dist/parity/audit.d.ts.map +1 -1
- package/dist/parity/audit.js +63 -46
- package/dist/parity/audit.js.map +1 -1
- package/dist/parity/bin.js +17 -8
- package/dist/parity/bin.js.map +1 -1
- package/dist/parity/catalogue.d.ts.map +1 -1
- package/dist/parity/catalogue.js +7 -1
- package/dist/parity/catalogue.js.map +1 -1
- package/dist/parity/manifest.d.ts +19 -12
- package/dist/parity/manifest.d.ts.map +1 -1
- package/dist/parity/manifest.js +60 -37
- package/dist/parity/manifest.js.map +1 -1
- package/dist/parity/pages.d.ts +3 -3
- package/dist/parity/pages.d.ts.map +1 -1
- package/dist/parity/pages.js +4 -5
- package/dist/parity/pages.js.map +1 -1
- package/dist/parity/seed.d.ts +11 -0
- package/dist/parity/seed.d.ts.map +1 -0
- package/dist/parity/seed.js +99 -0
- package/dist/parity/seed.js.map +1 -0
- package/dist/parity/wording.d.ts +4 -3
- package/dist/parity/wording.d.ts.map +1 -1
- package/dist/parity/wording.js +21 -10
- package/dist/parity/wording.js.map +1 -1
- package/dist/search/correct.d.ts +25 -0
- package/dist/search/correct.d.ts.map +1 -0
- package/dist/search/correct.js +65 -0
- package/dist/search/correct.js.map +1 -0
- package/dist/search/query.d.ts +7 -2
- package/dist/search/query.d.ts.map +1 -1
- package/dist/search/query.js +12 -8
- package/dist/search/query.js.map +1 -1
- package/dist/search/search.d.ts +27 -0
- package/dist/search/search.d.ts.map +1 -0
- package/dist/search/search.js +65 -0
- package/dist/search/search.js.map +1 -0
- package/dist/sends/guarded.d.ts +12 -0
- package/dist/sends/guarded.d.ts.map +1 -1
- package/dist/sends/guarded.js +24 -2
- package/dist/sends/guarded.js.map +1 -1
- package/dist/services/archive.d.ts +8 -3
- package/dist/services/archive.d.ts.map +1 -1
- package/dist/services/archive.js +24 -3
- package/dist/services/archive.js.map +1 -1
- package/dist/services/chats.d.ts.map +1 -1
- package/dist/services/chats.js +13 -9
- package/dist/services/chats.js.map +1 -1
- package/dist/services/deps.d.ts +13 -0
- package/dist/services/deps.d.ts.map +1 -1
- package/dist/services/deps.js +12 -0
- package/dist/services/deps.js.map +1 -1
- package/dist/services/inbox.d.ts +14 -4
- package/dist/services/inbox.d.ts.map +1 -1
- package/dist/services/inbox.js +55 -14
- package/dist/services/inbox.js.map +1 -1
- package/dist/services/index.d.ts +2 -2
- package/dist/services/index.d.ts.map +1 -1
- package/dist/services/index.js +1 -1
- package/dist/services/index.js.map +1 -1
- package/dist/services/messages.d.ts +51 -6
- package/dist/services/messages.d.ts.map +1 -1
- package/dist/services/messages.js +202 -19
- package/dist/services/messages.js.map +1 -1
- package/dist/services/moderation.d.ts.map +1 -1
- package/dist/services/moderation.js +7 -1
- package/dist/services/moderation.js.map +1 -1
- package/dist/services/people.d.ts.map +1 -1
- package/dist/services/people.js +8 -5
- package/dist/services/people.js.map +1 -1
- package/dist/speech/hearing.d.ts +1 -1
- package/dist/speech/hearing.d.ts.map +1 -1
- package/dist/speech/hearing.js +2 -2
- package/dist/speech/hearing.js.map +1 -1
- package/dist/speech/install.d.ts +8 -1
- package/dist/speech/install.d.ts.map +1 -1
- package/dist/speech/install.js +11 -4
- package/dist/speech/install.js.map +1 -1
- 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/sqlite/accounts.d.ts +1 -0
- package/dist/store/sqlite/accounts.d.ts.map +1 -1
- package/dist/store/sqlite/accounts.js +6 -1
- package/dist/store/sqlite/accounts.js.map +1 -1
- package/dist/store/sqlite/completeness.d.ts +17 -0
- package/dist/store/sqlite/completeness.d.ts.map +1 -0
- package/dist/store/sqlite/completeness.js +30 -0
- package/dist/store/sqlite/completeness.js.map +1 -0
- package/dist/store/sqlite/messages.d.ts +2 -2
- package/dist/store/sqlite/messages.d.ts.map +1 -1
- package/dist/store/sqlite/messages.js +10 -14
- package/dist/store/sqlite/messages.js.map +1 -1
- package/dist/store/sqlite/search-index.d.ts.map +1 -1
- package/dist/store/sqlite/search-index.js +45 -9
- 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 +27 -17
- package/dist/store/sqlite/search.js.map +1 -1
- package/dist/store/sqlite/words.d.ts +83 -0
- package/dist/store/sqlite/words.d.ts.map +1 -0
- package/dist/store/sqlite/words.js +255 -0
- package/dist/store/sqlite/words.js.map +1 -0
- package/dist/store/store.d.ts +40 -0
- package/dist/store/store.d.ts.map +1 -1
- package/dist/store/store.js +19 -2
- package/dist/store/store.js.map +1 -1
- package/package.json +10 -4
- package/parity.json +1136 -389
- package/dist/domain/capabilities.d.ts +0 -22
- package/dist/domain/capabilities.d.ts.map +0 -1
- package/dist/domain/capabilities.js +0 -2
- package/dist/domain/capabilities.js.map +0 -1
|
@@ -1,12 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { CliError } from "@leemour/cli-core";
|
|
2
|
+
import { Command, Option } from "commander";
|
|
3
|
+
import { isTextModelInstalled, placedText, textModelsDirectory } from "../../embeddings/embed.js";
|
|
4
|
+
import { DEFAULT_TEXT_MODEL, TEXT_MODELS, textModel } from "../../embeddings/models.js";
|
|
5
|
+
import { install, installedBytes, installFiles, isInstalled, megabytes, modelPath, modelsDirectory, vadPath, } from "../../speech/install.js";
|
|
3
6
|
import { orderedModels, speechModel, VAD } from "../../speech/models.js";
|
|
4
7
|
import { choose } from "../../speech/transcribe.js";
|
|
5
8
|
import { baseContext } from "../context.js";
|
|
6
9
|
import { listed } from "../paging.js";
|
|
7
10
|
/**
|
|
8
11
|
* Models that run on this machine, by what they work on; `audio` is the speech models behind
|
|
9
|
-
* `messages transcribe --local`. Nothing here talks to the messenger. The folder is shared by every
|
|
12
|
+
* `messages transcribe --local`, `text` the embedding models behind `conversations embed`. Nothing here talks to the messenger. The folder is shared by every
|
|
10
13
|
* messenger CLI, so a model downloaded once serves them all.
|
|
11
14
|
*/
|
|
12
15
|
export const modelsCommand = (messenger) => {
|
|
@@ -65,6 +68,64 @@ export const modelsCommand = (messenger) => {
|
|
|
65
68
|
context.renderer.result({ id: model.id, downloaded: true, works: true, directory });
|
|
66
69
|
}, { unbounded: true });
|
|
67
70
|
});
|
|
71
|
+
const text = models.command("text").description("embedding models for searching conversations by meaning");
|
|
72
|
+
text
|
|
73
|
+
.command("list")
|
|
74
|
+
.description("the embedding models, most suitable first, which are downloaded, and which one is the default")
|
|
75
|
+
.action(async function () {
|
|
76
|
+
const context = baseContext(this, messenger.resolveSettings);
|
|
77
|
+
await context.run(async () => {
|
|
78
|
+
const directory = textModelsDirectory(context.env);
|
|
79
|
+
const items = TEXT_MODELS.map((model) => ({
|
|
80
|
+
id: model.id,
|
|
81
|
+
title: model.title,
|
|
82
|
+
languages: model.languages,
|
|
83
|
+
licence: model.licence,
|
|
84
|
+
size: megabytes(model.files.reduce((sum, file) => sum + file.bytes, 0)),
|
|
85
|
+
downloaded: isTextModelInstalled(model, directory),
|
|
86
|
+
default: model.id === DEFAULT_TEXT_MODEL,
|
|
87
|
+
}));
|
|
88
|
+
if (context.format === "pretty") {
|
|
89
|
+
const line = (item) => `${item.default ? "*" : " "} ${item.id.padEnd(16)} ${item.size.padStart(7)} ${item.downloaded ? "downloaded" : "—".padEnd(10)} ${item.licence}`;
|
|
90
|
+
context.streams.data(`${items.map(line).join("\n")}\n`);
|
|
91
|
+
}
|
|
92
|
+
else if (context.format === "jsonl")
|
|
93
|
+
context.renderer.stream(items);
|
|
94
|
+
else
|
|
95
|
+
context.renderer.result({ ...listed(items), directory });
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
text
|
|
99
|
+
.command("download")
|
|
100
|
+
.argument("<model>", "a model id from `models text list`")
|
|
101
|
+
.addOption(new Option("--accept-terms", "accept the model's licence terms, for a model that has its own"))
|
|
102
|
+
.description("download an embedding model once, checked against the sha256 this version expects")
|
|
103
|
+
.action(async function (id, options) {
|
|
104
|
+
const context = baseContext(this, messenger.resolveSettings);
|
|
105
|
+
await context.run(async () => {
|
|
106
|
+
const model = textModel(id);
|
|
107
|
+
if (model.terms && !options.acceptTerms) {
|
|
108
|
+
throw new CliError("validation_error", `${model.id} comes under the ${model.licence} (${model.terms}): read them, then run this again with --accept-terms`);
|
|
109
|
+
}
|
|
110
|
+
const directory = textModelsDirectory(context.env);
|
|
111
|
+
if (!isTextModelInstalled(model, directory)) {
|
|
112
|
+
context.renderer.note(`${model.id}: ${megabytes(model.files.reduce((sum, file) => sum + file.bytes, 0))} from Hugging Face`);
|
|
113
|
+
await installFiles(placedText(model, directory), { progress: (line) => context.renderer.note(line) });
|
|
114
|
+
}
|
|
115
|
+
context.renderer.note(`${model.id}: loading it once to check it works`);
|
|
116
|
+
const { openEmbedder } = await import("../../embeddings/embed.js");
|
|
117
|
+
const embedder = await openEmbedder(model, directory);
|
|
118
|
+
try {
|
|
119
|
+
const [vector] = await embedder.embed(["check"], "query");
|
|
120
|
+
if (vector?.length !== model.dims)
|
|
121
|
+
throw new CliError("invalid_response", `${model.id} gave a vector of the wrong size`);
|
|
122
|
+
}
|
|
123
|
+
finally {
|
|
124
|
+
await embedder.close();
|
|
125
|
+
}
|
|
126
|
+
context.renderer.result({ id: model.id, downloaded: true, works: true, directory });
|
|
127
|
+
}, { unbounded: true });
|
|
128
|
+
});
|
|
68
129
|
return models;
|
|
69
130
|
};
|
|
70
131
|
//# sourceMappingURL=models-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models-command.js","sourceRoot":"","sources":["../../../src/cli/messenger/models-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"models-command.js","sourceRoot":"","sources":["../../../src/cli/messenger/models-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observed.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/observed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAE,KAAK,gBAAgB,EAAkB,MAAM,WAAW,CAAA;AAIjE;;;GAGG;AACH,eAAO,MAAM,QAAQ,cAAe,gBAAgB,UAAU,SAAS,KAAG,
|
|
1
|
+
{"version":3,"file":"observed.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/observed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAE,KAAK,gBAAgB,EAAkB,MAAM,WAAW,CAAA;AAIjE;;;GAGG;AACH,eAAO,MAAM,QAAQ,cAAe,gBAAgB,UAAU,SAAS,KAAG,gBAuIzE,CAAA"}
|
|
@@ -33,23 +33,40 @@ export const observed = (messenger, events) => {
|
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
const mint = messenger.newSendId;
|
|
36
|
+
const { chats, history, contact, around } = messenger;
|
|
36
37
|
// A method not listed here is timed under its own name, with no ids until a line here names them.
|
|
37
38
|
return throughWrapper(messenger, {
|
|
38
39
|
self: () => messenger.self(),
|
|
39
40
|
...(mint ? { newSendId: () => mint.call(messenger) } : {}),
|
|
40
41
|
me: () => timed("account.me", {}, () => messenger.me()),
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
...(chats
|
|
43
|
+
? {
|
|
44
|
+
chats: (window) => timed("chats.list", {}, () => chats.call(messenger, window), (page) => ({ counts: { chats: page.items.length } })),
|
|
45
|
+
}
|
|
46
|
+
: {}),
|
|
47
|
+
...(history
|
|
48
|
+
? {
|
|
49
|
+
history: (reference, options) => timed("messages.list", {}, () => history.call(messenger, reference, options), (page) => ({
|
|
50
|
+
...(page.items[0] ? { ids: { chat: page.items[0].chatId } } : {}),
|
|
51
|
+
counts: { messages: page.items.length },
|
|
52
|
+
})),
|
|
53
|
+
}
|
|
54
|
+
: {}),
|
|
46
55
|
resolve: (reference) => timed("chats.resolve", {}, () => messenger.resolve(reference), (chat) => ({ ids: { chat: chat.id } })),
|
|
47
56
|
chat: (reference) => timed("chats.show", {}, () => messenger.chat(reference), (card) => ({ ids: { chat: card.id }, ...(card.members ? { counts: { members: card.members.length } } : {}) })),
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
57
|
+
...(contact
|
|
58
|
+
? {
|
|
59
|
+
contact: (reference) => timed("contacts.show", {}, () => contact.call(messenger, reference), (card) => ({ ids: { person: card.id }, counts: { chats: card.chats.length } })),
|
|
60
|
+
}
|
|
61
|
+
: {}),
|
|
62
|
+
...(around
|
|
63
|
+
? {
|
|
64
|
+
around: (reference, messageId, window) => timed("messages.around", { ids: { message: messageId } }, () => around.call(messenger, reference, messageId, window), (items) => ({
|
|
65
|
+
...(items[0] ? { ids: { chat: items[0].chatId, message: messageId } } : {}),
|
|
66
|
+
counts: { messages: items.length },
|
|
67
|
+
})),
|
|
68
|
+
}
|
|
69
|
+
: {}),
|
|
53
70
|
send: (chatId, text, options) => timed("messages.send", { ids: { chat: chatId, send: options.sendId, ...(options.replyTo ? { reply: options.replyTo } : {}) } }, () => messenger.send(chatId, text, options), (sent) => ({ ids: { message: sent.message.id } })),
|
|
54
71
|
...(messenger.watch
|
|
55
72
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observed.js","sourceRoot":"","sources":["../../../src/cli/messenger/observed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAkB,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAyB,cAAc,EAAE,MAAM,WAAW,CAAA;AAIjE;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,SAA2B,EAAE,MAAiB,EAAoB,EAAE;IAC3F,MAAM,KAAK,GAAG,KAAK,EAAK,SAAiB,EAAE,KAAY,EAAE,IAAsB,EAAE,KAA4B,EAAE,EAAE;QAC/G,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAA;QAChC,MAAM,MAAM,GAAG,CAAC,IAAI,GAAU,EAAE,EAAS,EAAE,CACzC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,CAAA;QAClF,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACzD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QACjC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAA;QAChE,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;YAC3B,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAA;YAC7G,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACtG,MAAM,CAAC;gBACL,KAAK,EAAE,UAAU;gBACjB,SAAS;gBACT,UAAU,EAAE,UAAU,EAAE;gBACxB,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB;gBAC/D,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,GAAG,MAAM,EAAE;aACZ,CAAC,CAAA;YACF,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC,CAAA;IAED,MAAM,IAAI,GAAG,SAAS,CAAC,SAAS,CAAA;IAChC,kGAAkG;IAClG,OAAO,cAAc,CACnB,SAAS,EACT;QACE,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE;QAC5B,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;QACvD,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAChB,KAAK,CACH,YAAY,EACZ,EAAE,EACF,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"observed.js","sourceRoot":"","sources":["../../../src/cli/messenger/observed.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,7 @@ export interface Sent {
|
|
|
55
55
|
/** The send's identity. Repeat it after an unknown outcome, never a new one. */
|
|
56
56
|
sendId: string;
|
|
57
57
|
}
|
|
58
|
-
/** What every messenger does:
|
|
58
|
+
/** What every messenger does: `messages send` and the account and chat lookups stand on these. */
|
|
59
59
|
export interface MessengerCore {
|
|
60
60
|
/** The logged-in account's id, from what is stored locally — no request. `null` before a login. */
|
|
61
61
|
self(): Id | null;
|
|
@@ -65,6 +65,19 @@ export interface MessengerCore {
|
|
|
65
65
|
*/
|
|
66
66
|
newSendId?(): string;
|
|
67
67
|
me(): Promise<Account>;
|
|
68
|
+
resolve(chat: string): Promise<Chat>;
|
|
69
|
+
/** One chat and who is in it; `members` is `null` where the messenger does not say — a channel, a hidden list. */
|
|
70
|
+
chat(chat: string): Promise<ChatCard>;
|
|
71
|
+
/** An option the messenger has no way to honour is refused, never dropped. */
|
|
72
|
+
send(chatId: Id, text: string, options: SendOptions): Promise<Sent>;
|
|
73
|
+
logout(): Promise<void>;
|
|
74
|
+
close(): Promise<void>;
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Reads the messenger answers from its server. A messenger whose history is pushed to it
|
|
78
|
+
* (`Messenger.history: "store"`) leaves them out: the services answer those reads from the store.
|
|
79
|
+
*/
|
|
80
|
+
export interface ServerReads {
|
|
68
81
|
chats(window: {
|
|
69
82
|
limit?: number;
|
|
70
83
|
offset: number;
|
|
@@ -78,9 +91,6 @@ export interface MessengerCore {
|
|
|
78
91
|
before?: string;
|
|
79
92
|
reactions?: false;
|
|
80
93
|
}): Promise<Page<Message>>;
|
|
81
|
-
resolve(chat: string): Promise<Chat>;
|
|
82
|
-
/** One chat and who is in it; `members` is `null` where the messenger does not say — a channel, a hidden list. */
|
|
83
|
-
chat(chat: string): Promise<ChatCard>;
|
|
84
94
|
/** One person and the chats this account shares with them, newest first. A chat that is not a person is refused. */
|
|
85
95
|
contact(person: string): Promise<PersonCard>;
|
|
86
96
|
/** One message and up to `before` and `after` either side, oldest first; the one asked for carries `anchor`. */
|
|
@@ -88,10 +98,6 @@ export interface MessengerCore {
|
|
|
88
98
|
before: number;
|
|
89
99
|
after: number;
|
|
90
100
|
}): Promise<WindowedMessage[]>;
|
|
91
|
-
/** An option the messenger has no way to honour is refused, never dropped. */
|
|
92
|
-
send(chatId: Id, text: string, options: SendOptions): Promise<Sent>;
|
|
93
|
-
logout(): Promise<void>;
|
|
94
|
-
close(): Promise<void>;
|
|
95
101
|
}
|
|
96
102
|
/** Reading beyond the core: forward from a point, back from a moment, a forum's topics, where a link leads. */
|
|
97
103
|
export interface ChatReading {
|
|
@@ -171,6 +177,17 @@ export interface LiveUpdates {
|
|
|
171
177
|
*/
|
|
172
178
|
watch(onEvent: (event: MessageEvent) => void, signal: AbortSignal, onReady?: () => void): Promise<void>;
|
|
173
179
|
}
|
|
180
|
+
/** What a messenger pushed in one go: any of chats, the people in them, and past messages of any chats. */
|
|
181
|
+
export interface HistoryBatch {
|
|
182
|
+
chats?: Chat[];
|
|
183
|
+
people?: Member[];
|
|
184
|
+
messages?: Message[];
|
|
185
|
+
}
|
|
186
|
+
/** For a messenger that pushes its history to the client instead of answering for it (`Messenger.history: "store"`). */
|
|
187
|
+
export interface PushedHistory {
|
|
188
|
+
/** Chats, people and past messages as the messenger pushes them, until `signal` aborts. */
|
|
189
|
+
feed(onBatch: (batch: HistoryBatch) => void, signal: AbortSignal): Promise<void>;
|
|
190
|
+
}
|
|
174
191
|
/** A message's files and its speech, fetched from the messenger. */
|
|
175
192
|
export interface MessageMedia {
|
|
176
193
|
/** The files attached to one message, fetched fresh from the messenger: a stored reference may have expired. */
|
|
@@ -288,7 +305,7 @@ export interface ChatFolders {
|
|
|
288
305
|
* be held to all of it. A method added from now on goes into a group, never the core, and returns a
|
|
289
306
|
* promise: the wrappers time and pass it through without being told about it (`throughWrapper`).
|
|
290
307
|
*/
|
|
291
|
-
export interface MessengerAdapter extends MessengerCore, Partial<ChatReading>, Partial<MessageEditing>, Partial<MessagePins>, Partial<MessageReactions>, Partial<ReadState>, Partial<MessagePolls>, Partial<LiveUpdates>, Partial<MessageMedia>, Partial<ScheduledMessages>, Partial<GroupModeration>, Partial<AccountTools>, Partial<GroupAdmin>, Partial<ChatFolders>, Partial<ContactBook>, Partial<AccountEditing> {
|
|
308
|
+
export interface MessengerAdapter extends MessengerCore, Partial<ServerReads>, Partial<ChatReading>, Partial<MessageEditing>, Partial<MessagePins>, Partial<MessageReactions>, Partial<ReadState>, Partial<MessagePolls>, Partial<LiveUpdates>, Partial<PushedHistory>, Partial<MessageMedia>, Partial<ScheduledMessages>, Partial<GroupModeration>, Partial<AccountTools>, Partial<GroupAdmin>, Partial<ChatFolders>, Partial<ContactBook>, Partial<AccountEditing> {
|
|
292
309
|
}
|
|
293
310
|
type Method = (...args: never[]) => unknown;
|
|
294
311
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/port.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,UAAU,EACV,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,MAAM,EACN,YAAY,EACZ,SAAS,EACT,WAAW,EACX,WAAW,EACX,EAAE,EACF,UAAU,EACV,MAAM,EACN,OAAO,EACP,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,cAAc,EACd,IAAI,EACJ,KAAK,EACL,eAAe,EAChB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAEnD,iIAAiI;AACjI,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,0EAA0E;IAC1E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,IAAI,aAAa,CAAC,UAAU,CAAC,CAAA;CACnC;AAED,qGAAqG;AACrG,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,+FAA+F;AAC/F,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,qCAAqC;IACrC,OAAO,CAAC,EAAE,EAAE,CAAA;IACZ,wCAAwC;IACxC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,0EAA0E;IAC1E,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,6EAA6E;IAC7E,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;CACvB;AAED,kGAAkG;AAClG,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,2FAA2F;AAC3F,MAAM,MAAM,KAAK,GAAG;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAEjD,oCAAoC;AACpC,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,OAAO,CAAA;IAClB,gFAAgF;IAChF,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,IAAI;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAA;CACf;AAED,
|
|
1
|
+
{"version":3,"file":"port.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/port.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../src/cli/messenger/port.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../src/cli/messenger/port.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AA0U5C;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAAuB,EACvB,OAAyB,EACzB,IAAI,GAA6E,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAChF,EAAE,CACpB,IAAI,KAAK,CAAC,OAAO,EAAE;IACjB,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAChB,IAAI,GAAG,IAAI,GAAG;YAAE,OAAO,GAAG,CAAC,GAA6B,CAAC,CAAA;QACzD,MAAM,KAAK,GAAG,KAAK,CAAC,GAA6B,CAAY,CAAA;QAC7D,OAAO,OAAO,KAAK,KAAK,UAAU;YAChC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAE,KAA+C,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACrG,CAAC,CAAC,KAAK,CAAA;IACX,CAAC;IACD,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,KAAK;CAC9C,CAAC,CAAA;AAEJ,iFAAiF;AACjF,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,OAAyB,EACzB,MAAS,EACT,IAAY,EACsB,EAAE;IACpC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7B,IAAI,OAAO,KAAK,KAAK,UAAU;QAAE,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,yBAAyB,IAAI,EAAE,CAAC,CAAA;IACxG,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAqC,CAAA;AAChE,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AccountKey, MessageStore } from "../../store/store.js";
|
|
1
|
+
import type { AccountKey, DeletionScope, MessageStore } from "../../store/store.js";
|
|
2
2
|
import type { EventSink } from "../runs/events.js";
|
|
3
3
|
import { type MessengerAdapter } from "./port.js";
|
|
4
4
|
export interface Saving {
|
|
@@ -9,6 +9,7 @@ export interface Saving {
|
|
|
9
9
|
events: EventSink;
|
|
10
10
|
/** Saves still writing, for the closer to wait on: `watch` does not hold the next event for one. */
|
|
11
11
|
pending?: Set<Promise<void>>;
|
|
12
|
+
deletedWithoutChat?: DeletionScope;
|
|
12
13
|
}
|
|
13
14
|
/**
|
|
14
15
|
* The adapter, with what each read answers written to the store. **A failed write never fails the
|
|
@@ -18,5 +19,5 @@ export interface Saving {
|
|
|
18
19
|
* would erase what `chats list` stored. Nor are `chat` and `contact`: a card's member list is not
|
|
19
20
|
* known to be whole, and `saveMembers` replaces the list.
|
|
20
21
|
*/
|
|
21
|
-
export declare const stored: (messenger: MessengerAdapter, { account, store, warn, events, pending }: Saving) => MessengerAdapter;
|
|
22
|
+
export declare const stored: (messenger: MessengerAdapter, { account, store, warn, events, pending, deletedWithoutChat }: Saving) => MessengerAdapter;
|
|
22
23
|
//# sourceMappingURL=stored.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stored.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/stored.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"stored.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/stored.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAiC,KAAK,gBAAgB,EAAkB,MAAM,WAAW,CAAA;AAEhG,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,UAAU,CAAA;IACnB,0GAA0G;IAC1G,KAAK,EAAE,MAAM,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAAA;IAC9C,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B,MAAM,EAAE,SAAS,CAAA;IACjB,oGAAoG;IACpG,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5B,kBAAkB,CAAC,EAAE,aAAa,CAAA;CACnC;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,MAAM,cACN,gBAAgB,iEACoC,MAAM,KACpE,gBAsJF,CAAA"}
|
|
@@ -7,7 +7,7 @@ import { capability, throughWrapper } from "./port.js";
|
|
|
7
7
|
* would erase what `chats list` stored. Nor are `chat` and `contact`: a card's member list is not
|
|
8
8
|
* known to be whole, and `saveMembers` replaces the list.
|
|
9
9
|
*/
|
|
10
|
-
export const stored = (messenger, { account, store, warn, events, pending }) => {
|
|
10
|
+
export const stored = (messenger, { account, store, warn, events, pending, deletedWithoutChat }) => {
|
|
11
11
|
let warned = false;
|
|
12
12
|
const attempt = async (operation, write) => {
|
|
13
13
|
try {
|
|
@@ -27,12 +27,12 @@ export const stored = (messenger, { account, store, warn, events, pending }) =>
|
|
|
27
27
|
pending?.add(saving);
|
|
28
28
|
return saving.finally(() => pending?.delete(saving));
|
|
29
29
|
};
|
|
30
|
+
const { chats, history, around } = messenger;
|
|
30
31
|
// A method not listed here saves nothing and passes through; a lane that should save adds its line.
|
|
31
32
|
return throughWrapper(messenger, {
|
|
32
33
|
self: () => messenger.self(),
|
|
33
34
|
resolve: (reference) => messenger.resolve(reference),
|
|
34
35
|
chat: (reference) => messenger.chat(reference),
|
|
35
|
-
contact: (reference) => messenger.contact(reference),
|
|
36
36
|
logout: () => messenger.logout(),
|
|
37
37
|
close: () => messenger.close(),
|
|
38
38
|
me: async () => {
|
|
@@ -40,45 +40,72 @@ export const stored = (messenger, { account, store, warn, events, pending }) =>
|
|
|
40
40
|
await save("account.me", (opened) => opened.saveAccount(account, { name: me.name }));
|
|
41
41
|
return me;
|
|
42
42
|
},
|
|
43
|
-
chats
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
const page = await messenger.history(reference, options);
|
|
57
|
-
const chatId = page.items[0]?.chatId;
|
|
58
|
-
if (chatId !== undefined) {
|
|
59
|
-
await save("messages.list", (opened) => opened.saveMessages(account, chatId, page.items, { via: "history", seenAt }));
|
|
43
|
+
...(chats
|
|
44
|
+
? {
|
|
45
|
+
chats: async (window) => {
|
|
46
|
+
const page = await chats.call(messenger, window);
|
|
47
|
+
// Only a page that names every chat says the others were left; an empty one is a hiccup.
|
|
48
|
+
const complete = window.offset === 0 && !page.hasMore && page.items.length > 0;
|
|
49
|
+
await save("chats.list", async (opened) => {
|
|
50
|
+
await opened.saveChats(account, page.items);
|
|
51
|
+
if (complete)
|
|
52
|
+
await opened.markChatsLeft(account, page.items.map((chat) => chat.id));
|
|
53
|
+
});
|
|
54
|
+
return page;
|
|
55
|
+
},
|
|
60
56
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
57
|
+
: {}),
|
|
58
|
+
...(history
|
|
59
|
+
? {
|
|
60
|
+
history: async (reference, options) => {
|
|
61
|
+
const seenAt = Date.now();
|
|
62
|
+
const page = await history.call(messenger, reference, options);
|
|
63
|
+
const chatId = page.items[0]?.chatId;
|
|
64
|
+
if (chatId !== undefined) {
|
|
65
|
+
await save("messages.list", (opened) => opened.saveMessages(account, chatId, page.items, { via: "history", seenAt }));
|
|
66
|
+
}
|
|
67
|
+
return page;
|
|
68
|
+
},
|
|
70
69
|
}
|
|
71
|
-
|
|
72
|
-
|
|
70
|
+
: {}),
|
|
71
|
+
...(around
|
|
72
|
+
? {
|
|
73
|
+
around: async (reference, messageId, window) => {
|
|
74
|
+
const seenAt = Date.now();
|
|
75
|
+
const items = await around.call(messenger, reference, messageId, window);
|
|
76
|
+
const chatId = items[0]?.chatId;
|
|
77
|
+
if (chatId !== undefined) {
|
|
78
|
+
const plain = items.map(({ anchor, ...message }) => message);
|
|
79
|
+
await save("messages.around", (opened) => opened.saveMessages(account, chatId, plain, { via: "context", seenAt }));
|
|
80
|
+
}
|
|
81
|
+
return items;
|
|
82
|
+
},
|
|
83
|
+
}
|
|
84
|
+
: {}),
|
|
73
85
|
...(messenger.watch
|
|
74
86
|
? {
|
|
75
87
|
watch: (onEvent, signal, onReady) => messenger.watch?.((event) => {
|
|
76
88
|
const seenAt = Date.now();
|
|
77
|
-
void save("messages.watch", (opened) => keep(opened, account, event, seenAt));
|
|
89
|
+
void save("messages.watch", (opened) => keep(opened, account, event, seenAt, deletedWithoutChat));
|
|
78
90
|
onEvent(event);
|
|
79
91
|
}, signal, onReady) ?? Promise.resolve(),
|
|
80
92
|
}
|
|
81
93
|
: {}),
|
|
94
|
+
...(messenger.feed
|
|
95
|
+
? {
|
|
96
|
+
feed: (onBatch, signal) => {
|
|
97
|
+
// In order: a batch's messages may belong to chats only an earlier batch named.
|
|
98
|
+
let previous = Promise.resolve();
|
|
99
|
+
return (messenger.feed?.((batch) => {
|
|
100
|
+
const saving = previous.then(() => attempt("history.feed", (opened) => fill(opened, account, batch)));
|
|
101
|
+
previous = saving;
|
|
102
|
+
pending?.add(saving);
|
|
103
|
+
void saving.finally(() => pending?.delete(saving));
|
|
104
|
+
onBatch(batch);
|
|
105
|
+
}, signal) ?? Promise.resolve());
|
|
106
|
+
},
|
|
107
|
+
}
|
|
108
|
+
: {}),
|
|
82
109
|
...(messenger.edit
|
|
83
110
|
? {
|
|
84
111
|
edit: async (chatId, messageId, text, options) => {
|
|
@@ -117,8 +144,23 @@ export const stored = (messenger, { account, store, warn, events, pending }) =>
|
|
|
117
144
|
},
|
|
118
145
|
});
|
|
119
146
|
};
|
|
147
|
+
/**
|
|
148
|
+
* A pushed batch as the store keeps it. No `markChatsLeft`: a push names some chats, never all of them.
|
|
149
|
+
* No `seenAt`: a pushed snapshot may be older than a deletion this store already holds.
|
|
150
|
+
*/
|
|
151
|
+
const fill = async (store, account, batch) => {
|
|
152
|
+
if (batch.chats?.length)
|
|
153
|
+
await store.saveChats(account, batch.chats);
|
|
154
|
+
if (batch.people?.length)
|
|
155
|
+
await store.savePeople(account, batch.people);
|
|
156
|
+
const byChat = new Map();
|
|
157
|
+
for (const message of batch.messages ?? [])
|
|
158
|
+
byChat.set(message.chatId, [...(byChat.get(message.chatId) ?? []), message]);
|
|
159
|
+
for (const [chatId, messages] of byChat)
|
|
160
|
+
await store.saveMessages(account, chatId, messages, { via: "history" });
|
|
161
|
+
};
|
|
120
162
|
/** Each change as the store keeps it: a message or an edit upserted, a deletion a tombstone, reactions replaced. */
|
|
121
|
-
const keep = async (store, account, event, seenAt) => {
|
|
163
|
+
const keep = async (store, account, event, seenAt, among) => {
|
|
122
164
|
switch (event.event) {
|
|
123
165
|
case "message":
|
|
124
166
|
case "edit": {
|
|
@@ -127,7 +169,7 @@ const keep = async (store, account, event, seenAt) => {
|
|
|
127
169
|
return;
|
|
128
170
|
}
|
|
129
171
|
case "delete":
|
|
130
|
-
await store.markDeleted(account, [event.messageId], event.chatId === null ? {} : { chatId: event.chatId });
|
|
172
|
+
await store.markDeleted(account, [event.messageId], event.chatId === null ? (among ? { among } : {}) : { chatId: event.chatId });
|
|
131
173
|
return;
|
|
132
174
|
case "reaction":
|
|
133
175
|
await store.saveReactions(account, event.chatId, event.messageId, event.reactions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stored.js","sourceRoot":"","sources":["../../../src/cli/messenger/stored.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"stored.js","sourceRoot":"","sources":["../../../src/cli/messenger/stored.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,8 @@ import { type Messenger, type MessengerContext } from "./context.js";
|
|
|
9
9
|
export declare const watchCommand: (messenger: Messenger) => Command;
|
|
10
10
|
/**
|
|
11
11
|
* Listens until Ctrl-C, SIGTERM, `--timeout` or — with `pipe` — a reader that has gone away.
|
|
12
|
-
* Each ends it normally. Tests hand in `signal` instead of process-wide handlers.
|
|
12
|
+
* Each ends it normally. Tests hand in `signal` instead of process-wide handlers. An adapter with
|
|
13
|
+
* `feed` runs it beside `watch`, so what the messenger pushes reaches the store (`stored`).
|
|
13
14
|
*/
|
|
14
15
|
export declare const listenUntilStopped: (command: Command, context: MessengerContext, messenger: Messenger, onEvent: (event: MessageEvent) => void, { stop, pipe, catchUp, onReady, }: {
|
|
15
16
|
stop: AbortController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch-command.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/watch-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAc,MAAM,wBAAwB,CAAA;AAGtE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAoB,MAAM,cAAc,CAAA;AAEtF;;;;GAIG;AACH,eAAO,MAAM,YAAY,cAAe,SAAS,KAAG,OAkC9C,CAAA;AAEN
|
|
1
|
+
{"version":3,"file":"watch-command.d.ts","sourceRoot":"","sources":["../../../src/cli/messenger/watch-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAc,MAAM,wBAAwB,CAAA;AAGtE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAoB,MAAM,cAAc,CAAA;AAEtF;;;;GAIG;AACH,eAAO,MAAM,YAAY,cAAe,SAAS,KAAG,OAkC9C,CAAA;AAEN;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,YACpB,OAAO,WACP,gBAAgB,aACd,SAAS,WACX,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,qCAMnC;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE,KACpF,OAAO,CAAC,IAAI,CAuCd,CAAA"}
|
|
@@ -43,7 +43,8 @@ export const watchCommand = (messenger) => new Command("watch")
|
|
|
43
43
|
});
|
|
44
44
|
/**
|
|
45
45
|
* Listens until Ctrl-C, SIGTERM, `--timeout` or — with `pipe` — a reader that has gone away.
|
|
46
|
-
* Each ends it normally. Tests hand in `signal` instead of process-wide handlers.
|
|
46
|
+
* Each ends it normally. Tests hand in `signal` instead of process-wide handlers. An adapter with
|
|
47
|
+
* `feed` runs it beside `watch`, so what the messenger pushes reaches the store (`stored`).
|
|
47
48
|
*/
|
|
48
49
|
export const listenUntilStopped = async (command, context, messenger, onEvent, { stop, pipe = false, catchUp = false, onReady = () => context.renderer.note("listening — Ctrl-C to stop"), }) => {
|
|
49
50
|
const given = environmentOf(command).signal;
|
|
@@ -67,7 +68,15 @@ export const listenUntilStopped = async (command, context, messenger, onEvent, {
|
|
|
67
68
|
if (!connection.watch) {
|
|
68
69
|
throw new CliError("validation_error", `${messenger.app.command} cannot listen for new messages`);
|
|
69
70
|
}
|
|
70
|
-
|
|
71
|
+
// A feed that ends early is fine — the push is done; one that fails ends the listening too.
|
|
72
|
+
const failing = (error) => {
|
|
73
|
+
stop.abort();
|
|
74
|
+
throw error;
|
|
75
|
+
};
|
|
76
|
+
await Promise.all([
|
|
77
|
+
connection.watch(onEvent, stop.signal, onReady).catch(failing),
|
|
78
|
+
connection.feed?.(() => { }, stop.signal).catch(failing),
|
|
79
|
+
]);
|
|
71
80
|
}, { listen: true, ...(catchUp ? { catchUp } : {}) });
|
|
72
81
|
}
|
|
73
82
|
finally {
|