@microsoft/applicationinsights-core-js 3.0.0-beta.2211-01 → 3.0.0-beta.2211-03

package/src/JavaScriptSDK/AppInsightsCore.ts

@@ -4,8 +4,8 @@
 
 import dynamicProto from "@microsoft/dynamicproto-js";
 import {
-    arrAppend, arrForEach, arrIndexOf, deepExtend, dumpObj, hasDocument, isFunction, isNullOrUndefined, isPlainObject, objDeepFreeze,
-    objDefineProp, objForEachKey, objFreeze, objHasOwn, throwError
+    ITimerHandler, arrAppend, arrForEach, arrIndexOf, deepExtend, dumpObj, hasDocument, isFunction, isNullOrUndefined, isPlainObject,
+    objDeepFreeze, objDefineProp, objForEachKey, objFreeze, objHasOwn, scheduleInterval, throwError
 } from "@nevware21/ts-utils";
 import { createDynamicConfig, onConfigChange } from "../Config/DynamicConfig";
 import { IConfigDefaults } from "../Config/IConfigDefaults";
@@ -260,7 +260,8 @@ export class AppInsightsCore implements IAppInsightsCore {
         /**
          * Internal log poller
          */
-        let _internalLogPoller: number = 0;
+        let _internalLogPoller: ITimerHandler;
+        let _internalLogPollerListening: boolean;
 
         dynamicProto(AppInsightsCore, this, (_self) => {
 
@@ -325,6 +326,8 @@ export class AppInsightsCore implements IAppInsightsCore {
 
                 _isInitialized = true;
                 _self.releaseQueue();
+
+                _self.pollInternalLogs();
             };
         
             _self.getTransmissionControls = (): IChannelControls[][] => {
@@ -456,22 +459,31 @@ export class AppInsightsCore implements IAppInsightsCore {
             /**
              * Periodically check logger.queue for log messages to be flushed
              */
-            _self.pollInternalLogs = (eventName?: string): number => {
+            _self.pollInternalLogs = (eventName?: string): ITimerHandler => {
                 _internalLogsEventName = eventName || null;
 
-                _addUnloadHook(_configHandler.watch((details) => {
-                    let interval: number = details.cfg.diagnosticLogInterval;
+                function _startLogPoller(config: IConfiguration) {
+                    let interval: number = config.diagnosticLogInterval;
                     if (!interval || !(interval > 0)) {
                         interval = 10000;
                     }
 
-                    if(_internalLogPoller) {
-                        clearInterval(_internalLogPoller);
-                    }
-                    _internalLogPoller = setInterval(() => {
+                    _internalLogPoller && _internalLogPoller.cancel();
+                    _internalLogPoller = scheduleInterval(() => {
                         _flushInternalLogs();
                     }, interval) as any;
-                }));
+                }
+
+                if (!_internalLogPollerListening) {
+                    _internalLogPollerListening = true;
+                    // listen to the configuration
+                    _addUnloadHook(_configHandler.watch((details) => {
+                        _startLogPoller(details.cfg);
+                    }));
+                } else {
+                    // We are being called again, so make sure the poller is running
+                    _startLogPoller(_configHandler.cfg);
+                }
 
                 return _internalLogPoller;
             }
@@ -480,9 +492,9 @@ export class AppInsightsCore implements IAppInsightsCore {
              * Stop polling log messages from logger.queue
              */
             _self.stopPollingInternalLogs = (): void => {
-                if(_internalLogPoller) {
-                    clearInterval(_internalLogPoller);
-                    _internalLogPoller = 0;
+                if (_internalLogPoller) {
+                    _internalLogPoller.cancel();
+                    _internalLogPoller = null;
                     _flushInternalLogs();
                 }
             }
@@ -1140,9 +1152,9 @@ export class AppInsightsCore implements IAppInsightsCore {
     /**
      * Periodically check logger.queue for
      */
-    public pollInternalLogs(eventName?: string): number {
+    public pollInternalLogs(eventName?: string): ITimerHandler {
         // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
-        return 0;
+        return null;
     }
 
     /**

package/src/JavaScriptSDK.Interfaces/IAppInsightsCore.ts

@@ -17,6 +17,7 @@ import { SendRequestReason } from "../JavaScriptSDK.Enums/SendRequestReason";
 import { IDistributedTraceContext } from "./IDistributedTraceContext";
 import { ILegacyUnloadHook, IUnloadHook } from "./IUnloadHook";
 import { WatcherFunction } from "../Config/IDynamicWatcher";
+import { ITimerHandler } from "@nevware21/ts-utils";
 
 export interface ILoadedPlugin<T extends IPlugin> {
     plugin: T;
@@ -115,7 +116,7 @@ export interface IAppInsightsCore extends IPerfManagerProvider {
      */
     addTelemetryInitializer(telemetryInitializer: TelemetryInitializerFunction): ITelemetryInitializerHandler;
 
-    pollInternalLogs?(eventName?: string): number;
+    pollInternalLogs?(eventName?: string): ITimerHandler;
 
     stopPollingInternalLogs?(): void;
 

package/types/JavaScriptSDK/AppInsightsCore.d.ts

@@ -1,3 +1,4 @@
+import { ITimerHandler } from "@nevware21/ts-utils";
 import { WatcherFunction } from "../Config/IDynamicWatcher";
 import { SendRequestReason } from "../JavaScriptSDK.Enums/SendRequestReason";
 import { IAppInsightsCore, ILoadedPlugin } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
@@ -70,7 +71,7 @@ export declare class AppInsightsCore implements IAppInsightsCore {
     /**
      * Periodically check logger.queue for
      */
-    pollInternalLogs(eventName?: string): number;
+    pollInternalLogs(eventName?: string): ITimerHandler;
     /**
      * Periodically check logger.queue for
      */

package/types/JavaScriptSDK.Interfaces/IAppInsightsCore.d.ts

@@ -15,6 +15,7 @@ import { SendRequestReason } from "../JavaScriptSDK.Enums/SendRequestReason";
 import { IDistributedTraceContext } from "./IDistributedTraceContext";
 import { ILegacyUnloadHook, IUnloadHook } from "./IUnloadHook";
 import { WatcherFunction } from "../Config/IDynamicWatcher";
+import { ITimerHandler } from "@nevware21/ts-utils";
 export interface ILoadedPlugin<T extends IPlugin> {
     plugin: T;
     /**
@@ -81,7 +82,7 @@ export interface IAppInsightsCore extends IPerfManagerProvider {
      * @returns - A ITelemetryInitializerHandler to enable the initializer to be removed
      */
     addTelemetryInitializer(telemetryInitializer: TelemetryInitializerFunction): ITelemetryInitializerHandler;
-    pollInternalLogs?(eventName?: string): number;
+    pollInternalLogs?(eventName?: string): ITimerHandler;
     stopPollingInternalLogs?(): void;
     /**
      * Return a new instance of the IProcessTelemetryContext for processing events

package/types/__DynamicConstants.d.ts

@@ -9,9 +9,11 @@ export declare const _DYN_ENUMERABLE = "enumerable";
 export declare const _DYN_APPLY = "apply";
 export declare const _DYN_PUSH = "push";
 export declare const _DYN_SPLICE = "splice";
+export declare const _DYN_CANCEL = "cancel";
 export declare const _DYN_INITIALIZE = "initialize";
 export declare const _DYN_IDENTIFIER = "identifier";
 export declare const _DYN_IS_INITIALIZED = "isInitialized";
+export declare const _DYN_POLL_INTERNAL_LOGS = "pollInternalLogs";
 export declare const _DYN_NAME = "name";
 export declare const _DYN_TIME = "time";
 export declare const _DYN_PROCESS_NEXT = "processNext";