The swiss army knife of lossless video/audio editing
try to fix broken expressions
Mikael Finstad6e60133ef70f
diff --git a/src/renderer/src/worker/eval.ts b/src/renderer/src/worker/eval.tsindex a14bd0ed..abbf2635 100644--- a/src/renderer/src/worker/eval.ts+++ b/src/renderer/src/worker/eval.ts@@ -1,8 +1,28 @@-const workerUrl = new URL('evalWorker.js', import.meta.url);+import invariant from 'tiny-invariant';++// https://github.com/vitejs/vite/issues/11823#issuecomment-1407277242+// https://github.com/mifi/lossless-cut/issues/2059+import Worker from './evalWorker?worker';+++export interface RequestMessageData {+ code: string,+ id: number,+ context: string // json+}++export type ResponseMessageData = { id: number } & ({+ error: string,+} | {+ data: unknown,+})// https://v3.vitejs.dev/guide/features.html#web-workers// todo terminate() and recreate in case of error?-const worker = new Worker(workerUrl);+const worker = new Worker();+worker.addEventListener('error', (err) => {+ console.error('evalWorker error', err);+});let lastRequestId = 0;@@ -22,13 +42,17 @@ export default async function safeishEval(code: string, context: Record<string,worker.removeEventListener('error', onError);}- function onMessage({ data: { id: responseId, error, data } }) {+ function onMessage(response: { data: ResponseMessageData }) {// console.log('message', { responseId, error, data })- if (responseId === id) {+ if (response.data.id === id) {cleanup();- if (error) reject(new Error(error));- else resolve(data);+ if ('error' in response.data) {+ reject(new Error(response.data.error));+ } else {+ invariant('data' in response.data);+ resolve(response.data.data);+ }}}@@ -46,6 +70,6 @@ export default async function safeishEval(code: string, context: Record<string,worker.addEventListener('messageerror', onMessageerror);worker.addEventListener('error', onError);- worker.postMessage({ id, code, context: JSON.stringify(context) });+ worker.postMessage({ id, code, context: JSON.stringify(context) } satisfies RequestMessageData);});}diff --git a/src/renderer/src/worker/evalWorker.ts b/src/renderer/src/worker/evalWorker.tsindex b81669fc..b426ee9b 100644--- a/src/renderer/src/worker/evalWorker.ts+++ b/src/renderer/src/worker/evalWorker.ts@@ -1,10 +1,15 @@-// eslint-disable-next-line unicorn/no-this-assignment, @typescript-eslint/no-this-alias-const myGlobal = this;+import type { RequestMessageData, ResponseMessageData } from './eval';+// https://stackoverflow.com/a/10796616/6519037// https://github.com/Zirak/SO-ChatBot/blob/master/source/eval.js// https://github.com/Zirak/SO-ChatBot/blob/master/source/codeWorker.js+// `this` doesn't seem to work when transpiling, so use globalThis instead+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis+const myGlobal = globalThis;++const wl = {self: 1,onmessage: 1,@@ -119,7 +124,7 @@ myGlobal.fetch = undefined;// eslint-disable-next-line wrap-iife, func-names(function () {- onmessage = (event) => {+ onmessage = (event: MessageEvent<RequestMessageData>) => {// eslint-disable-next-line strict, lines-around-directive'use strict';@@ -130,9 +135,9 @@ myGlobal.fetch = undefined;// https://stackoverflow.com/questions/8403108/calling-eval-in-particular-context// eslint-disable-next-line unicorn/new-for-builtins, no-new-funcconst result = Function(`\nwith (this) { return (${code}); }`).call(context);- postMessage({ id, data: result });+ postMessage({ id, data: result } satisfies ResponseMessageData);} catch (e) {- postMessage({ id, error: `${e}` });+ postMessage({ id, error: `${e}` } satisfies ResponseMessageData);}};})();diff --git a/tsconfig.web.json b/tsconfig.web.jsonindex 56a2e8c4..3eb0d857 100644--- a/tsconfig.web.json+++ b/tsconfig.web.json@@ -5,6 +5,8 @@"noEmit": true,"noImplicitAny": false, // todo++ "types": ["vite/client"],},"references": [{ "path": "./tsconfig.main.json" },