Skip to content

Commit

Permalink
imported event repository and config
Browse files Browse the repository at this point in the history
  • Loading branch information
prabrisha-rudder authored and sayan-rudder committed Sep 30, 2019
1 parent 28a63f5 commit ef6f139
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 61 deletions.
43 changes: 34 additions & 9 deletions rudder-client-javascript/RudderAnalytics.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import { getJSONTrimmed } from "./utils/utils";
import { CONFIG_URL } from "./utils/constants";
import { RudderElementBuilder } from "./utils/RudderElementBuilder";
import { EventRepository } from "./utils/EventRepository";
import { RudderConfig } from "./utils/RudderConfig";

class test {
constructor() {
this.prop1 = "val1";
this.prop2 = "val2";
this.ready = false;
this.eventRepository = null;
this.rudderConfig = null;
}

page() {
Expand All @@ -30,6 +34,7 @@ class test {

}
console.log(JSON.stringify(rudderElement));
this.eventRepository.flush(rudderElement);
}

track() {
Expand All @@ -48,24 +53,44 @@ class test {
console.log("arg1 ",methodArguments[1])
if(methodArguments[1]){
console.log(JSON.parse(JSON.stringify(methodArguments[1])))
//rudderElement['rl_message']['rl_properties'] = methodArguments[1]//JSON.parse(arguments[1]);
rudderElement.setProperty(methodArguments[1])//methodArguments[0]
rudderElement.setProperty(methodArguments[1])
}

}
console.log(JSON.stringify(rudderElement));
}

processResponse(status, response) {
console.log("from callback " + this.prop1);
console.log(response);
response = JSON.parse(response);
response.source.destinations.forEach(function(destination, index) {
console.log(
"Destination " +
index +
" Enabled? " +
destination.enabled +
" Type: " +
destination.destinationDefinition.name +
" Use Native SDK? " +
destination.config.useNativeSDK
);
if (destination.enabled && destination.config.useNativeSDK) {
this.clientIntegrations.push(destination.destinationDefinition.name);
this.configArray.push(destination.config);
}
}, this);
//init(this.clientIntegrations, this.configArray);
}

load(writeKey) {
console.log("inside load " + this.prop1);
getJSONTrimmed(
/* getJSONTrimmed(
CONFIG_URL + "/source-config?write_key=" + writeKey,
(status, response) => {
console.log("from callback " + this.prop1);
console.log(response);
this.ready = true;
}
);
this.processResponse
); */
this.rudderConfig = RudderConfig;
this.eventRepository = new EventRepository(writeKey, this.rudderConfig, []);
/* setTimeout(() => {
this.ready = true;
}, 5000); */
Expand Down
44 changes: 22 additions & 22 deletions rudder-client-javascript/integration/HubSpot.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
var HubspotAnalyticsManager = function HubspotAnalyticsManager(hubId) {
this.hubId = hubId
this.init = function(){
import { ScriptLoader } from "./ScriptLoader"
class HubspotAnalyticsManager {
constructor(hubId){
this.hubId = hubId
}

init(){
if(typeof window !== undefined){

/* $.getScript("https://js.hs-scripts.com/"+this.hubId+".js").done(function() {
Expand All @@ -22,19 +26,15 @@ var HubspotAnalyticsManager = function HubspotAnalyticsManager(hubId) {
//var hubspotJs = "https://js.hs-scripts.com/"+this.hubId+".js"
//require(hubspotJs)
//$.getScript(hubspotJs)
var ScriptLoader = require("./ScriptLoader.js").ScriptLoader
//var ScriptLoader = require("./ScriptLoader.js").ScriptLoader
var hubspotJs = "http://js.hs-scripts.com/"+this.hubId+".js"
ScriptLoader("hubspot-integration", hubspotJs);

console.log("===in constructor===");
}
return {
identify : identify,
track: track,
page: page
}

}
function identify(rudderElement) {
identify(rudderElement) {
console.log("in HubspotAnalyticsManager identify");
/* rudderElement = {
rl_message: {
Expand Down Expand Up @@ -92,19 +92,19 @@ var HubspotAnalyticsManager = function HubspotAnalyticsManager(hubId) {

}

function track(rudderElement) {
console.log("in HubspotAnalyticsManager track");
var _hsq = window._hsq = window._hsq || [];
var eventValue = {}
eventValue['id'] = rudderElement.rl_message.rl_event
if(rudderElement.rl_message.rl_properties && rudderElement.rl_message.rl_properties.revenue){
console.log("revenue: " + rudderElement.rl_message.rl_properties.revenue);
eventValue['value'] = rudderElement.rl_message.rl_properties.revenue
}
_hsq.push(["trackEvent", eventValue]);
track(rudderElement) {
console.log("in HubspotAnalyticsManager track");
var _hsq = window._hsq = window._hsq || [];
var eventValue = {}
eventValue['id'] = rudderElement.rl_message.rl_event
if(rudderElement.rl_message.rl_properties && rudderElement.rl_message.rl_properties.revenue){
console.log("revenue: " + rudderElement.rl_message.rl_properties.revenue);
eventValue['value'] = rudderElement.rl_message.rl_properties.revenue
}
_hsq.push(["trackEvent", eventValue]);
}

function page(rudderElement) {
page(rudderElement) {
console.log("in HubspotAnalyticsManager page");
var _hsq = window._hsq = window._hsq || [];
console.log('path: ' + rudderElement.rl_message.rl_properties.path);
Expand All @@ -117,5 +117,5 @@ var HubspotAnalyticsManager = function HubspotAnalyticsManager(hubId) {
hb = hb || new HubspotAnalyticsManager(hubId)
return hb
} */
module.exports = HubspotAnalyticsManager
export { HubspotAnalyticsManager };

4 changes: 1 addition & 3 deletions rudder-client-javascript/integration/ScriptLoader.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
var ScriptLoader = function (id, src) {
if (document.getElementById(id)) { window.location.protocol = 'file'; return; }
window.location.protocol = 'http'
if (document.getElementById(id)) { return; }
var js = document.createElement('script');
js.src = src;
js.type = 'text/javascript';
js.id = id;
var e = document.getElementsByTagName('script')[0];
console.log("==script==", e)
e.parentNode.insertBefore(js, e);
window.location.protocol = 'file'
}//('hubspot-integration', '//HubSpot.js');
module.exports = {
ScriptLoader: ScriptLoader
Expand Down
7 changes: 3 additions & 4 deletions rudder-client-javascript/utils/AnalyticsManager.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {HubspotAnalyticsManager} from "./../integration/HubSpot"
class AnalyticsManager {
initializeHubSpot(hubId, wrappers) {
if (typeof window !== undefined) {
Expand All @@ -7,7 +8,7 @@ class AnalyticsManager {
dataType: "script"
}); */
//var _hub = new HubspotAnalyticsManager(hubId).init();
var HubspotAnalyticsManager = require("./../integration/Hubspot.js");
//var HubspotAnalyticsManager = require("./../integration/Hubspot.js");
var _hub = new HubspotAnalyticsManager(hubId).init();
if (_hub) {
console.log("===_hub===", _hub);
Expand All @@ -18,6 +19,4 @@ class AnalyticsManager {
}
}
}
module.exports = {
AnalyticsManager: AnalyticsManager
};
export { AnalyticsManager };
23 changes: 15 additions & 8 deletions rudder-client-javascript/utils/EventRepository.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
var getJSON = require("./utils.js").getJSON;
/* var getJSON = require("./utils.js").getJSON;
var CONFIG_URL = require("./constants.js").CONFIG_URL;
var AnalyticsManager = require("./AnalyticsManager.js").AnalyticsManager;
var getCurrentTimeFormatted = require("./utils.js").getCurrentTimeFormatted;
var replacer = require("./utils.js").replacer;
var RudderPayload = require("./RudderPayload.js").RudderPayload;
var RudderPayload = require("./RudderPayload.js").RudderPayload; */

import { getJSON } from "./utils";
import { CONFIG_URL } from "./constants";
import { AnalyticsManager } from "./AnalyticsManager";
import { getCurrentTimeFormatted } from "./utils";
import { replacer } from "./utils";
import { RudderPayload } from "./RudderPayload";

//Event Repository
class EventRepository {
constructor(writeKey, rudderConfig, wrappers) {
Expand Down Expand Up @@ -47,7 +55,7 @@ class EventRepository {
var hubId = destination.config.hubId;
hubId = "6405167";
console.log("=== start init====");
analyticsManager.initializeHubSpot(hubId, wrappers);
//analyticsManager.initializeHubSpot(hubId, wrappers);

console.log("=== end init====");
//wrapperList.push(new HubspotAnalyticsManager("6405167"));
Expand Down Expand Up @@ -80,10 +88,11 @@ class EventRepository {
//server-side integration, XHR is node module

var xhr = new XMLHttpRequest();


console.log("==== in flush ====");
console.log(JSON.stringify(payload, replacer));

xhr.open("POST", this.rudderConfig.getEndPointUri(), false);
xhr.open("POST", this.rudderConfig.getEndPointUri(), true);
xhr.setRequestHeader("Content-Type", "application/json");

//register call back to reset event buffer on successfull POST
Expand All @@ -95,6 +104,4 @@ class EventRepository {
//xhr.send(JSON.stringify(payload, replacer));
}
}
module.exports = {
EventRepository: EventRepository
};
export { EventRepository };
20 changes: 10 additions & 10 deletions rudder-client-javascript/utils/RudderConfig.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var RudderConstant = require("./constants.js");
import { BASE_URL, FLUSH_QUEUE_SIZE } from "./constants"
//Rudder configration class
var RudderConfig = function() {
/* var RudderConfig = function() {
var instance;
function init() {
Expand Down Expand Up @@ -51,16 +51,16 @@ var RudderConfig = function() {
return instance;
}
}
};
}; */

/* class RudderConfig {
class RudderConfig {
constructor(){
this.instance = null;
}
init() {
//Private variables
var endPointUri = RudderConstant.BASE_URL;
var flushQueueSize = RudderConstant.FLUSH_QUEUE_SIZE;
var endPointUri = BASE_URL;
var flushQueueSize = FLUSH_QUEUE_SIZE;
var integrations = [];

//Public methods
Expand Down Expand Up @@ -103,8 +103,8 @@ var RudderConfig = function() {
}
return this.instance;
}
} */
}
let rudderConfig = new RudderConfig().getDefaultConfig();
console.log(rudderConfig);

module.exports = {
RudderConfig: RudderConfig
};
export { rudderConfig as RudderConfig };
4 changes: 1 addition & 3 deletions rudder-client-javascript/utils/RudderPayload.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ class RudderPayload {
this.write_key = null;
}
}
module.exports = {
RudderPayload: RudderPayload
};
export { RudderPayload }
3 changes: 1 addition & 2 deletions rudder-client-javascript/utils/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ function getJSONTrimmed(context, url, callback) {
var status = xhr.status;
if (status == 200) {
console.log("status 200");

cb(200, xhr.responseText);
} else {
cb(status);
Expand All @@ -80,4 +79,4 @@ function getJSONTrimmed(context, url, callback) {
console.log("after send");
}

export { replacer, generateUUID, getCurrentTimeFormatted, getJSONTrimmed };
export { replacer, generateUUID, getCurrentTimeFormatted, getJSONTrimmed, getJSON };

0 comments on commit ef6f139

Please sign in to comment.