xushiting 3 years ago
parent
commit
9b42a1a2d7

+ 1 - 1
src/ActionsHandler.js

@@ -1,9 +1,9 @@
-//const logger = new Logger("actions-handler")
 import Actions from "./enum/Actions.js"
 import {eventsManager} from "./EventsManager.js"
 import util from "./util.js"
 import Person from "./enum/Person.js"
 import ClickType from "./enum/ClickType.js"
+import Logger from "./Logger.js"
 
 const logger = new Logger('actions-handler')
 const QueueActions = [Actions.Transfer, Actions.ChangeSkin, Actions.GetOnVehicle, Actions.GetOffVehicle];

+ 2 - 2
src/BaseTable.js

@@ -1,6 +1,6 @@
-//const log\$e = new Logger("db");
-import {logger} from "./Logger.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('db')
 export default class BaseTable {
     constructor(e, t) {
         this.db = null

+ 3 - 2
src/Broadcast.js

@@ -1,6 +1,7 @@
-//const logger = new Logger("xverse-broadcast")
-import {logger} from "./Logger.js"
 import MessageHandleType from "./enum/MessageHandleType.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('xverse-broadcast')
 
 export default class Broadcast{
     constructor(e, t) {

+ 2 - 1
src/Camera.js

@@ -1,9 +1,10 @@
-import {logger} from "./Logger.js"
 import CameraStates from "./enum/CameraStates.js"
 import Person from "./enum/Person.js"
 import EImageQuality from "./enum/EImageQuality.js"
 import Actions from "./enum/Actions.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('camera')
 export default class Camera extends EventEmitter {
     constructor(e) {
         super();

+ 2 - 2
src/EngineProxy.js

@@ -1,5 +1,3 @@
-//const logger = new Logger("xverse-bus")
-import {logger} from "./Logger.js"
 import CircularArray from "./CircularArray.js"
 import AssetTypeName from "./enum/AssetTypeName.js"
 import AssetClassName from "./enum/AssetClassName.js"
@@ -11,7 +9,9 @@ import XSceneManager from "./XSceneManager.js"
 import XBillboardManager from "./XBillboardManager.js"
 import ModelManager from "./ModelManager.js"
 import InitEngineTimeoutError from "./error/InitEngineTimeoutError.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('xverse-bus')
 const http = new Http
   , blobToDataURI = async i=>new Promise((e,t)=>{
     const r = new FileReader;

+ 3 - 1
src/EventsController.js

@@ -1,7 +1,9 @@
 import {eventsManager} from "./EventsManager.js"
-import {logger} from "./Logger.js"
 import StaticMeshEvent from "./StaticMeshEvent.js"
 import RotationEvent from "./RotationEvent.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('eventsController')
 
 export default class EventsController {
     constructor(e) {

+ 2 - 1
src/EventsManager.js

@@ -1,8 +1,9 @@
-import {logger} from "./Logger.js"
 import Actions from "./enum/Actions.js"
 import Codes from "./enum/Codes.js"
 import util from "./util.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('events')
 export default class EventsManager extends EventEmitter {
     constructor() {
         super(...arguments);

+ 3 - 1
src/Heartbeat.js

@@ -1,4 +1,6 @@
-import {logger} from "./Logger.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('heartbeat')
 
 export default class Heartbeat {
     constructor(e) {

+ 2 - 2
src/Http.js

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

+ 3 - 1
src/Http1.js

@@ -1,6 +1,8 @@
-import {logger} from "./Logger.js"
 import AxiosCanceler from "./AxiosCanceler"
 
+import Logger from "./Logger.js"
+
+const logger = new Logger('http')
 class Http1 extends EventEmitter {
     constructor() {
         super()

+ 2 - 2
src/Http2.js

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

+ 0 - 21
src/Logger1.js

@@ -1,21 +0,0 @@
-export default class Logger1{
-    constructor(e) {
-        E(this, "module");
-        this.module = e
-    }
-    static setLogger(e) {
-        Logger1.instance = e
-    }
-    debug(...e) {
-        return Logger1.instance.debug(...e)
-    }
-    info(...e) {
-        return Logger1.instance.info(...e)
-    }
-    warn(...e) {
-        return Logger1.instance.warn(...e)
-    }
-    error(...e) {
-        return Logger1.instance.error(...e)
-    }
-};

+ 2 - 2
src/ModelManager.js

@@ -1,8 +1,8 @@
-//const log$f = new Logger("model-manager")
-import {logger} from "./Logger.js"
 import {http1} from "./Http1.js"
 import util from "./util.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('model-manager')
 export default class ModelManager{
     constructor(e, t) {
         this.avatarModelList = []

+ 3 - 1
src/NetworkController.js

@@ -1,5 +1,4 @@
 import Codes from "./enum/Codes.js"
-import {logger} from "./Logger.js"
 import Socket from "./Socket.js"
 import Rtcp from "./Rtcp.js"
 import NetworkMonitor from "./NetworkMonitor.js"
@@ -7,6 +6,9 @@ import Stream from "./Stream.js"
 import InternalError from "./error/InternalError.js"
 import util from "./util.js"
 import Actions from "./enum/Actions.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('NetworkController')
 
 var workerSourceCode = `onmessage = function (event) {
     const data = event.data

+ 2 - 1
src/Panorama.js

@@ -1,8 +1,9 @@
 import Codes from "./enum/Codes.js"
-import {logger} from "./Logger.js"
 import {eventsManager} from "./EventsManager.js"
 import util from "./util.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('panorama')
 export default class Panorama {
     constructor(e) {
         E(this, "_actived", !1);

+ 2 - 2
src/Preload.js

@@ -1,12 +1,12 @@
-//const log$d = new Logger("preload");
-import {logger} from "./Logger.js"
 import {reporter} from "./Reporter.js"
 import {modelTable} from "./ModelTable.js"
 import util from "./util.js"
 import {http1} from "./Http1.js"
 import InternalError from "./error/InternalError.js"
 import axios from "axios";
+import Logger from "./Logger.js"
 
+const logger = new Logger('preload')
 export default class Preload {
     constructor(e) {
         this.config = null

+ 4 - 2
src/Rtcp.js

@@ -1,7 +1,9 @@
-import {logger} from "./Logger.js"
 import Workers from "./Workers.js"
 import Heartbeat from "./Heartbeat.js"
- 
+import Logger from "./Logger.js"
+
+const logger = new Logger('rtcp')
+
 export default class Rtcp extends EventEmitter {
     constructor(e) {
         

+ 2 - 2
src/Signal.js

@@ -1,11 +1,11 @@
-//const log$4 = new Logger("xverse-signal");
 import Codes from "./enum/Codes.js"
-import {logger} from "./Logger.js"
 import {eventsManager} from "./EventsManager.js"
 import ECurrentShaderMode from "./enum/ECurrentShaderMode.js"
 import Actions from "./enum/Actions.js"
 import PointType from "./enum/PointType.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('xverse-signal')
 export default class Signal {
     constructor(e) {
         this.signalHandleActived = !0

+ 2 - 1
src/Socket.js

@@ -1,11 +1,12 @@
-import {logger} from "./Logger.js"
 import Heartbeat from "./Heartbeat.js"
 import Timeout from "./Timeout.js"
 import InitNetworkTimeoutError from "./error/InitNetworkTimeoutError.js"
 import {reporter} from "./Reporter.js"
 import util from "./util.js"
 import InternalError from "./error/InternalError.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('ws')
 export default class Socket extends EventEmitter {
     constructor(e) {
         super();

+ 4 - 1
src/Stats.js

@@ -1,8 +1,11 @@
 
+import Logger from "./Logger.js"
+
+const logger = new Logger('stats')
 const numberFormat = new Intl.NumberFormat(window.navigator.language,{
     maximumFractionDigits: 0
 });
-import {logger} from "./Logger.js"
+
 export default class Stats extends EventEmitter {
     constructor(e) {
         super();

+ 2 - 1
src/Stream.js

@@ -1,6 +1,7 @@
-import {logger} from "./Logger.js"
 import InternalError from "./error/InternalError.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('stream')
 export default class Stream {
     constructor(e) {
         this.el = null

+ 3 - 3
src/XAvatarBillboardComponent.js

@@ -1,8 +1,8 @@
-//const log$F = new Logger$1("XAvatarBillboardComponent");
-
 import EMeshType from "./enum/EMeshType.js"
 import BillboardStatus from "./enum/BillboardStatus.js"
-import {logger} from "./Logger.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('XAvatarBillboardComponent')
 
 export default class XAvatarBillboardComponent {
     constructor(e) {

+ 3 - 3
src/XAvatarComopnent.js

@@ -1,7 +1,7 @@
-//const log$H = new Logger$1("XAvatarComopnent");
-
 import EMeshType from "./enum/EMeshType.js"
-import {logger} from "./Logger.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('XAvatarComopnent')
 
 export default class XAvatarComopnent {
     constructor() {

+ 0 - 2
src/XAvatarLoader.js

@@ -1,5 +1,3 @@
-import {logger} from "./Logger.js"
-
 export default class XAvatarLoader {
     constructor() {
         E(this, "containers", new Map);

+ 2 - 1
src/XAvatarManager.js

@@ -1,9 +1,10 @@
-import {logger} from "./Logger.js"
 import Pool from "./Pool"
 import BillboardStatus from "./enum/BillboardStatus.js"
 import {avatarLoader} from "./XAvatarLoader.js"
 import XAvatar from "./XAvatar.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('AvatarManager')
 export default class XAvatarManager {
     constructor(e) {
         this.characterMap = new Map

+ 2 - 3
src/XBillboard.js

@@ -1,9 +1,8 @@
-//const log$I = new Logger$1("Billboard");
-
 import EMeshType from "./enum/EMeshType.js"
-import {logger} from "./Logger.js"
 import XBillboardManager from "./XBillboardManager.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('Billboard')
 export default class XBillboard {
     constructor(e, t=!1, r=!1) {
         E(this, "_mesh", null);

+ 2 - 1
src/XBreathPointManager.js

@@ -1,8 +1,9 @@
 import XStaticMesh from "./XStaticMesh.js"
-import {logger} from "./Logger.js"
 import EMeshType from "./enum/EMeshType.js"
 import BreathPoint from "./BreathPoint.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('XBreathPointManager')
 export default class XBreathPointManager {
     constructor(e) {
         E(this, "_scene");

+ 4 - 1
src/XDecal.js

@@ -1,5 +1,8 @@
 import EMeshType from "./enum/EMeshType.js"
-import {logger} from "./Logger.js"
+import XDecalTextureError from "./error/XDecalTextureError.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('XDecalManager')
 
 export default class XDecal {
     constructor(e) {

+ 3 - 2
src/XLightManager.js

@@ -1,5 +1,6 @@
-//const log$C = new Logger$1("XLightManager");
-import {logger} from "./Logger.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('XLightManager')
 
 export default class XLightManager {
     constructor(e) {

+ 2 - 1
src/XMaterialComponent.js

@@ -1,6 +1,7 @@
-import {logger} from "./Logger.js"
 import XVideoRawYUV from "./XVideoRawYUV"
+import Logger from "./Logger.js"
 
+const logger = new Logger('XMaterial')
 export default class XMaterialComponent {
     constructor(e, t) {
         E(this, "scene");

+ 4 - 4
src/XSceneManager.js

@@ -1,6 +1,3 @@
-//const log$t = new Logger$1("XSceneManager");
-import {logger} from "./Logger.js"
-import Logger1 from "./Logger1.js"
 import XCameraComponent from "./XCameraComponent.js"
 import XStaticMeshComponent from "./XStaticMeshComponent.js"
 import XMaterialComponent from "./XMaterialComponent.js"
@@ -12,7 +9,10 @@ import XBillboardManager from "./XBillboardManager.js"
 import XLightManager from "./XLightManager.js"
 import XEngineRunTimeStats from "./XEngineRunTimeStats.js"
 import EShaderMode from "./enum/EShaderMode.js"
+import defaultLog from "./defaultLog.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('XSceneManager')
 
 const getAlphaWidthMap = (i,e)=>{
     const t = new BABYLON.DynamicTexture("test",3,e)
@@ -126,7 +126,7 @@ export default class XSceneManager {
             embedMode: true,
         })
         this.urlTransformer = t.urlTransformer || (s=>Promise.resolve(s)),
-        t.logger && Logger1.setLogger(t.logger),
+        t.logger && defaultLog.setLogger(t.logger),
         this.gl = e.getContext("webgl2", {
             preserveDrawingBuffer: !0
         }) || e.getContext("webgl", {

+ 2 - 2
src/XStateMachine.js

@@ -1,6 +1,6 @@
-//const log$G = new Logger$1("XStateMachine");
-import {logger} from "./Logger.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('XStateMachine')
 export default class XStateMachine {
     constructor(e) {
         E(this, "state");

+ 2 - 2
src/XStaticMesh.js

@@ -1,7 +1,7 @@
-//const log$z = new Logger$1("XStaticMesh");
-import {logger} from "./Logger.js"
 import EMeshType from "./enum/EMeshType.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('XStaticMesh')
 export default class XStaticMesh {
     constructor({id: e, mesh: t, group: r="default", lod: n=0, xtype: o=EMeshType.XStaticMesh, skinInfo: a="default", url: s=""}) {
         E(this, "_mesh");

+ 2 - 2
src/XStaticMeshComponent.js

@@ -1,10 +1,10 @@
-//const log$u = new Logger$1("XStaticMeshComponent")
-import {logger} from "./Logger.js"
 import XStaticMesh from "./XStaticMesh.js"
 import EMeshType from "./enum/EMeshType.js"
 import XStaticMeshFromOneGltf from "./XStaticMeshFromOneGltf.js"
 import XLowpolyModelError from "./error/XLowpolyModelError.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('XStaticMeshComponent')
 export default class XStaticMeshComponent{
     constructor(e) {
         E(this, "scene");

+ 2 - 1
src/XStaticMeshFromOneGltf.js

@@ -1,9 +1,10 @@
-import {logger} from "./Logger.js"
 import XStaticMesh from "./XStaticMesh.js"
 import XLowpolyModelError from "./error/XLowpolyModelError.js"
 import util from "./util.js"
 import EMeshType from "./enum/EMeshType.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('XStaticMeshComponent')
 export default class XStaticMeshFromOneGltf {
     constructor(e, t) {
         E(this, "_scene");

+ 3 - 1
src/XSubSequence.js

@@ -1,5 +1,7 @@
 import {http2} from "./Http2.js"
-import {logger} from "./Logger.js"
+import Logger from "./Logger.js"
+
+const logger = new Logger('subSequence')
 
 const DefaultUrlTransformer = async i=>typeof i != "string" ? (console.warn("url transformer error", i),
 i) : i.startsWith("blob:") ? i : http2.get({

+ 2 - 2
src/XTelevision.js

@@ -1,8 +1,8 @@
-//const log$y = new Logger$1("XTelevision");
-import {logger} from "./Logger.js"
 import XStaticMesh from "./XStaticMesh.js"
 import EMeshType from "./enum/EMeshType.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('XTelevision')
 export default class XTelevision {
     constructor(e, t, r, n) {
         E(this, "videoElement");

+ 3 - 1
src/Xverse.js

@@ -1,12 +1,14 @@
 import util from "./util.js"
 import {reporter} from "./Reporter.js"
-import {logger} from "./Logger.js"
 import ModelManager from "./ModelManager.js"
 import XverseRoom from "./XverseRoom.js"
 import Preload from "./Preload.js"
 import RenderType from "./enum/RenderType.js"
 import Person from "./enum/Person.js"
+import LoggerLevels from "./enum/LoggerLevels.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('xverse')
 export default class Xverse{
     constructor(e) {
         e || (e = {});

+ 2 - 2
src/XverseAvatar.js

@@ -1,12 +1,12 @@
-//const logger = new Logger("xverse-avatar");
-import {logger} from "./Logger.js"
 import util from "./util.js"
 import InternalError from "./error/InternalError.js"
 import EAvatarRelationRank from "./enum/EAvatarRelationRank.js"
 import AvatarGroup from "./enum/AvatarGroup.js"
 import MotionType from "./enum/MotionType.js"
 import Queue from "./Queue.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('xverse-avatar')
 export default class XverseAvatar extends EventEmitter {
     constructor({userId: e, isHost: t, room: r, avatarId: n, isSelf: o, group: a=AvatarGroup.Npc}) {
         super();

+ 2 - 2
src/XverseAvatarManager.js

@@ -1,5 +1,3 @@
-//const logger = new Logger("xverse-avatar-manager")
-import {logger} from "./Logger.js"
 import CoreBroadcastType from "./enum/CoreBroadcastType.js"
 import AvatarGroup from "./enum/AvatarGroup.js"
 import Broadcast from "./Broadcast.js"
@@ -11,7 +9,9 @@ import Person from "./enum/Person.js"
 import XverseAvatar from "./XverseAvatar.js"
 import MotionType from "./enum/MotionType.js"
 import TimeoutError from "./error/TimeoutError.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('xverse-avatar-manager')
 export default class XverseAvatarManager extends EventEmitter {
     constructor(e) {
         super();

+ 2 - 1
src/XverseEffectManager.js

@@ -1,5 +1,6 @@
-import {logger} from "./Logger.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('xverse-effect-manager')
 export default class XverseEffectManager extends EventEmitter {
     constructor(e) {
         super();

+ 2 - 2
src/Xverse_Room.js

@@ -1,6 +1,4 @@
-//const logger = new Logger("xverse-room");
 import XverseAvatarManager from "./XverseAvatarManager.js"
-import {logger} from "./Logger.js"
 import Codes from "./enum/Codes.js"
 import PathManager from "./PathManager.js"
 import Camera from "./Camera.js"
@@ -25,7 +23,9 @@ import EventsController from "./EventsController.js"
 import EImageQuality from "./enum/EImageQuality.js"
 import Panorama from "./Panorama.js"
 import Debug from "./Debug.js"
+import Logger from "./Logger.js"
 
+const logger = new Logger('xverse-room')
 export default class Xverse_Room extends EventEmitter {
     constructor(e) {
         super();