oxen-io
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updating workflows actions version

This commit is contained in:
Audric Ackermann 2022-04-21 17:10:26 +10:00
parent 4010373a7b
commit 0efce6ea2d
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
13 changed files with 87 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintignore
View File

@ -3,9 +3,6 @@ components/**
dist/**
mnemonic_languages/**
# Generated files
js/util_worker.js
# TypeScript generated files
ts/**/*.js
**/ts/**/*.js

37
.github/workflows/build-binaries.yml vendored
View File

@ -20,13 +20,23 @@ jobs:
SIGNAL_ENV: production
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout git repo
uses: actions/checkout@v2
- run: git config --global core.autocrlf false
- name: Checkout git repo
uses: actions/checkout@v3
# we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase
- name: Install node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 16.13.0
node-version: '16.13.0'
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
- name: Chocolatey Install Action
if: runner.os == 'Windows'
@ -34,8 +44,9 @@ jobs:
with:
args: install python2 visualcpp-build-tools -y
# Not having this will break the windows build because the PATH won't be set by msbuild.
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1
if: runner.os == 'Windows'
- name: Setup node for windows
@ -45,19 +56,21 @@ jobs:
npm config set python python2.7
npm config set msvs_version 2017
- name: Install yarn
run: npm install yarn --no-save
- name: Install Dependencies
run: yarn install --frozen-lockfile --network-timeout 600000
- name: Install Desktop node_modules
if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile --network-timeout 600000 --force
- name: Generate and concat files
run: yarn generate
run: yarn generate && yarn transpile
- name: Lint Files
if: runner.os != 'Windows'
# 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

53
.github/workflows/pull-request.yml vendored
View File

@ -20,12 +20,20 @@ jobs:
- run: git config --global core.autocrlf false
- name: Checkout git repo
uses: actions/checkout@v2
uses: actions/checkout@v3
# we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase
- name: Install node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 16.13.0
node-version: '16.13.0'
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
- name: Chocolatey Install Action
if: runner.os == 'Windows'
@ -35,7 +43,7 @@ jobs:
#Not having this will break the windows build because the PATH won't be set by msbuild.
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1
if: runner.os == 'Windows'
- name: Setup node for windows
@ -45,38 +53,17 @@ jobs:
npm config set python python2.7
npm config set msvs_version 2017
- uses: actions/cache@v2
id: yarn-cache
if: runner.os != 'Windows'
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: Install Dependencies #skipped if step before set variable to true
if: |
steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile --network-timeout 600000
- name: Install Desktop node_modules
if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile --network-timeout 600000 --force
- name: Generate and concat files
run: yarn generate
run: yarn generate && yarn transpile
- name: Lint Files
if: runner.os != 'Windows'
run: |
yarn lint-full
- name: Make linux use en_US locale
# no need to lint files on all platforms. Just do it once on the quicker one
if: runner.os == 'Linux'
run: |
sudo apt-get install -y hunspell-en-us
sudo locale-gen en_US.UTF-8
sudo dpkg-reconfigure locales
echo "::stop-commands::`echo -n ${{ github.token }} | sha256sum | head -c 64`"
echo ::set-env name=DISPLAY:::9.0
echo ::set-env name=LANG::en_US.UTF-8
echo "::`echo -n ${{ github.token }} | sha256sum | head -c 64`::"
run: yarn lint-full
- name: Test
uses: GabrielBB/xvfb-action@v1.0
with:
run: yarn test
- name: Unit Test
run: yarn test

34
.github/workflows/release.yml vendored
View File

@ -17,13 +17,23 @@ jobs:
SIGNAL_ENV: production
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout git repo
uses: actions/checkout@v2
- run: git config --global core.autocrlf false
- name: Checkout git repo
uses: actions/checkout@v3
# we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase
- name: Install node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 16.13.0
node-version: '16.13.0'
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
- name: Chocolatey Install Action
if: runner.os == 'Windows'
@ -31,8 +41,9 @@ jobs:
with:
args: install python2 visualcpp-build-tools -y
#Not having this will break the windows build because the PATH won't be set by msbuild.
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1
if: runner.os == 'Windows'
- name: Setup node for windows
@ -42,20 +53,21 @@ jobs:
npm config set python python2.7
npm config set msvs_version 2017
- name: Install yarn
run: npm install yarn --no-save
- name: Install Dependencies
run: yarn install --frozen-lockfile --network-timeout 600000
- name: Install Desktop node_modules
if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile --network-timeout 600000 --force
- name: Generate and concat files
run: yarn generate
run: yarn generate && yarn transpile
- 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=always

1
.gitignore vendored
View File

@ -13,7 +13,6 @@ release/
sql/
# generated files
js/util_worker.js
stylesheets/*.css
# React / TypeScript

2
.prettierignore
View File

@ -5,7 +5,6 @@
config/local-*.json
config/local.json
dist/**
js/util_worker.js
stylesheets/*.css
test/ts/**/*.js
@ -18,7 +17,6 @@ ts/test/automation/notes
# Third-party files
node_modules/**
js/util_worker.js
mnemonic_languages/**
playwright.config.js

17
build/afterPackHook.js
View File

@ -32,15 +32,10 @@ module.exports = async function(context) {
const targetExecutable = path.join(context.appOutDir, `${executableName}-bin`);
const launcherScript = path.join(context.appOutDir, 'resources', 'launcher-script.sh');
const chromeSandbox = path.join(context.appOutDir, 'chrome-sandbox');
return Promise.all([
// rename session-desktop to session-desktop-bin
renameAsync(sourceExecutable, targetExecutable),
// rename launcher script to session-desktop
renameAsync(launcherScript, sourceExecutable),
// remove the chrome-sandbox file since we explicitly disable it
unlinkAsync(chromeSandbox),
]);
// rename session-desktop to session-desktop-bin
await renameAsync(sourceExecutable, targetExecutable);
// rename launcher script to session-desktop
await renameAsync(launcherScript, sourceExecutable);
// remove the chrome-sandbox file since we explicitly disable it
return unlinkAsync(chromeSandbox);
};

12
package.json
View File

@ -49,7 +49,7 @@
"ready": "yarn grunt && yarn lint-full && yarn test",
"sedtoAppImage": "sed -i 's/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/\"target\": \"AppImage\"/g' package.json",
"sedtoDeb": "sed -i 's/\"target\": \"AppImage\"/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/g' package.json",
"parcel-util-worker": "rimraf ts/webworker/workers/util.worker.js; parcel build --target util-worker --no-autoinstall --no-cache"
"parcel-util-worker": "rimraf ts/webworker/workers/util.worker.js && parcel build --target util-worker --no-autoinstall --no-cache"
},
"dependencies": {
"@reduxjs/toolkit": "^1.4.0",
@ -122,10 +122,6 @@
"styled-components": "5.1.1",
"uuid": "3.3.2"
},
"peerDependencies": {
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"devDependencies": {
"@playwright/test": "^1.16.3",
"@types/backbone": "^1.4.2",
@ -225,6 +221,7 @@
"build": {
"appId": "com.loki-project.messenger-desktop",
"afterSign": "build/notarize.js",
"afterPack": "build/afterPackHook.js",
"artifactName": "${name}-${os}-${arch}-${version}.${ext}",
"extraResources": {
"from": "./build/launcher-script.sh",
@ -344,11 +341,12 @@
"!node_modules/@journeyapps/sqlcipher/build/*",
"!node_modules/@journeyapps/sqlcipher/lib/binding/node-*",
"!build/*.js",
"build/afterPackHook.js",
"build/launcher-script.sh",
"!node_modules/better-sqlite3/deps/*",
"!node_modules/better-sqlite3/src/*",
"node_modules/better-sqlite3/build/Release/better_sqlite3.node",
"!dev-app-update.yml"
],
"afterPack": "./build/afterPackHook.js"
]
}
}

22
ts/components/settings/section/CategoryAppearance.tsx
View File

@ -132,28 +132,6 @@ export const SettingsCategoryAppearance = (props: { hasPassword: boolean | null
buttonColor={SessionButtonColor.Primary}
buttonText={window.i18n('translation')}
/>
{/* <SessionSettingButtonItem
title={window.i18n('trimDatabase')}
description={window.i18n('trimDatabaseDescription')}
onClick={async () => {
const msgCount = await getMessageCount();
const deleteAmount = Math.max(msgCount - 10000, 0);
dispatch(
updateConfirmModal({
onClickOk: () => {
void trimMessages();
},
onClickClose: () => {
updateConfirmModal(null);
},
message: window.i18n('trimDatabaseConfirmationBody', [`${deleteAmount}`]),
})
);
}}
buttonColor={SessionButtonColor.Primary}
buttonText={window.i18n('trimDatabase')}
/> */}
<SessionSettingButtonItem
onClick={() => {
ipcRenderer.send('show-debug-log');

5
ts/data/data.ts
View File

@ -551,11 +551,6 @@ export async function removeAllMessagesInConversation(conversationId: string): P
} while (messages.length > 0);
}
export async function trimMessages(): Promise<void> {
await channels.trimMessages(1000);
return;
}
export async function getMessagesBySentAt(sentAt: number): Promise<MessageCollection> {
const messages = await channels.getMessagesBySentAt(sentAt);
return new MessageCollection(messages);

1
ts/data/dataInit.ts
View File

@ -64,7 +64,6 @@ const channelsToMake = new Set([
'hasConversationOutgoingMessage',
'getSeenMessagesByHashList',
'getLastHashBySnode',
'trimMessages',
'getUnprocessedCount',
'getAllUnprocessed',
'getUnprocessedById',

130
ts/node/sql.ts
View File

@ -2558,135 +2558,6 @@ function getFirstUnreadMessageWithMention(conversationId: string, ourpubkey: str
return rows[0].id;
}
/**
* Deletes all but the 10,000 last received messages.
*/
function trimMessages(limit: number) {
console.log(limit); // adding this for linting purposes.
// METHOD 1 Start - Seems to take to long and freeze
// const convoCount = globalInstance
// .prepare(
// `
// SELECT COUNT(*) FROM ${MESSAGES_TABLE}
// WHERE conversationId = $conversationId
// `
// )
// .all({
// conversationId,
// });
// if (convoCount < limit) {
// console.log(`Skipping conversation: ${conversationId}`);
// return;
// } else {
// console.count('convo surpassed limit');
// }
// globalInstance
// .prepare(
// `
// DELETE FROM ${MESSAGES_TABLE}
// WHERE conversationId = $conversationId
// AND id NOT IN (
// SELECT id FROM ${MESSAGES_TABLE}
// WHERE conversationId = $conversationId
// ORDER BY received_at DESC
// LIMIT $limit
// );
// `
// )
// .run({
// conversationId,
// limit,
// });
// METHOD 1 END
// METHOD 2 Start
// const messages = globalInstance
// .prepare(
// `
// SELECT id, conversationId FROM ${MESSAGES_TABLE}
// CREATE VIRTUAL TABLE IF NOT EXISTS temp_deletion
// id STRING PRIMARY KEY ASC
// `
// )
// .all();
// const idsToDelete = [];
// const convoCountLookup = {};
// for (let index = 0; index < messages.length; index + 1) {
// const { conversationId, id } = messages[index];
// console.log(`run ${index} - convoId: ${conversationId}, messageId: ${id}`);
// if (!convoCountLookup[conversationId]) {
// convoCountLookup[conversationId] = 1;
// } else {
// convoCountLookup[conversationId] + 1;
// if (convoCountLookup[conversationId] > limit) {
// idsToDelete.push(id);
// }
// }
// }
// // Ideally should be able to do WHERE id IN (x, y, z) with an array of IDs
// // the array might need to be chunked as well for performance
// const idSlice = [...idsToDelete].slice(0, 30);
// idSlice.forEach(() => {
// globalInstance
// .prepare(
// `
// DELETE FROM ${MESSAGES_TABLE}
// WHERE id = $idSlice
// `
// )
// .run({
// idSlice,
// });
// });
// Method 2 End
// Method 3 start - Audric's suggestion
// const largeConvos = globalInstance
// .prepare(
// `
// SELECT conversationId, count(id) FROM ${MESSAGES_TABLE}
// GROUP BY conversationId
// HAVING COUNT(id) > 1000
// `
// )
// .all();
// console.log({ largeConvos });
// // finding 1000th msg timestamp
// largeConvos.forEach(convo => {
// const convoId = convo.conversationId;
// console.log({ convoId });
// const lastMsg = globalInstance
// .prepare(
// `
// SELECT received_at, sent_at FROM ${MESSAGES_TABLE}
// WHERE conversationId = $convoId
// ORDER BY received_at DESC
// LIMIT 1
// OFFSET 999
// `
// )
// .all({
// convoId,
// });
// // use timestamp with lesserThan as conditional for deletion
// console.log({ lastMsg });
// const timestamp = lastMsg[0].received_at;
// if (timestamp) {
// console.log({ timestamp, convoId });
// globalInstance
// .prepare(
// `
// DELETE FROM ${MESSAGES_TABLE}
// WHERE conversationId = $convoId
// AND received_at < $timestamp
// `
// )
// .run({
// timestamp,
// convoId,
// });
// }
// });
}
function getMessagesBySentAt(sentAt: number) {
const rows = assertGlobalInstance()
.prepare(
@ -3783,7 +3654,6 @@ export const sqlNode = {
getFirstUnreadMessageIdInConversation,
getFirstUnreadMessageWithMention,
hasConversationOutgoingMessage,
trimMessages,
fillWithTestData,
getUnprocessedCount,

10
ts/test/session/unit/privacy/Privacy_test.ts
View File

@ -87,13 +87,19 @@ describe('Privacy', () => {
it('removes whatever is in front of the app root path before logging', () => {
const appRootPath = path.join(__dirname, '..', '..', '..', '..', '..');
const appFolderName = path.basename(appRootPath);
expect(redactAll(appRootPath)).to.be.equal(`[REDACTED]/${appFolderName}`);
expect(redactAll(appRootPath)).to.be.be.oneOf([
`[REDACTED]/${appFolderName}`,
`[REDACTED]\\${appFolderName}`,
]);
});
it('removes whatever is in front of the app root path before logging', () => {
const appRootPath = path.join(__dirname, '..', '..', '..', '..', '..');
const appFolderName = path.basename(appRootPath);
expect(redactAll(appRootPath)).to.be.equal(`[REDACTED]/${appFolderName}`);
expect(redactAll(appRootPath)).to.be.be.oneOf([
`[REDACTED]/${appFolderName}`,
`[REDACTED]\\${appFolderName}`,
]);
});
});
});