|
@@ -1,3 +1,6 @@
|
|
|
+import Codes from "./enum/Codes.js"
|
|
|
+import {logger} from "./Logger.js"
|
|
|
+
|
|
|
class XverseRoom extends XverseRoom$1 {
|
|
|
constructor() {
|
|
|
super(...arguments);
|
|
@@ -8,7 +11,7 @@ class XverseRoom extends XverseRoom$1 {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-const log$3 = new Logger("xverse-room");
|
|
|
+//const log$3 = new Logger("xverse-room");
|
|
|
class XverseRoom$1 extends EventEmitter {
|
|
|
constructor(e) {
|
|
|
super();
|
|
@@ -48,12 +51,12 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
E(this, "signal", new Signal(this));
|
|
|
E(this, "firstFrameTimestamp");
|
|
|
E(this, "receiveRtcData", async()=>{
|
|
|
- log$3.info("Invoke receiveRtcData");
|
|
|
+ logger.info("Invoke receiveRtcData");
|
|
|
let e = !1
|
|
|
, t = !1
|
|
|
, r = !1
|
|
|
, n = !1;
|
|
|
- return this.viewMode === "serverless" ? (log$3.warn("set view mode to serverless"),
|
|
|
+ return this.viewMode === "serverless" ? (logger.warn("set view mode to serverless"),
|
|
|
this.setViewMode("observer").then(()=>this, ()=>this)) : new Promise(o=>{
|
|
|
const a = this.networkController.rtcp.workers;
|
|
|
a.registerFunction("signal", s=>{
|
|
@@ -66,21 +69,21 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
timestamp: Date.now()
|
|
|
}),
|
|
|
t || (t = !0,
|
|
|
- log$3.info("Invoke stream event")),
|
|
|
+ logger.info("Invoke stream event")),
|
|
|
s.stream) {
|
|
|
r || (r = !0,
|
|
|
- log$3.info("Invoke updateRawYUVData")),
|
|
|
+ logger.info("Invoke updateRawYUVData")),
|
|
|
this.isUpdatedRawYUVData = !1;
|
|
|
const u = (l = this._currentState.skin) == null ? void 0 : l.fov;
|
|
|
this.sceneManager.materialComponent.updateRawYUVData(s.stream, s.width, s.height, u),
|
|
|
this.isUpdatedRawYUVData = !0
|
|
|
}
|
|
|
- e || (log$3.info("Invoke isAfterRenderRegistered"),
|
|
|
+ e || (logger.info("Invoke isAfterRenderRegistered"),
|
|
|
e = !0,
|
|
|
this.scene.registerAfterRender(()=>{
|
|
|
this.engineProxy.frameRenderNumber >= 2 && (n || (n = !0,
|
|
|
- log$3.info("Invoke registerAfterRender")),
|
|
|
- this.isFirstDataUsed || (log$3.info("Invoke isStreamAvailable"),
|
|
|
+ logger.info("Invoke registerAfterRender")),
|
|
|
+ this.isFirstDataUsed || (logger.info("Invoke isStreamAvailable"),
|
|
|
this.isFirstDataUsed = !0,
|
|
|
this.firstFrameTimestamp = Date.now(),
|
|
|
o(this),
|
|
@@ -96,7 +99,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
),
|
|
|
a.registerFunction("reconnectedFrame", ()=>{}
|
|
|
),
|
|
|
- log$3.info("Invoke decoderWorker.postMessage"),
|
|
|
+ logger.info("Invoke decoderWorker.postMessage"),
|
|
|
a.decoderWorker.postMessage({
|
|
|
t: 5
|
|
|
})
|
|
@@ -112,7 +115,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
const n = e
|
|
|
, {canvas: t} = n
|
|
|
, r = Oe(n, ["canvas"]);
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "startJoinRoomAt",
|
|
|
startTime: Date.now(),
|
|
|
group: "joinRoom",
|
|
@@ -195,7 +198,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
async _initRoom() {
|
|
|
const e = this.validateOptions(this.options);
|
|
|
if (e)
|
|
|
- return log$3.error("initRoom param error", e),
|
|
|
+ return logger.error("initRoom param error", e),
|
|
|
Promise.reject(e);
|
|
|
const {canvas: t, avatarId: r, skinId: n, userId: o, wsServerUrl: a, role: s, token: l, pageSession: u, rotationRenderType: c, isAllSync: h=!1, appId: f, camera: d, player: _, avatarComponents: g, nickname: m, avatarScale: v, firends: y=[], syncByEvent: b=!1, areaName: T, attitude: C=MotionType.Walk, pathName: A, viewMode: S="full", person: P, roomId: R, roomTypeId: M, hasAvatar: x=!1, syncToOthers: I=!1, prioritySync: w=!1, removeWhenDisconnected: O=!0, extra: D} = this.options;
|
|
|
this.setCurrentNetworkOptions({
|
|
@@ -243,7 +246,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
});
|
|
|
try {
|
|
|
await Promise.all([this.initNetwork(), this.initConfig(), this.initWasm()]),
|
|
|
- log$3.info("network config wasm all ready, start to create game");
|
|
|
+ logger.info("network config wasm all ready, start to create game");
|
|
|
const F = await this.requestCreateRoom({
|
|
|
skinId: n
|
|
|
})
|
|
@@ -272,7 +275,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
afterJoinRoom() {
|
|
|
this.joined = !0,
|
|
|
this.viewMode === "observer" && this.setViewModeToObserver(),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
tag: this.viewMode,
|
|
|
value: this.firstFrameTimestamp - this._startTime,
|
|
|
startTime: Date.now(),
|
|
@@ -292,7 +295,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
}
|
|
|
leave() {
|
|
|
var e, t;
|
|
|
- return log$3.info("Invoke room.leave"),
|
|
|
+ return logger.info("Invoke room.leave"),
|
|
|
(e = this.eventsController) == null || e.clearEvents(),
|
|
|
(t = this.networkController) == null || t.quit(),
|
|
|
this
|
|
@@ -313,18 +316,18 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
const e = Date.now();
|
|
|
try {
|
|
|
await this.networkController.connect()._timeout(8e3, new InitNetworkTimeoutError),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "networkInitAt",
|
|
|
startTime: this._startTime,
|
|
|
group: "joinRoom"
|
|
|
}),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "networkInitCost",
|
|
|
startTime: e,
|
|
|
group: "joinRoom"
|
|
|
})
|
|
|
} catch (t) {
|
|
|
- throw log$3.infoAndReportMeasurement({
|
|
|
+ throw logger.infoAndReportMeasurement({
|
|
|
metric: "networkInitAt",
|
|
|
startTime: e,
|
|
|
group: "joinRoom",
|
|
@@ -337,18 +340,18 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
const e = Date.now();
|
|
|
try {
|
|
|
await this.modelManager.getApplicationConfig()._timeout(8e3, new InitConfigTimeoutError),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "configInitAt",
|
|
|
startTime: this._startTime,
|
|
|
group: "joinRoom"
|
|
|
}),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "configInitCost",
|
|
|
startTime: e,
|
|
|
group: "joinRoom"
|
|
|
})
|
|
|
} catch (t) {
|
|
|
- throw log$3.infoAndReportMeasurement({
|
|
|
+ throw logger.infoAndReportMeasurement({
|
|
|
metric: "configInitAt",
|
|
|
startTime: e,
|
|
|
group: "joinRoom",
|
|
@@ -362,12 +365,12 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
try {
|
|
|
this.engineProxy = new EngineProxy(this),
|
|
|
await this.engineProxy.initEngine(e),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "webglInitAt",
|
|
|
startTime: this._startTime,
|
|
|
group: "joinRoom"
|
|
|
}),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "webglInitCost",
|
|
|
startTime: t,
|
|
|
group: "joinRoom"
|
|
@@ -375,9 +378,9 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
return
|
|
|
} catch (r) {
|
|
|
let n = r;
|
|
|
- return r.code !== Codes$1.InitEngineTimeout && (n = new InitEngineError),
|
|
|
- log$3.error(r),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ return r.code !== Codes.InitEngineTimeout && (n = new InitEngineError),
|
|
|
+ logger.error(r),
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "webglInitAt",
|
|
|
startTime: t,
|
|
|
group: "joinRoom",
|
|
@@ -393,7 +396,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
try {
|
|
|
await this.networkController.rtcp.workers.init(this.options.resolution)._timeout(8e3, new InitDecoderTimeoutError),
|
|
|
this.networkController.rtcp.workers.registerFunction("error", t=>{
|
|
|
- log$3.error("decode error", t);
|
|
|
+ logger.error("decode error", t);
|
|
|
const {code: r, message: n} = t;
|
|
|
this.emit("error", {
|
|
|
code: r,
|
|
@@ -401,12 +404,12 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
})
|
|
|
}
|
|
|
),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "wasmInitAt",
|
|
|
group: "joinRoom",
|
|
|
startTime: this._startTime
|
|
|
}),
|
|
|
- log$3.infoAndReportMeasurement({
|
|
|
+ logger.infoAndReportMeasurement({
|
|
|
metric: "wasmInitCost",
|
|
|
group: "joinRoom",
|
|
|
startTime: e
|
|
@@ -416,7 +419,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
}
|
|
|
)
|
|
|
} catch (t) {
|
|
|
- throw log$3.infoAndReportMeasurement({
|
|
|
+ throw logger.infoAndReportMeasurement({
|
|
|
metric: "wasmInitAt",
|
|
|
group: "joinRoom",
|
|
|
startTime: e,
|
|
@@ -464,7 +467,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
}),
|
|
|
s
|
|
|
} catch (r) {
|
|
|
- throw log$3.error("Request create room error", r),
|
|
|
+ throw logger.error("Request create room error", r),
|
|
|
r
|
|
|
}
|
|
|
}
|
|
@@ -479,7 +482,7 @@ class XverseRoom$1 extends EventEmitter {
|
|
|
}
|
|
|
async setViewMode(e) {}
|
|
|
handleRepetLogin() {
|
|
|
- log$3.warn("receive " + Codes$1.RepeatLogin + " for repeat login"),
|
|
|
+ logger.warn("receive " + Codes.RepeatLogin + " for repeat login"),
|
|
|
this.emit("repeatLogin"),
|
|
|
reporter.disable(),
|
|
|
this.networkController.quit()
|