fleek-track-analytics 0.0.96 → 0.0.99

package/README.md

@@ -59,6 +59,8 @@ const analyticsWrapper = new TrackAnalytics({
 });
 
 analyticsWrapper.initAnalytics();
+
+export { analyticsWrapper }
 ```
 
 Parameter description for TrackAnalytics class constructor

package/lib/react-native/analytics-tool/analytics-tool-types.d.ts

@@ -1,4 +1,3 @@
 import { tAPP } from '../../track-analytics-types';
 import { IRNAnalyticsWrapper } from '../track-analytics/track-analytics-types';
-import { TraceManager } from '../utils/trace-manager';
-export type tRNToolWraperFunction = (segmentKey: string, app: tAPP, traceManager: TraceManager, debug?: boolean) => IRNAnalyticsWrapper;
+export type tRNToolWraperFunction = (segmentKey: string, app: tAPP, debug?: boolean) => IRNAnalyticsWrapper;

package/lib/react-native/analytics-tool/react-native-segment.js

@@ -4,7 +4,7 @@ exports.reactNativeSegment = void 0;
 const analytics_react_native_1 = require("@segment/analytics-react-native");
 const segment_logger_1 = require("../utils/segment-logger");
 const package_json_1 = require("../../../package.json");
-const reactNativeSegment = (segmentKey, app, traceManager, debug) => {
+const reactNativeSegment = (segmentKey, app, debug) => {
     const client = (0, analytics_react_native_1.createClient)({
         writeKey: segmentKey,
         trackAppLifecycleEvents: true,
@@ -13,9 +13,7 @@ const reactNativeSegment = (segmentKey, app, traceManager, debug) => {
     });
     const trackWrapper = async (eventName, eventParams) => {
         const data = eventParams;
-        const trace = await traceManager.getTraceId();
-        console.log('testing1 in track', trace);
-        return await client.track.call(client, eventName, Object.assign(Object.assign({}, data), { anlaytics_lib_version: package_json_1.version, fleek_platform: app, time_stamp: Date.now(), trace_id: trace }));
+        return await client.track.call(client, eventName, Object.assign(Object.assign({}, data), { anlaytics_lib_version: package_json_1.version, fleek_platform: app, time_stamp: Date.now() }));
     };
     return {
         track: trackWrapper,

package/lib/react-native/analytics-tool/react-native-segment.js.map

@@ -1 +1 @@
-{"version":3,"file":"react-native-segment.js","sourceRoot":"","sources":["../../../src/react-native/analytics-tool/react-native-segment.ts"],"names":[],"mappings":";;;AAAA,4EAAwE;AACxE,4DAA0D;AAE1D,wDAAgD;AAGzC,MAAM,kBAAkB,GAA0B,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;IAChG,MAAM,MAAM,GAAG,IAAA,qCAAY,EAAC;QAC1B,QAAQ,EAAE,UAAU;QACpB,uBAAuB,EAAE,IAAI;QAC7B,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,gCAAe,CAAC,CAAC,CAAC,SAAS;KAC5C,CAAC,CAAC;IAEH,MAAM,YAAY,GAAa,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE;QAC9D,MAAM,IAAI,GAAG,WAAiC,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;QACxC,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,kCAC3C,IAAI,KACP,qBAAqB,EAAE,sBAAO,EAC9B,cAAc,EAAE,GAAG,EACnB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EACtB,QAAQ,EAAE,KAAK,IACf,CAAC;IACL,CAAC,CAAC;IAEF,OAAO;QACL,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,YAAY;QAClB,aAAa,EAAE,MAAM;KACtB,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,kBAAkB,sBA4B7B"}
+{"version":3,"file":"react-native-segment.js","sourceRoot":"","sources":["../../../src/react-native/analytics-tool/react-native-segment.ts"],"names":[],"mappings":";;;AAAA,4EAAwE;AACxE,4DAA0D;AAE1D,wDAAgD;AAGzC,MAAM,kBAAkB,GAA0B,CAAC,UAAkB,EAAE,GAAG,EAAE,KAAe,EAAE,EAAE;IACpG,MAAM,MAAM,GAAG,IAAA,qCAAY,EAAC;QAC1B,QAAQ,EAAE,UAAU;QACpB,uBAAuB,EAAE,IAAI;QAC7B,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,gCAAe,CAAC,CAAC,CAAC,SAAS;KAC5C,CAAC,CAAC;IAEH,MAAM,YAAY,GAAa,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE;QAC9D,MAAM,IAAI,GAAG,WAAiC,CAAC;QAC/C,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,kCAAO,IAAI,KAAE,qBAAqB,EAAE,sBAAO,EAAE,cAAc,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,IAAG,CAAC;IAC9I,CAAC,CAAC;IAEF,OAAO;QACL,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,YAAY;QAClB,aAAa,EAAE,MAAM;KACtB,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,kBAAkB,sBAoB7B"}

package/lib/react-native/track-analytics/track-analytics.d.ts

@@ -5,7 +5,6 @@ declare class TrackAnalytics {
     private initParams;
     private analyticsWrapper;
     reactNativeSegmentClient?: SegmentClient;
-    private traceManager;
     constructor(params: IAnalyticsInit);
     initAnalytics: () => void;
     private checkInitDone;

package/lib/react-native/track-analytics/track-analytics.js

@@ -3,14 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrackAnalytics = void 0;
 const constants_1 = require("../../constants");
 const react_native_segment_1 = require("../analytics-tool/react-native-segment");
-const trace_manager_1 = require("../utils/trace-manager");
 class TrackAnalytics {
     constructor(params) {
         this.analyticsWrapper = null;
         this.initAnalytics = () => {
-            this.traceManager.init();
             try {
-                this.analyticsWrapper = (0, react_native_segment_1.reactNativeSegment)(this.initParams.segmentKey, this.initParams.App, this.traceManager, this.initParams.debug || this.initParams.devMode);
+                this.analyticsWrapper = (0, react_native_segment_1.reactNativeSegment)(this.initParams.segmentKey, this.initParams.App, this.initParams.debug || this.initParams.devMode);
                 this.reactNativeSegmentClient = this.analyticsWrapper.segmentClient;
             }
             catch (e) {
@@ -36,7 +34,6 @@ class TrackAnalytics {
             }
         };
         this.initParams = params;
-        this.traceManager = new trace_manager_1.TraceManager(params.errorHandler);
     }
     checkInitDone() {
         if (this.analyticsWrapper) {

package/lib/react-native/track-analytics/track-analytics.js.map

@@ -1 +1 @@
-{"version":3,"file":"track-analytics.js","sourceRoot":"","sources":["../../../src/react-native/track-analytics/track-analytics.ts"],"names":[],"mappings":";;;AAEA,+CAAgD;AAChD,iFAA4E;AAE5E,0DAAsD;AAEtD,MAAM,cAAc;IAMlB,YAAY,MAAsB;QAJ1B,qBAAgB,GAA+B,IAAI,CAAC;QAS5D,kBAAa,GAAG,GAAG,EAAE;YACnB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,IAAI,CAAC,gBAAgB,GAAG,IAAA,yCAAkB,EACxC,IAAI,CAAC,UAAU,CAAC,UAAU,EAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,EACnB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CACjD,CAAC;gBACF,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC;YACtE,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC;QAWF,UAAK,GAAa,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;;YAClC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA,CAAC;YACrD,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAgB,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;;YAC3C,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC;QAEF,WAAM,GAAc,KAAK,EAAE,MAAM,EAAE,EAAE;;YACnC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,MAAM,CAAC,MAAM,CAAC,CAAA,CAAC;YACrD,CAAC;QACH,CAAC,CAAC;QA5CA,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC5D,CAAC;IAiBO,aAAa;QACnB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,4BAA4B,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CAmBF;AAEQ,wCAAc"}
+{"version":3,"file":"track-analytics.js","sourceRoot":"","sources":["../../../src/react-native/track-analytics/track-analytics.ts"],"names":[],"mappings":";;;AAEA,+CAAgD;AAChD,iFAA4E;AAG5E,MAAM,cAAc;IAKlB,YAAY,MAAsB;QAH1B,qBAAgB,GAA+B,IAAI,CAAC;QAO5D,kBAAa,GAAG,GAAG,EAAE;YACnB,IAAI,CAAC;gBACH,IAAI,CAAC,gBAAgB,GAAG,IAAA,yCAAkB,EAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC9I,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC;YACtE,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC;QAWF,UAAK,GAAa,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;;YAClC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA,CAAC;YACrD,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAgB,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;;YAC3C,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC;QAEF,WAAM,GAAc,KAAK,EAAE,MAAM,EAAE,EAAE;;YACnC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,MAAM,CAAC,MAAM,CAAC,CAAA,CAAC;YACrD,CAAC;QACH,CAAC,CAAC;QArCA,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IAC3B,CAAC;IAWO,aAAa;QACnB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,4BAA4B,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CAmBF;AAEQ,wCAAc"}

package/lib/web/analytics-tool/analytics-tool-types.d.ts

@@ -1,4 +1,3 @@
 import { tAPP } from '../../track-analytics-types';
 import { IWebAnalyticsWrapper } from '../track-analytics/track-analytics-types';
-import { TraceManager } from '../utils/trace-manager';
-export type tWebToolWraperFunction = (segmentKey: string, app: tAPP, traceManager: TraceManager, debug?: boolean) => IWebAnalyticsWrapper;
+export type tWebToolWraperFunction = (segmentKey: string, app: tAPP, debug?: boolean) => IWebAnalyticsWrapper;

package/lib/web/analytics-tool/web-segment.js

@@ -7,8 +7,17 @@ function isPlainObject(obj) {
     return Object.prototype.toString.call(obj).slice(8, -1).toLowerCase() === 'object';
 }
 exports.isPlainObject = isPlainObject;
-const webSegment = (segmentKey, app, traceManager, debug) => {
+const webSegment = (segmentKey, app, debug) => {
     const client = analytics_next_1.AnalyticsBrowser.load({ writeKey: segmentKey }, {
+        integrations: {
+            'Segment.io': {
+                deliveryStrategy: {
+                    config: {
+                        keepalive: true,
+                    },
+                },
+            },
+        },
         user: {
             persist: true,
             localStorage: {
@@ -18,20 +27,17 @@ const webSegment = (segmentKey, app, traceManager, debug) => {
     });
     return {
         track: async (eventName, eventParams, options, callback) => {
-            const trace = traceManager.getTraceId();
-            const eventData = Object.assign(Object.assign({}, eventParams), { anlaytics_lib_version: package_json_1.version, fleek_platform: app, time_stamp: Date.now(), trace_id: trace });
+            const eventData = Object.assign(Object.assign({}, eventParams), { anlaytics_lib_version: package_json_1.version, fleek_platform: app, time_stamp: Date.now() });
             if (debug) {
                 console.log('TRACK EVENT', eventName, eventData);
             }
             return await client.track(eventName, eventData, options, callback);
         },
         page: async (name, props) => {
-            const trace = traceManager.getTraceId();
-            const eventProperties = props ? Object.assign(Object.assign({}, props), { trace_id: trace }) : { trace_id: trace };
             if (debug) {
-                console.log('PAGE EVENT', name, eventProperties);
+                console.log('PAGE EVENT', name, props);
             }
-            return await client.page(name, eventProperties);
+            return await client.page(name, Object.assign(Object.assign({}, props), { fleek_platform: app }));
         },
         identify: async (...args) => {
             if (debug) {
@@ -39,6 +45,9 @@ const webSegment = (segmentKey, app, traceManager, debug) => {
             }
             return await client.identify(...args);
         },
+        getAnonymousId: async () => {
+            return (await client.user()).anonymousId();
+        },
         type: 'WEB_SEGMENT',
     };
 };

package/lib/web/analytics-tool/web-segment.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-segment.js","sourceRoot":"","sources":["../../../src/web/analytics-tool/web-segment.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAE3D,wDAAgD;AAEhD,SAAgB,aAAa,CAAC,GAAY;IACxC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;AACrF,CAAC;AAFD,sCAEC;AAEM,MAAM,UAAU,GAA2B,CAAC,UAAkB,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;IACjG,MAAM,MAAM,GAAG,iCAAgB,CAAC,IAAI,CAClC,EAAE,QAAQ,EAAE,UAAU,EAAE,EACxB;QACE,IAAI,EAAE;YACJ,OAAO,EAAE,IAAI;YACb,YAAY,EAAE;gBACZ,GAAG,EAAE,qBAAqB;aAC3B;SACF;KACF,CACF,CAAC;IAEF,OAAO;QACL,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;YACzD,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;YACxC,MAAM,SAAS,mCAAQ,WAAW,KAAE,qBAAqB,EAAE,sBAAO,EAAE,cAAc,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,GAAE,CAAC;YACnI,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACnD,CAAC;YAED,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;YACxC,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,iCAAM,KAAK,KAAE,QAAQ,EAAE,KAAK,IAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;YACpF,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;YACnD,CAAC;YACD,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAClD,CAAC;QACD,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;YAC1B,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,CAAC;YACzC,CAAC;YACD,OAAO,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,EAAE,aAAa;KACpB,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,UAAU,cAuCrB"}
+{"version":3,"file":"web-segment.js","sourceRoot":"","sources":["../../../src/web/analytics-tool/web-segment.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAE3D,wDAAgD;AAEhD,SAAgB,aAAa,CAAC,GAAY;IACxC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;AACrF,CAAC;AAFD,sCAEC;AAEM,MAAM,UAAU,GAA2B,CAAC,UAAkB,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;IACnF,MAAM,MAAM,GAAG,iCAAgB,CAAC,IAAI,CAClC,EAAE,QAAQ,EAAE,UAAU,EAAE,EACxB;QACE,YAAY,EAAE;YACZ,YAAY,EAAE;gBACZ,gBAAgB,EAAE;oBAChB,MAAM,EAAE;wBACN,SAAS,EAAE,IAAI;qBAChB;iBACF;aACF;SACF;QACD,IAAI,EAAE;YACJ,OAAO,EAAE,IAAI;YACb,YAAY,EAAE;gBACZ,GAAG,EAAE,qBAAqB;aAC3B;SACF;KACF,CACF,CAAC;IAEF,OAAO;QACL,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;YACzD,MAAM,SAAS,mCAAQ,WAAW,KAAE,qBAAqB,EAAE,sBAAO,EAAE,cAAc,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC;YAClH,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACnD,CAAC;YAED,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YAC1B,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC;YACD,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,kCAAO,KAAK,KAAE,cAAc,EAAE,GAAG,IAAG,CAAC;QACpE,CAAC;QACD,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;YAC1B,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,CAAC;YACzC,CAAC;YACD,OAAO,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACxC,CAAC;QACD,cAAc,EAAE,KAAK,IAAI,EAAE;YACzB,OAAO,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7C,CAAC;QACD,IAAI,EAAE,aAAa;KACpB,CAAC;AACJ,CAAC,CAAC;AAhDW,QAAA,UAAU,cAgDrB"}

package/lib/web/track-analytics/track-analytics-types.d.ts

@@ -4,10 +4,12 @@ import { tAPP } from '../../track-analytics-types';
 export type tWebTrack = <T extends EVENT_NAMES>(eventName: T, eventParams: EVENT_MAP[T], options?: Options | Callback, callback?: Callback) => Promise<Context | void>;
 export type tWebIdentify = (id?: ID | object, traits?: UserTraits | Callback | null, options?: Options | Callback, callback?: Callback) => Promise<Context | void>;
 export type tWebPage = (name?: string | object, properties?: Record<string, unknown> | Options | Callback | null) => Promise<Context | void>;
+export type tWebAnonymousId = () => Promise<ID | void>;
 export interface IWebAnalyticsWrapper {
     track: tWebTrack;
     identify: tWebIdentify;
     page: tWebPage;
+    getAnonymousId: tWebAnonymousId;
     type: string;
 }
 export type tToolWraperFunction = (APP: tAPP) => IWebAnalyticsWrapper;

package/lib/web/track-analytics/track-analytics.d.ts

@@ -1,14 +1,14 @@
 import { IAnalyticsInit } from '../../track-analytics-types';
-import { tWebIdentify, tWebPage, tWebTrack } from './track-analytics-types';
+import { tWebAnonymousId, tWebIdentify, tWebPage, tWebTrack } from './track-analytics-types';
 declare class TrackAnalytics {
     private initParams;
     private analyticsWrapper;
-    private traceManager;
     constructor(params: IAnalyticsInit);
     initAnalytics: () => Promise<void>;
     private checkInitDone;
     track: tWebTrack;
     identify: tWebIdentify;
     page: tWebPage;
+    getAnonymousId: tWebAnonymousId;
 }
 export { TrackAnalytics };

package/lib/web/track-analytics/track-analytics.js

@@ -4,18 +4,16 @@ exports.TrackAnalytics = void 0;
 const constants_1 = require("../../constants");
 const web_segment_1 = require("../analytics-tool/web-segment");
 const dev_logger_1 = require("../utils/dev-logger");
-const trace_manager_1 = require("../utils/trace-manager");
 class TrackAnalytics {
     constructor(params) {
         this.analyticsWrapper = null;
         this.initAnalytics = async () => {
             try {
-                this.traceManager.init();
                 if (this.initParams.devMode && !this.initParams.debug) {
                     this.analyticsWrapper = dev_logger_1.devModeLogger;
                 }
                 else {
-                    this.analyticsWrapper = (0, web_segment_1.webSegment)(this.initParams.segmentKey, this.initParams.App, this.traceManager, this.initParams.debug);
+                    this.analyticsWrapper = (0, web_segment_1.webSegment)(this.initParams.segmentKey, this.initParams.App, this.initParams.debug);
                 }
             }
             catch (e) {
@@ -40,8 +38,13 @@ class TrackAnalytics {
                 return await ((_a = this.analyticsWrapper) === null || _a === void 0 ? void 0 : _a.page(params));
             }
         };
+        this.getAnonymousId = async () => {
+            var _a;
+            if (this.checkInitDone()) {
+                return await ((_a = this.analyticsWrapper) === null || _a === void 0 ? void 0 : _a.getAnonymousId());
+            }
+        };
         this.initParams = params;
-        this.traceManager = new trace_manager_1.TraceManager(params.errorHandler);
     }
     checkInitDone() {
         if (this.analyticsWrapper) {

package/lib/web/track-analytics/track-analytics.js.map

@@ -1 +1 @@
-{"version":3,"file":"track-analytics.js","sourceRoot":"","sources":["../../../src/web/track-analytics/track-analytics.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAGhD,+DAA2D;AAC3D,oDAAoD;AACpD,0DAAsD;AAEtD,MAAM,cAAc;IAKlB,YAAY,MAAsB;QAH1B,qBAAgB,GAAgC,IAAI,CAAC;QAQ7D,kBAAa,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,CAAC;gBACH,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;gBACzB,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;oBACtD,IAAI,CAAC,gBAAgB,GAAG,0BAAa,CAAC;gBACxC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,gBAAgB,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAChI,CAAC;YACH,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC;QAYF,UAAK,GAAc,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;;YACnC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA,CAAC;YACrD,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAiB,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;;YAC5C,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC;QAEF,SAAI,GAAa,KAAK,EAAE,MAAM,EAAE,EAAE;;YAChC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC;YACnD,CAAC;QACH,CAAC,CAAC;QA3CA,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC5D,CAAC;IAeO,aAAa;QACnB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAE1B,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,4BAA4B,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CAmBF;AAEQ,wCAAc"}
+{"version":3,"file":"track-analytics.js","sourceRoot":"","sources":["../../../src/web/track-analytics/track-analytics.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAGhD,+DAA2D;AAC3D,oDAAoD;AAEpD,MAAM,cAAc;IAIlB,YAAY,MAAsB;QAF1B,qBAAgB,GAAgC,IAAI,CAAC;QAM7D,kBAAa,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,CAAC;gBACH,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;oBACtD,IAAI,CAAC,gBAAgB,GAAG,0BAAa,CAAC;gBACxC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,gBAAgB,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC7G,CAAC;YACH,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC;QAYF,UAAK,GAAc,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;;YACnC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA,CAAC;YACrD,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAiB,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;;YAC5C,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC;QAEF,SAAI,GAAa,KAAK,EAAE,MAAM,EAAE,EAAE;;YAChC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC;YACnD,CAAC;QACH,CAAC,CAAC;QAEF,mBAAc,GAAoB,KAAK,IAAI,EAAE;;YAC3C,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,cAAc,EAAE,CAAA,CAAC;YACvD,CAAC;QACH,CAAC,CAAC;QA/CA,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IAC3B,CAAC;IAcO,aAAa;QACnB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAE1B,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,4BAA4B,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CAyBF;AAEQ,wCAAc"}

package/lib/web/utils/dev-logger.js

@@ -11,6 +11,9 @@ exports.devModeLogger = {
     identify: async (...args) => {
         console.log('IDENTIFY EVENT', args[0], args);
     },
+    getAnonymousId: async () => {
+        console.log('GET Anonymous ID Called');
+    },
     type: 'WEB-DEBUG',
 };
 //# sourceMappingURL=dev-logger.js.map

package/lib/web/utils/dev-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-logger.js","sourceRoot":"","sources":["../../../src/web/utils/dev-logger.ts"],"names":[],"mappings":";;;AAEa,QAAA,aAAa,GAAyB;IACjD,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IACD,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC1B,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,EAAE,WAAW;CAClB,CAAC"}
+{"version":3,"file":"dev-logger.js","sourceRoot":"","sources":["../../../src/web/utils/dev-logger.ts"],"names":[],"mappings":";;;AAEa,QAAA,aAAa,GAAyB;IACjD,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IACD,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC1B,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IACD,cAAc,EAAE,KAAK,IAAI,EAAE;QACzB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,EAAE,WAAW;CAClB,CAAC"}

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "fleek-track-analytics",
-  "version": "0.0.96",
+  "version": "0.0.99",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "exports": {
     ".": "./lib/index.js",
     "./react-native": "./lib/react-native/index.js",
     "./lib/web": "./lib/web/index.js",
-    "./lib/node": "./lib/node/index.js",
-    "./lib/segment-exports": "./lib/segment-exports"
+    "./lib/node": "./lib/node/index.js"
   },
   "repository": {
     "type": "git",
@@ -24,7 +23,6 @@
     "build": "rm -rf lib && tsc"
   },
   "dependencies": {
-    "@react-native-async-storage/async-storage": "^1.23.1",
     "@segment/analytics-next": "^1.66.0",
     "@segment/analytics-node": "^2.1.0",
     "@segment/analytics-react-native": "^2.19.1",
@@ -35,7 +33,6 @@
   "devDependencies": {
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.5",
-    "@types/react-native": "^0.73.0",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^7.5.0",
     "@typescript-eslint/parser": "^7.5.0",
@@ -46,7 +43,7 @@
     "nodemon": "^3.1.0",
     "prettier": "^3.2.5",
     "react": "^18.2.0",
-    "react-native": "^0.74.0",
+    "react-native": "^0.73.6",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.4"

package/lib/react-native/utils/trace-manager.d.ts

@@ -1,12 +0,0 @@
-declare class TraceManager {
-    private duration;
-    private traceId?;
-    private traceIdTS?;
-    private errorHanlder;
-    constructor(errorHanlder: (e: unknown) => void, duration?: number);
-    private generateTrace;
-    private updateTraceState;
-    getTraceId: () => Promise<string | number>;
-    init(): Promise<void>;
-}
-export { TraceManager };

package/lib/react-native/utils/trace-manager.js

@@ -1,79 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TraceManager = void 0;
-const uuid_1 = require("uuid");
-const async_storage_1 = __importDefault(require("@react-native-async-storage/async-storage"));
-const defaultDuration = 1800000;
-const traceKey = '__FLEEK_TRACK_TRACE__';
-const traceTSKey = '__FLEEK_TRACK_TRACE_TS__';
-class TraceManager {
-    constructor(errorHanlder, duration) {
-        this.getTraceId = async () => {
-            const now = Date.now();
-            if (this.traceId && this.traceIdTS && now - this.traceIdTS < this.duration) {
-                this.traceIdTS = now;
-                await this.updateTraceState(now);
-                return this.traceIdTS;
-            }
-            if (this.traceId && this.traceIdTS && now - this.traceIdTS > this.duration) {
-                return this.generateTrace(now);
-            }
-            return this.generateTrace(now);
-        };
-        this.duration = duration || defaultDuration;
-        this.errorHanlder = errorHanlder;
-    }
-    async generateTrace(latestTs) {
-        try {
-            const storageTrace = await async_storage_1.default.getItem(traceKey);
-            const storageTraceTS = Number.parseInt((await async_storage_1.default.getItem(traceTSKey)) || '');
-            if (storageTrace && !Number.isNaN(storageTraceTS) && latestTs - storageTraceTS < this.duration) {
-                this.updateTraceState(latestTs);
-                return storageTrace;
-            }
-            else {
-                const trace = (0, uuid_1.v4)();
-                this.updateTraceState(latestTs, trace);
-                return trace;
-            }
-        }
-        catch (e) {
-            this.errorHanlder(e);
-        }
-        return (0, uuid_1.v4)();
-    }
-    async updateTraceState(latestTs, traceId) {
-        let timer = null;
-        const updateTs = latestTs;
-        console.log('testing2 updateTraceState called', latestTs, traceId);
-        const attemptStorageUpdate = async () => {
-            try {
-                console.log('testing3 updating latestTS in storage', latestTs);
-                this.traceIdTS = latestTs;
-                await async_storage_1.default.setItem(traceTSKey, updateTs.toString());
-                if (traceId) {
-                    console.log('testing3 updating traceId in storage', traceId);
-                    this.traceId = traceId;
-                    await async_storage_1.default.setItem(traceKey, traceId);
-                }
-            }
-            catch (e) {
-                this.errorHanlder(e);
-            }
-        };
-        if (!timer) {
-            await attemptStorageUpdate();
-            timer = setTimeout(() => {
-                timer = null;
-            }, 1000);
-        }
-    }
-    async init() {
-        await this.getTraceId();
-    }
-}
-exports.TraceManager = TraceManager;
-//# sourceMappingURL=trace-manager.js.map

package/lib/react-native/utils/trace-manager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"trace-manager.js","sourceRoot":"","sources":["../../../src/react-native/utils/trace-manager.ts"],"names":[],"mappings":"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"}