jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hiqua-no_lower_limit_query' into next-beta

This commit is contained in:
Evan Hahn 2021-04-14 13:43:24 -05:00 committed by Scott Nonnenberg
parent cb75e8b5f7 08905e1386
commit ea6562b7ac
9 changed files with 111 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -4,7 +4,7 @@
"description": "Private messaging from your desktop",
"desktopName": "signal.desktop",
"repository": "https://github.com/signalapp/Signal-Desktop.git",
"version": "5.0.0-beta.2",
"version": "5.0.0-beta.4",
"license": "AGPL-3.0-only",
"author": {
"name": "Open Whisper Systems",

12
stylesheets/_modules.scss
View File

@ -789,8 +789,8 @@
.module-message__generic-attachment__text {
flex-grow: 1;
margin-left: 8px;
// The width of the icon plus our 8px margin
max-width: calc(100% - 37px);
// The width of the icon plus our 8px margin plus 1px leeway
max-width: calc(100% - 36px);
}
.module-message__generic-attachment__file-name {
@ -11444,16 +11444,16 @@ $contact-modal-padding: 18px;
}
}
/* Spec: container < 437px */
@media (min-width: 0px) and (max-width: 799px) {
/* Spec: container < 515px */
@media (min-width: 0px) and (max-width: 834px) {
.module-message {
// Add 2px for 1px border
max-width: 302px;
}
}
/* Spec: container > 438px and container < 593px */
@media (min-width: 800px) and (max-width: 925px) {
/* Spec: container > 514px and container < 606px */
@media (min-width: 835px) and (max-width: 925px) {
.module-message {
// Add 2px for 1px border
max-width: 376px;

2
ts/components/MainHeader.tsx
View File

@ -205,7 +205,7 @@ export class MainHeader extends React.Component<PropsType, StateType> {
updateSearchTerm(searchTerm);
}
if (searchTerm.length < 2) {
if (searchTerm.length < 1) {
return;
}

3
ts/models/messages.ts
View File

@ -3814,8 +3814,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
Math.min(readSync.get('read_at'), Date.now())
);
}
}
if (readSync || message.isExpirationTimerUpdate()) {
message.unset('unread');
// This is primarily to allow the conversation to mark all older
// messages as read, as is done when we receive a read sync for

175
ts/services/storage.ts
View File

@ -32,6 +32,7 @@ import {
import { ConversationModel } from '../models/conversations';
import { storageJobQueue } from '../util/JobQueue';
import { sleep } from '../util/sleep';
import { isMoreRecentThan } from '../util/timestamp';
import { isStorageWriteFeatureEnabled } from '../storage/isFeatureEnabled';
const {
@ -41,7 +42,7 @@ const {
let consecutiveStops = 0;
let consecutiveConflicts = 0;
const forcedPushBucket: Array<number> = [];
const uploadBucket: Array<number> = [];
const validRecordTypes = new Set([
0, // UNKNOWN
@ -125,6 +126,7 @@ type GeneratedManifestType = {
async function generateManifest(
version: number,
previousManifest?: ManifestRecordClass,
isNewManifest = false
): Promise<GeneratedManifestType> {
window.log.info(
@ -138,6 +140,7 @@ async function generateManifest(
const ITEM_TYPE = window.textsecure.protobuf.ManifestRecord.Identifier.Type;
const conversationsToUpdate = [];
const insertKeys: Array<string> = [];
const deleteKeys: Array<ArrayBuffer> = [];
const manifestRecordKeys: Set<ManifestRecordIdentifierClass> = new Set();
const newItems: Set<StorageItemClass> = new Set();
@ -206,6 +209,7 @@ async function generateManifest(
newItems.add(storageItem);
if (storageID) {
insertKeys.push(storageID);
window.log.info(
'storageService.generateManifest: new key',
conversation.idForLogging(),
@ -343,6 +347,60 @@ async function generateManifest(
storageKeyDuplicates.clear();
// If we have a copy of what the current remote manifest is then we run these
// additional validations comparing our pending manifest to the remote
// manifest:
if (previousManifest) {
const pendingInserts: Set<string> = new Set();
const pendingDeletes: Set<string> = new Set();
const remoteKeys: Set<string> = new Set();
previousManifest.keys.forEach(
(identifier: ManifestRecordIdentifierClass) => {
const storageID = arrayBufferToBase64(identifier.raw.toArrayBuffer());
remoteKeys.add(storageID);
}
);
const localKeys: Set<string> = new Set();
manifestRecordKeys.forEach((identifier: ManifestRecordIdentifierClass) => {
const storageID = arrayBufferToBase64(identifier.raw.toArrayBuffer());
localKeys.add(storageID);
if (!remoteKeys.has(storageID)) {
pendingInserts.add(storageID);
}
});
remoteKeys.forEach(storageID => {
if (!localKeys.has(storageID)) {
pendingDeletes.add(storageID);
}
});
if (deleteKeys.length !== pendingDeletes.size) {
throw new Error('invalid write delete keys length do not match');
}
if (newItems.size !== pendingInserts.size) {
throw new Error('invalid write insert items length do not match');
}
deleteKeys.forEach(key => {
const storageID = arrayBufferToBase64(key);
if (!pendingDeletes.has(storageID)) {
throw new Error(
'invalid write delete key missing from pending deletes'
);
}
});
insertKeys.forEach(storageID => {
if (!pendingInserts.has(storageID)) {
throw new Error(
'invalid write insert key missing from pending inserts'
);
}
});
}
const manifestRecord = new window.textsecure.protobuf.ManifestRecord();
manifestRecord.version = version;
manifestRecord.keys = Array.from(manifestRecordKeys);
@ -488,7 +546,7 @@ async function createNewManifest() {
conversationsToUpdate,
newItems,
storageManifest,
} = await generateManifest(version, true);
} = await generateManifest(version, undefined, true);
await uploadManifest(version, {
conversationsToUpdate,
@ -715,17 +773,7 @@ async function processManifest(
});
});
// if the remote only keys are larger or equal to our local keys then it
// was likely a forced push of storage service. We keep track of these
// merges so that we can detect possible infinite loops
const isForcePushed = remoteOnlyRecords.size >= localKeys.size;
const conflictCount = await processRemoteRecords(
remoteOnlyRecords,
isForcePushed
);
let hasConflicts = conflictCount !== 0;
const conflictCount = await processRemoteRecords(remoteOnlyRecords);
// Post-merge, if our local records contain any storage IDs that were not
// present in the remote manifest then we'll need to clear it, generate a
@ -740,21 +788,16 @@ async function processManifest(
redactStorageID(storageID),
conversation.idForLogging()
);
conversation.set({
needsStorageServiceSync: true,
storageID: undefined,
});
conversation.unset('storageID');
updateConversation(conversation.attributes);
hasConflicts = true;
}
});
return hasConflicts;
return conflictCount !== 0;
}
async function processRemoteRecords(
remoteOnlyRecords: Map<string, RemoteRecord>,
isForcePushed = false
remoteOnlyRecords: Map<string, RemoteRecord>
): Promise<number> {
const storageKeyBase64 = window.storage.get('storageKey');
const storageKey = base64ToArrayBuffer(storageKeyBase64);
@ -917,50 +960,6 @@ async function processRemoteRecords(
// fresh.
window.storage.put('storage-service-error-records', newRecordsWithErrors);
const now = Date.now();
if (isForcePushed) {
window.log.info(
'storageService.processRemoteRecords: remote manifest was likely force pushed',
now
);
forcedPushBucket.push(now);
// we need to check our conversations because maybe all of them were not
// updated properly, for those that weren't we'll clear their storage
// key so that they can be included in the next update
window.getConversations().forEach((conversation: ConversationModel) => {
const storageID = conversation.get('storageID');
if (storageID && !remoteOnlyRecords.has(storageID)) {
window.log.info(
'storageService.processRemoteRecords: clearing storageID',
conversation.idForLogging()
);
conversation.unset('storageID');
}
});
if (forcedPushBucket.length >= 3) {
const [firstMostRecentForcedPush] = forcedPushBucket;
if (now - firstMostRecentForcedPush < 5 * MINUTE) {
window.log.info(
'storageService.processRemoteRecords: thrasing? Backing off'
);
const error = new Error();
error.code = 'E_BACKOFF';
throw error;
}
window.log.info(
'storageService.processRemoteRecords: thrash timestamp of first -> now',
firstMostRecentForcedPush,
now
);
forcedPushBucket.shift();
}
}
if (conflictCount !== 0) {
window.log.info(
'storageService.processRemoteRecords: ' +
@ -981,13 +980,13 @@ async function processRemoteRecords(
return 0;
}
async function sync(): Promise<void> {
async function sync(): Promise<ManifestRecordClass | undefined> {
if (!isStorageWriteFeatureEnabled()) {
window.log.info(
'storageService.sync: Not starting desktop.storage is falsey'
);
return;
return undefined;
}
if (!window.storage.get('storageKey')) {
@ -996,6 +995,7 @@ async function sync(): Promise<void> {
window.log.info('storageService.sync: starting...');
let manifest: ManifestRecordClass | undefined;
try {
// If we've previously interacted with strage service, update 'fetchComplete' record
const previousFetchComplete = window.storage.get('storageFetchComplete');
@ -1005,12 +1005,12 @@ async function sync(): Promise<void> {
}
const localManifestVersion = manifestFromStorage || 0;
const manifest = await fetchManifest(localManifestVersion);
manifest = await fetchManifest(localManifestVersion);
// Guarding against no manifests being returned, everything should be ok
if (!manifest) {
window.log.info('storageService.sync: no new manifest');
return;
return undefined;
}
const version = manifest.version.toNumber();
@ -1033,16 +1033,10 @@ async function sync(): Promise<void> {
'storageService.sync: error processing manifest',
err && err.stack ? err.stack : String(err)
);
// When we're told to backoff, backoff to the max which should be
// ~5 minutes. If this job was running inside a queue it'll probably time
// out.
if (err.code === 'E_BACKOFF') {
await backOff(9001);
}
}
window.log.info('storageService.sync: complete');
return manifest;
}
async function upload(fromSync = false): Promise<void> {
@ -1058,6 +1052,22 @@ async function upload(fromSync = false): Promise<void> {
throw new Error('storageService.upload: We are offline!');
}
// Rate limit uploads coming from syncing
if (fromSync) {
uploadBucket.push(Date.now());
if (uploadBucket.length >= 3) {
const [firstMostRecentWrite] = uploadBucket;
if (isMoreRecentThan(5 * MINUTE, firstMostRecentWrite)) {
throw new Error(
'storageService.uploadManifest: too many writes too soon.'
);
}
uploadBucket.shift();
}
}
if (!window.storage.get('storageKey')) {
// requesting new keys runs the sync job which will detect the conflict
// and re-run the upload job once we're merged and up-to-date.
@ -1069,11 +1079,12 @@ async function upload(fromSync = false): Promise<void> {
return;
}
let previousManifest: ManifestRecordClass | undefined;
if (!fromSync) {
// Syncing before we upload so that we repair any unknown records and
// records with errors as well as ensure that we have the latest up to date
// manifest.
await sync();
previousManifest = await sync();
}
const localManifestVersion = window.storage.get('manifestVersion') || 0;
@ -1085,7 +1096,7 @@ async function upload(fromSync = false): Promise<void> {
);
try {
const generatedManifest = await generateManifest(version);
const generatedManifest = await generateManifest(version, previousManifest);
await uploadManifest(version, generatedManifest);
} catch (err) {
if (err.code === 409) {
@ -1131,7 +1142,9 @@ export const storageServiceUploadJob = debounce(() => {
return;
}
storageJobQueue(upload, `upload v${window.storage.get('manifestVersion')}`);
storageJobQueue(async () => {
await upload();
}, `upload v${window.storage.get('manifestVersion')}`);
}, 500);
export const runStorageServiceSyncJob = debounce(() => {
@ -1142,5 +1155,7 @@ export const runStorageServiceSyncJob = debounce(() => {
return;
}
storageJobQueue(sync, `sync v${window.storage.get('manifestVersion')}`);
storageJobQueue(async () => {
await sync();
}, `sync v${window.storage.get('manifestVersion')}`);
}, 500);

4
ts/services/storageRecordOps.ts
View File

@ -519,6 +519,10 @@ export async function mergeGroupV1Record(
conversation.idForLogging()
);
} else {
if (groupV1Record.id.byteLength !== 16) {
throw new Error('Not a valid gv1');
}
conversation = await window.ConversationController.getOrCreateAndWait(
groupId,
'group'

2
ts/sql/Server.ts
View File

@ -3438,7 +3438,7 @@ async function getUnprocessedCount(): Promise<number> {
const row = db.prepare<EmptyQuery>('SELECT count(*) from unprocessed;').get();
if (!row) {
throw new Error('getMessageCount: Unable to get count of unprocessed');
throw new Error('getUnprocessedCount: Unable to get count of unprocessed');
}
return row['count(*)'];

2
ts/state/ducks/search.ts
View File

@ -355,7 +355,7 @@ export function reducer(
const { payload } = action;
const { query } = payload;
const hasQuery = Boolean(query && query.length >= 2);
const hasQuery = Boolean(query);
const isWithinConversation = Boolean(state.searchConversationId);
return {

2
ts/state/selectors/search.ts
View File

@ -59,7 +59,7 @@ export const getStartSearchCounter = createSelector(
export const isSearching = createSelector(
getQuery,
(query: string): boolean => query.trim().length > 1
(query: string): boolean => query.trim().length > 0
);
export const getMessageSearchResultLookup = createSelector(