000

src/EngineProxy.js

@@ -12,7 +12,7 @@ import InitEngineTimeoutError from "./error/InitEngineTimeoutError.js"
 import Logger from "./Logger.js"
 import TV from "./TV.js"
 
-const logger = new Logger('bus')
+const logger = new Logger('Bus')
 const http = new Http
 const blobToDataURI = async i=>new Promise((resolve,reject)=>{
     const fileReader = new FileReader;
@@ -161,7 +161,6 @@ export default class EngineProxy{
 
                         logger.infoAndReportMeasurement({
                             value: 0,
-                            startTime: Date.now(),
                             type: "renderError",
                             error: new Error("[SDK] Scene not ready, skip render and reload."),
                             options: {
@@ -181,7 +180,6 @@ export default class EngineProxy{
                         }),
                         logger.infoAndReportMeasurement({
                             value: 0,
-                            startTime: Date.now(),
                             type: "renderError",
                             error,
                             options: {
@@ -386,11 +384,9 @@ export default class EngineProxy{
         const startTime = Date.now();
         return this._loadAssets(e, t)._timeout(r, new InitEngineTimeoutError(`loadAssets timeout(${r}ms)`)).then(o=>(logger.infoAndReportMeasurement({
             tag: "loadAssets",
-            startTime: startTime,
             type: "loadAssets"
         }),o)).catch(err=>(logger.infoAndReportMeasurement({
             tag: "loadAssets",
-            startTime: startTime,
             type: "loadAssets",
             error: err
         }),

src/EventsManager.js

@@ -63,7 +63,7 @@ export default class EventsManager extends EventEmitter {
                 if (code === Codes.Success)
                     resolve(data),
                     this.off(traceId),
-                    logger.infoAndReportMeasurement({ type: s, tag, extraData: e.extra, startTime, traceId });
+                    logger.infoAndReportMeasurement({ type: s, traceId, tag, extraData: e.extra });
                 else {
                     if (code === Codes.ActionMaybeDelay) return;
                     if (code === Codes.DoActionBlocked && e.event === Actions.Rotation) {
@@ -75,7 +75,7 @@ export default class EventsManager extends EventEmitter {
                     this.off(traceId),
                     reject(error),
                     this.emit("actionResponseError", { error, event: e, tag }),
-                    logger.infoAndReportMeasurement({ type: s, tag, extraData: e.extra, error, startTime, traceId })
+                    logger.infoAndReportMeasurement({ type: s, traceId, tag, error, extraData: e.extra })
                 }
             });
 
@@ -90,7 +90,7 @@ export default class EventsManager extends EventEmitter {
                 reject(error),
                 this.events.delete(traceId),
                 this.off(traceId),
-                logger.infoAndReportMeasurement({ type: s, tag, extraData: e.extra, error, startTime, traceId })
+                logger.infoAndReportMeasurement({ type: s, traceId, tag, error, extraData: e.extra })
             }, time)
         })
     }

src/Http.js

@@ -2,7 +2,7 @@ import Xverse from "./Xverse.js"
 import {modelTable} from "./ModelTable.js"
 import Logger from "./Logger.js"
 
-const logger = new Logger('http')
+const logger = new Logger('Http')
 const isIndexedDbSupported = ()=>(window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB) !== void 0
 const dataURItoBlob = i=>{
     let e;

src/Http1.js

@@ -2,7 +2,7 @@ import AxiosCanceler from "./AxiosCanceler"
 
 import Logger from "./Logger.js"
 
-const logger = new Logger('http')
+const logger = new Logger('Http')
 class Http1 extends EventEmitter {
     constructor() {
         super()
@@ -53,7 +53,6 @@ class Http1 extends EventEmitter {
         const _ = Date.now()
           , g = ()=>this.instatnce.request(d).then(m=>(o && logger.infoAndReportMeasurement({
             type: "http",
-            startTime: _,
             extraData: t,
             group: "http",
             tag: o
@@ -65,7 +64,6 @@ class Http1 extends EventEmitter {
             logger.warn(`request ${t} retry, left retry count`, u),
             g()) : (logger.infoAndReportMeasurement({
                 type: "http",
-                startTime: _,
                 error: m,
                 extraData: {
                     url: t,

src/Http2.js

@@ -1,7 +1,7 @@
 import {modelTable} from "./ModelTable.js"
 import Logger from "./Logger.js"
 
-const logger = new Logger('http')
+const logger = new Logger('Http')
 class Http2 extends EventEmitter {
     async get({url: e, useIndexedDb: t=!1, timeout: r=1e4, key: n}) {
         if (t)

src/NetworkController.js

@@ -61,12 +61,10 @@ export default class NetworkController extends EventEmitter {
                 var n, o;
                 r ? ((o = this.room.stats) == null || o.disable(),
                 logger.infoAndReportMeasurement({
-                    type: "pageHide",
-                    startTime: Date.now()
+                    type: "pageHide"
                 })) : ((n = this.room.stats) == null || n.enable(),
                 logger.infoAndReportMeasurement({
                     type: "pageShow",
-                    startTime: Date.now(),
                     extraData: {
                         state: this._state
                     }
@@ -167,13 +165,11 @@ export default class NetworkController extends EventEmitter {
         return logger.info("start reconnect, count:", this.reconnectCount),
         this._reconnect().then(()=>{
             logger.infoAndReportMeasurement({
-                startTime: e,
                 type: "reconnect"
             })
         }
         ).catch(t=>{
             if (logger.infoAndReportMeasurement({
-                startTime: e,
                 type: "reconnect",
                 error: t
             }),
@@ -265,8 +261,7 @@ export default class NetworkController extends EventEmitter {
             logger.infoAndReportMeasurement({
                 type: "baiduRtt",
                 group: "http",
-                value: r,
-                startTime: e
+                value: r
             })
         }),
         !worker) {
@@ -278,7 +273,6 @@ export default class NetworkController extends EventEmitter {
                 logger.infoAndReportMeasurement({
                     type: "workerRtt",
                     group: "http",
-                    startTime: e,
                     value: r.data
                 })
             }

src/Preload.js

@@ -112,7 +112,6 @@ export default class Preload {
             await this._preload(e, f, t);
             logger.infoAndReportMeasurement({
                 tag: e,
-                startTime: n,
                 type: "assetsPreload",
                 extraData: {
                     total: o
@@ -124,14 +123,13 @@ export default class Preload {
             return (this.requests[e].stopped || axios.isCancel(a)) && (s = new PreloadCanceledError),
             logger.infoAndReportMeasurement({
                 tag: e,
-                startTime: n,
                 type: "assetsPreload",
-                extraData: {
-                    total: o
-                },
                 error: s,
                 options: {
                     immediate: !0
+                },
+                extraData: {
+                    total: o
                 }
             }),
             Promise.reject(s)

src/Rtcp.js

@@ -164,12 +164,10 @@ export default class Rtcp extends EventEmitter {
                 this.emit("rtcConnected"),
                 this.network.room.currentNetworkOptions.reconnect || (logger.infoAndReportMeasurement({
                     type: "datachannelOpenedAt",
-                    startTime: this.network.room._startTime,
                     group: "joinRoom"
                 }),
                 logger.infoAndReportMeasurement({
                     type: "datachannelOpenedCost",
-                    startTime: e,
                     group: "joinRoom"
                 }))
                 console.log('this.inputChannel',this.inputChannel)

src/Socket.js

@@ -97,8 +97,7 @@ export default class Socket extends EventEmitter {
       delete mt.token;
       logger.infoAndReportMeasurement({
         type: "startGame",
-        extraData: mt,
-        startTime: Date.now(),
+        extraData: mt
       });
     });
     (this.network = e),
@@ -150,13 +149,11 @@ export default class Socket extends EventEmitter {
           this.network.room.currentNetworkOptions.reconnect ||
             (logger.infoAndReportMeasurement({
               type: "wsOpenedAt",
-              group: "joinRoom",
-              startTime: this.network.room._startTime,
+              group: "joinRoom"
             }),
             logger.infoAndReportMeasurement({
               type: "wsOpenedCost",
-              group: "joinRoom",
-              startTime: t,
+              group: "joinRoom"
             }));
       }),
       this.handleWSEvent();

src/Stats.js

@@ -97,7 +97,6 @@ export default class Stats extends EventEmitter {
         const _ = this.room.viewMode === "observer" || this.room.viewMode === "serverless";
         e && !_ && (logger.infoAndReportMeasurement({
             type: "weakNetwork",
-            startTime: Date.now(),
             extraData: {
                 msg: this._networkSamples.slice(20),
                 netDelayRTTValues: u,

src/Xverse.js

@@ -31,7 +31,6 @@ export default class Xverse{
 
         logger.infoAndReportMeasurement({
             type: "sdkInit",
-            startTime: Date.now(),
             extraData: {
                 version: a,
                 enviroment: r,

src/XverseAvatar.js

@@ -69,7 +69,6 @@ export default class XverseAvatar extends EventEmitter {
             this.isSelf && setTimeout(()=>{
                 logger.infoAndReportMeasurement({
                     tag: animationName,
-                    startTime,
                     value: 0,
                     type: "playAnimationStart"
                 })
@@ -84,8 +83,7 @@ export default class XverseAvatar extends EventEmitter {
             ),
             this.isSelf && logger.infoAndReportMeasurement({
                 tag: animationName,
-                startTime,
-                extra: {
+                extraData: {
                     loop: isLoop
                 },
                 type: "playAnimationEnd"
@@ -94,10 +92,9 @@ export default class XverseAvatar extends EventEmitter {
             return logger.error(`[avatar: ${this.userId}] Play animation failed: ${animationName}`, err),
             this.isSelf && logger.infoAndReportMeasurement({
                 tag: animationName,
-                startTime,
                 type: "playAnimationEnd",
                 error: err,
-                extra: {
+                extraData: {
                     loop: isLoop
                 }
             }),
@@ -144,9 +141,8 @@ export default class XverseAvatar extends EventEmitter {
             })
             this.isSelf && logger.infoAndReportMeasurement({
                 tag: "changeComponents",
-                startTime,
                 type: "changeComponents",
-                extra: {
+                extraData: {
                     inputComponents: avatarComponents,
                     finalComponents: this.avatarComponents,
                     mode: ChangeComponentsMode[mode]
@@ -157,10 +153,9 @@ export default class XverseAvatar extends EventEmitter {
         } catch (error) {
             this.isSelf && logger.infoAndReportMeasurement({
                 tag: "changeComponents",
-                startTime,
                 type: "changeComponents",
                 error,
-                extra: {
+                extraData: {
                     inputComponents: avatarComponents,
                     finalComponents: this.avatarComponents,
                     mode: ChangeComponentsMode[mode]

src/XverseAvatarManager.js

@@ -302,12 +302,10 @@ export default class XverseAvatarManager extends EventEmitter {
             userId === this._room.userId && (
                 logger.infoAndReportMeasurement({
                     type: "avatarLoadDuration",
-                    startTime,
                     group: "costs"
                 }),
                 logger.infoAndReportMeasurement({
                     type: "avatarLoadAt",
-                    startTime: this._room._startTime,
                     group: "costs"
                 })
             )
@@ -354,10 +352,9 @@ export default class XverseAvatarManager extends EventEmitter {
                 o.motionType === MotionType.Run && (a = "Running")),
                 o._playAnimation(a, !0, !0),
                 logger.infoAndReportMeasurement({
-                    startTime: Date.now(),
                     value: 0,
                     type: n ? "userAvatarStartRotating" : "userAvatarStopRotating",
-                    extra: {
+                    extraData: {
                         motionType: o.motionType,
                         moveToExtra: this._room.moveToExtra
                     }
@@ -379,10 +376,9 @@ export default class XverseAvatarManager extends EventEmitter {
                 })),
                 o._playAnimation(a, !0, !0),
                 logger.infoAndReportMeasurement({
-                    startTime: Date.now(),
                     value: 0,
                     type: r ? "userAvatarStartMoving" : "userAvatarStopMoving",
-                    extra: {
+                    extraData: {
                         motionType: o.motionType,
                         moveToExtra: this._room.moveToExtra
                     }

src/Xverse_Room.js

@@ -78,10 +78,9 @@ export default class Xverse_Room extends EventEmitter {
 
     logger.infoAndReportMeasurement({
       type: "startJoinRoomAt",
-      startTime: Date.now(),
       group: "joinRoom",
-      extraData: r,
       value: 0,
+      extraData: r
     });
   }
 
@@ -276,7 +275,6 @@ export default class Xverse_Room extends EventEmitter {
       logger.infoAndReportMeasurement({
         tag: this.viewMode,
         value: this.firstFrameTimestamp || Date.now() - this._startTime,
-        startTime: Date.now(),
         type: "joinRoom",
         options: {
           immediate: !0,
@@ -328,19 +326,16 @@ export default class Xverse_Room extends EventEmitter {
         ._timeout(8e3, new InitNetworkTimeoutError()),
         logger.infoAndReportMeasurement({
           type: "networkInitAt",
-          startTime: this._startTime,
           group: "joinRoom",
         }),
         logger.infoAndReportMeasurement({
           type: "networkInitCost",
-          startTime: e,
           group: "joinRoom",
         });
     } catch (t) {
       throw (
         (logger.infoAndReportMeasurement({
           type: "networkInitAt",
-          startTime: e,
           group: "joinRoom",
           error: t,
         }),
@@ -356,19 +351,16 @@ export default class Xverse_Room extends EventEmitter {
         ._timeout(8e3, new InitConfigTimeoutError()),
         logger.infoAndReportMeasurement({
           type: "configInitAt",
-          startTime: this._startTime,
           group: "joinRoom",
         }),
         logger.infoAndReportMeasurement({
           type: "configInitCost",
-          startTime: e,
           group: "joinRoom",
         });
     } catch (t) {
       throw (
         (logger.infoAndReportMeasurement({
           type: "configInitAt",
-          startTime: e,
           group: "joinRoom",
           error: t,
         }),
@@ -383,12 +375,10 @@ export default class Xverse_Room extends EventEmitter {
         await this.engineProxy.initEngine(e),
         logger.infoAndReportMeasurement({
           type: "webglInitAt",
-          startTime: this._startTime,
           group: "joinRoom",
         }),
         logger.infoAndReportMeasurement({
           type: "webglInitCost",
-          startTime: t,
           group: "joinRoom",
         });
       return;
@@ -400,7 +390,6 @@ export default class Xverse_Room extends EventEmitter {
         logger.error(r),
         logger.infoAndReportMeasurement({
           type: "webglInitAt",
-          startTime: t,
           group: "joinRoom",
           error: n,
         }),
@@ -431,13 +420,11 @@ export default class Xverse_Room extends EventEmitter {
         }),
         logger.infoAndReportMeasurement({
           type: "wasmInitAt",
-          group: "joinRoom",
-          startTime: this._startTime,
+          group: "joinRoom"
         }),
         logger.infoAndReportMeasurement({
           type: "wasmInitCost",
-          group: "joinRoom",
-          startTime: i,
+          group: "joinRoom"
         }),
         eventsManager.on("traceId", (o) => {
           this.networkController.rtcp.workers.onTraceId(o);
@@ -447,7 +434,6 @@ export default class Xverse_Room extends EventEmitter {
         (logger.infoAndReportMeasurement({
           type: "wasmInitAt",
           group: "joinRoom",
-          startTime: i,
           error: o,
         }),
           o)