chore: arrow function for coding style

correctly navigate to desktop directory for CI building after
building default plugins for CI

.eslintignore

@@ -74,7 +74,6 @@ packages/turndown/
 packages/pdf-viewer/dist
 plugin_types/
 readme/
-packages/react-native-vosk/lib/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.js
@@ -397,7 +396,6 @@ packages/app-mobile/components/NoteEditor/NoteEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
 packages/app-mobile/components/NoteEditor/SelectionFormatting.js
 packages/app-mobile/components/NoteEditor/types.js
-packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
@@ -418,15 +416,12 @@ packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js
 packages/app-mobile/components/screens/encryption-config.js
 packages/app-mobile/components/screens/search.js
 packages/app-mobile/components/side-menu-content.js
-packages/app-mobile/components/voiceTyping/VoiceTypingDialog.js
 packages/app-mobile/gulpfile.js
 packages/app-mobile/root.js
 packages/app-mobile/services/AlarmServiceDriver.android.js
 packages/app-mobile/services/AlarmServiceDriver.ios.js
 packages/app-mobile/services/e2ee/RSA.react-native.js
 packages/app-mobile/services/profiles/index.js
-packages/app-mobile/services/voiceTyping/vosk.dummy.js
-packages/app-mobile/services/voiceTyping/vosk.js
 packages/app-mobile/setupQuickActions.js
 packages/app-mobile/tools/buildInjectedJs.js
 packages/app-mobile/utils/ShareExtension.js
@@ -716,7 +711,6 @@ packages/lib/services/searchengine/SearchFilter.test.js
 packages/lib/services/searchengine/filterParser.js
 packages/lib/services/searchengine/filterParser.test.js
 packages/lib/services/searchengine/gotoAnythingStyleQuery.js
-packages/lib/services/searchengine/gotoAnythingStyleQuery.test.js
 packages/lib/services/searchengine/queryBuilder.js
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/ShareService.test.js
@@ -811,7 +805,6 @@ packages/plugins/ToggleSidebars/api/index.js
 packages/plugins/ToggleSidebars/api/types.js
 packages/plugins/ToggleSidebars/src/index.js
 packages/react-native-saf-x/src/index.js
-packages/react-native-vosk/src/index.js
 packages/renderer/HtmlToHtml.js
 packages/renderer/InMemoryCache.js
 packages/renderer/MarkupToHtml.js
@@ -879,8 +872,6 @@ packages/tools/website/updateDownloadPage.js
 packages/tools/website/updateNews.js
 packages/tools/website/utils/applyTranslations.js
 packages/tools/website/utils/applyTranslations.test.js
-packages/tools/website/utils/convertLinksToLocale.js
-packages/tools/website/utils/convertLinksToLocale.test.js
 packages/tools/website/utils/frontMatter.js
 packages/tools/website/utils/news.js
 packages/tools/website/utils/openGraph.js

.github/scripts/run_ci.sh

@@ -180,9 +180,6 @@ cd "$ROOT_DIR/packages/app-desktop"
 
 if [[ $GIT_TAG_NAME = v* ]]; then
 	echo "Step: Building and publishing desktop application..."
-	# cd "$ROOT_DIR/packages/tools"
-	# node bundleDefaultPlugins.js
-	cd "$ROOT_DIR/packages/app-desktop"
 	USE_HARD_LINKS=false yarn run dist
 elif [[ $IS_LINUX = 1 ]] && [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
 	echo "Step: Building Docker Image..."

.github/workflows/github-actions-main.yml

@@ -71,9 +71,7 @@ jobs:
       - uses: olegtarasov/get-tag@v2.1
       - uses: actions/setup-node@v2
         with:
-          # We need to pin the version to 18.15, because 18.16+ fails with this error:
-          # https://github.com/facebook/react-native/issues/36440
-          node-version: '18.15.0'
+          node-version: '18'
 
       - name: Install Yarn
         run: |

.gitignore

@@ -383,7 +383,6 @@ packages/app-mobile/components/NoteEditor/NoteEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
 packages/app-mobile/components/NoteEditor/SelectionFormatting.js
 packages/app-mobile/components/NoteEditor/types.js
-packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
@@ -404,15 +403,12 @@ packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js
 packages/app-mobile/components/screens/encryption-config.js
 packages/app-mobile/components/screens/search.js
 packages/app-mobile/components/side-menu-content.js
-packages/app-mobile/components/voiceTyping/VoiceTypingDialog.js
 packages/app-mobile/gulpfile.js
 packages/app-mobile/root.js
 packages/app-mobile/services/AlarmServiceDriver.android.js
 packages/app-mobile/services/AlarmServiceDriver.ios.js
 packages/app-mobile/services/e2ee/RSA.react-native.js
 packages/app-mobile/services/profiles/index.js
-packages/app-mobile/services/voiceTyping/vosk.dummy.js
-packages/app-mobile/services/voiceTyping/vosk.js
 packages/app-mobile/setupQuickActions.js
 packages/app-mobile/tools/buildInjectedJs.js
 packages/app-mobile/utils/ShareExtension.js
@@ -702,7 +698,6 @@ packages/lib/services/searchengine/SearchFilter.test.js
 packages/lib/services/searchengine/filterParser.js
 packages/lib/services/searchengine/filterParser.test.js
 packages/lib/services/searchengine/gotoAnythingStyleQuery.js
-packages/lib/services/searchengine/gotoAnythingStyleQuery.test.js
 packages/lib/services/searchengine/queryBuilder.js
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/ShareService.test.js
@@ -797,7 +792,6 @@ packages/plugins/ToggleSidebars/api/index.js
 packages/plugins/ToggleSidebars/api/types.js
 packages/plugins/ToggleSidebars/src/index.js
 packages/react-native-saf-x/src/index.js
-packages/react-native-vosk/src/index.js
 packages/renderer/HtmlToHtml.js
 packages/renderer/InMemoryCache.js
 packages/renderer/MarkupToHtml.js
@@ -865,8 +859,6 @@ packages/tools/website/updateDownloadPage.js
 packages/tools/website/updateNews.js
 packages/tools/website/utils/applyTranslations.js
 packages/tools/website/utils/applyTranslations.test.js
-packages/tools/website/utils/convertLinksToLocale.js
-packages/tools/website/utils/convertLinksToLocale.test.js
 packages/tools/website/utils/frontMatter.js
 packages/tools/website/utils/news.js
 packages/tools/website/utils/openGraph.js

.npmpackagejsonlintrc.json

@@ -15,7 +15,6 @@
 					"@joplin/tools",
 					"@joplin/react-native-saf-x",
 					"@joplin/react-native-alarm-notification",
-					"@joplin/react-native-vosk",
 					"@joplin/utils"
 				]
 		  	}

.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch

@@ -1,127 +0,0 @@
-diff --git a/android/build.gradle b/android/build.gradle
-index 6afcbbf0cc8ca2d69dd78077d61e59a90b2136bb..9f8d72b4ec5b2b3d290975d6a255917c95300854 100644
---- a/android/build.gradle
-+++ b/android/build.gradle
-@@ -67,19 +67,19 @@ repositories {
- }
- 
- // Generate UUIDs for each models contained in android/src/main/assets/
--tasks.register('genUUID') {
--  doLast {
--    fileTree(dir: "$rootDir/app/src/main/assets", exclude: ['*/*']).visit { fileDetails ->
--      if (fileDetails.directory) {
--        def odir = file("$rootDir/app/src/main/assets/$fileDetails.relativePath")
--        def ofile = file("$odir/uuid")
--        mkdir odir
--        ofile.text = UUID.randomUUID().toString()
--      }
--    }
--  }
--}
--preBuild.dependsOn genUUID
-+// tasks.register('genUUID') {
-+//   doLast {
-+//     fileTree(dir: "$rootDir/app/src/main/assets", exclude: ['*/*']).visit { fileDetails ->
-+//       if (fileDetails.directory) {
-+//         def odir = file("$rootDir/app/src/main/assets/$fileDetails.relativePath")
-+//         def ofile = file("$odir/uuid")
-+//         mkdir odir
-+//         ofile.text = UUID.randomUUID().toString()
-+//       }
-+//     }
-+//   }
-+// }
-+// preBuild.dependsOn genUUID
- 
- def kotlin_version = getExtOrDefault('kotlinVersion')
- 
-diff --git a/android/src/main/java/com/reactnativevosk/VoskModule.kt b/android/src/main/java/com/reactnativevosk/VoskModule.kt
-index 0e2b6595b1b2cf1ee01c6c64239c4b0ea37fce19..f3da440bc2863a59db6d2d1691c54d8d4870cb3f 100644
---- a/android/src/main/java/com/reactnativevosk/VoskModule.kt
-+++ b/android/src/main/java/com/reactnativevosk/VoskModule.kt
-@@ -19,13 +19,25 @@ class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
-     return "Vosk"
-   }
- 
-+  @ReactMethod
-+  fun addListener(type: String?) {
-+    // Keep: Required for RN built in Event Emitter Calls.
-+  }
-+
-+  @ReactMethod
-+  fun removeListeners(type: Int?) {
-+    // Keep: Required for RN built in Event Emitter Calls.
-+  }
-+
-   override fun onResult(hypothesis: String) {
-     // Get text data from string object
-     val text = getHypothesisText(hypothesis)
- 
-     // Stop recording if data found
-     if (text != null && text.isNotEmpty()) {
--      cleanRecognizer();
-+      // Don't auto-stop the recogniser - we want to do that when the user
-+      // presses on "stop" only.
-+      // cleanRecognizer();
-       sendEvent("onResult", text)
-     }
-   }
-@@ -153,6 +165,25 @@ class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
-     cleanRecognizer();
-   }
- 
-+  @ReactMethod
-+  fun stopOnly() {
-+    if (speechService != null) {
-+      speechService!!.stop()
-+    }
-+  }
-+
-+  @ReactMethod
-+  fun cleanup() {
-+    if (speechService != null) {
-+      speechService!!.shutdown();
-+      speechService = null
-+    }
-+    if (recognizer != null) {
-+      recognizer!!.close();
-+      recognizer = null;
-+    }
-+  }
-+
-   @ReactMethod
-   fun unload() {
-     cleanRecognizer();
-diff --git a/lib/typescript/index.d.ts b/lib/typescript/index.d.ts
-index 441e41cc402cca3a60b34978ef4fea976076259c..a173acebb4b314402550442ad471e0f7c706e3c4 100644
---- a/lib/typescript/index.d.ts
-+++ b/lib/typescript/index.d.ts
-@@ -10,6 +10,8 @@ export default class Vosk {
-     currentRegisteredEvents: EmitterSubscription[];
-     start: (grammar?: string[] | null) => Promise<String>;
-     stop: () => void;
-+    stopOnly: () => void;
-+    cleanup: () => void;
-     unload: () => void;
-     onResult: (onResult: (e: VoskEvent) => void) => EventSubscription;
-     onFinalResult: (onFinalResult: (e: VoskEvent) => void) => EventSubscription;
-diff --git a/src/index.tsx b/src/index.tsx
-index d9f90c921d89b1b4d85e145443ed3376546a368a..29e4068dbd7500828a73145bd25497a52c9bf638 100644
---- a/src/index.tsx
-+++ b/src/index.tsx
-@@ -69,6 +69,15 @@ export default class Vosk {
-     VoskModule.stop();
-   };
- 
-+  stopOnly = () => {
-+		VoskModule.stopOnly();
-+	};
-+
-+	cleanup = () => {
-+		this.cleanListeners();
-+		VoskModule.cleanup();
-+	};
-+
-   unload = () => {
-     this.cleanListeners();
-     VoskModule.unload();

Assets/ImageSources/DocSources/Application.drawio

@@ -1,136 +0,0 @@
-<mxfile host="Electron" modified="2023-04-29T09:42:39.598Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.1 Chrome/112.0.5615.87 Electron/24.1.2 Safari/537.36" etag="apmX4QvXCQymGu7gtKJn" version="21.2.1" type="device">
-  <diagram name="Page-1" id="5f0bae14-7c28-e335-631c-24af17079c00">
-    <mxGraphModel dx="1244" dy="759" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" background="none" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-1" value="Front end" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="465" y="120" width="170" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-4" value="Service" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="320" y="280" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-5" value="Service" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="490" y="280" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-6" value="Service" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="670" y="280" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-10" value="Model" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="320" y="430" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-11" value="Model" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="490" y="430" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-12" value="Model" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="670" y="430" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-14" value="SQLite database" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
-          <mxGeometry x="490" y="580" width="122.5" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-19" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-10" target="93vzSs2z7RmF_nCAYhdf-4">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-20" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-11" target="93vzSs2z7RmF_nCAYhdf-4">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-21" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-12" target="93vzSs2z7RmF_nCAYhdf-4">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-22" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-10" target="93vzSs2z7RmF_nCAYhdf-5">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-23" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-11" target="93vzSs2z7RmF_nCAYhdf-5">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-24" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-12" target="93vzSs2z7RmF_nCAYhdf-5">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-25" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-10" target="93vzSs2z7RmF_nCAYhdf-6">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-26" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-11" target="93vzSs2z7RmF_nCAYhdf-6">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-27" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-12" target="93vzSs2z7RmF_nCAYhdf-6">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-28" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-10" target="93vzSs2z7RmF_nCAYhdf-14">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-29" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-14" target="93vzSs2z7RmF_nCAYhdf-11">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-30" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-14" target="93vzSs2z7RmF_nCAYhdf-12">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="440" as="sourcePoint" />
-            <mxPoint x="750" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-31" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-4" target="93vzSs2z7RmF_nCAYhdf-1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="620" y="440" as="sourcePoint" />
-            <mxPoint x="670" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-32" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-5" target="93vzSs2z7RmF_nCAYhdf-1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="620" y="440" as="sourcePoint" />
-            <mxPoint x="670" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-33" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-6" target="93vzSs2z7RmF_nCAYhdf-1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="620" y="440" as="sourcePoint" />
-            <mxPoint x="670" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-37" value="BACKEND" style="swimlane;whiteSpace=wrap;html=1;swimlaneFillColor=none;shadow=0;" vertex="1" parent="1">
-          <mxGeometry x="280" y="230" width="560" height="480" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-38" value="JSON config file" style="shape=note;whiteSpace=wrap;html=1;backgroundOutline=1;darkOpacity=0.05;" vertex="1" parent="1">
-          <mxGeometry x="910" y="420" width="80" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="93vzSs2z7RmF_nCAYhdf-39" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="93vzSs2z7RmF_nCAYhdf-37" target="93vzSs2z7RmF_nCAYhdf-38">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="830" y="480" as="sourcePoint" />
-            <mxPoint x="800" y="580" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>

Assets/ImageSources/DocSources/JoplinServer.drawio

@@ -1,70 +0,0 @@
-<mxfile host="Electron" modified="2023-04-29T10:24:42.580Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.1 Chrome/112.0.5615.87 Electron/24.1.2 Safari/537.36" etag="kcPEKHJGaBvNGFhEOF2g" version="21.2.1" type="device">
-  <diagram name="Page-1" id="5f0bae14-7c28-e335-631c-24af17079c00">
-    <mxGraphModel dx="1306" dy="797" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" background="none" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-7" value="Joplin Server" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="320" y="40" width="630" height="465" as="geometry">
-            <mxRectangle x="350" y="300" width="120" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-2" value="Server application" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="t8PL5avYcYxuv0YEq-6K-7">
-          <mxGeometry x="270" y="92.5" width="170" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-3" value="PostgreSQL" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="t8PL5avYcYxuv0YEq-6K-7">
-          <mxGeometry x="190" y="262.5" width="140" height="110" as="geometry" />
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-5" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="t8PL5avYcYxuv0YEq-6K-7" source="t8PL5avYcYxuv0YEq-6K-3" target="t8PL5avYcYxuv0YEq-6K-2">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="280" y="232.5" as="sourcePoint" />
-            <mxPoint x="330" y="182.5" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-11" value="Note metadata,&lt;br&gt;user accounts, etc." style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="t8PL5avYcYxuv0YEq-6K-5">
-          <mxGeometry x="0.0586" y="1" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-4" value="AWS S3" style="shape=cube;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;darkOpacity=0.05;darkOpacity2=0.1;" vertex="1" parent="t8PL5avYcYxuv0YEq-6K-7">
-          <mxGeometry x="430" y="277.5" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-6" value="Note and attachment&lt;br&gt;content" style="endArrow=classic;startArrow=classic;html=1;rounded=0;exitX=0;exitY=0;exitDx=50;exitDy=0;exitPerimeter=0;" edge="1" parent="t8PL5avYcYxuv0YEq-6K-7" source="t8PL5avYcYxuv0YEq-6K-4" target="t8PL5avYcYxuv0YEq-6K-2">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="390" y="242.5" as="sourcePoint" />
-            <mxPoint x="440" y="192.5" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-12" value="Reverse proxy" style="whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="t8PL5avYcYxuv0YEq-6K-7">
-          <mxGeometry x="70" y="97.5" width="75" height="75" as="geometry" />
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-13" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;" edge="1" parent="t8PL5avYcYxuv0YEq-6K-7" source="t8PL5avYcYxuv0YEq-6K-12" target="t8PL5avYcYxuv0YEq-6K-2">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="180" y="160" as="sourcePoint" />
-            <mxPoint x="230" y="110" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-18" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="t8PL5avYcYxuv0YEq-6K-7" source="t8PL5avYcYxuv0YEq-6K-14" target="t8PL5avYcYxuv0YEq-6K-2">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-14" value="Env file (config)" style="shape=note;whiteSpace=wrap;html=1;backgroundOutline=1;darkOpacity=0.05;" vertex="1" parent="t8PL5avYcYxuv0YEq-6K-7">
-          <mxGeometry x="540" y="90" width="60" height="85" as="geometry" />
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-8" value="Joplin Application (mobile, desktop, ...)" style="whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
-          <mxGeometry x="40" y="110" width="130" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-9" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="t8PL5avYcYxuv0YEq-6K-8" target="t8PL5avYcYxuv0YEq-6K-12">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="130" y="270" as="sourcePoint" />
-            <mxPoint x="310" y="230" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="t8PL5avYcYxuv0YEq-6K-10" value="HTTP REST requests" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="t8PL5avYcYxuv0YEq-6K-9">
-          <mxGeometry x="0.0435" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>

Assets/WebsiteAssets/css/site.css

@@ -657,16 +657,6 @@ footer .bottom-links-row p {
 	font-size: 1.1em;
 }
 
-.language-switcher {
-	display: inline;
-}
-
-.language-switcher > button {
-	border: none;
-	background-color: transparent;
-	color: #0557ba;
-}
-
 /*****************************************************************
  WHAT'S NEW PAGE
 *****************************************************************/

Assets/WebsiteAssets/templates/front.mustache

@@ -421,7 +421,7 @@
 		</div>
 
 		<script
-			src="{{jsBaseUrl}}/bootstrap5.0.2.bundle.min.js"
+			src="{{jsBaseUrl}}/bootstrap5.0.2.min.js"
 			rel="preload"
 			as="script"
 		></script>

Assets/WebsiteAssets/templates/main-new.mustache

@@ -85,11 +85,6 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			{{> footer}}
 		</div>
 
-		<script
-			src="{{jsBaseUrl}}/bootstrap5.0.2.bundle.min.js"
-			rel="preload"
-			as="script"
-		></script>
 		<script src="{{{assetUrls.js.script}}}"></script>
 
 		{{> analytics}}

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -17,21 +17,6 @@
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
 				<a href="{{baseUrl}}/cn/" class="fw500">中文</a>
-
-				<!--
-				<div class="dropdown language-switcher">
-					<button class="fw500" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
-						Language
-					</button>
-					<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-						<li><a class="dropdown-item" href="#">Action</a></li>
-						<li><a class="dropdown-item" href="#">Another action</a></li>
-						<li><a class="dropdown-item" href="#">Something else here</a></li>
-					</ul>
-				</div>
-				-->
-
-
 				{{#showJoplinCloudLinks}}
 					{{> joplinCloudButton}}
 				{{/showJoplinCloudLinks}}

README.md

@@ -1,5 +1,5 @@
 <!-- DONATELINKS -->
-[![Donate using PayPal](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?business=E8JMYD2LQ8MMA&no_recurring=0&item_name=I+rely+on+donations+to+maintain+and+improve+the+Joplin+open+source+project.+Thank+you+for+your+help+-+it+makes+a+difference%21&currency_code=EUR) [![Sponsor on GitHub](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
+[![Donate using PayPal](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [![Sponsor on GitHub](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
 <!-- DONATELINKS -->
 
 <img width="64" src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/LinuxIcons/256x256.png" align="left" /> **Joplin** is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in [Markdown format](#markdown).
@@ -125,11 +125,10 @@ A community maintained list of these distributions can be found here: [Unofficia
 	- [How to build the apps](https://github.com/laurent22/joplin/blob/dev/BUILD.md)
 	- [Writing a technical spec](https://github.com/laurent22/joplin/blob/dev/readme/technical_spec.md)
 	- [Desktop application styling](https://github.com/laurent22/joplin/blob/dev/readme/spec/desktop_styling.md)
-	- [Note history spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md)
+	- [Note History spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md)
 	- [Synchronisation spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/sync.md)
 	- [Sync Lock spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md)
 	- [Synchronous Scroll spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_scroll.md)
-	- [Overall Architecture spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/architecture.md)
 	- [Plugin Architecture spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md)
 	- [Search Sorting spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md)
 	- [E2EE: Technical spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md)

package.json

@@ -81,7 +81,7 @@
     "gulp": "4.0.2",
     "husky": "3.1.0",
     "lerna": "3.22.1",
-    "lint-staged": "13.2.1",
+    "lint-staged": "13.2.0",
     "madge": "6.0.0",
     "npm-package-json-lint": "6.4.0",
     "typedoc": "0.17.8",
@@ -96,7 +96,6 @@
   "packageManager": "yarn@3.3.1",
   "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",
-    "rn-fetch-blob@0.12.0": "patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.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"
+    "rn-fetch-blob@0.12.0": "patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch"
   }
 }

packages/app-cli/package.json

@@ -44,7 +44,7 @@
     "@joplin/lib": "~2.11",
     "@joplin/renderer": "~2.11",
     "@joplin/utils": "~2.11",
-    "aws-sdk": "2.1340.0",
+    "aws-sdk": "2.1290.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
     "fs-extra": "11.1.1",
@@ -57,7 +57,7 @@
     "proper-lockfile": "4.1.2",
     "read-chunk": "2.1.0",
     "server-destroy": "1.0.1",
-    "sharp": "0.32.0",
+    "sharp": "0.31.3",
     "sprintf-js": "1.1.2",
     "sqlite3": "5.1.6",
     "string-padding": "1.0.2",

packages/app-desktop/gui/NoteEditor/NoteEditor.tsx

@@ -631,7 +631,7 @@ const mapStateToProps = (state: AppState) => {
 		], whenClauseContext)[0],
 		contentMaxWidth: state.settings['style.editor.contentMaxWidth'],
 		isSafeMode: state.settings.isSafeMode,
-		useCustomPdfViewer: false, // state.settings.useCustomPdfViewer,
+		useCustomPdfViewer: state.settings.useCustomPdfViewer,
 	};
 };
 

packages/app-desktop/package.json

@@ -5,7 +5,8 @@
   "main": "main.js",
   "private": true,
   "scripts": {
-    "dist": "yarn run electronRebuild && npx electron-builder",
+    "dist": "yarn run bundleDefaultPlugins && yarn run electronRebuild && npx electron-builder",
+    "bundleDefaultPlugins": "cd ../tools && node bundleDefaultPlugins.js",
     "build": "gulp build",
     "postinstall": "yarn run build",
     "electronBuilder": "gulp electronBuilder",
@@ -27,7 +28,6 @@
   },
   "build": {
     "appId": "net.cozic.joplin-desktop",
-    "compression": "maximum",
     "productName": "Joplin",
     "npmRebuild": false,
     "afterSign": "./tools/notarizeMacApp.js",
@@ -91,7 +91,11 @@
             "CFBundleURLName": "org.joplinapp.x-callback-url"
           }
         ]
-      }
+      },
+      "binaries": [
+        "Contents/Resources/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/mac/arm64/7za",
+        "Contents/Resources/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/mac/x64/7za"
+      ]
     },
     "linux": {
       "icon": "../../Assets/LinuxIcons",
@@ -108,6 +112,8 @@
   },
   "homepage": "https://github.com/laurent22/joplin#readme",
   "devDependencies": {
+    "@electron/notarize": "1.2.3",
+    "@electron/rebuild": "3.2.10",
     "@joplin/tools": "~2.11",
     "@testing-library/react-hooks": "8.0.1",
     "@types/jest": "29.2.6",
@@ -116,9 +122,7 @@
     "@types/react-redux": "7.1.25",
     "@types/styled-components": "5.1.26",
     "electron": "19.1.4",
-    "electron-builder": "23.6.0",
-    "electron-notarize": "1.2.2",
-    "electron-rebuild": "3.2.9",
+    "electron-builder": "24.1.2",
     "glob": "8.1.0",
     "gulp": "4.0.2",
     "jest": "29.4.3",
@@ -138,6 +142,7 @@
     "@fortawesome/fontawesome-free": "5.15.4",
     "@joeattardi/emoji-button": "4.6.4",
     "@joplin/lib": "~2.11",
+    "@joplin/pdf-viewer": "~2.11",
     "@joplin/renderer": "~2.11",
     "async-mutex": "0.4.0",
     "codemirror": "5.65.9",
@@ -167,7 +172,7 @@
     "react-toggle-button": "2.2.0",
     "react-tooltip": "4.5.1",
     "redux": "4.2.1",
-    "reselect": "4.1.8",
+    "reselect": "4.1.7",
     "roboto-fontface": "0.10.0",
     "smalltalk": "2.5.1",
     "sqlite3": "5.1.6",
@@ -176,4 +181,4 @@
     "taboverride": "4.0.3",
     "tinymce": "5.10.6"
   }
-}
+}

packages/app-desktop/tools/copyApplicationAssets.js

@@ -72,10 +72,10 @@ async function main() {
 			src: langSourceDir,
 			dest: `${buildLibDir}/tinymce/langs`,
 		},
-		// {
-		// 	src: resolve(__dirname, '../../pdf-viewer/dist'),
-		// 	dest: `${buildLibDir}/@joplin/pdf-viewer`,
-		// },
+		{
+			src: resolve(__dirname, '../../pdf-viewer/dist'),
+			dest: `${buildLibDir}/@joplin/pdf-viewer`,
+		},
 	];
 
 	const files = [
@@ -93,10 +93,10 @@ async function main() {
 			src: resolve(__dirname, '../../lib/services/plugins/sandboxProxy.js'),
 			dest: `${buildLibDir}/@joplin/lib/services/plugins/sandboxProxy.js`,
 		},
-		// {
-		// 	src: resolve(__dirname, '../../pdf-viewer/index.html'),
-		// 	dest: `${buildLibDir}/@joplin/pdf-viewer/index.html`,
-		// },
+		{
+			src: resolve(__dirname, '../../pdf-viewer/index.html'),
+			dest: `${buildLibDir}/@joplin/pdf-viewer/index.html`,
+		},
 	];
 
 	// First we delete all the destination directories, then we copy the files.

packages/app-desktop/tools/notarizeMacApp.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const electron_notarize = require('electron-notarize');
+const electron_notarize = require('@electron/notarize');
 const execCommand = require('./execCommand');
 
 function isDesktopAppTag(tagName) {

packages/app-mobile/.gitignore

@@ -72,4 +72,3 @@ components/NoteEditor/CodeMirror/CodeMirror.bundle.min.js
 components/NoteEditor/**/*.bundle.js.md5
 
 utils/fs-driver-android.js
-android/app/build-*

packages/app-mobile/android/app/build.gradle

@@ -79,9 +79,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
  */
 
 project.ext.react = [
-    // 2023/05/07: Leave that to `false` for now because Hermes is rubbish at
-    // reporting errors, which it makes it impossible to investigate crashes.
-    enableHermes: false,  // clean and rebuild if changing
+    enableHermes: true,  // clean and rebuild if changing
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -152,8 +150,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097694
-		versionName "2.11.9"
+		versionCode 2097687
+		versionName "2.11.2"
 		// ndk {
 		// 	abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		// }

packages/app-mobile/android/app/src/main/assets/model-fr-fr/README

@@ -1,7 +0,0 @@
-French small model for Vosk
-
-WER
-
-%WER 23.95 [ 37203 / 155330, 5373 ins, 4427 del, 27403 sub ] exp/chain_a/tdnn/decode_test_cv/wer_12_0.0
-%WER 19.30 [ 2975 / 15412, 683 ins, 672 del, 1620 sub ] exp/chain_a/tdnn/decode_test_mtedx/wer_10_0.0
-%WER 27.25 [ 20208 / 74145, 2647 ins, 5852 del, 11709 sub ] exp/chain_a/tdnn/decode_test_podcast_reseg/wer_10_0.0

packages/app-mobile/android/app/src/main/assets/model-fr-fr/conf/mfcc.conf

@@ -1,8 +0,0 @@
---use-energy=false
---sample-frequency=16000
---num-mel-bins=40
---num-ceps=40
---low-freq=40
---high-freq=-200
---allow-upsample=true
---allow-downsample=true

packages/app-mobile/android/app/src/main/assets/model-fr-fr/conf/model.conf

@@ -1,10 +0,0 @@
---min-active=200
---max-active=7000
---beam=13.0
---lattice-beam=4.0
---acoustic-scale=1.0
---frame-subsampling-factor=3
---endpoint.silence-phones=1:2:3:4:5:6:7:8:9:10
---endpoint.rule2.min-trailing-silence=0.5
---endpoint.rule3.min-trailing-silence=1.0
---endpoint.rule4.min-trailing-silence=2.0

packages/app-mobile/android/app/src/main/assets/model-fr-fr/graph/disambig_tid.int

@@ -1,76 +0,0 @@
-9365
-9366
-9367
-9368
-9369
-9370
-9371
-9372
-9373
-9374
-9375
-9376
-9377
-9378
-9379
-9380
-9381
-9382
-9383
-9384
-9385
-9386
-9387
-9388
-9389
-9390
-9391
-9392
-9393
-9394
-9395
-9396
-9397
-9398
-9399
-9400
-9401
-9402
-9403
-9404
-9405
-9406
-9407
-9408
-9409
-9410
-9411
-9412
-9413
-9414
-9415
-9416
-9417
-9418
-9419
-9420
-9421
-9422
-9423
-9424
-9425
-9426
-9427
-9428
-9429
-9430
-9431
-9432
-9433
-9434
-9435
-9436
-9437
-9438
-9439
-9440

packages/app-mobile/android/app/src/main/assets/model-fr-fr/graph/phones/word_boundary.int

@@ -1,154 +0,0 @@
-1 nonword
-2 begin
-3 end
-4 internal
-5 singleton
-6 nonword
-7 begin
-8 end
-9 internal
-10 singleton
-11 begin
-12 end
-13 internal
-14 singleton
-15 begin
-16 end
-17 internal
-18 singleton
-19 begin
-20 end
-21 internal
-22 singleton
-23 begin
-24 end
-25 internal
-26 singleton
-27 begin
-28 end
-29 internal
-30 singleton
-31 begin
-32 end
-33 internal
-34 singleton
-35 begin
-36 end
-37 internal
-38 singleton
-39 begin
-40 end
-41 internal
-42 singleton
-43 begin
-44 end
-45 internal
-46 singleton
-47 begin
-48 end
-49 internal
-50 singleton
-51 begin
-52 end
-53 internal
-54 singleton
-55 begin
-56 end
-57 internal
-58 singleton
-59 begin
-60 end
-61 internal
-62 singleton
-63 begin
-64 end
-65 internal
-66 singleton
-67 begin
-68 end
-69 internal
-70 singleton
-71 begin
-72 end
-73 internal
-74 singleton
-75 begin
-76 end
-77 internal
-78 singleton
-79 begin
-80 end
-81 internal
-82 singleton
-83 begin
-84 end
-85 internal
-86 singleton
-87 begin
-88 end
-89 internal
-90 singleton
-91 begin
-92 end
-93 internal
-94 singleton
-95 begin
-96 end
-97 internal
-98 singleton
-99 begin
-100 end
-101 internal
-102 singleton
-103 begin
-104 end
-105 internal
-106 singleton
-107 begin
-108 end
-109 internal
-110 singleton
-111 begin
-112 end
-113 internal
-114 singleton
-115 begin
-116 end
-117 internal
-118 singleton
-119 begin
-120 end
-121 internal
-122 singleton
-123 begin
-124 end
-125 internal
-126 singleton
-127 begin
-128 end
-129 internal
-130 singleton
-131 begin
-132 end
-133 internal
-134 singleton
-135 begin
-136 end
-137 internal
-138 singleton
-139 begin
-140 end
-141 internal
-142 singleton
-143 begin
-144 end
-145 internal
-146 singleton
-147 begin
-148 end
-149 internal
-150 singleton
-151 begin
-152 end
-153 internal
-154 singleton

packages/app-mobile/android/app/src/main/assets/model-fr-fr/ivector/global_cmvn.stats

@@ -1,3 +0,0 @@
- [
-  1.022245e+11 -6.33291e+09 -2.480997e+09 8.290258e+09 -9.084483e+09 -8.092173e+09 -1.4735e+10 -7.041795e+09 -1.171205e+10 -2.976464e+08 -1.009425e+10 -6765179 -7.821326e+09 1.449499e+09 -6.413975e+09 -5.303802e+08 -4.998635e+09 9.521598e+07 -3.073041e+09 1.56756e+08 -1.287956e+09 1.738752e+08 -2.382392e+08 -2.716675e+07 4.404485e+08 -1.913359e+08 7.780919e+08 -4.006922e+08 7.895809e+08 -5.401082e+08 5.17605e+08 -6.227134e+08 6.58271e+08 -6.204593e+07 5.187754e+08 -4.497048e+08 4.219366e+07 -2.78742e+08 -1.797385e+07 -3.604475e+07 1.053647e+09 
-  1.040194e+13 6.245521e+11 4.223293e+11 6.831219e+11 6.078478e+11 6.3425e+11 7.943839e+11 6.013323e+11 6.781652e+11 5.272091e+11 5.810814e+11 4.353831e+11 4.473305e+11 3.42063e+11 3.083377e+11 2.14257e+11 1.892057e+11 1.163827e+11 8.367058e+10 4.203224e+10 2.297476e+10 7.596307e+09 1.099877e+09 2.886651e+08 3.797438e+09 9.372847e+09 1.629059e+10 2.196351e+10 2.747149e+10 3.072878e+10 3.238528e+10 3.330232e+10 3.407238e+10 3.230687e+10 2.676914e+10 2.252055e+10 1.914305e+10 1.565974e+10 1.224627e+10 8.415393e+09 0 ]

packages/app-mobile/android/app/src/main/assets/model-fr-fr/ivector/splice.conf

@@ -1,2 +0,0 @@
---left-context=3
---right-context=3

packages/app-mobile/android/app/src/main/assets/model-fr-fr/uuid

@@ -1 +0,0 @@
-1b7180e6-e500-4818-adc8-a41fe97a84ce

packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts

@@ -3,11 +3,8 @@ import shim from '@joplin/lib/shim';
 import Setting from '@joplin/lib/models/Setting';
 const { themeStyle } = require('../../global-style.js');
 import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
-import Logger from '@joplin/lib/Logger';
 const { assetsToHeaders } = require('@joplin/renderer');
 
-const logger = Logger.create('NoteBodyViewer/useSource');
-
 interface UseSourceResult {
 	// [html] can be null if the note is still being rendered.
 	html: string|null;
@@ -22,23 +19,6 @@ function usePrevious(value: any, initialValue: any = null): any {
 	return ref.current;
 }
 
-const onlyCheckboxHasChangedHack = (previousBody: string, newBody: string) => {
-	if (previousBody.length !== newBody.length) return false;
-
-	for (let i = 0; i < previousBody.length; i++) {
-		const c1 = previousBody.charAt(i);
-		const c2 = newBody.charAt(i);
-
-		if (c1 !== c2) {
-			if (c1 === ' ' && (c2 === 'x' || c2 === 'X')) continue;
-			if (c2 === ' ' && (c1 === 'x' || c1 === 'X')) continue;
-			return false;
-		}
-	}
-
-	return true;
-};
-
 export default function useSource(noteBody: string, noteMarkupLanguage: number, themeId: number, highlightedKeywords: string[], noteResources: any, paddingBottom: number, noteHash: string): UseSourceResult {
 	const [html, setHtml] = useState<string>('');
 	const [injectedJs, setInjectedJs] = useState<string[]>([]);
@@ -62,20 +42,14 @@ export default function useSource(noteBody: string, noteMarkupLanguage: number,
 
 	// To address https://github.com/laurent22/joplin/issues/433
 	//
-	// If a checkbox in a note is ticked, the body changes, which normally would
-	// trigger a re-render of this component, which has the unfortunate side
-	// effect of making the view scroll back to the top. This re-rendering
-	// however is uncessary since the component is already visually updated via
-	// JS. So here, if the note has not changed, we prevent the component from
-	// updating. This fixes the above issue. A drawback of this is if the note
-	// is updated via sync, this change will not be displayed immediately.
-	//
-	// 2022-05-03: However we sometimes need the HTML to be updated, even when
-	// only the body has changed - for example when attaching a resource, or
-	// when adding text via speech recognition. So the logic has been narrowed
-	// down so that updates are skipped only when checkbox has been changed.
-	// Checkboxes still work as expected, without making the note scroll, and
-	// other text added to the note is displayed correctly.
+	// If a checkbox in a note is ticked, the body changes, which normally
+	// would trigger a re-render of this component, which has the
+	// unfortunate side effect of making the view scroll back to the top.
+	// This re-rendering however is uncessary since the component is
+	// already visually updated via JS. So here, if the note has not
+	// changed, we prevent the component from updating. This fixes the
+	// above issue. A drawback of this is if the note is updated via sync,
+	// this change will not be displayed immediately.
 	//
 	// IMPORTANT: KEEP noteBody AS THE FIRST dependency in the array as the
 	// below logic rely on this.
@@ -88,13 +62,9 @@ export default function useSource(noteBody: string, noteMarkupLanguage: number,
 		return accum;
 	}, {});
 	const onlyNoteBodyHasChanged = Object.keys(changedDeps).length === 1 && changedDeps[0];
-	const onlyCheckboxesHaveChanged = previousDeps[0] && changedDeps[0] && onlyCheckboxHasChangedHack(previousDeps[0], noteBody);
 
 	useEffect(() => {
-		if (onlyNoteBodyHasChanged && onlyCheckboxesHaveChanged) {
-			logger.info('Only a checkbox has changed - not updating HTML');
-			return () => {};
-		}
+		if (onlyNoteBodyHasChanged) return () => {};
 
 		let cancelled = false;
 

packages/app-mobile/components/note-list.js

@@ -1,32 +1,15 @@
 const React = require('react');
-
-import { Component } from 'react';
-
-import { connect } from 'react-redux';
-import { FlatList, Text, StyleSheet, Button, View } from 'react-native';
-import { FolderEntity, NoteEntity } from '@joplin/lib/services/database/types';
-import { AppState } from '../utils/types';
-
+const Component = React.Component;
+const { connect } = require('react-redux');
+const { FlatList, Text, StyleSheet, Button, View } = require('react-native');
 const { _ } = require('@joplin/lib/locale');
 const { NoteItem } = require('./note-item.js');
+const time = require('@joplin/lib/time').default;
 const { themeStyle } = require('./global-style.js');
 
-interface NoteListProps {
-	themeId: string;
-	dispatch: (action: any)=> void;
-	notesSource: string;
-	items: NoteEntity[];
-	folders: FolderEntity[];
-	noteSelectionEnabled?: boolean;
-	selectedFolderId?: string;
-}
-
-class NoteListComponent extends Component<NoteListProps> {
-	private rootRef_: FlatList;
-	private styles_: Record<string, StyleSheet.NamedStyles<any>>;
-
-	public constructor(props: NoteListProps) {
-		super(props);
+class NoteListComponent extends Component {
+	constructor() {
+		super();
 
 		this.state = {
 			items: [],
@@ -38,7 +21,7 @@ class NoteListComponent extends Component<NoteListProps> {
 		this.createNotebookButton_click = this.createNotebookButton_click.bind(this);
 	}
 
-	private styles() {
+	styles() {
 		const themeId = this.props.themeId;
 		const theme = themeStyle(themeId);
 
@@ -64,7 +47,7 @@ class NoteListComponent extends Component<NoteListProps> {
 		return this.styles_[themeId];
 	}
 
-	private createNotebookButton_click() {
+	createNotebookButton_click() {
 		this.props.dispatch({
 			type: 'NAV_GO',
 			routeName: 'Folder',
@@ -72,14 +55,34 @@ class NoteListComponent extends Component<NoteListProps> {
 		});
 	}
 
-	public UNSAFE_componentWillReceiveProps(newProps: NoteListProps) {
+	filterNotes(notes) {
+		const todoFilter = 'all'; // Setting.value('todoFilter');
+		if (todoFilter === 'all') return notes;
+
+		const now = time.unixMs();
+		const maxInterval = 1000 * 60 * 60 * 24;
+		const notRecentTime = now - maxInterval;
+
+		const output = [];
+		for (let i = 0; i < notes.length; i++) {
+			const note = notes[i];
+			if (note.is_todo) {
+				if (todoFilter === 'recent' && note.user_updated_time < notRecentTime && !!note.todo_completed) continue;
+				if (todoFilter === 'nonCompleted' && !!note.todo_completed) continue;
+			}
+			output.push(note);
+		}
+		return output;
+	}
+
+	UNSAFE_componentWillReceiveProps(newProps) {
 		// Make sure scroll position is reset when switching from one folder to another or to a tag list.
 		if (this.rootRef_ && newProps.notesSource !== this.props.notesSource) {
 			this.rootRef_.scrollToOffset({ offset: 0, animated: false });
 		}
 	}
 
-	public render() {
+	render() {
 		// `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39
 
 		if (this.props.items.length) {
@@ -106,7 +109,7 @@ class NoteListComponent extends Component<NoteListProps> {
 	}
 }
 
-const NoteList = connect((state: AppState) => {
+const NoteList = connect(state => {
 	return {
 		items: state.notes,
 		folders: state.folders,
@@ -116,4 +119,4 @@ const NoteList = connect((state: AppState) => {
 	};
 })(NoteListComponent);
 
-export default NoteList;
+module.exports = { NoteList };

packages/app-mobile/components/screens/Note.tsx

@@ -29,7 +29,7 @@ import ScreenHeader from '../ScreenHeader';
 const NoteTagsDialog = require('./NoteTagsDialog');
 import time from '@joplin/lib/time';
 const { Checkbox } = require('../checkbox.js');
-import { _, currentLocale } from '@joplin/lib/locale';
+const { _ } = require('@joplin/lib/locale');
 import { reg } from '@joplin/lib/registry';
 import ResourceFetcher from '@joplin/lib/services/ResourceFetcher';
 const { BaseScreenComponent } = require('../base-screen.js');
@@ -44,18 +44,13 @@ import ShareExtension from '../../utils/ShareExtension.js';
 import CameraView from '../CameraView';
 import { NoteEntity } from '@joplin/lib/services/database/types';
 import Logger from '@joplin/lib/Logger';
-import VoiceTypingDialog from '../voiceTyping/VoiceTypingDialog';
-import { voskEnabled } from '../../services/voiceTyping/vosk';
 const urlUtils = require('@joplin/lib/urlUtils');
 
-// import Vosk from 'react-native-vosk';
-
 const emptyArray: any[] = [];
 
 const logger = Logger.create('screens/Note');
 
 class NoteScreenComponent extends BaseScreenComponent {
-
 	public static navigationOptions(): any {
 		return { header: null };
 	}
@@ -89,8 +84,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 				canUndo: false,
 				canRedo: false,
 			},
-
-			voiceTypingDialogShown: false,
 		};
 
 		this.saveActionQueues_ = {};
@@ -245,8 +238,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 		this.onBodyViewerCheckboxChange = this.onBodyViewerCheckboxChange.bind(this);
 		this.onBodyChange = this.onBodyChange.bind(this);
 		this.onUndoRedoDepthChange = this.onUndoRedoDepthChange.bind(this);
-		this.voiceTypingDialog_onText = this.voiceTypingDialog_onText.bind(this);
-		this.voiceTypingDialog_onDismiss = this.voiceTypingDialog_onDismiss.bind(this);
 	}
 
 	private useEditorBeta(): boolean {
@@ -880,69 +871,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 		if (buttonId === 'attachPhoto') void this.attachPhoto_onPress();
 	}
 
-	// private vosk_:Vosk;
-
-	// private async getVosk() {
-	// 	if (this.vosk_) return this.vosk_;
-	// 	this.vosk_ = new Vosk();
-	// 	await this.vosk_.loadModel('model-fr-fr');
-	// 	return this.vosk_;
-	// }
-
-	// private async voiceRecording_onPress() {
-	// 	logger.info('Vosk: Getting instance...');
-
-	// 	const vosk = await this.getVosk();
-
-	// 	this.voskResult_ = [];
-
-	// 	const eventHandlers: any[] = [];
-
-	// 	eventHandlers.push(vosk.onResult(e => {
-	// 		logger.info('Vosk: result', e.data);
-	// 		this.voskResult_.push(e.data);
-	// 	}));
-
-	// 	eventHandlers.push(vosk.onError(e => {
-	// 		logger.warn('Vosk: error', e.data);
-	// 	}));
-
-	// 	eventHandlers.push(vosk.onTimeout(e => {
-	// 		logger.warn('Vosk: timeout', e.data);
-	// 	}));
-
-	// 	eventHandlers.push(vosk.onFinalResult(e => {
-	// 		logger.info('Vosk: final result', e.data);
-	// 	}));
-
-	// 	logger.info('Vosk: Starting recording...');
-
-	// 	void vosk.start();
-
-	// 	const buttonId = await dialogs.pop(this, 'Voice recording in progress...', [
-	// 		{ text: 'Stop recording', id: 'stop' },
-	// 		{ text: _('Cancel'), id: 'cancel' },
-	// 	]);
-
-	// 	logger.info('Vosk: Stopping recording...');
-	// 	vosk.stop();
-
-	// 	for (const eventHandler of eventHandlers) {
-	// 		eventHandler.remove();
-	// 	}
-
-	// 	logger.info('Vosk: Recording stopped:', this.voskResult_);
-
-	// 	if (buttonId === 'cancel') return;
-
-	// 	const newNote: NoteEntity = { ...this.state.note };
-	// 	newNote.body = `${newNote.body} ${this.voskResult_.join(' ')}`;
-	// 	this.setState({ note: newNote });
-	// 	this.scheduleSave();
-	// }
-
-
-
 	public menuOptions() {
 		const note = this.state.note;
 		const isTodo = note && !!note.is_todo;
@@ -986,18 +914,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 				void this.share_onPress();
 			},
 		});
-
-		// Voice typing is enabled only for French language and on Android for now
-		if (voskEnabled && shim.mobilePlatform() === 'android' && currentLocale() === 'fr_FR') {
-			output.push({
-				title: _('Voice typing...'),
-				onPress: () => {
-					// this.voiceRecording_onPress();
-					this.setState({ voiceTypingDialogShown: true });
-				},
-			});
-		}
-
 		if (isSaved) {
 			output.push({
 				title: _('Tags'),
@@ -1117,25 +1033,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 		void this.saveOneProperty('body', newBody);
 	}
 
-	private voiceTypingDialog_onText(text: string) {
-		if (this.state.mode === 'view') {
-			const newNote: NoteEntity = { ...this.state.note };
-			newNote.body = `${newNote.body} ${text}`;
-			this.setState({ note: newNote });
-			this.scheduleSave();
-		} else {
-			if (this.useEditorBeta()) {
-				this.editorRef.current.insertText(text);
-			} else {
-				logger.warn('Voice typing is not supported in plaintext editor');
-			}
-		}
-	}
-
-	private voiceTypingDialog_onDismiss() {
-		this.setState({ voiceTypingDialogShown: false });
-	}
-
 	public render() {
 		if (this.state.isLoading) {
 			return (
@@ -1291,11 +1188,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 
 		const noteTagDialog = !this.state.noteTagDialogShown ? null : <NoteTagsDialog onCloseRequested={this.noteTagDialog_closeRequested} />;
 
-		const renderVoiceTypingDialog = () => {
-			if (!this.state.voiceTypingDialogShown) return null;
-			return <VoiceTypingDialog onText={this.voiceTypingDialog_onText} onDismiss={this.voiceTypingDialog_onDismiss}/>;
-		};
-
 		return (
 			<View style={this.rootStyle(this.props.themeId).root}>
 				<ScreenHeader
@@ -1324,7 +1216,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 					}}
 				/>
 				{noteTagDialog}
-				{renderVoiceTypingDialog()}
 			</View>
 		);
 	}
@@ -1347,10 +1238,6 @@ const NoteScreen = connect((state: any) => {
 		showSideMenu: state.showSideMenu,
 		provisionalNoteIds: state.provisionalNoteIds,
 		highlightedWords: state.highlightedWords,
-
-		// What we call "beta editor" in this component is actually the (now
-		// default) CodeMirror editor. That should be refactored to make it less
-		// confusing.
 		useEditorBeta: !state.settings['editor.usePlainText'],
 	};
 })(NoteScreenComponent);

packages/app-mobile/components/screens/Notes.tsx

@@ -2,7 +2,7 @@ const React = require('react');
 import { AppState as RNAppState, View, StyleSheet, NativeEventSubscription } from 'react-native';
 import { stateUtils } from '@joplin/lib/reducer';
 import { connect } from 'react-redux';
-import NoteList from '../NoteList';
+const { NoteList } = require('../note-list.js');
 import Folder from '@joplin/lib/models/Folder';
 import Tag from '@joplin/lib/models/Tag';
 import Note from '@joplin/lib/models/Note';
@@ -254,7 +254,7 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
 		return (
 			<View style={rootStyle}>
 				<ScreenHeader title={iconString + title} showBackButton={false} parentComponent={thisComp} sortButton_press={this.sortButton_press} folderPickerOptions={this.folderPickerOptions()} showSearchButton={true} showSideMenuButton={true} />
-				<NoteList />
+				<NoteList style={this.styles().noteList} />
 				{actionButtonComp}
 				<DialogBox
 					ref={(dialogbox: any) => {

packages/app-mobile/components/voiceTyping/VoiceTypingDialog.tsx

@@ -1,99 +0,0 @@
-import * as React from 'react';
-import { useState, useEffect, useCallback } from 'react';
-import { Button, Dialog, Text } from 'react-native-paper';
-import { _ } from '@joplin/lib/locale';
-import useAsyncEffect, { AsyncEffectEvent } from '@joplin/lib/hooks/useAsyncEffect';
-import { getVosk, Recorder, startRecording, Vosk } from '../../services/voiceTyping/vosk';
-import { Alert } from 'react-native';
-
-interface Props {
-	onDismiss: ()=> void;
-	onText: (text: string)=> void;
-}
-
-enum RecorderState {
-	Loading = 1,
-	Recording = 2,
-	Processing = 3,
-}
-
-const useVosk = (): Vosk|null => {
-	const [vosk, setVosk] = useState<Vosk>(null);
-
-	useAsyncEffect(async (event: AsyncEffectEvent) => {
-		const v = await getVosk();
-		if (event.cancelled) return;
-		setVosk(v);
-	}, []);
-
-	return vosk;
-};
-
-export default (props: Props) => {
-	const [recorder, setRecorder] = useState<Recorder>(null);
-	const [recorderState, setRecorderState] = useState<RecorderState>(RecorderState.Loading);
-
-	const vosk = useVosk();
-
-	useEffect(() => {
-		if (!vosk) return;
-		setRecorderState(RecorderState.Recording);
-	}, [vosk]);
-
-	useEffect(() => {
-		if (recorderState === RecorderState.Recording) {
-			setRecorder(startRecording(vosk));
-		}
-	}, [recorderState, vosk]);
-
-	const onDismiss = useCallback(() => {
-		recorder.cleanup();
-		props.onDismiss();
-	}, [recorder, props.onDismiss]);
-
-	const onStop = useCallback(async () => {
-		try {
-			setRecorderState(RecorderState.Processing);
-			const result = await recorder.stop();
-			props.onText(result);
-		} catch (error) {
-			Alert.alert(error.message);
-		}
-		onDismiss();
-	}, [recorder, onDismiss, props.onText]);
-
-	const renderContent = () => {
-		const components: Record<RecorderState, any> = {
-			[RecorderState.Loading]: <Text variant="bodyMedium">Loading...</Text>,
-			[RecorderState.Recording]: <Text variant="bodyMedium">Please record your voice...</Text>,
-			[RecorderState.Processing]: <Text variant="bodyMedium">Converting speech to text...</Text>,
-		};
-
-		return components[recorderState];
-	};
-
-	const renderActions = () => {
-		const components: Record<RecorderState, any> = {
-			[RecorderState.Loading]: null,
-			[RecorderState.Recording]: (
-				<Dialog.Actions>
-					<Button onPress={onDismiss}>Cancel</Button>
-					<Button onPress={onStop}>Done</Button>
-				</Dialog.Actions>
-			),
-			[RecorderState.Processing]: null,
-		};
-
-		return components[recorderState];
-	};
-
-	return (
-		<Dialog visible={true} onDismiss={props.onDismiss}>
-			<Dialog.Title>{_('Voice typing')}</Dialog.Title>
-			<Dialog.Content>
-				{renderContent()}
-			</Dialog.Content>
-			{renderActions()}
-		</Dialog>
-	);
-};

packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj

@@ -384,12 +384,14 @@
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -420,7 +422,6 @@
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/react-native-vosk/Vosk.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -441,7 +442,6 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Vosk.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -598,7 +598,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -661,7 +661,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

packages/app-mobile/ios/Podfile

@@ -20,13 +20,10 @@ target 'Joplin' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    # Hermes is now enabled by default. Disable by setting this flag to false.
+# Hermes is now enabled by default. Disable by setting this flag to false.
     # Upcoming versions of React Native may rely on get_default_flags(), but
     # we make it explicit here to aid in the React Native upgrade process.
-
-    # 2023/05/07: Leave that to `false` for now because Hermes is rubbish at
-    # reporting errors, which it makes it impossible to investigate crashes.
-    :hermes_enabled => false,
+    :hermes_enabled => true,
     :fabric_enabled => flags[:fabric_enabled],
     # Enables Flipper.
     #

packages/app-mobile/ios/Podfile.lock

@@ -73,6 +73,7 @@ PODS:
     - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
+  - hermes-engine (0.70.6)
   - JoplinCommonShareExtension (1.0.0)
   - JoplinRNShareExtension (1.0.0):
     - JoplinCommonShareExtension
@@ -90,6 +91,12 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
+  - RCT-Folly/Futures (2021.07.22.00):
+    - boost
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - libevent
   - RCTRequired (0.70.6)
   - RCTTypeSafety (0.70.6):
     - FBLazyVector (= 0.70.6)
@@ -267,6 +274,17 @@ PODS:
     - React-logger (= 0.70.6)
     - React-perflogger (= 0.70.6)
     - React-runtimeexecutor (= 0.70.6)
+  - React-hermes (0.70.6):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly/Futures (= 2021.07.22.00)
+    - React-cxxreact (= 0.70.6)
+    - React-jsi (= 0.70.6)
+    - React-jsiexecutor (= 0.70.6)
+    - React-jsinspector (= 0.70.6)
+    - React-perflogger (= 0.70.6)
   - React-jsi (0.70.6):
     - boost (= 1.76.0)
     - DoubleConversion
@@ -298,7 +316,7 @@ PODS:
     - React-Core
   - react-native-camera/RN (4.2.1):
     - React-Core
-  - react-native-document-picker (8.2.0):
+  - react-native-document-picker (8.1.4):
     - React-Core
   - react-native-fingerprint-scanner (6.0.0):
     - React
@@ -310,13 +328,13 @@ PODS:
     - React-Core
   - react-native-image-resizer (1.4.5):
     - React-Core
-  - react-native-netinfo (9.3.9):
+  - react-native-netinfo (9.3.8):
     - React-Core
   - react-native-rsa-native (2.0.5):
     - React
   - react-native-saf-x (2.11.0):
     - React-Core
-  - react-native-safe-area-context (4.5.1):
+  - react-native-safe-area-context (4.5.0):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -328,8 +346,6 @@ PODS:
     - React-Core
   - react-native-version-info (1.1.1):
     - React-Core
-  - react-native-vosk (0.1.12):
-    - React-Core
   - react-native-webview (11.26.1):
     - React-Core
   - React-perflogger (0.70.6)
@@ -416,7 +432,7 @@ PODS:
     - React
   - RNSecureRandom (1.0.1):
     - React
-  - RNShare (8.2.2):
+  - RNShare (8.2.1):
     - React-Core
   - RNVectorIcons (9.2.0):
     - React-Core
@@ -452,8 +468,10 @@ DEPENDENCIES:
   - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
   - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+  - hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`)
   - JoplinCommonShareExtension (from `ShareExtension`)
   - JoplinRNShareExtension (from `ShareExtension`)
+  - libevent (~> 2.1.12)
   - OpenSSL-Universal (= 1.1.1100)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -467,6 +485,7 @@ DEPENDENCIES:
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
   - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
   - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
+  - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`)
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
@@ -486,7 +505,6 @@ DEPENDENCIES:
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-sqlite-storage (from `../node_modules/react-native-sqlite-storage`)
   - react-native-version-info (from `../node_modules/react-native-version-info`)
-  - react-native-vosk (from `../node_modules/react-native-vosk`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -542,6 +560,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/React/FBReactNativeSpec"
   glog:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
+  hermes-engine:
+    :podspec: "../node_modules/react-native/sdks/hermes/hermes-engine.podspec"
   JoplinCommonShareExtension:
     :path: ShareExtension
   JoplinRNShareExtension:
@@ -566,6 +586,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/React/CoreModules"
   React-cxxreact:
     :path: "../node_modules/react-native/ReactCommon/cxxreact"
+  React-hermes:
+    :path: "../node_modules/react-native/ReactCommon/hermes"
   React-jsi:
     :path: "../node_modules/react-native/ReactCommon/jsi"
   React-jsiexecutor:
@@ -604,8 +626,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-sqlite-storage"
   react-native-version-info:
     :path: "../node_modules/react-native-version-info"
-  react-native-vosk:
-    :path: "../node_modules/react-native-vosk"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
   React-perflogger:
@@ -674,6 +694,7 @@ SPEC CHECKSUMS:
   FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  hermes-engine: 2af7b7a59128f250adfd86f15aa1d5a2ecd39995
   JoplinCommonShareExtension: a8b60b02704d85a7305627912c0240e94af78db7
   JoplinRNShareExtension: 485f3e6dad83b7b77f1572eabc249f869ee55c02
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
@@ -688,26 +709,26 @@ SPEC CHECKSUMS:
   React-Core: b587d0a624f9611b0e032505f3d6f25e8daa2bee
   React-CoreModules: c6ff48b985e7aa622e82ca51c2c353c7803eb04e
   React-cxxreact: ade3d9e63c599afdead3c35f8a8bd12b3da6730b
+  React-hermes: ed09ae33512bbb8d31b2411778f3af1a2eb681a1
   React-jsi: 5a3952e0c6d57460ad9ee2c905025b4c28f71087
   React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f
   React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b
   React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0
   react-native-alarm-notification: 26527410a6162d07a9dc57f4bbc62e94ff48e65d
   react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
-  react-native-document-picker: 495c444c0c773c6e83a5d91165890ecb1c0a399a
+  react-native-document-picker: a9bd26996d1b2e4f412dd186041714c79af381d0
   react-native-fingerprint-scanner: ac6656f18c8e45a7459302b84da41a44ad96dbbe
   react-native-geolocation: 69f4fd37650b8e7fee91816d395e62dd16f5ab8d
   react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
   react-native-image-picker: ec9b713e248760bfa0f879f0715391de4651a7cb
   react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
-  react-native-netinfo: 22c082970cbd99071a4e5aa7a612ac20d66b08f0
+  react-native-netinfo: fbc23bc2fe217155d85f2f7e0644b1654df8029b
   react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
   react-native-saf-x: 9bd5238d3b43d76bbec64aa82c173ac20a4bce9f
-  react-native-safe-area-context: f5549f36508b1b7497434baa0cd97d7e470920d4
+  react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
   react-native-slider: 33b8d190b59d4f67a541061bb91775d53d617d9d
   react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
   react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9
-  react-native-vosk: 33b8e82a46cc56f31bb4847a40efa2d160270e2e
   react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
   React-perflogger: 8c79399b0500a30ee8152d0f9f11beae7fc36595
   React-RCTActionSheet: 7316773acabb374642b926c19aef1c115df5c466
@@ -730,12 +751,12 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
   RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef
-  RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
+  RNShare: eaee3dd5a06dad397c7d3b14762007035c5de405
   RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 0235ffbfa2e655de806a80d996148182dd493d8d
+PODFILE CHECKSUM: 1f5ea1b29b693e847adf004360d019d064a024ca
 
 COCOAPODS: 1.11.3

packages/app-mobile/metro.config.js

@@ -24,7 +24,6 @@ const localPackages = {
 	'@joplin/fork-uslug': path.resolve(__dirname, '../fork-uslug/'),
 	'@joplin/react-native-saf-x': path.resolve(__dirname, '../react-native-saf-x/'),
 	'@joplin/react-native-alarm-notification': path.resolve(__dirname, '../react-native-alarm-notification/'),
-	'@joplin/react-native-vosk': path.resolve(__dirname, '../react-native-vosk/'),
 };
 
 const watchedFolders = [];

packages/app-mobile/package.json

@@ -25,7 +25,7 @@
     "@react-native-community/clipboard": "1.5.1",
     "@react-native-community/datetimepicker": "6.7.5",
     "@react-native-community/geolocation": "2.1.0",
-    "@react-native-community/netinfo": "9.3.9",
+    "@react-native-community/netinfo": "9.3.8",
     "@react-native-community/push-notification-ios": "1.10.1",
     "@react-native-community/slider": "4.4.2",
     "assert-browserify": "2.0.0",
@@ -44,7 +44,7 @@
     "react-native-action-button": "2.8.5",
     "react-native-camera": "4.2.1",
     "react-native-dialogbox": "0.6.10",
-    "react-native-document-picker": "8.2.0",
+    "react-native-document-picker": "8.1.4",
     "react-native-dropdownalert": "4.5.1",
     "react-native-exit-app": "1.1.0",
     "react-native-file-viewer": "2.1.5",
@@ -58,15 +58,14 @@
     "react-native-popup-menu": "0.16.1",
     "react-native-quick-actions": "0.3.13",
     "react-native-rsa-native": "2.0.5",
-    "react-native-safe-area-context": "4.5.1",
+    "react-native-safe-area-context": "4.5.0",
     "react-native-securerandom": "1.0.1",
-    "react-native-share": "8.2.2",
+    "react-native-share": "8.2.1",
     "react-native-side-menu-updated": "1.3.2",
     "react-native-sqlite-storage": "6.0.1",
     "react-native-url-polyfill": "1.3.0",
     "react-native-vector-icons": "9.2.0",
     "react-native-version-info": "1.1.1",
-    "react-native-vosk": "0.1.12",
     "react-native-webview": "11.26.1",
     "react-redux": "7.2.9",
     "redux": "4.2.1",

packages/app-mobile/services/voiceTyping/vosk.dummy.ts

@@ -1,21 +0,0 @@
-type Vosk = any;
-
-export { Vosk };
-
-export interface Recorder {
-	stop: ()=> Promise<string>;
-	cleanup: ()=> void;
-}
-
-export const getVosk = async () => {
-	return {} as any;
-};
-
-export const startRecording = (_vosk: Vosk): Recorder => {
-	return {
-		stop: async () => { return ''; },
-		cleanup: () => {},
-	};
-};
-
-export const voskEnabled = false;

packages/app-mobile/services/voiceTyping/vosk.ts

@@ -1,113 +0,0 @@
-import Logger from '@joplin/lib/Logger';
-import Vosk from 'react-native-vosk';
-const logger = Logger.create('voiceTyping/vosk');
-
-enum State {
-	Idle = 0,
-	Recording,
-}
-
-let vosk_: Vosk|null = null;
-let state_: State = State.Idle;
-
-export const voskEnabled = true;
-
-export { Vosk };
-
-export interface Recorder {
-	stop: ()=> Promise<string>;
-	cleanup: ()=> void;
-}
-
-export const getVosk = async () => {
-	if (vosk_) return vosk_;
-	vosk_ = new Vosk();
-	await vosk_.loadModel('model-fr-fr');
-	return vosk_;
-};
-
-export const startRecording = (vosk: Vosk): Recorder => {
-	if (state_ !== State.Idle) throw new Error('Vosk is already recording');
-
-	state_ = State.Recording;
-
-	const result: string[] = [];
-	const eventHandlers: any[] = [];
-	let finalResultPromiseResolve: Function = null;
-	let finalResultPromiseReject: Function = null;
-	let finalResultTimeout = false;
-
-	const completeRecording = (finalResult: string, error: Error) => {
-		logger.info(`Complete recording. Final result: ${finalResult}. Error:`, error);
-
-		for (const eventHandler of eventHandlers) {
-			eventHandler.remove();
-		}
-
-		vosk.cleanup(),
-
-		state_ = State.Idle;
-
-		if (error) {
-			if (finalResultPromiseReject) finalResultPromiseReject(error);
-		} else {
-			if (finalResultPromiseResolve) finalResultPromiseResolve(finalResult);
-		}
-	};
-
-	eventHandlers.push(vosk.onResult(e => {
-		logger.info('Result', e.data);
-		result.push(e.data);
-	}));
-
-	eventHandlers.push(vosk.onError(e => {
-		logger.warn('Error', e.data);
-	}));
-
-	eventHandlers.push(vosk.onTimeout(e => {
-		logger.warn('Timeout', e.data);
-	}));
-
-	eventHandlers.push(vosk.onFinalResult(e => {
-		logger.info('Final result', e.data);
-
-		if (finalResultTimeout) {
-			logger.warn('Got final result - but already timed out. Not doing anything.');
-			return;
-		}
-
-		completeRecording(e.data, null);
-	}));
-
-	logger.info('Starting recording...');
-
-	void vosk.start();
-
-	return {
-		stop: (): Promise<string> => {
-			logger.info('Stopping recording...');
-
-			vosk.stopOnly();
-
-			logger.info('Waiting for final result...');
-
-			setTimeout(() => {
-				finalResultTimeout = true;
-				logger.warn('Timed out waiting for finalResult event');
-				completeRecording('', new Error('Could not process your message. Please try again.'));
-			}, 5000);
-
-			return new Promise((resolve: Function, reject: Function) => {
-				finalResultPromiseResolve = resolve;
-				finalResultPromiseReject = reject;
-			});
-		},
-		cleanup: () => {
-			if (state_ !== State.Idle) {
-				logger.info('Cancelling...');
-				vosk.stopOnly();
-				completeRecording('', null);
-			}
-		},
-	};
-};

packages/lib/models/Setting.ts

@@ -1395,7 +1395,7 @@ class Setting extends BaseModel {
 			useCustomPdfViewer: {
 				value: false,
 				type: SettingItemType.Bool,
-				public: false,
+				public: true,
 				advanced: true,
 				appTypes: [AppType.Desktop],
 				label: () => 'Use custom PDF viewer (Beta)',

packages/lib/package.json

@@ -25,12 +25,12 @@
     "@types/uuid": "^9.0.0",
     "clean-html": "1.5.0",
     "jest": "29.4.3",
-    "sharp": "0.32.0",
+    "sharp": "0.31.3",
     "typescript": "4.9.4"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.296.0",
-    "@aws-sdk/s3-request-presigner": "3.296.0",
+    "@aws-sdk/client-s3": "3.241.0",
+    "@aws-sdk/s3-request-presigner": "3.241.0",
     "@joplin/fork-htmlparser2": "^4.1.43",
     "@joplin/fork-sax": "^1.2.47",
     "@joplin/fork-uslug": "^1.0.8",
@@ -80,7 +80,7 @@
     "read-chunk": "2.1.0",
     "redux": "4.2.1",
     "relative": "3.0.2",
-    "reselect": "4.1.8",
+    "reselect": "4.1.7",
     "server-destroy": "1.0.1",
     "sprintf-js": "1.1.2",
     "sqlite3": "5.1.6",

packages/lib/services/searchengine/SearchEngine.test.js

@@ -431,7 +431,6 @@ describe('services_SearchEngine', () => {
 			['title:abcd efgh', { _: ['efgh'], title: ['abcd'] }],
 			['title:abcd', { title: ['abcd'] }],
 			['"abcd efgh"', { _: ['abcd efgh'] }],
-			['"abcd efgh" ijkl', { _: ['abcd efgh', 'ijkl'] }],
 			['title:abcd title:efgh', { title: ['abcd', 'efgh'] }],
 		];
 

packages/lib/services/searchengine/SearchEngine.ts

@@ -5,31 +5,20 @@ import Note from '../../models/Note';
 import BaseModel from '../../BaseModel';
 import ItemChangeUtils from '../ItemChangeUtils';
 import shim from '../../shim';
-import filterParser, { Term } from './filterParser';
+import filterParser from './filterParser';
 import queryBuilder from './queryBuilder';
 import { ItemChangeEntity, NoteEntity } from '../database/types';
 const { sprintf } = require('sprintf-js');
 const { pregQuote, scriptType, removeDiacritics } = require('../../string-utils.js');
 
-enum SearchType {
-	Auto = 'auto',
-	Basic = 'basic',
-	Nonlatin = 'nonlatin',
-	Fts = 'fts',
-}
-
-interface SearchOptions {
-	searchType: SearchType;
-}
-
 export default class SearchEngine {
 
 	public static instance_: SearchEngine = null;
 	public static relevantFields = 'id, title, body, user_created_time, user_updated_time, is_todo, todo_completed, todo_due, parent_id, latitude, longitude, altitude, source_url';
-	public static SEARCH_TYPE_AUTO = SearchType.Auto;
-	public static SEARCH_TYPE_BASIC = SearchType.Basic;
-	public static SEARCH_TYPE_NONLATIN_SCRIPT = SearchType.Nonlatin;
-	public static SEARCH_TYPE_FTS = SearchType.Fts;
+	public static SEARCH_TYPE_AUTO = 'auto';
+	public static SEARCH_TYPE_BASIC = 'basic';
+	public static SEARCH_TYPE_NONLATIN_SCRIPT = 'nonlatin';
+	public static SEARCH_TYPE_FTS = 'fts';
 
 	public dispatch: Function = (_o: any) => {};
 	private logger_ = new Logger();
@@ -428,7 +417,7 @@ export default class SearchEngine {
 
 		const trimQuotes = (str: string) => str.startsWith('"') ? str.substr(1, str.length - 2) : str;
 
-		let allTerms: Term[] = [];
+		let allTerms: any[] = [];
 
 		try {
 			allTerms = filterParser(query);
@@ -440,20 +429,7 @@ export default class SearchEngine {
 		const titleTerms = allTerms.filter(x => x.name === 'title' && !x.negated).map(x => trimQuotes(x.value));
 		const bodyTerms = allTerms.filter(x => x.name === 'body' && !x.negated).map(x => trimQuotes(x.value));
 
-		interface ComplexTerm {
-			type: 'regex' | 'text';
-			value: string;
-			scriptType: any;
-			valueRegex?: RegExp;
-		}
-
-		interface Terms {
-			_: (string | ComplexTerm)[];
-			title: (string | ComplexTerm)[];
-			body: (string | ComplexTerm)[];
-		}
-
-		const terms: Terms = { _: textTerms, 'title': titleTerms, 'body': bodyTerms };
+		const terms: any = { _: textTerms, 'title': titleTerms, 'body': bodyTerms };
 
 		// Filter terms:
 		// - Convert wildcards to regex
@@ -462,9 +438,7 @@ export default class SearchEngine {
 
 		let termCount = 0;
 		const keys = [];
-		for (const col2 in terms) {
-			const col = col2 as '_' | 'title' | 'body';
-
+		for (const col in terms) {
 			if (!terms.hasOwnProperty(col)) continue;
 
 			if (!terms[col].length) {
@@ -473,7 +447,7 @@ export default class SearchEngine {
 			}
 
 			for (let i = terms[col].length - 1; i >= 0; i--) {
-				const term = terms[col][i] as string;
+				const term = terms[col][i];
 
 				// SQlLite FTS doesn't allow "*" queries and neither shall we
 				if (term === '*') {
@@ -494,16 +468,12 @@ export default class SearchEngine {
 		}
 
 		//
-		// The object "allTerms" is used for query construction purposes (this
-		// contains all the filter terms) Since this is used for the FTS match
-		// query, we need to normalize text, title and body terms. Note, we're
-		// not normalizing terms like tag because these are matched using SQL
-		// LIKE operator and so we must preserve their diacritics.
+		// The object "allTerms" is used for query construction purposes (this contains all the filter terms)
+		// Since this is used for the FTS match query, we need to normalize text, title and body terms.
+		// Note, we're not normalizing terms like tag because these are matched using SQL LIKE operator and so we must preserve their diacritics.
 		//
-		// The object "terms" only include text, title, body terms and is used
-		// for highlighting. By not normalizing the text, title, body in
-		// "terms", highlighting still works correctly for words with
-		// diacritics.
+		// The object "terms" only include text, title, body terms and is used for highlighting.
+		// By not normalizing the text, title, body in "terms", highlighting still works correctly for words with diacritics.
 		//
 
 		allTerms = allTerms.map(x => {
@@ -551,9 +521,9 @@ export default class SearchEngine {
 		const searchOptions: any = {};
 
 		for (const key of parsedQuery.keys) {
-			if ((parsedQuery.terms as any)[key].length === 0) continue;
+			if (parsedQuery.terms[key].length === 0) continue;
 
-			const term = (parsedQuery.terms as any)[key].map((x: Term) => x.value).join(' ');
+			const term = parsedQuery.terms[key].map((x: any) => x.value).join(' ');
 			if (key === '_') searchOptions.anywherePattern = `*${term}*`;
 			if (key === 'title') searchOptions.titlePattern = `*${term}*`;
 			if (key === 'body') searchOptions.bodyPattern = `*${term}*`;
@@ -591,13 +561,12 @@ export default class SearchEngine {
 		return SearchEngine.SEARCH_TYPE_FTS;
 	}
 
-	public async search(searchString: string, options: SearchOptions = null) {
+	public async search(searchString: string, options: any = null) {
 		if (!searchString) return [];
 
-		options = {
+		options = Object.assign({}, {
 			searchType: SearchEngine.SEARCH_TYPE_AUTO,
-			...options,
-		};
+		}, options);
 
 		const searchType = this.determineSearchType_(searchString, options.searchType);
 		const parsedQuery = await this.parseQuery(searchString);

packages/lib/services/searchengine/filterParser.ts

@@ -1,5 +1,5 @@
 
-export interface Term {
+interface Term {
 	name: string;
 	value: string;
 	negated: boolean;

packages/lib/services/searchengine/gotoAnythingStyleQuery.test.ts

@@ -1,17 +0,0 @@
-import gotoAnythingStyleQuery from './gotoAnythingStyleQuery';
-
-describe('searchengine/gotoAnythingStyleQuery', () => {
-
-	it('should prepare queries', () => {
-		const testCases: [string, string][] = [
-			['hello', 'hello*'],
-			['hello welc', 'hello* welc*'],
-		];
-
-		for (const [input, expected] of testCases) {
-			const actual = gotoAnythingStyleQuery(input);
-			expect(actual).toBe(expected);
-		}
-	});
-
-});

packages/pdf-viewer/package.json

@@ -9,12 +9,12 @@
     "access": "restricted"
   },
   "scripts": {
-    "tsc_DISABLED": "tsc --project tsconfig.json",
-    "watch_DISABLED": "webpack --watch --config webpack.config.js --mode=development",
-    "build_DISABLED": "webpack --config webpack.config.js --mode=production",
-    "test_DISABLED": "jest",
-    "test-ci_DISABLED": "yarn test",
-    "postinstall_DISABLED": "yarn build"
+    "tsc": "tsc --project tsconfig.json",
+    "watch": "webpack --watch --config webpack.config.js --mode=development",
+    "build": "webpack --config webpack.config.js --mode=production",
+    "test": "jest",
+    "test-ci": "yarn test",
+    "postinstall": "yarn build"
   },
   "author": "Joplin",
   "license": "AGPL-3.0-or-later",

packages/react-native-alarm-notification/.gitignore

@@ -42,5 +42,3 @@ local.properties
 buck-out/
 \.buckd/
 *.keystore
-
-android/build-*

packages/react-native-saf-x/.gitignore

@@ -63,6 +63,4 @@ android/keystores/debug.keystore
 # generated by bob
 lib/
 .env
-docs
-
-android/build-*
+docs

packages/react-native-vosk/.circleci/config.yml

@@ -1,98 +0,0 @@
-version: 2.1
-
-executors:
-  default:
-    docker:
-      - image: circleci/node:16
-    working_directory: ~/project
-
-commands:
-  attach_project:
-    steps:
-      - attach_workspace:
-          at: ~/project
-
-jobs:
-  install-dependencies:
-    executor: default
-    steps:
-      - checkout
-      - attach_project
-      - restore_cache:
-          keys:
-            - dependencies-{{ checksum "package.json" }}
-            - dependencies-
-      - restore_cache:
-          keys:
-            - dependencies-example-{{ checksum "example/package.json" }}
-            - dependencies-example-
-      - run:
-          name: Install dependencies
-          command: |
-            yarn install --cwd example --frozen-lockfile
-            yarn install --frozen-lockfile
-      - save_cache:
-          key: dependencies-{{ checksum "package.json" }}
-          paths: node_modules
-      - save_cache:
-          key: dependencies-example-{{ checksum "example/package.json" }}
-          paths: example/node_modules
-      - persist_to_workspace:
-          root: .
-          paths: .
-
-  lint:
-    executor: default
-    steps:
-      - attach_project
-      - run:
-          name: Lint files
-          command: |
-            yarn lint
-
-  typescript:
-    executor: default
-    steps:
-      - attach_project
-      - run:
-          name: Typecheck files
-          command: |
-            yarn typescript
-
-  unit-tests:
-    executor: default
-    steps:
-      - attach_project
-      - run:
-          name: Run unit tests
-          command: |
-            yarn test --coverage
-      - store_artifacts:
-          path: coverage
-          destination: coverage
-
-  build-package:
-    executor: default
-    steps:
-      - attach_project
-      - run:
-          name: Build package
-          command: |
-            yarn prepare
-
-workflows:
-  build-and-test:
-    jobs:
-      - install-dependencies
-      - lint:
-          requires:
-            - install-dependencies
-      - typescript:
-          requires:
-            - install-dependencies
-      - unit-tests:
-          requires:
-            - install-dependencies
-      - build-package:
-          requires:
-            - install-dependencies

packages/react-native-vosk/.gitattributes

@@ -1,4 +0,0 @@
-*.pbxproj -text
-# specific for windows script files
-*.bat text eol=crlf
-*.a filter=lfs diff=lfs merge=lfs -text

packages/react-native-vosk/.github/workflows/npm-publish.yml

@@ -1,22 +0,0 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  publish-npm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          registry-url: https://registry.npmjs.org/
-      - run: yarn
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

packages/react-native-vosk/.gitignore

@@ -1,72 +0,0 @@
-# OSX
-#
-.DS_Store
-
-# XDE
-.expo/
-
-# VSCode
-.vscode/
-jsconfig.json
-
-# Xcode
-#
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-ios/.xcode.env.local
-project.xcworkspace
-
-# Android/IJ
-#
-.classpath
-.cxx
-.gradle
-.idea
-.project
-.settings
-local.properties
-android.iml
-.cxx/
-*.keystore
-!debug.keystore
-
-# Cocoapods
-#
-example/ios/Pods
-
-# Ruby
-example/vendor/
-
-# Temporary files created by Metro to check the health of the file watcher
-.metro-health-check*
-
-# node.js
-#
-node_modules/
-npm-debug.log
-yarn-debug.log
-yarn-error.log
-
-# Expo
-.expo/*
-
-# generated by bob
-# lib/
-
-# Generated by UUID
-example/android/app/src/main/assets/*/uuid
-android/build-*

packages/react-native-vosk/.watchmanconfig

@@ -1 +0,0 @@
-{}

packages/react-native-vosk/.yarnrc

@@ -1,3 +0,0 @@
-# Override Yarn command so we can automatically setup the repo on running `yarn`
-
-yarn-path "scripts/bootstrap.js"

packages/react-native-vosk/CONTRIBUTING.md

@@ -1,195 +0,0 @@
-# Contributing
-
-We want this community to be friendly and respectful to each other. Please follow it in all your interactions with the project.
-
-## Development workflow
-
-To get started with the project, run `yarn` in the root directory to install the required dependencies for each package:
-
-```sh
-yarn
-```
-
-> While it's possible to use [`npm`](https://github.com/npm/cli), the tooling is built around [`yarn`](https://classic.yarnpkg.com/), so you'll have an easier time if you use `yarn` for development.
-
-While developing, you can run the [example app](/example/) to test your changes. Any changes you make in your library's JavaScript code will be reflected in the example app without a rebuild. If you change any native code, then you'll need to rebuild the example app.
-
-To start the packager:
-
-```sh
-yarn example start
-```
-
-To run the example app on Android:
-
-```sh
-yarn example android
-```
-
-To run the example app on iOS:
-
-```sh
-yarn example ios
-```
-
-
-Make sure your code passes TypeScript and ESLint. Run the following to verify:
-
-```sh
-yarn typescript
-yarn lint
-```
-
-To fix formatting errors, run the following:
-
-```sh
-yarn lint --fix
-```
-
-Remember to add tests for your change if possible. Run the unit tests by:
-
-```sh
-yarn test
-```
-To edit the Objective-C files, open `example/ios/VoskExample.xcworkspace` in XCode and find the source files at `Pods > Development Pods > react-native-vosk`.
-
-To edit the Kotlin files, open `example/android` in Android studio and find the source files at `reactnativevosk` under `Android`.
-### Commit message convention
-
-We follow the [conventional commits specification](https://www.conventionalcommits.org/en) for our commit messages:
-
-- `fix`: bug fixes, e.g. fix crash due to deprecated method.
-- `feat`: new features, e.g. add new method to the module.
-- `refactor`: code refactor, e.g. migrate from class components to hooks.
-- `docs`: changes into documentation, e.g. add usage example for the module..
-- `test`: adding or updating tests, e.g. add integration tests using detox.
-- `chore`: tooling changes, e.g. change CI config.
-
-Our pre-commit hooks verify that your commit message matches this format when committing.
-
-### Linting and tests
-
-[ESLint](https://eslint.org/), [Prettier](https://prettier.io/), [TypeScript](https://www.typescriptlang.org/)
-
-We use [TypeScript](https://www.typescriptlang.org/) for type checking, [ESLint](https://eslint.org/) with [Prettier](https://prettier.io/) for linting and formatting the code, and [Jest](https://jestjs.io/) for testing.
-
-Our pre-commit hooks verify that the linter and tests pass when committing.
-
-### Publishing to npm
-
-We use [release-it](https://github.com/release-it/release-it) to make it easier to publish new versions. It handles common tasks like bumping version based on semver, creating tags and releases etc.
-
-To publish new versions, run the following:
-
-```sh
-yarn release
-```
-
-### Scripts
-
-The `package.json` file contains various scripts for common tasks:
-
-- `yarn bootstrap`: setup project by installing all dependencies and pods.
-- `yarn typescript`: type-check files with TypeScript.
-- `yarn lint`: lint files with ESLint.
-- `yarn test`: run unit tests with Jest.
-- `yarn example start`: start the Metro server for the example app.
-- `yarn example android`: run the example app on Android.
-- `yarn example ios`: run the example app on iOS.
-
-### Sending a pull request
-
-> **Working on your first pull request?** You can learn how from this _free_ series: [How to Contribute to an Open Source Project on GitHub](https://app.egghead.io/playlists/how-to-contribute-to-an-open-source-project-on-github).
-
-When you're sending a pull request:
-
-- Prefer small pull requests focused on one change.
-- Verify that linters and tests are passing.
-- Review the documentation to make sure it looks good.
-- Follow the pull request template when opening a pull request.
-- For pull requests that change the API or implementation, discuss with maintainers first by opening an issue.
-
-## Code of Conduct
-
-### Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-### Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-- Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-- The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-### Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-### Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-### Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-### Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-#### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-#### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-#### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-#### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-### Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
-available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

packages/react-native-vosk/LICENSE

@@ -1,20 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Joris Gaudin
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

packages/react-native-vosk/README.md

@@ -1,125 +0,0 @@
-# react-native-vosk - React ASR (Automated Speech Recognition)
-
-* * *
-
-**NOTE:** For some reason this module doesn't work (events are not being fired), so for now we use the actual `react-native-vosk` module, but with a patch
-
-**Joplin fork** of `react-native-vosk@0.1.12` with the following changes:
-
-- The `onResult()` event doesn't automatically stop the recorder - because we need it to keep running so that it captures the whole text. The original package was designed to record one keyword, but we need whole sentences.
-- Added the `stopOnly()` method. This is because the original `stop()` method wouldn't just stop, but clear everything, this preventing the useful `onFinalResult()` event from event from being emitted. And we need this event to get the final text.
-- Also added `cleanup()` method. It should be called once the `onFinalResult()` event has been received, and does the same as the original `stop()` method.
-- The folder in `ios/Vosk/vosk-model-spk-0.4` was deleted because unclear what it's for, and we don't build the iOS version anyway. If it's ever needed it can be restored from the original repo: https://github.com/riderodd/react-native-vosk
-
-* * *
-
-Speech recognition module for react native using [Vosk](https://github.com/alphacep/vosk-api) library
-
-## Installation
-
-### Library
-```sh
-npm install -S react-native-vosk
-```
-
-### Models
-Vosk uses prebuilt models to perform speech recognition offline. You have to download the model(s) that you need on [Vosk official website](https://alphacephei.com/vosk/models)
-Avoid using too heavy models, because the computation time required to load them into your app could lead to bad user experience.
-Then, unzip the model in your app folder. If you just need to use the iOS version, put the model folder wherever you want, and import it as described below. If you need both iOS and Android to work, you can avoid to copy the model twice for both projects by importing the model from the Android assets folder in XCode. Just do as follow:
-
-### Android
-In Android Studio, open the project manager, right-click on your project folder and New > Folder > Assets folder.
-![Android Studio assets folder creation](https://raw.githubusercontent.com/riderodd/react-native-vosk/main/docs/android_studio_assets_folder_creation.png)
-
-Then put the model folder inside the assets folder created. In your file tree it should be located in android\app\src\main\assets. So, if you downloaded the french model named model-fr-fr, you should access the model by going to android\app\src\main\assets\model-fr-fr. In Android studio, your project structure should be like that:
-![Android Studio final project structure](https://raw.githubusercontent.com/riderodd/react-native-vosk/main/docs/android_studio_project_structure.png)
-
-You can import as many models as you want.
-
-### iOS
-In order to let the project work, you're going to need the iOS library. Mail contact@alphacephei.com to get the libraries. You're going to have a libvosk.xcframework file (or folder for not mac users), just copy it in the ios folder of the module (node_modules/react-native-vosk/ios/libvosk.xcframework). Then run in your root project:
-```sh
-npm run pods
-```
-
-In XCode, right-click on your project folder, and click on "Add files to [your project name]".
-
-![XCode add files to project](https://raw.githubusercontent.com/riderodd/react-native-vosk/main/docs/xcode_add_files_to_folder.png)
-
-Then navigate to your model folder. You can navigate to your Android assets folder as mentionned before, and chose your model here. It will avoid to have the model copied twice in your project. If you don't use the Android build, you can just put the model wherever you want, and select it.
-
-![XCode chose model folder](https://raw.githubusercontent.com/riderodd/react-native-vosk/main/docs/xcode_chose_model_folder.png)
-
-That's all. The model folder should appear in your project. When you click on it, your project target should be checked (see below).
-
-![XCode full settings screenshot](https://raw.githubusercontent.com/riderodd/react-native-vosk/main/docs/xcode_full_settings_screenshot.png)
-
-## Usage
-
-```js
-import VoiceRecognition from 'react-native-voice-recognition';
-
-// ...
-
-const voiceRecognition = new VoiceRecognition();
-
-voiceRecognition.loadModel('model-fr-fr').then(() => {
-    // we can use promise...
-    voiceRecognition
-        .start()
-        .then((res: any) => {
-            console.log('Result is: ' + res);
-        })
-
-    // ... or events
-    const resultEvent = vosk.onResult((res) => {
-      console.log('A onResult event has been caught: ' + res.data);
-    });
-
-    // Don't forget to call resultEvent.remove(); when needed
-}).catch(e => {
-    console.error(e);
-})
-
-```
-
-Note that `start()` method will ask for audio record permission.
-
-[Complete example...](https://github.com/riderodd/react-native-vosk/blob/main/example/src/App.tsx)
-
-### Methods
-
-| Method | Argument | Return | Description |
-|---|---|---|---|
-| `loadModel` | `path: string` | `Promise` | Loads the voice model used for recognition, it is required before using start method |
-| `start` | `grammar: string[]` or `none` | `Promise` | Starts the voice recognition and returns the recognized text as a promised string, you can recognize specific words using the `grammar` argument (ex: ["left", "right"]) according to kaldi's documentation |
-| `stop` | `none` | `none` | Stops the recognition |
-
-### Events 
-
-| Method | Promise return | Description |
-|---|---|---|
-| `onResult` | The recognized word as a `string` | Triggers on voice recognition result |
-| `onFinalResult` | The recognized word as a `string` | Triggers if stopped using `stop()` method |
-| `onError` | The error that occured as a `string` or `exception` | Triggers if an error occured |
-| `onTimeout` | "timeout" `string` | Triggers on timeout |
-
-#### Example
-
-```js
-const resultEvent = voiceRecognition.onResult((res) => {
-    console.log('A onResult event has been caught: ' + res.data);
-});
-    
-resultEvent.remove();
-```
-
-Don't forget to remove the event listener once you don't need it anymore.
-
-## Contributing
-
-See the [contributing guide](CONTRIBUTING.md) to learn how to contribute to the repository and the development workflow.
-
-## License
-
-MIT

packages/react-native-vosk/android/build.gradle

@@ -1,107 +0,0 @@
-buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["Vosk_kotlinVersion"]
-
-  repositories {
-    google()
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-  }
-}
-
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-
-
-def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Vosk_" + name]
-}
-
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["Vosk_" + name]).toInteger()
-}
-
-android {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-
-  defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-
-  lintOptions {
-    disable 'GradleCompatible'
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-}
-
-repositories {
-  mavenCentral()
-  google()
-}
-
-// Generate UUIDs for each models contained in android/src/main/assets/
-
-// We don't want this because it's going to generate a different one on each
-// build, even when nothing has changed.
-
-// tasks.register('genUUID') {
-//   doLast {
-//     fileTree(dir: "$rootDir/app/src/main/assets", exclude: ['*/*']).visit { fileDetails ->
-//       if (fileDetails.directory) {
-//         def odir = file("$rootDir/app/src/main/assets/$fileDetails.relativePath")
-//         def ofile = file("$odir/uuid")
-//         mkdir odir
-//         ofile.text = UUID.randomUUID().toString()
-//       }
-//     }
-//   }
-// }
-// preBuild.dependsOn genUUID
-
-def kotlin_version = getExtOrDefault('kotlinVersion')
-
-dependencies {
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  // From node_modules
-  implementation 'net.java.dev.jna:jna:5.12.1@aar'
-  implementation 'com.alphacephei:vosk-android:0.3.46@aar'
-}
-
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "Vosk"
-    codegenJavaPackageName = "com.reactnativevosk"
-  }
-}

packages/react-native-vosk/android/gradle.properties

@@ -1,5 +0,0 @@
-Vosk_kotlinVersion=1.7.0
-Vosk_minSdkVersion=21
-Vosk_targetSdkVersion=31
-Vosk_compileSdkVersion=31
-Vosk_ndkversion=21.4.7075529

packages/react-native-vosk/android/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnativevosk">
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-</manifest>

packages/react-native-vosk/android/src/main/java/com/reactnativevosk/VoskModule.kt

@@ -1,192 +0,0 @@
-package com.reactnativevosk
-import com.facebook.react.bridge.*
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import org.json.JSONObject
-import org.vosk.Model
-import org.vosk.Recognizer
-import org.vosk.android.RecognitionListener
-import org.vosk.android.SpeechService
-import org.vosk.android.StorageService
-import java.io.IOException
-
-class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext), RecognitionListener {
-  private var model: Model? = null
-  private var speechService: SpeechService? = null
-  private var context: ReactApplicationContext? = reactContext
-  private var recognizer: Recognizer? = null
-
-  override fun getName(): String {
-    return "Vosk"
-  }
-
-  @ReactMethod
-  fun addListener(type: String?) {
-    // Keep: Required for RN built in Event Emitter Calls.
-  }
-
-  @ReactMethod
-  fun removeListeners(type: Int?) {
-    // Keep: Required for RN built in Event Emitter Calls.
-  }
-
-  override fun onResult(hypothesis: String) {
-    // Get text data from string object
-    val text = getHypothesisText(hypothesis)
-
-    // Stop recording if data found
-    if (text != null && text.isNotEmpty()) {
-      // Don't auto-stop the recogniser - we want to do that when the user
-      // presses on "stop" only.
-      // cleanRecognizer();
-      sendEvent("onResult", text)
-    }
-  }
-
-  override fun onFinalResult(hypothesis: String) {
-    val text = getHypothesisText(hypothesis)
-    if (text!!.isNotEmpty()) sendEvent("onFinalResult", text)
-  }
-
-  override fun onPartialResult(hypothesis: String) {
-    sendEvent("onPartialResult", hypothesis)
-  }
-
-  override fun onError(e: Exception) {
-    sendEvent("onError", e.toString())
-  }
-
-  override fun onTimeout() {
-    sendEvent("onTimeout")
-  }
-
-  /**
-   * Converts hypothesis json text to the recognized text
-   * @return the recognized text or null if something went wrong
-   */
-  private fun getHypothesisText(hypothesis: String): String? {
-    // Hypothesis is in the form: '{text: "recognized text"}'
-    return try {
-      val res = JSONObject(hypothesis)
-      res.getString("text")
-    } catch (tx: Throwable) {
-      null
-    }
-  }
-
-  /**
-   * Sends event to react native with associated data
-   */
-  private fun sendEvent(eventName: String, data: String? = null) {
-    // Write event data if there is some
-    val event = Arguments.createMap().apply {
-      if (data != null) putString("data", data)
-    }
-
-    // Send event
-    context?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)?.emit(
-      eventName,
-      event
-    )
-  }
-
-  /**
-   * Translates array of string(s) to required kaldi string format
-   * @return the array of string(s) as a single string
-   */
-  private fun makeGrammar(grammarArray: ReadableArray): String {
-    return grammarArray.toArrayList().joinToString(
-      prefix = "[",
-      separator = ", ",
-      transform = {"\"" + it + "\""},
-      postfix = "]"
-    )
-  }
-
-  @ReactMethod
-  fun loadModel(path: String, promise: Promise) {
-    cleanModel();
-    StorageService.unpack(context, path, "models",
-      { model: Model? ->
-        this.model = model
-        promise.resolve("Model successfully loaded")
-      }
-    ) { e: IOException ->
-      this.model = null
-      promise.reject(e)
-    }
-  }
-
-  @ReactMethod
-  fun start(grammar: ReadableArray? = null) {
-
-    if (model == null) {
-      sendEvent("onError", "Model is not loaded yet")
-    }
-    else if (speechService != null) {
-      sendEvent("onError", "Recognizer is already in use")
-    } else {
-      try {
-        recognizer =
-          if (grammar != null)
-            Recognizer(model, 16000.0f, makeGrammar(grammar))
-          else
-            Recognizer(model, 16000.0f)
-
-        speechService = SpeechService(recognizer, 16000.0f)
-        speechService!!.startListening(this)
-        sendEvent("onStart")
-
-      } catch (e: IOException) {
-        sendEvent("onError", e.toString())
-      }
-    }
-  }
-  private fun cleanRecognizer() {
-    if (speechService != null) {
-      speechService!!.stop()
-      speechService!!.shutdown();
-      speechService = null
-    }
-    if (recognizer != null) {
-      recognizer!!.close();
-      recognizer = null;
-    }
-  }
-
-  private fun cleanModel() {
-    if (this.model != null) {
-      this.model!!.close();
-      this.model = null;
-    }
-  }
-
-  @ReactMethod
-  fun stop() {
-    cleanRecognizer();
-  }
-
-  @ReactMethod
-  fun stopOnly() {
-    if (speechService != null) {
-      speechService!!.stop()
-    }
-  }
-
-  @ReactMethod
-  fun cleanup() {
-    if (speechService != null) {
-      speechService!!.shutdown();
-      speechService = null
-    }
-    if (recognizer != null) {
-      recognizer!!.close();
-      recognizer = null;
-    }
-  }
-
-  @ReactMethod
-  fun unload() {
-    cleanRecognizer();
-    cleanModel();
-  }
-}

packages/react-native-vosk/android/src/main/java/com/reactnativevosk/VoskPackage.kt

@@ -1,16 +0,0 @@
-package com.reactnativevosk
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-
-
-class VoskPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf(VoskModule(reactContext))
-    }
-
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return emptyList()
-    }
-}

packages/react-native-vosk/babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-	presets: ['module:metro-react-native-babel-preset'],
-};

packages/react-native-vosk/ios/Vosk-Bridging-Header.h

@@ -1,4 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-#import <React/RCTEventEmitter.h>
-#import "vosk_api.h"

packages/react-native-vosk/ios/Vosk.m

@@ -1,21 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
-
-@interface RCT_EXTERN_MODULE(Vosk, RCTEventEmitter)
-
-RCT_EXTERN_METHOD(loadModel:(NSString *)name
-                 withResolver:(RCTPromiseResolveBlock)resolve
-                 withRejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(start:(NSArray)grammar)
-
-RCT_EXTERN_METHOD(stop)
-
-RCT_EXTERN_METHOD(unload)
-
-+ (BOOL)requiresMainQueueSetup
-{
-  return NO;
-}
-
-@end

packages/react-native-vosk/ios/Vosk.swift

@@ -1,179 +0,0 @@
-import Foundation
-import AVFoundation
-
-// The representation of the JSON object returned by Vosk
-struct VoskResult: Codable {
-    // Partial result
-    var partial: String?
-    // Complete result
-    var text: String?
-}
-
-@objc(Vosk)
-class Vosk: RCTEventEmitter {
-    // Class properties
-    /// The current vosk model loaded
-    var currentModel: VoskModel?
-    /// The vosk recognizer
-    var recognizer : OpaquePointer?
-    /// The audioEngine used to pipe microphone to recognizer
-    let audioEngine = AVAudioEngine()
-    /// The audioEngine input
-    var inputNode: AVAudioInputNode!
-    /// The microphone input format
-    var formatInput: AVAudioFormat!
-    /// A queue to process datas
-    var processingQueue: DispatchQueue!
-    /// Keep the last processed result here
-    var lastRecognizedResult: VoskResult?
-    /// The timeout timer ref
-    var timeoutTimer: Timer?
-    
-    /// React member: has any JS event listener
-    var hasListener: Bool = false
-    
-    // Class methods
-    override init() {
-        super.init()
-        // Init the processing queue
-        processingQueue = DispatchQueue(label: "recognizerQueue")
-        // Create a new audio engine.
-        inputNode = audioEngine.inputNode
-        // Get the microphone default input format
-        formatInput = inputNode.inputFormat(forBus: 0)
-    }
-    
-    deinit {
-        // free the recognizer
-        vosk_recognizer_free(recognizer);
-    }
-
-    /// Called when React adds an event observer
-    override func startObserving() {
-        hasListener = true
-    }
-
-    /// Called when no more event observers are running
-    override func stopObserving() {
-        hasListener = false
-    }
-    
-    /// React method to define allowed events
-    @objc override func supportedEvents() -> [String]! {
-        return ["onError","onResult","onFinalResult","onPartialResult","onTimeout"];
-    }
-
-    /// Load a Vosk model
-    @objc(loadModel:withResolver:withRejecter:)
-    func loadModel(name: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
-        if (currentModel != nil) {
-            currentModel = nil; // deinit model
-        }
-        currentModel = VoskModel(name: name)
-        resolve(name)
-    }
-    
-    /// Start speech recognition
-    @objc(start:)
-    func start(grammar: [String]?) -> Void {
-        let audioSession = AVAudioSession.sharedInstance()
-        
-        do {
-            // Ask the user for permission to use the mic if required then start the engine.
-            try audioSession.setCategory(.record)
-            
-            if (grammar != nil && grammar!.isEmpty == false) {
-                let jsonGrammar = try! JSONEncoder().encode(grammar)
-                recognizer = vosk_recognizer_new_grm(currentModel!.model, Float(formatInput.sampleRate), String(data: jsonGrammar, encoding: .utf8))
-            } else {
-                recognizer = vosk_recognizer_new_spk(currentModel!.model, Float(formatInput.sampleRate), currentModel!.spkModel)
-            }
-            
-            let formatPcm = AVAudioFormat.init(commonFormat: AVAudioCommonFormat.pcmFormatInt16, sampleRate: formatInput.sampleRate, channels: 1, interleaved: true)
-            
-            inputNode.installTap(onBus: 0,
-                                 bufferSize: UInt32(formatInput.sampleRate / 10),
-                                 format: formatPcm) { buffer, time in
-                    self.processingQueue.async {
-                        let res = self.recognizeData(buffer: buffer)
-                        DispatchQueue.main.async {
-                            let parsedResult = try! JSONDecoder().decode(VoskResult.self, from: res.result!.data(using: .utf8)!)
-                            self.lastRecognizedResult = parsedResult
-                            if (res.completed && self.hasListener && res.result != nil) {
-                                self.sendEvent(withName: "onResult", body: ["data": parsedResult.text!])
-                                self.stopInternal(withoutEvents: true);
-                            } else if (!res.completed && self.hasListener && res.result != nil) {
-                                self.sendEvent(withName: "onPartialResult", body: ["data": parsedResult.partial!])
-                            }
-                        }
-                    }
-            }
-            
-            // Start the stream of audio data.
-            audioEngine.prepare()
-            
-            audioSession.requestRecordPermission { [weak self] success in
-                guard success, let self = self else { return }
-                try? self.audioEngine.start()
-            }
-            
-            // and manage timeout
-            timeoutTimer = Timer.scheduledTimer(withTimeInterval: 10, repeats: false) {_ in
-                self.sendEvent(withName: "onTimeout", body: ["data": ""])
-                self.stopInternal(withoutEvents: true)
-            }
-        } catch {
-            if (hasListener) {
-                sendEvent(withName: "onError", body: ["data": "Unable to start AVAudioEngine " + error.localizedDescription])
-            } else {
-                debugPrint("Unable to start AVAudioEngine " + error.localizedDescription)
-            }
-            vosk_recognizer_free(recognizer);
-        }
-    }
-    
-    /// Unload speech recognition and model
-    @objc(unload) func unload() -> Void {
-        stopInternal(withoutEvents: false)
-        if (currentModel != nil) {
-            currentModel = nil; // deinit model
-        }
-    }
-    
-    /// Stop speech recognition if started
-    @objc(stop) func stop() -> Void {
-        // stop engines and send onFinalResult event
-        stopInternal(withoutEvents: false)
-    }
-    
-    /// Do internal cleanup on stop recognition
-    func stopInternal(withoutEvents: Bool) {
-        inputNode.removeTap(onBus: 0)
-        if (audioEngine.isRunning) {
-            audioEngine.stop()
-            if (hasListener && !withoutEvents) {
-                sendEvent(withName: "onFinalResult", body: ["data": lastRecognizedResult!.partial])
-            }
-            lastRecognizedResult = nil
-        }
-        if (recognizer != nil) {
-            vosk_recognizer_free(recognizer);
-            recognizer = nil
-        }
-        if (timeoutTimer != nil) {
-            timeoutTimer?.invalidate()
-            timeoutTimer = nil
-        }
-    }
-    
-    /// Process the audio buffer and do recognition with Vosk
-    func recognizeData(buffer : AVAudioPCMBuffer) -> (result: String?, completed: Bool) {
-            let dataLen = Int(buffer.frameLength * 2)
-            let channels = UnsafeBufferPointer(start: buffer.int16ChannelData, count: 1)
-            let endOfSpeech = channels[0].withMemoryRebound(to: Int8.self, capacity: dataLen) {
-                vosk_recognizer_accept_waveform(recognizer, $0, Int32(dataLen))
-            }
-            let res = endOfSpeech == 1 ? vosk_recognizer_result(recognizer) : vosk_recognizer_partial_result(recognizer)
-            return (String(validatingUTF8: res!), endOfSpeech == 1);
-    }
-}

packages/react-native-vosk/ios/Vosk.xcodeproj/project.pbxproj

@@ -1,301 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 52;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		33B015BD288FEEE500EBEBCF /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 33B015BC288FEEE400EBEBCF /* libc++.tbd */; };
-		33B015BF288FEF1300EBEBCF /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33B015BE288FEEE800EBEBCF /* Accelerate.framework */; };
-		33B015C3288FF3E400EBEBCF /* libvosk.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33B015C2288FF3E400EBEBCF /* libvosk.xcframework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		58B511D91A9E6C8500147676 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		134814201AA4EA6300B7C361 /* libVosk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libVosk.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		33B015BC288FEEE400EBEBCF /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-		33B015BE288FEEE800EBEBCF /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
-		33B015C0288FEF5E00EBEBCF /* VoskModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VoskModel.swift; sourceTree = "<group>"; };
-		33B015C2288FF3E400EBEBCF /* libvosk.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = libvosk.xcframework; sourceTree = "<group>"; };
-		B3E7B5891CC2AC0600A0062D /* Vosk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Vosk.m; sourceTree = "<group>"; };
-		F4FF95D5245B92E700C19C63 /* Vosk-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Vosk-Bridging-Header.h"; sourceTree = "<group>"; };
-		F4FF95D6245B92E800C19C63 /* Vosk.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Vosk.swift; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		58B511D81A9E6C8500147676 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				33B015BF288FEF1300EBEBCF /* Accelerate.framework in Frameworks */,
-				33B015BD288FEEE500EBEBCF /* libc++.tbd in Frameworks */,
-				33B015C3288FF3E400EBEBCF /* libvosk.xcframework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		134814211AA4EA7D00B7C361 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				134814201AA4EA6300B7C361 /* libVosk.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		33B015BA288FEE6600EBEBCF /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				33B015C2288FF3E400EBEBCF /* libvosk.xcframework */,
-				33B015BC288FEEE400EBEBCF /* libc++.tbd */,
-				33B015BE288FEEE800EBEBCF /* Accelerate.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		58B511D21A9E6C8500147676 = {
-			isa = PBXGroup;
-			children = (
-				F4FF95D6245B92E800C19C63 /* Vosk.swift */,
-				33B015C0288FEF5E00EBEBCF /* VoskModel.swift */,
-				B3E7B5891CC2AC0600A0062D /* Vosk.m */,
-				F4FF95D5245B92E700C19C63 /* Vosk-Bridging-Header.h */,
-				134814211AA4EA7D00B7C361 /* Products */,
-				33B015BA288FEE6600EBEBCF /* Frameworks */,
-			);
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		58B511DA1A9E6C8500147676 /* Vosk */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "Vosk" */;
-			buildPhases = (
-				58B511D71A9E6C8500147676 /* Sources */,
-				58B511D81A9E6C8500147676 /* Frameworks */,
-				58B511D91A9E6C8500147676 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Vosk;
-			productName = RCTDataManager;
-			productReference = 134814201AA4EA6300B7C361 /* libVosk.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		58B511D31A9E6C8500147676 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0920;
-				ORGANIZATIONNAME = Facebook;
-				TargetAttributes = {
-					58B511DA1A9E6C8500147676 = {
-						CreatedOnToolsVersion = 6.1.1;
-					};
-				};
-			};
-			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "Vosk" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				English,
-				en,
-			);
-			mainGroup = 58B511D21A9E6C8500147676;
-			productRefGroup = 58B511D21A9E6C8500147676;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				58B511DA1A9E6C8500147676 /* Vosk */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		58B511D71A9E6C8500147676 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		58B511ED1A9E6C8500147676 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=*]" = arm64;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		58B511EE1A9E6C8500147676 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=*]" = arm64;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		58B511F01A9E6C8500147676 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../../React/**",
-					"$(SRCROOT)/../../react-native/React/**",
-				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = Vosk;
-				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "Vosk-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Debug;
-		};
-		58B511F11A9E6C8500147676 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../../React/**",
-					"$(SRCROOT)/../../react-native/React/**",
-				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = Vosk;
-				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "Vosk-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "Vosk" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				58B511ED1A9E6C8500147676 /* Debug */,
-				58B511EE1A9E6C8500147676 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "Vosk" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				58B511F01A9E6C8500147676 /* Debug */,
-				58B511F11A9E6C8500147676 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 58B511D31A9E6C8500147676 /* Project object */;
-}

packages/react-native-vosk/ios/Vosk/README.md

@@ -1 +0,0 @@
-Here was the folder `vosk-model-spk-0.4`. You can restore it from the original repo: https://github.com/riderodd/react-native-vosk

packages/react-native-vosk/ios/VoskModel.swift

@@ -1,51 +0,0 @@
-//
-//  Vosk.swift
-//  VoskApiTest
-//
-//  Created by Niсkolay Shmyrev on 01.03.20.
-//  Copyright © 2020-2021 Alpha Cephei. All rights reserved.
-//
-
-import Foundation
-
-public final class VoskModel {
-    
-    var model : OpaquePointer!
-    var spkModel : OpaquePointer!
-    
-    init(name: String) {
-        
-        // Set to -1 to disable logs
-        vosk_set_log_level(0);
-        
-        let appBundle = Bundle(for: Self.self)
-        
-        // Load model from main app bundle
-        if let resourcePath = Bundle.main.resourcePath {
-            let modelPath = resourcePath + "/" + name
-            model = vosk_model_new(modelPath)
-        }
-
-        // Get the URL to the resource bundle within the bundle
-        // of the current class.
-        guard let resourceBundleURL = appBundle.url(
-            forResource: "Vosk", withExtension: "bundle")
-            else { fatalError("Vosk.bundle not found!") }
-        
-        // Create a bundle object for the bundle found at that URL.
-        guard let resourceBundle = Bundle(url: resourceBundleURL)
-            else { fatalError("Cannot access Vosk.bundle!") }
-        
-        if let resourcePath = resourceBundle.resourcePath {
-            let spkModelPath = resourcePath + "/vosk-model-spk-0.4"
-            spkModel = vosk_spk_model_new(spkModelPath)
-        }
-    }
-    
-    deinit {
-        vosk_model_free(model)
-        vosk_spk_model_free(spkModel)
-    }
-    
-}
-

packages/react-native-vosk/ios/vosk_api.h

@@ -1,292 +0,0 @@
-// Copyright 2020-2021 Alpha Cephei Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/* This header contains the C API for Vosk speech recognition system */
-
-#ifndef VOSK_API_H
-#define VOSK_API_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Model stores all the data required for recognition
- *  it contains static data and can be shared across processing
- *  threads. */
-typedef struct VoskModel VoskModel;
-
-
-/** Speaker model is the same as model but contains the data
- *  for speaker identification. */
-typedef struct VoskSpkModel VoskSpkModel;
-
-
-/** Recognizer object is the main object which processes data.
- *  Each recognizer usually runs in own thread and takes audio as input.
- *  Once audio is processed recognizer returns JSON object as a string
- *  which represent decoded information - words, confidences, times, n-best lists,
- *  speaker information and so on */
-typedef struct VoskRecognizer VoskRecognizer;
-
-
-/** Loads model data from the file and returns the model object
- *
- * @param model_path: the path of the model on the filesystem
- * @returns model object or NULL if problem occured */
-VoskModel *vosk_model_new(const char *model_path);
-
-
-/** Releases the model memory
- *
- *  The model object is reference-counted so if some recognizer
- *  depends on this model, model might still stay alive. When
- *  last recognizer is released, model will be released too. */
-void vosk_model_free(VoskModel *model);
-
-
-/** Check if a word can be recognized by the model
- * @param word: the word
- * @returns the word symbol if @param word exists inside the model
- * or -1 otherwise.
- * Reminding that word symbol 0 is for <epsilon> */
-int vosk_model_find_word(VoskModel *model, const char *word);
-
-
-/** Loads speaker model data from the file and returns the model object
- *
- * @param model_path: the path of the model on the filesystem
- * @returns model object or NULL if problem occured */
-VoskSpkModel *vosk_spk_model_new(const char *model_path);
-
-
-/** Releases the model memory
- *
- *  The model object is reference-counted so if some recognizer
- *  depends on this model, model might still stay alive. When
- *  last recognizer is released, model will be released too. */
-void vosk_spk_model_free(VoskSpkModel *model);
-
-/** Creates the recognizer object
- *
- *  The recognizers process the speech and return text using shared model data
- *  @param model       VoskModel containing static data for recognizer. Model can be
- *                     shared across recognizers, even running in different threads.
- *  @param sample_rate The sample rate of the audio you going to feed into the recognizer.
- *                     Make sure this rate matches the audio content, it is a common
- *                     issue causing accuracy problems.
- *  @returns recognizer object or NULL if problem occured */
-VoskRecognizer *vosk_recognizer_new(VoskModel *model, float sample_rate);
-
-
-/** Creates the recognizer object with speaker recognition
- *
- *  With the speaker recognition mode the recognizer not just recognize
- *  text but also return speaker vectors one can use for speaker identification
- *
- *  @param model       VoskModel containing static data for recognizer. Model can be
- *                     shared across recognizers, even running in different threads.
- *  @param sample_rate The sample rate of the audio you going to feed into the recognizer.
- *                     Make sure this rate matches the audio content, it is a common
- *                     issue causing accuracy problems.
- *  @param spk_model speaker model for speaker identification
- *  @returns recognizer object or NULL if problem occured */
-VoskRecognizer *vosk_recognizer_new_spk(VoskModel *model, float sample_rate, VoskSpkModel *spk_model);
-
-
-/** Creates the recognizer object with the phrase list
- *
- *  Sometimes when you want to improve recognition accuracy and when you don't need
- *  to recognize large vocabulary you can specify a list of phrases to recognize. This
- *  will improve recognizer speed and accuracy but might return [unk] if user said
- *  something different.
- *
- *  Only recognizers with lookahead models support this type of quick configuration.
- *  Precompiled HCLG graph models are not supported.
- *
- *  @param model       VoskModel containing static data for recognizer. Model can be
- *                     shared across recognizers, even running in different threads.
- *  @param sample_rate The sample rate of the audio you going to feed into the recognizer.
- *                     Make sure this rate matches the audio content, it is a common
- *                     issue causing accuracy problems.
- *  @param grammar The string with the list of phrases to recognize as JSON array of strings,
- *                 for example "["one two three four five", "[unk]"]".
- *
- *  @returns recognizer object or NULL if problem occured */
-VoskRecognizer *vosk_recognizer_new_grm(VoskModel *model, float sample_rate, const char *grammar);
-
-
-/** Adds speaker model to already initialized recognizer
- *
- * Can add speaker recognition model to already created recognizer. Helps to initialize
- * speaker recognition for grammar-based recognizer.
- *
- * @param spk_model Speaker recognition model */
-void vosk_recognizer_set_spk_model(VoskRecognizer *recognizer, VoskSpkModel *spk_model);
-
-
-/** Configures recognizer to output n-best results
- *
- * <pre>
- *   {
- *      "alternatives": [
- *          { "text": "one two three four five", "confidence": 0.97 },
- *          { "text": "one two three for five", "confidence": 0.03 },
- *      ]
- *   }
- * </pre>
- *
- * @param max_alternatives - maximum alternatives to return from recognition results
- */
-void vosk_recognizer_set_max_alternatives(VoskRecognizer *recognizer, int max_alternatives);
-
-
-/** Enables words with times in the output
- *
- * <pre>
- *   "result" : [{
- *       "conf" : 1.000000,
- *       "end" : 1.110000,
- *       "start" : 0.870000,
- *       "word" : "what"
- *     }, {
- *       "conf" : 1.000000,
- *       "end" : 1.530000,
- *       "start" : 1.110000,
- *       "word" : "zero"
- *     }, {
- *       "conf" : 1.000000,
- *       "end" : 1.950000,
- *       "start" : 1.530000,
- *       "word" : "zero"
- *     }, {
- *       "conf" : 1.000000,
- *       "end" : 2.340000,
- *       "start" : 1.950000,
- *       "word" : "zero"
- *     }, {
- *       "conf" : 1.000000,
- *       "end" : 2.610000,
- *       "start" : 2.340000,
- *       "word" : "one"
- *     }],
- * </pre>
- *
- * @param words - boolean value
- */
-void vosk_recognizer_set_words(VoskRecognizer *recognizer, int words);
-
-
-/** Accept voice data
- *
- *  accept and process new chunk of voice data
- *
- *  @param data - audio data in PCM 16-bit mono format
- *  @param length - length of the audio data
- *  @returns 1 if silence is occured and you can retrieve a new utterance with result method 
- *           0 if decoding continues
- *           -1 if exception occured */
-int vosk_recognizer_accept_waveform(VoskRecognizer *recognizer, const char *data, int length);
-
-
-/** Same as above but the version with the short data for language bindings where you have
- *  audio as array of shorts */
-int vosk_recognizer_accept_waveform_s(VoskRecognizer *recognizer, const short *data, int length);
-
-
-/** Same as above but the version with the float data for language bindings where you have
- *  audio as array of floats */
-int vosk_recognizer_accept_waveform_f(VoskRecognizer *recognizer, const float *data, int length);
-
-
-/** Returns speech recognition result
- *
- * @returns the result in JSON format which contains decoded line, decoded
- *          words, times in seconds and confidences. You can parse this result
- *          with any json parser
- *
- * <pre>
- *  {
- *    "text" : "what zero zero zero one"
- *  }
- * </pre>
- *
- * If alternatives enabled it returns result with alternatives, see also vosk_recognizer_set_alternatives().
- *
- * If word times enabled returns word time, see also vosk_recognizer_set_word_times().
- */
-const char *vosk_recognizer_result(VoskRecognizer *recognizer);
-
-
-/** Returns partial speech recognition
- *
- * @returns partial speech recognition text which is not yet finalized.
- *          result may change as recognizer process more data.
- *
- * <pre>
- * {
- *    "partial" : "cyril one eight zero"
- * }
- * </pre>
- */
-const char *vosk_recognizer_partial_result(VoskRecognizer *recognizer);
-
-
-/** Returns speech recognition result. Same as result, but doesn't wait for silence
- *  You usually call it in the end of the stream to get final bits of audio. It
- *  flushes the feature pipeline, so all remaining audio chunks got processed.
- *
- *  @returns speech result in JSON format.
- */
-const char *vosk_recognizer_final_result(VoskRecognizer *recognizer);
-
-
-/** Resets the recognizer
- *
- *  Resets current results so the recognition can continue from scratch */
-void vosk_recognizer_reset(VoskRecognizer *recognizer);
-
-
-/** Releases recognizer object
- *
- *  Underlying model is also unreferenced and if needed released */
-void vosk_recognizer_free(VoskRecognizer *recognizer);
-
-/** Set log level for Kaldi messages
- *
- *  @param log_level the level
- *     0 - default value to print info and error messages but no debug
- *     less than 0 - don't print info messages
- *     greather than 0 - more verbose mode
- */
-void vosk_set_log_level(int log_level);
-
-/**
- *  Init, automatically select a CUDA device and allow multithreading.
- *  Must be called once from the main thread.
- *  Has no effect if HAVE_CUDA flag is not set.
- */
-void vosk_gpu_init();
-
-/**
- *  Init CUDA device in a multi-threaded environment.
- *  Must be called for each thread.
- *  Has no effect if HAVE_CUDA flag is not set.
- */
-void vosk_gpu_thread_init();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* VOSK_API_H */

packages/react-native-vosk/lefthook.yml

@@ -1,11 +0,0 @@
-pre-commit:
-  parallel: true
-  commands:
-    lint:
-      files: git diff --name-only @{push}
-      glob: "*.{js,ts,jsx,tsx}"
-      run: npx eslint {files}
-    types:
-      files: git diff --name-only @{push}
-      glob: "*.{js,ts, jsx, tsx}"
-      run: npx tsc --noEmit

packages/react-native-vosk/lib/commonjs/index.js

@@ -1,95 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _reactNative = require("react-native");
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-const LINKING_ERROR = `The package 'react-native-vosk' doesn't seem to be linked. Make sure: \n\n${_reactNative.Platform.select({
-  ios: '- You have run \'pod install\'\n',
-  default: ''
-})}- You rebuilt the app after installing the package\n` + '- You are not using Expo managed workflow\n';
-const VoskModule = _reactNative.NativeModules.Vosk ? _reactNative.NativeModules.Vosk : new Proxy({}, {
-  get() {
-    throw new Error(LINKING_ERROR);
-  }
-});
-const eventEmitter = new _reactNative.NativeEventEmitter(VoskModule);
-class Vosk {
-  constructor() {
-    var _this = this;
-    _defineProperty(this, "loadModel", path => VoskModule.loadModel(path));
-    _defineProperty(this, "currentRegisteredEvents", []);
-    _defineProperty(this, "start", function () {
-      let grammar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-      return new Promise((resolve, reject) => {
-        // Check for permission
-        _this.requestRecordPermission()
-        // eslint-disable-next-line promise/prefer-await-to-then
-        .then(granted => {
-          if (!granted) return reject('Audio record permission denied');
-
-          // Setup events
-          _this.currentRegisteredEvents.push(eventEmitter.addListener('onResult', e => resolve(e.data)));
-          _this.currentRegisteredEvents.push(eventEmitter.addListener('onFinalResult', e => resolve(e.data)));
-          _this.currentRegisteredEvents.push(eventEmitter.addListener('onError', e => reject(e.data)));
-          _this.currentRegisteredEvents.push(eventEmitter.addListener('onTimeout', () => reject('timeout')));
-
-          // Start recognition
-          VoskModule.start(grammar);
-        })
-        // eslint-disable-next-line promise/prefer-await-to-then
-        .catch(e => {
-          reject(e);
-        });
-        // eslint-disable-next-line promise/prefer-await-to-then
-      }).finally(() => {
-        _this.cleanListeners();
-      });
-    });
-    _defineProperty(this, "stop", () => {
-      this.cleanListeners();
-      VoskModule.stop();
-    });
-    _defineProperty(this, "stopOnly", () => {
-      VoskModule.stopOnly();
-    });
-    _defineProperty(this, "cleanup", () => {
-      this.cleanListeners();
-      VoskModule.cleanup();
-    });
-    _defineProperty(this, "unload", () => {
-      this.cleanListeners();
-      VoskModule.unload();
-    });
-    _defineProperty(this, "onResult", onResult => {
-      return eventEmitter.addListener('onResult', onResult);
-    });
-    _defineProperty(this, "onFinalResult", onFinalResult => {
-      return eventEmitter.addListener('onFinalResult', onFinalResult);
-    });
-    _defineProperty(this, "onError", onError => {
-      return eventEmitter.addListener('onError', onError);
-    });
-    _defineProperty(this, "onTimeout", onTimeout => {
-      return eventEmitter.addListener('onTimeout', onTimeout);
-    });
-    _defineProperty(this, "requestRecordPermission", async () => {
-      if (_reactNative.Platform.OS === 'ios') return true;
-      const granted = await _reactNative.PermissionsAndroid.request(_reactNative.PermissionsAndroid.PERMISSIONS.RECORD_AUDIO);
-      return granted === _reactNative.PermissionsAndroid.RESULTS.GRANTED;
-    });
-    _defineProperty(this, "cleanListeners", () => {
-      // Clean event listeners
-      this.currentRegisteredEvents.forEach(subscription => subscription.remove());
-      this.currentRegisteredEvents = [];
-    });
-  } // Public functions
-  // Event listeners builders
-  // Private functions
-}
-exports.default = Vosk;
-//# sourceMappingURL=index.js.map

packages/react-native-vosk/lib/module/index.js

@@ -1,88 +0,0 @@
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { NativeEventEmitter, NativeModules, PermissionsAndroid, Platform } from 'react-native';
-const LINKING_ERROR = `The package 'react-native-vosk' doesn't seem to be linked. Make sure: \n\n${Platform.select({
-  ios: '- You have run \'pod install\'\n',
-  default: ''
-})}- You rebuilt the app after installing the package\n` + '- You are not using Expo managed workflow\n';
-const VoskModule = NativeModules.Vosk ? NativeModules.Vosk : new Proxy({}, {
-  get() {
-    throw new Error(LINKING_ERROR);
-  }
-});
-const eventEmitter = new NativeEventEmitter(VoskModule);
-export default class Vosk {
-  constructor() {
-    var _this = this;
-    _defineProperty(this, "loadModel", path => VoskModule.loadModel(path));
-    _defineProperty(this, "currentRegisteredEvents", []);
-    _defineProperty(this, "start", function () {
-      let grammar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-      return new Promise((resolve, reject) => {
-        // Check for permission
-        _this.requestRecordPermission()
-        // eslint-disable-next-line promise/prefer-await-to-then
-        .then(granted => {
-          if (!granted) return reject('Audio record permission denied');
-
-          // Setup events
-          _this.currentRegisteredEvents.push(eventEmitter.addListener('onResult', e => resolve(e.data)));
-          _this.currentRegisteredEvents.push(eventEmitter.addListener('onFinalResult', e => resolve(e.data)));
-          _this.currentRegisteredEvents.push(eventEmitter.addListener('onError', e => reject(e.data)));
-          _this.currentRegisteredEvents.push(eventEmitter.addListener('onTimeout', () => reject('timeout')));
-
-          // Start recognition
-          VoskModule.start(grammar);
-        })
-        // eslint-disable-next-line promise/prefer-await-to-then
-        .catch(e => {
-          reject(e);
-        });
-        // eslint-disable-next-line promise/prefer-await-to-then
-      }).finally(() => {
-        _this.cleanListeners();
-      });
-    });
-    _defineProperty(this, "stop", () => {
-      this.cleanListeners();
-      VoskModule.stop();
-    });
-    _defineProperty(this, "stopOnly", () => {
-      VoskModule.stopOnly();
-    });
-    _defineProperty(this, "cleanup", () => {
-      this.cleanListeners();
-      VoskModule.cleanup();
-    });
-    _defineProperty(this, "unload", () => {
-      this.cleanListeners();
-      VoskModule.unload();
-    });
-    _defineProperty(this, "onResult", onResult => {
-      return eventEmitter.addListener('onResult', onResult);
-    });
-    _defineProperty(this, "onFinalResult", onFinalResult => {
-      return eventEmitter.addListener('onFinalResult', onFinalResult);
-    });
-    _defineProperty(this, "onError", onError => {
-      return eventEmitter.addListener('onError', onError);
-    });
-    _defineProperty(this, "onTimeout", onTimeout => {
-      return eventEmitter.addListener('onTimeout', onTimeout);
-    });
-    _defineProperty(this, "requestRecordPermission", async () => {
-      if (Platform.OS === 'ios') return true;
-      const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.RECORD_AUDIO);
-      return granted === PermissionsAndroid.RESULTS.GRANTED;
-    });
-    _defineProperty(this, "cleanListeners", () => {
-      // Clean event listeners
-      this.currentRegisteredEvents.forEach(subscription => subscription.remove());
-      this.currentRegisteredEvents = [];
-    });
-  } // Public functions
-  // Event listeners builders
-  // Private functions
-}
-//# sourceMappingURL=index.js.map

packages/react-native-vosk/lib/typescript/index.d.ts

@@ -1,23 +0,0 @@
-import { EventSubscription } from 'react-native';
-declare type VoskEvent = {
-    /**
-     * Event datas
-     */
-    data: string;
-};
-export default class Vosk {
-    loadModel: (path: string) => any;
-    private currentRegisteredEvents;
-    start: (grammar?: string[] | null) => Promise<String>;
-    stop: () => void;
-    stopOnly: () => void;
-    cleanup: () => void;
-    unload: () => void;
-    onResult: (onResult: (e: VoskEvent) => void) => EventSubscription;
-    onFinalResult: (onFinalResult: (e: VoskEvent) => void) => EventSubscription;
-    onError: (onError: (e: VoskEvent) => void) => EventSubscription;
-    onTimeout: (onTimeout: (e: VoskEvent) => void) => EventSubscription;
-    private requestRecordPermission;
-    private cleanListeners;
-}
-export {};

packages/react-native-vosk/package.json

@@ -1,85 +0,0 @@
-{
-  "name": "@joplin/react-native-vosk",
-  "version": "0.1.13",
-  "description": "Speech recognition module for react native using Vosk library",
-  "main": "lib/commonjs/index",
-  "module": "lib/module/index",
-  "types": "lib/typescript/index.d.ts",
-  "react-native": "src/index",
-  "source": "src/index",
-  "files": [
-    "src",
-    "lib",
-    "android",
-    "ios",
-    "cpp",
-    "react-native-vosk.podspec",
-    "!lib/typescript/example",
-    "!android/build",
-    "!ios/build",
-    "!**/__tests__",
-    "!**/__fixtures__",
-    "!**/__mocks__"
-  ],
-  "scripts": {
-    "build": "tsc --project tsconfig.json && bob build",
-    "watch": "tsc --watch --preserveWatchOutput --project tsconfig.json",
-    "tsc": "tsc --project tsconfig.json"
-  },
-  "keywords": [
-    "react-native",
-    "ios",
-    "android"
-  ],
-  "repository": "https://github.com/riderodd/react-native-vosk",
-  "author": "Joris Gaudin <contact@jg-web.site> (https://www.jg-web.site/)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/riderodd/react-native-vosk/issues"
-  },
-  "homepage": "https://github.com/riderodd/react-native-vosk#readme",
-  "publishConfig": {
-    "access": "public"
-  },
-  "devDependencies": {
-    "@babel/eslint-parser": "7.18.2",
-    "@react-native-community/eslint-config": "3.0.2",
-    "@release-it/conventional-changelog": "5.0.0",
-    "@types/jest": "28.1.2",
-    "@types/react": "~17.0.21",
-    "@types/react-native": "0.68.0",
-    "eslint": "8.4.1",
-    "jest": "28.1.1",
-    "pod-install": "0.1.0",
-    "react": "18.2.0",
-    "react-native": "0.71.4",
-    "react-native-builder-bob": "0.18.3",
-    "release-it": "15.0.0",
-    "typescript": "4.5.2"
-  },
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
-  },
-  "jest": {
-    "preset": "react-native",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/lib/"
-    ]
-  },
-  "react-native-builder-bob": {
-    "source": "src",
-    "output": "lib",
-    "targets": [
-      "commonjs",
-      "module",
-      [
-        "typescript",
-        {
-          "project": "tsconfig.build.json"
-        }
-      ]
-    ]
-  }
-}

packages/react-native-vosk/react-native-vosk.podspec

@@ -1,41 +0,0 @@
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_version = '2021.06.28.00-v2'
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-
-Pod::Spec.new do |s|
-  s.name         = "react-native-vosk"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
-
-  s.platforms    = { :ios => "10.0" }
-  s.source       = { :git => "https://github.com/riderodd/react-native-vosk.git", :tag => "#{s.version}" }
-
-  s.source_files = "ios/**/*.{h,m,mm,swift}"
-  s.resource_bundles = { 'Vosk' => ['ios/Vosk/*'] }
-
-  s.dependency "React-Core"
-  s.frameworks = "Accelerate"
-  s.library = "c++"
-  s.vendored_frameworks = "ios/libvosk.xcframework"
-  s.requires_arc = true
-
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly", folly_version
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-  end
-end

packages/react-native-vosk/scripts/bootstrap.js

@@ -1,29 +0,0 @@
-const os = require('os');
-const path = require('path');
-const child_process = require('child_process');
-
-const root = path.resolve(__dirname, '..');
-const args = process.argv.slice(2);
-const options = {
-	cwd: process.cwd(),
-	env: process.env,
-	stdio: 'inherit',
-	encoding: 'utf-8',
-};
-
-if (os.type() === 'Windows_NT') {
-	options.shell = true;
-}
-
-let result;
-
-if (process.cwd() !== root || args.length) {
-	// We're not in the root of the project, or additional arguments were passed
-	// In this case, forward the command to `yarn`
-	result = child_process.spawnSync('yarn', args, options);
-} else {
-	// If `yarn` is run without arguments, perform bootstrap
-	result = child_process.spawnSync('yarn', ['bootstrap'], options);
-}
-
-process.exitCode = result.status;

packages/react-native-vosk/src/index.tsx

@@ -1,117 +0,0 @@
-import {
-	EmitterSubscription,
-	EventSubscription,
-	NativeEventEmitter,
-	NativeModules,
-	PermissionsAndroid,
-	Platform,
-} from 'react-native';
-
-const LINKING_ERROR =
-	`The package 'react-native-vosk' doesn't seem to be linked. Make sure: \n\n${
-		Platform.select({ ios: '- You have run \'pod install\'\n', default: '' })
-	}- You rebuilt the app after installing the package\n` +
-	'- You are not using Expo managed workflow\n';
-
-const VoskModule = NativeModules.Vosk
-	? NativeModules.Vosk
-	: new Proxy(
-		{},
-		{
-			get() {
-				throw new Error(LINKING_ERROR);
-			},
-		}
-	);
-
-type VoskEvent = {
-	/**
-	 * Event datas
-	 */
-	data: string;
-};
-
-const eventEmitter = new NativeEventEmitter(VoskModule);
-
-export default class Vosk {
-	// Public functions
-	public loadModel = (path: string) => VoskModule.loadModel(path);
-
-	private currentRegisteredEvents: EmitterSubscription[] = [];
-
-	public start = (grammar: string[] | null = null): Promise<String> => {
-
-		return new Promise<String>((resolve, reject) => {
-			// Check for permission
-			this.requestRecordPermission()
-				// eslint-disable-next-line promise/prefer-await-to-then
-				.then((granted) => {
-					if (!granted) return reject('Audio record permission denied');
-
-					// Setup events
-					this.currentRegisteredEvents.push(eventEmitter.addListener('onResult', (e: VoskEvent) => resolve(e.data)));
-					this.currentRegisteredEvents.push(eventEmitter.addListener('onFinalResult', (e: VoskEvent) => resolve(e.data)));
-					this.currentRegisteredEvents.push(eventEmitter.addListener('onError', (e: VoskEvent) => reject(e.data)));
-					this.currentRegisteredEvents.push(eventEmitter.addListener('onTimeout', () => reject('timeout')));
-
-					// Start recognition
-					VoskModule.start(grammar);
-				})
-				// eslint-disable-next-line promise/prefer-await-to-then
-				.catch((e) => {
-					reject(e);
-				});
-		// eslint-disable-next-line promise/prefer-await-to-then
-		}).finally(() => {
-			this.cleanListeners();
-		});
-	};
-
-	public stop = () => {
-		this.cleanListeners();
-		VoskModule.stop();
-	};
-
-	public stopOnly = () => {
-		VoskModule.stopOnly();
-	};
-
-	public cleanup = () => {
-		this.cleanListeners();
-		VoskModule.cleanup();
-	};
-
-	public unload = () => {
-		this.cleanListeners();
-		VoskModule.unload();
-	};
-
-	// Event listeners builders
-	public onResult = (onResult: (e: VoskEvent)=> void): EventSubscription => {
-		return eventEmitter.addListener('onResult', onResult);
-	};
-	public onFinalResult = (onFinalResult: (e: VoskEvent)=> void): EventSubscription => {
-		return eventEmitter.addListener('onFinalResult', onFinalResult);
-	};
-	public onError = (onError: (e: VoskEvent)=> void): EventSubscription => {
-		return eventEmitter.addListener('onError', onError);
-	};
-	public onTimeout = (onTimeout: (e: VoskEvent)=> void): EventSubscription => {
-		return eventEmitter.addListener('onTimeout', onTimeout);
-	};
-
-	// Private functions
-	private requestRecordPermission = async () => {
-		if (Platform.OS === 'ios') return true;
-		const granted = await PermissionsAndroid.request(
-			PermissionsAndroid.PERMISSIONS.RECORD_AUDIO!
-		);
-		return granted === PermissionsAndroid.RESULTS.GRANTED;
-	};
-
-	private cleanListeners = () => {
-		// Clean event listeners
-		this.currentRegisteredEvents.forEach(subscription => subscription.remove());
-		this.currentRegisteredEvents = [];
-	};
-}

packages/react-native-vosk/tsconfig.build.json

@@ -1,5 +0,0 @@
-
-{
-  "extends": "./tsconfig",
-  "exclude": ["example"]
-}