From f9502d1dd9e164feec40546fd1601c8d9dfde696 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 17 五月 2023 18:29:40 +0800
Subject: [PATCH] Merge pull request #522 from alibaba-damo-academy/dev_cmz_fromDev_infer

---
 funasr/runtime/html5/readme.md |   58 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/funasr/runtime/html5/readme.md b/funasr/runtime/html5/readme.md
index 917865b..612dc20 100644
--- a/funasr/runtime/html5/readme.md
+++ b/funasr/runtime/html5/readme.md
@@ -9,42 +9,56 @@
 ```
 
 ### javascript
+[html5褰曢煶](https://github.com/xiangyuecn/Recorder)
 ```shell
-Recorder [html5褰曢煶](https://github.com/xiangyuecn/Recorder)
+Recorder 
 ```
-## html5鏈嶅姟閰嶇疆
-### 鍚姩html5鏈嶅姟
+
+### demo椤甸潰濡備笅
+![img](https://github.com/alibaba-damo-academy/FunASR/blob/for-html5-demo/funasr/runtime/html5/demo.gif)
+
+## 涓ょws_server_online杩炴帴妯″紡
+### 1)鐩存帴杩炴帴妯″紡锛屾祻瑙堝櫒https楹﹀厠椋� --> html5 demo鏈嶅姟 --> js wss鎺ュ彛 --> wss asr online srv(璇佷功鐢熸垚璇峰線鍚庣湅)
+
+### 2)nginx涓浆锛屾祻瑙堝櫒https楹﹀厠椋� --> html5 demo鏈嶅姟 --> js wss鎺ュ彛 --> nginx鏈嶅姟 --> ws asr online srv
+
+## 1.html5 demo鏈嶅姟鍚姩
+### 鍚姩html5鏈嶅姟锛岄渶瑕乻sl璇佷功(鑷繁鐢熸垚璇峰線鍚庣湅)
 
 ```shell
 usage: h5Server.py [-h] [--host HOST] [--port PORT] [--certfile CERTFILE]
                    [--keyfile KEYFILE]
 python h5Server.py --port 1337
 ```
-娉�:
-wsconnecter.js閲岄厤缃畂nline asr wss璺緞
+## 2.鍚姩ws or wss asr online srv
+[鍏蜂綋璇风湅online asr](https://github.com/alibaba-damo-academy/FunASR/tree/main/funasr/runtime/python/websocket)
+online asr鎻愪緵涓ょws鍜寃ss妯″紡锛寃ss妯″紡鍙互鐩存帴鍚姩锛屾棤闇�nginx涓浆銆傚惁鍒欓渶瑕侀�氳繃nginx灏唚ss杞彂鍒拌online asr鐨剋s绔彛涓�
+### wss鏂瑰紡
+```shell
+python ws_server_online.py --certfile server.crt --keyfile server.key  --port 5921
+```
+### ws鏂瑰紡
+```shell
+python ws_server_online.py  --port 5921
+```
+## 3.淇敼wsconnecter.js閲宎sr鎺ュ彛鍦板潃
+wsconnecter.js閲岄厤缃畂nline asr鏈嶅姟鍦板潃璺緞锛岃繖閲岄厤缃殑鏄痺ss绔彛
 var Uri = "wss://xxx:xxx/" 
 
-### 娴忚鍣ㄦ墦寮�鍦板潃
+## 4.娴忚鍣ㄦ墦寮�鍦板潃娴嬭瘯
 https://127.0.0.1:1337/static/index.html
 
 
-### demo椤甸潰濡備笅
-![img](https://github.com/zhaomingwork/FunASR/tree/for-html5-demo/funasr/runtime/html5/demo.gif)
 
 
-##鍚庣閰嶇疆
-h5鎵撳紑楹﹀厠椋庨渶瑕乭ttps鍗忚锛屽悓鏃跺悗绔殑asr websocket涔熷繀椤绘槸wss鍗忚锛岃�岀洰鍓峓online asr](https://github.com/alibaba-damo-academy/FunASR/tree/main/funasr/runtime/python/websocket)妯″瀷鍙敮鎸亀s鍗忚锛屾墍浠ユ垜浠�氳繃nginx閰嶇疆瀹炵幇wss鍗忚鍒皐s鍗忚鐨勮浆鎹€��
-
-##鍏蜂綋杩囩▼濡備笅锛�
-娴忚鍣╤tts --> html5 demo鏈嶅姟 --> js wss鎺ュ彛 --> nginx鏈嶅姟 --> ws asr online srv
-
-##閰嶇疆nginx wss鍗忚(浜嗚В鐨勫彲浠ヨ烦杩囷級
+## 鑷鐢熸垚璇佷功
 鐢熸垚璇佷功(娉ㄦ剰杩欑璇佷功骞朵笉鑳借鎵�鏈夋祻瑙堝櫒璁ゅ彲锛岄儴鍒嗘墜鍔ㄦ巿鏉冨彲浠ヨ闂�,鏈�濂戒娇鐢ㄥ叾浠栬璇佺殑瀹樻柟ssl璇佷功)
 
-### 鐢熸垚绉侀挜锛屾寜鐓ф彁绀哄～鍐欏唴瀹�
+```shell
+### 1)鐢熸垚绉侀挜锛屾寜鐓ф彁绀哄～鍐欏唴瀹�
 openssl genrsa -des3 -out server.key 1024
  
-### 鐢熸垚csr鏂囦欢 锛屾寜鐓ф彁绀哄～鍐欏唴瀹�
+### 2)鐢熸垚csr鏂囦欢 锛屾寜鐓ф彁绀哄～鍐欏唴瀹�
 openssl req -new -key server.key -out server.csr
  
 ### 鍘绘帀pass
@@ -53,8 +67,12 @@
  
 ### 鐢熸垚crt鏂囦欢锛屾湁鏁堟湡1骞达紙365澶╋級
 openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
+```
 
-##nginx杞彂閰嶇疆绀轰緥
+## nginx閰嶇疆璇存槑(浜嗚В鐨勫彲浠ヨ烦杩�)
+h5鎵撳紑楹﹀厠椋庨渶瑕乭ttps鍗忚锛屽悓鏃跺悗绔殑asr websocket涔熷繀椤绘槸wss鍗忚锛屽鏋淸online asr](https://github.com/alibaba-damo-academy/FunASR/tree/main/funasr/runtime/python/websocket)浠s鏂瑰紡杩愯锛屾垜浠彲浠ラ�氳繃nginx閰嶇疆瀹炵幇wss鍗忚鍒皐s鍗忚鐨勮浆鎹€��
+
+### nginx杞彂閰嶇疆绀轰緥
 ```shell
 events {                                                                                                            [0/1548]
     worker_connections  1024;
@@ -76,7 +94,7 @@
     location /wss/ {
 
 
-      proxy_pass http://127.0.0.1:1111/;  # asr online model ws address:port
+      proxy_pass http://127.0.0.1:1111/;  # asr online model ws address and port
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -88,4 +106,4 @@
 
 ## Acknowledge
 1. This project is maintained by [FunASR community](https://github.com/alibaba-damo-academy/FunASR).
-2. We acknowledge [鐖卞尰澹癩(http://www.aihealthx.com/) for contributing the html5 demo.
\ No newline at end of file
+2. We acknowledge [AiHealthx](http://www.aihealthx.com/) for contributing the html5 demo.
\ No newline at end of file

--
Gitblit v1.9.1