make sure emulators should return the message

Author: xsro

src/ASM/manager.ts

@@ -9,9 +9,10 @@ import { uriUtils } from '../utils/util';
 export * from './vscode-dosbox';
 
 export interface AsmResult {
-    message?: string,
+    message: string,
     error?: number,
-    warn?: number
+    warn?: number,
+    [id: string]: unknown,
 }
 
 export interface ActionContext {

src/emulators/dosbox.ts

@@ -114,8 +114,8 @@ export class Dosbox implements ExecAction {
 
         let result = undefined;
 
+        const [hook, promise] = messageCollector();
         if (ctx.actionType !== conf.ActionType.open && USE_NODEFS_WATCH) {
-            const [hook, promise] = messageCollector();
             nodefs.watchFile(logUri.fsPath, () => {
                 try {
                     if (nodefs.existsSync(logUri.fsPath)) {
@@ -127,24 +127,25 @@ export class Dosbox implements ExecAction {
                     console.error(e);
                 }
             });
-            promise.then(val => {
-                console.log(val);
-                result = val;
-            });
         }
 
         await box.run().catch(e => {
             console.error("dosbox run error", e);
+            throw new Error(e);
         });
 
         if (result === undefined) {
             if (nodefs.existsSync(logUri.fsPath)) {
                 result = nodefs.readFileSync(logUri.fsPath, { encoding: 'utf-8' });
+                hook(result);
             }
         }
+
+        const message = await promise;
+
         if (result === undefined) {
             throw new Error("can't get dosbox's result" + logUri.fsPath);
         }
-        return { message: result };
+        return { message, result };
     }
 }

src/emulators/jsdosWeb.ts

@@ -10,7 +10,6 @@ import { messageCollector } from "../diagnose/messageCollector";
 export class JsdosWeb implements ExecAction {
     name: DosEmulatorType | DosEmulatorType[] = DosEmulatorType.jsdos;
     async run(context: ExtensionContext, ctx: ActionContext, api: API): Promise<AsmResult> {
-        let result = undefined;
         await api.jsdos.jszip.loadAsync(ctx.bundleData);
 
         let fileInJsdos = "";
@@ -67,8 +66,9 @@ export class JsdosWeb implements ExecAction {
                         break;
                 }
             });
-            result = await promise;
+            const message = await promise;
+            return { message, webview };
         }
-        return { message: result };
+        throw new Error("can't get message from" + this.name);
     }
 }