From 6d1cb63bf3518ec5505c0f2f9a087570e3a8f5b9 Mon Sep 17 00:00:00 2001
From: yucongshuang <v-yucongshuang@oppo.com>
Date: Fri, 8 Aug 2025 14:58:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?server=E9=85=8D=E7=BD=AE=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=92=E4=BB=B6=E7=BB=99=E9=A2=84=E8=A7=88=E9=A1=B5?=
 =?UTF-8?q?=E4=BC=A0=E8=B0=83=E8=AF=95js=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/hap-server/package.json                 |  3 ++-
 packages/hap-server/src/preview/create-router.js |  1 +
 packages/hap-server/src/preview/views/page.html  | 10 ++++++++--
 packages/hap-server/src/server.js                | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/hap-server/package.json b/packages/hap-server/package.json
index 761cb562..c5dcd46d 100644
--- a/packages/hap-server/package.json
+++ b/packages/hap-server/package.json
@@ -44,6 +44,7 @@
     "qr-image": "^3.2.0",
     "qrcode-terminal": "^0.12.0",
     "request": "^2.88.2",
-    "resolve": "^1.22.2"
+    "resolve": "^1.22.2",
+    "koa-proxies": "^0.12.4"
   }
 }
diff --git a/packages/hap-server/src/preview/create-router.js b/packages/hap-server/src/preview/create-router.js
index c5f626a6..77d6f5e5 100644
--- a/packages/hap-server/src/preview/create-router.js
+++ b/packages/hap-server/src/preview/create-router.js
@@ -228,6 +228,7 @@ export default async function createRouter(previewTarget) {
         type,
         script,
         scriptNotFound: !scriptExists(script),
+        devtoolUrl: browerOptions.options.devtoolUrl || '',
         webJsUrl: genWebJsUrl(browerOptions.options.version || ctx.conf.options.webVersion), // 更改预览版本号修改为同媒介查询一样的传参方式，同时兼容之前的方式
         language: currentLanguage,
         mediaQueryParams: JSON.stringify(mediaQueryParams) // 传给页面的媒介查询参数
diff --git a/packages/hap-server/src/preview/views/page.html b/packages/hap-server/src/preview/views/page.html
index 929d02c6..54757540 100644
--- a/packages/hap-server/src/preview/views/page.html
+++ b/packages/hap-server/src/preview/views/page.html
@@ -93,6 +93,11 @@
         document.write('<script src="/preview-static/web.js">\x3C/script>')
       }
     </script>
+    <script type="text/javascript">
+      if (`{{devtoolUrl}}`) {
+        document.write('<script src="{{devtoolUrl}}">\x3C/script>')
+      }
+    </script>
     <script type="text/javascript">
       var base = '/preview'
       var type = '{{ type }}'
@@ -102,7 +107,8 @@
         var routeName = '{{ routeName }}'
         Hap.init({
           base,
-          type
+          type,
+          'idePlatform': `{{devtoolUrl}}` ? 'extensionOnline': undefined
         })
       })()
     </script>
@@ -114,7 +120,7 @@
       <p>编译可能存在异常</p>
     </div>
     <script type="text/javascript">
-      if ({{ scriptNotFound }}) {
+      if (`{{ scriptNotFound }}`) {
         // TODO loading
         setTimeout(() => {
           var el = document.getElementById('scriptNotFound')
diff --git a/packages/hap-server/src/server.js b/packages/hap-server/src/server.js
index 2bd8e2b3..0fb8714a 100644
--- a/packages/hap-server/src/server.js
+++ b/packages/hap-server/src/server.js
@@ -16,6 +16,7 @@ import {
 } from '@hap-toolkit/shared-utils'
 import { browerOptions } from './config'
 const moduler = [require('@hap-toolkit/debugger')]
+const proxies = require('koa-proxies')
 let server = null
 export async function launch(conf) {
   return new Promise(async (resolve) => {
@@ -25,6 +26,20 @@ export async function launch(conf) {
         moduler.push((await import('@hap-toolkit/packager')).router, require('./preview/index.js'))
       }
       const app = new Koa()
+      // 改版ide插件的方式h5预览的ajax请求需要设置动态代理
+      app.use(async (ctx, next) => {
+        if (ctx.request.url.startsWith('/api/proxy')) {
+          const target = ctx.request.url.split('target=')[1] // 从查询参数获取目标地址
+          //  const apiReg = new RegExp(`^${api}/`);
+          return proxies('/api/proxy', {
+            target: target,
+            changeOrigin: true,
+            logs: true,
+            rewrite: (path) => path.replace(/^\/api\/proxy/, '')
+          })(ctx, next)
+        }
+        return next()
+      })
       let serverPort = globalConfig.server.port
       // 如果设置的端口被占用，则自动递增获取可用端口
       serverPort = await portfinder.getPortPromise({

From 1208c4c227585e43760d7802115d3f60cd264100 Mon Sep 17 00:00:00 2001
From: yucongshuang <v-yucongshuang@oppo.com>
Date: Fri, 8 Aug 2025 14:59:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/hap-server/src/preview/views/page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/hap-server/src/preview/views/page.html b/packages/hap-server/src/preview/views/page.html
index 54757540..2b94f638 100644
--- a/packages/hap-server/src/preview/views/page.html
+++ b/packages/hap-server/src/preview/views/page.html
@@ -108,7 +108,7 @@
         Hap.init({
           base,
           type,
-          'idePlatform': `{{devtoolUrl}}` ? 'extensionOnline': undefined
+          idePlatform: `{{devtoolUrl}}` ? 'extensionOnline' : undefined
         })
       })()
     </script>