diff --git a/.changeset/perfect-trees-rescue.md b/.changeset/perfect-trees-rescue.md new file mode 100644 index 0000000000000..1e20beebbc32d --- /dev/null +++ b/.changeset/perfect-trees-rescue.md @@ -0,0 +1,13 @@ +--- +'rocketchat-services': patch +'@rocket.chat/omnichannel-transcript': patch +'@rocket.chat/authorization-service': patch +'@rocket.chat/stream-hub-service': patch +'@rocket.chat/presence-service': patch +'@rocket.chat/account-service': patch +'@rocket.chat/ddp-streamer': patch +'@rocket.chat/queue-worker': patch +'@rocket.chat/meteor': patch +--- + +Bump meteor to 3.1.2 and Node version to 20.13.1 diff --git a/.github/workflows/ci-deploy-gh-pages.yml b/.github/workflows/ci-deploy-gh-pages.yml index 6a343dd8476b1..13a8e6a408b56 100644 --- a/.github/workflows/ci-deploy-gh-pages.yml +++ b/.github/workflows/ci-deploy-gh-pages.yml @@ -17,7 +17,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.11.0 + node-version: 22.13.1 deno-version: 1.37.1 cache-modules: true install: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2697b0bfc2796..d7677ca1f16ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -199,7 +199,7 @@ jobs: uses: ./.github/actions/setup-node if: github.event.action != 'closed' with: - node-version: 22.11.0 + node-version: 22.13.1 deno-version: 1.37.1 cache-modules: true install: true diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml index 73774c18cee25..4d608203945e7 100644 --- a/.github/workflows/new-release.yml +++ b/.github/workflows/new-release.yml @@ -34,7 +34,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.11.0 + node-version: 22.13.1 deno-version: 1.37.1 cache-modules: true install: true diff --git a/.github/workflows/pr-update-description.yml b/.github/workflows/pr-update-description.yml index 0163404fb5e0a..bf21bad05a537 100644 --- a/.github/workflows/pr-update-description.yml +++ b/.github/workflows/pr-update-description.yml @@ -21,7 +21,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.11.0 + node-version: 22.13.1 deno-version: 1.37.1 cache-modules: true install: true diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index e45b88d5bca97..9a8110b13eee1 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -24,7 +24,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.11.0 + node-version: 22.13.1 deno-version: 1.37.1 cache-modules: true install: true diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 640574d3eca39..95dfd7f474315 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -15,7 +15,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.11.0 + node-version: 22.13.1 deno-version: 1.37.1 cache-modules: true install: true diff --git a/.github/workflows/update-version-durability.yml b/.github/workflows/update-version-durability.yml index 1972e8181c713..0b3fb34c4e6fd 100644 --- a/.github/workflows/update-version-durability.yml +++ b/.github/workflows/update-version-durability.yml @@ -19,7 +19,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4.1.0 with: - node-version: '22.11.0' + node-version: '22.13.1' - name: Install dependencies run: | diff --git a/apps/meteor/.docker-mongo/Dockerfile b/apps/meteor/.docker-mongo/Dockerfile index faa3c6138ca90..2d85a15eca878 100644 --- a/apps/meteor/.docker-mongo/Dockerfile +++ b/apps/meteor/.docker-mongo/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0-bullseye-slim +FROM node:22.13.1-bullseye-slim LABEL maintainer="buildmaster@rocket.chat" diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine index e4f8b11cb96b1..e098d21722a5d 100644 --- a/apps/meteor/.docker/Dockerfile.alpine +++ b/apps/meteor/.docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 LABEL maintainer="buildmaster@rocket.chat" diff --git a/apps/meteor/.docker/Dockerfile.debian b/apps/meteor/.docker/Dockerfile.debian index 7b1094b46508e..9a4012d1e5b39 100644 --- a/apps/meteor/.docker/Dockerfile.debian +++ b/apps/meteor/.docker/Dockerfile.debian @@ -2,7 +2,7 @@ ARG DENO_VERSION="1.37.1" FROM denoland/deno:bin-${DENO_VERSION} as deno -FROM node:22.11.0-bullseye-slim +FROM node:22.13.1-bullseye-slim LABEL maintainer="buildmaster@rocket.chat" diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages index efc4541f666d9..3d585e080efad 100644 --- a/apps/meteor/.meteor/packages +++ b/apps/meteor/.meteor/packages @@ -13,29 +13,29 @@ rocketchat:streamer rocketchat:version rocketchat:user-presence -accounts-base@3.0.3 +accounts-base@3.0.4 accounts-facebook@1.3.4 accounts-github@1.5.1 accounts-google@1.4.1 accounts-meteor-developer@1.5.1 -accounts-oauth@1.4.5 +accounts-oauth@1.4.6 accounts-password@3.0.3 accounts-twitter@1.5.2 google-oauth@1.4.5 -oauth@3.0.0 +oauth@3.0.1 oauth2@1.3.3 check@1.4.4 ddp-rate-limiter@1.2.2 rate-limit@1.1.2 -email@3.1.1 +email@3.1.2 meteor-base@1.5.2 ddp-common@1.4.4 -webapp@2.0.4 +webapp@2.0.5 -mongo@2.0.3 +mongo@2.1.0 reload@1.3.2 service-configuration@1.3.5 @@ -58,7 +58,7 @@ tracker@1.3.4 reactive-dict@1.3.2 reactive-var@1.0.13 -babel-compiler@7.11.2 +babel-compiler@7.11.3 standard-minifier-css@1.9.3 dynamic-import@0.7.4 ecmascript@0.16.10 diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release index 8d20e1a2d3a87..5f22892744ba2 100644 --- a/apps/meteor/.meteor/release +++ b/apps/meteor/.meteor/release @@ -1 +1 @@ -METEOR@3.1 +METEOR@3.1.2 diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions index e3d5dd574f1e3..3689b1b0fc5d3 100644 --- a/apps/meteor/.meteor/versions +++ b/apps/meteor/.meteor/versions @@ -1,14 +1,14 @@ -accounts-base@3.0.3 +accounts-base@3.0.4 accounts-facebook@1.3.4 accounts-github@1.5.1 accounts-google@1.4.1 accounts-meteor-developer@1.5.1 -accounts-oauth@1.4.5 +accounts-oauth@1.4.6 accounts-password@3.0.3 accounts-twitter@1.5.2 -allow-deny@2.0.0 +allow-deny@2.1.0 autoupdate@2.0.0 -babel-compiler@7.11.2 +babel-compiler@7.11.3 babel-runtime@1.5.2 base64@1.0.13 binary-heap@1.0.12 @@ -17,10 +17,10 @@ callback-hook@1.6.0 check@1.4.4 core-runtime@1.0.0 ddp@1.4.2 -ddp-client@3.0.3 +ddp-client@3.1.0 ddp-common@1.4.4 ddp-rate-limiter@1.2.2 -ddp-server@3.0.3 +ddp-server@3.1.0 diff-sequence@1.1.3 dispatch:run-as-user@1.1.1 dynamic-import@0.7.4 @@ -29,9 +29,9 @@ ecmascript-runtime@0.8.3 ecmascript-runtime-client@0.12.2 ecmascript-runtime-server@0.11.1 ejson@1.1.4 -email@3.1.1 +email@3.1.2 es5-shim@4.8.1 -facebook-oauth@1.11.4 +facebook-oauth@1.11.5 facts-base@1.0.2 fetch@0.1.5 geojson-utils@1.0.12 @@ -44,21 +44,21 @@ inter-process-messaging@0.1.2 kadira:flow-router@2.12.1 localstorage@1.2.1 logging@1.3.5 -meteor@2.0.2 +meteor@2.1.0 meteor-base@1.5.2 meteor-developer-oauth@1.3.3 meteorhacks:inject-initial@1.0.5 minifier-css@2.0.0 minimongo@2.0.2 -modern-browsers@0.1.11 +modern-browsers@0.2.0 modules@0.20.3 modules-runtime@0.13.2 -mongo@2.0.3 +mongo@2.1.0 mongo-decimal@0.2.0 mongo-dev-server@1.1.1 mongo-id@1.0.9 -npm-mongo@6.10.0 -oauth@3.0.0 +npm-mongo@6.10.2 +oauth@3.0.1 oauth1@1.5.2 oauth2@1.3.3 ordered-dict@1.2.0 @@ -82,15 +82,15 @@ service-configuration@1.3.5 session@1.2.2 sha@1.0.10 shell-server@0.6.1 -socket-stream-client@0.5.3 +socket-stream-client@0.6.0 standard-minifier-css@1.9.3 tracker@1.3.4 twitter-oauth@1.3.4 typescript@5.6.3 underscore@1.6.4 url@1.3.5 -webapp@2.0.4 +webapp@2.0.5 webapp-hashing@1.1.2 zodern:caching-minifier@0.5.0 -zodern:standard-minifier-js@5.2.0 -zodern:types@1.0.10 +zodern:standard-minifier-js@5.3.1 +zodern:types@1.0.13 diff --git a/apps/meteor/app/api/server/api.ts b/apps/meteor/app/api/server/api.ts index 7854138c063be..cd274fe8f72cb 100644 --- a/apps/meteor/app/api/server/api.ts +++ b/apps/meteor/app/api/server/api.ts @@ -705,7 +705,7 @@ export class APIClass { this._routes.push({ path: route, options: _options, - endpoints: operations[method as keyof Operations] as Record, + endpoints: operations[method as keyof Operations] as unknown as Record, }); }); }); @@ -1014,7 +1014,7 @@ settings.watch('API_Enable_Rate_Limiter_Limit_Calls_Default', (value) => }); Meteor.startup(() => { - (WebApp.connectHandlers as ReturnType).use( + (WebApp.connectHandlers as unknown as ReturnType).use( API.api .use((_req, res, next) => { res.removeHeader('X-Powered-By'); @@ -1029,7 +1029,7 @@ Meteor.startup(() => { ); }); -(WebApp.connectHandlers as ReturnType) +(WebApp.connectHandlers as unknown as ReturnType) .use( express.json({ limit: '50mb', diff --git a/apps/meteor/app/oauth2-server-config/server/oauth/oauth2-server.ts b/apps/meteor/app/oauth2-server-config/server/oauth/oauth2-server.ts index ab21aa3a8cf33..76e1a8f94b86b 100644 --- a/apps/meteor/app/oauth2-server-config/server/oauth/oauth2-server.ts +++ b/apps/meteor/app/oauth2-server-config/server/oauth/oauth2-server.ts @@ -73,4 +73,4 @@ API.v1.addAuthMethod(async function () { return oAuth2ServerAuth(this.request); }); -(WebApp.connectHandlers as ReturnType).use(oauth2server.app); +(WebApp.connectHandlers as unknown as ReturnType).use(oauth2server.app); diff --git a/apps/meteor/client/meteorOverrides/ddpOverREST.ts b/apps/meteor/client/meteorOverrides/ddpOverREST.ts index 5ddfb7ba5085c..c0abc244cc476 100644 --- a/apps/meteor/client/meteorOverrides/ddpOverREST.ts +++ b/apps/meteor/client/meteorOverrides/ddpOverREST.ts @@ -49,7 +49,8 @@ const withDDPOverREST = (_send: (this: Meteor.IMeteorConnection, message: Meteor msg: 'updated', methods: [message.id], }); - this.onMessage(_message); + + this._streamHandlers.onMessage(_message); }; const method = encodeURIComponent(message.method.replace(/\//g, ':')); diff --git a/apps/meteor/definition/externals/meteor/meteor.d.ts b/apps/meteor/definition/externals/meteor/meteor.d.ts index b7220937213f9..91cefa7c1b408 100644 --- a/apps/meteor/definition/externals/meteor/meteor.d.ts +++ b/apps/meteor/definition/externals/meteor/meteor.d.ts @@ -85,7 +85,11 @@ declare module 'meteor/meteor' { _outstandingMethodBlocks: unknown[]; - onMessage(message: string): void; + // Updated: onMessage is now inside _streamHandlers + _streamHandlers: { + onMessage(message: string): void; + onReset(): void; + }; status(): { connected: boolean; @@ -94,6 +98,7 @@ declare module 'meteor/meteor' { status: 'connected' | 'connecting' | 'failed' | 'waiting' | 'offline'; reconnect: () => void; }; + subscribe( id: string, name: string, diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts index 938dae6e7c0ea..dcc84a3098d45 100644 --- a/apps/meteor/ee/server/apps/communication/rest.ts +++ b/apps/meteor/ee/server/apps/communication/rest.ts @@ -60,7 +60,7 @@ export class AppsRestApi { enableCors: false, }); await this.addManagementRoutes(); - (WebApp.connectHandlers as ReturnType).use(this.api.router.router); + (WebApp.connectHandlers as unknown as ReturnType).use(this.api.router.router); } addManagementRoutes() { diff --git a/apps/meteor/ee/server/services/Dockerfile b/apps/meteor/ee/server/services/Dockerfile index 55e1157c0985c..fe26cdcf822fa 100644 --- a/apps/meteor/ee/server/services/Dockerfile +++ b/apps/meteor/ee/server/services/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0 as build +FROM node:22.13.1 as build WORKDIR /app @@ -28,7 +28,7 @@ COPY ./tsconfig.base.json . RUN yarn workspace @rocket.chat/core-typings run build \ && yarn workspace @rocket.chat/rest-typings run build -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 ARG SERVICE diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile index 9ff933b759bf5..7d5abaf8ab4a7 100644 --- a/ee/apps/account-service/Dockerfile +++ b/ee/apps/account-service/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 ARG SERVICE diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile index a3b016c7fac07..8317ff4a38400 100644 --- a/ee/apps/authorization-service/Dockerfile +++ b/ee/apps/authorization-service/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 ARG SERVICE diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile index f4a581c5e60ee..e5a51de429e27 100644 --- a/ee/apps/ddp-streamer/Dockerfile +++ b/ee/apps/ddp-streamer/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 ARG SERVICE diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile index 10551af8d966d..4de1425275c87 100644 --- a/ee/apps/omnichannel-transcript/Dockerfile +++ b/ee/apps/omnichannel-transcript/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 ARG SERVICE diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile index 082e4629df390..56d506b5510a5 100644 --- a/ee/apps/presence-service/Dockerfile +++ b/ee/apps/presence-service/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 ARG SERVICE diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile index 10551af8d966d..4de1425275c87 100644 --- a/ee/apps/queue-worker/Dockerfile +++ b/ee/apps/queue-worker/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 ARG SERVICE diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile index a3b016c7fac07..8317ff4a38400 100644 --- a/ee/apps/stream-hub-service/Dockerfile +++ b/ee/apps/stream-hub-service/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0-alpine3.20 +FROM node:22.13.1-alpine3.20 ARG SERVICE diff --git a/package.json b/package.json index 59dbdd6ae5496..72471391a1ba9 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "homepage": "https://github.com/RocketChat/Rocket.Chat#readme", "engines": { "yarn": "4.6.0", - "node": "22.11.0", + "node": "22.13.1", "npm": "Use yarn instead" }, "packageManager": "yarn@4.6.0", @@ -54,7 +54,7 @@ ] }, "volta": { - "node": "22.11.0", + "node": "22.13.1", "yarn": "1.22.18" }, "resolutions": {