Repository navigation
fix(think): telegramMessenger nativeStreaming option (#2397) #2414
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
2d8f359
fix(think): forward nativeStreaming to the Telegram adapter and allow…
threepointone 35c1b8f
Merge remote-tracking branch 'upstream/main' into fix-2397-telegram-n…
threepointone b9badc1
Merge remote-tracking branch 'upstream/main' into fix-2397-telegram-n…
threepointone File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@cloudflare/think": patch | ||
| --- | ||
|
|
||
| Add a `nativeStreaming` option to `telegramMessenger` and forward it to the adapter (#2397). `@chat-adapter/telegram` 4.38 made native draft streaming opt-in, so private-chat replies always posted and edited, with no way to turn drafts back on. `telegramMessenger` also passes `allowUnverifiedWebhooks` when there's no `secretToken`, so `verifyWebhook: false` or a custom `verifyWebhook` no longer throws "secretToken is required in webhook mode" on those adapter versions. Think still refuses a webhook with neither a secret token nor an explicit `verifyWebhook`. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import { createTelegramAdapter } from "@chat-adapter/telegram"; | ||
| import { describe, expect, it, vi } from "vitest"; | ||
| import { telegramMessenger } from "../messengers/telegram"; | ||
|
|
||
| vi.mock("@chat-adapter/telegram", async (importOriginal) => { | ||
| const actual = | ||
| await importOriginal<typeof import("@chat-adapter/telegram")>(); | ||
| return { | ||
| ...actual, | ||
| createTelegramAdapter: vi.fn(actual.createTelegramAdapter) | ||
| }; | ||
| }); | ||
|
|
||
| function lastAdapterConfig(): Record<string, unknown> { | ||
| return vi.mocked(createTelegramAdapter).mock.lastCall?.[0] as Record< | ||
| string, | ||
| unknown | ||
| >; | ||
| } | ||
|
|
||
| describe("telegram messenger adapter config (#2397)", () => { | ||
| it("forwards nativeStreaming to the adapter", () => { | ||
| telegramMessenger({ | ||
| nativeStreaming: true, | ||
| secretToken: "secret", | ||
| token: "token", | ||
| userName: "fake_bot" | ||
| }); | ||
| expect(lastAdapterConfig()).toMatchObject({ nativeStreaming: true }); | ||
|
|
||
| telegramMessenger({ | ||
| secretToken: "secret", | ||
| token: "token", | ||
| userName: "fake_bot" | ||
| }); | ||
| expect(lastAdapterConfig().nativeStreaming).toBeUndefined(); | ||
| }); | ||
|
|
||
| it("allows unverified adapter webhooks only when Think verifies them", () => { | ||
| telegramMessenger({ | ||
| secretToken: "secret", | ||
| token: "token", | ||
| userName: "fake_bot" | ||
| }); | ||
| expect(lastAdapterConfig()).toMatchObject({ | ||
| allowUnverifiedWebhooks: false, | ||
| secretToken: "secret" | ||
| }); | ||
|
|
||
| telegramMessenger({ | ||
| token: "token", | ||
| userName: "fake_bot", | ||
| verifyWebhook: false | ||
| }); | ||
| expect(lastAdapterConfig()).toMatchObject({ | ||
| allowUnverifiedWebhooks: true | ||
| }); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔍 Adapter behavior remains untested
The lockfile installs Telegram adapter 4.31, which predates both new options. These assertions check forwarding, not native drafts or webhook construction under 4.38+.
Was this helpful? React with 👍 or 👎 to provide feedback.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Intentional. Bumping the lockfile to
chat/@chat-adapter/telegram4.38+ changes the privateChat.prototype.drainQueuesignature that Think's recovery drain (#2312) relies on (see #2397), so that belongs in a separate dependency-update PR. What Think controls here is the config it passes the adapter, which these tests cover; draft streaming and webhook validation are the adapter's own behaviour.