From 475c92eeb484583a02ba1ee603e4139a2df0a070 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 7 Apr 2022 11:42:22 +1000 Subject: [PATCH] migrate about_start to not use jquery --- about.html | 7 +- about_preload.js | 3 - debug_log.html | 15 +++- debug_log_preload.js | 8 -- password.html | 6 +- password_preload.js | 3 - preload.js | 3 - stylesheets/_session.scss | 3 + ts/components/leftpane/ActionsPanel.tsx | 13 --- .../settings/section/CategoryAppearance.tsx | 6 +- ts/data/data.ts | 7 +- ts/data/dataInit.ts | 1 - ts/mains/about_start.ts | 29 +++++++ ts/{starts => mains}/debug_log_start.tsx | 4 +- ts/mains/main_node.ts | 25 +++--- ts/{starts => mains}/password_start.tsx | 0 ts/node/config.ts | 1 + ts/node/encrypt_attachment_buffer.ts | 1 + ts/node/logging.ts | 1 + ts/node/sql.ts | 34 +------- ts/receiver/dataMessage.ts | 3 +- ts/session/sending/MessageSender.ts | 3 +- ts/starts/about_start.ts | 26 ------ ts/util/logging.ts | 6 +- ts/views/DebugLogView.tsx | 84 ++++++++++++------- ts/webworker/workers/util.worker.ts | 2 +- 26 files changed, 139 insertions(+), 155 deletions(-) create mode 100644 ts/mains/about_start.ts rename ts/{starts => mains}/debug_log_start.tsx (71%) rename ts/{starts => mains}/password_start.tsx (100%) delete mode 100644 ts/starts/about_start.ts diff --git a/about.html b/about.html index 61d3213c2..b9f8892cb 100644 --- a/about.html +++ b/about.html @@ -11,7 +11,7 @@ img-src 'self' blob: data:; media-src 'self' blob:; object-src 'none'; - script-src 'self'; + script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline';" /> @@ -49,7 +49,8 @@ Terms of Service - - + diff --git a/about_preload.js b/about_preload.js index 6706a6437..db2c428ad 100644 --- a/about_preload.js +++ b/about_preload.js @@ -8,9 +8,6 @@ const config = url.parse(window.location.toString(), true).query; const { locale } = config; const localeMessages = ipcRenderer.sendSync('locale-data'); -global.dcodeIO = global.dcodeIO || {}; -global.dcodeIO.ByteBuffer = require('bytebuffer'); - window.getEnvironment = () => config.environment; window.getVersion = () => config.version; window.getCommitHash = () => config.commitHash; diff --git a/debug_log.html b/debug_log.html index abe498909..a2ae79656 100644 --- a/debug_log.html +++ b/debug_log.html @@ -11,15 +11,22 @@ img-src 'self' blob: data:; media-src 'self' blob:; object-src 'none'; - script-src 'self'; + script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline';" /> - + +
- - + + diff --git a/debug_log_preload.js b/debug_log_preload.js index cb561f955..4fa7f0fc8 100644 --- a/debug_log_preload.js +++ b/debug_log_preload.js @@ -3,15 +3,10 @@ const { ipcRenderer } = require('electron'); const url = require('url'); const i18n = require('./ts/util/i18n'); -const { DebugLogView } = require('./ts/views/DebugLogView'); - const config = url.parse(window.location.toString(), true).query; const { locale } = config; const localeMessages = ipcRenderer.sendSync('locale-data'); -global.dcodeIO = global.dcodeIO || {}; -global.dcodeIO.ByteBuffer = require('bytebuffer'); - window._ = require('lodash'); window.React = require('react'); @@ -35,7 +30,4 @@ window.getCommitHash = () => config.commitHash; window.closeDebugLog = () => ipcRenderer.send('close-debug-log'); -window.Views = {}; -window.Views.DebugLogView = DebugLogView; - window.saveLog = logText => ipcRenderer.send('save-debug-log', logText); diff --git a/password.html b/password.html index 1c7f3c002..c25c2a502 100644 --- a/password.html +++ b/password.html @@ -11,7 +11,7 @@ img-src 'self' blob: data:; media-src 'self' blob:; object-src 'none'; - script-src 'self'; + script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline';" /> @@ -28,6 +28,8 @@ - + diff --git a/password_preload.js b/password_preload.js index 8452a361d..76d3c6ff9 100644 --- a/password_preload.js +++ b/password_preload.js @@ -8,9 +8,6 @@ const config = url.parse(window.location.toString(), true).query; const { locale } = config; const localeMessages = ipcRenderer.sendSync('locale-data'); -global.dcodeIO = global.dcodeIO || {}; -global.dcodeIO.ByteBuffer = require('bytebuffer'); - window.React = require('react'); window.ReactDOM = require('react-dom'); diff --git a/preload.js b/preload.js index bdc12ca9c..bc7dfa706 100644 --- a/preload.js +++ b/preload.js @@ -15,9 +15,6 @@ if (config.appInstance) { } // tslint:disable: no-require-imports no-var-requires -global.dcodeIO = global.dcodeIO || {}; -global.dcodeIO.ByteBuffer = require('bytebuffer'); - window.platform = process.platform; window.getTitle = () => title; window.getEnvironment = () => configAny.environment; diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 5af810b38..53f23bd74 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -1,5 +1,8 @@ $onionPathLineColor: rgba(#7a7a7a, 0.6); +#root { + height: 100%; +} .subtle { opacity: $session-subtle-factor; } diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 1a1aec5f5..42b31bc84 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -9,7 +9,6 @@ import { hasSyncedInitialConfigurationItem, lastAvatarUploadTimestamp, removeConversation, - removeOneOpenGroupV1Message, } from '../../data/data'; import { getMessageQueue } from '../../session/sending'; import { useDispatch, useSelector } from 'react-redux'; @@ -192,16 +191,6 @@ const triggerSyncIfNeeded = async () => { } }; -const scheduleDeleteOpenGroupV1Messages = async () => { - const leftToRemove = await removeOneOpenGroupV1Message(); - if (leftToRemove > 0) { - window?.log?.info(`We still have ${leftToRemove} opengroupv1 messages to remove...`); - setTimeout(scheduleDeleteOpenGroupV1Messages, 10000); - } else { - window?.log?.info('No more opengroupv1 messages to remove...'); - } -}; - const removeAllV1OpenGroups = async () => { const allV1Convos = (await getAllOpenGroupV1Conversations()).models || []; // do not remove messages of opengroupv1 for now. We have to find a way of doing it without making the whole app extremely slow @@ -222,8 +211,6 @@ const removeAllV1OpenGroups = async () => { window.log.warn(`failed to delete opengroupv1 ${v1Convo.id}`, e); } } - - setTimeout(scheduleDeleteOpenGroupV1Messages, 10000); }; const triggerAvatarReUploadIfNeeded = async () => { diff --git a/ts/components/settings/section/CategoryAppearance.tsx b/ts/components/settings/section/CategoryAppearance.tsx index 39d47d4b3..975f74265 100644 --- a/ts/components/settings/section/CategoryAppearance.tsx +++ b/ts/components/settings/section/CategoryAppearance.tsx @@ -3,7 +3,11 @@ import React from 'react'; import { useDispatch, useSelector } from 'react-redux'; // tslint:disable-next-line: no-submodule-imports import useUpdate from 'react-use/lib/useUpdate'; -import { createOrUpdateItem, hasLinkPreviewPopupBeenDisplayed } from '../../../data/data'; +import { + createOrUpdateItem, + fillWithTestData, + hasLinkPreviewPopupBeenDisplayed, +} from '../../../data/data'; import { ToastUtils } from '../../../session/utils'; import { updateConfirmModal } from '../../../state/ducks/modalDialog'; import { toggleAudioAutoplay } from '../../../state/ducks/userConfig'; diff --git a/ts/data/data.ts b/ts/data/data.ts index a5d9527ed..5149a8819 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -3,15 +3,10 @@ import _ from 'lodash'; import { MessageResultProps } from '../components/search/MessageSearchResults'; -import { - ConversationCollection, - ConversationModel, - ConversationTypeEnum, -} from '../models/conversation'; +import { ConversationCollection, ConversationModel } from '../models/conversation'; import { MessageCollection, MessageModel } from '../models/message'; import { MessageAttributes, MessageDirection } from '../models/messageType'; import { HexKeyPair } from '../receiver/keypairs'; -import { getConversationController } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; import { PubKey } from '../session/types'; import { ReduxConversationType } from '../state/ducks/conversations'; diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts index fc035b21c..efdcc29fa 100644 --- a/ts/data/dataInit.ts +++ b/ts/data/dataInit.ts @@ -89,7 +89,6 @@ const channelsToMake = new Set([ 'getLatestClosedGroupEncryptionKeyPair', 'addClosedGroupEncryptionKeyPair', 'removeAllClosedGroupEncryptionKeyPairs', - 'removeOneOpenGroupV1Message', 'fillWithTestData', ...channelsToMakeForOpengroupV2, ]); diff --git a/ts/mains/about_start.ts b/ts/mains/about_start.ts new file mode 100644 index 000000000..c435a1c98 --- /dev/null +++ b/ts/mains/about_start.ts @@ -0,0 +1,29 @@ +// Add version and commit hash + +global.setTimeout(() => { + const version = document.getElementsByClassName('version').item(0); + + const commit = document.getElementsByClassName('commitHash').item(0); + const environment = document.getElementsByClassName('environment').item(0); + + // Add debugging metadata - environment if not production, app instance name + const states = []; + + if (window.getEnvironment() !== 'production') { + states.push(window.getEnvironment()); + } + if (window.getAppInstance()) { + states.push(window.getAppInstance()); + } + if (version) { + version.innerHTML = `v${window.getVersion()}`; + } + + if (commit) { + commit.innerHTML = window.getCommitHash() || ''; + } + + if (environment) { + environment.innerHTML = states.join(' - '); + } +}, 1000); diff --git a/ts/starts/debug_log_start.tsx b/ts/mains/debug_log_start.tsx similarity index 71% rename from ts/starts/debug_log_start.tsx rename to ts/mains/debug_log_start.tsx index eafbec0f4..4d0988473 100644 --- a/ts/starts/debug_log_start.tsx +++ b/ts/mains/debug_log_start.tsx @@ -13,4 +13,6 @@ import { DebugLogView } from '../views/DebugLogView'; // }); // Whisper ? -window.ReactDOM.render(, document.getElementById('root')); +global.setTimeout(() => { + window.ReactDOM.render(, document.getElementById('root')); +}, 1000); diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index 7e0905d94..8cabc68f8 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -28,7 +28,6 @@ import packageJson from '../../package.json'; // checked - only node setupGlobalErrorHandler(); import electronLocalshortcut from 'electron-localshortcut'; -console; // tslint:disable: no-console @@ -493,13 +492,13 @@ async function showPasswordWindow() { minHeight, autoHideMenuBar: false, webPreferences: { - nodeIntegration: false, + nodeIntegration: true, enableRemoteModule: true, nodeIntegrationInWorker: false, contextIsolation: false, // sandbox: true, - preload: path.join(__dirname, '..', 'password_preload.js'), + preload: path.join(__dirname, '..', '..', 'password_preload.js'), nativeWindowOpen: true, }, // don't setup icon, the executable one will be used by default @@ -507,7 +506,7 @@ async function showPasswordWindow() { passwordWindow = new BrowserWindow(windowOptions); - await passwordWindow.loadURL(prepareURL([__dirname, 'password.html'])); + await passwordWindow.loadURL(prepareURL([__dirname, '..', '..', 'password.html'])); captureClicks(passwordWindow); @@ -560,17 +559,17 @@ async function showAbout() { const options = { width: 500, - height: 400, - resizable: false, + height: 500, + resizable: true, title: locale.messages.about, autoHideMenuBar: true, backgroundColor: '#000', show: false, webPreferences: { - nodeIntegration: false, + nodeIntegration: true, nodeIntegrationInWorker: false, contextIsolation: false, - preload: path.join(__dirname, '..', 'about_preload.js'), + preload: path.join(__dirname, '..', '..', 'about_preload.js'), nativeWindowOpen: true, }, parent: mainWindow, @@ -580,7 +579,7 @@ async function showAbout() { captureClicks(aboutWindow); - await aboutWindow.loadURL(prepareURL([__dirname, 'about.html'])); + await aboutWindow.loadURL(prepareURL([__dirname, '..', '..', 'about.html'])); aboutWindow.on('closed', () => { aboutWindow = null; @@ -608,17 +607,17 @@ async function showDebugLogWindow() { const options = { width: Math.max(size[0] - 100, WINDOW_SIZE.minWidth), height: Math.max(size[1] - 100, WINDOW_SIZE.minHeight), - resizable: false, + resizable: true, title: locale.messages.debugLog, autoHideMenuBar: true, backgroundColor: '#000', show: false, modal: true, webPreferences: { - nodeIntegration: false, + nodeIntegration: true, nodeIntegrationInWorker: false, contextIsolation: false, - preload: path.join(__dirname, '..', 'debug_log_preload.js'), + preload: path.join(__dirname, '..', '..', 'debug_log_preload.js'), nativeWindowOpen: true, }, parent: mainWindow, @@ -628,7 +627,7 @@ async function showDebugLogWindow() { captureClicks(debugLogWindow); - await debugLogWindow.loadURL(prepareURL([__dirname, 'debug_log.html'], { theme })); + await debugLogWindow.loadURL(prepareURL([__dirname, '..', '..', 'debug_log.html'], { theme })); debugLogWindow.on('closed', () => { debugLogWindow = null; diff --git a/ts/starts/password_start.tsx b/ts/mains/password_start.tsx similarity index 100% rename from ts/starts/password_start.tsx rename to ts/mains/password_start.tsx diff --git a/ts/node/config.ts b/ts/node/config.ts index c50bcdcbb..5890f8dc9 100644 --- a/ts/node/config.ts +++ b/ts/node/config.ts @@ -31,6 +31,7 @@ if (environment === 'production') { } // We load config after we've made our modifications to NODE_ENV +//tslint-disable no-require-imports no-var-requires const c = require('config'); (c as any).environment = environment; diff --git a/ts/node/encrypt_attachment_buffer.ts b/ts/node/encrypt_attachment_buffer.ts index 54dea5f83..d3bb279cc 100644 --- a/ts/node/encrypt_attachment_buffer.ts +++ b/ts/node/encrypt_attachment_buffer.ts @@ -50,6 +50,7 @@ export async function encryptAttachmentBufferNode( sodium.crypto_secretstream_xchacha20poly1305_TAG_FINAL ); + //tslint-disable restrict-plus-operands const encryptedBufferWithHeader = new Uint8Array(bufferOut.length + header.length); encryptedBufferWithHeader.set(header); encryptedBufferWithHeader.set(bufferOut, header.length); diff --git a/ts/node/logging.ts b/ts/node/logging.ts index e34c53907..a95306da7 100644 --- a/ts/node/logging.ts +++ b/ts/node/logging.ts @@ -64,6 +64,7 @@ export async function initializeLogger() { ipc.on('fetch-log', event => { fs.mkdirSync(logPath, { recursive: true }); + console.info('fetching logs from logPath'); fetch(logPath).then( data => { diff --git a/ts/node/sql.ts b/ts/node/sql.ts index b1f4276ca..c197d9b97 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -3330,35 +3330,6 @@ function removeV2OpenGroupRoom(conversationId: string) { }); } -function removeOneOpenGroupV1Message() { - const row = assertGlobalInstance() - .prepare( - `SELECT count(*) from ${MESSAGES_TABLE} WHERE - conversationId LIKE 'publicChat:1@%';` - ) - .get(); - const toRemoveCount = row['count(*)']; - - if (toRemoveCount <= 0) { - return 0; - } - console.info('left opengroupv1 message to remove: ', toRemoveCount); - const rowMessageIds = assertGlobalInstance() - .prepare( - `SELECT id from ${MESSAGES_TABLE} WHERE conversationId LIKE 'publicChat:1@%' ORDER BY id LIMIT 1;` - ) - .all(); - - const messagesIds = map(rowMessageIds, r => r.id)[0]; - - console.time('removeOneOpenGroupV1Message'); - - removeMessage(messagesIds); - console.timeEnd('removeOneOpenGroupV1Message'); - - return toRemoveCount - 1; -} - // tslint:disable: binary-expression-operand-order // tslint:disable: insecure-random @@ -3451,7 +3422,7 @@ function fillWithTestData(numConvosToAdd: number, numMsgsToAdd: number) { const msgObjToAdd = { // body: `fake body ${activeAt}`, body: `fakeMsgIdx-spongebob-${index} ${fakeBodyText} ${activeAt}`, - conversationId: `${convoId}`, + conversationId: `05${id}`, // eslint-disable-next-line camelcase expires_at: 0, hasAttachments: 0, @@ -3467,7 +3438,7 @@ function fillWithTestData(numConvosToAdd: number, numMsgsToAdd: number) { sent_at: Date.now(), source: `${convoId}`, sourceDevice: 1, - type: '%', + type: 'outgoing', unread: 1, expireTimer: 0, expirationStartTimestamp: 0, @@ -3602,5 +3573,4 @@ export const sqlNode = { getAllV2OpenGroupRooms, getV2OpenGroupRoomByRoomId, removeV2OpenGroupRoom, - removeOneOpenGroupV1Message, }; diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index 7aea04fbf..97c3734bf 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -28,6 +28,7 @@ import { import { MessageModel } from '../models/message'; import { isUsFromCache } from '../session/utils/User'; import { decryptProfile } from '../util/crypto/profileEncrypter'; +import ByteBuffer from 'bytebuffer'; export async function updateProfileOneAtATime( conversation: ConversationModel, @@ -52,8 +53,6 @@ async function createOrUpdateProfile( profile: SignalService.DataMessage.ILokiProfile, profileKey?: Uint8Array | null ) { - const { dcodeIO } = window; - // Retain old values unless changed: const newProfile = conversation.get('profile') || {}; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 1376eb356..ba311ce6a 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -21,6 +21,7 @@ import { getMessageById } from '../../../ts/data/data'; import { getConversationController } from '../conversations'; import { ed25519Str } from '../onions/onionPath'; import { EmptySwarmError } from '../utils/errors'; +import ByteBuffer from 'bytebuffer'; const DEFAULT_CONNECTIONS = 1; @@ -128,7 +129,7 @@ export async function TEST_sendMessageToSnode( isSyncMessage?: boolean, messageId?: string ): Promise { - const data64 = window.dcodeIO.ByteBuffer.wrap(data).toString('base64'); + const data64 = ByteBuffer.wrap(data).toString('base64'); const swarm = await getSwarmFor(pubKey); window?.log?.debug( diff --git a/ts/starts/about_start.ts b/ts/starts/about_start.ts deleted file mode 100644 index 4af7b3640..000000000 --- a/ts/starts/about_start.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* global $: false */ - -// Add version and commit hash -$('.version').text(`v${window.getVersion()}`); -$('.commitHash').text(window.getCommitHash() || ''); - -// Add debugging metadata - environment if not production, app instance name -const states = []; - -if (window.getEnvironment() !== 'production') { - states.push(window.getEnvironment()); -} -if (window.getAppInstance()) { - states.push(window.getAppInstance()); -} - -$('.environment').text(states.join(' - ')); - -// Install the 'dismiss with escape key' handler -// $(document).on('keyup', e => { -// 'use strict'; - -// if (e.keyCode === 27) { -// window.closeAbout(); -// } -// }); diff --git a/ts/util/logging.ts b/ts/util/logging.ts index 1a3ca8e1a..659a8495f 100644 --- a/ts/util/logging.ts +++ b/ts/util/logging.ts @@ -94,14 +94,13 @@ function format(entries: Array) { return redactAll(entries.map(formatLine).join('\n')); } -async function fetch() { +export async function fetch() { return new Promise(resolve => { - ipc.send('fetch-log'); - ipc.on('fetched-log', (_event, text) => { const result = `${getHeader()}\n${format(text)}`; resolve(result); }); + ipc.send('fetch-log'); }); } @@ -130,7 +129,6 @@ window.log = { info: _.partial(logAtLevel, 'info', 'INFO '), debug: _.partial(logAtLevel, 'debug', 'DEBUG'), trace: _.partial(logAtLevel, 'trace', 'TRACE'), - fetch, }; window.onerror = (_message, _script, _line, _col, error) => { diff --git a/ts/views/DebugLogView.tsx b/ts/views/DebugLogView.tsx index b1f45be94..d1ba8d940 100644 --- a/ts/views/DebugLogView.tsx +++ b/ts/views/DebugLogView.tsx @@ -1,7 +1,44 @@ import React, { useEffect, useState } from 'react'; +import styled from 'styled-components'; +import { fetch } from '../util/logging'; -export const DebugLogView = () => { +const StyledContent = styled.div` + display: flex; + flex-direction: column; + padding: 10px; + height: 100%; +`; + +const DebugLogTextArea = (props: { content: string }) => { + console.warn('DebugLogTextArea ', props.content); + return -
- -
- + + ); }; diff --git a/ts/webworker/workers/util.worker.ts b/ts/webworker/workers/util.worker.ts index b430684dc..a0632dfd5 100644 --- a/ts/webworker/workers/util.worker.ts +++ b/ts/webworker/workers/util.worker.ts @@ -29,7 +29,7 @@ const functions = { bytesFromString, }; // tslint:disable: function-name - +//tslint-disable no-console onmessage = async (e: any) => { const [jobId, fnName, ...args] = e.data;