@arms/rum-core 0.0.34 → 0.0.35

package/lib/model/reporter.js

@@ -125,7 +125,6 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
     this.eventQueue = [];
   };
   _proto.mergeEvent = function mergeEvent(ctx, events, view) {
-    var _config$net;
     var config = ctx.getConfig();
     var session = ctx.session;
     var sessionId = session.getSessionId();
@@ -157,9 +156,7 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
       session: {
         id: sessionId
       },
-      net: {
-        model: (_config$net = config.net) === null || _config$net === void 0 ? void 0 : _config$net.model
-      },
+      net: {},
       view: view,
       events: events
     };

package/lib/model/shell.d.ts

@@ -4,7 +4,8 @@ import { IShell } from "../types/shell";
 export default abstract class Shell implements IShell {
     client: IClient;
     constructor(config?: IConfiguration);
-    updateFromRemoteConfig(config: any): void;
+    getCombinedConfig(config?: IConfiguration): any;
+    updateFromRemoteConfig(config: any, reSetup?: boolean): void;
     /**
      * 初始化
      */

package/lib/model/shell.js

@@ -15,36 +15,47 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
     this.client = void 0;
     this.client = new _client["default"]();
     if (config && this.init) {
-      var combinedConf;
-      if ((0, _combineConfig.isRemoteConfigEnable)(config) && (0, _is.isFunction)(this.getLocalConfig)) {
-        var localConfig = this.getLocalConfig(0, config.pid);
-        combinedConf = (0, _combineConfig["default"])(config, localConfig);
-      }
-      this.init(combinedConf || config);
-
-      // 拉取远程配置进行更新
-      this.updateFromRemoteConfig(config);
+      this.init(config);
     }
+    // if (config && this.init) {
+    //   this.init(this.getCombinedConfig(config));
+
+    //   // 拉取远程配置进行更新
+    //   this.updateFromRemoteConfig(config);
+    // }
   }
   var _proto = Shell.prototype;
-  _proto.updateFromRemoteConfig = function updateFromRemoteConfig(config) {
+  _proto.getCombinedConfig = function getCombinedConfig(config) {
+    var combinedConf;
+    if ((0, _combineConfig.isRemoteConfigEnable)(config) && (0, _is.isFunction)(this.getLocalConfig)) {
+      var localConfig = this.getLocalConfig(0, config.pid);
+      combinedConf = (0, _combineConfig["default"])(config, localConfig);
+    }
+    return combinedConf || config;
+  };
+  _proto.updateFromRemoteConfig = function updateFromRemoteConfig(config, reSetup) {
+    if (reSetup === void 0) {
+      reSetup = true;
+    }
     // 请求动态配置
     if (config.pid && (0, _combineConfig.isRemoteConfigEnable)(config) && (0, _is.isFunction)(this.getRemoteConfig)) {
       var that = this;
-      this.getRemoteConfig((0, _combineConfig.getRemoteConfigUrl)(config), config).then(function (remoteConfig) {
+      var proms = this.getRemoteConfig((0, _combineConfig.getRemoteConfigUrl)(config), config);
+      proms === null || proms === void 0 ? void 0 : proms.then(function (remoteConfig) {
         if (!remoteConfig || remoteConfig.errorStatus !== undefined) return;
         var combinedConf = (0, _combineConfig["default"])(config, remoteConfig);
 
         // 无有效的新配置，无需更新
         if (!combinedConf) return;
-        if ((0, _is.isObject)(console) && (0, _is.isFunction)(console.log)) {
-          console.log("合并后动态配置后的新配置:\n", combinedConf);
+
+        // 存储到本地
+        if ((0, _is.isFunction)(that.storeRemoteConfig)) {
+          that.storeRemoteConfig(remoteConfig, config.pid);
         }
+        if (reSetup === false || config.remoteConfig.reSetup === false) return;
         var context = that.client.getContext();
-
         // 更新配置
         context.setConfig(combinedConf);
-
         // 逐个更新collector
         var collectors = that.client.getCollectors();
         collectors.forEach(function (collector) {
@@ -53,11 +64,6 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
             collector.setup(context, that.client.sendEvent);
           }
         });
-
-        // 存储到本地
-        if ((0, _is.isFunction)(that.storeRemoteConfig)) {
-          that.storeRemoteConfig(remoteConfig, config.pid);
-        }
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",