-
Notifications
You must be signed in to change notification settings - Fork 22
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
Add webpage translation functionality #25
base: main
Are you sure you want to change the base?
Conversation
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.
Thanks so much, this looks great! Just some small nitpicks.
There is also a CHANGELOG.md file where you should mention this.
I can add a test for this later.
I also think there's a slightly cleaner way to enable the HTTPClient to make external HTTP requests, I will think a bit about it.
@@ -1003,6 +1056,18 @@ export class Translator { | |||
return libraryInfoString; | |||
} | |||
|
|||
private async getContentFromWebpage(webpageUrl: string | URL): Promise<string> { | |||
const { statusCode, content, contentType } = | |||
await this.httpClient.sendRequestWithBackoff<string>('GET', webpageUrl.toString()); |
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.
Actually, using this method will leak the DeepL API key to this website (as it's in the headers).
I think a simple way to solve this is to add a method like sendExternalWebRequest
to the httpClient
, that just reimplements sending an HTTP request, using e.g. the proxy config from the client and any options added in the request, and use that for the downloadWebpage
functionality.
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.
I ended up stripping the Authorization header from the request before it gets sent if the request is a webpage request. It seemed more straightforward than making a whole new function. See my other comment.
options, | ||
); | ||
|
||
if (!isDeepLUrl && axiosRequestConfig.headers) { | ||
delete axiosRequestConfig.headers.Authorization; |
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.
This is where I strip the API key if the request is going to an external domain.
@JanEbbing I made the requested changes awhile ago. Pinging you in case you didn't see. |
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.
Manually deleting the API key from the headers seems fine to me. Requesting 2 small changes, then this should be good to go, thanks so much for your work!
Awesome, thanks - as this is a bigger feature we are going through an internal review at the moment. To be consistent with the project standards, could you please squash all commits into a single one and use conventional commit naming ( |
I can do that, although isn't commit squashing done at merge time? |
@JanEbbing |
ba6d044
to
3da0e3d
Compare
When will this be merged? It's a great feature! |
@JanEbbing Do you plan on merging this at any point? |
This is implementing the enhancement from #21. Closes #21.