chore: update hap-server

Signed-off-by: JayFate <[email protected]>
hapjs-platform · Aug 22, 2024 · 7ef24f3 · 7ef24f3
1 parent 7b3a574
commit 7ef24f3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 31 deletions.
diff --git a/__tests__/examples/sample.test.js b/__tests__/examples/sample.test.js
@@ -57,13 +57,14 @@ describe('hap-toolkit', () => {
   it(
     'hap-server',
     async () => {
+      const serverReg = /服务器地址: (http:\/\/.*),/
       const dialogs = [
         {
           pattern: (output) => {
-            return output.match(/生成HTTP服务器的二维码: (http:\/\/.*)/)
+            return output.match(serverReg)
           },
           feeds: (proc, output) => {
-            const match = output.match(/生成HTTP服务器的二维码: (http:\/\/.*)/)
+            const match = output.match(serverReg)
             const url = match[1]
             const p1 = fetch(url)
               .then((res) => {

diff --git a/packages/hap-packager/src/router/routes.js b/packages/hap-packager/src/router/routes.js
@@ -141,18 +141,6 @@ async function notify(context, next) {
   await next()
 }
 
-/**
- * 二维码api
- */
-async function qrCode(context, next) {
-  const port = context.app.server.address().port
-  const data = getServerAddress(port)
-  const image = qr.image(data, { size: 9 })
-  await next()
-  context.type = 'image/png'
-  context.body = image
-}
-
 async function saveDataCoverage(context, next) {
   const reqDataCoverage = context.request.body.coverage
   if (!reqDataCoverage) {
@@ -224,7 +212,7 @@ async function saveDataLogs(context, next) {
 export default {
   index,
   bundle,
-  qrCode,
+  qrCode: index,
   logger,
   notify,
   saveDataCoverage,

diff --git a/packages/hap-server/src/server.js b/packages/hap-server/src/server.js
@@ -7,8 +7,8 @@ import http from 'http'
 import Koa from 'koa'
 import opn from 'opn'
 import portfinder from 'portfinder'
+import qrTerminal from 'qrcode-terminal'
 import {
-  outputQRCodeOnTerminal,
   getIPv4IPAddress,
   colorconsole,
   globalConfig,
@@ -75,11 +75,9 @@ export async function launch(conf) {
         colorconsole.info(`### App Server ### 服务器地址: ${localUrl}, ${lanUrl}`)
         colorconsole.info(`### App Server ### 请确保手机与App Server处于相同网段`)
         // 输出二维码地址
-        outputQRCodeOnTerminal(lanUrl)
+        qrTerminal.generate(lanUrl, { small: true })
         // 在浏览器中打开二维码页面
-        if (openBrowser) {
-          opn(lanUrl)
-        }
+        openBrowser && opn(lanUrl)
         resolve({
           launchServerError: null,
           server,

diff --git a/packages/hap-shared-utils/package.json b/packages/hap-shared-utils/package.json
@@ -28,8 +28,7 @@
     "event-bus.js"
   ],
   "dependencies": {
-    "chalk": "^2.4.2",
-    "qrcode-terminal": "^0.12.0"
+    "chalk": "^2.4.2"
   },
   "devDependencies": {
     "strip-ansi": "^5.2.0"

diff --git a/packages/hap-shared-utils/src/index.js b/packages/hap-shared-utils/src/index.js
@@ -197,15 +197,6 @@ export function stripPrefixForIPV4MappedIPV6Address(ip) {
   return ip
 }
 
-/**
- * 命令行输出二维码
- * @param text
- */
-export function outputQRCodeOnTerminal(text) {
-  console.info(`\n生成HTTP服务器的二维码: ${text}`)
-  qrTerminal.generate(text, { small: true })
-}
-
 /**
  * 相对工作目录的路径
  *