fix: correctly report errors from worker loading

farfromrefug · farfromrefug · commit 135bfbeec2b7 · 2025-01-31T14:47:53.000+01:00
diff --git a/app/services/api.ts b/app/services/api.ts
@@ -353,6 +353,9 @@ export async function downloadStories(story: RemoteContent, folderId?: number) {
                         true
                     );
                     DEV_LOG && console.warn('aimportContentFromFiles done');
+                } catch (error) {
+                    showError(error);
+                    hideSnackMessage();
                 } finally {
                     if (file && File.exists(file.path)) {
                         DEV_LOG && console.log('removing downloading file', file.path);
diff --git a/app/services/importservice.ts b/app/services/importservice.ts
@@ -17,7 +17,7 @@ export interface ImportEnabledEventData extends Optional<EventData<Observable>,
 
 export class ImportService extends BaseWorkerHandler<ImportWorker> {
     constructor() {
-        super(() => new Worker('~/workers/ImportWorkerBootstrap'));
+        super(() => new Worker('~/workers/ImportWorker'));
     }
     async onWorkerEvent(eventData: any) {
         if (eventData.target === 'documentsService') {
diff --git a/app/workers/ImportWorker.ts b/app/workers/ImportWorker.ts
@@ -1,3 +1,4 @@
+import '@nativescript/core/globals';
 import SqlQuery from '@akylas/kiss-orm/dist/Queries/SqlQuery';
 import { getWorkerContextValue, loadImageSync, setWorkerContextValue } from '@akylas/nativescript-app-utils';
 import { BaseWorker, WorkerEvent } from '@akylas/nativescript-app-utils/worker/BaseWorker';
@@ -461,26 +462,3 @@ export default class ImportWorker extends BaseWorker {
 }
 
 const worker = new ImportWorker(context);
-const receivedMessage = worker.receivedMessage.bind(worker);
-context.onmessage = (event) => {
-    // DEV_LOG && console.log(TAG, 'onmessage', Date.now(), event);
-    if (typeof event.data.messageData === 'string') {
-        try {
-            event.data.messageData = JSON.parse(event.data.messageData);
-        } catch (error) {}
-    }
-    if (Array.isArray(event.data.nativeData)) {
-        event.data.nativeData = (event.data.nativeData as string[]).reduce((acc, key) => {
-            const actualKey = key.split('$$$')[1];
-            acc[actualKey] = getWorkerContextValue(key);
-            setWorkerContextValue(key, null);
-            return acc;
-        }, {});
-    }
-    if (typeof event.data.error === 'string') {
-        try {
-            event.data.error = JSON.parse(event.data.error);
-        } catch (error) {}
-    }
-    receivedMessage(event);
-};
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
         "@akylas/kiss-orm": "2.1.11",
         "@akylas/nativescript": "8.8.10",
         "@akylas/nativescript-app-tools": "file:tools",
-        "@akylas/nativescript-app-utils": "2.2.2",
+        "@akylas/nativescript-app-utils": "2.2.3",
         "@akylas/nativescript-inapp-purchase": "0.0.4",
         "@akylas/nativescript-inappbrowser": "3.1.8",
         "@akylas/non-playstore": "portal:plugin_non_playstore",

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export interface ImportEnabledEventData extends Optional<EventData<Observable>,`
`17`	`17`
`18`	`18`	`export class ImportService extends BaseWorkerHandler<ImportWorker> {`
`19`	`19`	`constructor() {`
`20`		`- super(() => new Worker('~/workers/ImportWorkerBootstrap'));`
	`20`	`+ super(() => new Worker('~/workers/ImportWorker'));`
`21`	`21`	`}`
`22`	`22`	`async onWorkerEvent(eventData: any) {`
`23`	`23`	`if (eventData.target === 'documentsService') {`