@lvce-editor/static-server 0.44.3 → 0.44.5

package/static/{629a831 → 10163fd}/packages/diff-worker/dist/diffWorkerMain.js

@@ -1,115 +1,66 @@
-const None = 0;
-const Insertion = 1;
-const Deletion = 2;
-
-// Based on https://johnresig.com/projects/javascript-diff-algorithm/ by John Resig (License MIT)
-
-const makeDiffMap = (linesA, linesB) => {
-  const map = Object.create(null);
-  // pass one
-  const na = [];
-  for (const line of linesB) {
-    if (line in map) {
-      map[line].nc++;
-    } else {
-      map[line] = {
-        oc: 0,
-        nc: 1,
-        olno: -1
-      };
-    }
-    na.push(map[line]);
+const normalizeLine = line => {
+  if (line.startsWith('Error: ')) {
+    return line.slice('Error: '.length);
   }
-  // pass two
-  const oa = [];
-  for (const [i, line] of linesA.entries()) {
-    if (line in map) {
-      map[line].oc++;
-    } else {
-      map[line] = {
-        oc: 1,
-        nc: 0,
-        olno: 0
-      };
-    }
-    map[line].olno = i;
-    oa.push(map[line]);
+  if (line.startsWith('VError: ')) {
+    return line.slice('VError: '.length);
   }
-  return {
-    map,
-    oa,
-    na
-  };
+  return line;
 };
-
-// Based on https://johnresig.com/projects/javascript-diff-algorithm/ by John Resig (License MIT)
-
-const diff = (linesA, linesB) => {
-  // create hashmaps of which line corresponds to which indices
-  const {
-    oa,
-    na
-  } = makeDiffMap(linesA, linesB);
-
-  // pass 3
-  for (let i = 0; i < na.length; i++) {
-    const entry = na[i];
-    if (entry.nc === 1 && entry.oc === 1) {
-      na[i] = entry.olno;
-      oa[entry.olno] = i;
-    }
+const getCombinedMessage = (error, message) => {
+  const stringifiedError = normalizeLine(`${error}`);
+  if (message) {
+    return `${message}: ${stringifiedError}`;
   }
-
-  // pass 4
-  for (let i = 0; i < na.length - 1; i++) {
-    const j = na[i];
-    if (typeof j === 'number' && na[i + 1] === oa[j + 1]) {
-      oa[j + 1] = i + 1;
-      na[i + 1] = j + 1;
-    }
+  return stringifiedError;
+};
+const NewLine$2 = '\n';
+const getNewLineIndex$1 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$2, startIndex);
+};
+const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent;
   }
-
-  // pass 5
-  for (let i = na.length; i > 0; i--) {
-    const j = na[i];
-    if (typeof j === 'number' && na[i - 1] === oa[j - 1]) {
-      na[i - 1] = j - 1;
-      oa[j - 1] = i - 1;
-    }
+  const parentNewLineIndex = getNewLineIndex$1(parent);
+  const childNewLineIndex = getNewLineIndex$1(child);
+  if (childNewLineIndex === -1) {
+    return parent;
   }
-  const changesRight = [];
-  const changesLeft = [];
-  for (let i = 0; i < na.length; i++) {
-    const j = na[i];
-    if (typeof j === 'number') ; else {
-      changesRight.push({
-        type: Insertion,
-        index: i
-      });
-    }
+  const parentFirstLine = parent.slice(0, parentNewLineIndex);
+  const childRest = child.slice(childNewLineIndex);
+  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
+  if (parentFirstLine.includes(childFirstLine)) {
+    return parentFirstLine + childRest;
   }
-  for (let i = 0; i < oa.length; i++) {
-    const j = oa[i];
-    if (typeof j === 'number') ; else {
-      changesLeft.push({
-        type: Deletion,
-        index: i
-      });
+  return child;
+};
+class VError extends Error {
+  constructor(error, message) {
+    const combinedMessage = getCombinedMessage(error, message);
+    super(combinedMessage);
+    this.name = 'VError';
+    if (error instanceof Error) {
+      this.stack = mergeStacks(this.stack, error.stack);
+    }
+    if (error.codeFrame) {
+      // @ts-ignore
+      this.codeFrame = error.codeFrame;
+    }
+    if (error.code) {
+      // @ts-ignore
+      this.code = error.code;
     }
   }
-  return {
-    changesLeft,
-    changesRight
-  };
-};
+}
 
-let AssertionError$1 = class AssertionError extends Error {
+class AssertionError extends Error {
   constructor(message) {
     super(message);
     this.name = 'AssertionError';
   }
-};
-const getType$2 = value => {
+}
+const getType = value => {
   switch (typeof value) {
     case 'number':
       return 'number';
@@ -132,751 +83,958 @@ const getType$2 = value => {
   }
 };
 const array = value => {
-  const type = getType$2(value);
+  const type = getType(value);
   if (type !== 'array') {
-    throw new AssertionError$1('expected value to be of type array');
+    throw new AssertionError('expected value to be of type array');
   }
 };
 
-const diffInline = (linesLeft, linesRight) => {
-  array(linesLeft);
-  array(linesRight);
-  const {
-    changesLeft,
-    changesRight
-  } = diff(linesLeft, linesRight);
-  const lengthLeft = linesLeft.length;
-  const lengthRight = linesRight.length;
-  const inlineDiffLinesLeft = [];
-  const inlineDiffLinesRight = [];
-  for (let i = 0; i < linesLeft.length; i++) {
-    inlineDiffLinesLeft.push(None);
-  }
-  for (let i = 0; i < linesRight.length; i++) {
-    inlineDiffLinesRight.push(None);
+const isMessagePort = value => {
+  return value && value instanceof MessagePort;
+};
+const isMessagePortMain = value => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain';
+};
+const isOffscreenCanvas = value => {
+  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
+};
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
+};
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
+};
+const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
+    }
   }
-  for (const change of changesLeft) {
-    inlineDiffLinesLeft[change.index] = change.type;
+  return false;
+};
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
   }
-  for (const change of changesRight) {
-    inlineDiffLinesRight[change.index] = change.type;
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
   }
-  const merged = [];
-  let leftIndex = 0;
-  let rightIndex = 0;
-  while (leftIndex < lengthLeft && rightIndex < lengthRight) {
-    const left = inlineDiffLinesLeft[leftIndex];
-    const right = inlineDiffLinesRight[rightIndex];
-    if (left === right) {
-      merged.push({
-        leftIndex,
-        rightIndex,
-        type: None
-      });
-      leftIndex++;
-      rightIndex++;
-    } else if (left === Deletion) {
-      merged.push({
-        leftIndex,
-        rightIndex,
-        type: Deletion
-      });
-      leftIndex++;
-    } else if (leftIndex <= rightIndex) {
-      merged.push({
-        leftIndex,
-        rightIndex,
-        type: left
-      });
-      leftIndex++;
-    } else if (leftIndex > rightIndex) {
-      merged.push({
-        leftIndex,
-        rightIndex,
-        type: right
-      });
-      rightIndex++;
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
     }
+    return;
   }
-  while (leftIndex < lengthLeft) {
-    const left = inlineDiffLinesLeft[leftIndex];
-    merged.push({
-      leftIndex,
-      rightIndex: -1,
-      type: left
-    });
-    leftIndex++;
-  }
-  while (rightIndex < lengthRight) {
-    const right = inlineDiffLinesRight[rightIndex];
-    merged.push({
-      leftIndex: -1,
-      rightIndex,
-      type: right
-    });
-    rightIndex++;
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
   }
-  return merged;
 };
-
-const commandMap = {
-  'Diff.diff': diff,
-  'Diff.diffInline': diffInline
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables, isTransferrable);
+  return transferrables;
 };
-
-const commands = Object.create(null);
-const registerCommand = (key, fn) => {
-  commands[key] = fn;
+const attachEvents = that => {
+  const handleMessage = (...args) => {
+    const data = that.getData(...args);
+    that.dispatchEvent(new MessageEvent('message', {
+      data
+    }));
+  };
+  that.onMessage(handleMessage);
+  const handleClose = event => {
+    that.dispatchEvent(new Event('close'));
+  };
+  that.onClose(handleClose);
 };
-const registerCommands = commandMap => {
-  for (const [key, value] of Object.entries(commandMap)) {
-    registerCommand(key, value);
+class Ipc extends EventTarget {
+  constructor(rawIpc) {
+    super();
+    this._rawIpc = rawIpc;
+    attachEvents(this);
   }
+}
+const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
+const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
+const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
+const NewLine$1 = '\n';
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
 };
-const getCommand = key => {
-  return commands[key];
+const RE_AT = /^\s+at/;
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
+const isNormalStackLine = line => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
 };
-
-const Two = '2.0';
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
+const getDetails = lines => {
+  const index = lines.findIndex(isNormalStackLine);
+  if (index === -1) {
+    return {
+      actualMessage: joinLines$1(lines),
+      rest: []
+    };
   }
-}
-const getType$1 = value => {
-  switch (typeof value) {
-    case 'number':
-      return 'number';
-    case 'function':
-      return 'function';
-    case 'string':
-      return 'string';
-    case 'object':
-      if (value === null) {
-        return 'null';
-      }
-      if (Array.isArray(value)) {
-        return 'array';
-      }
-      return 'object';
-    case 'boolean':
-      return 'boolean';
-    default:
-      return 'unknown';
+  let lastIndex = index - 1;
+  while (++lastIndex < lines.length) {
+    if (!isNormalStackLine(lines[lastIndex])) {
+      break;
+    }
   }
+  return {
+    actualMessage: lines[index - 1],
+    rest: lines.slice(index, lastIndex)
+  };
 };
-const number = value => {
-  const type = getType$1(value);
-  if (type !== 'number') {
-    throw new AssertionError('expected value to be of type number');
-  }
+const splitLines$1 = lines => {
+  return lines.split(NewLine$1);
 };
-const state$1 = {
-  callbacks: Object.create(null)
+const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
+const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
+const isMessageCodeBlockStartIndex = line => {
+  return RE_MESSAGE_CODE_BLOCK_START.test(line);
 };
-const get = id => {
-  return state$1.callbacks[id];
+const isMessageCodeBlockEndIndex = line => {
+  return RE_MESSAGE_CODE_BLOCK_END.test(line);
 };
-const remove = id => {
-  delete state$1.callbacks[id];
+const getMessageCodeBlock = stderr => {
+  const lines = splitLines$1(stderr);
+  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
+  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
+  const relevantLines = lines.slice(startIndex, endIndex);
+  const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
+  return relevantMessage;
 };
-const warn = (...args) => {
-  console.warn(...args);
+const isModuleNotFoundMessage = line => {
+  return line.includes('[ERR_MODULE_NOT_FOUND]');
 };
-const resolve = (id, args) => {
-  number(id);
-  const fn = get(id);
-  if (!fn) {
-    console.log(args);
-    warn(`callback ${id} may already be disposed`);
-    return;
-  }
-  fn(args);
-  remove(id);
+const getModuleNotFoundError = stderr => {
+  const lines = splitLines$1(stderr);
+  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
+  const message = lines[messageIndex];
+  return {
+    message,
+    code: ERR_MODULE_NOT_FOUND
+  };
 };
-class JsonRpcError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'JsonRpcError';
-  }
-}
-const MethodNotFound = -32601;
-const Custom = -32001;
-const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
-const getType = prettyError => {
-  if (prettyError && prettyError.type) {
-    return prettyError.type;
-  }
-  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
-    return prettyError.constructor.name;
+const isModuleNotFoundError = stderr => {
+  if (!stderr) {
+    return false;
   }
-  return undefined;
+  return stderr.includes('ERR_MODULE_NOT_FOUND');
 };
-const getErrorProperty = (error, prettyError) => {
-  if (error && error.code === E_COMMAND_NOT_FOUND) {
-    return {
-      code: MethodNotFound,
-      message: error.message,
-      data: error.stack
-    };
+const isModulesSyntaxError = stderr => {
+  if (!stderr) {
+    return false;
   }
+  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
+};
+const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
+const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
+const isUnhelpfulNativeModuleError = stderr => {
+  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
+};
+const getNativeModuleErrorMessage = stderr => {
+  const message = getMessageCodeBlock(stderr);
   return {
-    code: Custom,
-    message: prettyError.message,
-    data: {
-      stack: prettyError.stack,
-      codeFrame: prettyError.codeFrame,
-      type: getType(prettyError),
-      code: prettyError.code,
-      name: prettyError.name
-    }
+    message: `Incompatible native node module: ${message}`,
+    code: E_INCOMPATIBLE_NATIVE_MODULE
   };
 };
-const create$1 = (message, error) => {
+const getModuleSyntaxError = () => {
   return {
-    jsonrpc: Two,
-    id: message.id,
-    error
+    message: `ES Modules are not supported in electron`,
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
   };
 };
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
-  const prettyError = preparePrettyError(error);
-  logError(error, prettyError);
-  const errorProperty = getErrorProperty(error, prettyError);
-  return create$1(message, errorProperty);
-};
-const create = (message, result) => {
+const getHelpfulChildProcessError = (stdout, stderr) => {
+  if (isUnhelpfulNativeModuleError(stderr)) {
+    return getNativeModuleErrorMessage(stderr);
+  }
+  if (isModulesSyntaxError(stderr)) {
+    return getModuleSyntaxError();
+  }
+  if (isModuleNotFoundError(stderr)) {
+    return getModuleNotFoundError(stderr);
+  }
+  const lines = splitLines$1(stderr);
+  const {
+    actualMessage,
+    rest
+  } = getDetails(lines);
   return {
-    jsonrpc: Two,
-    id: message.id,
-    result: result ?? null
+    message: actualMessage,
+    code: '',
+    stack: rest
   };
 };
-const getSuccessResponse = (message, result) => {
-  const resultProperty = result ?? null;
-  return create(message, resultProperty);
-};
-const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
-  try {
-    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
-    return getSuccessResponse(message, result);
-  } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
+class IpcError extends VError {
+  // @ts-ignore
+  constructor(betterMessage, stdout = '', stderr = '') {
+    if (stdout || stderr) {
+      // @ts-ignore
+      const {
+        message,
+        code,
+        stack
+      } = getHelpfulChildProcessError(stdout, stderr);
+      const cause = new Error(message);
+      // @ts-ignore
+      cause.code = code;
+      cause.stack = stack;
+      super(cause, betterMessage);
+    } else {
+      super(betterMessage);
+    }
+    // @ts-ignore
+    this.name = 'IpcError';
+    // @ts-ignore
+    this.stdout = stdout;
+    // @ts-ignore
+    this.stderr = stderr;
   }
+}
+const readyMessage = 'ready';
+const getData$2 = event => {
+  return event.data;
 };
-const defaultPreparePrettyError = error => {
-  return error;
-};
-const defaultLogError = () => {
-  // ignore
+const listen$7 = () => {
+  // @ts-ignore
+  if (typeof WorkerGlobalScope === 'undefined') {
+    throw new TypeError('module is not in web worker scope');
+  }
+  return globalThis;
 };
-const defaultRequiresSocket = () => {
-  return false;
+const signal$8 = global => {
+  global.postMessage(readyMessage);
 };
-const defaultResolve = resolve;
-const handleJsonRpcMessage = async (...args) => {
-  let message;
-  let ipc;
-  let execute;
-  let preparePrettyError;
-  let logError;
-  let resolve;
-  let requiresSocket;
-  if (args.length === 1) {
-    const arg = args[0];
-    message = arg.message;
-    ipc = arg.ipc;
-    execute = arg.execute;
-    preparePrettyError = arg.preparePrettyError || defaultPreparePrettyError;
-    logError = arg.logError || defaultLogError;
-    requiresSocket = arg.requiresSocket || defaultRequiresSocket;
-    resolve = arg.resolve || defaultResolve;
-  } else {
-    ipc = args[0];
-    message = args[1];
-    execute = args[2];
-    resolve = args[3];
-    preparePrettyError = args[4];
-    logError = args[5];
-    requiresSocket = args[6];
+class IpcChildWithModuleWorker extends Ipc {
+  getData(event) {
+    return getData$2(event);
   }
-  if ('id' in message) {
-    if ('method' in message) {
-      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-      try {
-        ipc.send(response);
-      } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
-        ipc.send(errorResponse);
-      }
-      return;
-    }
-    resolve(message.id, message);
-    return;
+  send(message) {
+    // @ts-ignore
+    this._rawIpc.postMessage(message);
   }
-  if ('method' in message) {
-    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-    return;
-  }
-  throw new JsonRpcError('unexpected message');
-};
-
-const processName = 'diff-worker';
-
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new Error(`[${processName}] command not found ${command}`);
-  }
-  return fn(...args);
-};
-
-const requiresSocket = () => {
-  return false;
-};
-const preparePrettyError = error => {
-  return error;
-};
-const logError = error => {
-  console.error(error);
-};
-const handleMessage = event => {
-  return handleJsonRpcMessage(event.target, event.data, execute, resolve, preparePrettyError, logError, requiresSocket);
-};
-const handleIpc = ipc => {
-  ipc.addEventListener('message', handleMessage);
-};
-
-const ModuleWorker = 2;
-const ModuleWorkerAndMessagePort = 8;
-const Auto = () => {
-  if (globalThis.acceptPort) {
-    return MessagePort;
-  }
-  return ModuleWorkerAndMessagePort;
-};
-
-const getData$1 = event => {
-  return event.data;
-};
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    // @ts-ignore
+    this._rawIpc.postMessage(message, transfer);
   }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
+  dispose() {
+    // ignore
   }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
-    }
-    return;
+  onClose(callback) {
+    // ignore
   }
-};
-const isMessagePort = value => {
-  return value && value instanceof MessagePort;
-};
-const isMessagePortMain = value => {
-  return value && value.constructor && value.constructor.name === 'MessagePortMain';
-};
-const isOffscreenCanvas = value => {
-  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
-};
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
-};
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
-};
-const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
-const isTransferrable = value => {
-  for (const fn of transferrables) {
-    if (fn(value)) {
-      return true;
-    }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
   }
-  return false;
-};
-const getTransferrables = value => {
-  const transferrables = [];
-  walkValue(value, transferrables, isTransferrable);
-  return transferrables;
+}
+const wrap$f = global => {
+  return new IpcChildWithModuleWorker(global);
 };
-const attachEvents = that => {
-  const handleMessage = (...args) => {
-    const data = that.getData(...args);
-    that.dispatchEvent(new MessageEvent('message', {
-      data
-    }));
-  };
-  that.onMessage(handleMessage);
-  const handleClose = event => {
-    that.dispatchEvent(new Event('close'));
+const withResolvers = () => {
+  let _resolve;
+  const promise = new Promise(resolve => {
+    _resolve = resolve;
+  });
+  return {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    resolve: _resolve,
+    promise
   };
-  that.onClose(handleClose);
 };
-class Ipc extends EventTarget {
-  constructor(rawIpc) {
-    super();
-    this._rawIpc = rawIpc;
-    attachEvents(this);
-  }
-}
-const readyMessage = 'ready';
-const listen$4 = () => {
+const waitForFirstMessage = async port => {
+  const {
+    resolve,
+    promise
+  } = withResolvers();
+  port.addEventListener('message', resolve, {
+    once: true
+  });
+  const event = await promise;
   // @ts-ignore
-  if (typeof WorkerGlobalScope === 'undefined') {
-    throw new TypeError('module is not in web worker scope');
+  return event.data;
+};
+const listen$6 = async () => {
+  const parentIpcRaw = listen$7();
+  signal$8(parentIpcRaw);
+  const parentIpc = wrap$f(parentIpcRaw);
+  const firstMessage = await waitForFirstMessage(parentIpc);
+  if (firstMessage.method !== 'initialize') {
+    throw new IpcError('unexpected first message');
+  }
+  const type = firstMessage.params[0];
+  if (type === 'message-port') {
+    parentIpc.send({
+      jsonrpc: '2.0',
+      id: firstMessage.id,
+      result: null
+    });
+    parentIpc.dispose();
+    const port = firstMessage.params[1];
+    return port;
   }
   return globalThis;
 };
-const signal$3 = global => {
-  global.postMessage(readyMessage);
-};
-class IpcChildWithModuleWorker extends Ipc {
+class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
   getData(event) {
-    return getData$1(event);
+    return getData$2(event);
   }
   send(message) {
-    // @ts-ignore
     this._rawIpc.postMessage(message);
   }
   sendAndTransfer(message) {
     const transfer = getTransferrables(message);
-    // @ts-ignore
     this._rawIpc.postMessage(message, transfer);
   }
   dispose() {
-    // ignore
+    if (this._rawIpc.close) {
+      this._rawIpc.close();
+    }
   }
   onClose(callback) {
     // ignore
   }
   onMessage(callback) {
     this._rawIpc.addEventListener('message', callback);
+    this._rawIpc.start();
   }
 }
-const wrap$6 = global => {
-  return new IpcChildWithModuleWorker(global);
+const wrap$e = port => {
+  return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
-const IpcChildWithModuleWorker$1 = {
+const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
-  listen: listen$4,
-  signal: signal$3,
-  wrap: wrap$6
-};
-const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
-const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
-const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
-const NewLine$1 = '\n';
-const joinLines = lines => {
-  return lines.join(NewLine$1);
-};
-const splitLines = lines => {
-  return lines.split(NewLine$1);
-};
-const isModuleNotFoundMessage = line => {
-  return line.includes('[ERR_MODULE_NOT_FOUND]');
+  listen: listen$6,
+  wrap: wrap$e
 };
-const getModuleNotFoundError = stderr => {
-  const lines = splitLines(stderr);
-  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
-  const message = lines[messageIndex];
+
+const Two = '2.0';
+const create$4 = (method, params) => {
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    jsonrpc: Two,
+    method,
+    params
   };
 };
-const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
-const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
-const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
-const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
-const RE_AT = /^\s+at/;
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
-const isUnhelpfulNativeModuleError = stderr => {
-  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
+const callbacks = Object.create(null);
+const set = (id, fn) => {
+  callbacks[id] = fn;
 };
-const isMessageCodeBlockStartIndex = line => {
-  return RE_MESSAGE_CODE_BLOCK_START.test(line);
+const get = id => {
+  return callbacks[id];
 };
-const isMessageCodeBlockEndIndex = line => {
-  return RE_MESSAGE_CODE_BLOCK_END.test(line);
+const remove = id => {
+  delete callbacks[id];
 };
-const getMessageCodeBlock = stderr => {
-  const lines = splitLines(stderr);
-  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
-  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
-  const relevantLines = lines.slice(startIndex, endIndex);
-  const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
-  return relevantMessage;
+let id = 0;
+const create$3 = () => {
+  return ++id;
 };
-const getNativeModuleErrorMessage = stderr => {
-  const message = getMessageCodeBlock(stderr);
+const registerPromise = () => {
+  const id = create$3();
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  set(id, resolve);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    id,
+    promise
   };
 };
-const isModulesSyntaxError = stderr => {
-  if (!stderr) {
-    return false;
-  }
-  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
-};
-const getModuleSyntaxError = () => {
+const create$2 = (method, params) => {
+  const {
+    id,
+    promise
+  } = registerPromise();
+  const message = {
+    jsonrpc: Two,
+    method,
+    params,
+    id
+  };
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    message,
+    promise
   };
 };
-const isModuleNotFoundError = stderr => {
-  if (!stderr) {
-    return false;
+class JsonRpcError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'JsonRpcError';
   }
-  return stderr.includes('ERR_MODULE_NOT_FOUND');
-};
-const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
+}
+const NewLine = '\n';
+const DomException = 'DOMException';
+const ReferenceError$1 = 'ReferenceError';
+const SyntaxError$1 = 'SyntaxError';
+const TypeError$1 = 'TypeError';
+const getErrorConstructor = (message, type) => {
+  if (type) {
+    switch (type) {
+      case DomException:
+        return DOMException;
+      case TypeError$1:
+        return TypeError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case ReferenceError$1:
+        return ReferenceError;
+      default:
+        return Error;
+    }
+  }
+  if (message.startsWith('TypeError: ')) {
+    return TypeError;
+  }
+  if (message.startsWith('SyntaxError: ')) {
+    return SyntaxError;
+  }
+  if (message.startsWith('ReferenceError: ')) {
+    return ReferenceError;
+  }
+  return Error;
 };
-const getDetails = lines => {
-  const index = lines.findIndex(isNormalStackLine);
-  if (index === -1) {
-    return {
-      actualMessage: joinLines(lines),
-      rest: []
-    };
+const constructError = (message, type, name) => {
+  const ErrorConstructor = getErrorConstructor(message, type);
+  if (ErrorConstructor === DOMException && name) {
+    return new ErrorConstructor(message, name);
   }
-  let lastIndex = index - 1;
-  while (++lastIndex < lines.length) {
-    if (!isNormalStackLine(lines[lastIndex])) {
-      break;
+  if (ErrorConstructor === Error) {
+    const error = new Error(message);
+    if (name && name !== 'VError') {
+      error.name = name;
     }
+    return error;
   }
-  return {
-    actualMessage: lines[index - 1],
-    rest: lines.slice(index, lastIndex)
-  };
+  return new ErrorConstructor(message);
 };
-const getHelpfulChildProcessError = (stdout, stderr) => {
-  if (isUnhelpfulNativeModuleError(stderr)) {
-    return getNativeModuleErrorMessage(stderr);
-  }
-  if (isModulesSyntaxError(stderr)) {
-    return getModuleSyntaxError();
-  }
-  if (isModuleNotFoundError(stderr)) {
-    return getModuleNotFoundError(stderr);
+const getNewLineIndex = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine, startIndex);
+};
+const getParentStack = error => {
+  let parentStack = error.stack || error.data || error.message || '';
+  if (parentStack.startsWith('    at')) {
+    parentStack = error.message + NewLine + parentStack;
   }
-  const lines = splitLines(stderr);
-  const {
-    actualMessage,
-    rest
-  } = getDetails(lines);
-  return {
-    message: `${actualMessage}`,
-    code: '',
-    stack: rest
-  };
+  return parentStack;
 };
-const normalizeLine = line => {
-  if (line.startsWith('Error: ')) {
-    return line.slice(`Error: `.length);
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+const MethodNotFound = -32601;
+const Custom = -32001;
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const restoreJsonRpcError = error => {
+  if (error && error instanceof Error) {
+    return error;
+  }
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
+  if (error && error.code && error.code === MethodNotFound) {
+    const restoredError = new JsonRpcError(error.message);
+    const parentStack = getParentStack(error);
+    restoredError.stack = parentStack + NewLine + currentStack;
+    return restoredError;
+  }
+  if (error && error.message) {
+    const restoredError = constructError(error.message, error.type, error.name);
+    if (error.data) {
+      if (error.data.stack && error.data.type && error.message) {
+        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+      } else if (error.data.stack) {
+        restoredError.stack = error.data.stack;
+      }
+      if (error.data.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.data.codeFrame;
+      }
+      if (error.data.code) {
+        // @ts-ignore
+        restoredError.code = error.data.code;
+      }
+      if (error.data.type) {
+        // @ts-ignore
+        restoredError.name = error.data.type;
+      }
+    } else {
+      if (error.stack) {
+        const lowerStack = restoredError.stack || '';
+        // @ts-ignore
+        const indexNewLine = getNewLineIndex(lowerStack);
+        const parentStack = getParentStack(error);
+        // @ts-ignore
+        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+      }
+      if (error.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.codeFrame;
+      }
+    }
+    return restoredError;
   }
-  if (line.startsWith('VError: ')) {
-    return line.slice(`VError: `.length);
+  if (typeof error === 'string') {
+    return new Error(`JsonRpc Error: ${error}`);
   }
-  return line;
+  return new Error(`JsonRpc Error: ${error}`);
 };
-const getCombinedMessage = (error, message) => {
-  const stringifiedError = normalizeLine(`${error}`);
-  if (message) {
-    return `${message}: ${stringifiedError}`;
+const unwrapJsonRpcResult = responseMessage => {
+  if ('error' in responseMessage) {
+    const restoredError = restoreJsonRpcError(responseMessage.error);
+    throw restoredError;
   }
-  return stringifiedError;
+  if ('result' in responseMessage) {
+    return responseMessage.result;
+  }
+  throw new JsonRpcError('unexpected response message');
 };
-const NewLine = '\n';
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine, startIndex);
+const warn = (...args) => {
+  console.warn(...args);
 };
-const mergeStacks = (parent, child) => {
-  if (!child) {
-    return parent;
+const resolve = (id, response) => {
+  const fn = get(id);
+  if (!fn) {
+    console.log(response);
+    warn(`callback ${id} may already be disposed`);
+    return;
   }
-  const parentNewLineIndex = getNewLineIndex(parent);
-  const childNewLineIndex = getNewLineIndex(child);
-  if (childNewLineIndex === -1) {
-    return parent;
+  fn(response);
+  remove(id);
+};
+const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
+const getErrorType = prettyError => {
+  if (prettyError && prettyError.type) {
+    return prettyError.type;
   }
-  const parentFirstLine = parent.slice(0, parentNewLineIndex);
-  const childRest = child.slice(childNewLineIndex);
-  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
-  if (parentFirstLine.includes(childFirstLine)) {
-    return parentFirstLine + childRest;
+  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
+    return prettyError.constructor.name;
   }
-  return child;
+  return undefined;
 };
-class VError extends Error {
-  constructor(error, message) {
-    const combinedMessage = getCombinedMessage(error, message);
-    super(combinedMessage);
-    this.name = 'VError';
-    if (error instanceof Error) {
-      this.stack = mergeStacks(this.stack, error.stack);
-    }
-    if (error.codeFrame) {
-      // @ts-ignore
-      this.codeFrame = error.codeFrame;
-    }
-    if (error.code) {
-      // @ts-ignore
-      this.code = error.code;
-    }
+const getErrorProperty = (error, prettyError) => {
+  if (error && error.code === E_COMMAND_NOT_FOUND) {
+    return {
+      code: MethodNotFound,
+      message: error.message,
+      data: error.stack
+    };
   }
-}
-class IpcError extends VError {
-  // @ts-ignore
-  constructor(betterMessage, stdout = '', stderr = '') {
-    if (stdout || stderr) {
-      // @ts-ignore
-      const {
-        message,
-        code,
-        stack
-      } = getHelpfulChildProcessError(stdout, stderr);
-      const cause = new Error(message);
-      // @ts-ignore
-      cause.code = code;
-      cause.stack = stack;
-      super(cause, betterMessage);
-    } else {
-      super(betterMessage);
+  return {
+    code: Custom,
+    message: prettyError.message,
+    data: {
+      stack: prettyError.stack,
+      codeFrame: prettyError.codeFrame,
+      type: getErrorType(prettyError),
+      code: prettyError.code,
+      name: prettyError.name
     }
-    // @ts-ignore
-    this.name = 'IpcError';
-    // @ts-ignore
-    this.stdout = stdout;
-    // @ts-ignore
-    this.stderr = stderr;
+  };
+};
+const create$1 = (message, error) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    error
+  };
+};
+const getErrorResponse = (message, error, preparePrettyError, logError) => {
+  const prettyError = preparePrettyError(error);
+  logError(error, prettyError);
+  const errorProperty = getErrorProperty(error, prettyError);
+  return create$1(message, errorProperty);
+};
+const create$5 = (message, result) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    result: result ?? null
+  };
+};
+const getSuccessResponse = (message, result) => {
+  const resultProperty = result ?? null;
+  return create$5(message, resultProperty);
+};
+const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
+  try {
+    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
+    return getSuccessResponse(message, result);
+  } catch (error) {
+    return getErrorResponse(message, error, preparePrettyError, logError);
+  }
+};
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
+};
+const defaultResolve = resolve;
+
+// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
+const normalizeParams = args => {
+  if (args.length === 1) {
+    const options = args[0];
+    return {
+      ipc: options.ipc,
+      message: options.message,
+      execute: options.execute,
+      resolve: options.resolve || defaultResolve,
+      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
+      logError: options.logError || defaultLogError,
+      requiresSocket: options.requiresSocket || defaultRequiresSocket
+    };
   }
-}
-const withResolvers = () => {
-  let _resolve;
-  const promise = new Promise(resolve => {
-    _resolve = resolve;
-  });
   return {
-    resolve: _resolve,
-    promise
+    ipc: args[0],
+    message: args[1],
+    execute: args[2],
+    resolve: args[3],
+    preparePrettyError: args[4],
+    logError: args[5],
+    requiresSocket: args[6]
   };
 };
-const waitForFirstMessage = async port => {
+const handleJsonRpcMessage = async (...args) => {
+  const options = normalizeParams(args);
   const {
+    message,
+    ipc,
+    execute,
     resolve,
+    preparePrettyError,
+    logError,
+    requiresSocket
+  } = options;
+  if ('id' in message) {
+    if ('method' in message) {
+      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+      try {
+        ipc.send(response);
+      } catch (error) {
+        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        ipc.send(errorResponse);
+      }
+      return;
+    }
+    resolve(message.id, message);
+    return;
+  }
+  if ('method' in message) {
+    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+    return;
+  }
+  throw new JsonRpcError('unexpected message');
+};
+const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
+  const {
+    message,
     promise
-  } = withResolvers();
-  port.addEventListener('message', resolve, {
-    once: true
-  });
-  const event = await promise;
-  // @ts-ignore
-  return event.data;
+  } = create$2(method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
 };
-const listen$3 = async () => {
-  const parentIpcRaw = listen$4();
-  signal$3(parentIpcRaw);
-  const parentIpc = wrap$6(parentIpcRaw);
-  const firstMessage = await waitForFirstMessage(parentIpc);
-  if (firstMessage.method !== 'initialize') {
-    throw new IpcError('unexpected first message');
+const send = (transport, method, ...params) => {
+  const message = create$4(method, params);
+  transport.send(message);
+};
+const invoke = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, false);
+};
+const invokeAndTransfer = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, true);
+};
+
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new Error(`command not found ${command}`);
   }
-  const type = firstMessage.params[0];
-  if (type === 'message-port') {
-    parentIpc.send({
-      jsonrpc: '2.0',
-      id: firstMessage.id,
-      result: null
-    });
-    parentIpc.dispose();
-    const port = firstMessage.params[1];
-    return port;
+  return fn(...args);
+};
+
+const createRpc = ipc => {
+  const rpc = {
+    // @ts-ignore
+    ipc,
+    /**
+     * @deprecated
+     */
+    send(method, ...params) {
+      send(ipc, method, ...params);
+    },
+    invoke(method, ...params) {
+      return invoke(ipc, method, ...params);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeAndTransfer(ipc, method, ...params);
+    }
+  };
+  return rpc;
+};
+const requiresSocket = () => {
+  return false;
+};
+const preparePrettyError = error => {
+  return error;
+};
+const logError = () => {
+  // handled by renderer worker
+};
+const handleMessage = event => {
+  const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
+  const actualExecute = event?.target?.execute || execute;
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+};
+const handleIpc = ipc => {
+  if ('addEventListener' in ipc) {
+    ipc.addEventListener('message', handleMessage);
+  } else if ('on' in ipc) {
+    // deprecated
+    ipc.on('message', handleMessage);
   }
-  return globalThis;
 };
-class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
+const listen$1 = async (module, options) => {
+  const rawIpc = await module.listen(options);
+  if (module.signal) {
+    module.signal(rawIpc);
   }
-  getData(event) {
-    return getData$1(event);
+  const ipc = module.wrap(rawIpc);
+  return ipc;
+};
+const create = async ({
+  commandMap
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const ipc = await listen$1(IpcChildWithModuleWorkerAndMessagePort$1);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  return rpc;
+};
+const WebWorkerRpcClient = {
+  __proto__: null,
+  create
+};
+
+const None = 0;
+const Insertion = 1;
+const Deletion = 2;
+
+// Based on https://johnresig.com/projects/javascript-diff-algorithm/ by John Resig (License MIT)
+
+const makeDiffMap = (linesA, linesB) => {
+  const map = Object.create(null);
+  // pass one
+  const na = [];
+  for (const line of linesB) {
+    if (line in map) {
+      map[line].nc++;
+    } else {
+      map[line] = {
+        oc: 0,
+        nc: 1,
+        olno: -1
+      };
+    }
+    na.push(map[line]);
   }
-  send(message) {
-    this._rawIpc.postMessage(message);
+  // pass two
+  const oa = [];
+  for (const [i, line] of linesA.entries()) {
+    if (line in map) {
+      map[line].oc++;
+    } else {
+      map[line] = {
+        oc: 1,
+        nc: 0,
+        olno: 0
+      };
+    }
+    map[line].olno = i;
+    oa.push(map[line]);
   }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
+  return {
+    map,
+    oa,
+    na
+  };
+};
+
+// Based on https://johnresig.com/projects/javascript-diff-algorithm/ by John Resig (License MIT)
+
+const diff = (linesA, linesB) => {
+  // create hashmaps of which line corresponds to which indices
+  const {
+    oa,
+    na
+  } = makeDiffMap(linesA, linesB);
+
+  // pass 3
+  for (let i = 0; i < na.length; i++) {
+    const entry = na[i];
+    if (entry.nc === 1 && entry.oc === 1) {
+      na[i] = entry.olno;
+      oa[entry.olno] = i;
+    }
   }
-  dispose() {
-    if (this._rawIpc.close) {
-      this._rawIpc.close();
+
+  // pass 4
+  for (let i = 0; i < na.length - 1; i++) {
+    const j = na[i];
+    if (typeof j === 'number' && na[i + 1] === oa[j + 1]) {
+      oa[j + 1] = i + 1;
+      na[i + 1] = j + 1;
     }
   }
-  onClose(callback) {
-    // ignore
+
+  // pass 5
+  for (let i = na.length; i > 0; i--) {
+    const j = na[i];
+    if (typeof j === 'number' && na[i - 1] === oa[j - 1]) {
+      na[i - 1] = j - 1;
+      oa[j - 1] = i - 1;
+    }
   }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
+  const changesRight = [];
+  const changesLeft = [];
+  for (let i = 0; i < na.length; i++) {
+    const j = na[i];
+    if (typeof j === 'number') ; else {
+      changesRight.push({
+        type: Insertion,
+        index: i
+      });
+    }
   }
-}
-const wrap$5 = port => {
-  return new IpcChildWithModuleWorkerAndMessagePort(port);
-};
-const IpcChildWithModuleWorkerAndMessagePort$1 = {
-  __proto__: null,
-  listen: listen$3,
-  wrap: wrap$5
+  for (let i = 0; i < oa.length; i++) {
+    const j = oa[i];
+    if (typeof j === 'number') ; else {
+      changesLeft.push({
+        type: Deletion,
+        index: i
+      });
+    }
+  }
+  return {
+    changesLeft,
+    changesRight
+  };
 };
 
-const getModule = method => {
-  switch (method) {
-    case ModuleWorker:
-      return IpcChildWithModuleWorker$1;
-    case ModuleWorkerAndMessagePort:
-      return IpcChildWithModuleWorkerAndMessagePort$1;
-    default:
-      throw new Error('unexpected ipc type');
+const diffInline = (linesLeft, linesRight) => {
+  array(linesLeft);
+  array(linesRight);
+  const {
+    changesLeft,
+    changesRight
+  } = diff(linesLeft, linesRight);
+  const lengthLeft = linesLeft.length;
+  const lengthRight = linesRight.length;
+  const inlineDiffLinesLeft = [];
+  const inlineDiffLinesRight = [];
+  for (let i = 0; i < linesLeft.length; i++) {
+    inlineDiffLinesLeft.push(None);
+  }
+  for (let i = 0; i < linesRight.length; i++) {
+    inlineDiffLinesRight.push(None);
+  }
+  for (const change of changesLeft) {
+    inlineDiffLinesLeft[change.index] = change.type;
+  }
+  for (const change of changesRight) {
+    inlineDiffLinesRight[change.index] = change.type;
+  }
+  const merged = [];
+  let leftIndex = 0;
+  let rightIndex = 0;
+  while (leftIndex < lengthLeft && rightIndex < lengthRight) {
+    const left = inlineDiffLinesLeft[leftIndex];
+    const right = inlineDiffLinesRight[rightIndex];
+    if (left === right) {
+      merged.push({
+        leftIndex,
+        rightIndex,
+        type: None
+      });
+      leftIndex++;
+      rightIndex++;
+    } else if (left === Deletion) {
+      merged.push({
+        leftIndex,
+        rightIndex,
+        type: Deletion
+      });
+      leftIndex++;
+    } else if (leftIndex <= rightIndex) {
+      merged.push({
+        leftIndex,
+        rightIndex,
+        type: left
+      });
+      leftIndex++;
+    } else if (leftIndex > rightIndex) {
+      merged.push({
+        leftIndex,
+        rightIndex,
+        type: right
+      });
+      rightIndex++;
+    }
   }
+  while (leftIndex < lengthLeft) {
+    const left = inlineDiffLinesLeft[leftIndex];
+    merged.push({
+      leftIndex,
+      rightIndex: -1,
+      type: left
+    });
+    leftIndex++;
+  }
+  while (rightIndex < lengthRight) {
+    const right = inlineDiffLinesRight[rightIndex];
+    merged.push({
+      leftIndex: -1,
+      rightIndex,
+      type: right
+    });
+    rightIndex++;
+  }
+  return merged;
 };
 
-const listen$1 = async ({
-  method
-}) => {
-  const module = await getModule(method);
-  const rawIpc = await module.listen();
-  // @ts-ignore
-  if (module.signal) {
-    // @ts-ignore
-    module.signal(rawIpc);
-  }
-  const ipc = module.wrap(rawIpc);
-  return ipc;
+const commandMap = {
+  'Diff.diff': diff,
+  'Diff.diffInline': diffInline
 };
 
 const listen = async () => {
-  registerCommands(commandMap);
-  const ipc = await listen$1({
-    method: Auto()
+  await WebWorkerRpcClient.create({
+    commandMap: commandMap
   });
-  handleIpc(ipc);
 };
 
 const main = async () => {