fix: login handler issue, update version to 2.18.12

Author: dynilath

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-bondage-club",
-  "version": "2.18.11",
+  "version": "2.18.12",
   "description": "An electron wrapped bondage-club",
   "main": "./build/main.js",
   "author": "dynilath <dynilath@qq.com>",

src/bridge/index.ts

@@ -104,9 +104,13 @@ export function createCtxBridge (): EBCContext {
     clientLogined: (ticket: string, userinfo) =>
       testTicket(ticket)
         .then(() => testSetting('credentialSupport'))
-        .then(() => ipcRenderer.invoke('credential-client-logined', userinfo))
-        .then(handle => {
-          session.userHandle = handle
+        .then(() => {
+          ipcRenderer.on('credential-client-logined-reply', (e, user, handle) => {
+            if(user !== userinfo.user) return;
+            session.userHandle = handle
+            ipcRenderer.removeAllListeners('credential-client-logined-reply')
+          });
+          ipcRenderer.send('credential-client-logined', userinfo);
         }),
     saveUserPass: (ticket: string): Promise<string> =>
       testTicket(ticket)

src/main.ts

@@ -31,8 +31,6 @@ app.whenReady().then(async () => {
     console.error(error)
   }
 
-  const i18nObj = new i18nText()
-
   ScriptResource.init()
   MyProtocol.init()
   Credential.init()

src/main/credential.ts

@@ -80,8 +80,12 @@ function createOnLoginListener (parent: PromptParent) {
         }
       )
     }
-    return handle
-  }) as Parameters<typeof ipcMain.handle>[1]
+    parent.window.webContents.send(
+      'credential-client-logined-reply',
+      user,
+      handle
+    )
+  }) as Parameters<typeof ipcMain.on>[1]
 }
 
 export const Credential = {

src/main/mainWindow.ts

@@ -120,7 +120,7 @@ function mainWindowAfterLoad (
   ipcMain.on('reload-menu', mReloadMenu)
   ipcMain.on('load-script-url', mLoadScriptURL)
   ipcMain.on('language-change', mLanguageChange)
-  ipcMain.handle('credential-client-logined', onLogined)
+  ipcMain.on('credential-client-logined', onLogined)
 
   mainWindow.on('close', () => {
     ipcMain.off('reload-menu', mReloadMenu)