@lvce-editor/output-view 1.11.0 → 1.13.0

package/dist/outputViewWorkerMain.js

@@ -879,7 +879,7 @@ const send = (transport, method, ...params) => {
   const message = create$4$1(method, params);
   transport.send(message);
 };
-const invoke$1 = (ipc, method, ...params) => {
+const invoke$2 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -918,7 +918,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
+      return invoke$2(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -1106,7 +1106,8 @@ const {
   get: get$1,
   set: set$4,
   wrapCommand,
-  wrapGetter
+  wrapGetter,
+  getKeys
 } = create$2();
 
 const create$1 = (id, uri, x, y, width, height, platform, parentId) => {
@@ -1136,7 +1137,8 @@ const create$1 = (id, uri, x, y, width, height, platform, parentId) => {
     errorCode: 0,
     buttons: [],
     filteredItems: [],
-    platform
+    platform,
+    watchId: 0
   };
   set$4(id, state, state);
 };
@@ -1331,9 +1333,59 @@ const create = rpcId => {
     }
   };
 };
+const DebugWorker$1 = 55;
+const EditorWorker$1 = 99;
 const ExtensionHostWorker = 44;
+const MainProcess$1 = -5;
 const RendererWorker$1 = 1;
+const RendererProcess$1 = 1670;
+const SearchProcess$1 = 77;
+const SearchProcessElectron = 2;
+const SharedProcess$1 = 1;
+const SourceControlWorker = 66;
+const EmbedsProcess$1 = 207;
+const EmbedsWorker = 208;
 const FileSystemWorker$1 = 209;
+const FileSystemProcess$1 = 210;
+const MarkdownWorker$1 = 300;
+const CompletionWorker = 301;
+const ColorPickerWorker = 302;
+const SourceActionWorker = 303;
+const ErrorWorker$1 = 3308;
+const SyntaxHighlightingWorker$1 = 3309;
+const ClipBoardWorker$1 = 3400;
+const ClipBoardProcess$1 = 3401;
+const ExtensionDetailWorker = 3402;
+const ProblemsWorker = 3403;
+const OutputWorker = 7001;
+const RpcId = {
+  __proto__: null,
+  ClipBoardProcess: ClipBoardProcess$1,
+  ClipBoardWorker: ClipBoardWorker$1,
+  ColorPickerWorker,
+  CompletionWorker,
+  DebugWorker: DebugWorker$1,
+  EditorWorker: EditorWorker$1,
+  EmbedsProcess: EmbedsProcess$1,
+  EmbedsWorker,
+  ErrorWorker: ErrorWorker$1,
+  ExtensionDetailWorker,
+  ExtensionHostWorker,
+  FileSystemProcess: FileSystemProcess$1,
+  FileSystemWorker: FileSystemWorker$1,
+  MainProcess: MainProcess$1,
+  MarkdownWorker: MarkdownWorker$1,
+  OutputWorker,
+  ProblemsWorker,
+  RendererProcess: RendererProcess$1,
+  RendererWorker: RendererWorker$1,
+  SearchProcess: SearchProcess$1,
+  SearchProcessElectron,
+  SharedProcess: SharedProcess$1,
+  SourceActionWorker,
+  SourceControlWorker,
+  SyntaxHighlightingWorker: SyntaxHighlightingWorker$1
+};
 const {
   invoke: invoke$9,
   set: set$9} = create(ExtensionHostWorker);
@@ -1439,6 +1491,7 @@ const activateByEvent$1 = event => {
 const RendererWorker = {
   __proto__: null,
   activateByEvent: activateByEvent$1,
+  invoke: invoke$3,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
   sendMessagePortToFileSystemWorker: sendMessagePortToFileSystemWorker$2,
   set: set$3};
@@ -1563,6 +1616,49 @@ const handleFilterInput = async (state, value) => {
   };
 };
 
+const createWatchId = () => {
+  const watchId = Math.random();
+  return watchId;
+};
+
+const {
+  invoke: invoke$1,
+  sendMessagePortToExtensionHostWorker,
+  sendMessagePortToFileSystemWorker: sendMessagePortToFileSystemWorker$1,
+  set: set$1,
+  activateByEvent
+} = RendererWorker;
+
+const handleFileChange = async watchId => {
+  const keys = getKeys();
+  for (const key of keys) {
+    const instance = get$1(key);
+    if (instance.newState.watchId === watchId) {
+      // @ts-ignore
+      await invoke$1('Output.refresh');
+    }
+  }
+};
+
+const watchCallbacks = Object.create(null);
+const registerWatchCallback = (id, fn) => {
+  watchCallbacks[id] = fn;
+};
+const executeWatchCallBack = id => {
+  watchCallbacks[id](id);
+};
+
+const setupChangeListener = async (watchId, uri) => {
+  try {
+    const rpcId = RpcId.OutputWorker;
+    registerWatchCallback(watchId, handleFileChange);
+    // @ts-ignore
+    await FileSystemWorker.invoke(/* OutputChannel.open */'FileSystem.watchFile', watchId, /* path */uri, rpcId);
+  } catch {
+    // ignore
+  }
+};
+
 const selectChannel = async (state, id) => {
   const {
     options,
@@ -1578,6 +1674,10 @@ const selectChannel = async (state, id) => {
     error,
     code
   } = await loadLines(matchingOption.uri);
+
+  // TODO memory leak and race condition, need to dispose file watcher of previous uri
+  const watchId = createWatchId();
+  await setupChangeListener(watchId, matchingOption.uri);
   const filteredItems = filterItems(lines, filterValue);
   return {
     ...state,
@@ -1585,7 +1685,8 @@ const selectChannel = async (state, id) => {
     errorCode: code,
     listItems: lines,
     filteredItems,
-    selectedOption: id
+    selectedOption: id,
+    watchId
   };
 };
 
@@ -1593,13 +1694,6 @@ const handleSelect = async (state, id) => {
   return selectChannel(state, id);
 };
 
-const {
-  sendMessagePortToExtensionHostWorker,
-  sendMessagePortToFileSystemWorker: sendMessagePortToFileSystemWorker$1,
-  set: set$1,
-  activateByEvent
-} = RendererWorker;
-
 const sendMessagePortToExtensionHostWorker2 = async port => {
   await sendMessagePortToExtensionHostWorker(port);
 };
@@ -1626,7 +1720,7 @@ const initializeExtensionHost = async () => {
 };
 
 const sendMessagePortToFileSystemWorker = async port => {
-  await sendMessagePortToFileSystemWorker$1(port, 0);
+  await sendMessagePortToFileSystemWorker$1(port, RpcId.OutputWorker);
 };
 
 const createFileSystemWorkerRpc = async () => {
@@ -1710,28 +1804,6 @@ const loadOptions = async platform => {
   }, ...extensionOptions];
 };
 
-const watchCallbacks = Object.create(null);
-const registerWatchCallback = (id, fn) => {
-  watchCallbacks[id] = fn;
-};
-const executeWatchCallBack = id => {
-  watchCallbacks[id]();
-};
-
-const setupChangeListener = async uri => {
-  try {
-    const watchId = Math.random();
-    registerWatchCallback(watchId, () => {
-      // TODO
-      // console.log('channel changed')
-    });
-    // @ts-ignore
-    await FileSystemWorker.invoke(/* OutputChannel.open */'FileSystem.watchFile', watchId, /* path */uri);
-  } catch {
-    // ignore
-  }
-};
-
 const isString = value => {
   return typeof value === 'string';
 };
@@ -1763,7 +1835,8 @@ const loadContent = async (state, savedState) => {
     error,
     code
   } = await loadLines(uri);
-  await setupChangeListener(uri);
+  const watchId = createWatchId();
+  await setupChangeListener(watchId, uri);
   const buttons = loadButtons();
   return {
     ...state,
@@ -1775,7 +1848,8 @@ const loadContent = async (state, savedState) => {
     filteredItems: lines,
     options,
     selectedOption: selectedId,
-    buttons
+    buttons,
+    watchId
   };
 };
 
@@ -1855,6 +1929,31 @@ const getActions = state => {
   }];
 };
 
+const refresh = async state => {
+  const {
+    filterValue,
+    options,
+    selectedOption
+  } = state;
+  const matchingOption = options.find(option => option.id === selectedOption);
+  if (!matchingOption) {
+    return state;
+  }
+  const {
+    lines,
+    error,
+    code
+  } = await loadLines(matchingOption.uri);
+  const filteredItems = filterItems(lines, filterValue);
+  return {
+    ...state,
+    listItems: lines,
+    filteredItems,
+    error,
+    errorCode: code
+  };
+};
+
 const renderFilterValue = (oldState, newState) => {
   return ['Viewlet.setValueByName', Filter, newState.filterValue];
 };
@@ -2135,7 +2234,8 @@ const commandMap = {
   'Output.resize': resize,
   'Output.saveState': saveState,
   'Output.setOutputChannel': wrapCommand(setOutputChannel),
-  'Output.terminate': terminate
+  'Output.terminate': terminate,
+  'Output.refresh': wrapCommand(refresh)
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/output-view",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "Output View Worker",
   "repository": {
     "type": "git",