@lvce-editor/main-process 6.15.0 → 6.17.0

package/dist/mainProcessMain.js

@@ -3426,7 +3426,7 @@ const formatUtilityProcessName = name => {
 const state$6 = {
   all: Object.create(null)
 };
-const add$1 = (pid, process, name) => {
+const add$2 = (pid, process, name) => {
   number(pid);
   object(process);
   string(name);
@@ -3461,7 +3461,7 @@ const trackUtilityProcess = (rawIpc, name) => {
     pid
   } = rawIpc;
   const formattedName = formatUtilityProcessName(name);
-  add$1(pid, rawIpc, formattedName);
+  add$2(pid, rawIpc, formattedName);
   const cleanup = () => {
     remove$1(pid);
     rawIpc.off('exit', handleExit);
@@ -4067,6 +4067,7 @@ const DidNavigate = 'did-navigate';
 const PageTitleUpdated = 'page-title-updated';
 const Destroyed = 'destroyed';
 const BeforeInputEvent = 'before-input-event';
+const Login = 'login';
 
 const Deny = 'deny';
 
@@ -4087,7 +4088,7 @@ const state$3 = {
   fallThroughKeyBindings: [],
   views: Object.create(null)
 };
-const add = (id, browserWindow, view) => {
+const add$1 = (id, browserWindow, view) => {
   // state
   state$3.views[id] = {
     browserWindow,
@@ -4515,8 +4516,14 @@ const formatMessage = ({
   message,
   sourceId
 }) => {
-  const source = sourceId ? ` (${sourceId}:${lineNumber})` : '';
-  return `${new Date().toISOString()} [${level}] [Window] ${message}${source}`;
+  return JSON.stringify({
+    category: 'Window',
+    level,
+    line: lineNumber,
+    message,
+    source: sourceId,
+    timestamp: new Date().toISOString()
+  });
 };
 const addListener = (webContents, logger = getOrCreateLogger()) => {
   webContents.on('console-message', event => {
@@ -6155,14 +6162,14 @@ const getKeyBindingIdentifier = input => {
   return identifier;
 };
 
-const key$6 = 'before-input';
-const attach$6 = (webContents, listener) => {
+const key$7 = 'before-input';
+const attach$7 = (webContents, listener) => {
   webContents.on(BeforeInputEvent, listener);
 };
-const detach$6 = (webContents, listener) => {
+const detach$7 = (webContents, listener) => {
   webContents.off(BeforeInputEvent, listener);
 };
-const handler$6 = (event, input) => {
+const handler$7 = (event, input) => {
   if (input.type !== KeyDown) {
     return {
       messages: [],
@@ -6187,6 +6194,28 @@ const handler$6 = (event, input) => {
 };
 
 const ElectronBrowserViewEventListenerBeforeInput = {
+	__proto__: null,
+	attach: attach$7,
+	detach: detach$7,
+	handler: handler$7,
+	key: key$7
+};
+
+const key$6 = 'context-menu';
+const attach$6 = (webContents, listener) => {
+  webContents.on(ContextMenu, listener);
+};
+const detach$6 = (webContents, listener) => {
+  webContents.off(ContextMenu, listener);
+};
+const handler$6 = (event, params) => {
+  return {
+    messages: [['handleContextMenu', params]],
+    result: undefined
+  };
+};
+
+const ElectronBrowserViewEventListenerContextMenu = {
 	__proto__: null,
 	attach: attach$6,
 	detach: detach$6,
@@ -6194,21 +6223,21 @@ const ElectronBrowserViewEventListenerBeforeInput = {
 	key: key$6
 };
 
-const key$5 = 'context-menu';
+const key$5 = 'destroyed';
 const attach$5 = (webContents, listener) => {
-  webContents.on(ContextMenu, listener);
+  webContents.on(Destroyed, listener);
 };
 const detach$5 = (webContents, listener) => {
-  webContents.off(ContextMenu, listener);
+  webContents.off(Destroyed, listener);
 };
-const handler$5 = (event, params) => {
+const handler$5 = () => {
   return {
-    messages: [['handleContextMenu', params]],
+    messages: [['handleBrowserViewDestroyed']],
     result: undefined
   };
 };
 
-const ElectronBrowserViewEventListenerContextMenu = {
+const ElectronBrowserViewEventListenerDestroyed = {
 	__proto__: null,
 	attach: attach$5,
 	detach: detach$5,
@@ -6216,21 +6245,21 @@ const ElectronBrowserViewEventListenerContextMenu = {
 	key: key$5
 };
 
-const key$4 = 'destroyed';
+const key$4 = 'did-navigate';
 const attach$4 = (webContents, listener) => {
-  webContents.on(Destroyed, listener);
+  webContents.on(DidNavigate, listener);
 };
 const detach$4 = (webContents, listener) => {
-  webContents.off(Destroyed, listener);
+  webContents.off(DidNavigate, listener);
 };
-const handler$4 = () => {
+const handler$4 = (event, url) => {
   return {
-    messages: [['handleBrowserViewDestroyed']],
+    messages: [['handleDidNavigate', url]],
     result: undefined
   };
 };
 
-const ElectronBrowserViewEventListenerDestroyed = {
+const ElectronBrowserViewEventListenerDidNavigate = {
 	__proto__: null,
 	attach: attach$4,
 	detach: detach$4,
@@ -6238,21 +6267,64 @@ const ElectronBrowserViewEventListenerDestroyed = {
 	key: key$4
 };
 
-const key$3 = 'did-navigate';
+const pendingLogins = new Map();
+let nextRequestId = 1;
+const add = (webContentsId, callback) => {
+  const requestId = `${webContentsId}:${nextRequestId++}`;
+  pendingLogins.set(requestId, {
+    callback,
+    webContentsId
+  });
+  return requestId;
+};
+const take = requestId => {
+  const pendingLogin = pendingLogins.get(requestId);
+  pendingLogins.delete(requestId);
+  return pendingLogin;
+};
+const accept = (requestId, username, password) => {
+  const pendingLogin = take(requestId);
+  pendingLogin?.callback(username, password);
+};
+const cancel = requestId => {
+  const pendingLogin = take(requestId);
+  pendingLogin?.callback();
+};
+const cancelForWebContents = webContentsId => {
+  for (const [requestId, pendingLogin] of pendingLogins) {
+    if (pendingLogin.webContentsId !== webContentsId) {
+      continue;
+    }
+    pendingLogins.delete(requestId);
+    pendingLogin.callback();
+  }
+};
+
+const key$3 = Login;
 const attach$3 = (webContents, listener) => {
-  webContents.on(DidNavigate, listener);
+  webContents.on(Login, listener);
 };
 const detach$3 = (webContents, listener) => {
-  webContents.off(DidNavigate, listener);
+  webContents.off(Login, listener);
 };
-const handler$3 = (event, url) => {
+const handler$3 = (event, authenticationResponseDetails, authInfo, callback, webContentsId) => {
+  event.preventDefault();
+  const requestId = add(webContentsId, callback);
   return {
-    messages: [['handleDidNavigate', url]],
+    messages: [['handleLogin', {
+      host: authInfo.host,
+      isProxy: authInfo.isProxy,
+      port: authInfo.port,
+      realm: authInfo.realm,
+      requestId,
+      scheme: authInfo.scheme,
+      url: String(authenticationResponseDetails.url)
+    }]],
     result: undefined
   };
 };
 
-const ElectronBrowserViewEventListenerDidNavigate = {
+const ElectronBrowserViewEventListenerLogin = {
 	__proto__: null,
 	attach: attach$3,
 	detach: detach$3,
@@ -6339,6 +6411,7 @@ const ElectronBrowserViewEventListeners = {
 	contextMenu: ElectronBrowserViewEventListenerContextMenu,
 	destroyed: ElectronBrowserViewEventListenerDestroyed,
 	didNavigate: ElectronBrowserViewEventListenerDidNavigate,
+	login: ElectronBrowserViewEventListenerLogin,
 	pageTitleUpdated: ElectronBrowserViewEventListenerPageTitleUpdated,
 	willNavigate: ElectronBrowserViewEventListenerWillNavigate,
 	windowOpen: ElectronBrowserViewEventListenerWindowOpen
@@ -6367,7 +6440,7 @@ const createWebContentsView = async () => {
   const {
     id
   } = webContents;
-  add(id, browserWindow, view);
+  add$1(id, browserWindow, view);
   return id;
 };
 const attachEventListeners = webContentsId => {
@@ -6383,7 +6456,7 @@ const attachEventListeners = webContentsId => {
       const {
         messages,
         result
-      } = value.handler(...args);
+      } = value.handler(...args, webContentsId);
       for (const message of messages) {
         const [key, ...rest] = message;
         send(`ElectronWebContents.${key}`, webContentsId, ...rest);
@@ -6397,6 +6470,7 @@ const attachEventListeners = webContentsId => {
 };
 const disposeWebContentsView = browserViewId => {
   console.log('[main process] dispose browser view', browserViewId);
+  cancelForWebContents(browserViewId);
   const instance = get$3(browserViewId);
   if (!instance) {
     return;
@@ -6972,7 +7046,9 @@ const commandMap = {
   'ElectronWebContents.callFunction': callFunction,
   'ElectronWebContents.dispose': dispose$1,
   'ElectronWebContents.getStats': getStats$1,
+  'ElectronWebContentsView.acceptLogin': accept,
   'ElectronWebContentsView.attachEventListeners': attachEventListeners,
+  'ElectronWebContentsView.cancelLogin': cancel,
   'ElectronWebContentsView.createWebContentsView': createWebContentsView,
   'ElectronWebContentsView.disposeWebContentsView': disposeWebContentsView,
   'ElectronWebContentsViewFunctions.addToWindow': addToWindow,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "6.15.0",
+  "version": "6.17.0",
   "keywords": [
     "lvce-editor",
     "electron"