plugin: auto add IMs; drop name requirement

page/Fcitx5.d.ts

@@ -62,7 +62,7 @@ export interface FCITX {
   jsKeyToFcitxString: (event: KeyboardEvent) => string
   getMenuActions: () => MenuAction[]
   activateMenuAction: (id: number) => void
-  installPlugin: (name: string, buffer: ArrayBuffer) => void
+  installPlugin: (buffer: ArrayBuffer) => string
   getInstalledPlugins: () => string[]
   Module: EM_MODULE
 }

page/plugin.ts

@@ -6,13 +6,27 @@ function reload() {
   Module.ccall('reload', 'void', [], [])
 }
 
-export function installPlugin(name: string, buffer: ArrayBuffer) {
+const textDecoder = new TextDecoder()
+
+function addDefaultIMs(byteArray: Uint8Array) {
+  const inputMethods = (JSON.parse(textDecoder.decode(byteArray)).input_methods ?? []) as string[]
+  const currentInputMethods = window.fcitx.getInputMethods().map(im => im.name)
+  window.fcitx.setInputMethods([...currentInputMethods, ...inputMethods.filter(im => !currentInputMethods.includes(im))])
+}
+
+export function installPlugin(buffer: ArrayBuffer) {
   // UZIP hangs on empty zip.
   if (buffer.byteLength < 1024) {
     throw new Error('Invalid plugin')
   }
   const manifest = UZIP.parse(buffer)
-  if (!(`plugin/${name}.json` in manifest)) {
+  const names = Object.keys(manifest).map(path => (path.match(/^plugin\/(\S+)\.json$/) ?? { 1: undefined })[1]).filter(name => name !== undefined)
+  if (names.length !== 1) {
+    throw new Error('Invalid plugin')
+  }
+  const name = names[0]
+  const byteArray = manifest[`plugin/${name}.json`]
+  if (!byteArray) {
     throw new Error('Invalid plugin')
   }
   Object.entries(manifest).forEach(([path, data]) => {
@@ -25,6 +39,8 @@ export function installPlugin(name: string, buffer: ArrayBuffer) {
     }
   })
   reload()
+  addDefaultIMs(byteArray)
+  return name
 }
 
 export function getInstalledPlugins() {