diff --git a/apps/meteor/app/2fa/server/code/index.ts b/apps/meteor/app/2fa/server/code/index.ts index cfe7b8ab7d4d4..8242b1c66185e 100644 --- a/apps/meteor/app/2fa/server/code/index.ts +++ b/apps/meteor/app/2fa/server/code/index.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import type { IUser, IMethodConnection } from '@rocket.chat/core-typings'; import { Users } from '@rocket.chat/models'; diff --git a/apps/meteor/app/api/server/definition.ts b/apps/meteor/app/api/server/definition.ts index 9898a33ae27af..c728de5b16be5 100644 --- a/apps/meteor/app/api/server/definition.ts +++ b/apps/meteor/app/api/server/definition.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage } from 'http'; +import type { IncomingMessage } from 'node:http'; import type { IUser, LicenseModule, RequiredField } from '@rocket.chat/core-typings'; import type { Logger } from '@rocket.chat/logger'; diff --git a/apps/meteor/app/api/server/lib/MultipartUploadHandler.ts b/apps/meteor/app/api/server/lib/MultipartUploadHandler.ts index 467cf016d0d68..3f375fc4cd053 100644 --- a/apps/meteor/app/api/server/lib/MultipartUploadHandler.ts +++ b/apps/meteor/app/api/server/lib/MultipartUploadHandler.ts @@ -1,8 +1,8 @@ -import fs from 'fs'; -import { IncomingMessage } from 'http'; -import type { Stream, Transform } from 'stream'; -import { Readable } from 'stream'; -import { pipeline } from 'stream/promises'; +import fs from 'node:fs'; +import { IncomingMessage } from 'node:http'; +import type { Stream, Transform } from 'node:stream'; +import { Readable } from 'node:stream'; +import { pipeline } from 'node:stream/promises'; import { MeteorError } from '@rocket.chat/core-services'; import { Random } from '@rocket.chat/random'; diff --git a/apps/meteor/app/api/server/lib/getUploadFormData.ts b/apps/meteor/app/api/server/lib/getUploadFormData.ts index 12d91c5c4ac91..5e5ae85416d65 100644 --- a/apps/meteor/app/api/server/lib/getUploadFormData.ts +++ b/apps/meteor/app/api/server/lib/getUploadFormData.ts @@ -1,5 +1,5 @@ -import { Readable } from 'stream'; -import { ReadableStream } from 'stream/web'; +import { Readable } from 'node:stream'; +import { ReadableStream } from 'node:stream/web'; import { MeteorError } from '@rocket.chat/core-services'; import type { ValidateFunction } from 'ajv'; diff --git a/apps/meteor/app/api/server/middlewares/remoteAddressMiddleware.ts b/apps/meteor/app/api/server/middlewares/remoteAddressMiddleware.ts index c8fff45bae33f..a91bbafbbeb65 100644 --- a/apps/meteor/app/api/server/middlewares/remoteAddressMiddleware.ts +++ b/apps/meteor/app/api/server/middlewares/remoteAddressMiddleware.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage } from 'http'; +import type { IncomingMessage } from 'node:http'; import type { Context, MiddlewareHandler } from 'hono'; diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts index c93450d937cd0..cf7a9a2d3d1bf 100644 --- a/apps/meteor/app/api/server/v1/misc.ts +++ b/apps/meteor/app/api/server/v1/misc.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import type { IDirectoryChannelResult, IDirectoryUserResult, IRoom, IUser } from '@rocket.chat/core-typings'; import { Settings, Users, WorkspaceCredentials } from '@rocket.chat/models'; diff --git a/apps/meteor/app/apps/server/bridges/listeners.ts b/apps/meteor/app/apps/server/bridges/listeners.ts index 6c3b97e81f0a4..be8ccf3339205 100644 --- a/apps/meteor/app/apps/server/bridges/listeners.ts +++ b/apps/meteor/app/apps/server/bridges/listeners.ts @@ -1,6 +1,6 @@ -import crypto from 'crypto'; -import fs from 'fs'; -import path from 'path'; +import crypto from 'node:crypto'; +import fs from 'node:fs'; +import path from 'node:path'; import type { IAppServerOrchestrator, IAppsRoom, IAppsLivechatRoom, IAppsMessage } from '@rocket.chat/apps'; import type { IPreEmailSentContext } from '@rocket.chat/apps-engine/definition/email'; diff --git a/apps/meteor/app/apps/server/bridges/oauthApps.ts b/apps/meteor/app/apps/server/bridges/oauthApps.ts index ad9d26c24ae4c..d16087cfb5c61 100644 --- a/apps/meteor/app/apps/server/bridges/oauthApps.ts +++ b/apps/meteor/app/apps/server/bridges/oauthApps.ts @@ -1,4 +1,4 @@ -import { randomUUID } from 'crypto'; +import { randomUUID } from 'node:crypto'; import type { IAppServerOrchestrator } from '@rocket.chat/apps'; import { OAuthAppsBridge } from '@rocket.chat/apps/dist/server/bridges/OAuthAppsBridge'; diff --git a/apps/meteor/app/assets/server/assets.ts b/apps/meteor/app/assets/server/assets.ts index 9266f21cc0218..c2008c6b8cbe6 100644 --- a/apps/meteor/app/assets/server/assets.ts +++ b/apps/meteor/app/assets/server/assets.ts @@ -1,5 +1,5 @@ -import crypto from 'crypto'; -import type { ServerResponse, IncomingMessage } from 'http'; +import crypto from 'node:crypto'; +import type { ServerResponse, IncomingMessage } from 'node:http'; import type { IRocketChatAssets, IRocketChatAsset, ISetting } from '@rocket.chat/core-typings'; import { Settings } from '@rocket.chat/models'; diff --git a/apps/meteor/app/cors/server/cors.ts b/apps/meteor/app/cors/server/cors.ts index 5e7909c525dfb..9464762d57d04 100644 --- a/apps/meteor/app/cors/server/cors.ts +++ b/apps/meteor/app/cors/server/cors.ts @@ -1,6 +1,6 @@ -import type http from 'http'; -import type { UrlWithParsedQuery } from 'url'; -import url from 'url'; +import type http from 'node:http'; +import type { UrlWithParsedQuery } from 'node:url'; +import url from 'node:url'; import { Logger } from '@rocket.chat/logger'; import { Meteor } from 'meteor/meteor'; diff --git a/apps/meteor/app/emoji-emojione/lib/generateEmojiIndex.mjs b/apps/meteor/app/emoji-emojione/lib/generateEmojiIndex.mjs index 009ef3dcc8f47..fbed7b93cd9b1 100644 --- a/apps/meteor/app/emoji-emojione/lib/generateEmojiIndex.mjs +++ b/apps/meteor/app/emoji-emojione/lib/generateEmojiIndex.mjs @@ -3,7 +3,7 @@ // before using this script make sure to run: npm i --no-save node-sprite-generator // node --experimental-modules generateEmojiIndex.mjs -import fs from 'fs'; +import fs from 'node:fs'; import nsg from 'node-sprite-generator'; import _ from 'underscore'; import gm from 'gm'; // lgtm[js/unused-local-variable] diff --git a/apps/meteor/app/file-upload/lib/FileUploadBase.ts b/apps/meteor/app/file-upload/lib/FileUploadBase.ts index e6027c833e5da..a9dc82ef46e57 100644 --- a/apps/meteor/app/file-upload/lib/FileUploadBase.ts +++ b/apps/meteor/app/file-upload/lib/FileUploadBase.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import path from 'node:path'; import { UploadFS } from '../../../server/ufs'; diff --git a/apps/meteor/app/file-upload/server/config/AmazonS3.ts b/apps/meteor/app/file-upload/server/config/AmazonS3.ts index 36da7e5feeee9..77a554e46b7af 100644 --- a/apps/meteor/app/file-upload/server/config/AmazonS3.ts +++ b/apps/meteor/app/file-upload/server/config/AmazonS3.ts @@ -1,5 +1,5 @@ -import http from 'http'; -import https from 'https'; +import http from 'node:http'; +import https from 'node:https'; import _ from 'underscore'; diff --git a/apps/meteor/app/file-upload/server/config/FileSystem.ts b/apps/meteor/app/file-upload/server/config/FileSystem.ts index c39cf5807d602..512b2dd175f20 100644 --- a/apps/meteor/app/file-upload/server/config/FileSystem.ts +++ b/apps/meteor/app/file-upload/server/config/FileSystem.ts @@ -1,4 +1,4 @@ -import fsp from 'fs/promises'; +import fsp from 'node:fs/promises'; import { getContentDisposition } from './helper'; import { UploadFS } from '../../../../server/ufs'; diff --git a/apps/meteor/app/file-upload/server/config/GoogleStorage.ts b/apps/meteor/app/file-upload/server/config/GoogleStorage.ts index 7960e1333ec74..fface3fce7d2d 100644 --- a/apps/meteor/app/file-upload/server/config/GoogleStorage.ts +++ b/apps/meteor/app/file-upload/server/config/GoogleStorage.ts @@ -1,5 +1,5 @@ -import http from 'http'; -import https from 'https'; +import http from 'node:http'; +import https from 'node:https'; import _ from 'underscore'; diff --git a/apps/meteor/app/file-upload/server/config/GridFS.ts b/apps/meteor/app/file-upload/server/config/GridFS.ts index bb9dfa5891f26..94c6629e4f245 100644 --- a/apps/meteor/app/file-upload/server/config/GridFS.ts +++ b/apps/meteor/app/file-upload/server/config/GridFS.ts @@ -1,7 +1,7 @@ -import type * as http from 'http'; -import type { TransformCallback, TransformOptions } from 'stream'; -import stream from 'stream'; -import zlib from 'zlib'; +import type * as http from 'node:http'; +import type { TransformCallback, TransformOptions } from 'node:stream'; +import stream from 'node:stream'; +import zlib from 'node:zlib'; import type { IUpload } from '@rocket.chat/core-typings'; import { Logger } from '@rocket.chat/logger'; diff --git a/apps/meteor/app/file-upload/server/config/helper.ts b/apps/meteor/app/file-upload/server/config/helper.ts index f1c465537255c..df07a2ac41bf4 100644 --- a/apps/meteor/app/file-upload/server/config/helper.ts +++ b/apps/meteor/app/file-upload/server/config/helper.ts @@ -1,5 +1,5 @@ -import type http from 'http'; -import URL from 'url'; +import type http from 'node:http'; +import URL from 'node:url'; export const forceDownload = (req: http.IncomingMessage): boolean => { const { query } = URL.parse(req.url || '', true); diff --git a/apps/meteor/app/file-upload/server/lib/FileUpload.ts b/apps/meteor/app/file-upload/server/lib/FileUpload.ts index a368d28586c0c..809a6a9821d1c 100644 --- a/apps/meteor/app/file-upload/server/lib/FileUpload.ts +++ b/apps/meteor/app/file-upload/server/lib/FileUpload.ts @@ -1,13 +1,13 @@ -import { Buffer } from 'buffer'; -import type { WriteStream } from 'fs'; -import fs from 'fs'; -import { unlink, rename, writeFile } from 'fs/promises'; -import type * as http from 'http'; -import type * as https from 'https'; -import stream from 'stream'; -import { finished } from 'stream/promises'; -import URL from 'url'; -import { isArrayBufferView } from 'util/types'; +import { Buffer } from 'node:buffer'; +import type { WriteStream } from 'node:fs'; +import fs from 'node:fs'; +import { unlink, rename, writeFile } from 'node:fs/promises'; +import type * as http from 'node:http'; +import type * as https from 'node:https'; +import stream from 'node:stream'; +import { finished } from 'node:stream/promises'; +import URL from 'node:url'; +import { isArrayBufferView } from 'node:util/types'; import { hashLoginToken } from '@rocket.chat/account-utils'; import { Apps, AppEvents } from '@rocket.chat/apps'; diff --git a/apps/meteor/app/file-upload/server/lib/ranges.ts b/apps/meteor/app/file-upload/server/lib/ranges.ts index 0ac86347ca423..0fedb0e981fac 100644 --- a/apps/meteor/app/file-upload/server/lib/ranges.ts +++ b/apps/meteor/app/file-upload/server/lib/ranges.ts @@ -1,4 +1,4 @@ -import type http from 'http'; +import type http from 'node:http'; import type { IUpload } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/app/file-upload/server/lib/requests.ts b/apps/meteor/app/file-upload/server/lib/requests.ts index b2ae48fbca362..22799b5cb5fae 100644 --- a/apps/meteor/app/file-upload/server/lib/requests.ts +++ b/apps/meteor/app/file-upload/server/lib/requests.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage } from 'http'; +import type { IncomingMessage } from 'node:http'; import { Uploads } from '@rocket.chat/models'; import { WebApp } from 'meteor/webapp'; diff --git a/apps/meteor/app/file-upload/ufs/AmazonS3/server.ts b/apps/meteor/app/file-upload/ufs/AmazonS3/server.ts index 31d60937661de..86fc72c8bf313 100644 --- a/apps/meteor/app/file-upload/ufs/AmazonS3/server.ts +++ b/apps/meteor/app/file-upload/ufs/AmazonS3/server.ts @@ -1,4 +1,4 @@ -import stream from 'stream'; +import stream from 'node:stream'; import { DeleteObjectCommand, diff --git a/apps/meteor/app/file-upload/ufs/Webdav/server.ts b/apps/meteor/app/file-upload/ufs/Webdav/server.ts index e5a8a62b5d059..fd30732ae3c0a 100644 --- a/apps/meteor/app/file-upload/ufs/Webdav/server.ts +++ b/apps/meteor/app/file-upload/ufs/Webdav/server.ts @@ -1,4 +1,4 @@ -import stream from 'stream'; +import stream from 'node:stream'; import type { IUpload } from '@rocket.chat/core-typings'; import { Random } from '@rocket.chat/random'; diff --git a/apps/meteor/app/file/server/file.server.ts b/apps/meteor/app/file/server/file.server.ts index 629684391bcbd..02a5a5b03edf3 100644 --- a/apps/meteor/app/file/server/file.server.ts +++ b/apps/meteor/app/file/server/file.server.ts @@ -1,8 +1,8 @@ -import type { ReadStream } from 'fs'; -import fs from 'fs'; -import fsp from 'fs/promises'; -import path from 'path'; -import { Readable } from 'stream'; +import type { ReadStream } from 'node:fs'; +import fs from 'node:fs'; +import fsp from 'node:fs/promises'; +import path from 'node:path'; +import { Readable } from 'node:stream'; import type { ObjectId } from 'bson'; import { MongoInternals } from 'meteor/mongo'; diff --git a/apps/meteor/app/file/server/functions/sanitizeFileName.ts b/apps/meteor/app/file/server/functions/sanitizeFileName.ts index 5b9ca233cbe07..fb19617afd496 100644 --- a/apps/meteor/app/file/server/functions/sanitizeFileName.ts +++ b/apps/meteor/app/file/server/functions/sanitizeFileName.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import path from 'node:path'; export function sanitizeFileName(fileName: string) { const base = path.basename(fileName); diff --git a/apps/meteor/app/importer-pending-files/server/PendingFileImporter.ts b/apps/meteor/app/importer-pending-files/server/PendingFileImporter.ts index 56aa0293aedb0..35b88c4267138 100644 --- a/apps/meteor/app/importer-pending-files/server/PendingFileImporter.ts +++ b/apps/meteor/app/importer-pending-files/server/PendingFileImporter.ts @@ -1,5 +1,5 @@ -import http from 'http'; -import https from 'https'; +import http from 'node:http'; +import https from 'node:https'; import { api } from '@rocket.chat/core-services'; import type { IImport, MessageAttachment, IUpload, IImporterShortSelection } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts b/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts index 581172a617b96..dcf2d772bd6f1 100644 --- a/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts +++ b/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts @@ -1,4 +1,4 @@ -import fs from 'fs'; +import fs from 'node:fs'; import type { IImport, IImportUser } from '@rocket.chat/core-typings'; import { Settings } from '@rocket.chat/models'; diff --git a/apps/meteor/app/importer/server/methods/downloadPublicImportFile.ts b/apps/meteor/app/importer/server/methods/downloadPublicImportFile.ts index d2da85c7cfd49..a2f60404c4914 100644 --- a/apps/meteor/app/importer/server/methods/downloadPublicImportFile.ts +++ b/apps/meteor/app/importer/server/methods/downloadPublicImportFile.ts @@ -1,6 +1,6 @@ -import fs from 'fs'; -import http from 'http'; -import https from 'https'; +import fs from 'node:fs'; +import http from 'node:http'; +import https from 'node:https'; import { Import } from '@rocket.chat/core-services'; import type { IUser } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/app/importer/server/methods/getImportFileData.ts b/apps/meteor/app/importer/server/methods/getImportFileData.ts index 522a9e8b71249..e029f4c2bfecf 100644 --- a/apps/meteor/app/importer/server/methods/getImportFileData.ts +++ b/apps/meteor/app/importer/server/methods/getImportFileData.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import type { IImportProgress, IImporterSelection } from '@rocket.chat/core-typings'; import type { ServerMethods } from '@rocket.chat/ddp-client'; diff --git a/apps/meteor/app/integrations/server/lib/isolated-vm/buildSandbox.ts b/apps/meteor/app/integrations/server/lib/isolated-vm/buildSandbox.ts index 1bbefb6a2ee7a..16aacd8ae1fa1 100644 --- a/apps/meteor/app/integrations/server/lib/isolated-vm/buildSandbox.ts +++ b/apps/meteor/app/integrations/server/lib/isolated-vm/buildSandbox.ts @@ -1,4 +1,4 @@ -import { EventEmitter } from 'events'; +import { EventEmitter } from 'node:events'; import { serverFetch as fetch, Response } from '@rocket.chat/server-fetch'; import ivm, { type Context } from 'isolated-vm'; diff --git a/apps/meteor/app/irc/server/servers/RFC2813/index.js b/apps/meteor/app/irc/server/servers/RFC2813/index.js index 531338d939827..752c0bc4007f9 100644 --- a/apps/meteor/app/irc/server/servers/RFC2813/index.js +++ b/apps/meteor/app/irc/server/servers/RFC2813/index.js @@ -1,6 +1,6 @@ -import { EventEmitter } from 'events'; -import net from 'net'; -import util from 'util'; +import { EventEmitter } from 'node:events'; +import net from 'node:net'; +import util from 'node:util'; import { Logger } from '@rocket.chat/logger'; diff --git a/apps/meteor/app/lib/server/functions/saveUser/setPasswordUpdater.ts b/apps/meteor/app/lib/server/functions/saveUser/setPasswordUpdater.ts index f9218d64449b3..7f51b451b9002 100644 --- a/apps/meteor/app/lib/server/functions/saveUser/setPasswordUpdater.ts +++ b/apps/meteor/app/lib/server/functions/saveUser/setPasswordUpdater.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import type { IUser } from '@rocket.chat/core-typings'; import type { Updater } from '@rocket.chat/model-typings'; diff --git a/apps/meteor/app/lib/server/lib/validateEmailDomain.js b/apps/meteor/app/lib/server/lib/validateEmailDomain.js index d00a8808e8aee..fbf17b8511b51 100644 --- a/apps/meteor/app/lib/server/lib/validateEmailDomain.js +++ b/apps/meteor/app/lib/server/lib/validateEmailDomain.js @@ -1,5 +1,5 @@ -import dns from 'dns'; -import util from 'util'; +import dns from 'node:dns'; +import util from 'node:util'; import { validateEmail } from '@rocket.chat/tools'; import { Meteor } from 'meteor/meteor'; diff --git a/apps/meteor/app/lib/server/oauth/facebook.js b/apps/meteor/app/lib/server/oauth/facebook.js index e60dff901d69c..ee982c462055e 100644 --- a/apps/meteor/app/lib/server/oauth/facebook.js +++ b/apps/meteor/app/lib/server/oauth/facebook.js @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import { Match, check } from 'meteor/check'; diff --git a/apps/meteor/app/livechat/server/lib/messages.ts b/apps/meteor/app/livechat/server/lib/messages.ts index e04a3f4ddcd72..558aecde98f5c 100644 --- a/apps/meteor/app/livechat/server/lib/messages.ts +++ b/apps/meteor/app/livechat/server/lib/messages.ts @@ -1,5 +1,5 @@ -import dns from 'dns'; -import * as util from 'util'; +import dns from 'node:dns'; +import * as util from 'node:util'; import type { ILivechatVisitor, AtLeast, IMessage, IUser, IOmnichannelRoomInfo, SelectedAgent } from '@rocket.chat/core-typings'; import { LivechatDepartment, Messages } from '@rocket.chat/models'; diff --git a/apps/meteor/app/livechat/server/livechat.ts b/apps/meteor/app/livechat/server/livechat.ts index 8928ee826eaf9..3efc2feb17bd3 100644 --- a/apps/meteor/app/livechat/server/livechat.ts +++ b/apps/meteor/app/livechat/server/livechat.ts @@ -1,4 +1,4 @@ -import url from 'url'; +import url from 'node:url'; import jsdom from 'jsdom'; import mem from 'mem'; diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts index 7dd58f35bed3e..61e4bd7421b88 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts @@ -1,4 +1,4 @@ -import type { ServerResponse } from 'http'; +import type { ServerResponse } from 'node:http'; import type { IUser, IIncomingMessage, IPersonalAccessToken, IRole } from '@rocket.chat/core-typings'; import { CredentialTokens, Rooms, Users, Roles } from '@rocket.chat/models'; diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts index 824b7ec684dcc..edcea9f72794e 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts @@ -1,7 +1,7 @@ -import crypto from 'crypto'; -import querystring from 'querystring'; -import util from 'util'; -import zlib from 'zlib'; +import crypto from 'node:crypto'; +import querystring from 'node:querystring'; +import util from 'node:util'; +import zlib from 'node:zlib'; import { Meteor } from 'meteor/meteor'; diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts index 8d99fa18b70ae..c7bd6d032fb65 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts @@ -1,5 +1,5 @@ -import { EventEmitter } from 'events'; -import zlib from 'zlib'; +import { EventEmitter } from 'node:events'; +import zlib from 'node:zlib'; import type { Logger } from '@rocket.chat/logger'; diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/signature/validateRedirectSignature.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/signature/validateRedirectSignature.ts index 9dd73052b8214..31c57ceb9bf9e 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/signature/validateRedirectSignature.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/signature/validateRedirectSignature.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import type { SAMLRedirectEnvelope } from '../../definition/SAMLEnvelope'; import { SAMLUtils } from '../Utils'; diff --git a/apps/meteor/app/meteor-accounts-saml/server/listener.ts b/apps/meteor/app/meteor-accounts-saml/server/listener.ts index 8747bd59a8714..665be0506531f 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/listener.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/listener.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage, ServerResponse } from 'http'; +import type { IncomingMessage, ServerResponse } from 'node:http'; import bodyParser from 'body-parser'; import express from 'express'; diff --git a/apps/meteor/app/metrics/server/lib/collectMetrics.ts b/apps/meteor/app/metrics/server/lib/collectMetrics.ts index a720e9c5aff70..079e4d1be3692 100644 --- a/apps/meteor/app/metrics/server/lib/collectMetrics.ts +++ b/apps/meteor/app/metrics/server/lib/collectMetrics.ts @@ -1,4 +1,4 @@ -import http from 'http'; +import http from 'node:http'; import { Statistics } from '@rocket.chat/models'; import { tracerSpan } from '@rocket.chat/tracing'; diff --git a/apps/meteor/app/slackbridge/server/RocketAdapter.ts b/apps/meteor/app/slackbridge/server/RocketAdapter.ts index cdf4cd8085af9..5c46d75368dda 100644 --- a/apps/meteor/app/slackbridge/server/RocketAdapter.ts +++ b/apps/meteor/app/slackbridge/server/RocketAdapter.ts @@ -3,7 +3,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ // @ts-nocheck -import util from 'util'; +import util from 'node:util'; import { Messages, Rooms, Users } from '@rocket.chat/models'; import { Random } from '@rocket.chat/random'; diff --git a/apps/meteor/app/slackbridge/server/SlackAdapter.ts b/apps/meteor/app/slackbridge/server/SlackAdapter.ts index 831ca8a67cbce..b02ad32ea13a2 100644 --- a/apps/meteor/app/slackbridge/server/SlackAdapter.ts +++ b/apps/meteor/app/slackbridge/server/SlackAdapter.ts @@ -4,9 +4,9 @@ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ // @ts-nocheck -import http from 'http'; -import https from 'https'; -import url from 'url'; +import http from 'node:http'; +import https from 'node:https'; +import url from 'node:url'; import { Message } from '@rocket.chat/core-services'; import { Messages, Rooms, Users } from '@rocket.chat/models'; diff --git a/apps/meteor/app/statistics/server/lib/statistics.ts b/apps/meteor/app/statistics/server/lib/statistics.ts index c0aadb9965691..8c810acaad70b 100644 --- a/apps/meteor/app/statistics/server/lib/statistics.ts +++ b/apps/meteor/app/statistics/server/lib/statistics.ts @@ -1,5 +1,5 @@ import { log } from 'console'; -import os from 'os'; +import os from 'node:os'; import { Analytics, Team, VideoConf, Presence } from '@rocket.chat/core-services'; import type { IRoom, IStats, ISetting } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/app/theme/server/server.ts b/apps/meteor/app/theme/server/server.ts index d0342df878973..34b71e38a303d 100644 --- a/apps/meteor/app/theme/server/server.ts +++ b/apps/meteor/app/theme/server/server.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import { Settings } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; diff --git a/apps/meteor/app/ui-master/server/inject.ts b/apps/meteor/app/ui-master/server/inject.ts index 47b63db4bb3f8..07423bc8ac5c7 100644 --- a/apps/meteor/app/ui-master/server/inject.ts +++ b/apps/meteor/app/ui-master/server/inject.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import type { NextHandleFunction } from 'connect'; import { Inject } from 'meteor/meteorhacks:inject-initial'; diff --git a/apps/meteor/app/utils/server/functions/isDocker.ts b/apps/meteor/app/utils/server/functions/isDocker.ts index 86471cec24d1f..56d074718d069 100644 --- a/apps/meteor/app/utils/server/functions/isDocker.ts +++ b/apps/meteor/app/utils/server/functions/isDocker.ts @@ -1,4 +1,4 @@ -import fs from 'fs'; +import fs from 'node:fs'; function hasDockerEnv(): boolean { try { diff --git a/apps/meteor/app/version-check/server/functions/getNewUpdates.ts b/apps/meteor/app/version-check/server/functions/getNewUpdates.ts index 60bacbe71c9d4..2d0ce22a3c427 100644 --- a/apps/meteor/app/version-check/server/functions/getNewUpdates.ts +++ b/apps/meteor/app/version-check/server/functions/getNewUpdates.ts @@ -1,4 +1,4 @@ -import os from 'os'; +import os from 'node:os'; import { Settings } from '@rocket.chat/models'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; diff --git a/apps/meteor/app/webdav/server/lib/webdavClientAdapter.ts b/apps/meteor/app/webdav/server/lib/webdavClientAdapter.ts index 43e9bb4642d77..c3d7df2330509 100644 --- a/apps/meteor/app/webdav/server/lib/webdavClientAdapter.ts +++ b/apps/meteor/app/webdav/server/lib/webdavClientAdapter.ts @@ -1,5 +1,5 @@ -import stream from 'stream'; -import type { Readable, Writable } from 'stream'; +import stream from 'node:stream'; +import type { Readable, Writable } from 'node:stream'; import type { WebDAVClient, FileStat, ResponseDataDetailed, WebDAVClientOptions } from 'webdav'; import { createClient } from 'webdav'; diff --git a/apps/meteor/ee/server/apps/orchestrator.js b/apps/meteor/ee/server/apps/orchestrator.js index 0c04100add928..879f4a6160784 100644 --- a/apps/meteor/ee/server/apps/orchestrator.js +++ b/apps/meteor/ee/server/apps/orchestrator.js @@ -1,6 +1,6 @@ -import * as fs from 'fs'; -import * as os from 'os'; -import * as path from 'path'; +import * as fs from 'node:fs'; +import * as os from 'node:os'; +import * as path from 'node:path'; import { registerOrchestrator } from '@rocket.chat/apps'; import { AppManager } from '@rocket.chat/apps/dist/server/AppManager'; diff --git a/apps/meteor/ee/server/apps/storage/AppFileSystemSourceStorage.ts b/apps/meteor/ee/server/apps/storage/AppFileSystemSourceStorage.ts index afd3d16808d77..8aa454545ee69 100644 --- a/apps/meteor/ee/server/apps/storage/AppFileSystemSourceStorage.ts +++ b/apps/meteor/ee/server/apps/storage/AppFileSystemSourceStorage.ts @@ -1,5 +1,5 @@ -import { promises as fs } from 'fs'; -import { join, normalize } from 'path'; +import { promises as fs } from 'node:fs'; +import { join, normalize } from 'node:path'; import { AppSourceStorage } from '@rocket.chat/apps/dist/server/storage/AppSourceStorage'; import type { IAppStorageItem } from '@rocket.chat/apps/dist/server/storage/IAppStorageItem'; diff --git a/apps/meteor/ee/server/local-services/instance/service.ts b/apps/meteor/ee/server/local-services/instance/service.ts index a8dfa5112d1a8..ab056e096c714 100644 --- a/apps/meteor/ee/server/local-services/instance/service.ts +++ b/apps/meteor/ee/server/local-services/instance/service.ts @@ -1,4 +1,4 @@ -import os from 'os'; +import os from 'node:os'; import type { AppStatusReport } from '@rocket.chat/core-services'; import { Apps, License, ServiceClassInternal, Settings } from '@rocket.chat/core-services'; diff --git a/apps/meteor/server/configuration/configureBoilerplate.ts b/apps/meteor/server/configuration/configureBoilerplate.ts index ca5c949c69946..f5687f5a338b0 100644 --- a/apps/meteor/server/configuration/configureBoilerplate.ts +++ b/apps/meteor/server/configuration/configureBoilerplate.ts @@ -1,4 +1,4 @@ -import { createHash } from 'crypto'; +import { createHash } from 'node:crypto'; import { Meteor } from 'meteor/meteor'; import { WebApp, WebAppInternals } from 'meteor/webapp'; diff --git a/apps/meteor/server/email/IMAPInterceptor.ts b/apps/meteor/server/email/IMAPInterceptor.ts index 49bb087493c9b..7cb31b7becf5c 100644 --- a/apps/meteor/server/email/IMAPInterceptor.ts +++ b/apps/meteor/server/email/IMAPInterceptor.ts @@ -1,5 +1,5 @@ -import { EventEmitter } from 'events'; -import { Readable } from 'stream'; +import { EventEmitter } from 'node:events'; +import { Readable } from 'node:stream'; import { EmailInbox } from '@rocket.chat/models'; import type { ImapMessage, ImapMessageBodyInfo } from 'imap'; diff --git a/apps/meteor/server/lib/cas/middleware.ts b/apps/meteor/server/lib/cas/middleware.ts index 48a34d68645f0..2026d51f67e0e 100644 --- a/apps/meteor/server/lib/cas/middleware.ts +++ b/apps/meteor/server/lib/cas/middleware.ts @@ -1,5 +1,5 @@ -import type { IncomingMessage, ServerResponse } from 'http'; -import url from 'url'; +import type { IncomingMessage, ServerResponse } from 'node:http'; +import url from 'node:url'; import { validate } from '@rocket.chat/cas-validate'; import type { ICredentialToken, RequiredField } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/server/lib/dataExport/exportRoomMessagesToFile.ts b/apps/meteor/server/lib/dataExport/exportRoomMessagesToFile.ts index 76befbd38b004..37fbe4d710a06 100644 --- a/apps/meteor/server/lib/dataExport/exportRoomMessagesToFile.ts +++ b/apps/meteor/server/lib/dataExport/exportRoomMessagesToFile.ts @@ -1,4 +1,4 @@ -import { mkdir, writeFile } from 'fs/promises'; +import { mkdir, writeFile } from 'node:fs/promises'; import type { IMessage, IRoom, IUser, MessageAttachment, FileProp, RoomType, IExportOperation } from '@rocket.chat/core-typings'; import { Messages } from '@rocket.chat/models'; diff --git a/apps/meteor/server/lib/dataExport/makeZipFile.ts b/apps/meteor/server/lib/dataExport/makeZipFile.ts index 3b8d5dc030163..5447546e106bd 100644 --- a/apps/meteor/server/lib/dataExport/makeZipFile.ts +++ b/apps/meteor/server/lib/dataExport/makeZipFile.ts @@ -1,4 +1,4 @@ -import { createWriteStream } from 'fs'; +import { createWriteStream } from 'node:fs'; import archiver from 'archiver'; diff --git a/apps/meteor/server/lib/dataExport/processDataDownloads.spec.ts b/apps/meteor/server/lib/dataExport/processDataDownloads.spec.ts index 7f6f432b5cd25..a97c93cbcb09a 100644 --- a/apps/meteor/server/lib/dataExport/processDataDownloads.spec.ts +++ b/apps/meteor/server/lib/dataExport/processDataDownloads.spec.ts @@ -1,4 +1,4 @@ -import fs from 'fs'; +import fs from 'node:fs'; import type { IExportOperation } from '@rocket.chat/core-typings'; import { expect } from 'chai'; diff --git a/apps/meteor/server/lib/dataExport/processDataDownloads.ts b/apps/meteor/server/lib/dataExport/processDataDownloads.ts index 5a41c7d28713e..41f8c693459f3 100644 --- a/apps/meteor/server/lib/dataExport/processDataDownloads.ts +++ b/apps/meteor/server/lib/dataExport/processDataDownloads.ts @@ -1,10 +1,10 @@ -import { createWriteStream } from 'fs'; -import { access, mkdir, rm, writeFile } from 'fs/promises'; +import { randomUUID } from 'node:crypto'; +import { createWriteStream } from 'node:fs'; +import { access, mkdir, rm, writeFile } from 'node:fs/promises'; import type { IExportOperation, IUser, RoomType } from '@rocket.chat/core-typings'; import { Avatars, ExportOperations, UserDataFiles, Subscriptions } from '@rocket.chat/models'; import moment from 'moment'; -import { v4 as uuidv4 } from 'uuid'; import { FileUpload } from '../../../app/file-upload/server'; import { settings } from '../../../app/settings/server'; @@ -200,7 +200,7 @@ const continueExportOperation = async function (exportOperation: IExportOperatio } } - const generatedFileName = uuidv4(); + const generatedFileName = randomUUID(); const zipFolder = settings.get('UserData_FileSystemZipPath')?.trim() || '/tmp/zipFiles'; if (exportOperation.status === 'downloading') { diff --git a/apps/meteor/server/lib/dataExport/sendFile.ts b/apps/meteor/server/lib/dataExport/sendFile.ts index 552e9f43ecc2a..6ae72e74cba29 100644 --- a/apps/meteor/server/lib/dataExport/sendFile.ts +++ b/apps/meteor/server/lib/dataExport/sendFile.ts @@ -1,6 +1,6 @@ -import { mkdir, mkdtemp } from 'fs/promises'; -import { tmpdir } from 'os'; -import path, { join } from 'path'; +import { mkdir, mkdtemp } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import path, { join } from 'node:path'; import type { IUser } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/server/lib/dataExport/uploadZipFile.ts b/apps/meteor/server/lib/dataExport/uploadZipFile.ts index 77a16004bf644..abac817561180 100644 --- a/apps/meteor/server/lib/dataExport/uploadZipFile.ts +++ b/apps/meteor/server/lib/dataExport/uploadZipFile.ts @@ -1,5 +1,5 @@ -import { createReadStream } from 'fs'; -import { stat } from 'fs/promises'; +import { createReadStream } from 'node:fs'; +import { stat } from 'node:fs/promises'; import type { IUser } from '@rocket.chat/core-typings'; import { Users } from '@rocket.chat/models'; diff --git a/apps/meteor/server/lib/fileUtils.ts b/apps/meteor/server/lib/fileUtils.ts index b595b8eab4c77..c60fbb76bf9ba 100644 --- a/apps/meteor/server/lib/fileUtils.ts +++ b/apps/meteor/server/lib/fileUtils.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import path from 'node:path'; import filenamify from 'filenamify'; diff --git a/apps/meteor/server/methods/requestDataDownload.ts b/apps/meteor/server/methods/requestDataDownload.ts index 6d49cb93dcb10..7074c8429947a 100644 --- a/apps/meteor/server/methods/requestDataDownload.ts +++ b/apps/meteor/server/methods/requestDataDownload.ts @@ -1,6 +1,6 @@ -import { mkdtemp } from 'fs/promises'; -import { tmpdir } from 'os'; -import path, { join } from 'path'; +import { mkdtemp } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import path, { join } from 'node:path'; import type { IExportOperation, IUser } from '@rocket.chat/core-typings'; import type { ServerMethods } from '@rocket.chat/ddp-client'; diff --git a/apps/meteor/server/routes/avatar/middlewares/auth.ts b/apps/meteor/server/routes/avatar/middlewares/auth.ts index 958e05379c88a..33cb5cb22ac42 100644 --- a/apps/meteor/server/routes/avatar/middlewares/auth.ts +++ b/apps/meteor/server/routes/avatar/middlewares/auth.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage, ServerResponse } from 'http'; +import type { IncomingMessage, ServerResponse } from 'node:http'; import type { IIncomingMessage } from '@rocket.chat/core-typings'; import type { NextFunction } from 'connect'; diff --git a/apps/meteor/server/routes/avatar/middlewares/browserVersion.ts b/apps/meteor/server/routes/avatar/middlewares/browserVersion.ts index dac619df3b347..9eaf89e1445a2 100644 --- a/apps/meteor/server/routes/avatar/middlewares/browserVersion.ts +++ b/apps/meteor/server/routes/avatar/middlewares/browserVersion.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage, ServerResponse } from 'http'; +import type { IncomingMessage, ServerResponse } from 'node:http'; import type { IIncomingMessage } from '@rocket.chat/core-typings'; import type { NextFunction } from 'connect'; diff --git a/apps/meteor/server/routes/avatar/room.ts b/apps/meteor/server/routes/avatar/room.ts index 4737d607d1b84..9cdb0c17968e9 100644 --- a/apps/meteor/server/routes/avatar/room.ts +++ b/apps/meteor/server/routes/avatar/room.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage, ServerResponse } from 'http'; +import type { IncomingMessage, ServerResponse } from 'node:http'; import type { IIncomingMessage, IRoom, IUpload } from '@rocket.chat/core-typings'; import { Avatars, Rooms } from '@rocket.chat/models'; diff --git a/apps/meteor/server/routes/avatar/user.ts b/apps/meteor/server/routes/avatar/user.ts index 1cc45d9e401dc..e31848ad9c018 100644 --- a/apps/meteor/server/routes/avatar/user.ts +++ b/apps/meteor/server/routes/avatar/user.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage, ServerResponse } from 'http'; +import type { IncomingMessage, ServerResponse } from 'node:http'; import type { IUser } from '@rocket.chat/apps-engine/definition/users'; import type { IIncomingMessage } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/server/routes/avatar/utils.ts b/apps/meteor/server/routes/avatar/utils.ts index 9dbb50719ab13..b7f4bcae4668b 100644 --- a/apps/meteor/server/routes/avatar/utils.ts +++ b/apps/meteor/server/routes/avatar/utils.ts @@ -1,4 +1,4 @@ -import type { ServerResponse } from 'http'; +import type { ServerResponse } from 'node:http'; import { hashLoginToken } from '@rocket.chat/account-utils'; import type { IIncomingMessage, IUpload } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/server/routes/i18n.ts b/apps/meteor/server/routes/i18n.ts index 1bdba1f09cc8e..eb941b33fad37 100644 --- a/apps/meteor/server/routes/i18n.ts +++ b/apps/meteor/server/routes/i18n.ts @@ -1,4 +1,4 @@ -import type { ServerResponse } from 'http'; +import type { ServerResponse } from 'node:http'; import type { IncomingMessage } from 'connect'; import { WebApp } from 'meteor/webapp'; diff --git a/apps/meteor/server/routes/userDataDownload.ts b/apps/meteor/server/routes/userDataDownload.ts index b0c7597e1c553..71a4129f1dc19 100644 --- a/apps/meteor/server/routes/userDataDownload.ts +++ b/apps/meteor/server/routes/userDataDownload.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage, ServerResponse } from 'http'; +import type { IncomingMessage, ServerResponse } from 'node:http'; import { hashLoginToken } from '@rocket.chat/account-utils'; import type { IIncomingMessage, IUser, IUserDataFile } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/server/services/banner/service.ts b/apps/meteor/server/services/banner/service.ts index ec6656961af0b..4784e8bcb20f2 100644 --- a/apps/meteor/server/services/banner/service.ts +++ b/apps/meteor/server/services/banner/service.ts @@ -1,8 +1,9 @@ +import { randomUUID } from 'node:crypto'; + import { api, ServiceClassInternal } from '@rocket.chat/core-services'; import type { IBannerService } from '@rocket.chat/core-services'; import type { BannerPlatform, IBanner, IBannerDismiss, Optional, IUser } from '@rocket.chat/core-typings'; import { Banners, BannersDismiss, Users } from '@rocket.chat/models'; -import { v4 as uuidv4 } from 'uuid'; export class BannerService extends ServiceClassInternal implements IBannerService { protected name = 'banner'; @@ -27,7 +28,7 @@ export class BannerService extends ServiceClassInternal implements IBannerServic } async create(doc: Optional): Promise { - const bannerId = doc._id || uuidv4(); + const bannerId = doc._id || randomUUID(); doc.view.appId = doc.view.appId ?? 'banner-core'; doc.view.viewId = bannerId; diff --git a/apps/meteor/server/services/federation/Settings.ts b/apps/meteor/server/services/federation/Settings.ts index 36305229fc6be..464027f81b861 100644 --- a/apps/meteor/server/services/federation/Settings.ts +++ b/apps/meteor/server/services/federation/Settings.ts @@ -1,6 +1,4 @@ -import crypto from 'crypto'; - -import { v4 as uuidv4 } from 'uuid'; +import crypto from 'node:crypto'; import { settings, settingsRegistry } from '../../../app/settings/server'; @@ -36,7 +34,7 @@ export const addMatrixBridgeFederationSettings = async (): Promise => { section: 'Matrix Bridge', }); - const uniqueId = settings.get('uniqueID') || uuidv4().slice(0, 15).replace(new RegExp('-', 'g'), '_'); + const uniqueId = settings.get('uniqueID') || crypto.randomUUID().slice(0, 15).replaceAll('-', '_'); const homeserverToken = crypto.createHash('sha256').update(`hs_${uniqueId}`).digest('hex'); const applicationServiceToken = crypto.createHash('sha256').update(`as_${uniqueId}`).digest('hex'); diff --git a/apps/meteor/server/services/image/service.ts b/apps/meteor/server/services/image/service.ts index 85b4d2d05f979..8d226949c5175 100644 --- a/apps/meteor/server/services/image/service.ts +++ b/apps/meteor/server/services/image/service.ts @@ -1,5 +1,5 @@ -import type { Readable } from 'stream'; -import stream from 'stream'; +import type { Readable } from 'node:stream'; +import stream from 'node:stream'; import { ServiceClassInternal } from '@rocket.chat/core-services'; import type { IMediaService, ResizeResult } from '@rocket.chat/core-services'; diff --git a/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts b/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts index 3981f02c9bce1..d026e3577140f 100644 --- a/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts +++ b/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts @@ -1,5 +1,5 @@ -import QueryString from 'querystring'; -import URL from 'url'; +import QueryString from 'node:querystring'; +import URL from 'node:url'; import type { MessageAttachment, IMessage, IUser, IOmnichannelRoom, IRoom } from '@rocket.chat/core-typings'; import { isOmnichannelRoom, isQuoteAttachment } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/server/services/nps/service.ts b/apps/meteor/server/services/nps/service.ts index 5c92a33bde016..bdbfeb7bd3799 100644 --- a/apps/meteor/server/services/nps/service.ts +++ b/apps/meteor/server/services/nps/service.ts @@ -1,4 +1,4 @@ -import { createHash } from 'crypto'; +import { createHash } from 'node:crypto'; import type { INPSService, NPSVotePayload, NPSCreatePayload } from '@rocket.chat/core-services'; import { ServiceClassInternal, Banner, NPS, Settings } from '@rocket.chat/core-services'; diff --git a/apps/meteor/server/services/upload/service.ts b/apps/meteor/server/services/upload/service.ts index bf99ca794e8c4..f19b4bb57b72b 100644 --- a/apps/meteor/server/services/upload/service.ts +++ b/apps/meteor/server/services/upload/service.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import type Stream from 'stream'; +import fs from 'node:fs'; +import type Stream from 'node:stream'; import type { IUploadDetails } from '@rocket.chat/apps-engine/definition/uploads/IUploadDetails'; import { api, ServiceClassInternal } from '@rocket.chat/core-services'; diff --git a/apps/meteor/server/settings/misc.ts b/apps/meteor/server/settings/misc.ts index 2af9d9b902903..053dd53f8b832 100644 --- a/apps/meteor/server/settings/misc.ts +++ b/apps/meteor/server/settings/misc.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import { Logger } from '@rocket.chat/logger'; import { Settings } from '@rocket.chat/models'; diff --git a/apps/meteor/server/startup/serverRunning.ts b/apps/meteor/server/startup/serverRunning.ts index 79b2463eb9245..90911769c20db 100644 --- a/apps/meteor/server/startup/serverRunning.ts +++ b/apps/meteor/server/startup/serverRunning.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; // import { Users } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; diff --git a/apps/meteor/server/ufs/ufs-local.spec.ts b/apps/meteor/server/ufs/ufs-local.spec.ts index 6fed2a129fae7..3b9517475ca89 100644 --- a/apps/meteor/server/ufs/ufs-local.spec.ts +++ b/apps/meteor/server/ufs/ufs-local.spec.ts @@ -1,4 +1,4 @@ -import fs from 'fs'; +import fs from 'node:fs'; import { expect } from 'chai'; import { before, beforeEach, afterEach, describe, it } from 'mocha'; diff --git a/apps/meteor/server/ufs/ufs-local.ts b/apps/meteor/server/ufs/ufs-local.ts index a2842696cfee1..c18f4f4c39769 100644 --- a/apps/meteor/server/ufs/ufs-local.ts +++ b/apps/meteor/server/ufs/ufs-local.ts @@ -1,6 +1,6 @@ -import fs from 'fs'; -import { unlink } from 'fs/promises'; -import { isNativeError } from 'util/types'; +import fs from 'node:fs'; +import { unlink } from 'node:fs/promises'; +import { isNativeError } from 'node:util/types'; import type { IUpload } from '@rocket.chat/core-typings'; import mkdirp from 'mkdirp'; diff --git a/apps/meteor/server/ufs/ufs-methods.ts b/apps/meteor/server/ufs/ufs-methods.ts index 55c18f6ca066c..ae68a01c618fd 100644 --- a/apps/meteor/server/ufs/ufs-methods.ts +++ b/apps/meteor/server/ufs/ufs-methods.ts @@ -1,4 +1,4 @@ -import fs from 'fs'; +import fs from 'node:fs'; import type { IUpload } from '@rocket.chat/core-typings'; import { check } from 'meteor/check'; diff --git a/apps/meteor/server/ufs/ufs-server.ts b/apps/meteor/server/ufs/ufs-server.ts index 34b3422981a63..4b528a1a59ff3 100644 --- a/apps/meteor/server/ufs/ufs-server.ts +++ b/apps/meteor/server/ufs/ufs-server.ts @@ -1,8 +1,8 @@ -import domain from 'domain'; -import fs from 'fs'; -import stream from 'stream'; -import URL from 'url'; -import zlib from 'zlib'; +import fs from 'node:fs'; +import stream from 'node:stream'; +import { pipeline } from 'node:stream/promises'; +import URL from 'node:url'; +import zlib from 'node:zlib'; import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; @@ -33,14 +33,6 @@ Meteor.startup(() => { }); }); -// Create domain to handle errors -// and possibly avoid server crashes. -const d = domain.create(); - -d.on('error', (err) => { - console.error(`ufs: ${err.message}`); -}); - // Listen HTTP requests to serve files WebApp.connectHandlers.use(async (req, res, next) => { // Quick check to see if request should be caught @@ -132,7 +124,7 @@ WebApp.connectHandlers.use(async (req, res, next) => { return; } - await d.run(async () => { + try { // Check if the file can be accessed if ((await store.onRead.call(store, fileId, file, req, res)) !== false) { const options: { @@ -267,7 +259,7 @@ WebApp.connectHandlers.use(async (req, res, next) => { headers['Content-Encoding'] = 'gzip'; delete headers['Content-Length']; res.writeHead(status, headers); - ws.pipe(zlib.createGzip()).pipe(res); + await pipeline(ws, zlib.createGzip(), res); return; } // Compress with deflate @@ -275,7 +267,7 @@ WebApp.connectHandlers.use(async (req, res, next) => { headers['Content-Encoding'] = 'deflate'; delete headers['Content-Length']; res.writeHead(status, headers); - ws.pipe(zlib.createDeflate()).pipe(res); + await pipeline(ws, zlib.createDeflate(), res); return; } } @@ -284,12 +276,20 @@ WebApp.connectHandlers.use(async (req, res, next) => { // Send raw data if (!headers['Content-Encoding']) { res.writeHead(status, headers); - ws.pipe(res); + await pipeline(ws, res); } } else { res.end(); } - }); + } catch (err) { + console.error(`ufs: ${err instanceof Error ? err.message : String(err)}`); + if (!res.headersSent) { + res.writeHead(500); + } + if (!res.writableEnded) { + res.end(); + } + } } else { next(); } diff --git a/apps/meteor/server/ufs/ufs-store.ts b/apps/meteor/server/ufs/ufs-store.ts index 3c6d6c983850f..08398f2018471 100644 --- a/apps/meteor/server/ufs/ufs-store.ts +++ b/apps/meteor/server/ufs/ufs-store.ts @@ -1,6 +1,6 @@ -import fs from 'fs'; -import type * as http from 'http'; -import type stream from 'stream'; +import fs from 'node:fs'; +import type * as http from 'node:http'; +import type stream from 'node:stream'; import type { IUpload } from '@rocket.chat/core-typings'; import type { IBaseUploadsModel } from '@rocket.chat/model-typings'; diff --git a/apps/meteor/tests/unit/server/lib/dataExport/uploadZipFile.spec.ts b/apps/meteor/tests/unit/server/lib/dataExport/uploadZipFile.spec.ts index 61a477b40df54..30f849823a6e6 100644 --- a/apps/meteor/tests/unit/server/lib/dataExport/uploadZipFile.spec.ts +++ b/apps/meteor/tests/unit/server/lib/dataExport/uploadZipFile.spec.ts @@ -24,10 +24,10 @@ const { uploadZipFile } = proxyquire.noCallThru().load('../../../../../server/li id: stubs.randomId, }, }, - 'fs/promises': { + 'node:fs/promises': { stat: stubs.stat, }, - 'fs': { + 'node:fs': { createReadStream: stubs.createReadStream, }, '../../../app/file-upload/server': { diff --git a/ee/packages/federation-matrix/src/api/_matrix/media.ts b/ee/packages/federation-matrix/src/api/_matrix/media.ts index c5eeb88fd3cb9..f9ed40a9ebc2a 100644 --- a/ee/packages/federation-matrix/src/api/_matrix/media.ts +++ b/ee/packages/federation-matrix/src/api/_matrix/media.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import type { IUpload } from '@rocket.chat/core-typings'; import { federationSDK } from '@rocket.chat/federation-sdk'; diff --git a/ee/packages/federation-matrix/src/helpers/validateFederatedUsername.ts b/ee/packages/federation-matrix/src/helpers/validateFederatedUsername.ts index f3d4943365dc8..b4d6cf3098395 100644 --- a/ee/packages/federation-matrix/src/helpers/validateFederatedUsername.ts +++ b/ee/packages/federation-matrix/src/helpers/validateFederatedUsername.ts @@ -1,4 +1,4 @@ -import { isIPv4, isIPv6 } from 'net'; +import { isIPv4, isIPv6 } from 'node:net'; import type { UserID } from '@rocket.chat/federation-sdk'; diff --git a/ee/packages/federation-matrix/tests/end-to-end/messaging.spec.ts b/ee/packages/federation-matrix/tests/end-to-end/messaging.spec.ts index bf4ba49cf6bea..ffb0248a4a086 100644 --- a/ee/packages/federation-matrix/tests/end-to-end/messaging.spec.ts +++ b/ee/packages/federation-matrix/tests/end-to-end/messaging.spec.ts @@ -1,4 +1,4 @@ -import * as path from 'path'; +import * as path from 'node:path'; import type { IMessage } from '@rocket.chat/core-typings'; diff --git a/ee/packages/federation-matrix/tests/helper/synapse-client.ts b/ee/packages/federation-matrix/tests/helper/synapse-client.ts index 31be8d92cb78e..c465f36eb1cad 100644 --- a/ee/packages/federation-matrix/tests/helper/synapse-client.ts +++ b/ee/packages/federation-matrix/tests/helper/synapse-client.ts @@ -3,8 +3,8 @@ * This file provides validated federation configuration for federation tests. */ -import * as fs from 'fs'; -import * as path from 'path'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; import { createClient, type MatrixClient, KnownMembership, type Room, type RoomMember, Visibility } from 'matrix-js-sdk'; import { logger } from 'matrix-js-sdk/lib/logger'; diff --git a/ee/packages/license/src/AirGappedRestriction.ts b/ee/packages/license/src/AirGappedRestriction.ts index 1ba3bb1b32990..d35d610d135b2 100644 --- a/ee/packages/license/src/AirGappedRestriction.ts +++ b/ee/packages/license/src/AirGappedRestriction.ts @@ -1,4 +1,4 @@ -import EventEmitter from 'events'; +import EventEmitter from 'node:events'; import { License } from '.'; import { decryptStatsToken } from './token'; diff --git a/ee/packages/license/src/token.ts b/ee/packages/license/src/token.ts index 9a77adbc44183..fa1b9677e0242 100644 --- a/ee/packages/license/src/token.ts +++ b/ee/packages/license/src/token.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import type { ILicenseV3 } from '@rocket.chat/core-typings'; import { verify, sign, getPairs } from '@rocket.chat/jwt'; diff --git a/ee/packages/license/src/validation/validateLicenseUrl.spec.ts b/ee/packages/license/src/validation/validateLicenseUrl.spec.ts index 4b305c595902b..c534fd887c047 100644 --- a/ee/packages/license/src/validation/validateLicenseUrl.spec.ts +++ b/ee/packages/license/src/validation/validateLicenseUrl.spec.ts @@ -2,7 +2,7 @@ * @jest-environment node */ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import { validateLicenseUrl } from './validateLicenseUrl'; import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder'; diff --git a/ee/packages/license/src/validation/validateLicenseUrl.ts b/ee/packages/license/src/validation/validateLicenseUrl.ts index 567b44324931c..b6ba078bc745a 100644 --- a/ee/packages/license/src/validation/validateLicenseUrl.ts +++ b/ee/packages/license/src/validation/validateLicenseUrl.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import type { ILicenseV3, BehaviorWithContext, LicenseValidationOptions } from '@rocket.chat/core-typings'; diff --git a/ee/packages/media-calls/src/internal/SignalProcessor.ts b/ee/packages/media-calls/src/internal/SignalProcessor.ts index 7ea06dbcc64b7..c02758f8d1a84 100644 --- a/ee/packages/media-calls/src/internal/SignalProcessor.ts +++ b/ee/packages/media-calls/src/internal/SignalProcessor.ts @@ -144,7 +144,7 @@ export class GlobalSignalProcessor { return; } - await Promise.all(calls.map((call) => this.reactToUnknownCall(uid, call, signal).catch(() => null))); + await Promise.allSettled(calls.map((call) => this.reactToUnknownCall(uid, call, signal))); } private async reactToUnknownCall(uid: IUser['_id'], call: IMediaCall, signal: ClientMediaSignalRegister): Promise { diff --git a/ee/packages/media-calls/src/server/CallDirector.ts b/ee/packages/media-calls/src/server/CallDirector.ts index b7fa20bf1225a..6387a373e2bce 100644 --- a/ee/packages/media-calls/src/server/CallDirector.ts +++ b/ee/packages/media-calls/src/server/CallDirector.ts @@ -1,4 +1,4 @@ -import { randomUUID } from 'crypto'; +import { randomUUID } from 'node:crypto'; import type { IMediaCall, diff --git a/ee/packages/media-calls/src/sip/Session.ts b/ee/packages/media-calls/src/sip/Session.ts index 9e81b6630c1ca..c4f5efdeb8c0c 100644 --- a/ee/packages/media-calls/src/sip/Session.ts +++ b/ee/packages/media-calls/src/sip/Session.ts @@ -1,4 +1,4 @@ -import type { Socket } from 'net'; +import type { Socket } from 'node:net'; import type { IMediaCall, MediaCallContact } from '@rocket.chat/core-typings'; import type { ClientMediaSignalBody } from '@rocket.chat/media-signaling'; diff --git a/ee/packages/network-broker/src/NetworkBroker.ts b/ee/packages/network-broker/src/NetworkBroker.ts index 4a3a36c170105..de4b603b15bf9 100644 --- a/ee/packages/network-broker/src/NetworkBroker.ts +++ b/ee/packages/network-broker/src/NetworkBroker.ts @@ -1,4 +1,4 @@ -import Stream from 'stream'; +import Stream from 'node:stream'; import { asyncLocalStorage } from '@rocket.chat/core-services'; import type { CallingOptions, IBroker, IBrokerNode, IServiceMetrics, IServiceClass, EventSignatures } from '@rocket.chat/core-services'; diff --git a/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts b/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts index 6532b1f505724..67b9aa5ab16d9 100644 --- a/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts +++ b/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts @@ -1,4 +1,4 @@ -import { Readable } from 'stream'; +import { Readable } from 'node:stream'; import { ServiceClass, @@ -466,7 +466,7 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT streamParam, details: { // transcript_{company-name}_{date}_{hour}.pdf - name: `${transcriptText}_${data.siteName}_${new Intl.DateTimeFormat('en-US').format(new Date()).replace(/\//g, '-')}_${ + name: `${transcriptText}_${data.siteName}_${new Intl.DateTimeFormat('en-US').format(new Date()).replaceAll('/', '-')}_${ data.visitor?.name || data.visitor?.username || 'Visitor' }.pdf`, type: 'application/pdf', diff --git a/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.fixtures.ts b/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.fixtures.ts index 157ec50b64fb5..70d3641b99f5d 100644 --- a/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.fixtures.ts +++ b/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.fixtures.ts @@ -1,4 +1,4 @@ -import { Buffer } from 'buffer'; +import { Buffer } from 'node:buffer'; import type { ChatTranscriptData, PDFMessage } from '../../types/ChatTranscriptData'; import type { WorkerData } from '../../types/WorkerData'; diff --git a/ee/packages/pdf-worker/src/templates/ChatTranscript/components/Files.tsx b/ee/packages/pdf-worker/src/templates/ChatTranscript/components/Files.tsx index 925a1733272c0..ccf416306e949 100644 --- a/ee/packages/pdf-worker/src/templates/ChatTranscript/components/Files.tsx +++ b/ee/packages/pdf-worker/src/templates/ChatTranscript/components/Files.tsx @@ -1,4 +1,4 @@ -import { Buffer } from 'buffer'; +import { Buffer } from 'node:buffer'; import { View, StyleSheet, Text, Image } from '@react-pdf/renderer'; import colors from '@rocket.chat/fuselage-tokens/colors.json'; diff --git a/ee/packages/pdf-worker/src/templates/ChatTranscript/index.tsx b/ee/packages/pdf-worker/src/templates/ChatTranscript/index.tsx index a336db047d573..32f659bed98fc 100644 --- a/ee/packages/pdf-worker/src/templates/ChatTranscript/index.tsx +++ b/ee/packages/pdf-worker/src/templates/ChatTranscript/index.tsx @@ -1,4 +1,4 @@ -import * as path from 'path'; +import * as path from 'node:path'; import ReactPDF, { Font, Document, Page, StyleSheet } from '@react-pdf/renderer'; import colors from '@rocket.chat/fuselage-tokens/colors.json'; diff --git a/ee/packages/pdf-worker/src/worker.fixtures.ts b/ee/packages/pdf-worker/src/worker.fixtures.ts index b4593459b7b53..79e8ceb8c878c 100644 --- a/ee/packages/pdf-worker/src/worker.fixtures.ts +++ b/ee/packages/pdf-worker/src/worker.fixtures.ts @@ -1,4 +1,4 @@ -import { Buffer } from 'buffer'; +import { Buffer } from 'node:buffer'; import type { WorkerData } from './types/WorkerData'; diff --git a/ee/packages/presence/src/Presence.ts b/ee/packages/presence/src/Presence.ts index 56ac216a25205..e8e76d755f19a 100755 --- a/ee/packages/presence/src/Presence.ts +++ b/ee/packages/presence/src/Presence.ts @@ -47,7 +47,7 @@ export class Presence extends ServiceClass implements IPresence { } // always store the number of connections per instance so we can show correct in the UI - if (diff?.hasOwnProperty('extraInformation.conns')) { + if (diff && Object.hasOwn(diff, 'extraInformation.conns')) { this.connsPerInstance.set(id, diff['extraInformation.conns']); this.peakConnections = Math.max(this.peakConnections, this.getTotalConnections()); diff --git a/packages/account-utils/src/index.ts b/packages/account-utils/src/index.ts index a736232043da9..ce6c23ee4aa77 100644 --- a/packages/account-utils/src/index.ts +++ b/packages/account-utils/src/index.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; export function hashLoginToken(loginToken: string): string { const hash = crypto.createHash('sha256'); diff --git a/packages/agenda/src/Agenda.ts b/packages/agenda/src/Agenda.ts index d9b16d9193ed3..b21c10ae33052 100644 --- a/packages/agenda/src/Agenda.ts +++ b/packages/agenda/src/Agenda.ts @@ -1,4 +1,4 @@ -import { EventEmitter } from 'events'; +import { EventEmitter } from 'node:events'; import debugInitializer from 'debug'; import humanInterval from 'human-interval'; @@ -969,7 +969,7 @@ export class Agenda extends EventEmitter { if (!extraJob) { // Go through each jobName set in 'Agenda.process' and fill the queue with the next jobs for (jobName in this._definitions) { - if (this._definitions.hasOwnProperty(jobName)) { + if (Object.hasOwn(this._definitions, jobName)) { debug('queuing up job to process: [%s]', jobName); void this._jobQueueFilling(jobName); } diff --git a/packages/apps-engine/src/definition/oauth2/IOAuth2.ts b/packages/apps-engine/src/definition/oauth2/IOAuth2.ts index b5d2ca2cd17f9..7a9ab0eb1fd7e 100644 --- a/packages/apps-engine/src/definition/oauth2/IOAuth2.ts +++ b/packages/apps-engine/src/definition/oauth2/IOAuth2.ts @@ -1,4 +1,4 @@ -import type { URL } from 'url'; +import type { URL } from 'node:url'; import type { IConfigurationExtend, IHttp, IModify, IPersistence, IRead } from '../accessors'; import type { IUser } from '../users/IUser'; diff --git a/packages/apps-engine/src/definition/oauth2/OAuth2Client.ts b/packages/apps-engine/src/definition/oauth2/OAuth2Client.ts index 0f8a95b031321..6d2cb70bc563a 100644 --- a/packages/apps-engine/src/definition/oauth2/OAuth2Client.ts +++ b/packages/apps-engine/src/definition/oauth2/OAuth2Client.ts @@ -1,4 +1,4 @@ -import { URL } from 'url'; +import { URL } from 'node:url'; import type { App } from '../App'; import type { IConfigurationExtend, IHttp, IModify, IPersistence, IRead } from '../accessors'; diff --git a/packages/apps/src/server/AppManager.ts b/packages/apps/src/server/AppManager.ts index d24931c7be431..51db8feea41fe 100644 --- a/packages/apps/src/server/AppManager.ts +++ b/packages/apps/src/server/AppManager.ts @@ -1,4 +1,4 @@ -import { Buffer } from 'buffer'; +import { Buffer } from 'node:buffer'; import { AppStatus, AppStatusUtils } from '@rocket.chat/apps-engine/definition/AppStatus'; import type { IAppInfo } from '@rocket.chat/apps-engine/definition/metadata'; diff --git a/packages/apps/src/server/ProxiedApp.ts b/packages/apps/src/server/ProxiedApp.ts index 273b774721ffd..3da36624262f3 100644 --- a/packages/apps/src/server/ProxiedApp.ts +++ b/packages/apps/src/server/ProxiedApp.ts @@ -1,4 +1,4 @@ -import { inspect } from 'util'; +import { inspect } from 'node:util'; import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; import { AppsEngineException } from '@rocket.chat/apps-engine/definition/exceptions'; diff --git a/packages/apps/src/server/accessors/LivechatCreator.ts b/packages/apps/src/server/accessors/LivechatCreator.ts index a40b2e416affe..df51bb1debabb 100644 --- a/packages/apps/src/server/accessors/LivechatCreator.ts +++ b/packages/apps/src/server/accessors/LivechatCreator.ts @@ -1,4 +1,4 @@ -import { randomBytes } from 'crypto'; +import { randomBytes } from 'node:crypto'; import type { ILivechatCreator } from '@rocket.chat/apps-engine/definition/accessors'; import type { IExtraRoomParams } from '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator'; diff --git a/packages/apps/src/server/accessors/UploadCreator.ts b/packages/apps/src/server/accessors/UploadCreator.ts index b21c333dc5076..f33a30f0e4259 100644 --- a/packages/apps/src/server/accessors/UploadCreator.ts +++ b/packages/apps/src/server/accessors/UploadCreator.ts @@ -12,7 +12,7 @@ export class UploadCreator implements IUploadCreator { ) {} public async uploadBuffer(buffer: Buffer, descriptor: IUploadDescriptor): Promise { - if (!descriptor.hasOwnProperty('user') && !descriptor.visitorToken) { + if (!Object.hasOwn(descriptor, 'user') && !descriptor.visitorToken) { descriptor.user = await this.bridges.getUserBridge().doGetAppUser(this.appId); } diff --git a/packages/apps/src/server/compiler/AppCompiler.ts b/packages/apps/src/server/compiler/AppCompiler.ts index 9ae3b12ba67a0..58b7f28f6405b 100644 --- a/packages/apps/src/server/compiler/AppCompiler.ts +++ b/packages/apps/src/server/compiler/AppCompiler.ts @@ -1,4 +1,4 @@ -import * as path from 'path'; +import * as path from 'node:path'; import type { AppManager } from '../AppManager'; import { ProxiedApp } from '../ProxiedApp'; diff --git a/packages/apps/src/server/compiler/AppPackageParser.ts b/packages/apps/src/server/compiler/AppPackageParser.ts index 97018af67bcc9..827f7d2208b0d 100644 --- a/packages/apps/src/server/compiler/AppPackageParser.ts +++ b/packages/apps/src/server/compiler/AppPackageParser.ts @@ -1,10 +1,10 @@ -import * as path from 'path'; +import { randomUUID } from 'node:crypto'; +import * as path from 'node:path'; import type { IAppInfo } from '@rocket.chat/apps-engine/definition/metadata/IAppInfo'; import { ENGINE_VERSION } from '@rocket.chat/apps-engine/definition/version'; import AdmZip from 'adm-zip'; import * as semver from 'semver'; -import { v4 as uuidv4 } from 'uuid'; import { AppImplements } from '.'; import type { IParseAppPackageResult } from './IParseAppPackageResult'; @@ -27,7 +27,7 @@ export class AppPackageParser { info = JSON.parse(infoZip.getData().toString()) as IAppInfo; if (!AppPackageParser.uuid4Regex.test(info.id)) { - info.id = uuidv4(); + info.id = randomUUID(); console.warn( 'WARNING: We automatically generated a uuid v4 id for', info.name, diff --git a/packages/apps/src/server/compiler/modules/networking.ts b/packages/apps/src/server/compiler/modules/networking.ts index d8ed3c8e744b7..55e599e134b32 100644 --- a/packages/apps/src/server/compiler/modules/networking.ts +++ b/packages/apps/src/server/compiler/modules/networking.ts @@ -1,6 +1,6 @@ -import type * as http from 'http'; -import type * as https from 'https'; -import type * as net from 'net'; +import type * as http from 'node:http'; +import type * as https from 'node:https'; +import type * as net from 'node:net'; import { ForbiddenNativeModuleAccess } from '.'; import { PermissionDeniedError } from '../../errors/PermissionDeniedError'; diff --git a/packages/apps/src/server/managers/AppSignatureManager.ts b/packages/apps/src/server/managers/AppSignatureManager.ts index 1b24cd9d7d4da..f41b8eac898b2 100644 --- a/packages/apps/src/server/managers/AppSignatureManager.ts +++ b/packages/apps/src/server/managers/AppSignatureManager.ts @@ -1,4 +1,4 @@ -import { createHash } from 'crypto'; +import { createHash } from 'node:crypto'; import * as jose from 'jose'; diff --git a/packages/apps/src/server/marketplace/license/Crypto.ts b/packages/apps/src/server/marketplace/license/Crypto.ts index a4f92799f3d3e..3881b0979899c 100644 --- a/packages/apps/src/server/marketplace/license/Crypto.ts +++ b/packages/apps/src/server/marketplace/license/Crypto.ts @@ -1,4 +1,4 @@ -import { publicDecrypt } from 'crypto'; +import { publicDecrypt } from 'node:crypto'; import type { IInternalBridge } from '../../bridges'; diff --git a/packages/apps/src/server/misc/UIHelper.ts b/packages/apps/src/server/misc/UIHelper.ts index 398a86124ef56..acfe6d1ffea0c 100644 --- a/packages/apps/src/server/misc/UIHelper.ts +++ b/packages/apps/src/server/misc/UIHelper.ts @@ -1,6 +1,7 @@ +import { randomUUID } from 'node:crypto'; + import type { IBlock } from '@rocket.chat/apps-engine/definition/uikit'; import type { LayoutBlock } from '@rocket.chat/ui-kit'; -import { v4 as uuid } from 'uuid'; export class UIHelper { /** @@ -15,12 +16,12 @@ export class UIHelper { block.appId = appId; } if (!block.blockId) { - block.blockId = uuid(); + block.blockId = randomUUID(); } if (block.elements) { block.elements.forEach((element) => { if (!element.actionId) { - element.actionId = uuid(); + element.actionId = randomUUID(); } }); } diff --git a/packages/apps/src/server/misc/Utilities.ts b/packages/apps/src/server/misc/Utilities.ts index f126d379752e8..3d64dd2c54d85 100644 --- a/packages/apps/src/server/misc/Utilities.ts +++ b/packages/apps/src/server/misc/Utilities.ts @@ -10,7 +10,7 @@ export class Utilities { Object.getOwnPropertyNames(item).forEach((prop: string) => { if ( - item.hasOwnProperty(prop) && + Object.hasOwn(item, prop) && item[prop] !== null && (typeof item[prop] === 'object' || typeof item[prop] === 'function') && !Object.isFrozen(item[prop]) diff --git a/packages/apps/src/server/runtime/AppsEngineNodeRuntime.ts b/packages/apps/src/server/runtime/AppsEngineNodeRuntime.ts index b0cba60c912c1..4dadf1588e87e 100644 --- a/packages/apps/src/server/runtime/AppsEngineNodeRuntime.ts +++ b/packages/apps/src/server/runtime/AppsEngineNodeRuntime.ts @@ -1,5 +1,5 @@ -import * as timers from 'timers'; -import * as vm from 'vm'; +import * as timers from 'node:timers'; +import * as vm from 'node:vm'; import type { App } from '@rocket.chat/apps-engine/definition/App'; diff --git a/packages/apps/src/server/runtime/EmptyRuntime.ts b/packages/apps/src/server/runtime/EmptyRuntime.ts index 6c7b11a778c28..18f2934a98095 100644 --- a/packages/apps/src/server/runtime/EmptyRuntime.ts +++ b/packages/apps/src/server/runtime/EmptyRuntime.ts @@ -1,4 +1,4 @@ -import { EventEmitter } from 'events'; +import { EventEmitter } from 'node:events'; import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; diff --git a/packages/apps/src/server/runtime/IRuntimeController.ts b/packages/apps/src/server/runtime/IRuntimeController.ts index 69791e25e0ab8..5c51ecf4a8b3c 100644 --- a/packages/apps/src/server/runtime/IRuntimeController.ts +++ b/packages/apps/src/server/runtime/IRuntimeController.ts @@ -1,4 +1,4 @@ -import type { EventEmitter } from 'events'; +import type { EventEmitter } from 'node:events'; import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; diff --git a/packages/apps/src/server/runtime/deno/AppsEngineDenoRuntime.ts b/packages/apps/src/server/runtime/deno/AppsEngineDenoRuntime.ts index 82822b0a296d3..acc483f69692c 100644 --- a/packages/apps/src/server/runtime/deno/AppsEngineDenoRuntime.ts +++ b/packages/apps/src/server/runtime/deno/AppsEngineDenoRuntime.ts @@ -1,8 +1,8 @@ -import * as child_process from 'child_process'; -import * as fs from 'fs'; -import * as path from 'path'; -import { type Readable, EventEmitter } from 'stream'; -import { inspect as utilInspect } from 'util'; +import * as child_process from 'node:child_process'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; +import { type Readable, EventEmitter } from 'node:stream'; +import { inspect as utilInspect } from 'node:util'; import { AppStatus, AppStatusUtils } from '@rocket.chat/apps-engine/definition/AppStatus'; import type { AppMethod } from '@rocket.chat/apps-engine/definition/metadata'; diff --git a/packages/apps/src/server/runtime/deno/LivenessManager.ts b/packages/apps/src/server/runtime/deno/LivenessManager.ts index ae9e843add7ca..7b3e9ac83c1a8 100644 --- a/packages/apps/src/server/runtime/deno/LivenessManager.ts +++ b/packages/apps/src/server/runtime/deno/LivenessManager.ts @@ -1,5 +1,5 @@ -import type { ChildProcess } from 'child_process'; -import { EventEmitter } from 'stream'; +import type { ChildProcess } from 'node:child_process'; +import { EventEmitter } from 'node:stream'; import type { DenoRuntimeSubprocessController } from './AppsEngineDenoRuntime'; import type { ProcessMessenger } from './ProcessMessenger'; diff --git a/packages/apps/src/server/runtime/deno/ProcessMessenger.ts b/packages/apps/src/server/runtime/deno/ProcessMessenger.ts index c5c2394e56dfa..b17affd8218d2 100644 --- a/packages/apps/src/server/runtime/deno/ProcessMessenger.ts +++ b/packages/apps/src/server/runtime/deno/ProcessMessenger.ts @@ -1,4 +1,4 @@ -import type { ChildProcess } from 'child_process'; +import type { ChildProcess } from 'node:child_process'; import type { JsonRpc } from 'jsonrpc-lite'; diff --git a/packages/apps/src/server/runtime/deno/bundler.ts b/packages/apps/src/server/runtime/deno/bundler.ts index e6442a336b83c..e80060ab5bb52 100644 --- a/packages/apps/src/server/runtime/deno/bundler.ts +++ b/packages/apps/src/server/runtime/deno/bundler.ts @@ -1,4 +1,4 @@ -import * as path from 'path'; +import * as path from 'node:path'; import { build, type PluginBuild, type OnLoadArgs, type OnResolveArgs } from 'esbuild'; diff --git a/packages/apps/tests/server/runtime/DenoRuntimeSubprocessController.test.ts b/packages/apps/tests/server/runtime/DenoRuntimeSubprocessController.test.ts index 0342261534ad8..df954811aa3ef 100644 --- a/packages/apps/tests/server/runtime/DenoRuntimeSubprocessController.test.ts +++ b/packages/apps/tests/server/runtime/DenoRuntimeSubprocessController.test.ts @@ -1,10 +1,10 @@ /* eslint-disable dot-notation -- we avoid the dot notation here when testing private methods */ -import * as fs from 'fs/promises'; import * as assert from 'node:assert'; +import * as fs from 'node:fs/promises'; +import * as os from 'node:os'; +import * as path from 'node:path'; import { describe, it, afterEach, mock, before, after } from 'node:test'; -import * as os from 'os'; -import * as path from 'path'; import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; import { UserStatusConnection, UserType } from '@rocket.chat/apps-engine/definition/users'; diff --git a/packages/apps/tests/server/runtime/SecureFieldsCodecCompatibility.test.ts b/packages/apps/tests/server/runtime/SecureFieldsCodecCompatibility.test.ts index d865f5de01707..869442e4121d4 100644 --- a/packages/apps/tests/server/runtime/SecureFieldsCodecCompatibility.test.ts +++ b/packages/apps/tests/server/runtime/SecureFieldsCodecCompatibility.test.ts @@ -1,8 +1,8 @@ -import * as fs from 'fs/promises'; import * as assert from 'node:assert'; +import * as fs from 'node:fs/promises'; +import * as os from 'node:os'; +import * as path from 'node:path'; import { describe, it, before, after } from 'node:test'; -import * as os from 'os'; -import * as path from 'path'; import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; import { RoomType } from '@rocket.chat/apps-engine/definition/rooms'; diff --git a/packages/apps/tests/server/runtime/deno/LivenessManager.test.ts b/packages/apps/tests/server/runtime/deno/LivenessManager.test.ts index 9a157d8a123d4..469aebe47ae0d 100644 --- a/packages/apps/tests/server/runtime/deno/LivenessManager.test.ts +++ b/packages/apps/tests/server/runtime/deno/LivenessManager.test.ts @@ -1,7 +1,7 @@ -import type { ChildProcess } from 'child_process'; import * as assert from 'node:assert'; +import type { ChildProcess } from 'node:child_process'; +import { EventEmitter } from 'node:stream'; import { describe, it, beforeEach, afterEach, mock, type Mock } from 'node:test'; -import { EventEmitter } from 'stream'; import debugFactory from 'debug'; diff --git a/packages/apps/tests/test-data/utilities.ts b/packages/apps/tests/test-data/utilities.ts index b9e464d8fa682..df4e0b7da7a2e 100644 --- a/packages/apps/tests/test-data/utilities.ts +++ b/packages/apps/tests/test-data/utilities.ts @@ -1,4 +1,4 @@ -import * as os from 'os'; +import * as os from 'node:os'; import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; import type { IHttp, IModify, IPersistence, IRead } from '@rocket.chat/apps-engine/definition/accessors'; diff --git a/packages/cas-validate/src/validate.ts b/packages/cas-validate/src/validate.ts index 44cb86676671b..00158c7dbf0e7 100644 --- a/packages/cas-validate/src/validate.ts +++ b/packages/cas-validate/src/validate.ts @@ -1,7 +1,7 @@ -import type { IncomingMessage } from 'http'; -import https from 'https'; -import type { ParsedUrlQueryInput } from 'querystring'; -import url from 'url'; +import type { IncomingMessage } from 'node:http'; +import https from 'node:https'; +import type { ParsedUrlQueryInput } from 'node:querystring'; +import url from 'node:url'; import type { Cheerio, CheerioAPI } from 'cheerio'; import { load } from 'cheerio'; diff --git a/packages/core-services/src/LocalBroker.ts b/packages/core-services/src/LocalBroker.ts index 312b337c9812c..c03b7d6311b22 100644 --- a/packages/core-services/src/LocalBroker.ts +++ b/packages/core-services/src/LocalBroker.ts @@ -1,4 +1,4 @@ -import { EventEmitter } from 'events'; +import { EventEmitter } from 'node:events'; import { Logger } from '@rocket.chat/logger'; import { InstanceStatus } from '@rocket.chat/models'; diff --git a/packages/core-services/src/types/IMediaService.ts b/packages/core-services/src/types/IMediaService.ts index f155e360e0eb1..44aafe7781732 100644 --- a/packages/core-services/src/types/IMediaService.ts +++ b/packages/core-services/src/types/IMediaService.ts @@ -1,4 +1,4 @@ -import type { Readable, Stream } from 'stream'; +import type { Readable, Stream } from 'node:stream'; import type sharp from 'sharp'; diff --git a/packages/core-services/src/types/IUploadService.ts b/packages/core-services/src/types/IUploadService.ts index 32ae5a6f900d4..4c3024c2765f7 100644 --- a/packages/core-services/src/types/IUploadService.ts +++ b/packages/core-services/src/types/IUploadService.ts @@ -1,4 +1,4 @@ -import type Stream from 'stream'; +import type Stream from 'node:stream'; import type { IUploadDetails } from '@rocket.chat/apps-engine/definition/uploads/IUploadDetails'; import type { IMessage, IUpload, IUser, FilesAndAttachments, AtLeast } from '@rocket.chat/core-typings'; diff --git a/packages/core-services/src/types/ServiceClass.ts b/packages/core-services/src/types/ServiceClass.ts index 683854a453707..e7c97bd481d57 100644 --- a/packages/core-services/src/types/ServiceClass.ts +++ b/packages/core-services/src/types/ServiceClass.ts @@ -1,4 +1,4 @@ -import { EventEmitter } from 'events'; +import { EventEmitter } from 'node:events'; import type { ISetting } from '@rocket.chat/core-typings'; diff --git a/packages/core-typings/src/IIncomingMessage.ts b/packages/core-typings/src/IIncomingMessage.ts index 0889312784f71..c771989407eb4 100644 --- a/packages/core-typings/src/IIncomingMessage.ts +++ b/packages/core-typings/src/IIncomingMessage.ts @@ -1,4 +1,4 @@ -import type { IncomingMessage } from 'http'; +import type { IncomingMessage } from 'node:http'; export interface IIncomingMessage extends IncomingMessage { query: Record; diff --git a/packages/core-typings/src/IMessage/IMessage.ts b/packages/core-typings/src/IMessage/IMessage.ts index 7a59a5b1702c8..a180c7d7528fa 100644 --- a/packages/core-typings/src/IMessage/IMessage.ts +++ b/packages/core-typings/src/IMessage/IMessage.ts @@ -1,4 +1,4 @@ -import type { UrlWithStringQuery } from 'url'; +import type { UrlWithStringQuery } from 'node:url'; import type Icons from '@rocket.chat/icons'; import type { Root } from '@rocket.chat/message-parser'; diff --git a/packages/core-typings/src/ISocketConnection.ts b/packages/core-typings/src/ISocketConnection.ts index 8f1c5664db564..e14fa8974961c 100644 --- a/packages/core-typings/src/ISocketConnection.ts +++ b/packages/core-typings/src/ISocketConnection.ts @@ -1,4 +1,4 @@ -import type { IncomingHttpHeaders } from 'http'; +import type { IncomingHttpHeaders } from 'node:http'; export interface ISocketConnection { id: string; diff --git a/packages/core-typings/src/IStats.ts b/packages/core-typings/src/IStats.ts index e6fbf30ca15eb..d801a9daa8b3e 100644 --- a/packages/core-typings/src/IStats.ts +++ b/packages/core-typings/src/IStats.ts @@ -1,4 +1,4 @@ -import type { CpuInfo } from 'os'; +import type { CpuInfo } from 'node:os'; import type { IMatrixFederationStatistics } from './IMatrixFederationStatistics'; import type { DeviceSessionAggregationResult, OSSessionAggregationResult, UserSessionAggregationResult } from './ISession'; diff --git a/packages/ddp-client/__tests__/DDPSDK.spec.ts b/packages/ddp-client/__tests__/DDPSDK.spec.ts index e83cb2c92bdc2..ff7a25d7a3fbc 100644 --- a/packages/ddp-client/__tests__/DDPSDK.spec.ts +++ b/packages/ddp-client/__tests__/DDPSDK.spec.ts @@ -1,4 +1,4 @@ -import util from 'util'; +import util from 'node:util'; import WS from 'jest-websocket-mock'; import { WebSocket } from 'ws'; diff --git a/packages/http-router/src/middlewares/honoAdapterForExpress.spec.ts b/packages/http-router/src/middlewares/honoAdapterForExpress.spec.ts index b200e0b8f96e0..57e2ccea3e251 100644 --- a/packages/http-router/src/middlewares/honoAdapterForExpress.spec.ts +++ b/packages/http-router/src/middlewares/honoAdapterForExpress.spec.ts @@ -1,4 +1,4 @@ -import { Readable, PassThrough } from 'stream'; +import { Readable, PassThrough } from 'node:stream'; import type { Request, Response as ExpressResponse } from 'express'; import type { Hono } from 'hono'; diff --git a/packages/http-router/src/middlewares/honoAdapterForExpress.ts b/packages/http-router/src/middlewares/honoAdapterForExpress.ts index b6f306bffecf9..a3eeb98f9d619 100644 --- a/packages/http-router/src/middlewares/honoAdapterForExpress.ts +++ b/packages/http-router/src/middlewares/honoAdapterForExpress.ts @@ -1,4 +1,4 @@ -import { Readable } from 'stream'; +import { Readable } from 'node:stream'; import type { Request, Response } from 'express'; import type { Hono } from 'hono'; diff --git a/packages/instance-status/src/index.ts b/packages/instance-status/src/index.ts index 77b41584ed58e..afda96e738083 100644 --- a/packages/instance-status/src/index.ts +++ b/packages/instance-status/src/index.ts @@ -1,11 +1,12 @@ +import { randomUUID } from 'node:crypto'; + import type { IInstanceStatus } from '@rocket.chat/core-typings'; import { InstanceStatus as InstanceStatusModel } from '@rocket.chat/models'; -import { v4 as uuidv4 } from 'uuid'; export const defaultPingInterval = parseInt(String(process.env.MULTIPLE_INSTANCES_PING_INTERVAL)) || 10; export const indexExpire = (parseInt(String(process.env.MULTIPLE_INSTANCES_EXPIRE)) || Math.ceil((defaultPingInterval * 3) / 60)) * 60; -const ID = uuidv4(); +const ID = randomUUID(); const id = (): IInstanceStatus['_id'] => ID; const currentInstance = { diff --git a/packages/livechat/webpack.config.ts b/packages/livechat/webpack.config.ts index f7a728d816654..844b4347eccfa 100644 --- a/packages/livechat/webpack.config.ts +++ b/packages/livechat/webpack.config.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import path from 'node:path'; import HtmlWebpackPlugin from 'html-webpack-plugin'; import MiniCssExtractPlugin from 'mini-css-extract-plugin'; diff --git a/packages/models/src/models/EmojiCustom.ts b/packages/models/src/models/EmojiCustom.ts index 679ee0d3ab037..d6e3167a848c0 100644 --- a/packages/models/src/models/EmojiCustom.ts +++ b/packages/models/src/models/EmojiCustom.ts @@ -18,7 +18,7 @@ export class EmojiCustomRaw extends BaseRaw implements IEmojiCusto let name = emojiName; if (typeof emojiName === 'string') { - name = emojiName.replace(/:/g, ''); + name = emojiName.replaceAll(':', ''); } const query = { diff --git a/packages/random/src/NodeRandomGenerator.ts b/packages/random/src/NodeRandomGenerator.ts index 24226fdb5fb4b..d2465e315d0b7 100644 --- a/packages/random/src/NodeRandomGenerator.ts +++ b/packages/random/src/NodeRandomGenerator.ts @@ -1,4 +1,4 @@ -import crypto from 'crypto'; +import crypto from 'node:crypto'; import { AleaRandomGenerator } from './AleaRandomGenerator'; import { RandomGenerator } from './RandomGenerator'; diff --git a/packages/release-action/src/bumpNextVersion.ts b/packages/release-action/src/bumpNextVersion.ts index f3a2e32f812af..d8628e46cf242 100644 --- a/packages/release-action/src/bumpNextVersion.ts +++ b/packages/release-action/src/bumpNextVersion.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import * as core from '@actions/core'; import { exec } from '@actions/exec'; diff --git a/packages/release-action/src/createNpmFile.ts b/packages/release-action/src/createNpmFile.ts index 7facf11120780..67c0112e526c4 100644 --- a/packages/release-action/src/createNpmFile.ts +++ b/packages/release-action/src/createNpmFile.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import fsPromise from 'fs/promises'; +import fs from 'node:fs'; +import fsPromise from 'node:fs/promises'; import * as core from '@actions/core'; diff --git a/packages/release-action/src/getMetadata.ts b/packages/release-action/src/getMetadata.ts index fb56c1621b497..40f3f57a1193f 100644 --- a/packages/release-action/src/getMetadata.ts +++ b/packages/release-action/src/getMetadata.ts @@ -1,6 +1,6 @@ -import { readFile } from 'fs/promises'; -import { EOL } from 'os'; -import path from 'path'; +import { readFile } from 'node:fs/promises'; +import { EOL } from 'node:os'; +import path from 'node:path'; import { readPackageJson } from './utils'; diff --git a/packages/release-action/src/index.ts b/packages/release-action/src/index.ts index 51956e9e2a8d7..53f82641b0ba6 100644 --- a/packages/release-action/src/index.ts +++ b/packages/release-action/src/index.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import * as core from '@actions/core'; diff --git a/packages/release-action/src/publishRelease.ts b/packages/release-action/src/publishRelease.ts index 88f35ddaab07c..d0706bdbdc740 100644 --- a/packages/release-action/src/publishRelease.ts +++ b/packages/release-action/src/publishRelease.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import * as core from '@actions/core'; import { exec } from '@actions/exec'; diff --git a/packages/release-action/src/updatePRDescription.ts b/packages/release-action/src/updatePRDescription.ts index 16238b7179a40..8196295d931f0 100644 --- a/packages/release-action/src/updatePRDescription.ts +++ b/packages/release-action/src/updatePRDescription.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import * as core from '@actions/core'; import { exec } from '@actions/exec'; diff --git a/packages/release-action/src/utils.ts b/packages/release-action/src/utils.ts index a5ae8c48b2c9c..271fb729494b9 100644 --- a/packages/release-action/src/utils.ts +++ b/packages/release-action/src/utils.ts @@ -1,6 +1,6 @@ -import fs from 'fs'; -import { readFile, writeFile } from 'fs/promises'; -import path from 'path'; +import fs from 'node:fs'; +import { readFile, writeFile } from 'node:fs/promises'; +import path from 'node:path'; import mdastToString from 'mdast-util-to-string'; import remarkParse from 'remark-parse'; diff --git a/packages/server-fetch/src/helpers.ts b/packages/server-fetch/src/helpers.ts index 69e10710f39aa..a1417d50a9dcd 100644 --- a/packages/server-fetch/src/helpers.ts +++ b/packages/server-fetch/src/helpers.ts @@ -1,5 +1,5 @@ -import { lookup } from 'dns'; -import net from 'net'; +import { lookup } from 'node:dns'; +import net from 'node:net'; import { domainPattern, ipv4Ranges, ipv4WithPortPattern, ipv6Ranges } from './constants'; diff --git a/packages/server-fetch/src/index.ts b/packages/server-fetch/src/index.ts index 2355d2a1b4754..73f2dd2970f50 100644 --- a/packages/server-fetch/src/index.ts +++ b/packages/server-fetch/src/index.ts @@ -1,5 +1,5 @@ -import http from 'http'; -import https from 'https'; +import http from 'node:http'; +import https from 'node:https'; import { Logger } from '@rocket.chat/logger'; import { censorUrl } from '@rocket.chat/tools'; diff --git a/packages/storybook-config/src/main.ts b/packages/storybook-config/src/main.ts index 594f27ba7b9c3..f41781ed0c9c6 100644 --- a/packages/storybook-config/src/main.ts +++ b/packages/storybook-config/src/main.ts @@ -1,4 +1,4 @@ -import { dirname, join } from 'path'; +import { dirname, join } from 'node:path'; import type { StorybookConfig } from '@storybook/react-webpack5'; diff --git a/packages/tools/src/getHeader.spec.ts b/packages/tools/src/getHeader.spec.ts index 71589322fc79f..ff65685ab67dd 100644 --- a/packages/tools/src/getHeader.spec.ts +++ b/packages/tools/src/getHeader.spec.ts @@ -1,4 +1,4 @@ -import type { IncomingHttpHeaders } from 'http'; +import type { IncomingHttpHeaders } from 'node:http'; import { getHeader } from './getHeader'; diff --git a/packages/tools/src/getHeader.ts b/packages/tools/src/getHeader.ts index bceaf6d364b07..488252fde44ac 100644 --- a/packages/tools/src/getHeader.ts +++ b/packages/tools/src/getHeader.ts @@ -1,4 +1,4 @@ -import type { IncomingHttpHeaders } from 'http'; +import type { IncomingHttpHeaders } from 'node:http'; type HeaderLike = IncomingHttpHeaders | Headers | Record; diff --git a/packages/tools/src/stream.ts b/packages/tools/src/stream.ts index 110d364705f39..c3ed6b22009ae 100644 --- a/packages/tools/src/stream.ts +++ b/packages/tools/src/stream.ts @@ -1,4 +1,4 @@ -import type { Readable } from 'stream'; +import type { Readable } from 'node:stream'; export const streamToBuffer = (stream: Readable): Promise => new Promise((resolve, reject) => { diff --git a/packages/tsconfig/server.json b/packages/tsconfig/server.json index cf11f8a482a63..8e2a7c52140b4 100644 --- a/packages/tsconfig/server.json +++ b/packages/tsconfig/server.json @@ -3,7 +3,7 @@ "extends": "./base.json", "compilerOptions": { "target": "es2020", - "lib": ["es2020"], + "lib": ["es2023"], "module": "commonjs", "sourceMap": true, },