Page MenuHomePhabricator
Differential D12854

[lib] introduce message searching to `SQLiteAPI`
ClosedPublic
Actions

Authored by kamil on Jul 23 2024, 3:10 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 23, 12:45 AM
Unknown Object (File)
Wed, Apr 23, 12:01 AM
Unknown Object (File)
Tue, Apr 22, 10:08 AM
Unknown Object (File)
Mon, Apr 21, 2:33 AM
Unknown Object (File)
Sun, Apr 6, 8:30 AM
Unknown Object (File)
Mar 24 2025, 8:48 AM
Unknown Object (File)
Feb 21 2025, 2:55 AM
Unknown Object (File)
Feb 21 2025, 2:54 AM
View All 73 Files
Subscribers
ashoat
inka

Details

Reviewers
tomek
inka
Commits
rCOMM5d535a143135: [lib] introduce message searching to `SQLiteAPI`
Summary

This diff introduces a shared interface on SQLiteAPI so the JS code in lib can use this API on both platforms.

Depends on D12853

Test Plan

Tested later in the stack by @inka.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
types/
6 lines
utils/
__mocks__/
1 line
native/
database/
1 line
web/
database/
19 lines

Diff 42710

View Options

lib/types/sqlite-types.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines
View Options

lib/utils/__mocks__/config.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines
View Options

native/database/sqlite-api.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines
View Options

web/database/sqlite-api.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines