dsh-plugin-weapp-gateway 0.8.13 → 0.8.14

package/lib/index.mjs

@@ -2821,6 +2821,7 @@ const plugin = {
                 api,
                 currentVersion: PLUGIN_VERSION,
                 requestId: crypto.randomUUID(),
+                profileName: ctx.get?.('profileContext')?.name,
               })
               sendJson(res, 200, result)
             } finally {

package/lib/plugin-updates.mjs

@@ -1,5 +1,6 @@
 export const PLUGIN_PACKAGE_NAME = 'dsh-plugin-weapp-gateway'
 const REGISTRY_LATEST_URL = `https://registry.npmjs.org/${PLUGIN_PACKAGE_NAME}/latest`
+const FAILED_INSTALL_STATES = new Set(['failed', 'cancelled', 'refused'])
 
 function errorField(value) {
   return typeof value === 'string' && value.trim() ? value.trim() : ''
@@ -22,6 +23,7 @@ export function formatPluginInstallError(error, depth = 0) {
     if (detail) return `${code && code !== detail ? `${code}: ` : ''}${detail}`.slice(0, 1000)
   }
 
+  if (code) return code
   try {
     const serialized = JSON.stringify(error, (key, value) => {
       if (/stack|authorization|cookie|password|secret|token|credential|api.?key/i.test(key)) return undefined
@@ -29,7 +31,28 @@ export function formatPluginInstallError(error, depth = 0) {
     })
     if (serialized && serialized !== '{}') return serialized.slice(0, 1000)
   } catch { /* use a generic message for cyclic or non-serializable errors */ }
-  return code || 'The plugin manager did not provide an error message'
+  return 'The plugin manager did not provide an error message'
+}
+
+function operationErrorCode(error, depth = 0) {
+  if (!error || typeof error !== 'object' || depth > 4) return ''
+  if (typeof error.code === 'string') return error.code
+  for (const nested of [error.error, error.cause, error.details]) {
+    const code = operationErrorCode(nested, depth + 1)
+    if (code) return code
+  }
+  return ''
+}
+
+function failedOperation(operation) {
+  return FAILED_INSTALL_STATES.has(operation?.application) || Boolean(operation?.error)
+}
+
+function operationMessage(operation) {
+  if (operation?.error) return formatPluginInstallError(operation.error)
+  return typeof operation?.message === 'string' && operation.message.trim()
+    ? operation.message.trim()
+    : `Plugin manager reported ${operation?.application || 'an unknown failure'}`
 }
 
 function parseVersion(value) {
@@ -97,11 +120,14 @@ export async function checkPluginUpdate({ currentVersion, fetchImpl = globalThis
   }
 }
 
-export async function installLatestPlugin({ api, currentVersion, fetchImpl = globalThis.fetch, requestId }) {
+export async function installLatestPlugin({ api, currentVersion, fetchImpl = globalThis.fetch, requestId, profileName }) {
   const update = await checkPluginUpdate({ currentVersion, fetchImpl })
   if (!update.updateAvailable) return { ...update, installed: false, reason: 'already-current' }
 
-  const command = `dsh plugin --profile web add ${PLUGIN_PACKAGE_NAME}@${update.latestVersion}`
+  const profile = typeof profileName === 'string' && /^[A-Za-z0-9._-]{1,80}$/.test(profileName)
+    ? profileName
+    : 'web'
+  const command = `dsh plugin --profile ${profile} add ${PLUGIN_PACKAGE_NAME}@${update.latestVersion}`
   let inventory
   try {
     inventory = await api.plugins.inventory()
@@ -112,16 +138,83 @@ export async function installLatestPlugin({ api, currentVersion, fetchImpl = glo
     return { ...update, installed: false, reason: 'plugin-manager-unavailable', command }
   }
 
-  const installation = await api.plugins.installBundle(
-    `${PLUGIN_PACKAGE_NAME}@${update.latestVersion}`,
-    { requestId },
-  )
-  const errorMessage = formatPluginInstallError(installation?.error)
+  let bundles
+  try {
+    bundles = await api.plugins.listBundles()
+  } catch (error) {
+    return { ...update, installed: false, reason: 'plugin-manager-unavailable', command, detail: error?.message }
+  }
+  if (!Array.isArray(bundles)) {
+    return { ...update, installed: false, reason: 'plugin-manager-unavailable', command }
+  }
+
+  const existing = bundles.find(bundle => bundle?.name === PLUGIN_PACKAGE_NAME && bundle.installed === true)
+  const installSpec = `${PLUGIN_PACKAGE_NAME}@${update.latestVersion}`
+  const installOptions = {
+    requestId,
+    saveExact: true,
+    ...(typeof existing?.enabled === 'boolean' ? { enabled: existing.enabled } : {}),
+  }
+
+  let removed = false
+  if (existing) {
+    if (typeof api.plugins.removeBundle !== 'function') {
+      return { ...update, installed: false, reason: 'plugin-manager-unavailable', command }
+    }
+
+    let removal
+    try {
+      removal = await api.plugins.removeBundle(PLUGIN_PACKAGE_NAME)
+    } catch (error) {
+      removal = { application: 'failed', error }
+    }
+
+    // Older hosts cannot hot-remove a running bundle; their package manager can still replace it for restart.
+    if (failedOperation(removal) && operationErrorCode(removal) !== 'stop-profile') {
+      return {
+        ...update,
+        installed: true,
+        installation: {
+          ...removal,
+          application: FAILED_INSTALL_STATES.has(removal?.application) ? removal.application : 'failed',
+          errorMessage: operationMessage(removal),
+        },
+      }
+    }
+    removed = !failedOperation(removal)
+  }
+
+  let installation
+  try {
+    installation = await api.plugins.installBundle(installSpec, installOptions)
+  } catch (error) {
+    installation = { application: 'failed', error }
+  }
+
+  let errorMessage = ''
+  if (failedOperation(installation) && removed) {
+    const previousSpec = typeof existing.source === 'string' && existing.source
+      ? existing.source
+      : `${PLUGIN_PACKAGE_NAME}@${currentVersion}`
+    try {
+      const recovery = await api.plugins.installBundle(previousSpec, {
+        ...(typeof existing.enabled === 'boolean' ? { enabled: existing.enabled } : {}),
+      })
+      errorMessage = failedOperation(recovery)
+        ? `Update failed: ${operationMessage(installation)}. Restoring the previous version also failed: ${operationMessage(recovery)}`
+        : `Update failed: ${operationMessage(installation)}. The previous version was restored.`
+      installation = { ...installation, recovery }
+    } catch (error) {
+      errorMessage = `Update failed: ${operationMessage(installation)}. Restoring the previous version also failed: ${formatPluginInstallError(error)}`
+    }
+  }
+
+  const detail = errorMessage || (installation?.error ? formatPluginInstallError(installation.error) : '')
   return {
     ...update,
     installed: true,
-    installation: errorMessage && installation && typeof installation === 'object'
-      ? { ...installation, errorMessage }
+    installation: detail && installation && typeof installation === 'object'
+      ? { ...installation, errorMessage: detail }
       : installation,
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-weapp-gateway",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "description": "Authenticated mobile gateway for DSH with Session V4 history, live permissions, inbox-based queue sync, built-in WeChat ClawBot, plugin management, LAN and Cloudflare Tunnel access, device pairing, per-session Agent presets, relay access, and speech input",
   "main": "lib/index.mjs",
   "files": [