You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-08-24 20:19:10 +02:00
Compare commits
8 Commits
v3.4.4
...
renovate/m
Author | SHA1 | Date | |
---|---|---|---|
|
7c3fb47b44 | ||
|
d3954e769f | ||
|
4d8a16bda7 | ||
|
f725d3895f | ||
|
0e19dce0d1 | ||
|
31c5058d5e | ||
|
4d760303bc | ||
|
0ad9e8f112 |
@@ -11,8 +11,9 @@ QUEUE_RETRY_COUNT=2
|
||||
QUEUE_MAINTENANCE_INTERVAL=30000
|
||||
|
||||
HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:0.0.2
|
||||
# Fullpath to images folder
|
||||
HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images
|
||||
# Fullpath to images folder e.g.:
|
||||
#HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images
|
||||
HTR_CLI_IMAGES_FOLDER=
|
||||
|
||||
QUEUE_DRIVER=pg
|
||||
# QUEUE_DRIVER=sqlite
|
||||
|
16
package.json
16
package.json
@@ -71,14 +71,14 @@
|
||||
"@crowdin/cli": "4",
|
||||
"@joplin/utils": "~2.12",
|
||||
"@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0",
|
||||
"@typescript-eslint/eslint-plugin": "6.21.0",
|
||||
"@typescript-eslint/parser": "6.21.0",
|
||||
"@typescript-eslint/eslint-plugin": "8.20.0",
|
||||
"@typescript-eslint/parser": "8.20.0",
|
||||
"cspell": "5.21.2",
|
||||
"eslint": "8.57.1",
|
||||
"eslint-interactive": "10.8.0",
|
||||
"eslint": "9.18.0",
|
||||
"eslint-interactive": "11.1.0",
|
||||
"eslint-plugin-import": "2.31.0",
|
||||
"eslint-plugin-jest": "27.9.0",
|
||||
"eslint-plugin-promise": "6.6.0",
|
||||
"eslint-plugin-jest": "28.11.0",
|
||||
"eslint-plugin-promise": "7.2.1",
|
||||
"eslint-plugin-react": "7.37.4",
|
||||
"execa": "5.1.1",
|
||||
"fs-extra": "11.2.0",
|
||||
@@ -93,7 +93,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@types/fs-extra": "11.0.4",
|
||||
"eslint-plugin-github": "4.10.2",
|
||||
"eslint-plugin-github": "5.1.5",
|
||||
"http-server": "14.1.1",
|
||||
"node-gyp": "11.2.0",
|
||||
"nodemon": "3.1.10"
|
||||
@@ -102,7 +102,7 @@
|
||||
"resolutions": {
|
||||
"react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
|
||||
"react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch",
|
||||
"eslint": "patch:eslint@8.57.1#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
|
||||
"eslint": "patch:eslint@9.18.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
|
||||
"app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch",
|
||||
"nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch",
|
||||
"pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
|
||||
|
@@ -146,11 +146,12 @@
|
||||
"@sentry/electron": "4.24.0",
|
||||
"@testing-library/react-hooks": "8.0.1",
|
||||
"@types/jest": "29.5.14",
|
||||
"@types/mustache": "4.2.5",
|
||||
"@types/mustache": "4.2.6",
|
||||
"@types/node": "18.19.87",
|
||||
"@types/react": "18.3.20",
|
||||
"@types/react-dom": "18.3.7",
|
||||
"@types/react-redux": "7.1.33",
|
||||
"@types/semver": "^7.7.0",
|
||||
"@types/styled-components": "5.1.32",
|
||||
"@types/tesseract.js": "2.0.0",
|
||||
"async-mutex": "0.5.0",
|
||||
|
@@ -89,8 +89,8 @@ android {
|
||||
applicationId "net.cozic.joplin"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 2097775
|
||||
versionName "3.4.2"
|
||||
versionCode 2097776
|
||||
versionName "3.4.3"
|
||||
ndk {
|
||||
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
|
||||
}
|
||||
|
@@ -1408,7 +1408,7 @@ PODS:
|
||||
- ReactCommon/turbomodule/core
|
||||
- react-native-alarm-notification (3.4.0):
|
||||
- React
|
||||
- react-native-document-picker (10.1.2):
|
||||
- react-native-document-picker (10.1.3):
|
||||
- DoubleConversion
|
||||
- glog
|
||||
- hermes-engine
|
||||
@@ -2335,7 +2335,7 @@ SPEC CHECKSUMS:
|
||||
React-Mapbuffer: c3f4b608e4a59dd2f6a416ef4d47a14400194468
|
||||
React-microtasksnativemodule: 054f34e9b82f02bd40f09cebd4083828b5b2beb6
|
||||
react-native-alarm-notification: fd7c73a3dc15ce2d5bd9b28dfaa5aa2e25850c7b
|
||||
react-native-document-picker: 3491100f1048571593b284b74b93ce99b14e20a2
|
||||
react-native-document-picker: da39c5e4f279d39c0356dca157b98f9dc349e5bb
|
||||
react-native-geolocation: ec15ffebc53790314885eb9e5f2132132fbc2600
|
||||
react-native-get-random-values: d16467cf726c618e9c7a8c3c39c31faa2244bbba
|
||||
react-native-image-picker: 99fbcec11cf4679170a7cfba4e4d9f598297448c
|
||||
|
@@ -47,10 +47,10 @@
|
||||
"devDependencies": {
|
||||
"@types/jest": "29.5.14",
|
||||
"@types/node": "18.19.87",
|
||||
"@typescript-eslint/eslint-plugin": "6.21.0",
|
||||
"@typescript-eslint/parser": "6.21.0",
|
||||
"@typescript-eslint/eslint-plugin": "8.20.0",
|
||||
"@typescript-eslint/parser": "8.20.0",
|
||||
"coveralls": "3.1.1",
|
||||
"eslint": "8.57.1",
|
||||
"eslint": "9.18.0",
|
||||
"jest": "29.7.0",
|
||||
"prettier": "3.5.3",
|
||||
"ts-jest": "29.3.1",
|
||||
|
@@ -24,7 +24,7 @@
|
||||
"@types/js-yaml": "4.0.9",
|
||||
"@types/jsdom": "21.1.7",
|
||||
"@types/markdown-it": "13.0.9",
|
||||
"@types/mustache": "4.2.5",
|
||||
"@types/mustache": "4.2.6",
|
||||
"@types/node": "18.19.87",
|
||||
"@types/node-rsa": "1.1.4",
|
||||
"@types/react": "18.3.20",
|
||||
|
@@ -72,7 +72,7 @@
|
||||
"@types/jsdom": "21.1.7",
|
||||
"@types/koa": "2.15.0",
|
||||
"@types/markdown-it": "13.0.9",
|
||||
"@types/mustache": "4.2.5",
|
||||
"@types/mustache": "4.2.6",
|
||||
"@types/node-os-utils": "1.3.4",
|
||||
"@types/nodemailer": "6.4.17",
|
||||
"@types/yargs": "17.0.33",
|
||||
|
@@ -51,7 +51,7 @@
|
||||
"@types/jest": "29.5.14",
|
||||
"@types/js-yaml": "4.0.9",
|
||||
"@types/markdown-it": "13.0.9",
|
||||
"@types/mustache": "4.2.5",
|
||||
"@types/mustache": "4.2.6",
|
||||
"@types/node": "18.19.87",
|
||||
"@types/node-fetch": "2.6.12",
|
||||
"@types/yargs": "17.0.33",
|
||||
|
@@ -165,6 +165,7 @@
|
||||
"v3.4.2": true,
|
||||
"android-v3.4.1": true,
|
||||
"v3.4.3": true,
|
||||
"android-v3.4.2": true
|
||||
"android-v3.4.2": true,
|
||||
"android-v3.4.3": true
|
||||
}
|
||||
}
|
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
if [ ! -f "/images/$1" ]; then
|
||||
echo "Error: Image file /images/$1 does not exist."
|
||||
echo "Error: Image file /images/$1 does not exist. Check if HTR_CLI_IMAGES_FOLDER environment variable is set correctly."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
require('dotenv').config();
|
||||
import * as Koa from 'koa';
|
||||
import Logger from '@joplin/utils/Logger';
|
||||
import Logger, { LoggerWrapper } from '@joplin/utils/Logger';
|
||||
import koaBody from 'koa-body';
|
||||
import initiateLogger from '../services/initiateLogger';
|
||||
import createQueue from '../services/createQueue';
|
||||
@@ -10,12 +10,11 @@ import env, { EnvVariables } from '../env';
|
||||
import HtrCli from '../core/HtrCli';
|
||||
import JobProcessor from '../workers/JobProcessor';
|
||||
|
||||
initiateLogger();
|
||||
const logger = Logger.create('api/app');
|
||||
|
||||
const init = async () => {
|
||||
const init = async (logger: LoggerWrapper) => {
|
||||
const envVariables = env();
|
||||
|
||||
logger.info('Checking configurations');
|
||||
await checkServerConfigurations(envVariables);
|
||||
|
||||
const app = new Koa();
|
||||
@@ -26,6 +25,7 @@ const init = async () => {
|
||||
|
||||
await router(app, envVariables.API_KEY);
|
||||
|
||||
logger.info('Creating queue');
|
||||
const queue = await createQueue(envVariables, true);
|
||||
|
||||
const fileStorage = new FileStorage();
|
||||
@@ -39,19 +39,22 @@ const init = async () => {
|
||||
|
||||
logger.info('Starting worker');
|
||||
await jobProcessor.init();
|
||||
logger.info('Server started successfully');
|
||||
};
|
||||
|
||||
const checkServerConfigurations = (envVariables: EnvVariables) => {
|
||||
if (!envVariables.API_KEY) throw Error('API_KEY environment variable not set.');
|
||||
if (!envVariables.HTR_CLI_IMAGES_FOLDER) throw Error('HTR_CLI_IMAGES_FOLDER environment variable not set. This should point to a folder where images will be stored.');
|
||||
};
|
||||
|
||||
const main = async () => {
|
||||
initiateLogger();
|
||||
const logger = Logger.create('api/app');
|
||||
logger.info('Starting...');
|
||||
await init();
|
||||
await init(logger);
|
||||
};
|
||||
|
||||
main().catch(error => {
|
||||
console.error(error);
|
||||
logger.error(error);
|
||||
process.exit(1);
|
||||
});
|
||||
|
@@ -6,7 +6,7 @@ export const defaultEnvValues: EnvVariables = {
|
||||
QUEUE_RETRY_COUNT: 2,
|
||||
QUEUE_MAINTENANCE_INTERVAL: 60000,
|
||||
HTR_CLI_DOCKER_IMAGE: 'joplin/htr-cli:0.0.2',
|
||||
HTR_CLI_IMAGES_FOLDER: '/home/js/joplin/packages/transcribe/images',
|
||||
HTR_CLI_IMAGES_FOLDER: '',
|
||||
QUEUE_DRIVER: 'pg', // 'sqlite'
|
||||
QUEUE_DATABASE_PASSWORD: '',
|
||||
QUEUE_DATABASE_NAME: '',
|
||||
|
@@ -54,7 +54,7 @@ export default class JobProcessor {
|
||||
try {
|
||||
await this.checkForJobs();
|
||||
} catch (error) {
|
||||
logger.error(`Error while processing job: ${this.currentJob}`, error);
|
||||
logger.error(`Error while processing job: ${this.currentJob?.id}`, error);
|
||||
const e = error as Error;
|
||||
if (this.currentJob) {
|
||||
await this.queue.fail(this.currentJob.id, e);
|
||||
|
@@ -1,5 +1,16 @@
|
||||
# Joplin Android Changelog
|
||||
|
||||
## [android-v3.4.3](https://github.com/laurent22/joplin/releases/tag/android-v3.4.3) (Pre-release) - 2025-08-04T17:38:13Z
|
||||
|
||||
- New: Add a Rich Text Editor (#12748 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
|
||||
- Improved: Performance: Improve Rich Text Editor startup performance (#12819 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
|
||||
- Improved: Updated packages @react-native-documents/picker (v10.1.3), babel-plugin-react-native-web (v0.20.0), jsdom (v26), react-refresh (v0.17.0), sharp (v0.34.0)
|
||||
- Fixed: Fix editor becomes blank after dismissing search (#12818) (#12781 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
|
||||
- Fixed: Fix on screen keyboard covers the markdown toolbar and contents on Android 15+ (#12838) (#12821 by [@mrjo118](https://github.com/mrjo118))
|
||||
- Fixed: Fix save button is invisible in release builds (#12826) (#12782 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
|
||||
- Fixed: Improve usability of inline search in notes (#12791) (#12783 by [@mrjo118](https://github.com/mrjo118))
|
||||
- Fixed: Markdown editor: Make list indentation size equivalent to four spaces (#12794) (#12573 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
|
||||
|
||||
## [android-v3.4.2](https://github.com/laurent22/joplin/releases/tag/android-v3.4.2) (Pre-release) - 2025-07-25T08:30:30Z
|
||||
|
||||
- Improved: Updated packages react-native-paper (v5.13.5)
|
||||
|
Reference in New Issue
Block a user