fix: part fix

Author: neko-para

app/renderer/src/stores/controller.ts

@@ -17,7 +17,7 @@ function reload_init() {
 
 async function connect(cfg: DeviceInfo, cb: (msg: string, detail: string) => void) {
   const { name, adb_path: path, adb_serial: serial, adb_type: type, adb_config: config } = cfg
-  const ctrl = await Controller.initAdb({
+  const ctrl = await Controller.init_adb({
     path,
     serial,
     type,
@@ -28,6 +28,7 @@ async function connect(cfg: DeviceInfo, cb: (msg: string, detail: string) => voi
   if (await ctrl.connected) {
     handles.value[ctrl.handle] = {
       cb: ctrl.cbId,
+      ci: ctrl.rpcId,
 
       name,
       cfg
@@ -42,7 +43,7 @@ async function connect(cfg: DeviceInfo, cb: (msg: string, detail: string) => voi
 async function disconnect(handle: ControllerHandle) {
   const ci = handles.value[handle]!
   delete handles.value[handle]
-  await (await Controller.init_from(handle, ci.cb)).destroy()
+  await (await Controller.init_from(handle, ci.cb, ci.ci)).destroy()
 }
 
 async function disconnect_all() {
@@ -71,7 +72,8 @@ function info(serial?: string) {
 }
 
 function init_from(handle: ControllerHandle) {
-  return Controller.init_from(handle, handles.value[handle]!.cb)
+  const ci = handles.value[handle]!
+  return Controller.init_from(handle, ci.cb, ci.ci)
 }
 
 function only_one() {

app/renderer/src/stores/instance.ts

@@ -60,11 +60,13 @@ async function create_with(cfg: InstanceSaveInfo) {
     runtime: {
       instance: {
         handle: inst.handle,
-        cb: inst.cbId
+        cb: inst.cbId,
+        ci: inst.rpcId
       },
       resource: {
         handle: res.handle,
-        cb: res.cbId
+        cb: res.cbId,
+        ci: res.rpcId
       },
       controller: ctrl
     }
@@ -91,8 +93,8 @@ function is_created(id: string) {
 async function destroy(handle: InstanceHandle) {
   const ii = handles.value[handle]!.runtime
   delete handles.value[handle]
-  await (await Instance.init_from(ii.instance.handle, ii.instance.cb)).destroy()
-  await (await Resource.init_from(ii.resource.handle, ii.resource.cb)).destroy()
+  await (await Instance.init_from(ii.instance.handle, ii.instance.cb, ii.instance.ci)).destroy()
+  await (await Resource.init_from(ii.resource.handle, ii.resource.cb, ii.resource.ci)).destroy()
 }
 
 async function destroy_all() {
@@ -223,14 +225,13 @@ function buildDiffConfig(
 }
 
 function init_res_from(handle: InstanceHandle) {
-  return Resource.init_from(
-    handles.value[handle]!.runtime.resource.handle,
-    handles.value[handle]!.runtime.resource.cb
-  )
+  const ri = handles.value[handle]!.runtime.resource
+  return Resource.init_from(ri.handle, ri.cb, ri.ci)
 }
 
 function init_from(handle: InstanceHandle) {
-  return Instance.init_from(handle, handles.value[handle]!.runtime.instance.cb)
+  const ii = handles.value[handle]!.runtime.instance
+  return Instance.init_from(handle, ii.cb, ii.ci)
 }
 
 async function run(

pkgs/type/src/handle.ts

@@ -2,6 +2,7 @@ import type { ControllerHandle, DeviceInfo, InstanceHandle, ResourceHandle } fro
 
 export type ControllerHandleInfo = {
   cb: string
+  ci: string
 
   name: string
   cfg: DeviceInfo
@@ -30,10 +31,12 @@ export type InstanceHandleInfo = InstanceSaveInfo & {
     resource: {
       handle: ResourceHandle
       cb: string
+      ci: string
     }
     instance: {
       handle: InstanceHandle
       cb: string
+      ci: string
     }
   }
 }