Merge branch 'master' of http://192.168.0.115:3000/xushiting/Metaverse

dist/index.html

@@ -55,6 +55,42 @@
         , HB_MAX_VALUE = 500
         , DURATION = 10
         , NET_INTERVAL = 1;
+    const VERSION$1 = "1.0.75"
+    , ENV = "production";
+
+
+
+    var De = Object.defineProperty
+    , Ne = Object.defineProperties;
+    var we = Object.getOwnPropertyDescriptors;
+    var be = Object.getOwnPropertySymbols;
+    var Me = Object.prototype.hasOwnProperty
+    , Ie = Object.prototype.propertyIsEnumerable;
+    var Se = (i,e,t)=>e in i ? De(i, e, {
+        enumerable: !0,
+        configurable: !0,
+        writable: !0,
+        value: t
+    }) : i[e] = t
+    , oe = (i,e)=>{
+        for (var t in e || (e = {}))
+            Me.call(e, t) && Se(i, t, e[t]);
+        if (be)
+            for (var t of be(e))
+                Ie.call(e, t) && Se(i, t, e[t]);
+        return i
+    }
+    , le = (i,e)=>Ne(i, we(e));
+    var Oe = (i,e)=>{
+        var t = {};
+        for (var r in i)
+            Me.call(i, r) && e.indexOf(r) < 0 && (t[r] = i[r]);
+        if (i != null && be)
+            for (var r of be(i))
+                e.indexOf(r) < 0 && Ie.call(i, r) && (t[r] = i[r]);
+        return t
+    };
+
 
     </script>
 

src/Codes.js

@@ -0,0 +1,38 @@
+var Codes = {
+    Success:0,
+    Param:1001,
+    Internal:1002,
+    Timeout:1003,
+    Authentication:1004,
+    TokenExpired:1005,
+    Unsupported:1006,
+    InitNetworkTimeout:1007,
+    InitDecoderTimeout:1008,
+    InitConfigTimeout:1009,
+    InitEngineTimeout:1010,
+    InitEngine:1011,
+    ActionBlocked:1012,
+    PreloadCanceled:1013,
+    FrequencyLimit:1014,
+    UsersUpperLimit:2e3,
+    RoomsUpperLimit:2001,
+    ServerParam:2002,
+    LackOfToken:2003,
+    LoginFailed:2004,
+    VerifyServiceDown:2005,
+    CreateSessionFailed:2006,
+    RtcConnection:2008,
+    DoActionFailed:2009,
+    StateSyncFailed:2010,
+    BroadcastFailed:2011,
+    DataAbnormal:2012,
+    GetOnVehicle:2015,
+    RepeatLogin:2017,
+    RoomDoseNotExist:2018,
+    TicketExpire:2019,
+    ServerRateLimit:2020,
+    DoActionBlocked:2333,
+    ActionMaybeDelay:2334,
+    ActionResponseTimeout:2999,
+}
+export default Codes

src/Logger.js

@@ -1,7 +1,10 @@
-class Logger{
+import Codes from "./Codes.js"
+import {reporter} from "./Reporter.js"
+import util from "./util.js"
+
+export default class Logger{
     constructor(e) {
-        E(this, "module", "log");
-        E(this, "level", 3);
+        this.level = 3
         this.module = e
     }
     static setLevel(e) {
@@ -11,7 +14,7 @@ class Logger{
         this.level = e
     }
     atleast(e) {
-        return e >= this.level && e >= Ce.level
+        return e >= this.level && e >= this.level
     }
     print(e, t, ...r) {
         if (this.atleast(t)) {
@@ -59,7 +62,7 @@ class Logger{
             e.value === void 0 && (e.endTime = o),
             e.value === void 0 && (e.value = o - e.startTime)
         }
-        if (e.error ? e.code = ((n = e.error) == null ? void 0 : n.code) || Codes$1.Internal : e.code = Codes$1.Success,
+        if (e.error ? e.code = ((n = e.error) == null ? void 0 : n.code) || Codes.Internal : e.code = Codes.Success,
         reporter.report("measurement", e, r),
         t.length || (t = [e]),
         e.level === 4 || e.error) {
@@ -75,7 +78,9 @@ class Logger{
         return this.print("error", 4, ...e)
     }
     prefix(e) {
-        return `[${this.module}][${e}] ${getFormattedDate(new Date)}:`
+        return `[${this.module}][${e}] ${util.getFormattedDate(new Date)}:`
     }
-}
-;
+};
+
+const logger = new Logger();
+export { logger };

src/ModelManager.js

@@ -1,23 +1,26 @@
-const log$f = new Logger("model-manager")
-class ModelManager{
+//const log$f = new Logger("model-manager")
+import {logger} from "./Logger.js"
+
+export default class ModelManager{
     constructor(e, t) {
-        E(this, "avatarModelList", []);
-        E(this, "skinList", []);
-        E(this, "applicationConfig");
-        E(this, "config");
-        E(this, "appId");
-        E(this, "releaseId");
+        this.avatarModelList = []
+        this.skinList = []
+        this.applicationConfig = null;
+        this.config = null
         this.appId = e,
         this.releaseId = t
     }
     static getInstance(e, t) {
-        return me.instance || (me.instance = new me(e,t)),
-        me.instance
+    //getInstance(e, t) {
+        return this.instance || (this.instance = new ModelManager(e,t)),
+        this.instance
     }
     static findModels(e, t, r) {
+    //findModels(e, t, r) {
         return e.filter(o=>o.typeName === t && o.className === r)
     }
     static findModel(e, t, r) {
+    //findModel(e, t, r) {
         const n = e.filter(o=>o.typeName === t && o.className === r)[0];
         return n || null
     }
@@ -37,7 +40,7 @@ class ModelManager{
             const o = `find path failed: skinId: ${e}, pathName: ${t}`;
             return Promise.reject(new ParamError(o))
         }
-        return log$f.debug("find route success", n),
+        return logger.debug("find route success", n),
         n
     }
     async findAssetList(e) {
@@ -46,7 +49,7 @@ class ModelManager{
             const n = `find path failed: skinId: ${e}`;
             return Promise.reject(new ParamError(n))
         }
-        return log$f.debug("find route success", r),
+        return logger.debug("find route success", r),
         r
     }
     async findAsset(e, t, r="id") {
@@ -58,7 +61,7 @@ class ModelManager{
             const a = `find asset failed: skinId: ${e}, keyValue: ${t}`;
             return Promise.reject(new ParamError(a))
         }
-        return log$f.debug("find asset success", o),
+        return logger.debug("find asset success", o),
         o
     }
     async findPoint(e, t) {
@@ -67,7 +70,7 @@ class ModelManager{
             const o = `find point failed: skinId: ${e}, id: ${t}`;
             return Promise.reject(new ParamError(o))
         }
-        return log$f.debug("find point success", n),
+        return logger.debug("find point success", n),
         n
     }
     async requestConfig() {
@@ -90,7 +93,7 @@ class ModelManager{
                 config: n,
                 preload: o
             },
-            log$f.debug("get config success", this.config),
+            logger.debug("get config success", this.config),
             this.config
         } catch (r) {
             return Promise.reject(r)
@@ -121,7 +124,7 @@ class ModelManager{
             })),
             this.avatarModelList
         } catch (e) {
-            return log$f.error(e),
+            return logger.error(e),
             []
         }
     }
@@ -184,7 +187,7 @@ class ModelManager{
             ),
             this.skinList
         } catch (e) {
-            return log$f.error(e),
+            return logger.error(e),
             []
         }
     }
@@ -193,5 +196,7 @@ class ModelManager{
             url: TEXTURE_URL
         }]
     }
-}
-;
+};
+
+// const modelManager = new ModelManager();
+// export { modelManager };

src/Preload.js

@@ -1,10 +1,13 @@
-const log$d = new Logger("preload");
-class Preload {
+//const log$d = new Logger("preload");
+import {logger} from "./Logger.js"
+import {reporter} from "./Reporter.js"
+
+export default class Preload {
     constructor(e) {
-        E(this, "config");
-        E(this, "allKeys", []);
-        E(this, "oldResourcesDeleted", !1);
-        E(this, "requests", {
+        this.config = null
+        this.allKeys = []
+        this.oldResourcesDeleted = !1;
+        this.requests = {
             simple: {
                 stopped: !0,
                 requests: {}
@@ -17,7 +20,7 @@ class Preload {
                 stopped: !0,
                 requests: {}
             }
-        });
+        };
         this.modelManager = e,
         this.init(e.appId)
     }
@@ -45,7 +48,7 @@ class Preload {
             e
         } catch {
             const t = "preload getAllKeys error";
-            return log$d.error(t),
+            return logger.error(t),
             Promise.reject(t)
         }
     }
@@ -76,7 +79,7 @@ class Preload {
             try {
                 await this.deleteOldResources(a.assetUrls.map(d=>d.url), s)
             } catch (d) {
-                log$d.error(d)
+                logger.error(d)
             }
             const {baseUrls: l, assetUrls: u, observeUrls: c} = a;
             let h;
@@ -96,11 +99,11 @@ class Preload {
             let f = h.filter(d=>!s.includes(d.url));
             r && isFunction(r) && (f = f.filter(r)),
             o = f.length,
-            log$d.debug("keysNeedToPreload", f),
+            logger.debug("keysNeedToPreload", f),
             f.length || t && t(h.length, h.length),
             n = Date.now(),
             await this._preload(e, f, t),
-            log$d.infoAndReportMeasurement({
+            logger.infoAndReportMeasurement({
                 tag: e,
                 startTime: n,
                 metric: "assetsPreload",
@@ -112,7 +115,7 @@ class Preload {
         } catch (a) {
             let s = a;
             return (this.requests[e].stopped || axios.isCancel(a)) && (s = new PreloadCanceledError),
-            log$d.infoAndReportMeasurement({
+            logger.infoAndReportMeasurement({
                 tag: e,
                 startTime: n,
                 metric: "assetsPreload",
@@ -133,8 +136,8 @@ class Preload {
         else
             return Promise.resolve();
         const r = t.filter(n=>!e.includes(n));
-        return log$d.debug("keysNeedToDelete", r),
-        log$d.warn("keysNeedToDelete", r.length),
+        return logger.debug("keysNeedToDelete", r),
+        logger.warn("keysNeedToDelete", r.length),
         Promise.all(r.map(n=>modelTable.delete(n)))
     }
     async _preload(e, t, r) {
@@ -160,7 +163,7 @@ class Preload {
             }).then(async c=>{
                 const h = c.data;
                 if (!(h instanceof Blob))
-                    return log$d.error("request blob failed, type:", typeof h, u),
+                    return logger.error("request blob failed, type:", typeof h, u),
                     Promise.reject("request blob failed " + u);
                 const f = await blobToDataURI$1(h);
                 try {
@@ -170,7 +173,7 @@ class Preload {
                     });
                     return
                 } catch (d) {
-                    return log$d.error("unable to add data to indexedDB", d),
+                    return logger.error("unable to add data to indexedDB", d),
                     Promise.reject(new InternalError("preload db error"))
                 }
             }

src/Reporter.js

@@ -1,13 +1,14 @@
+import util from "./util.js"
 export default class Reporter extends EventEmitter {
     constructor() {
         super();
-        this_header= {}
-        this_body= {}
-        this_queue= []
-        this_disabled= !1
-        this_interval= null
-        this_reportUrl= null
-        this.isDocumentLoaded =()=>document.readyState === "complete");
+        this._header= {}
+        this._body= {}
+        this._queue= []
+        this._disabled= !1
+        this._interval= null
+        this._reportUrl= null
+        this.isDocumentLoaded =()=>document.readyState === "complete";
         this._header.logModuleId = REPORT_MODULE_TYPE,
         this._header.url = location.href,
         this._header.enviroment = ENV,
@@ -39,7 +40,7 @@ export default class Reporter extends EventEmitter {
         if (o && o > Math.random())
             return;
         this.updateBody({
-            logTime: getFormattedDate(new Date),
+            logTime: util.getFormattedDate(new Date),
             logTimestamp: Date.now()
         });
         const a = s=>{
@@ -82,3 +83,6 @@ export default class Reporter extends EventEmitter {
         )
     }
 }
+
+const reporter = new Reporter();
+export { reporter };

src/Xverse.js

@@ -1,5 +1,8 @@
 import util from "./util.js"
-import reporter from "./Reporter.js"
+import {reporter} from "./Reporter.js"
+import {logger} from "./Logger.js"
+import ModelManager from "./ModelManager.js"
+import Preload from "./Preload.js"
 
 export default class Xverse{
     constructor(e) {
@@ -10,14 +13,18 @@ export default class Xverse{
         this.SUB_PACKAGE_VERSION = a,
         this.debug && Logger.setLevel(LoggerLevels.Debug);
         const s = this.pageSession = util.uuid();
-        if (reporter.updateHeader({
+        
+        reporter.updateHeader({
             pageSession: s
-        }),
-        reporter.updateReportUrl(REPORT_URL[this.env]),
+        })
+
+        reporter.updateReportUrl(REPORT_URL[this.env])
+
         a && reporter.updateBody({
             sdkVersion: a
-        }),
-        log$c.infoAndReportMeasurement({
+        })
+
+        logger.infoAndReportMeasurement({
             metric: "sdkInit",
             startTime: Date.now(),
             extra: {
@@ -25,13 +32,15 @@ export default class Xverse{
                 enviroment: r,
                 pageSession: s
             }
-        }),
-        log$c.debug("debug mode:", this.debug),
+        })
+
+        logger.debug("debug mode:", this.debug)
+
         reporter.on("report", l=>{
             t && t(l)
-        }
-        ),
-        n) {
+        })
+
+        if (n) {
             this.appId = n,
             this.releaseId = o;
             const l = ModelManager.getInstance(n, o);
@@ -43,7 +52,7 @@ export default class Xverse{
     }
     disableLogUpload() {
         reporter.disable(),
-        log$c.debug("log upload has been disabled")
+        logger.debug("logger upload has been disabled")
     }
     async getSkinList() {
         return []

src/util.js

@@ -5,6 +5,20 @@ var util = {
             return (i === "x" ? e : e & 3 | 8).toString(16)
         }
         )
+    },
+    getFormattedDate(i) {
+        const e = i.getMonth() + 1
+          , t = i.getDate()
+          , r = i.getHours()
+          , n = i.getMinutes()
+          , o = i.getSeconds()
+          , a = i.getMilliseconds()
+          , s = (e < 10 ? "0" : "") + e
+          , l = (t < 10 ? "0" : "") + t
+          , u = (r < 10 ? "0" : "") + r
+          , c = (n < 10 ? "0" : "") + n
+          , h = (o < 10 ? "0" : "") + o;
+        return i.getFullYear() + "-" + s + "-" + l + " " + u + ":" + c + ":" + h + "." + a
     }
 }
 export default util