Skip to content

refactor: Remove meteor/http for serverFetch #29038

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.

Sign up for GitHub

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
ggazzo merged 1 commit into from
Apr 25, 2023
Merged

refactor: Remove meteor/http for serverFetch #29038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 23 additions & 33 deletions apps/meteor/app/autotranslate/server/deeplTranslate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/

import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { HTTP } from 'meteor/http';
import _ from 'underscore';
import type {
IMessage,
Expand All @@ -13,6 +12,7 @@ import type {
ITranslationResult,
ISupportedLanguage,
} from '@rocket.chat/core-typings';
import { serverFetch as fetch } from '@rocket.chat/server-fetch';

@ggazzo ggazzo Apr 25, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is not the ideia of exporting serverFetch avoid use the same fetch name? why not keep serverFetch everywhere?

@KevLehman KevLehman Apr 25, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think it's more a preference thing. Part of my goal with the exported name is that ppl using it remember is not the standard fetch.

Renaming it to fetch also makes "easier" to move away from it when we use node's built in fetch in the future.


import { TranslationProviderRegistry, AutoTranslate } from './autotranslate';
import { SystemLogger } from '../../../server/lib/logger/system';
Expand Down Expand Up @@ -200,31 +200,24 @@ class DeeplAutoTranslate extends AutoTranslate {
const translations: { [k: string]: string } = {};
let msgs = message.msg.split('\n');
msgs = msgs.map((msg) => encodeURIComponent(msg));
const query = `text=${msgs.join('&text=')}`;
const supportedLanguages = await this.getSupportedLanguages('en');
targetLanguages.forEach((language) => {
for await (let language of targetLanguages) {
if (language.indexOf('-') !== -1 && !_.findWhere(supportedLanguages, { language })) {
language = language.substr(0, 2);
}
try {
const result = HTTP.get(this.apiEndPointUrl, {
params: {
auth_key: this.apiKey,
target_lang: language,
},
query,
});
const result = await fetch(this.apiEndPointUrl, { params: { auth_key: this.apiKey, target_lang: language, text: msgs } });

if (!result.ok) {
throw new Error(result.statusText);
}

if (
result.statusCode === 200 &&
result.data &&
result.data.translations &&
Array.isArray(result.data.translations) &&
result.data.translations.length > 0
) {
const body = await result.json();

if (result.status === 200 && body.translations && Array.isArray(body.translations) && body.translations.length > 0) {
// store translation only when the source and target language are different.
// multiple lines might contain different languages => Mix the text between source and detected target if neccessary
const translatedText = result.data.translations
const translatedText = body.translations
.map((translation: IDeepLTranslation, index: number) =>
translation.detected_source_language !== language ? translation.text : msgs[index],
)
Expand All @@ -234,7 +227,7 @@ class DeeplAutoTranslate extends AutoTranslate {
} catch (err) {
SystemLogger.error({ msg: 'Error translating message', err });
}
});
}
return translations;
}

Expand All @@ -247,35 +240,32 @@ class DeeplAutoTranslate extends AutoTranslate {
*/
async _translateAttachmentDescriptions(attachment: MessageAttachment, targetLanguages: string[]): Promise<ITranslationResult> {
const translations: { [k: string]: string } = {};
const query = `text=${encodeURIComponent(attachment.description || attachment.text || '')}`;
const supportedLanguages = await this.getSupportedLanguages('en');
targetLanguages.forEach((language) => {
for await (let language of targetLanguages) {
if (language.indexOf('-') !== -1 && !_.findWhere(supportedLanguages, { language })) {
language = language.substr(0, 2);
}
try {
const result = HTTP.get(this.apiEndPointUrl, {
const result = await fetch(this.apiEndPointUrl, {
params: {
auth_key: this.apiKey,
target_lang: language,
text: encodeURIComponent(attachment.description || attachment.text || ''),
},
query,
});
if (
result.statusCode === 200 &&
result.data &&
result.data.translations &&
Array.isArray(result.data.translations) &&
result.data.translations.length > 0
) {
if (result.data.translations.map((translation: IDeepLTranslation) => translation.detected_source_language).join() !== language) {
translations[language] = result.data.translations.map((translation: IDeepLTranslation) => translation.text);
if (!result.ok) {
throw new Error(result.statusText);
}
const body = await result.json();
if (result.status === 200 && body.translations && Array.isArray(body.translations) && body.translations.length > 0) {
if (body.translations.map((translation: IDeepLTranslation) => translation.detected_source_language).join() !== language) {
translations[language] = body.translations.map((translation: IDeepLTranslation) => translation.text);
}
}
} catch (err) {
SystemLogger.error({ msg: 'Error translating message attachment', err });
}
});
}
return translations;
}
}
Expand Down
55 changes: 28 additions & 27 deletions apps/meteor/app/autotranslate/server/googleTranslate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/

import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { HTTP } from 'meteor/http';
import _ from 'underscore';
import type {
IMessage,
Expand Down Expand Up @@ -130,39 +129,41 @@ class GoogleAutoTranslate extends AutoTranslate {
let msgs = message.msg.split('\n');
msgs = msgs.map((msg) => encodeURIComponent(msg));

const query = `q=${msgs.join('&q=')}`;
const supportedLanguages = await this.getSupportedLanguages('en');

targetLanguages.forEach((language) => {
for await (let language of targetLanguages) {
if (language.indexOf('-') !== -1 && !_.findWhere(supportedLanguages, { language })) {
language = language.substr(0, 2);
}

try {
const result = HTTP.get(this.apiEndPointUrl, {
const result = await fetch(this.apiEndPointUrl, {
params: {
key: this.apiKey,
target: language,
format: 'text',
q: msgs,
},
query,
});
if (!result.ok) {
throw new Error(result.statusText);
}
const body = await result.json();

if (
result.statusCode === 200 &&
result.data &&
result.data.data &&
result.data.data.translations &&
Array.isArray(result.data.data.translations) &&
result.data.data.translations.length > 0
result.status === 200 &&
body.data &&
body.data.translations &&
Array.isArray(body.data.translations) &&
body.data.translations.length > 0
) {
const txt = result.data.data.translations.map((translation: IGoogleTranslation) => translation.translatedText).join('\n');
const txt = body.data.translations.map((translation: IGoogleTranslation) => translation.translatedText).join('\n');
translations[language] = this.deTokenize(Object.assign({}, message, { msg: txt }));
}
} catch (err) {
SystemLogger.error({ msg: 'Error translating message', err });
}
});
}
return translations;
}

Expand All @@ -175,40 +176,40 @@ class GoogleAutoTranslate extends AutoTranslate {
*/
async _translateAttachmentDescriptions(attachment: MessageAttachment, targetLanguages: string[]): Promise<ITranslationResult> {
const translations: { [k: string]: string } = {};
const query = `q=${encodeURIComponent(attachment.description || attachment.text || '')}`;
const supportedLanguages = await this.getSupportedLanguages('en');

targetLanguages.forEach((language) => {
for await (let language of targetLanguages) {
if (language.indexOf('-') !== -1 && !_.findWhere(supportedLanguages, { language })) {
language = language.substr(0, 2);
}

try {
const result = HTTP.get(this.apiEndPointUrl, {
const result = await fetch(this.apiEndPointUrl, {
params: {
key: this.apiKey,
target: language,
format: 'text',
q: encodeURIComponent(attachment.description || attachment.text || ''),
},
query,
});
if (!result.ok) {
throw new Error(result.statusText);
}
const body = await result.json();

if (
result.statusCode === 200 &&
result.data &&
result.data.data &&
result.data.data.translations &&
Array.isArray(result.data.data.translations) &&
result.data.data.translations.length > 0
result.status === 200 &&
body.data &&
body.data.translations &&
Array.isArray(body.data.translations) &&
body.data.translations.length > 0
) {
translations[language] = result.data.data.translations
.map((translation: IGoogleTranslation) => translation.translatedText)
.join('\n');
translations[language] = body.data.translations.map((translation: IGoogleTranslation) => translation.translatedText).join('\n');
}
} catch (err) {
SystemLogger.error({ msg: 'Error translating message', err });
}
});
}
return translations;
}
}
Expand Down
29 changes: 20 additions & 9 deletions apps/meteor/app/autotranslate/server/msTranslate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
*/

import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { HTTP } from 'meteor/http';
import _ from 'underscore';
import type { IMessage, IProviderMetadata, ISupportedLanguage, ITranslationResult, MessageAttachment } from '@rocket.chat/core-typings';
import { serverFetch as fetch } from '@rocket.chat/server-fetch';

import { TranslationProviderRegistry, AutoTranslate } from './autotranslate';
import { msLogger } from './logger';
Expand Down Expand Up @@ -87,10 +87,14 @@ class MsAutoTranslate extends AutoTranslate {
if (this.supportedLanguages[target]) {
return this.supportedLanguages[target];
}
const languages = HTTP.get(this.apiGetLanguages);
this.supportedLanguages[target] = Object.keys(languages.data.translation).map((language) => ({
const request = await fetch(this.apiEndPointUrl);
if (!request.ok) {
throw new Error(request.statusText);
}
const languages = await request.json();
this.supportedLanguages[target] = Object.keys(languages.translation).map((language) => ({
language,
name: languages.data.translation[language].name,
name: languages.translation[language].name,
}));
return this.supportedLanguages[target || 'en'];
}
Expand All @@ -117,21 +121,28 @@ class MsAutoTranslate extends AutoTranslate {
}
return language;
});
const url = `${this.apiEndPointUrl}&to=${targetLanguages.join('&to=')}`;
const result = HTTP.post(url, {
const request = await fetch(this.apiEndPointUrl, {
method: 'POST',
headers: {
'Ocp-Apim-Subscription-Key': this.apiKey,
'Content-Type': 'application/json; charset=UTF-8',
},
data,
body: data,
params: {
to: targetLanguages,
},
});
if (!request.ok) {
throw new Error(request.statusText);
}
const result = await request.json();

if (result.statusCode === 200 && result.data && result.data.length > 0) {
if (request.status === 200 && result.length > 0) {
// store translation only when the source and target language are different.
translations = Object.assign(
{},
...targetLanguages.map((language) => ({
[language]: result.data
[language]: result
.map(
(line: { translations: { to: string; text: string }[] }) =>
line.translations.find((translation) => translation.to === language)?.text,
Expand Down
20 changes: 12 additions & 8 deletions apps/meteor/app/cloud/server/functions/connectWorkspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HTTP } from 'meteor/http';
import { Settings } from '@rocket.chat/models';
import { serverFetch as fetch } from '@rocket.chat/server-fetch';

import { getRedirectUri } from './getRedirectUri';
import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
Expand Down Expand Up @@ -30,30 +30,34 @@ export async function connectWorkspace(token: string) {
const cloudUrl = settings.get('Cloud_Url');
let result;
try {
result = HTTP.post(`${cloudUrl}/api/oauth/clients`, {
const request = await fetch(`${cloudUrl}/api/oauth/clients`, {
method: 'POST',
headers: {
Authorization: `Bearer ${token}`,
},
data: regInfo,
body: regInfo,
});

if (!request.ok) {
throw new Error((await request.json()).error);
}

result = await request.json();
} catch (err: any) {
SystemLogger.error({
msg: 'Failed to Connect with Rocket.Chat Cloud',
url: '/api/oauth/clients',
...(err.response?.data && { cloudError: err.response.data }),
err,
});

return false;
}

const { data } = result;

if (!data) {
if (!result) {
return false;
}

await saveRegistrationData(data);
await saveRegistrationData(result);

return true;
}
Loading