@lvce-editor/server 0.0.26 → 0.0.27

package/static/{0895dce → eb65b4e}/packages/renderer-process/src/parts/Platform/Platform.js

@@ -55,9 +55,9 @@ export const state = {
   },
   getAssetDir() {
     // @ts-ignore
-    if (typeof '/0895dce' !== 'undefined') {
+    if (typeof '/eb65b4e' !== 'undefined') {
       // @ts-ignore
-      return '/0895dce'
+      return '/eb65b4e'
     }
     if (platform === 'electron') {
       return '../../../../..'

package/static/{0895dce → eb65b4e}/packages/renderer-process/src/parts/RendererWorker/RendererWorker.js

@@ -12,12 +12,26 @@ export const state = {
   ipc: undefined,
 }
 
-const handleMessageFromRendererWorker = (event) => {
+const handleMessageFromRendererWorker = async (event) => {
   const data = event.data
-  if (event.ports && event.ports.length > 0) {
-    Command.execute(...data, ...event.ports)
+  if (data.method && data.id) {
+    try {
+      const result = await Command.execute(data.method, ...data.params)
+      send({
+        jsonrpc: '2.0',
+        id: data.id,
+        result,
+      })
+      return
+    } catch (error) {
+      send({
+        jsonrpc: '2.0',
+        id: data.id,
+        error,
+      })
+    }
   } else {
-    Command.execute(...data)
+    console.info('unknown message', data)
   }
 }
 
@@ -55,32 +69,9 @@ export const dispose = () => {
 }
 
 export const send = (message) => {
-  if (!message[0]) {
-    console.warn('invalid message', message)
-    return
-  }
   state.ipc.send(message)
 }
 
 export const sendAndTransfer = (message, transfer) => {
   state.ipc.sendAndTransfer(message, transfer)
 }
-
-export const handleInvoke = async (callbackId, method, ...params) => {
-  let result
-  try {
-    result = await Command.execute(method, ...params)
-  } catch (error) {
-    send([
-      /* Callback.reject */ 67331,
-      /* callbackId */ callbackId,
-      /* error */ error,
-    ])
-    return
-  }
-  send([
-    /* Callback.resolve */ 67330,
-    /* callbackId */ callbackId,
-    /* result */ result,
-  ])
-}

package/static/{0895dce → eb65b4e}/packages/renderer-process/src/parts/Viewlet/ViewletExplorer.js

@@ -69,11 +69,9 @@ const getAllEntries = async (dataTransfer) => {
   return allEntries
 }
 
-const handleFocusIn = (event) => {
-  console.log('explorer focus in')
+const handleFocus = (event) => {
   Focus.setFocus('Explorer')
   const $Target = event.target
-  console.log($Target)
   if ($Target.className === 'InputBox') {
     return
   }
@@ -81,7 +79,6 @@ const handleFocusIn = (event) => {
   if (index < 0) {
     return
   }
-  console.log('focus index', { index })
   event.preventDefault()
   RendererWorker.send([
     /* Explorer.handleClick */ 'Explorer.focusIndex',
@@ -89,6 +86,10 @@ const handleFocusIn = (event) => {
   ])
 }
 
+const handleBlur = () => {
+  RendererWorker.send([/* Explorer.handleBlur */ 'Explorer.handleBlur'])
+}
+
 const handleDragOver = (event) => {
   const state = ActiveViewlet.getStateFromEvent(event)
   event.preventDefault()
@@ -105,12 +106,9 @@ const handleDragStart = (event) => {
 }
 
 const handleDrop = async (event) => {
-  console.log('DROP')
   const state = ActiveViewlet.getStateFromEvent(event)
   state.element.classList.remove('DropTarget')
   event.preventDefault()
-  console.log(event.dataTransfer.items)
-  console.log('FILES', event.dataTransfer.files)
   const allEntries = await getAllEntries(event.dataTransfer)
   const firstEntry = allEntries[0]
   if (!firstEntry) {
@@ -136,7 +134,6 @@ const handleDrop = async (event) => {
   // RendererWorker.send()
   // const content = await firstEntry.file.text()
   // console.log(event.dataTransfer)
-  console.log('ENTRIES', allEntries)
 
   // console.log(content)
 }
@@ -237,7 +234,8 @@ export const create = () => {
   $Viewlet.addEventListener('mouseleave', handleMouseLeave, { capture: true })
   $Viewlet.addEventListener('wheel', handleWheel, { passive: true })
   $Viewlet.addEventListener('drop', handleDrop)
-  $Viewlet.addEventListener('focusin', handleFocusIn)
+  $Viewlet.addEventListener('focus', handleFocus)
+  $Viewlet.addEventListener('blur', handleBlur)
   return {
     $Viewlet,
   }
@@ -282,7 +280,6 @@ const render$Row = ($Row, rowInfo) => {
       $Row.className = `TreeItem Icon${rowInfo.icon}`
       break
     default:
-      // console.log({ rowInfo })
       break
   }
 }
@@ -329,9 +326,7 @@ const render$Rows = ($Rows, rowInfos) => {
 export const handleError = (state, message) => {
   Assert.object(state)
   Assert.string(message)
-  console.log('HANDLE ERROR 2', { message })
   state.$Viewlet.textContent = message
-  console.log(state.$Viewlet)
 }
 
 export const updateDirents = (state, dirents) => {
@@ -345,15 +340,32 @@ export const setFocusedIndex = (state, oldIndex, newIndex) => {
   Assert.number(oldIndex)
   Assert.number(newIndex)
   const { $Viewlet } = state
-  if (oldIndex === -1) {
-    $Viewlet.classList.remove('FocusOutline')
+  switch (oldIndex) {
+    case -2:
+      break
+    case -1:
+      $Viewlet.classList.remove('FocusOutline')
+      break
+    default:
+      const $Dirent = $Viewlet.children[oldIndex]
+      if ($Dirent) {
+        $Dirent.classList.remove('FocusOutline')
+      }
+      break
   }
-  if (newIndex === -1) {
-    $Viewlet.classList.add('FocusOutline')
-    $Viewlet.focus()
-  } else {
-    const $Dirent = $Viewlet.children[newIndex]
-    $Dirent.focus()
+  switch (newIndex) {
+    case -2:
+      $Viewlet.classList.remove('FocusOutline')
+      break
+    case -1:
+      $Viewlet.classList.add('FocusOutline')
+      $Viewlet.focus()
+      break
+    default:
+      const $Dirent = $Viewlet.children[newIndex]
+      $Dirent.classList.add('FocusOutline')
+      $Viewlet.focus()
+      break
   }
 }
 
@@ -372,17 +384,29 @@ export const hoverIndex = (state, oldIndex, newIndex) => {
 }
 
 export const showCreateFileInputBox = (state, index) => {
+  const { $Viewlet } = state
   const $InputBox = InputBox.create()
-  const $Dirent = state.$Viewlet.children[index]
-  $Dirent.before($InputBox)
+  if (index === -1) {
+    $Viewlet.append($InputBox)
+  } else {
+    const $Dirent = $Viewlet.children[index]
+    $Dirent.before($InputBox)
+  }
   $InputBox.focus()
   Focus.setFocus('ExplorerCreateFile')
 }
 
 export const hideCreateFileInputBox = (state, index) => {
-  const $InputBox = state.$Viewlet.children[index]
-  $InputBox.remove()
-  return $InputBox.value
+  const { $Viewlet } = state
+  if (index === -1) {
+    const $InputBox = $Viewlet.lastChild
+    $InputBox.remove()
+    return $InputBox.value
+  } else {
+    const $InputBox = $Viewlet.children[index]
+    $InputBox.remove()
+    return $InputBox.value
+  }
 }
 
 export const showRenameInputBox = (state, index, name) => {

package/static/eb65b4e/packages/renderer-process/src/parts/WebWorker/WebWorker.js

@@ -0,0 +1,26 @@
+import * as WebWorkerWithMessagePort from './WebWorkerWithMessagePort.js'
+import * as WebWorkerWithModuleWorker from './WebWorkerWithModuleWorker.js'
+import * as WebWorkerWithReferencePort from './WebWorkerWithReferencePort.js'
+
+/* istanbul ignore file */
+const METHOD_MESSAGE_PORT = 1
+const METHOD_MODULE_WORKER = 2
+const METHOD_REFERENCE_PORT = 3
+
+/**
+ * @type {number}
+ */
+const METHOD_PREFERRED = METHOD_MESSAGE_PORT
+
+export const create = async (url) => {
+  switch (METHOD_PREFERRED) {
+    case METHOD_MODULE_WORKER:
+      return WebWorkerWithModuleWorker.create(url)
+    case METHOD_MESSAGE_PORT:
+      return WebWorkerWithMessagePort.create(url)
+    case METHOD_REFERENCE_PORT:
+      return WebWorkerWithReferencePort.create(url)
+    default:
+      throw new Error('unknown method')
+  }
+}

package/static/eb65b4e/packages/renderer-process/src/parts/WebWorker/WebWorkerWithMessagePort.js

@@ -0,0 +1,8 @@
+export const create = async (url) => {
+  const port = await new Promise((resolve) => {
+    globalThis.acceptPort = resolve
+    import(url)
+  })
+  delete globalThis.acceptPort
+  return port
+}

package/static/eb65b4e/packages/renderer-process/src/parts/WebWorker/WebWorkerWithModuleWorker.js

@@ -0,0 +1,5 @@
+export const create = (url) => {
+  return new Worker(url, {
+    type: 'module',
+  })
+}

package/static/eb65b4e/packages/renderer-process/src/parts/WebWorker/WebWorkerWithReferencePort.js

@@ -0,0 +1,8 @@
+export const create = async (url) => {
+  const referencePort = await new Promise((resolve) => {
+    globalThis.acceptReferencePort = resolve
+    import(url)
+  })
+  delete globalThis.acceptReferencePort
+  return referencePort
+}

package/static/{0895dce → eb65b4e}/packages/renderer-process/src/rendererProcessMain.js

@@ -8,7 +8,6 @@ import * as M7 from '../src/parts/KeyBindings/KeyBindings.ipc.js'
 import * as M9 from '../src/parts/GlobalEventBus/GlobalEventBus.js'
 import * as M14 from '../src/parts/Widget/Widget.js'
 import * as M15 from '../src/parts/LocalStorage/LocalStorage.ipc.js'
-import * as M17 from '../src/parts/RendererWorker/RendererWorker.ipc.js'
 import * as M18 from '../src/parts/Platform/Platform.js'
 import * as M22 from '../src/parts/ServiceWorker/ServiceWorker.ipc.js'
 import * as M26 from '../src/parts/Location/Location.ipc.js'
@@ -32,7 +31,6 @@ globalThis.M = [
   M13,
   M14,
   M15,
-  M17,
   M18,
   M22,
   M26,