fix fetch自定义headerbug

langhuihui · Aug 15, 2023 · 8a95480 · 8a95480 · vercel · Aug 15, 2023
1 parent bb96e7c
commit 8a95480
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 30 deletions.
diff --git a/demo/document.md b/demo/document.md
@@ -1037,6 +1037,43 @@ windows 系统压缩方法
 <img src="/public/wasm.png">
 
 
+#### nginx的配置
+
+1. 用的springboot的tomcat，所以修改tomcat的mime类型，多添加一个wasm的类型
+2. 用的是ISS，配置下wasm类型的数据就行了。
+
+Extension: .wasm (dot wasm)
+MIMEType: application/wasm
+
+##### apache修改 mime.types，添加
+
+```shell
+application/wasm            wasm
+
+```
+
+##### nginx修改mime.types，添加
+
+```shell
+application/wasm            wasm;
+
+```
+##### 或者 nginx修改nginx.conf，添加
+
+```shell
+{
+    # 配置 MIME 类型
+    types {
+        application/wasm wasm;
+    }
+
+    # 开启 gzip 压缩
+    gzip on;
+
+}
+```
+
+
 #### 通过springBoot 部署的静态资源遇到 `falling back to arraybuffer instantiation` 错误问题
 
 > decoder-pro-simd.js:1 wasm streaming compile failed: CompileError: WebAssembly.instantiateStreaming(): section (code 1, "Type") extends past end of the module (length 11493359, remaining bytes 2877270) @+8

diff --git a/demo/public/decoder.js.map b/demo/public/decoder.js.map
diff --git a/demo/public/demo.html b/demo/public/demo.html
@@ -95,7 +95,7 @@
             <input
                 autocomplete="on"
                 id="playUrl"
-                value="http://flv.bdplay.nodemedia.cn/live/bbb_264.flv"
+                value="https://live.nodemedia.cn:8443/live/b480_264.flv"
             />
             <button id="play">播放</button>
             <button id="pause" style="display: none">停止</button>

diff --git a/demo/public/dist.zip b/demo/public/dist.zip
diff --git a/demo/public/jessibuca.d.ts b/demo/public/jessibuca.d.ts
@@ -561,9 +561,9 @@ declare class Jessibuca {
         buf: number;
         /** 当前视频帧率 */
         fps: number;
-        /** 当前音频码率，单位bit */
+        /** 当前音频码率，单位byte */
         abps: number;
-        /** 当前视频码率，单位bit */
+        /** 当前视频码率，单位byte */
         vbps: number;
         /** 当前视频帧pts，单位毫秒 */
         ts: number;

diff --git a/demo/public/jessibuca.js b/demo/public/jessibuca.js
diff --git a/demo/public/jessibuca.js.map b/demo/public/jessibuca.js.map
diff --git a/dist/jessibuca.d.ts b/dist/jessibuca.d.ts
@@ -561,9 +561,9 @@ declare class Jessibuca {
         buf: number;
         /** 当前视频帧率 */
         fps: number;
-        /** 当前音频码率，单位bit */
+        /** 当前音频码率，单位byte */
         abps: number;
-        /** 当前视频码率，单位bit */
+        /** 当前视频码率，单位byte */
         vbps: number;
         /** 当前视频帧pts，单位毫秒 */
         ts: number;

diff --git a/dist/jessibuca.js b/dist/jessibuca.js
diff --git a/src/jessibuca.js b/src/jessibuca.js
@@ -326,7 +326,7 @@ class Jessibuca extends Emitter {
                 this.pause().then(() => {
                     this.player.debug.log('Jessibuca', 'webglAlignmentError')
                     this._resetPlayer({openWebglAlignment: true})
-                    this.play(url).then(() => {
+                    this.play(url,options).then(() => {
                         // resolve();
                         this.player.debug.log('Jessibuca', 'webglAlignmentError and play success')
                     }).catch(() => {
@@ -358,7 +358,7 @@ class Jessibuca extends Emitter {
                 this.pause().then(() => {
                     this.player.debug.log('Jessibuca', 'media source full');
                     this._resetPlayer()
-                    this.play(url).then(() => {
+                    this.play(url,options).then(() => {
                         // resolve();
                         this.player.debug.log('Jessibuca', 'media source full and reset player and play success')
                     }).catch(() => {
@@ -372,7 +372,7 @@ class Jessibuca extends Emitter {
                 this.pause().then(() => {
                     this.player.debug.log('Jessibuca', 'media source append buffer error');
                     this._resetPlayer()
-                    this.play(url).then(() => {
+                    this.play(url,options).then(() => {
                         // resolve();
                         this.player.debug.log('Jessibuca', 'media source append buffer error and reset player and play success')
                     }).catch(() => {
@@ -386,7 +386,7 @@ class Jessibuca extends Emitter {
                 this.pause().then(() => {
                     this.player.debug.log('Jessibuca', 'media source buffer list large');
                     this._resetPlayer()
-                    this.play(url).then(() => {
+                    this.play(url,options).then(() => {
                         // resolve();
                         this.player.debug.log('Jessibuca', 'media source buffer list large and reset player and play success')
                     }).catch(() => {
@@ -400,7 +400,7 @@ class Jessibuca extends Emitter {
                 this.pause().then(() => {
                     this.player.debug.log('Jessibuca', 'media source append buffer end timeout');
                     this._resetPlayer()
-                    this.play(url).then(() => {
+                    this.play(url,options).then(() => {
                         // resolve();
                         this.player.debug.log('Jessibuca', 'media source append buffer end timeout and reset player and play success')
                     }).catch(() => {
@@ -422,7 +422,7 @@ class Jessibuca extends Emitter {
                     if (this.player._opt.autoWasm) {
                         this.player.debug.log('Jessibuca', 'auto wasm [wcs-> wasm] reset player and play')
                         this._resetPlayer({useWCS: false})
-                        this.play(url).then(() => {
+                        this.play(url,options).then(() => {
                             // resolve();
                             this.player.debug.log('Jessibuca', 'auto wasm [wcs-> wasm] reset player and play success')
                         }).catch(() => {
@@ -437,7 +437,7 @@ class Jessibuca extends Emitter {
                 this.pause().then(() => {
                     this.player.debug.log('Jessibuca', 'webcodecs Width Or Height Change reset player and play')
                     this._resetPlayer({useWCS: true})
-                    this.play(url).then(() => {
+                    this.play(url,options).then(() => {
                         // resolve();
                         this.player.debug.log('Jessibuca', 'webcodecs Width Or Height Change reset player and play success')
                     }).catch(() => {
@@ -452,7 +452,7 @@ class Jessibuca extends Emitter {
                     if (this.player._opt.autoWasm) {
                         this.player.debug.log('Jessibuca', 'webcodecs decode error reset player and play')
                         this._resetPlayer({useWCS: false})
-                        this.play(url).then(() => {
+                        this.play(url,options).then(() => {
                             // resolve();
                             this.player.debug.log('Jessibuca', 'webcodecs decode error  reset player and play success')
                         }).catch(() => {

diff --git a/src/stream/fetchLoader.js b/src/stream/fetchLoader.js
@@ -30,6 +30,7 @@ export default class FetchLoader extends Emitter {
      */
     fetchStream(url, options = {}) {
         const {demux} = this.player;
+        this.player.debug.log('FetchStream', 'fetchStream', url, JSON.stringify(options));
         this.player._times.streamStart = now();
         const fetchOptions = Object.assign({
             signal: this.abortController.signal,