@lvce-editor/renderer-process 30.63.2 → 30.64.1

package/dist/rendererProcessMain.js

@@ -804,7 +804,7 @@ const applyDirectProperties = (restoredError, error) => {
   }
 };
 const restoreMessageError = (error, _currentStack) => {
-  const restoredError = constructError(error.message, error.type, error.name);
+  const restoredError = constructError(error.message, error.type || error.data?.type, error.name);
   if (typeof error.code === 'string' || typeof error.code === 'number') {
     Object.defineProperty(restoredError, 'code', {
       configurable: true,
@@ -819,6 +819,23 @@ const restoreMessageError = (error, _currentStack) => {
   }
   return restoredError;
 };
+const getFallbackMessage = error => {
+  if (error && typeof error.message === 'string' && error.message) {
+    return error.message;
+  }
+  if (error && error.data) {
+    return getFallbackMessage(error.data);
+  }
+  const stringified = String(error);
+  if (stringified !== '[object Object]') {
+    return stringified;
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return stringified;
+  }
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
@@ -827,13 +844,13 @@ const restoreJsonRpcError = error => {
   if (error && error.code && error.code === MethodNotFound) {
     return restoreMethodNotFoundError(error, currentStack);
   }
+  if (error && error.error) {
+    return restoreJsonRpcError(error.error);
+  }
   if (error && error.message) {
     return restoreMessageError(error);
   }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
+  return new Error(`JsonRpc Error: ${getFallbackMessage(error)}`);
 };
 const unwrapJsonRpcResult = responseMessage => {
   if ('error' in responseMessage) {
@@ -892,7 +909,7 @@ const getErrorProperty = (error, prettyError) => {
     data: {
       code: prettyError.code ?? error?.code,
       codeFrame: prettyError.codeFrame,
-      name: prettyError.name,
+      name: prettyError.name ?? error?.name,
       stack: getStack(prettyError),
       type: getErrorType(prettyError)
     },
@@ -1114,6 +1131,9 @@ const logError$1 = () => {
   // handled by renderer worker
 };
 const handleMessage = event => {
+  if (event.data === 'ready') {
+    return Promise.resolve();
+  }
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError$1, actualRequiresSocket);
@@ -7089,10 +7109,26 @@ const isTerminalTextInput = event => {
   }
   return target instanceof Element && Boolean(target.closest('.XtermTerminal'));
 };
+const isEditableTarget = target => {
+  if (!(target instanceof Element)) {
+    return false;
+  }
+  return Boolean(target.closest('input, textarea, [contenteditable]:not([contenteditable="false"])'));
+};
 const handleKeyDown$2 = event => {
   if (isNativeButtonActivation(event) || isTerminalTextInput(event)) {
     return;
   }
+  const {
+    altKey,
+    ctrlKey,
+    key,
+    metaKey,
+    shiftKey
+  } = event;
+  if (key === '.' && !altKey && !ctrlKey && !metaKey && !shiftKey && isEditableTarget(event.target)) {
+    return;
+  }
   const identifier = getKeyBindingIdentifier(event);
   const identifiers = getIdentifiers();
   const matchingKeyBinding = isMatchingKeyBinding(identifiers, identifier);
@@ -12254,7 +12290,7 @@ const flushPendingData = state => {
     terminal
   } = state;
   for (const data of pendingData) {
-    terminal.write(data);
+    if (data?.restore) restore(state, data.restore);else terminal.write(data);
   }
   pendingData.length = 0;
 };
@@ -12286,6 +12322,7 @@ const mountTerminal = async (state, uid) => {
     cols,
     rows
   }) => {
+    if (state.restoring) return;
     resize(uid, {
       columns: cols,
       rows
@@ -12293,6 +12330,7 @@ const mountTerminal = async (state, uid) => {
   });
   terminal.open(state.$Viewlet);
   const resizeObserver = new ResizeObserver(() => {
+    if (state.restoring) return;
     fitAddon.fit();
     focusIfConnected(state);
   });
@@ -12318,6 +12356,7 @@ const create = () => {
     pendingData: [],
     pendingFocus: false,
     resizeObserver: undefined,
+    restoring: false,
     terminal: undefined
   };
 };
@@ -12342,6 +12381,35 @@ const write = (state, data) => {
   }
   terminal.write(data);
 };
+const restore = (state, snapshot) => {
+  if (state.disposed) return;
+  const {
+    columns,
+    data,
+    rows
+  } = snapshot;
+  if (!Number.isSafeInteger(columns) || !Number.isSafeInteger(rows) || columns < 2 || columns > 500 || rows < 1 || rows > 200 || typeof data !== 'string') {
+    throw new Error('Invalid terminal snapshot');
+  }
+  const {
+    terminal
+  } = state;
+  if (!terminal) {
+    state.pendingData.push({
+      restore: snapshot
+    });
+    return;
+  }
+  state.restoring = true;
+  terminal.reset();
+  terminal.resize(columns, rows);
+  terminal.write(data, () => {
+    if (state.disposed) return;
+    state.restoring = false;
+    state.fitAddon.fit();
+    focusIfConnected(state);
+  });
+};
 const focus = state => {
   object(state);
   const {
@@ -12391,6 +12459,7 @@ const ViewletTerminal2 = {
   dispose,
   focus,
   handleMouseDown,
+  restore,
   setTerminal,
   write
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.63.2",
+  "version": "30.64.1",
   "keywords": [
     "lvce-editor",
     "renderer-process"