@lvce-editor/static-server 0.99.17 → 0.99.19

package/static/{9ce9057 → 70d63c1}/extensions/builtin.language-basics-typescript/src/tokenizeTypeScript.js

@@ -93,6 +93,8 @@ export const TokenType = {
   Text: 23,
   KeywordThis: 24,
   KeywordAwait: 25,
+  PunctuationTag: 228,
+  TagName: 118,
 }
 
 export const TokenMap = {
@@ -124,6 +126,8 @@ export const TokenMap = {
   [TokenType.Text]: 'Text',
   [TokenType.KeywordThis]: 'KeywordThis',
   [TokenType.KeywordAwait]: 'KeywordAwait',
+  [TokenType.PunctuationTag]: 'PunctuationTag',
+  [TokenType.TagName]: 'TagName',
 }
 
 export const initialLineState = {
@@ -195,6 +199,7 @@ const RE_COMMA = /^\,/
 const RE_DOT = /^\./
 const RE_SQUARE_OPEN = /^\[/
 const RE_SQUARE_CLOSE = /^\]/
+const RE_BINDING_PATTERN_END = /[\]\}]\s*$/
 const RE_QUESTION_MARK = /^\?/
 const RE_EXCLAMATION_MARK = /^\!/
 const RE_STAR = /^\*/
@@ -2445,6 +2450,11 @@ export const tokenizeLine = (line, lineState) => {
     tokens.push(token, tokenLength)
   }
   if (
+    state === State.AfterKeywordVariableDeclaration &&
+    RE_BINDING_PATTERN_END.test(line)
+  ) {
+    state = State.TopLevelContent
+  } else if (
     state === State.AfterType &&
     (stack.includes(State.InsideClass) ||
       stack.includes(State.InsideTypeObject))

package/static/70d63c1/extensions/builtin.language-basics-typescript/src/tokenizeTypeScriptReact.js

@@ -0,0 +1,230 @@
+import {
+  initialLineState as initialTypeScriptLineState,
+  TokenType,
+  tokenizeLine as tokenizeTypeScriptLine,
+} from './tokenizeTypeScript.js'
+
+export * from './tokenizeTypeScript.js'
+
+export const initialLineState = {
+  ...initialTypeScriptLineState,
+  insideJsxTag: false,
+  jsxElementDepth: 0,
+}
+
+const RE_JSX_TAG = /<\/?([A-Za-z_$][\w$-]*(?:[.:][A-Za-z_$][\w$-]*)*)/g
+const RE_JSX_FRAGMENT = /<\/?>(?!>)/g
+const RE_TYPE_PARAMETER_SUFFIX = /^\s*(?:,|=|extends\b)/
+
+const getTokenTypeAtOffset = (tokens, offset) => {
+  let tokenOffset = 0
+  for (let index = 0; index < tokens.length; index += 2) {
+    const tokenType = tokens[index]
+    const tokenEnd = tokenOffset + tokens[index + 1]
+    if (offset < tokenEnd) {
+      return tokenType
+    }
+    tokenOffset = tokenEnd
+  }
+  return TokenType.None
+}
+
+const isLikelyJsxTag = (line, match, tokens, jsxElementDepth) => {
+  const openingOffset = match.index
+  if (getTokenTypeAtOffset(tokens, openingOffset) !== TokenType.Punctuation) {
+    return false
+  }
+  if (match[0][1] === '/') {
+    return true
+  }
+  const tagName = match[1]
+  const suffix = line.slice(openingOffset + match[0].length)
+  if (RE_TYPE_PARAMETER_SUFFIX.test(suffix)) {
+    return false
+  }
+  const previousCharacter = line[openingOffset - 1] || ''
+  if (/[$\w\])]/.test(previousCharacter) && jsxElementDepth === 0) {
+    return false
+  }
+  if (/^>\s*\(/.test(suffix)) {
+    return false
+  }
+  return true
+}
+
+const findTagEnd = (line, startOffset) => {
+  let braceDepth = 0
+  let quote = ''
+  for (let index = startOffset; index < line.length; index++) {
+    const character = line[index]
+    if (quote) {
+      if (character === '\\') {
+        index++
+      } else if (character === quote) {
+        quote = ''
+      }
+      continue
+    }
+    if (character === '"' || character === "'") {
+      quote = character
+    } else if (character === '{') {
+      braceDepth++
+    } else if (character === '}') {
+      braceDepth = Math.max(0, braceDepth - 1)
+    } else if (character === '>' && braceDepth === 0) {
+      const isSelfClosing = line[index - 1] === '/'
+      return {
+        end: index + 1,
+        start: isSelfClosing ? index - 1 : index,
+      }
+    }
+  }
+  return undefined
+}
+
+const getJsxTagRanges = (
+  line,
+  tokens,
+  wasInsideJsxTag,
+  previousJsxElementDepth
+) => {
+  const ranges = []
+  let insideJsxTag = wasInsideJsxTag
+  let jsxElementDepth = previousJsxElementDepth
+  let searchOffset = 0
+
+  if (insideJsxTag) {
+    const tagEnd = findTagEnd(line, 0)
+    if (!tagEnd) {
+      return { insideJsxTag, jsxElementDepth, ranges }
+    }
+    ranges.push({
+      end: tagEnd.end,
+      start: tagEnd.start,
+      tokenType: TokenType.PunctuationTag,
+    })
+    if (line.slice(tagEnd.start, tagEnd.end) === '/>') {
+      jsxElementDepth = Math.max(0, jsxElementDepth - 1)
+    }
+    insideJsxTag = false
+    searchOffset = tagEnd.end
+  }
+
+  RE_JSX_TAG.lastIndex = searchOffset
+  let match
+  while ((match = RE_JSX_TAG.exec(line))) {
+    if (!isLikelyJsxTag(line, match, tokens, jsxElementDepth)) {
+      continue
+    }
+    const openingOffset = match.index
+    const tagNameOffset = openingOffset + (match[0][1] === '/' ? 2 : 1)
+    ranges.push({
+      end: tagNameOffset,
+      start: openingOffset,
+      tokenType: TokenType.PunctuationTag,
+    })
+    ranges.push({
+      end: tagNameOffset + match[1].length,
+      start: tagNameOffset,
+      tokenType: TokenType.TagName,
+    })
+    const isClosingTag = match[0][1] === '/'
+    if (isClosingTag) {
+      jsxElementDepth = Math.max(0, jsxElementDepth - 1)
+    } else {
+      jsxElementDepth++
+    }
+    const tagEnd = findTagEnd(line, RE_JSX_TAG.lastIndex)
+    if (!tagEnd) {
+      insideJsxTag = true
+      break
+    }
+    ranges.push({
+      end: tagEnd.end,
+      start: tagEnd.start,
+      tokenType: TokenType.PunctuationTag,
+    })
+    if (!isClosingTag && line.slice(tagEnd.start, tagEnd.end) === '/>') {
+      jsxElementDepth--
+    }
+    RE_JSX_TAG.lastIndex = tagEnd.end
+  }
+
+  RE_JSX_FRAGMENT.lastIndex = 0
+  while ((match = RE_JSX_FRAGMENT.exec(line))) {
+    if (getTokenTypeAtOffset(tokens, match.index) === TokenType.Punctuation) {
+      ranges.push({
+        end: match.index + match[0].length,
+        start: match.index,
+        tokenType: TokenType.PunctuationTag,
+      })
+    }
+  }
+
+  ranges.sort((rangeA, rangeB) => rangeA.start - rangeB.start)
+  return { insideJsxTag, jsxElementDepth, ranges }
+}
+
+const applyTokenRanges = (tokens, ranges) => {
+  if (ranges.length === 0) {
+    return tokens
+  }
+  const boundaries = new Set([0])
+  const tokenSegments = []
+  let offset = 0
+  for (let index = 0; index < tokens.length; index += 2) {
+    const end = offset + tokens[index + 1]
+    tokenSegments.push({ end, start: offset, tokenType: tokens[index] })
+    boundaries.add(end)
+    offset = end
+  }
+  for (const range of ranges) {
+    boundaries.add(range.start)
+    boundaries.add(range.end)
+  }
+
+  const sortedBoundaries = [...boundaries].toSorted((a, b) => a - b)
+  const highlightedTokens = []
+  let rangeIndex = 0
+  let segmentIndex = 0
+  let previousKey = ''
+  for (let index = 0; index < sortedBoundaries.length - 1; index++) {
+    const start = sortedBoundaries[index]
+    const end = sortedBoundaries[index + 1]
+    while (ranges[rangeIndex] && ranges[rangeIndex].end <= start) {
+      rangeIndex++
+    }
+    while (tokenSegments[segmentIndex].end <= start) {
+      segmentIndex++
+    }
+    const range = ranges[rangeIndex]
+    const isHighlighted = range && range.start <= start && end <= range.end
+    const key = isHighlighted ? `range-${rangeIndex}` : `token-${segmentIndex}`
+    const tokenType = isHighlighted
+      ? range.tokenType
+      : tokenSegments[segmentIndex].tokenType
+    if (key === previousKey) {
+      highlightedTokens[highlightedTokens.length - 1] += end - start
+    } else {
+      highlightedTokens.push(tokenType, end - start)
+      previousKey = key
+    }
+  }
+  return highlightedTokens
+}
+
+export const tokenizeLine = (line, lineState) => {
+  const result = tokenizeTypeScriptLine(line, lineState)
+  const { insideJsxTag, jsxElementDepth, ranges } = getJsxTagRanges(
+    line,
+    result.tokens,
+    lineState.insideJsxTag || false,
+    lineState.jsxElementDepth || 0
+  )
+  return {
+    ...result,
+    insideJsxTag,
+    jsxElementDepth,
+    tokens: applyTokenRanges(result.tokens, ranges),
+  }
+}

package/static/{9ce9057 → 70d63c1}/manifest.json

@@ -11,13 +11,13 @@
   "display_override": ["window-controls-overlay", "minimal-ui"],
   "icons": [
     {
-      "src": "/9ce9057/icons/pwa-icon-192.png",
+      "src": "/70d63c1/icons/pwa-icon-192.png",
       "type": "image/png",
       "sizes": "192x192",
       "purpose": "any maskable"
     },
     {
-      "src": "/9ce9057/icons/pwa-icon-512.png",
+      "src": "/70d63c1/icons/pwa-icon-512.png",
       "type": "image/png",
       "sizes": "512x512",
       "purpose": "any maskable"

package/static/{9ce9057 → 70d63c1}/packages/editor-worker/dist/editorWorkerMain.js

@@ -67,7 +67,7 @@ const String$1 = 4;
 const Boolean$1 = 5;
 const Function$1 = 6;
 const Null = 7;
-const Unknown$2 = 8;
+const Unknown$3 = 8;
 const getType = value => {
   switch (typeof value) {
     case 'number':
@@ -87,7 +87,7 @@ const getType = value => {
     case 'boolean':
       return Boolean$1;
     default:
-      return Unknown$2;
+      return Unknown$3;
   }
 };
 const object = value => {
@@ -2090,6 +2090,7 @@ const InsertLineBreak = 'insertLineBreak';
 const LineComment = 'lineComment';
 const Rename = 'rename';
 const ToggleBlockComment$1 = 'toggleBlockComment';
+const Unknown$2 = 'unknown';
 
 const map$1 = Object.create(null);
 const set$7 = (id, widget) => {
@@ -12246,6 +12247,9 @@ const applyTabCompletion = (editor, result) => {
 };
 
 const handleTab = async editor => {
+  if (!isEverySelectionEmpty(editor.selections)) {
+    return indentMore(editor);
+  }
   const result = await getTabCompletion(editor);
   if (!result) {
     // TODO enter tab or two spaces
@@ -12601,59 +12605,75 @@ const loadContent = async (state, savedState) => {
   return newEditor5;
 };
 
-// TODO move cursor
-// TODO multiple cursors -> VS Code removes multiple cursors
-// TODO with selection -> VS Code moves whole selection
+const getSelectedLineRange = (selections, primarySelectionIndex) => {
+  const [startRowIndex,, selectionEndRowIndex, endColumnIndex] = getSelectionPairs(selections, primarySelectionIndex);
+  const endRowIndex = startRowIndex < selectionEndRowIndex && endColumnIndex === 0 ? selectionEndRowIndex - 1 : selectionEndRowIndex;
+  return {
+    endRowIndex,
+    startRowIndex
+  };
+};
+const movePositionDown = (lines, rowIndex, columnIndex) => {
+  const newRowIndex = rowIndex + 1;
+  if (newRowIndex < lines.length) {
+    return [newRowIndex, columnIndex];
+  }
+  const lastRowIndex = lines.length - 1;
+  return [lastRowIndex, lines[rowIndex - 1].length];
+};
+const getSelectionChanges = (lines, selections, primarySelectionIndex, direction) => {
+  const startRowIndex = selections[primarySelectionIndex];
+  const startColumnIndex = selections[primarySelectionIndex + 1];
+  const endRowIndex = selections[primarySelectionIndex + 2];
+  const endColumnIndex = selections[primarySelectionIndex + 3];
+  if (direction < 0) {
+    return new Uint32Array([startRowIndex - 1, startColumnIndex, endRowIndex - 1, endColumnIndex]);
+  }
+  const [newStartRowIndex, newStartColumnIndex] = movePositionDown(lines, startRowIndex, startColumnIndex);
+  const [newEndRowIndex, newEndColumnIndex] = movePositionDown(lines, endRowIndex, endColumnIndex);
+  return new Uint32Array([newStartRowIndex, newStartColumnIndex, newEndRowIndex, newEndColumnIndex]);
+};
+const moveLines = (editor, direction) => {
+  const {
+    lines,
+    primarySelectionIndex = 0,
+    selections
+  } = editor;
+  const {
+    endRowIndex,
+    startRowIndex
+  } = getSelectedLineRange(selections, primarySelectionIndex);
+  const lastRowIndex = lines.length - 1;
+  if (direction < 0 && startRowIndex === 0 || direction > 0 && endRowIndex === lastRowIndex) {
+    return editor;
+  }
+  const editStartRowIndex = direction < 0 ? startRowIndex - 1 : startRowIndex;
+  const editEndRowIndex = direction < 0 ? endRowIndex : endRowIndex + 1;
+  const selectedLines = lines.slice(startRowIndex, endRowIndex + 1);
+  const inserted = direction < 0 ? [...selectedLines, lines[startRowIndex - 1]] : [lines[endRowIndex + 1], ...selectedLines];
+  const changes = [{
+    deleted: lines.slice(editStartRowIndex, editEndRowIndex + 1),
+    end: {
+      columnIndex: lines[editEndRowIndex].length,
+      rowIndex: editEndRowIndex
+    },
+    inserted,
+    origin: Unknown$2,
+    start: {
+      columnIndex: 0,
+      rowIndex: editStartRowIndex
+    }
+  }];
+  const selectionChanges = getSelectionChanges(lines, selections, primarySelectionIndex, direction);
+  return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
+};
+
 const moveLineDown = editor => {
-  // const rowIndex = editor.cursor.rowIndex
-  // if (rowIndex === editor.lines.length - 1) {
-  //   return
-  // }
-  // const documentEdits = [
-  //   {
-  //     type: /* splice */ 2,
-  //     rowIndex: rowIndex,
-  //     count: 2,
-  //     newLines: [TextDocument.getLine(editor.textDocument, rowIndex + 1), TextDocument.getLine(editor.textDocument, rowIndex)],
-  //   },
-  // ]
-  // // @ts-ignore
-  // const cursorEdits = Editor.moveCursors(editor, (editor, cursor) => {
-  //   return {
-  //     rowIndex: cursor.rowIndex + 1,
-  //     columnIndex: cursor.columnIndex,
-  //   }
-  // })
-  // @ts-ignore
-  // Editor.scheduleDocumentAndCursors(editor, documentEdits, cursorEdits)
-  return editor;
+  return moveLines(editor, 1);
 };
 
-// TODO handle multiple cursors
 const moveLineUp = editor => {
-  // const rowIndex = editor.cursor.rowIndex
-  // if (rowIndex === 0) {
-  //   return
-  // }
-  // const documentEdits = [
-  //   {
-  //     type: /* splice */ 2,
-  //     rowIndex: rowIndex - 1,
-  //     count: 2,
-  //     newLines: [TextDocument.getLine(editor.textDocument, rowIndex), TextDocument.getLine(editor.textDocument, rowIndex - 1)],
-  //   },
-  // ]
-  // // @ts-ignore
-  // const cursorEdits = Editor.moveCursors(editor, (editor, cursor) => {
-  //   return {
-  //     // TODO handle bottom 0
-  //     rowIndex: cursor.rowIndex - 1,
-  //     columnIndex: cursor.columnIndex,
-  //   }
-  // })
-  // // @ts-ignore
-  // Editor.scheduleDocumentAndCursors(editor, documentEdits, cursorEdits)
-  return editor;
+  return moveLines(editor, -1);
 };
 
 /**

package/static/{9ce9057 → 70d63c1}/packages/extension-detail-view-worker/dist/extensionDetailViewWorkerMain.js

@@ -217,7 +217,7 @@ const contentSecurityPolicy = () => {
 const elements = () => {
   return i18nString(Elements);
 };
-const uninstall = () => {
+const uninstall$1 = () => {
   return i18nString(Uninstall$1);
 };
 const unableToLoadExtension = () => {
@@ -2794,6 +2794,9 @@ const disable2 = (id, platform) => {
 const getLanguages = (platform, assetDir) => {
   return invoke$4('Extensions.getLanguages', platform, assetDir);
 };
+const uninstall = id => {
+  return invoke$4(`Extensions.uninstall`, id);
+};
 
 const {
   invoke: invoke$3,
@@ -2876,15 +2879,15 @@ const getPreference = async key => {
 const getAllExtensions$1 = async () => {
   return invoke$1('ExtensionManagement.getAllExtensions');
 };
+const showErrorDialog = async errorInfo => {
+  await invoke$1('ErrorHandling.showErrorDialog', errorInfo);
+};
 const getExtension$2 = async id => {
   return invoke$1('ExtensionManagement.getExtension', id);
 };
 const openNativeFolder = async uri => {
   await invoke$1('OpenNativeFolder.openNativeFolder', uri);
 };
-const uninstallExtension = async id => {
-  return invoke$1('ExtensionManagement.uninstall', id);
-};
 const openExtensionSearch$1 = async () => {
   return invoke$1('SideBar.openViewlet', 'Extensions');
 };
@@ -4331,7 +4334,7 @@ const getExtensionDetailButtons = (hasColorTheme, isBuiltin, isDisabled, extensi
     onClick: HandleClickDisable
   }, {
     enabled: !isBuiltin,
-    label: uninstall(),
+    label: uninstall$1(),
     name: Uninstall,
     onClick: HandleClickUninstall
   }];
@@ -4489,6 +4492,10 @@ const handleClickSize = async state => {
   return state;
 };
 
+const uninstallExtension = async id => {
+  await uninstall(id);
+};
+
 const handleClickUninstall = async state => {
   const {
     extension
@@ -4496,8 +4503,16 @@ const handleClickUninstall = async state => {
   const {
     id
   } = extension;
-  await uninstallExtension(id);
-  return state;
+  try {
+    await uninstallExtension(id);
+    return {
+      ...state,
+      buttons: []
+    };
+  } catch (error) {
+    await showErrorDialog(error);
+    return state;
+  }
 };
 
 const handleColorThemeChanged = (state, colorThemeId) => {

package/static/{9ce9057 → 70d63c1}/packages/extension-management-worker/dist/extensionManagementWorkerMain.js

@@ -1478,6 +1478,17 @@ const addExtension$1 = extension => {
     webExtensions: [...state$1.extensionsState.webExtensions, extension]
   });
 };
+const removeWebExtension = id => {
+  const webExtensions = state$1.extensionsState.webExtensions.filter(extension => extension.id !== id);
+  if (webExtensions.length === state$1.extensionsState.webExtensions.length) {
+    return false;
+  }
+  update({
+    cachedExtensions: undefined,
+    webExtensions
+  });
+  return true;
+};
 const clearCachedExtensions = () => {
   update({
     cachedExtensions: undefined
@@ -1966,7 +1977,7 @@ const validateExternalConnectSource = (source, applicationOrigin) => {
   try {
     url = new URL(source);
   } catch {
-    throw new Error(`isolated extension connect source must be an absolute URL: ${source}`);
+    throw new Error(`isolated extension connect source must be an absolute URL. Invalid value: ${JSON.stringify(source)}`);
   }
   if (!['http:', 'https:', 'ws:', 'wss:'].includes(url.protocol) || !url.hostname || url.username || url.password) {
     throw new Error(`invalid isolated extension connect source ${source}`);
@@ -3028,14 +3039,21 @@ const executeExtensionDiagnosticProvider = async (rpc, extension, textDocument,
   }
   return executeRpcDiagnosticProvider(rpc, textDocument, args);
 };
+const executeMatchingDiagnosticProvider = async (extension, textDocument, args, assetDir, platform) => {
+  try {
+    const rpc = await getRpc$1(extension, assetDir, platform);
+    return await executeExtensionDiagnosticProvider(rpc, extension, textDocument, args);
+  } catch {
+    return [];
+  }
+};
 const executeDiagnosticProvider = async (extensionsState, textDocument, ...args) => {
   const {
     assetDir,
     platform
   } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions$5(extensionsState, textDocument, assetDir, platform);
-  const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
-  const results = await Promise.all(rpcs.map((rpc, index) => executeExtensionDiagnosticProvider(rpc, extensions[index], textDocument, args)));
+  const results = await Promise.all(extensions.map(extension => executeMatchingDiagnosticProvider(extension, textDocument, args, assetDir, platform)));
   return results.flat();
 };
 
@@ -4342,8 +4360,12 @@ const showQuickPick = async options => {
   return invoke$3('ExtensionHostQuickPick.showQuickPick', options);
 };
 
-const uninstallExtension = async () => {
-  // TODO
+const uninstallExtension = async id => {
+  const removedWebExtension = removeWebExtension(id);
+  if (!removedWebExtension) {
+    await invoke$2('ExtensionManagement.uninstall', id);
+  }
+  await disposeIsolatedExtensionHostWorker(id);
   await invalidateExtensionsCache();
 };
 

package/static/{9ce9057 → 70d63c1}/packages/extension-search-view-worker/dist/extensionSearchViewWorkerMain.js

@@ -1378,6 +1378,9 @@ const {
 const disableWorkspace$2 = id => {
   return invoke$1('Extensions.disableWorkspace', id);
 };
+const uninstall$2 = id => {
+  return invoke$1(`Extensions.uninstall`, id);
+};
 
 const {
   invoke,
@@ -1418,9 +1421,6 @@ const openUri$1 = async (uri, focus, options) => {
 const showErrorDialog = async errorInfo => {
   await invoke('ErrorHandling.showErrorDialog', errorInfo);
 };
-const uninstallExtension = async id => {
-  return invoke('ExtensionManagement.uninstall', id);
-};
 const installExtension = async id => {
   return invoke('ExtensionManagement.install', id);
 };
@@ -3958,7 +3958,7 @@ const handleSettingsButtonClick = async (state, index) => {
 
 const handleUninstall = async (state, id) => {
   try {
-    await uninstallExtension(id);
+    await uninstall$2(id);
     return setExtensionStatus(state, id, NotInstalled);
   } catch (error) {
     await showErrorDialog(error);
@@ -4127,6 +4127,7 @@ const getCss = state => {
 }
 
 .ExtensionListItem {
+  box-sizing: border-box;
   position: relative !important;
   flex-shrink: 0;
 }

package/static/{9ce9057 → 70d63c1}/packages/renderer-process/dist/rendererProcessMain.js

@@ -3578,7 +3578,7 @@ const getAssetDir = () => {
   }
   return '';
 };
-const assetDir = '/9ce9057';
+const assetDir = '/70d63c1';
 
 const getConfiguredWorkerUrl = key => {
   if (typeof location === 'undefined' || typeof document === 'undefined') {
@@ -9645,6 +9645,15 @@ const startWebRtcAudioStream = async options => {
   dc.addEventListener('message', e => {
     port.postMessage(e.data);
   });
+  port.onmessage = event => {
+    const {
+      data
+    } = event;
+    if (dc.readyState !== 'open') {
+      return;
+    }
+    dc.send(data);
+  };
 
   // 3. Standard WebRTC offer/answer handshake against the Realtime API.
   const offer = await pc.createOffer();
@@ -9652,10 +9661,12 @@ const startWebRtcAudioStream = async options => {
   pcs[uid] = {
     audioCtx,
     connection: pc,
+    dataChannel: dc,
     micAnalyzer,
     micStream,
     port,
-    remoteAnalyzer: remoteAnalyzerInstance
+    remoteAnalyzer: remoteAnalyzerInstance,
+    remoteAudio
   };
   return offer.sdp;
 };
@@ -9679,10 +9690,7 @@ const setRemoteDescription = async options => {
 };
 
 // TODO this has a race conditon when start/stop is pressed fast
-const stopWebRtcAudioStream = async options => {
-  const {
-    uid
-  } = options;
+const stopWebRtcAudioStream = async uid => {
   const pc = pcs[uid];
   if (!pc) {
     return;
@@ -9691,15 +9699,20 @@ const stopWebRtcAudioStream = async options => {
   const {
     audioCtx,
     connection,
+    dataChannel,
     micStream,
-    port
+    port,
+    remoteAudio
   } = pc;
   delete pcs[uid];
+  connection.ontrack = null;
   connection.close();
+  dataChannel.close();
   for (const t of micStream.getTracks()) {
     t.stop();
   }
   port.close();
+  remoteAudio.srcObject = null;
   if (audioCtx) {
     await audioCtx.close();
   }