[nix] Enable C++17 support for Emscripten
ClosedPublic
Actions

Authored by kamil on Jul 12 2023, 6:18 AM.

Details

Reviewers

michal
tomek
• jon

Commits

rCOMM21bb64c23e31: [nix] Enable C++17 support for Emscripten

Summary

Emscripten is coupled with clang version, according to clang docs C++17 starts from Clang 5.0, while we are using Clang 14.0.6 so should be safe.

Depends on D8487

Test Plan

Run script

Diff Detail

Repository

rCOMM Comm

Branch

wasm-native

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

kamil created this revision.Jul 12 2023, 6:18 AM

kamil held this revision as a draft.

Herald added a subscriber: ashoat. · View Herald TranscriptJul 12 2023, 6:18 AM

kamil added inline comments.Jul 12 2023, 6:19 AM

web/scripts/run_emscripten.sh
102	this line causing hiding this file by phabricator, so adding a comment to show content

kamil added a child revision: D8489: [native] replace `uint` with `unsigned int`.Jul 12 2023, 6:21 AM

Harbormaster completed remote builds in B20903: Diff 28634.Jul 12 2023, 6:35 AM

kamil published this revision for review.Jul 12 2023, 7:36 AM

Are we already explicitly using c++17 in native (not c++14 with extensions for 17)? If not it would be good to use it.

This revision is now accepted and ready to land.Jul 14 2023, 2:26 AM

In D8488#250674, @michal wrote:

Are we already explicitly using c++17 in native (not c++14 with extensions for 17)?

I think so

Closed by commit rCOMM21bb64c23e31: [nix] Enable C++17 support for Emscripten (authored by kamil). · Explain WhyJul 20 2023, 6:56 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMM21bb64c23e31: [nix] Enable C++17 support for Emscripten.

Revision Contents
Changeset List

Path

Size

web/

scripts/

run_emscripten.sh

Diff 28634

View Options

web/scripts/run_emscripten.sh

// @flow		// @flow

import type { Utility as OlmUtility } from '@commapp/olm';		import type { Utility as OlmUtility } from '@commapp/olm';
import invariant from 'invariant';		import invariant from 'invariant';
import { ErrorTypes, SiweMessage } from 'siwe';		import { ErrorTypes, SiweMessage } from 'siwe';
import t from 'tcomb';		import t, { type TInterface } from 'tcomb';
import bcrypt from 'twin-bcrypt';		import bcrypt from 'twin-bcrypt';

import { baseLegalPolicies, policies } from 'lib/facts/policies.js';		import {
		baseLegalPolicies,
		policies,
		policyTypeValidator,
		} from 'lib/facts/policies.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js';		import { hasMinCodeVersion } from 'lib/shared/version-utils.js';
import type {		import type {
ResetPasswordRequest,		ResetPasswordRequest,
LogOutResponse,		LogOutResponse,
DeleteAccountRequest,		DeleteAccountRequest,
RegisterResponse,		RegisterResponse,
RegisterRequest,		RegisterRequest,
LogInResponse,		LogInResponse,
Show All 10 Lines
import type {		import type {
ClientAvatar,		ClientAvatar,
UpdateUserAvatarRequest,		UpdateUserAvatarRequest,
} from 'lib/types/avatar-types.js';		} from 'lib/types/avatar-types.js';
import type {		import type {
IdentityKeysBlob,		IdentityKeysBlob,
SignedIdentityKeysBlob,		SignedIdentityKeysBlob,
} from 'lib/types/crypto-types.js';		} from 'lib/types/crypto-types.js';
import type { CalendarQuery } from 'lib/types/entry-types.js';		import {
import { defaultNumberPerThread } from 'lib/types/message-types.js';		type CalendarQuery,
		rawEntryInfoValidator,
		} from 'lib/types/entry-types.js';
		import {
		defaultNumberPerThread,
		rawMessageInfoValidator,
		messageTruncationStatusesValidator,
		} from 'lib/types/message-types.js';
import type {		import type {
SIWEAuthRequest,		SIWEAuthRequest,
SIWEMessage,		SIWEMessage,
SIWESocialProof,		SIWESocialProof,
} from 'lib/types/siwe-types.js';		} from 'lib/types/siwe-types.js';
import type {		import type {
SubscriptionUpdateRequest,		SubscriptionUpdateRequest,
SubscriptionUpdateResponse,		SubscriptionUpdateResponse,
} from 'lib/types/subscription-types.js';		} from 'lib/types/subscription-types.js';
import type { PasswordUpdate } from 'lib/types/user-types.js';		import { rawThreadInfoValidator } from 'lib/types/thread-types.js';
		import {
		type PasswordUpdate,
		loggedOutUserInfoValidator,
		loggedInUserInfoValidator,
		oldLoggedInUserInfoValidator,
		userInfoValidator,
		} from 'lib/types/user-types.js';
import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js';		import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js';
import {		import {
identityKeysBlobValidator,		identityKeysBlobValidator,
signedIdentityKeysBlobValidator,		signedIdentityKeysBlobValidator,
} from 'lib/utils/crypto-utils.js';		} from 'lib/utils/crypto-utils.js';
import { ServerError } from 'lib/utils/errors.js';		import { ServerError } from 'lib/utils/errors.js';
import { values } from 'lib/utils/objects.js';		import { values } from 'lib/utils/objects.js';
import { promiseAll } from 'lib/utils/promises.js';		import { promiseAll } from 'lib/utils/promises.js';
import {		import {
getPublicKeyFromSIWEStatement,		getPublicKeyFromSIWEStatement,
isValidSIWEMessage,		isValidSIWEMessage,
isValidSIWEStatementWithPublicKey,		isValidSIWEStatementWithPublicKey,
primaryIdentityPublicKeyRegex,		primaryIdentityPublicKeyRegex,
} from 'lib/utils/siwe-utils.js';		} from 'lib/utils/siwe-utils.js';
import {		import {
tShape,		tShape,
tPlatformDetails,		tPlatformDetails,
tPassword,		tPassword,
tEmail,		tEmail,
tOldValidUsername,		tOldValidUsername,
tRegex,		tRegex,
		tID,
} from 'lib/utils/validation-utils.js';		} from 'lib/utils/validation-utils.js';

import {		import {
entryQueryInputValidator,		entryQueryInputValidator,
newEntryQueryInputValidator,		newEntryQueryInputValidator,
normalizeCalendarQuery,		normalizeCalendarQuery,
verifyCalendarQueryThreadIDs,		verifyCalendarQueryThreadIDs,
} from './entry-responders.js';		} from './entry-responders.js';
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Lines	return {
},		},
};		};
}		}

const deleteAccountRequestInputValidator = tShape({		const deleteAccountRequestInputValidator = tShape({
password: t.maybe(tPassword),		password: t.maybe(tPassword),
});		});

		export const logOutResponseValidator: TInterface<LogOutResponse> =
		tShape<LogOutResponse>({
		currentUserInfo: loggedOutUserInfoValidator,
		});

async function accountDeletionResponder(		async function accountDeletionResponder(
viewer: Viewer,		viewer: Viewer,
input: any,		input: any,
): Promise<LogOutResponse> {		): Promise<LogOutResponse> {
const request: DeleteAccountRequest = input;		const request: DeleteAccountRequest = input;
await validateInput(viewer, deleteAccountRequestInputValidator, request);		await validateInput(viewer, deleteAccountRequestInputValidator, request);
const result = await deleteAccount(viewer, request);		const result = await deleteAccount(viewer, request);
invariant(result, 'deleteAccount should return result if handed request');		invariant(result, 'deleteAccount should return result if handed request');
Show All 13 Lines	const registerRequestInputValidator = tShape({
deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator),		deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator),
platformDetails: tPlatformDetails,		platformDetails: tPlatformDetails,
// We include `primaryIdentityPublicKey` to avoid breaking		// We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it.		// old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),		primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),		signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
});		});

		export const registerResponseValidator: TInterface<RegisterResponse> =
		tShape<RegisterResponse>({
		id: t.String,
		rawMessageInfos: t.list(rawMessageInfoValidator),
		currentUserInfo: t.union([
		oldLoggedInUserInfoValidator,
		loggedInUserInfoValidator,
		]),
		cookieChange: tShape({
		threadInfos: t.dict(t.String, rawThreadInfoValidator),
		userInfos: t.list(userInfoValidator),
		}),
		});

async function accountCreationResponder(		async function accountCreationResponder(
viewer: Viewer,		viewer: Viewer,
input: any,		input: any,
): Promise<RegisterResponse> {		): Promise<RegisterResponse> {
const request: RegisterRequest = input;		const request: RegisterRequest = input;
await validateInput(viewer, registerRequestInputValidator, request);		await validateInput(viewer, registerRequestInputValidator, request);
const { signedIdentityKeysBlob } = request;		const { signedIdentityKeysBlob } = request;
if (signedIdentityKeysBlob) {		if (signedIdentityKeysBlob) {
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Lines	const logInRequestInputValidator = tShape({
platformDetails: tPlatformDetails,		platformDetails: tPlatformDetails,
source: t.maybe(t.enums.of(values(logInActionSources))),		source: t.maybe(t.enums.of(values(logInActionSources))),
// We include `primaryIdentityPublicKey` to avoid breaking		// We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it.		// old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),		primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),		signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
});		});

		export const logInResponseValidator: TInterface<LogInResponse> =
		tShape<LogInResponse>({
		currentUserInfo: t.union([
		loggedInUserInfoValidator,
		oldLoggedInUserInfoValidator,
		]),
		rawMessageInfos: t.list(rawMessageInfoValidator),
		truncationStatuses: messageTruncationStatusesValidator,
		userInfos: t.list(userInfoValidator),
		rawEntryInfos: t.maybe(t.list(rawEntryInfoValidator)),
		serverTime: t.Number,
		cookieChange: tShape({
		threadInfos: t.dict(tID, rawThreadInfoValidator),
		userInfos: t.list(userInfoValidator),
		}),
		notAcknowledgedPolicies: t.maybe(t.list(policyTypeValidator)),
		});

async function logInResponder(		async function logInResponder(
viewer: Viewer,		viewer: Viewer,
input: any,		input: any,
): Promise<LogInResponse> {		): Promise<LogInResponse> {
await validateInput(viewer, logInRequestInputValidator, input);		await validateInput(viewer, logInRequestInputValidator, input);
const request: LogInRequest = input;		const request: LogInRequest = input;

let identityKeys: ?IdentityKeysBlob;		let identityKeys: ?IdentityKeysBlob;
▲ Show 20 Lines • Show All 281 Lines • Show Last 20 Lines

[nix] Enable C++17 support for EmscriptenClosedPublicActions