save merge

src/Error/ActionBlockedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class ActionBlockedError extends XverseError {
     constructor(e) {
         super(1012, e || "\u52A8\u4F5C\u88AB\u5C4F\u853D")

src/Error/ActionMaybeDelayError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class ActionMaybeDelayError extends XverseError {
     constructor(e) {
         super(2334, e || "\u52A8\u4F5C\u53EF\u80FD\u5EF6\u8FDF\u6267\u884C")

src/Error/ActionResponseTimeoutError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class ActionResponseTimeoutError extends XverseError {
     constructor(e) {
         super(2999, e || "action\u56DE\u5305\u8D85\u65F6")

src/Error/AuthenticationError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class AuthenticationError extends XverseError {
     constructor(e) {
         super(1004, e || "\u9274\u6743\u5931\u8D25")

src/Error/AvatarAnimationError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class AvatarAnimationError extends XverseError$1 {
     constructor(e) {
         super(5101, e || "[Engine] \u89D2\u8272\u52A8\u753B\u64AD\u653E\u5931\u8D25")

src/Error/AvatarAssetLoadingError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class AvatarAssetLoadingError extends XverseError {
     constructor(e) {
         super(5100, e || "[Engine] \u89D2\u8272\u8D44\u4EA7\u52A0\u8F7D\u5931\u8D25")

src/Error/BroadcastFailedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class BroadcastFailedError extends XverseError {
     constructor(e) {
         super(2011, e || "\u5E7F\u64AD\u63A5\u53E3\u63A5\u53E3\u5F02\u5E38")

src/Error/ContainerLoadingFailedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class ContainerLoadingFailedError extends XverseError {
     constructor(e) {
         super(5104, e || "[Engine] \u89D2\u8272\u8D44\u4EA7\u62C9\u53D6\u9519\u8BEF")

src/Error/CreateSessionFailedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class CreateSessionFailedError extends XverseError {
     constructor(e) {
         super(2006, e || "\u521B\u5EFA session \u5931\u8D25")

src/Error/DataAbnormalError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class DataAbnormalError extends XverseError {
     constructor(e) {
         super(2012, e || "\u6570\u636E\u5F02\u5E38")

src/Error/DoActionBlockedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class DoActionBlockedError extends XverseError {
     constructor(e) {
         super(2333, e || "\u52A8\u4F5C\u88AB\u5C4F\u853D")

src/Error/DoActionFailedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class DoActionFailedError extends XverseError {
     constructor(e) {
         super(2009, e || "\u52A8\u4F5C\u6267\u884C\u5931\u8D25")

src/Error/DuplicateAvatarIDError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class DuplicateAvatarIDError extends XverseError {
     constructor(e) {
         super(5103, e || "[Engine] \u89D2\u8272id\u91CD\u590D")

src/Error/ExceedMaxAvatarNumError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class ExceedMaxAvatarNumError extends XverseError {
     constructor(e) {
         super(5211, e || "[Engine] \u89D2\u8272\u4E2A\u6570\u8D85\u51FA\u4E0A\u9650")

src/Error/FrequencyLimitError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class FrequencyLimitError extends XverseError {
     constructor(e) {
         super(1014, e || "\u9891\u7387\u9650\u5236")

src/Error/GetOnVehicleError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class GetOnVehicleError extends XverseError {
     constructor(e) {
         super(2015, e || "\u4E0A\u8F7D\u5177\u5931\u8D25\u9700\u8981\u9884\u7EA6")

src/Error/InitDecoderTimeoutError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class InitDecoderTimeoutError extends XverseError {
     constructor(e) {
         super(1008, e || "Decoder \u521D\u59CB\u5316\u8D85\u65F6")

src/Error/InitEngineError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class InitEngineError extends XverseError {
     constructor(e) {
         super(1011, e || "\u5F15\u64CE\u521D\u59CB\u5316\u9519\u8BEF")

src/Error/InitEngineTimeoutError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class InitEngineTimeoutError extends XverseError {
     constructor(e) {
         super(1010, e || "\u5F15\u64CE\u521D\u59CB\u5316\u8D85\u65F6")

src/Error/InternalError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class InternalError extends XverseError {
     constructor(e) {
         super(1002, e || "\u5185\u90E8\u9519\u8BEF")

src/Error/LackOfTokenError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class LackOfTokenError extends XverseError {
     constructor(e) {
         super(2003, e || "\u7F3A\u5C11 Token")

src/Error/LoginFailedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class LoginFailedError extends XverseError {
     constructor(e) {
         super(2004, e || "\u8FDB\u5165\u623F\u95F4\u5931\u8D25")

src/Error/PreloadCanceledError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class PreloadCanceledError extends XverseError {
     constructor(e) {
         super(1013, e || "\u9884\u52A0\u8F7D\u88AB\u53D6\u6D88")

src/Error/RepeatLoginError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class RepeatLoginError extends XverseError {
     constructor(e) {
         super(2017, e || "\u5F02\u5730\u767B\u5F55")

src/Error/RoomDoseNotExistError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class RoomDoseNotExistError extends XverseError {
     constructor(e) {
         super(2018, e || "\u6307\u5B9A\u623F\u95F4\u4E0D\u5B58\u5728")

src/Error/RoomsUpperLimitError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class RoomsUpperLimitError extends XverseError {
     constructor(e) {
         super(2001, e || "\u623F\u95F4\u5230\u8FBE\u4E0A\u9650")

src/Error/RtcConnectionError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class RtcConnectionError extends XverseError {
     constructor(e) {
         super(2008, e || "RTC\u5EFA\u8054\u5931\u8D25")

src/Error/ServerParamError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class ServerParamError extends XverseError {
     constructor(e) {
         super(2002, e || "\u670D\u52A1\u5668\u53C2\u6570\u9519\u8BEF")

src/Error/ServerRateLimitError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class ServerRateLimitError extends XverseError {
     constructor(e) {
         super(2020, e || "\u670D\u52A1\u7AEF\u9891\u7387\u9650\u5236")

src/Error/StateSyncFailedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class StateSyncFailedError extends XverseError {
     constructor(e) {
         super(2010, e || "\u72B6\u6001\u540C\u6B65\u5931\u8D25")

src/Error/TicketExpireError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class TicketExpireError extends XverseError {
     constructor(e) {
         super(2019, e || "\u7968\u636E\u8FC7\u671F")

src/Error/TokenExpiredError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class TokenExpiredError extends XverseError {
     constructor(e) {
         super(1005, e || "Token \u5DF2\u8FC7\u671F")

src/Error/UnsupportedError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class UnsupportedError extends XverseError {
     constructor(e) {
         super(1006, e || "\u624B\u673A\u7CFB\u7EDF\u4E0D\u652F\u6301XVerse")

src/Error/UsersUpperLimitError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class UsersUpperLimitError extends XverseError {
     constructor(e) {
         super(2e3, e || "\u76F4\u64AD\u95F4\u4EBA\u6570\u5DF2\u6EE1")

src/Error/VerifyServiceDownError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class VerifyServiceDownError extends XverseError {
     constructor(e) {
         super(2005, e || "\u9274\u6743\u670D\u52A1\u5F02\u5E38")

src/Error/XBreathPointError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XBreathPointError extends XverseError {
     constructor(e) {
         super(5208, e || "[Engine] \u547C\u5438\u70B9\u9519\u8BEF")

src/Error/XDecalError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XDecalError extends XverseError {
     constructor(e) {
         super(5206, e || "[Engine] Decal\u6A21\u578B\u9519\u8BEF")

src/Error/XDecalTextureError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XDecalTextureError extends XverseError {
     constructor(e) {
         super(5207, e || "[Engine] decal\u7EB9\u7406\u9519\u8BEF")

src/Error/XLowpolyJsonError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XLowpolyJsonError extends XverseError {
     constructor(e) {
         super(5205, e || "[Engine] \u4F20\u5165\u6A21\u578Bjson\u9519\u8BEF")

src/Error/XLowpolyModelError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XLowpolyModelError extends XverseError {
     constructor(e) {
         super(5204, e || "[Engine] \u4F20\u5165\u6A21\u578Burl\u9519\u8BEF")

src/Error/XMaterialError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XMaterialError extends XverseError {
     constructor(e) {
         super(5210, e || "[Engine] Material\u9519\u8BEF")

src/Error/XTvMediaUrlError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XTvMediaUrlError extends XverseError {
     constructor(e) {
         super(5201, e || "[Engine] \u4F20\u5165Url\u9519\u8BEF")

src/Error/XTvModelError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XTvModelError extends XverseError {
     constructor(e) {
         super(5203, e || "[Engine] \u4F20\u5165TV\u6A21\u578Burl\u9519\u8BEF")

src/Error/XTvVideoElementError.js

@@ -1,3 +1,5 @@
+import XverseError from "./XverseError.js"
+
 export default class XTvVideoElementError extends XverseError {
     constructor(e) {
         super(5202, e || "[Engine] \u4F20\u5165video DOM\u9519\u8BEF")

src/NetworkController.js

@@ -4,6 +4,7 @@ import Socket from "./Socket.js"
 import Rtcp from "./Rtcp.js"
 import NetworkMonitor from "./NetworkMonitor.js"
 import Stream from "./Stream.js"
+import InternalError from "./error/InternalError.js"
 
 
 

src/Rtcp.js

@@ -21,8 +21,8 @@ export default class Rtcp extends EventEmitter {
 
         //this.workers = new Workers(this,new Logger("decode")),
         //this.workers.registerLogger(new Logger("decode")),
-        this.workers = new Workers(this);
-        this.workers.registerLogger();
+        this.workers = new Workers(this,logger);
+        this.workers.registerLogger(logger);
         this.workers.registerFunction("data", t=>{
             this.emit("data", t)
         }

src/Xverse.js

@@ -14,7 +14,7 @@ export default class Xverse{
         this.NO_CACHE = !1,
         this.env = r || "PROD",
         this.SUB_PACKAGE_VERSION = a,
-        this.debug && Logger.setLevel(LoggerLevels.Debug);
+        this.debug && logger.setLevel(LoggerLevels.Debug);
         const s = this.pageSession = util.uuid();
         
         reporter.updateHeader({

src/Xverse_Room.js

@@ -16,6 +16,7 @@ import MotionType from "./enum/MotionType.js"
 import NetworkController from "./NetworkController.js"
 import InitNetworkTimeoutError from "./error/InitNetworkTimeoutError.js"
 import InitConfigTimeoutError from "./error/InitConfigTimeoutError.js"
+import InitDecoderTimeoutError from "./error/InitDecoderTimeoutError.js"
 
 export default class Xverse_Room extends EventEmitter {
     constructor(e) {

src/开发笔记.txt

@@ -0,0 +1 @@
+1. Logger不能用单例模式，里面的module对应的是类的名称