diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index b07282917..50ceeae78 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -64,6 +64,14 @@ jobs: - name: Generate and concat files run: yarn build-everything + - name: Lint Files + # no need to lint files on all platforms. Just do it once on the quicker one + if: runner.os == 'Linux' + run: yarn lint-full + + - name: Unit Test + run: yarn test + - name: Build windows production binaries if: runner.os == 'Windows' run: node_modules\.bin\electron-builder --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release diff --git a/package.json b/package.json index 17ef56126..5e1ddb927 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,7 @@ "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"", "integration-test": "npx playwright test", "integration-test-snapshots": "npx playwright test -g 'profile picture' --update-snapshots", - "rebuild-libsession-for-unit-tests": "cd node_modules/session_util_wrapper/ && yarn configure && yarn build && cd ../../ ", - "test": "yarn rebuild-libsession-for-unit-tests && mocha -r jsdom-global/register --recursive --exit --timeout 10000 \"./ts/test/**/*_test.js\"", + "test": "mocha -r jsdom-global/register --recursive --exit --timeout 10000 \"./ts/test/**/*_test.js\"", "coverage": "nyc --reporter=html mocha -r jsdom-global/register --recursive --exit --timeout 10000 \"./ts/test/**/*_test.js\"", "build-release": "run-script-os", "build-release-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release", diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index 2c5ecb383..e357ba7bf 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -117,7 +117,9 @@ const SomeDeviceOutdatedSyncingNotice = () => { export const SessionInboxView = () => { const update = useUpdate(); // run only on mount - useEffect(() => setupLeftPane(update), []); + useEffect(() => { + setupLeftPane(update); + }, []); if (!window.inboxStore) { return null; diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 53806eb51..ed8c31155 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -34,10 +34,10 @@ import { useSelectedConversationKey, useSelectedIsActive, useSelectedIsBlocked, - useSelectedIsPrivateFriend, useSelectedIsGroup, useSelectedIsKickedFromGroup, useSelectedIsPrivate, + useSelectedIsPrivateFriend, useSelectedIsPublic, useSelectedMembers, useSelectedNotificationSetting, diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index aec060261..4b874e30e 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -63,7 +63,9 @@ const handleDeclineAndBlockConversationRequest = ( const handleAcceptConversationRequest = async (convoId: string) => { const convo = getConversationController().get(convoId); - if (!convo) return; + if (!convo) { + return; + } await convo.setDidApproveMe(true, false); await convo.setIsApproved(true, false); await convo.commit(); diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 3f5b51f74..57c9a3ce2 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -77,7 +77,7 @@ export const NoMessageNoMessageInConversation = () => { return ( - + ); diff --git a/ts/components/menu/MessageRequestBannerContextMenu.tsx b/ts/components/menu/MessageRequestBannerContextMenu.tsx index 273e50c4c..d6e3f67e4 100644 --- a/ts/components/menu/MessageRequestBannerContextMenu.tsx +++ b/ts/components/menu/MessageRequestBannerContextMenu.tsx @@ -1,11 +1,10 @@ import React from 'react'; -import { animation, Menu } from 'react-contexify'; +import { animation, Item, Menu } from 'react-contexify'; import _ from 'lodash'; import { SessionContextMenuContainer } from '../SessionContextMenuContainer'; import { useDispatch } from 'react-redux'; import { hideMessageRequestBanner } from '../../state/ducks/userConfig'; -import { Item } from 'react-contexify'; export type PropsContextConversationItem = { triggerId: string; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 7c9a6a83c..d5a05db91 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1217,8 +1217,6 @@ export class ConversationModel extends Backbone.Model { * When receiving a shared config message, we need to apply the change after the merge happened to our database. * This is done with this function. * There are other actions to change the priority from the UI (or from ) - * @param priority - * @param shouldCommit */ public async setPriorityFromWrapper( priority: number, @@ -1709,7 +1707,7 @@ export class ConversationModel extends Backbone.Model { } // we are trying to send a message to someone. Make sure this convo is not hidden - this.unhideIfNeeded(true); + await this.unhideIfNeeded(true); // an OpenGroupV2 message is just a visible message const chatMessageParams: VisibleMessageParams = { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index b2b42c3ad..c81bf2e1f 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -885,7 +885,7 @@ async function handleConfigurationMessageLegacy( window?.log?.info( 'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"' ); - window.setSettingValue(SettingsKey.someDeviceOutdatedSyncing, true); + await window.setSettingValue(SettingsKey.someDeviceOutdatedSyncing, true); await removeFromCache(envelope); return; } diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 807a63a79..d6063056d 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -311,10 +311,7 @@ async function handleExpirationTimerUpdateNoCommit( await conversation.updateExpireTimer(expireTimer, source, message.get('received_at'), {}, false); } -async function markConvoAsReadIfOutgoingMessage( - conversation: ConversationModel, - message: MessageModel -) { +function markConvoAsReadIfOutgoingMessage(conversation: ConversationModel, message: MessageModel) { const isOutgoingMessage = message.get('type') === 'outgoing' || message.get('direction') === 'outgoing'; if (isOutgoingMessage) { @@ -400,7 +397,7 @@ export async function handleMessageJob( ); } - await markConvoAsReadIfOutgoingMessage(conversation, messageModel); + markConvoAsReadIfOutgoingMessage(conversation, messageModel); if (messageModel.get('unread')) { conversation.throttledNotify(messageModel); } diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts index a3d9d4dc9..72ab41c10 100644 --- a/ts/session/utils/job_runners/JobDeserialization.ts +++ b/ts/session/utils/job_runners/JobDeserialization.ts @@ -30,7 +30,7 @@ export function persistedJobFromData( case 'FakeSleepForJobMultiType': return (new FakeSleepForMultiJob(data) as unknown) as PersistedJob; default: - console.error('unknown persisted job type:', (data as any).jobType); + window?.log?.error('unknown persisted job type:', (data as any).jobType); return null; } } diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx index eda23a6e6..7f7050ff3 100644 --- a/ts/state/ducks/settings.tsx +++ b/ts/state/ducks/settings.tsx @@ -49,15 +49,20 @@ const settingsSlice = createSlice({ updateSettingsBoolValue(state, action: PayloadAction<{ id: string; value: boolean }>) { const { id, value } = action.payload; - if (!isTrackedBoolean(id) || !isBoolean(value)) return state; + if (!isTrackedBoolean(id) || !isBoolean(value)) { + return state; + } state.settingsBools[id] = value; return state; }, deleteSettingsBoolValue(state, action: PayloadAction) { - if (!isTrackedBoolean(action.payload)) return state; + if (!isTrackedBoolean(action.payload)) { + return state; + } + // tslint:disable-next-line: no-dynamic-delete delete state.settingsBools[action.payload]; return state; }, diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts index 15e676fea..44cf64a74 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts @@ -10,17 +10,9 @@ import { UserUtils } from '../../../../session/utils'; import { SessionUtilContact } from '../../../../session/utils/libsession/libsession_utils_contacts'; // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name -// import * as SessionUtilWrapper from 'libsession_util_nodejs'; // tslint:disable-next-line: max-func-body-length describe('libsession_contacts', () => { - // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron). - // To do this, you can cd to the node_module/libsession_wrapper folder and do - // yarn configure && yarn build - // once that is done, you can rename this file and remove the _skip suffix so that test is run. - - // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron. - describe('filter contacts for wrapper', () => { const ourNumber = '051234567890acbdef'; const validArgs = { diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts index 118d26631..166ce063f 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts @@ -10,7 +10,6 @@ import { UserUtils } from '../../../../session/utils'; import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups'; // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name -// import * as SessionUtilWrapper from 'libsession_util_nodejs'; // tslint:disable-next-line: max-func-body-length describe('libsession_groups', () => { diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index 0e2822b95..0f3d34913 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -27,6 +27,7 @@ import { stubData, stubOpenGroupData } from '../../../test-utils/utils'; chai.use(chaiAsPromised as any); const { expect } = chai; +// tslint:disable: no-implicit-dependencies no-unused-expression no-http-string max-func-body-length describe('Message Utils', () => { afterEach(() => { diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 9b54d4bd6..9b6fc9a69 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -242,6 +242,7 @@ export function getLegacyGroupInfoFromDBValues({ */ export function assertUnreachable(_x: never, message: string): never { const msg = `assertUnreachable: Didn't expect to get here with "${message}"`; + // tslint:disable: no-console console.info(msg); throw new Error(msg); } diff --git a/ts/webworker/worker_interface.ts b/ts/webworker/worker_interface.ts index 935e53e8d..201ed703f 100644 --- a/ts/webworker/worker_interface.ts +++ b/ts/webworker/worker_interface.ts @@ -43,7 +43,9 @@ export class WorkerInterface { const { resolve, reject, fnName } = job; if (errorForDisplay) { - console.error(`Error received from worker job ${jobId} (${fnName}):`, errorForDisplay); + // tslint:disable: no-console + + window?.log?.error(`Error received from worker job ${jobId} (${fnName}):`, errorForDisplay); return reject( new Error(`Error received from worker job ${jobId} (${fnName}): ${errorForDisplay}`) ); diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index a8f165e75..1fcc7ba43 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -8,19 +8,19 @@ import { } from 'libsession_util_nodejs'; import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions'; +/* eslint-disable no-console */ +/* eslint-disable strict */ +// tslint:disable: no-console + /** * * @param _x Looks like we need to duplicate this function here as we cannot import the existing one from a webworker context - * @param message */ function assertUnreachable(_x: never, message: string): never { console.info(`assertUnreachable: Didn't expect to get here with "${message}"`); throw new Error("Didn't expect to get here"); } -/* eslint-disable no-console */ -/* eslint-disable strict */ - // we can only have one of those so don't worry about storing them in a map for now let userProfileWrapper: UserConfigWrapperNode | undefined; let contactsConfigWrapper: ContactsConfigWrapperNode | undefined; diff --git a/tslint.json b/tslint.json index 0838b513f..b0d7b49f0 100644 --- a/tslint.json +++ b/tslint.json @@ -29,13 +29,7 @@ "prefer-for-of": false, "chai-vague-errors": false, "no-useless-files": false, - "ordered-imports": [ - true, - { - "import-sources-order": "any", - "named-imports-order": "case-insensitive" - } - ], + "ordered-imports": false, "quotemark": [true, "single", "jsx-double", "avoid-template", "avoid-escape"], "semicolon": [true, "always", "ignore-bound-class-methods"], "trailing-comma": [