0.1.4-1.1.1: Fixed invalid unpack config in package.json

asivery · Apr 26, 2022 · dfd8a41 · dfd8a41
1 parent 43f91a4
commit dfd8a41
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electronwmd",
-  "version": "0.1.3-1.1.1",
+  "version": "0.1.4-1.1.1",
   "description": "Electron version of WebMinidisc Pro",
   "main": "dist/main.js",
   "scripts": {
@@ -21,7 +21,8 @@
     "asarUnpack": [
       "./node_modules/netmd-js/**/*",
       "./node_modules/crypto-js/**/*",
-      "./node_modules/jconv/**/*"
+      "./node_modules/jconv/**/*",
+      "./node_modules/jsbi/**/*"
     ],
     "win": {
       "icon": "./res/icon.ico"
@@ -42,6 +43,7 @@
     "@types/electron": "^1.6.10",
     "async-mutex": "^0.3.2",
     "jconv": "^0.1.5",
+    "jsbi": "^3.2.5",
     "netmd-js": "^3.2.3",
     "typescript": "^4.3.5",
     "webusb": "^2.2.0"

diff --git a/src/main.ts b/src/main.ts
@@ -26,6 +26,7 @@ async function integrate(window: BrowserWindow){
         writable: false,
         value: { usb }
     });
+    usb.ondisconnect = () => window.reload();
     const service = new NetMDUSBService({debug: true});
 
     let currentObj = service as any;
@@ -43,10 +44,9 @@ async function integrate(window: BrowserWindow){
                         }
                     }
                     try{
-                        return await (service as any)[n](...allArgs);
+                        return [ await (service as any)[n](...allArgs), null ];
                     }catch(err){
-                        window.reload();
-                        return null;
+                        return [ null, err ];
                     }
                 })
             });

diff --git a/src/preload.ts b/src/preload.ts
@@ -16,7 +16,7 @@ import {
     ipcRenderer.on("_callback", (evt, cbname, ...args) => callbacks[cbname](...args));
 
     for(const name of defined){
-        iface[name] = (...args: any[]) => {
+        iface[name] = async (...args: any[]) => {
             const registeredForThis = new Set<string>();
             for(let i = 0; i<args.length; i++){
                 if(typeof args[i] === "function"){
@@ -25,7 +25,9 @@ import {
                     args[i] = { interprocessType: "function" };
                 }
             }
-            return ipcRenderer.invoke(name, ...args);
+            const [ response, error ] = await ipcRenderer.invoke(name, ...args);
+            if(error) throw error;
+            return await response;
         }
         console.log(`Registering invoker for #${i++}(${name})`);
     }

diff --git a/src/wmd/netmd.ts b/src/wmd/netmd.ts
@@ -260,7 +260,7 @@ export class NetMDUSBService implements NetMDService {
     @asyncMutex
     async deleteTracks(indexes: number[]) {
         try{
-            this.netmdInterface!.stop();
+            await this.netmdInterface!.stop();
         }catch(ex){}
         indexes = indexes.sort();
         indexes.reverse();
@@ -277,7 +277,7 @@ export class NetMDUSBService implements NetMDService {
     @asyncMutex
     async wipeDisc() {
         try{
-            this.netmdInterface!.stop();
+            await this.netmdInterface!.stop();
         }catch(ex){}
         await this.netmdInterface!.eraseDisc();
         this.dropCachedContentList();