roomId etc

dist/assets/config.json

@@ -5,8 +5,8 @@
         "config": {
             "avatars": [
                 {
-                    "id": "KGe_Boy",
-                    "name": "KGe_Boy",
+                    "id": "My_Actor",
+                    "name": "My_Actor",
                     "url": "./assets/avatar/YXTN.zip",
                     "gender": "man",
                     "components": [],
@@ -24,7 +24,7 @@
             ],
             "skins": [
                 {
-                    "id": "10089",
+                    "id": "0000000001",
                     "name": "梁启超_Cookonlymaps",
                     "versionId": "00008",
                     "isEnable": false,
@@ -100,7 +100,7 @@
                     "visibleRules": [],
                     "animationList": [
                         {
-                            "avatarId": "KGe_Boy",
+                            "avatarId": "My_Actor",
                             "animations": [
                                 "Walking",
                                 "Idle"
@@ -151,7 +151,7 @@
                     "packName": "",
                     "typeName": "MODEL",
                     "className": "粗模",
-                    "skinId": "10089",
+                    "skinId": "0000000001",
                     "size": 3638904
                 },
                 {
@@ -159,7 +159,7 @@
                     "packName": "",
                     "typeName": "CONFIG",
                     "className": "环境光",
-                    "skinId": "10089",
+                    "skinId": "0000000001",
                     "size": 2723658
                 },
                 {

dist/assets/config_YXTN.json

@@ -5,8 +5,8 @@
         "config": {
             "avatars": [
                 {
-                    "id": "KGe_Boy",
-                    "name": "KGe_Boy",
+                    "id": "My_Actor",
+                    "name": "My_Actor",
                     "url": "./assets/avatar/YXTN.zip",
                     "gender": "man",
                     "components": [],
@@ -24,7 +24,7 @@
             ],
             "skins": [
                 {
-                    "id": "10089",
+                    "id": "0000000001",
                     "name": "梁启超_Cookonlymaps",
                     "versionId": "00008",
                     "isEnable": false,
@@ -100,7 +100,7 @@
                     "visibleRules": [],
                     "animationList": [
                         {
-                            "avatarId": "KGe_Boy",
+                            "avatarId": "My_Actor",
                             "animations": [
                                 "Walking",
                                 "Idle"
@@ -151,7 +151,7 @@
                     "packName": "",
                     "typeName": "MODEL",
                     "className": "粗模",
-                    "skinId": "10089",
+                    "skinId": "0000000001",
                     "size": 3638904
                 },
                 {
@@ -159,7 +159,7 @@
                     "packName": "",
                     "typeName": "CONFIG",
                     "className": "环境光",
-                    "skinId": "10089",
+                    "skinId": "0000000001",
                     "size": 2723658
                 },
                 {

dist/assets/config_body_man.json

@@ -5,8 +5,8 @@
         "config": {
             "avatars": [
                 {
-                    "id": "KGe_Boy",
-                    "name": "KGe_Boy",
+                    "id": "My_Actor",
+                    "name": "My_Actor",
                     "url": "./assets/avatar/body_man.zip",
                     "gender": "man",
                     "components": [
@@ -480,7 +480,7 @@
             ],
             "skins": [
                 {
-                    "id": "10089",
+                    "id": "0000000001",
                     "name": "梁启超_Cookonlymaps",
                     "versionId": "00008",
                     "isEnable": false,
@@ -548,7 +548,7 @@
                     "visibleRules": [],
                     "animationList": [
                         {
-                            "avatarId": "KGe_Boy",
+                            "avatarId": "My_Actor",
                             "animations": [
                                 "Dance01",
                                 "Dance05",
@@ -2399,7 +2399,7 @@
                     "packName": "",
                     "typeName": "MODEL",
                     "className": "粗模",
-                    "skinId": "10089",
+                    "skinId": "0000000001",
                     "size": 3638904
                 },
                 {
@@ -2407,7 +2407,7 @@
                     "packName": "",
                     "typeName": "CONFIG",
                     "className": "环境光",
-                    "skinId": "10089",
+                    "skinId": "0000000001",
                     "size": 2723658
                 },
                 {

dist/assets/config_man_YXL.json

@@ -5,8 +5,8 @@
         "config": {
             "avatars": [
                 {
-                    "id": "KGe_Boy",
-                    "name": "KGe_Boy",
+                    "id": "My_Actor",
+                    "name": "My_Actor",
                     "url": "./assets/avatar/man_YXL.zip",
                     "gender": "man",
                     "components": [],
@@ -24,7 +24,7 @@
             ],
             "skins": [
                 {
-                    "id": "10089",
+                    "id": "0000000001",
                     "name": "梁启超_Cookonlymaps",
                     "versionId": "00008",
                     "isEnable": false,
@@ -100,7 +100,7 @@
                     "visibleRules": [],
                     "animationList": [
                         {
-                            "avatarId": "KGe_Boy",
+                            "avatarId": "My_Actor",
                             "animations": [
                                 "Walking",
                                 "Idle"
@@ -151,7 +151,7 @@
                     "packName": "",
                     "typeName": "MODEL",
                     "className": "粗模",
-                    "skinId": "10089",
+                    "skinId": "0000000001",
                     "size": 3638904
                 },
                 {
@@ -159,7 +159,7 @@
                     "packName": "",
                     "typeName": "CONFIG",
                     "className": "环境光",
-                    "skinId": "10089",
+                    "skinId": "0000000001",
                     "size": 2723658
                 },
                 {

src/EngineProxy.js

@@ -162,9 +162,9 @@ export default class EngineProxy{
                         logger.infoAndReportMeasurement({
                             value: 0,
                             startTime: Date.now(),
-                            metric: "renderError",
+                            type: "renderError",
                             error: new Error("[SDK] Scene not ready, skip render and reload."),
-                            reportOptions: {
+                            options: {
                                 sampleRate: .1
                             }
                         })
@@ -182,9 +182,9 @@ export default class EngineProxy{
                         logger.infoAndReportMeasurement({
                             value: 0,
                             startTime: Date.now(),
-                            metric: "renderError",
+                            type: "renderError",
                             error,
-                            reportOptions: {
+                            options: {
                                 sampleRate: .1
                             }
                         })
@@ -387,11 +387,11 @@ export default class EngineProxy{
         return this._loadAssets(e, t)._timeout(r, new InitEngineTimeoutError(`loadAssets timeout(${r}ms)`)).then(o=>(logger.infoAndReportMeasurement({
             tag: "loadAssets",
             startTime: startTime,
-            metric: "loadAssets"
+            type: "loadAssets"
         }),o)).catch(err=>(logger.infoAndReportMeasurement({
             tag: "loadAssets",
             startTime: startTime,
-            metric: "loadAssets",
+            type: "loadAssets",
             error: err
         }),
         Promise.reject(err)))

src/EventsManager.js

@@ -4,7 +4,7 @@ import util from "./util.js"
 import Logger from "./Logger.js"
 import ActionResponseTimeoutError from "./error/ActionResponseTimeoutError.js"
 
-const logger = new Logger('events')
+const logger = new Logger('EventsManager')
 export default class EventsManager extends EventEmitter {
     constructor() {
         super(...arguments);
@@ -63,7 +63,7 @@ export default class EventsManager extends EventEmitter {
                 if (code === Codes.Success)
                     resolve(data),
                     this.off(traceId),
-                    logger.infoAndReportMeasurement({ metric: s, tag, extra: e.extra, startTime, traceId });
+                    logger.infoAndReportMeasurement({ type: s, tag, extraData: e.extra, startTime, traceId });
                 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({ metric: s, tag, extra: e.extra, error, startTime, traceId })
+                    logger.infoAndReportMeasurement({ type: s, tag, extraData: e.extra, error, startTime, traceId })
                 }
             });
 
@@ -90,7 +90,7 @@ export default class EventsManager extends EventEmitter {
                 reject(error),
                 this.events.delete(traceId),
                 this.off(traceId),
-                logger.infoAndReportMeasurement({ metric: s, tag, extra: e.extra, error, startTime, traceId })
+                logger.infoAndReportMeasurement({ type: s, tag, extraData: e.extra, error, startTime, traceId })
             }, time)
         })
     }

src/Http1.js

@@ -52,9 +52,9 @@ class Http1 extends EventEmitter {
         }, d));
         const _ = Date.now()
           , g = ()=>this.instatnce.request(d).then(m=>(o && logger.infoAndReportMeasurement({
-            metric: "http",
+            type: "http",
             startTime: _,
-            extra: t,
+            extraData: t,
             group: "http",
             tag: o
         }),
@@ -64,10 +64,10 @@ class Http1 extends EventEmitter {
             return u > 0 && !v ? (u--,
             logger.warn(`request ${t} retry, left retry count`, u),
             g()) : (logger.infoAndReportMeasurement({
-                metric: "http",
+                type: "http",
                 startTime: _,
                 error: m,
-                extra: {
+                extraData: {
                     url: t,
                     isCanceled: v
                 },

src/Http2.js

@@ -19,7 +19,7 @@ class Http2 extends EventEmitter {
                 const l = `${a && a.model ? "found" : "notFound"} data by search ${e} `;
                 if (logger.debug(l),
                 reporter$1.report("measurement", {
-                    metric: "indexedDB",
+                    type: "indexedDB",
                     value: s - o,
                     extra: l
                 }),
@@ -78,7 +78,7 @@ class Http2 extends EventEmitter {
                         const u = window.performance.now();
                         return logger.debug(`download ${e} takes:${u - s}ms`),
                         reporter$1.report("measurement", {
-                            metric: "http",
+                            type: "http",
                             value: u - s,
                             extra: e
                         }),

src/NetworkController.js

@@ -61,13 +61,13 @@ export default class NetworkController extends EventEmitter {
                 var n, o;
                 r ? ((o = this.room.stats) == null || o.disable(),
                 logger.infoAndReportMeasurement({
-                    metric: "pageHide",
+                    type: "pageHide",
                     startTime: Date.now()
                 })) : ((n = this.room.stats) == null || n.enable(),
                 logger.infoAndReportMeasurement({
-                    metric: "pageShow",
+                    type: "pageShow",
                     startTime: Date.now(),
-                    extra: {
+                    extraData: {
                         state: this._state
                     }
                 }),
@@ -168,13 +168,13 @@ export default class NetworkController extends EventEmitter {
         this._reconnect().then(()=>{
             logger.infoAndReportMeasurement({
                 startTime: e,
-                metric: "reconnect"
+                type: "reconnect"
             })
         }
         ).catch(t=>{
             if (logger.infoAndReportMeasurement({
                 startTime: e,
-                metric: "reconnect",
+                type: "reconnect",
                 error: t
             }),
             t.code === Codes.RepeatLogin) {
@@ -263,7 +263,7 @@ export default class NetworkController extends EventEmitter {
         const e = Date.now();
         if (this.pingOthers("https://www.baidu.com", function(t, r) {
             logger.infoAndReportMeasurement({
-                metric: "baiduRtt",
+                type: "baiduRtt",
                 group: "http",
                 value: r,
                 startTime: e
@@ -276,7 +276,7 @@ export default class NetworkController extends EventEmitter {
             worker = new Worker(URL.createObjectURL(t)),
             worker.onmessage = function(r) {
                 logger.infoAndReportMeasurement({
-                    metric: "workerRtt",
+                    type: "workerRtt",
                     group: "http",
                     startTime: e,
                     value: r.data

src/Preload.js

@@ -113,8 +113,8 @@ export default class Preload {
             logger.infoAndReportMeasurement({
                 tag: e,
                 startTime: n,
-                metric: "assetsPreload",
-                extra: {
+                type: "assetsPreload",
+                extraData: {
                     total: o
                 }
             });
@@ -125,12 +125,12 @@ export default class Preload {
             logger.infoAndReportMeasurement({
                 tag: e,
                 startTime: n,
-                metric: "assetsPreload",
-                extra: {
+                type: "assetsPreload",
+                extraData: {
                     total: o
                 },
                 error: s,
-                reportOptions: {
+                options: {
                     immediate: !0
                 }
             }),

src/Rtcp.js

@@ -163,12 +163,12 @@ export default class Rtcp extends EventEmitter {
                 this.inputReady = !0,
                 this.emit("rtcConnected"),
                 this.network.room.currentNetworkOptions.reconnect || (logger.infoAndReportMeasurement({
-                    metric: "datachannelOpenedAt",
+                    type: "datachannelOpenedAt",
                     startTime: this.network.room._startTime,
                     group: "joinRoom"
                 }),
                 logger.infoAndReportMeasurement({
-                    metric: "datachannelOpenedCost",
+                    type: "datachannelOpenedCost",
                     startTime: e,
                     group: "joinRoom"
                 }))

src/Socket.js

@@ -96,8 +96,8 @@ export default class Socket extends EventEmitter {
       const mt = JSON.parse(x.data);
       delete mt.token;
       logger.infoAndReportMeasurement({
-        metric: "startGame",
-        extra: mt,
+        type: "startGame",
+        extraData: mt,
         startTime: Date.now(),
       });
     });
@@ -149,12 +149,12 @@ export default class Socket extends EventEmitter {
           this.heartbeat.start(),
           this.network.room.currentNetworkOptions.reconnect ||
             (logger.infoAndReportMeasurement({
-              metric: "wsOpenedAt",
+              type: "wsOpenedAt",
               group: "joinRoom",
               startTime: this.network.room._startTime,
             }),
             logger.infoAndReportMeasurement({
-              metric: "wsOpenedCost",
+              type: "wsOpenedCost",
               group: "joinRoom",
               startTime: t,
             }));

src/Stats.js

@@ -96,9 +96,9 @@ export default class Stats extends EventEmitter {
         (h >= d || f >= d) && (e = !0);
         const _ = this.room.viewMode === "observer" || this.room.viewMode === "serverless";
         e && !_ && (logger.infoAndReportMeasurement({
-            metric: "weakNetwork",
+            type: "weakNetwork",
             startTime: Date.now(),
-            extra: {
+            extraData: {
                 msg: this._networkSamples.slice(20),
                 netDelayRTTValues: u,
                 netDelayHBValues: c

src/Workers.js

@@ -480,14 +480,14 @@ export default class Workers {
       this.firstYUVDecoded = e.data.yuv_ts;
       const k = this.firstYUVDecoded - this.rtcp.network.room._startTime;
       defaultLogger.infoAndReportMeasurement({
-        metric: "firstYUVDecodedAt",
+        type: "firstYUVDecodedAt",
         value: k,
         group: "joinRoom",
       });
       this.firstRender = Date.now();
       const j = this.firstYUVDecoded - this.rtcp.network.room._startTime;
       defaultLogger.infoAndReportMeasurement({
-        metric: "firstRenderAt",
+        type: "firstRenderAt",
         value: j,
         group: "joinRoom",
       });
@@ -807,7 +807,7 @@ export default class Workers {
         const $ =
           ((i = this.cachedStreams[e]) == null ? void 0 : i.byteLength) || 0;
         defaultLogger.infoAndReportMeasurement({
-          metric: "firstUpdateStreamLength",
+          type: "firstUpdateStreamLength",
           value: $,
           group: "joinRoom",
         });
@@ -1206,7 +1206,7 @@ export default class Workers {
         const Ct = this.firstMediaArrival - this.rtcp.network.room._startTime;
 
         defaultLogger.infoAndReportMeasurement({
-          metric: "firstMediaArravalAt",
+          type: "firstMediaArravalAt",
           value: Ct,
           group: "joinRoom",
         });
@@ -1364,7 +1364,7 @@ export default class Workers {
             const Dt =
               this.firstMediaArrival - this.rtcp.network.room._startTime;
             defaultLogger.infoAndReportMeasurement({
-              metric: "firstMediaArravalAt",
+              type: "firstMediaArravalAt",
               value: Dt,
               group: "joinRoom",
             });

src/Xverse.js

@@ -30,9 +30,9 @@ export default class Xverse{
         })
 
         logger.infoAndReportMeasurement({
-            metric: "sdkInit",
+            type: "sdkInit",
             startTime: Date.now(),
-            extra: {
+            extraData: {
                 version: a,
                 enviroment: r,
                 pageSession: s

src/XverseAvatar.js

@@ -71,7 +71,7 @@ export default class XverseAvatar extends EventEmitter {
                     tag: animationName,
                     startTime,
                     value: 0,
-                    metric: "playAnimationStart"
+                    type: "playAnimationStart"
                 })
             });
 
@@ -88,14 +88,14 @@ export default class XverseAvatar extends EventEmitter {
                 extra: {
                     loop: isLoop
                 },
-                metric: "playAnimationEnd"
+                type: "playAnimationEnd"
             })
         } catch (err) {
             return logger.error(`[avatar: ${this.userId}] Play animation failed: ${animationName}`, err),
             this.isSelf && logger.infoAndReportMeasurement({
                 tag: animationName,
                 startTime,
-                metric: "playAnimationEnd",
+                type: "playAnimationEnd",
                 error: err,
                 extra: {
                     loop: isLoop
@@ -145,7 +145,7 @@ export default class XverseAvatar extends EventEmitter {
             this.isSelf && logger.infoAndReportMeasurement({
                 tag: "changeComponents",
                 startTime,
-                metric: "changeComponents",
+                type: "changeComponents",
                 extra: {
                     inputComponents: avatarComponents,
                     finalComponents: this.avatarComponents,
@@ -158,7 +158,7 @@ export default class XverseAvatar extends EventEmitter {
             this.isSelf && logger.infoAndReportMeasurement({
                 tag: "changeComponents",
                 startTime,
-                metric: "changeComponents",
+                type: "changeComponents",
                 error,
                 extra: {
                     inputComponents: avatarComponents,

src/XverseAvatarManager.js

@@ -301,12 +301,12 @@ export default class XverseAvatarManager extends EventEmitter {
 
             userId === this._room.userId && (
                 logger.infoAndReportMeasurement({
-                    metric: "avatarLoadDuration",
+                    type: "avatarLoadDuration",
                     startTime,
                     group: "costs"
                 }),
                 logger.infoAndReportMeasurement({
-                    metric: "avatarLoadAt",
+                    type: "avatarLoadAt",
                     startTime: this._room._startTime,
                     group: "costs"
                 })
@@ -356,7 +356,7 @@ export default class XverseAvatarManager extends EventEmitter {
                 logger.infoAndReportMeasurement({
                     startTime: Date.now(),
                     value: 0,
-                    metric: n ? "userAvatarStartRotating" : "userAvatarStopRotating",
+                    type: n ? "userAvatarStartRotating" : "userAvatarStopRotating",
                     extra: {
                         motionType: o.motionType,
                         moveToExtra: this._room.moveToExtra
@@ -381,7 +381,7 @@ export default class XverseAvatarManager extends EventEmitter {
                 logger.infoAndReportMeasurement({
                     startTime: Date.now(),
                     value: 0,
-                    metric: r ? "userAvatarStartMoving" : "userAvatarStopMoving",
+                    type: r ? "userAvatarStartMoving" : "userAvatarStopMoving",
                     extra: {
                         motionType: o.motionType,
                         moveToExtra: this._room.moveToExtra

src/Xverse_Room.js

@@ -77,10 +77,10 @@ export default class Xverse_Room extends EventEmitter {
       r = Oe(n, ["canvas"]);
 
     logger.infoAndReportMeasurement({
-      metric: "startJoinRoomAt",
+      type: "startJoinRoomAt",
       startTime: Date.now(),
       group: "joinRoom",
-      extra: r,
+      extraData: r,
       value: 0,
     });
   }
@@ -277,8 +277,8 @@ export default class Xverse_Room extends EventEmitter {
         tag: this.viewMode,
         value: this.firstFrameTimestamp || Date.now() - this._startTime,
         startTime: Date.now(),
-        metric: "joinRoom",
-        reportOptions: {
+        type: "joinRoom",
+        options: {
           immediate: !0,
         },
       }),
@@ -327,19 +327,19 @@ export default class Xverse_Room extends EventEmitter {
         .connect()
         ._timeout(8e3, new InitNetworkTimeoutError()),
         logger.infoAndReportMeasurement({
-          metric: "networkInitAt",
+          type: "networkInitAt",
           startTime: this._startTime,
           group: "joinRoom",
         }),
         logger.infoAndReportMeasurement({
-          metric: "networkInitCost",
+          type: "networkInitCost",
           startTime: e,
           group: "joinRoom",
         });
     } catch (t) {
       throw (
         (logger.infoAndReportMeasurement({
-          metric: "networkInitAt",
+          type: "networkInitAt",
           startTime: e,
           group: "joinRoom",
           error: t,
@@ -355,19 +355,19 @@ export default class Xverse_Room extends EventEmitter {
         .getApplicationConfig()
         ._timeout(8e3, new InitConfigTimeoutError()),
         logger.infoAndReportMeasurement({
-          metric: "configInitAt",
+          type: "configInitAt",
           startTime: this._startTime,
           group: "joinRoom",
         }),
         logger.infoAndReportMeasurement({
-          metric: "configInitCost",
+          type: "configInitCost",
           startTime: e,
           group: "joinRoom",
         });
     } catch (t) {
       throw (
         (logger.infoAndReportMeasurement({
-          metric: "configInitAt",
+          type: "configInitAt",
           startTime: e,
           group: "joinRoom",
           error: t,
@@ -382,12 +382,12 @@ export default class Xverse_Room extends EventEmitter {
       (this.engineProxy = new EngineProxy(this)),
         await this.engineProxy.initEngine(e),
         logger.infoAndReportMeasurement({
-          metric: "webglInitAt",
+          type: "webglInitAt",
           startTime: this._startTime,
           group: "joinRoom",
         }),
         logger.infoAndReportMeasurement({
-          metric: "webglInitCost",
+          type: "webglInitCost",
           startTime: t,
           group: "joinRoom",
         });
@@ -399,7 +399,7 @@ export default class Xverse_Room extends EventEmitter {
         r.code !== Codes.InitEngineTimeout && (n = new InitEngineError()),
         logger.error(r),
         logger.infoAndReportMeasurement({
-          metric: "webglInitAt",
+          type: "webglInitAt",
           startTime: t,
           group: "joinRoom",
           error: n,
@@ -430,12 +430,12 @@ export default class Xverse_Room extends EventEmitter {
           });
         }),
         logger.infoAndReportMeasurement({
-          metric: "wasmInitAt",
+          type: "wasmInitAt",
           group: "joinRoom",
           startTime: this._startTime,
         }),
         logger.infoAndReportMeasurement({
-          metric: "wasmInitCost",
+          type: "wasmInitCost",
           group: "joinRoom",
           startTime: i,
         }),
@@ -445,7 +445,7 @@ export default class Xverse_Room extends EventEmitter {
     } catch (o) {
       throw (
         (logger.infoAndReportMeasurement({
-          metric: "wasmInitAt",
+          type: "wasmInitAt",
           group: "joinRoom",
           startTime: i,
           error: o,

src/main.js

@@ -31,9 +31,9 @@ const l = async()=>{
  
         let room = await xverse.joinRoom({
             canvas: document.getElementById('canvas'),
-            skinId: '10089',
-            avatarId: 'KGe_Boy',
-            roomId: 'e629ef3e-022d-4e64-8654-703bb96410eb',
+            skinId: '0000000001',
+            avatarId: 'My_Actor',
+            roomId: 'aea5406a-3099-48db-b428-30917872e58a',
             userId: nickname,
             //wsServerUrl: 'wss://uat-eks.xverse.cn/ws',
             // wsServerUrl: "ws://localhost:6688/ws",