Page MenuHomePhabricator
Differential D8551

[native] overload `SQLiteQueryExecutor` constructor
ClosedPublic
Actions

Authored by kamil on Jul 19 2023, 5:36 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 10:35 AM
Unknown Object (File)
Sat, Mar 15, 6:10 PM
Unknown Object (File)
Fri, Mar 7, 3:50 AM
Unknown Object (File)
Thu, Mar 6, 8:44 PM
Unknown Object (File)
Tue, Mar 4, 10:56 PM
Unknown Object (File)
Tue, Mar 4, 7:50 PM
Unknown Object (File)
Tue, Mar 4, 5:54 PM
Unknown Object (File)
Tue, Mar 4, 5:53 PM
View All Files
Subscribers
ashoat

Details

Reviewers
michal
tomek
• jon
Commits
rCOMM87e2ffdb590e: [native] overload `SQLiteQueryExecutor` constructor
Summary

On web, we will need to pass database path (path to virtual file in memory) from JS, and the best way will be to achieve this via constructor.

Depends on D8550

Test Plan

N/A

Diff Detail

Repository
rCOMM Comm
Branch
wasm-publish
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Jul 19 2023, 5:36 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptJul 19 2023, 5:36 AM
kamil updated this revision to Diff 28825.Jul 19 2023, 5:38 AM

remove debug

Harbormaster completed remote builds in B21028: Diff 28824.Jul 19 2023, 5:53 AM
Harbormaster completed remote builds in B21029: Diff 28825.Jul 19 2023, 5:57 AM
kamil added a child revision: D8552: [web] add `std::vector` (C++) <-> `Array` (JS) marshalling.Jul 19 2023, 6:37 AM
kamil published this revision for review.Jul 19 2023, 9:00 AM
michal accepted this revision.Jul 20 2023, 7:53 AM
michal added inline comments.
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
942–945 ↗(On Diff #28825)

Not really sure what the best practices for this are in c++, but can we do sth like call the arg-less constructor, from another constructor instead of calling migrate?

This revision is now accepted and ready to land.Jul 20 2023, 7:53 AM
kamil added inline comments.Jul 27 2023, 4:42 AM
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
942–945 ↗(On Diff #28825)

I think we can do sth like:

SQLiteQueryExecutor::SQLiteQueryExecutor() 
  : SQLiteQueryExecutor(*default path*) {}

SQLiteQueryExecutor::SQLiteQueryExecutor(std::string sqliteFilePath) {
  SQLiteQueryExecutor::sqliteFilePath = sqliteFilePath;
  SQLiteQueryExecutor::migrate();
}

but we do not have a default path and this is less readable

Closed by commit rCOMM87e2ffdb590e: [native] overload `SQLiteQueryExecutor` constructor (authored by kamil). · Explain WhyJul 27 2023, 5:06 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM87e2ffdb590e: [native] overload `SQLiteQueryExecutor` constructor.

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
DatabaseManagers/
1 line
51 lines

Diff 28824

View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h

// @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 Linesconst 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 Linesconst 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
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

// @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 Linesconst 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 Linesconst 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