• jon retitled this revision from Add dependencies needed to compile native modules to [nix] Add dependencies needed to compile native modules.Jun 19 2022, 11:31 AM

Additional dependencies

Make openssl available to all platforms for grpc compatibility

Harbormaster failed remote builds in B9816: Diff 13580!Jun 19 2022, 3:48 PM

Harbormaster completed remote builds in B9809: Diff 13573.Jun 19 2022, 4:10 PM

ashoat added inline comments.Jun 20 2022, 9:15 AM

nix/overlay.nix
32 ↗	(On Diff #13580)	I guess we're doing this so this line works with the new CMake config changes?

• jon marked an inline comment as done.Jun 22 2022, 7:57 PM

• jon added inline comments.

nix/overlay.nix
32 ↗	(On Diff #13580)	The `Session.hh` is used in our code, although it's not meant to be publicly exposed by upstream. I added it so I didn't have to also touch c++. The `Session.hh` just exposes a bit of abstraction on top of the olm primitives, the intent upstream is for the headers to only be used for their unit tests (which is why it's not exposed publicly) https://gitlab.matrix.org/matrix-org/olm/-/blob/master/include/olm/session.hh#L20

Harbormaster completed remote builds in B9816: Diff 13580.Jun 22 2022, 8:01 PM

varun added 1 blocking reviewer(s): varun.Jun 23 2022, 12:24 PM

varun accepted this revision.Jun 26 2022, 9:30 PM

This revision is now accepted and ready to land.Jun 26 2022, 9:30 PM

Herald added a reviewer: ashoat. · View Herald TranscriptJun 26 2022, 9:30 PM

This revision now requires review to proceed.Jun 26 2022, 9:30 PM

• max accepted this revision.Jun 27 2022, 2:28 AM

Please adjust line length before landing!

nix/overlay.nix
29–32 ↗	(On Diff #13580)	Makes sense!! Can you make sure to limit all lines to 80 chars?

This revision is now accepted and ready to land.Jun 28 2022, 11:59 AM

Closed by commit rCOMMc377946343a2: [nix] Add dependencies needed to compile native modules (authored by • jon). · Explain WhyJun 29 2022, 12:29 PM

This revision was automatically updated to reflect the committed changes.

• jon marked an inline comment as done.

• jon added a commit: rCOMMc377946343a2: [nix] Add dependencies needed to compile native modules.

• jon marked an inline comment as done.Jun 29 2022, 12:30 PM

• jon added inline comments.

nix/overlay.nix
29–32 ↗	(On Diff #13580)	Sorry, was pairing with varun, and landed to unblock some work we were doing, will tackle this in another diff

ashoat added inline comments.Jun 29 2022, 12:31 PM

nix/overlay.nix
29–32 ↗	(On Diff #13580)	No problem, can you make a Linear task so we don't forget? (Or alternately, feel free to put a diff up right away)

• jon added a child revision: D4424: [nix] Lint line length.Jun 30 2022, 2:26 PM

• jon marked 2 inline comments as done.Jun 30 2022, 2:27 PM

• jon added inline comments.

nix/overlay.nix
29–32 ↗	(On Diff #13580)	https://phab.comm.dev/D4424 Sorry about that

• jon added a child revision: D4430: [Services] Generate Protobuf files with CMake.Jul 3 2022, 8:51 AM

• jon added a child revision: D4564: [Nix] Add cmake-format to dev shell.Jul 18 2022, 2:52 PM

• jon removed a child revision: D4564: [Nix] Add cmake-format to dev shell.Jul 18 2022, 3:40 PM

• jon added a child revision: D4298: [services] Export sqlite_orm as CMake project.Jul 18 2022, 5:30 PM

atul added a child revision: D4564: [Nix] Add cmake-format to dev shell.Jul 18 2022, 5:59 PM

• jon added a child revision: D4448: Update android build with cmake changes.Jul 18 2022, 7:01 PM

• jon added a child revision: D4483: [Nix] Support building Android through gradle on Linux.Jul 20 2022, 12:41 PM

• jon removed a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 25 2022, 9:11 PM

• jon added a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 25 2022, 9:17 PM

• jon removed a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 25 2022, 9:28 PM

• jon added a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 25 2022, 9:33 PM

• jon removed a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 26 2022, 8:19 AM

• jon added a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 27 2022, 11:59 AM

• jon removed a child revision: D4564: [Nix] Add cmake-format to dev shell.Jul 27 2022, 12:25 PM

• jon removed a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 28 2022, 5:37 PM

• jon removed a child revision: D4298: [services] Export sqlite_orm as CMake project.Aug 17 2022, 9:40 AM

Revision Contents
Changeset List

Path

Size

nix/

dev-shell.nix

12 lines

overlay.nix

7 lines

Diff 13977

View Options

nix/dev-shell.nix

Show All 39 Lines
import { fetchUserInfos } from '../fetchers/user-fetchers';		import { fetchUserInfos } from '../fetchers/user-fetchers';
import type { Viewer } from '../session/viewer';		import type { Viewer } from '../session/viewer';
import { getAPNsNotificationTopic } from './providers';		import { getAPNsNotificationTopic } from './providers';
import {		import {
apnPush,		apnPush,
fcmPush,		fcmPush,
getUnreadCounts,		getUnreadCounts,
apnMaxNotificationPayloadByteSize,		apnMaxNotificationPayloadByteSize,
		fcmMaxNotificationPayloadByteSize,
} from './utils';		} from './utils';

type Device = {		type Device = {
+deviceType: DeviceType,		+deviceType: DeviceType,
+deviceToken: string,		+deviceToken: string,
+codeVersion: ?number,		+codeVersion: ?number,
};		};
type PushUserInfo = {		type PushUserInfo = {
▲ Show 20 Lines • Show All 469 Lines • ▼ Show 20 Lines	function prepareAndroidNotification(
dbID: string,		dbID: string,
codeVersion: number,		codeVersion: number,
): Object {		): Object {
const notifID = collapseKey ? collapseKey : dbID;		const notifID = collapseKey ? collapseKey : dbID;
const { merged, ...rest } = notifTextsForMessageInfo(		const { merged, ...rest } = notifTextsForMessageInfo(
allMessageInfos,		allMessageInfos,
threadInfo,		threadInfo,
);		);
const messageInfos = JSON.stringify(newRawMessageInfos);		const notification = {

if (badgeOnly && codeVersion < 69) {
// Older Android clients don't look at badgeOnly, so if we sent them the
// full payload they would treat it as a normal notif. Instead we will
// send them this payload that is missing an ID, which will prevent the
// system notif from being generated, but still allow for in-app notifs
// and badge updating.
return {
data: {		data: {
badge: unreadCount.toString(),		badge: unreadCount.toString(),
...rest,		...rest,
threadID: threadInfo.id,		threadID: threadInfo.id,
messageInfos,
},		},
};		};
}
return {		// The reason we only include `badgeOnly` for newer clients is because older
data: {		// clients don't know how to parse it. The reason we only include `id` for
badge: unreadCount.toString(),		// newer clients is that if the older clients see that field, they assume
...rest,		// the notif has a full payload, and then crash when trying to parse it.
		// By skipping `id` we allow old clients to still handle in-app notifs and
		// badge updating.
		if (!badgeOnly \|\| codeVersion >= 69) {
		notification.data = {
		...notification.data,
id: notifID,		id: notifID,
threadID: threadInfo.id,
messageInfos,
badgeOnly: badgeOnly ? '1' : '0',		badgeOnly: badgeOnly ? '1' : '0',
},
};		};
}		}

		const messageInfos = JSON.stringify(newRawMessageInfos);
		const copyWithMessageInfos = {
		...notification,
		data: { ...notification.data, messageInfos },
		};

		if (
		Buffer.byteLength(JSON.stringify(copyWithMessageInfos)) <=
		fcmMaxNotificationPayloadByteSize
		) {
		return copyWithMessageInfos;
		}
		return notification;
		}

type NotificationInfo =		type NotificationInfo =
\| {		\| {
+source: 'new_message',		+source: 'new_message',
+dbID: string,		+dbID: string,
+userID: string,		+userID: string,
+threadID: string,		+threadID: string,
+messageID: string,		+messageID: string,
+collapseKey: ?string,		+collapseKey: ?string,
▲ Show 20 Lines • Show All 243 Lines • Show Last 20 Lines

View Options

nix/overlay.nix

Show All 39 Lines
import { fetchUserInfos } from '../fetchers/user-fetchers';		import { fetchUserInfos } from '../fetchers/user-fetchers';
import type { Viewer } from '../session/viewer';		import type { Viewer } from '../session/viewer';
import { getAPNsNotificationTopic } from './providers';		import { getAPNsNotificationTopic } from './providers';
import {		import {
apnPush,		apnPush,
fcmPush,		fcmPush,
getUnreadCounts,		getUnreadCounts,
apnMaxNotificationPayloadByteSize,		apnMaxNotificationPayloadByteSize,
		fcmMaxNotificationPayloadByteSize,
} from './utils';		} from './utils';

type Device = {		type Device = {
+deviceType: DeviceType,		+deviceType: DeviceType,
+deviceToken: string,		+deviceToken: string,
+codeVersion: ?number,		+codeVersion: ?number,
};		};
type PushUserInfo = {		type PushUserInfo = {
▲ Show 20 Lines • Show All 469 Lines • ▼ Show 20 Lines	function prepareAndroidNotification(
dbID: string,		dbID: string,
codeVersion: number,		codeVersion: number,
): Object {		): Object {
const notifID = collapseKey ? collapseKey : dbID;		const notifID = collapseKey ? collapseKey : dbID;
const { merged, ...rest } = notifTextsForMessageInfo(		const { merged, ...rest } = notifTextsForMessageInfo(
allMessageInfos,		allMessageInfos,
threadInfo,		threadInfo,
);		);
const messageInfos = JSON.stringify(newRawMessageInfos);		const notification = {

if (badgeOnly && codeVersion < 69) {
// Older Android clients don't look at badgeOnly, so if we sent them the
// full payload they would treat it as a normal notif. Instead we will
// send them this payload that is missing an ID, which will prevent the
// system notif from being generated, but still allow for in-app notifs
// and badge updating.
return {
data: {		data: {
badge: unreadCount.toString(),		badge: unreadCount.toString(),
...rest,		...rest,
threadID: threadInfo.id,		threadID: threadInfo.id,
messageInfos,
},		},
};		};
}
return {		// The reason we only include `badgeOnly` for newer clients is because older
data: {		// clients don't know how to parse it. The reason we only include `id` for
badge: unreadCount.toString(),		// newer clients is that if the older clients see that field, they assume
...rest,		// the notif has a full payload, and then crash when trying to parse it.
		// By skipping `id` we allow old clients to still handle in-app notifs and
		// badge updating.
		if (!badgeOnly \|\| codeVersion >= 69) {
		notification.data = {
		...notification.data,
id: notifID,		id: notifID,
threadID: threadInfo.id,
messageInfos,
badgeOnly: badgeOnly ? '1' : '0',		badgeOnly: badgeOnly ? '1' : '0',
},
};		};
}		}

		const messageInfos = JSON.stringify(newRawMessageInfos);
		const copyWithMessageInfos = {
		...notification,
		data: { ...notification.data, messageInfos },
		};

		if (
		Buffer.byteLength(JSON.stringify(copyWithMessageInfos)) <=
		fcmMaxNotificationPayloadByteSize
		) {
		return copyWithMessageInfos;
		}
		return notification;
		}

type NotificationInfo =		type NotificationInfo =
\| {		\| {
+source: 'new_message',		+source: 'new_message',
+dbID: string,		+dbID: string,
+userID: string,		+userID: string,
+threadID: string,		+threadID: string,
+messageID: string,		+messageID: string,
+collapseKey: ?string,		+collapseKey: ?string,
▲ Show 20 Lines • Show All 243 Lines • Show Last 20 Lines

[nix] Add dependencies needed to compile native modulesClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 13977

nix/dev-shell.nix

nix/overlay.nix

[nix] Add dependencies needed to compile native modules
ClosedPublic
Actions

Revision Contents
Changeset List