Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .changeset/perfect-trees-rescue.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/ci-deploy-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-update-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-version-durability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.docker-mongo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-bullseye-slim
FROM node:22.13.1-bullseye-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20
FROM node:22.13.1-alpine3.20

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.docker/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
14 changes: 7 additions & 7 deletions apps/meteor/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@3.1
METEOR@3.1.2
34 changes: 17 additions & 17 deletions apps/meteor/.meteor/versions
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions apps/meteor/app/api/server/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -567,13 +567,13 @@
const api = this;
(operations[method as keyof Operations<TPathPattern, TOptions>] as Record<string, any>).action =
async function _internalRouteActionHandler() {
this.requestIp = getRequestIP(this.request)!;

Check warning on line 570 in apps/meteor/app/api/server/api.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

Forbidden non-null assertion

if (options.authRequired || options.authOrAnonRequired) {
const user = await api.authenticatedRoute(this.request);
this.user = user!;

Check warning on line 574 in apps/meteor/app/api/server/api.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

Forbidden non-null assertion
this.userId = String(this.request.headers['x-user-id']);
this.token = (this.request.headers['x-auth-token'] &&

Check warning on line 576 in apps/meteor/app/api/server/api.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

Forbidden non-null assertion
Accounts._hashLoginToken(String(this.request.headers['x-auth-token'])))!;
}

Expand Down Expand Up @@ -650,7 +650,7 @@
connection,
};

Accounts._setAccountData(connection.id, 'loginToken', this.token!);

Check warning on line 653 in apps/meteor/app/api/server/api.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

Forbidden non-null assertion

this.userId &&
(await api.processTwoFactor({
Expand Down Expand Up @@ -705,7 +705,7 @@
this._routes.push({
path: route,
options: _options,
endpoints: operations[method as keyof Operations<TPathPattern, TOptions>] as Record<string, string>,
endpoints: operations[method as keyof Operations<TPathPattern, TOptions>] as unknown as Record<string, string>,
});
});
});
Expand Down Expand Up @@ -1014,7 +1014,7 @@
});

Meteor.startup(() => {
(WebApp.connectHandlers as ReturnType<typeof express>).use(
(WebApp.connectHandlers as unknown as ReturnType<typeof express>).use(
API.api
.use((_req, res, next) => {
res.removeHeader('X-Powered-By');
Expand All @@ -1029,7 +1029,7 @@
);
});

(WebApp.connectHandlers as ReturnType<typeof express>)
(WebApp.connectHandlers as unknown as ReturnType<typeof express>)
.use(
express.json({
limit: '50mb',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ API.v1.addAuthMethod(async function () {
return oAuth2ServerAuth(this.request);
});

(WebApp.connectHandlers as ReturnType<typeof express>).use(oauth2server.app);
(WebApp.connectHandlers as unknown as ReturnType<typeof express>).use(oauth2server.app);
3 changes: 2 additions & 1 deletion apps/meteor/client/meteorOverrides/ddpOverREST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, ':'));
Expand Down
7 changes: 6 additions & 1 deletion apps/meteor/definition/externals/meteor/meteor.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -94,6 +98,7 @@ declare module 'meteor/meteor' {
status: 'connected' | 'connecting' | 'failed' | 'waiting' | 'offline';
reconnect: () => void;
};

subscribe(
id: string,
name: string,
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/apps/communication/rest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class AppsRestApi {
enableCors: false,
});
await this.addManagementRoutes();
(WebApp.connectHandlers as ReturnType<typeof express>).use(this.api.router.router);
(WebApp.connectHandlers as unknown as ReturnType<typeof express>).use(this.api.router.router);
}

addManagementRoutes() {
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/ee/server/services/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0 as build
FROM node:22.13.1 as build

WORKDIR /app

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/account-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20
FROM node:22.13.1-alpine3.20

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/authorization-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20
FROM node:22.13.1-alpine3.20

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/ddp-streamer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20
FROM node:22.13.1-alpine3.20

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/omnichannel-transcript/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20
FROM node:22.13.1-alpine3.20

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/presence-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20
FROM node:22.13.1-alpine3.20

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/queue-worker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20
FROM node:22.13.1-alpine3.20

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/stream-hub-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20
FROM node:22.13.1-alpine3.20

ARG SERVICE

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -54,7 +54,7 @@
]
},
"volta": {
"node": "22.11.0",
"node": "22.13.1",
"yarn": "1.22.18"
},
"resolutions": {
Expand Down
Loading