From a989a1a8186bb8a267f7d79f42523616a1059f63 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Mon, 11 Feb 2019 13:08:17 +1100 Subject: [PATCH] Save previews locally. --- js/link_previews_helper.js | 41 +++++++++------------ js/models/messages.js | 65 +++++++++++++++++++++------------- js/modules/signal.js | 2 ++ js/modules/types/attachment.js | 1 + 4 files changed, 59 insertions(+), 50 deletions(-) diff --git a/js/link_previews_helper.js b/js/link_previews_helper.js index bb73d386a..adaf8378b 100644 --- a/js/link_previews_helper.js +++ b/js/link_previews_helper.js @@ -1,9 +1,10 @@ /* global Signal, textsecure, - dcodeIO, */ +/* eslint-disable no-bitwise */ + // eslint-disable-next-line func-names (function() { 'use strict'; @@ -11,29 +12,6 @@ window.Signal = window.Signal || {}; window.Signal.LinkPreviews = window.Signal.LinkPreviews || {}; - const base64ImageCache = {}; - - function getBase64Image(preview) { - const { url, image } = preview; - if (!url || !image || !image.data) return null; - - // Return the cached value - if (base64ImageCache[url]) return base64ImageCache[url]; - - // Set the cache and return the value - try { - const contentType = image.contentType || 'image/jpeg'; - const base64 = dcodeIO.ByteBuffer.wrap(image.data).toString('base64'); - - const data = `data:${contentType};base64, ${base64}`; - base64ImageCache[url] = data; - - return data; - } catch (e) { - return null; - } - } - async function makeChunkedRequest(url) { const PARALLELISM = 3; const size = await textsecure.messaging.getProxiedSize(url); @@ -83,6 +61,19 @@ }; } + function hashCode(string) { + let hash = 0; + if (string.length === 0) { + return hash; + } + for (let i = 0; i < string.length; i += 1) { + const char = string.charCodeAt(i); + hash = (hash << 5) - hash + char; + hash &= hash; // Convert to 32bit integer + } + return hash; + } + async function getPreview(url) { let html; try { @@ -145,11 +136,11 @@ title, url, image, + hash: hashCode(url), }; } window.Signal.LinkPreviews.helper = { getPreview, - getBase64Image, }; })(); diff --git a/js/models/messages.js b/js/models/messages.js index 2c6cf7d45..bc0e4b9b1 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -17,7 +17,12 @@ window.Whisper = window.Whisper || {}; - const { Message: TypedMessage, Contact, PhoneNumber } = Signal.Types; + const { + Message: TypedMessage, + Contact, + PhoneNumber, + Attachment, + } = Signal.Types; const { deleteAttachmentData, deleteExternalMessageFiles, @@ -26,6 +31,7 @@ loadQuoteData, loadPreviewData, writeNewAttachmentData, + writeAttachment, } = window.Signal.Migrations; window.AccountCache = Object.create(null); @@ -85,7 +91,7 @@ this.on('expired', this.onExpired); this.setToExpire(); - this.updatePreviews(); + this.updatePreview(); }, idForLogging() { return `${this.get('source')}.${this.get('sourceDevice')} ${this.get( @@ -111,7 +117,7 @@ // eslint-disable-next-line no-bitwise return !!(this.get('flags') & flag); }, - async updatePreviews() { + async updatePreview() { // Don't generate link previews if user has turned them off if (!storage.get('linkPreviews', false)) { return; @@ -141,15 +147,36 @@ try { const result = await Signal.LinkPreviews.helper.getPreview(firstLink); + const { image, title, hash } = result; + // A link preview isn't worth showing unless we have either a title or an image - if (!result || !(result.image || result.title)) { + if (!result || !(image || title)) { this.updatingPreview = false; return; } - // We don't want to save the base64 url in the message as - // it will increase the size of it, Rather we fetch the base64 later + // Save the image to disk + const { data } = image; + const extension = Attachment.getFileExtension(image); + if (data && extension) { + try { + const filePath = await writeAttachment({ + data, + path: `previews/${hash}.${extension}`, + }); + + // return the image without the data + result.image = _.omit({ ...image, path: filePath }, 'data'); + } catch (e) { + window.log.warn('Failed to write preview to disk', e); + } + } + + // Save it!! this.set({ preview: [result] }); + await window.Signal.Data.saveMessage(this.attributes, { + Message: Whisper.Message, + }); } catch (e) { window.log.warn(`Failed to load previews for message: ${this.id}`); } finally { @@ -669,25 +696,13 @@ const previews = this.get('preview') || []; return previews.map(preview => { - let image = {}; - - // Try set the image from the attachment otherwise just pass in the object - if (preview.image) { - try { - const attachmentProps = this.getPropsForAttachment(preview.image); - if (attachmentProps.url) { - image = attachmentProps; - } - } catch (e) { - // Only set the image if we have a url to display - const url = Signal.LinkPreviews.helper.getBase64Image(preview); - if (preview.image.url || url) { - image = { - ...preview.image, - url: preview.image.url || url, - }; - } + let image = null; + try { + if (preview.image) { + image = this.getPropsForAttachment(preview.image); } + } catch (e) { + window.log.info('Failed to show preview'); } return { @@ -1383,7 +1398,7 @@ }); // Update the previews if we need to - message.updatePreviews(); + message.updatePreview(); if (type === 'outgoing') { const receipts = Whisper.DeliveryReceipts.forMessage( diff --git a/js/modules/signal.js b/js/modules/signal.js index bde4104ab..f97a421a1 100644 --- a/js/modules/signal.js +++ b/js/modules/signal.js @@ -169,6 +169,8 @@ function initializeMigrations({ logger, }), writeNewAttachmentData: createWriterForNew(attachmentsPath), + writeAttachment: ({ data, path }) => + createWriterForExisting(attachmentsPath)({ data, path }), }; } diff --git a/js/modules/types/attachment.js b/js/modules/types/attachment.js index 272c0d439..0a6352350 100644 --- a/js/modules/types/attachment.js +++ b/js/modules/types/attachment.js @@ -208,6 +208,7 @@ exports.deleteData = deleteOnDisk => { exports.isVoiceMessage = AttachmentTS.isVoiceMessage; exports.save = AttachmentTS.save; +exports.getFileExtension = AttachmentTS.getFileExtension; const THUMBNAIL_SIZE = 150; const THUMBNAIL_CONTENT_TYPE = 'image/png';