fallback - dont'use worker thread in electron

This commit is contained in:
Jan Prochazka
2021-12-12 20:26:42 +01:00
parent 13f277a1ea
commit 5e5a26ed4d
2 changed files with 29 additions and 6 deletions

View File

@@ -27,6 +27,10 @@
import resizeObserver from '../utility/resizeObserver'; import resizeObserver from '../utility/resizeObserver';
// @ts-ignore // @ts-ignore
import QueryParserWorker from 'web-worker:./QueryParserWorker'; import QueryParserWorker from 'web-worker:./QueryParserWorker';
import queryParserWorkerFallback from './queryParserWorkerFallback';
import getElectron from '../utility/getElectron';
const electron = getElectron();
const EDITOR_ID = `svelte-ace-editor-div:${Math.floor(Math.random() * 10000000000)}`; const EDITOR_ID = `svelte-ace-editor-div:${Math.floor(Math.random() * 10000000000)}`;
const dispatch = createEventDispatcher<{ const dispatch = createEventDispatcher<{
@@ -129,13 +133,13 @@
$: watchQueryParserWorker(splitterOptions && $tabVisible); $: watchQueryParserWorker(splitterOptions && $tabVisible);
function watchQueryParserWorker(enabled) { function watchQueryParserWorker(enabled) {
if (electron) return; // electron doesn't support workers
if (enabled) { if (enabled) {
if (!queryParserWorker) { if (!queryParserWorker) {
queryParserWorker = new QueryParserWorker(); queryParserWorker = new QueryParserWorker();
queryParserWorker.onmessage = e => { queryParserWorker.onmessage = e => {
queryParts = e.data; processParserResult(e.data);
editor.setHighlightActiveLine(queryParts.length <= 1);
changedCurrentQueryPart();
}; };
} }
} else { } else {
@@ -159,6 +163,12 @@
resizeOnNextTick(); resizeOnNextTick();
} }
function processParserResult(data) {
queryParts = data;
editor.setHighlightActiveLine(queryParts.length <= 1);
changedCurrentQueryPart();
}
const handleContextMenu = e => { const handleContextMenu = e => {
e.preventDefault(); e.preventDefault();
const left = e.pageX; const left = e.pageX;
@@ -172,16 +182,23 @@
function changedQueryParts() { function changedQueryParts() {
const editor = getEditor(); const editor = getEditor();
if (splitterOptions && editor && queryParserWorker) { if (splitterOptions && editor && (queryParserWorker || electron)) {
const editor = getEditor(); const editor = getEditor();
queryParserWorker.postMessage({ const message = {
text: editor.getValue(), text: editor.getValue(),
options: { options: {
...splitterOptions, ...splitterOptions,
returnRichInfo: true, returnRichInfo: true,
}, },
}); };
if (electron) {
const res = queryParserWorkerFallback(message);
processParserResult(res);
} else {
queryParserWorker.postMessage(message);
}
} }
// if (splitterOptions && editor) { // if (splitterOptions && editor) {
// const sql = editor.getValue(); // const sql = editor.getValue();

View File

@@ -0,0 +1,6 @@
import { splitQuery } from 'dbgate-query-splitter';
export default function c(data) {
const result = splitQuery(data.text, data.options);
return result;
}