@rongcloud/plugin-rtc 5.2.4-beem.1 → 5.2.4-beem.2

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.1
- * CommitId - d026964c6715be7805a3e5c8addd64d4008d17bd
- * Thu May 12 2022 18:57:27 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.2
+ * CommitId - 51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c
+ * Mon May 16 2022 17:37:30 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, LogLevel, RTCMode, IRuntime, RTCPluginContext, IServerRTCRoomEntry, IJoinRTCRoomData, IReceivedMessage, KVString, RTCJoinType, IRTCJoinedInfo, IPluginGenerator } from '@rongcloud/engine';
@@ -2226,6 +2226,11 @@ declare abstract class RCAbstractRoom {
      * 退出并销毁当前房间实例，退出后该房间的所有方法将不可用
      */
     __destroy(quitRoom: boolean): Promise<void>;
+    /**
+     * 退出房间之前禁用所有远端资源，避免退出动作耗时过长，
+     * 导致在未完全退出的过程中仍能听到房间内的声音问题
+     */
+    private _muteRemoteTracksBeforeQuit;
     private _leaveHandle;
     private _onLocalTrackDestroied;
     /**

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.1
- * CommitId - d026964c6715be7805a3e5c8addd64d4008d17bd
- * Thu May 12 2022 18:57:27 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.2
+ * CommitId - 51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c
+ * Mon May 16 2022 17:37:30 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { Logger, EventEmitter, isNumber, ErrorCode, ConnectionStatus, assert, ConversationType, RTCApiType, validate, isArray, RTCMode, isHttpUrl, isBoolean, HttpMethod, isString, notEmptyString, RTCJoinType, RTCIdentityChangeType, VersionManage } from '@rongcloud/engine';
@@ -6589,54 +6589,66 @@ class Pinger {
          * 记录最近一次成功的 Ping 时间戳
          */
         this._latestTimestamp = Date.now();
+        this._started = false;
         this._timer = null;
     }
     /**
      * 启动 Ping
      */
     start() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._timer) {
-                return;
-            }
-            // logger.debug('rtcping timer start ->')
-            this._timer = setInterval(this._loop.bind(this), this._gap);
+        if (this._started) {
+            return;
+        }
+        logger.info('rtcping start ->');
+        this._started = true;
+        this._checkAlive();
+    }
+    _sendPing() {
+        return new Promise(resolve => {
+            this._context.rtcPing(this._roomId, this._roomMode)
+                .then(resolve)
+                .catch(error => {
+                logger.error(`rtcping receive unknown error -> ${error}`);
+                resolve(ErrorCode.UNKNOWN);
+            });
+            setTimeout(resolve, PING_TIMEOUT, ErrorCode.TIMEOUT);
         });
     }
-    _loop() {
+    _checkAlive() {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            // logger.debug('rtcping send ->')
-            const code = yield new Promise(resolve => {
-                this._context.rtcPing(this._roomId, this._roomMode)
-                    .then(resolve)
-                    .catch(error => {
-                    logger.error(`rtcping receive unknown error -> ${error}`);
-                    resolve(ErrorCode.UNKNOWN);
-                });
-                setTimeout(resolve, PING_TIMEOUT, ErrorCode.TIMEOUT);
-            });
+            logger.info('rtcping ->');
+            const code = yield this._sendPing();
             const now = Date.now();
-            // ping 成功，记录时间戳，延时递归
+            // ping 成功
             if (code === ErrorCode.SUCCESS) {
-                // logger.debug('rtcping success <-')
+                logger.info('rtcping success ->');
                 this._latestTimestamp = now;
                 (_a = this.onPingResult) === null || _a === void 0 ? void 0 : _a.call(this, RCRTCPingResult.SUCCESS);
+                // 延迟递归
+                this._timer = setTimeout(() => this._checkAlive(), this._gap);
                 return;
             }
-            (_b = this.onPingResult) === null || _b === void 0 ? void 0 : _b.call(this, RCRTCPingResult.FAIL);
             logger.warn(`rtcping failed -> code: ${code}`);
+            (_b = this.onPingResult) === null || _b === void 0 ? void 0 : _b.call(this, RCRTCPingResult.FAIL);
             // 超出 1 分钟未成功进行 rtcping 操作，或用户已不存在于房间内时，通知客户离线
             if (code === 40003 || now - this._latestTimestamp > 60 * 1000) {
                 this.stop();
                 (_c = this.onFailed) === null || _c === void 0 ? void 0 : _c.call(this, code === 40003);
+                return;
             }
+            // 延迟发 rtcping，避免调用栈递归阻塞
+            this._timer = setTimeout(() => this._checkAlive(), 500);
         });
     }
     stop() {
+        if (!this._started) {
+            return;
+        }
+        logger.info('rtcping stop ->');
+        this._started = false;
         if (this._timer) {
-            // logger.warn('rtcping timer stop <-')
-            clearInterval(this._timer);
+            clearTimeout(this._timer);
             this._timer = null;
         }
     }
@@ -8434,7 +8446,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.1";
+        const rtcVersion = "5.2.4-beem.2";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -8761,6 +8773,9 @@ class RCAbstractRoom {
      * * 当值为 true 时，说明本端收到被踢出房间通知
      */
     _kickoff(byServer, content) {
+        if (this._destroyed) {
+            return;
+        }
         logger.warn(`onKickOff -> byServer: ${byServer}`);
         this._ntfClearRoomItem();
         this._leaveHandle(!byServer);
@@ -9139,6 +9154,17 @@ class RCAbstractRoom {
     __destroy(quitRoom) {
         return this._leaveHandle(quitRoom);
     }
+    /**
+     * 退出房间之前禁用所有远端资源，避免退出动作耗时过长，
+     * 导致在未完全退出的过程中仍能听到房间内的声音问题
+     */
+    _muteRemoteTracksBeforeQuit() {
+        const remoteTracks = Object.values(this._remoteTracks);
+        if (!remoteTracks.length) {
+            return;
+        }
+        remoteTracks.forEach((track) => track.mute());
+    }
     _leaveHandle(quitRoom) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -9146,6 +9172,7 @@ class RCAbstractRoom {
                 return;
             }
             this._destroyed = true;
+            this._muteRemoteTracksBeforeQuit();
             // 清除音量上报定时器
             (_a = this._audioLevelReport) === null || _a === void 0 ? void 0 : _a.clearAudioLevelReportTimer();
             if (quitRoom) {
@@ -10676,7 +10703,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.2.4-beem.1",
+    ClientVersion: "5.2.4-beem.2",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -12704,7 +12731,7 @@ const installer = {
             logger.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        VersionManage.add('plugin-rtc', "5.2.4-beem.1");
+        VersionManage.add('plugin-rtc', "5.2.4-beem.2");
         if (!VersionManage.validEngine("4.6.0-beem.5")) {
             logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
             return false;
@@ -12714,7 +12741,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.1"}, Commit: ${"d026964c6715be7805a3e5c8addd64d4008d17bd"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.2"}, Commit: ${"51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);

package/dist/index.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.1
- * CommitId - d026964c6715be7805a3e5c8addd64d4008d17bd
- * Thu May 12 2022 18:57:27 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.2
+ * CommitId - 51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c
+ * Mon May 16 2022 17:37:30 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -6592,54 +6592,66 @@ class Pinger {
          * 记录最近一次成功的 Ping 时间戳
          */
         this._latestTimestamp = Date.now();
+        this._started = false;
         this._timer = null;
     }
     /**
      * 启动 Ping
      */
     start() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._timer) {
-                return;
-            }
-            // logger.debug('rtcping timer start ->')
-            this._timer = setInterval(this._loop.bind(this), this._gap);
+        if (this._started) {
+            return;
+        }
+        logger.info('rtcping start ->');
+        this._started = true;
+        this._checkAlive();
+    }
+    _sendPing() {
+        return new Promise(resolve => {
+            this._context.rtcPing(this._roomId, this._roomMode)
+                .then(resolve)
+                .catch(error => {
+                logger.error(`rtcping receive unknown error -> ${error}`);
+                resolve(engine.ErrorCode.UNKNOWN);
+            });
+            setTimeout(resolve, PING_TIMEOUT, engine.ErrorCode.TIMEOUT);
         });
     }
-    _loop() {
+    _checkAlive() {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            // logger.debug('rtcping send ->')
-            const code = yield new Promise(resolve => {
-                this._context.rtcPing(this._roomId, this._roomMode)
-                    .then(resolve)
-                    .catch(error => {
-                    logger.error(`rtcping receive unknown error -> ${error}`);
-                    resolve(engine.ErrorCode.UNKNOWN);
-                });
-                setTimeout(resolve, PING_TIMEOUT, engine.ErrorCode.TIMEOUT);
-            });
+            logger.info('rtcping ->');
+            const code = yield this._sendPing();
             const now = Date.now();
-            // ping 成功，记录时间戳，延时递归
+            // ping 成功
             if (code === engine.ErrorCode.SUCCESS) {
-                // logger.debug('rtcping success <-')
+                logger.info('rtcping success ->');
                 this._latestTimestamp = now;
                 (_a = this.onPingResult) === null || _a === void 0 ? void 0 : _a.call(this, exports.RCRTCPingResult.SUCCESS);
+                // 延迟递归
+                this._timer = setTimeout(() => this._checkAlive(), this._gap);
                 return;
             }
-            (_b = this.onPingResult) === null || _b === void 0 ? void 0 : _b.call(this, exports.RCRTCPingResult.FAIL);
             logger.warn(`rtcping failed -> code: ${code}`);
+            (_b = this.onPingResult) === null || _b === void 0 ? void 0 : _b.call(this, exports.RCRTCPingResult.FAIL);
             // 超出 1 分钟未成功进行 rtcping 操作，或用户已不存在于房间内时，通知客户离线
             if (code === 40003 || now - this._latestTimestamp > 60 * 1000) {
                 this.stop();
                 (_c = this.onFailed) === null || _c === void 0 ? void 0 : _c.call(this, code === 40003);
+                return;
             }
+            // 延迟发 rtcping，避免调用栈递归阻塞
+            this._timer = setTimeout(() => this._checkAlive(), 500);
         });
     }
     stop() {
+        if (!this._started) {
+            return;
+        }
+        logger.info('rtcping stop ->');
+        this._started = false;
         if (this._timer) {
-            // logger.warn('rtcping timer stop <-')
-            clearInterval(this._timer);
+            clearTimeout(this._timer);
             this._timer = null;
         }
     }
@@ -8437,7 +8449,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.1";
+        const rtcVersion = "5.2.4-beem.2";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -8764,6 +8776,9 @@ class RCAbstractRoom {
      * * 当值为 true 时，说明本端收到被踢出房间通知
      */
     _kickoff(byServer, content) {
+        if (this._destroyed) {
+            return;
+        }
         logger.warn(`onKickOff -> byServer: ${byServer}`);
         this._ntfClearRoomItem();
         this._leaveHandle(!byServer);
@@ -9142,6 +9157,17 @@ class RCAbstractRoom {
     __destroy(quitRoom) {
         return this._leaveHandle(quitRoom);
     }
+    /**
+     * 退出房间之前禁用所有远端资源，避免退出动作耗时过长，
+     * 导致在未完全退出的过程中仍能听到房间内的声音问题
+     */
+    _muteRemoteTracksBeforeQuit() {
+        const remoteTracks = Object.values(this._remoteTracks);
+        if (!remoteTracks.length) {
+            return;
+        }
+        remoteTracks.forEach((track) => track.mute());
+    }
     _leaveHandle(quitRoom) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -9149,6 +9175,7 @@ class RCAbstractRoom {
                 return;
             }
             this._destroyed = true;
+            this._muteRemoteTracksBeforeQuit();
             // 清除音量上报定时器
             (_a = this._audioLevelReport) === null || _a === void 0 ? void 0 : _a.clearAudioLevelReportTimer();
             if (quitRoom) {
@@ -10679,7 +10706,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.2.4-beem.1",
+    ClientVersion: "5.2.4-beem.2",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -12707,7 +12734,7 @@ const installer = {
             logger.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        engine.VersionManage.add('plugin-rtc', "5.2.4-beem.1");
+        engine.VersionManage.add('plugin-rtc', "5.2.4-beem.2");
         if (!engine.VersionManage.validEngine("4.6.0-beem.5")) {
             logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
             return false;
@@ -12717,7 +12744,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.1"}, Commit: ${"d026964c6715be7805a3e5c8addd64d4008d17bd"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.2"}, Commit: ${"51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);

package/dist/index.umd.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.1
- * CommitId - d026964c6715be7805a3e5c8addd64d4008d17bd
- * Thu May 12 2022 18:57:27 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.2
+ * CommitId - 51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c
+ * Mon May 16 2022 17:37:30 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -6592,54 +6592,66 @@
              * 记录最近一次成功的 Ping 时间戳
              */
             this._latestTimestamp = Date.now();
+            this._started = false;
             this._timer = null;
         }
         /**
          * 启动 Ping
          */
         start() {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (this._timer) {
-                    return;
-                }
-                // logger.debug('rtcping timer start ->')
-                this._timer = setInterval(this._loop.bind(this), this._gap);
+            if (this._started) {
+                return;
+            }
+            logger.info('rtcping start ->');
+            this._started = true;
+            this._checkAlive();
+        }
+        _sendPing() {
+            return new Promise(resolve => {
+                this._context.rtcPing(this._roomId, this._roomMode)
+                    .then(resolve)
+                    .catch(error => {
+                    logger.error(`rtcping receive unknown error -> ${error}`);
+                    resolve(engine.ErrorCode.UNKNOWN);
+                });
+                setTimeout(resolve, PING_TIMEOUT, engine.ErrorCode.TIMEOUT);
             });
         }
-        _loop() {
+        _checkAlive() {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function* () {
-                // logger.debug('rtcping send ->')
-                const code = yield new Promise(resolve => {
-                    this._context.rtcPing(this._roomId, this._roomMode)
-                        .then(resolve)
-                        .catch(error => {
-                        logger.error(`rtcping receive unknown error -> ${error}`);
-                        resolve(engine.ErrorCode.UNKNOWN);
-                    });
-                    setTimeout(resolve, PING_TIMEOUT, engine.ErrorCode.TIMEOUT);
-                });
+                logger.info('rtcping ->');
+                const code = yield this._sendPing();
                 const now = Date.now();
-                // ping 成功，记录时间戳，延时递归
+                // ping 成功
                 if (code === engine.ErrorCode.SUCCESS) {
-                    // logger.debug('rtcping success <-')
+                    logger.info('rtcping success ->');
                     this._latestTimestamp = now;
                     (_a = this.onPingResult) === null || _a === void 0 ? void 0 : _a.call(this, exports.RCRTCPingResult.SUCCESS);
+                    // 延迟递归
+                    this._timer = setTimeout(() => this._checkAlive(), this._gap);
                     return;
                 }
-                (_b = this.onPingResult) === null || _b === void 0 ? void 0 : _b.call(this, exports.RCRTCPingResult.FAIL);
                 logger.warn(`rtcping failed -> code: ${code}`);
+                (_b = this.onPingResult) === null || _b === void 0 ? void 0 : _b.call(this, exports.RCRTCPingResult.FAIL);
                 // 超出 1 分钟未成功进行 rtcping 操作，或用户已不存在于房间内时，通知客户离线
                 if (code === 40003 || now - this._latestTimestamp > 60 * 1000) {
                     this.stop();
                     (_c = this.onFailed) === null || _c === void 0 ? void 0 : _c.call(this, code === 40003);
+                    return;
                 }
+                // 延迟发 rtcping，避免调用栈递归阻塞
+                this._timer = setTimeout(() => this._checkAlive(), 500);
             });
         }
         stop() {
+            if (!this._started) {
+                return;
+            }
+            logger.info('rtcping stop ->');
+            this._started = false;
             if (this._timer) {
-                // logger.warn('rtcping timer stop <-')
-                clearInterval(this._timer);
+                clearTimeout(this._timer);
                 this._timer = null;
             }
         }
@@ -8437,7 +8449,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.2.4-beem.1";
+            const rtcVersion = "5.2.4-beem.2";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -8764,6 +8776,9 @@
          * * 当值为 true 时，说明本端收到被踢出房间通知
          */
         _kickoff(byServer, content) {
+            if (this._destroyed) {
+                return;
+            }
             logger.warn(`onKickOff -> byServer: ${byServer}`);
             this._ntfClearRoomItem();
             this._leaveHandle(!byServer);
@@ -9142,6 +9157,17 @@
         __destroy(quitRoom) {
             return this._leaveHandle(quitRoom);
         }
+        /**
+         * 退出房间之前禁用所有远端资源，避免退出动作耗时过长，
+         * 导致在未完全退出的过程中仍能听到房间内的声音问题
+         */
+        _muteRemoteTracksBeforeQuit() {
+            const remoteTracks = Object.values(this._remoteTracks);
+            if (!remoteTracks.length) {
+                return;
+            }
+            remoteTracks.forEach((track) => track.mute());
+        }
         _leaveHandle(quitRoom) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
@@ -9149,6 +9175,7 @@
                     return;
                 }
                 this._destroyed = true;
+                this._muteRemoteTracksBeforeQuit();
                 // 清除音量上报定时器
                 (_a = this._audioLevelReport) === null || _a === void 0 ? void 0 : _a.clearAudioLevelReportTimer();
                 if (quitRoom) {
@@ -10679,7 +10706,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.2.4-beem.1",
+        ClientVersion: "5.2.4-beem.2",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString()
     });
@@ -12707,7 +12734,7 @@
                 logger.error('Please use the https protocol or use `http://localhost` to open the page!');
                 return false;
             }
-            engine.VersionManage.add('plugin-rtc', "5.2.4-beem.1");
+            engine.VersionManage.add('plugin-rtc', "5.2.4-beem.2");
             if (!engine.VersionManage.validEngine("4.6.0-beem.5")) {
                 logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
                 return false;
@@ -12717,7 +12744,7 @@
         setup(context, runtime, options = {}) {
             logger.setLogLevel(options.logLevel);
             logger.setLogStdout(options.logStdout);
-            logger.warn(`RCRTC Version: ${"5.2.4-beem.1"}, Commit: ${"d026964c6715be7805a3e5c8addd64d4008d17bd"}`);
+            logger.warn(`RCRTC Version: ${"5.2.4-beem.2"}, Commit: ${"51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c"}`);
             logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
             logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
             logger.warn(`browserInfo.version -> ${browserInfo.version}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rongcloud/plugin-rtc",
-  "version": "5.2.4-beem.1",
+  "version": "5.2.4-beem.2",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "@rongcloud/engine": "4.6.0-beem.5"
   },
-  "__commit__": "d026964c6715be7805a3e5c8addd64d4008d17bd"
+  "__commit__": "51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c"
 }