-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix sticker creator in our new typescriptified world
- Loading branch information
1 parent
f2af71f
commit 68f27c1
Showing
15 changed files
with
381 additions
and
311 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
|
|
||
| # Generated files | ||
| app/**/*.js | ||
| sticker-creator/**/*.js | ||
| config/local-*.json | ||
| config/local.json | ||
| dist/** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,290 +1,11 @@ | ||
| // Copyright 2019-2022 Signal Messenger, LLC | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
|
|
||
| import PQueue from 'p-queue'; | ||
| import Backbone from 'backbone'; | ||
| import './window/phase1-dependencies'; | ||
| import './window/phase2-signal'; | ||
| import './window/phase3-sticker-functions'; | ||
| import './window/phase4-theme'; | ||
|
|
||
| import { ipcRenderer as ipc } from 'electron'; | ||
| import sharp from 'sharp'; | ||
| import pify from 'pify'; | ||
| import { readFile } from 'fs'; | ||
| import { noop, uniqBy } from 'lodash'; | ||
|
|
||
| // It is important to call this as early as possible | ||
| import { SignalContext } from '../ts/windows/context'; | ||
|
|
||
| import { | ||
| deriveStickerPackKey, | ||
| encryptAttachment, | ||
| getRandomBytes, | ||
| } from '../ts/Crypto'; | ||
| import * as Bytes from '../ts/Bytes'; | ||
| import { SignalService as Proto } from '../ts/protobuf'; | ||
| import { getEnvironment } from '../ts/environment'; | ||
| import { createSetting } from '../ts/util/preload'; | ||
| import * as Attachments from '../ts/windows/attachments'; | ||
|
|
||
| import * as Signal from '../ts/signal'; | ||
| import { textsecure } from '../ts/textsecure'; | ||
|
|
||
| import { initialize as initializeWebAPI } from '../ts/textsecure/WebAPI'; | ||
| import { getAnimatedPngDataIfExists } from '../ts/util/getAnimatedPngDataIfExists'; | ||
|
|
||
| const { config } = SignalContext; | ||
| window.i18n = SignalContext.i18n; | ||
|
|
||
| const STICKER_SIZE = 512; | ||
| const MIN_STICKER_DIMENSION = 10; | ||
| const MAX_STICKER_DIMENSION = STICKER_SIZE; | ||
| const MAX_STICKER_BYTE_LENGTH = 300 * 1024; | ||
|
|
||
| window.ROOT_PATH = window.location.href.startsWith('file') ? '../../' : '/'; | ||
| window.getEnvironment = getEnvironment; | ||
| window.getVersion = () => window.SignalContext.config.version; | ||
|
|
||
| window.PQueue = PQueue; | ||
| window.Backbone = Backbone; | ||
|
|
||
| window.localeMessages = ipc.sendSync('locale-data'); | ||
|
|
||
| require('../ts/SignalProtocolStore'); | ||
|
|
||
| SignalContext.log.info('sticker-creator starting up...'); | ||
|
|
||
| window.Signal = Signal.setup({ | ||
| Attachments, | ||
| getRegionCode: () => { | ||
| throw new Error('Sticker Creator preload: Not implemented!'); | ||
| }, | ||
| logger: SignalContext.log, | ||
| userDataPath: SignalContext.config.userDataPath, | ||
| }); | ||
| window.textsecure = textsecure; | ||
|
|
||
| const WebAPI = initializeWebAPI({ | ||
| url: config.serverUrl, | ||
| storageUrl: config.storageUrl, | ||
| updatesUrl: config.updatesUrl, | ||
| directoryVersion: config.directoryVersion, | ||
| directoryUrl: config.directoryUrl, | ||
| directoryEnclaveId: config.directoryEnclaveId, | ||
| directoryTrustAnchor: config.directoryTrustAnchor, | ||
| directoryV2Url: config.directoryV2Url, | ||
| directoryV2PublicKey: config.directoryV2PublicKey, | ||
| directoryV2CodeHashes: config.directoryV2CodeHashes, | ||
| cdnUrlObject: { | ||
| 0: config.cdnUrl0, | ||
| 2: config.cdnUrl2, | ||
| }, | ||
| certificateAuthority: config.certificateAuthority, | ||
| contentProxyUrl: config.contentProxyUrl, | ||
| proxyUrl: config.proxyUrl, | ||
| version: config.version, | ||
| }); | ||
|
|
||
| function processStickerError(message: string, i18nKey: string): Error { | ||
| const result = new Error(message); | ||
| result.errorMessageI18nKey = i18nKey; | ||
| return result; | ||
| } | ||
|
|
||
| window.processStickerImage = async (path: string | undefined) => { | ||
| if (!path) { | ||
| throw new Error(`Path ${path} is not valid!`); | ||
| } | ||
|
|
||
| const imgBuffer = await pify(readFile)(path); | ||
| const sharpImg = sharp(imgBuffer); | ||
| const meta = await sharpImg.metadata(); | ||
|
|
||
| const { width, height } = meta; | ||
| if (!width || !height) { | ||
| throw processStickerError( | ||
| 'Sticker height or width were falsy', | ||
| 'StickerCreator--Toasts--errorProcessing' | ||
| ); | ||
| } | ||
|
|
||
| let contentType; | ||
| let processedBuffer; | ||
|
|
||
| // [Sharp doesn't support APNG][0], so we do something simpler: validate the file size | ||
| // and dimensions without resizing, cropping, or converting. In a perfect world, we'd | ||
| // resize and convert any animated image (GIF, animated WebP) to APNG. | ||
| // [0]: https://github.com/lovell/sharp/issues/2375 | ||
| const animatedPngDataIfExists = getAnimatedPngDataIfExists(imgBuffer); | ||
| if (animatedPngDataIfExists) { | ||
| if (imgBuffer.byteLength > MAX_STICKER_BYTE_LENGTH) { | ||
| throw processStickerError( | ||
| 'Sticker file was too large', | ||
| 'StickerCreator--Toasts--tooLarge' | ||
| ); | ||
| } | ||
| if (width !== height) { | ||
| throw processStickerError( | ||
| 'Sticker must be square', | ||
| 'StickerCreator--Toasts--APNG--notSquare' | ||
| ); | ||
| } | ||
| if (width > MAX_STICKER_DIMENSION) { | ||
| throw processStickerError( | ||
| 'Sticker dimensions are too large', | ||
| 'StickerCreator--Toasts--APNG--dimensionsTooLarge' | ||
| ); | ||
| } | ||
| if (width < MIN_STICKER_DIMENSION) { | ||
| throw processStickerError( | ||
| 'Sticker dimensions are too small', | ||
| 'StickerCreator--Toasts--APNG--dimensionsTooSmall' | ||
| ); | ||
| } | ||
| if (animatedPngDataIfExists.numPlays !== Infinity) { | ||
| throw processStickerError( | ||
| 'Animated stickers must loop forever', | ||
| 'StickerCreator--Toasts--mustLoopForever' | ||
| ); | ||
| } | ||
| contentType = 'image/png'; | ||
| processedBuffer = imgBuffer; | ||
| } else { | ||
| contentType = 'image/webp'; | ||
| processedBuffer = await sharpImg | ||
| .resize({ | ||
| width: STICKER_SIZE, | ||
| height: STICKER_SIZE, | ||
| fit: 'contain', | ||
| background: { r: 0, g: 0, b: 0, alpha: 0 }, | ||
| }) | ||
| .webp() | ||
| .toBuffer(); | ||
| if (processedBuffer.byteLength > MAX_STICKER_BYTE_LENGTH) { | ||
| throw processStickerError( | ||
| 'Sticker file was too large', | ||
| 'StickerCreator--Toasts--tooLarge' | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| return { | ||
| path, | ||
| buffer: processedBuffer, | ||
| src: `data:${contentType};base64,${processedBuffer.toString('base64')}`, | ||
| meta, | ||
| }; | ||
| }; | ||
|
|
||
| window.encryptAndUpload = async ( | ||
| manifest, | ||
| stickers, | ||
| cover, | ||
| onProgress = noop | ||
| ) => { | ||
| const usernameItem = await window.Signal.Data.getItemById('uuid_id'); | ||
| const oldUsernameItem = await window.Signal.Data.getItemById('number_id'); | ||
| const passwordItem = await window.Signal.Data.getItemById('password'); | ||
|
|
||
| const username = usernameItem?.value || oldUsernameItem?.value; | ||
| if (!username || !passwordItem?.value) { | ||
| const { message } = | ||
| window.localeMessages['StickerCreator--Authentication--error']; | ||
|
|
||
| ipc.send('show-message-box', { | ||
| type: 'warning', | ||
| message, | ||
| }); | ||
|
|
||
| throw new Error(message); | ||
| } | ||
|
|
||
| const { value: password } = passwordItem; | ||
|
|
||
| const packKey = getRandomBytes(32); | ||
| const encryptionKey = deriveStickerPackKey(packKey); | ||
| const iv = getRandomBytes(16); | ||
|
|
||
| const server = WebAPI.connect({ | ||
| username, | ||
| password, | ||
| useWebSocket: false, | ||
| }); | ||
|
|
||
| const uniqueStickers = uniqBy( | ||
| [...stickers, { imageData: cover }], | ||
| 'imageData' | ||
| ); | ||
|
|
||
| const manifestProto = new Proto.StickerPack(); | ||
| manifestProto.title = manifest.title; | ||
| manifestProto.author = manifest.author; | ||
| manifestProto.stickers = stickers.map(({ emoji }, id) => { | ||
| const s = new Proto.StickerPack.Sticker(); | ||
| s.id = id; | ||
| if (emoji) { | ||
| s.emoji = emoji; | ||
| } | ||
|
|
||
| return s; | ||
| }); | ||
| const coverSticker = new Proto.StickerPack.Sticker(); | ||
| coverSticker.id = | ||
| uniqueStickers.length === stickers.length ? 0 : uniqueStickers.length - 1; | ||
| coverSticker.emoji = ''; | ||
| manifestProto.cover = coverSticker; | ||
|
|
||
| const encryptedManifest = await encrypt( | ||
| Proto.StickerPack.encode(manifestProto).finish(), | ||
| encryptionKey, | ||
| iv | ||
| ); | ||
| const encryptedStickers = uniqueStickers.map(({ imageData }) => { | ||
| if (!imageData?.buffer) { | ||
| throw new Error('encryptStickers: Missing image data on sticker'); | ||
| } | ||
|
|
||
| return encrypt(imageData.buffer, encryptionKey, iv); | ||
| }); | ||
|
|
||
| const packId = await server.putStickers( | ||
| encryptedManifest, | ||
| encryptedStickers, | ||
| onProgress | ||
| ); | ||
|
|
||
| const hexKey = Bytes.toHex(packKey); | ||
|
|
||
| ipc.send('install-sticker-pack', packId, hexKey); | ||
|
|
||
| return { packId, key: hexKey }; | ||
| }; | ||
|
|
||
| function encrypt( | ||
| data: Uint8Array, | ||
| key: Uint8Array, | ||
| iv: Uint8Array | ||
| ): Uint8Array { | ||
| const { ciphertext } = encryptAttachment(data, key, iv); | ||
|
|
||
| return ciphertext; | ||
| } | ||
|
|
||
| const getThemeSetting = createSetting('themeSetting'); | ||
|
|
||
| async function resolveTheme() { | ||
| const theme = (await getThemeSetting.getValue()) || 'system'; | ||
| if (theme === 'system') { | ||
| return SignalContext.nativeThemeListener.getSystemTheme(); | ||
| } | ||
| return theme; | ||
| } | ||
|
|
||
| async function applyTheme() { | ||
| window.document.body.classList.remove('dark-theme'); | ||
| window.document.body.classList.remove('light-theme'); | ||
| window.document.body.classList.add(`${await resolveTheme()}-theme`); | ||
| } | ||
|
|
||
| window.addEventListener('DOMContentLoaded', applyTheme); | ||
|
|
||
| SignalContext.nativeThemeListener.subscribe(() => applyTheme()); | ||
|
|
||
| SignalContext.log.info('sticker-creator preload complete...'); |
Oops, something went wrong.