Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Session Recording Proxy Configuration #475

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Refactor Session Recording Proxy Configuration #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bb100f
helps to commit
chrisknu Mar 20, 2025
2ea667f
Add support for configurable endpoint-specific API hosts
chrisknu Mar 24, 2025
67bd268
build
chrisknu Mar 24, 2025
63d755e
refactor to simpler api_host config
chrisknu Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions dist/mixpanel-core.cjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4620,7 +4620,7 @@ MixpanelGroup.prototype._send_request = function(data, callback) {
return this._mixpanel._track_or_batch({
type: 'groups',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['groups'],
endpoint: this._mixpanel._getApiHost('groups') + '/' + this._get_config('api_routes')['groups'],
batcher: this._mixpanel.request_batchers.groups
}, callback);
};
Expand Down Expand Up @@ -4982,7 +4982,7 @@ MixpanelPeople.prototype._send_request = function(data, callback) {
return this._mixpanel._track_or_batch({
type: 'people',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['engage'],
endpoint: this._mixpanel._getApiHost('people') + '/' + this._get_config('api_routes')['engage'],
batcher: this._mixpanel.request_batchers.people
}, callback);
};
Expand Down Expand Up @@ -5740,6 +5740,7 @@ var DEFAULT_API_ROUTES = {
*/
var DEFAULT_CONFIG = {
'api_host': 'https://api-js.mixpanel.com',
'api_hosts': {},
'api_routes': DEFAULT_API_ROUTES,
'api_method': 'POST',
'api_transport': 'XHR',
Expand Down Expand Up @@ -5796,7 +5797,7 @@ var DEFAULT_CONFIG = {
'record_max_ms': MAX_RECORDING_MS,
'record_min_ms': 0,
'record_sessions_percent': 0,
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js'
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js',
};

var DOM_LOADED = false;
Expand Down Expand Up @@ -6721,7 +6722,7 @@ MixpanelLib.prototype.track = addOptOutCheckMixpanelLib(function(event_name, pro
var ret = this._track_or_batch({
type: 'events',
data: data,
endpoint: this.get_config('api_host') + '/' + this.get_config('api_routes')['track'],
endpoint: this._getApiHost('events') + '/' + this.get_config('api_routes')['track'],
batcher: this.request_batchers.events,
should_send_immediately: should_send_immediately,
send_request_options: options
Expand Down Expand Up @@ -7535,6 +7536,17 @@ MixpanelLib.prototype.get_property = function(property_name) {
return this['persistence'].load_prop([property_name]);
};

/**
* Get the API host for a specific endpoint type, falling back to the default api_host if not specified
*
* @param {String} endpoint_type The type of endpoint (e.g., "events", "people", "groups")
* @returns {String} The API host to use for this endpoint
* @private
*/
MixpanelLib.prototype._getApiHost = function(endpoint_type) {
return this.get_config('api_hosts')[endpoint_type] || this.get_config('api_host');
};

MixpanelLib.prototype.toString = function() {
var name = this.get_config('name');
if (name !== PRIMARY_INSTANCE_NAME) {
Expand Down
3 changes: 2 additions & 1 deletion dist/mixpanel-recorder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8153,8 +8153,9 @@
retryAfter: response.headers.get('Retry-After')
});
}.bind(this);
const apiHost = this.getConfig('session_recording_use_proxy') ? this.getConfig('api_host') : 'https://api.mixpanel.com';

win['fetch'](this.getConfig('api_host') + '/' + this.getConfig('api_routes')['record'] + '?' + new URLSearchParams(reqParams), {
win['fetch'](apiHost + '/' + this.getConfig('api_routes')['record'] + '?' + new URLSearchParams(reqParams), {
'method': 'POST',
'headers': {
'Authorization': 'Basic ' + btoa(this.getConfig('token') + ':'),
Expand Down
2 changes: 1 addition & 1 deletion dist/mixpanel-recorder.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/mixpanel-recorder.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions dist/mixpanel-with-async-recorder.cjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4620,7 +4620,7 @@ MixpanelGroup.prototype._send_request = function(data, callback) {
return this._mixpanel._track_or_batch({
type: 'groups',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['groups'],
endpoint: this._mixpanel._getApiHost('groups') + '/' + this._get_config('api_routes')['groups'],
batcher: this._mixpanel.request_batchers.groups
}, callback);
};
Expand Down Expand Up @@ -4982,7 +4982,7 @@ MixpanelPeople.prototype._send_request = function(data, callback) {
return this._mixpanel._track_or_batch({
type: 'people',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['engage'],
endpoint: this._mixpanel._getApiHost('people') + '/' + this._get_config('api_routes')['engage'],
batcher: this._mixpanel.request_batchers.people
}, callback);
};
Expand Down Expand Up @@ -5740,6 +5740,7 @@ var DEFAULT_API_ROUTES = {
*/
var DEFAULT_CONFIG = {
'api_host': 'https://api-js.mixpanel.com',
'api_hosts': {},
'api_routes': DEFAULT_API_ROUTES,
'api_method': 'POST',
'api_transport': 'XHR',
Expand Down Expand Up @@ -5796,7 +5797,7 @@ var DEFAULT_CONFIG = {
'record_max_ms': MAX_RECORDING_MS,
'record_min_ms': 0,
'record_sessions_percent': 0,
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js'
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js',
};

var DOM_LOADED = false;
Expand Down Expand Up @@ -6721,7 +6722,7 @@ MixpanelLib.prototype.track = addOptOutCheckMixpanelLib(function(event_name, pro
var ret = this._track_or_batch({
type: 'events',
data: data,
endpoint: this.get_config('api_host') + '/' + this.get_config('api_routes')['track'],
endpoint: this._getApiHost('events') + '/' + this.get_config('api_routes')['track'],
batcher: this.request_batchers.events,
should_send_immediately: should_send_immediately,
send_request_options: options
Expand Down Expand Up @@ -7535,6 +7536,17 @@ MixpanelLib.prototype.get_property = function(property_name) {
return this['persistence'].load_prop([property_name]);
};

/**
* Get the API host for a specific endpoint type, falling back to the default api_host if not specified
*
* @param {String} endpoint_type The type of endpoint (e.g., "events", "people", "groups")
* @returns {String} The API host to use for this endpoint
* @private
*/
MixpanelLib.prototype._getApiHost = function(endpoint_type) {
return this.get_config('api_hosts')[endpoint_type] || this.get_config('api_host');
};

MixpanelLib.prototype.toString = function() {
var name = this.get_config('name');
if (name !== PRIMARY_INSTANCE_NAME) {
Expand Down
23 changes: 18 additions & 5 deletions dist/mixpanel.amd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8336,8 +8336,9 @@ define((function () { 'use strict';
retryAfter: response.headers.get('Retry-After')
});
}.bind(this);
const apiHost = this._mixpanel.get_config('api_hosts')['record'] || 'https://api.mixpanel.com';

win['fetch'](this.getConfig('api_host') + '/' + this.getConfig('api_routes')['record'] + '?' + new URLSearchParams(reqParams), {
win['fetch'](apiHost + '/' + this.getConfig('api_routes')['record'] + '?' + new URLSearchParams(reqParams), {
'method': 'POST',
'headers': {
'Authorization': 'Basic ' + btoa(this.getConfig('token') + ':'),
Expand Down Expand Up @@ -9922,7 +9923,7 @@ define((function () { 'use strict';
return this._mixpanel._track_or_batch({
type: 'groups',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['groups'],
endpoint: this._mixpanel._getApiHost('groups') + '/' + this._get_config('api_routes')['groups'],
batcher: this._mixpanel.request_batchers.groups
}, callback);
};
Expand Down Expand Up @@ -10284,7 +10285,7 @@ define((function () { 'use strict';
return this._mixpanel._track_or_batch({
type: 'people',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['engage'],
endpoint: this._mixpanel._getApiHost('people') + '/' + this._get_config('api_routes')['engage'],
batcher: this._mixpanel.request_batchers.people
}, callback);
};
Expand Down Expand Up @@ -10919,6 +10920,7 @@ define((function () { 'use strict';
*/
var DEFAULT_CONFIG = {
'api_host': 'https://api-js.mixpanel.com',
'api_hosts': {},
'api_routes': DEFAULT_API_ROUTES,
'api_method': 'POST',
'api_transport': 'XHR',
Expand Down Expand Up @@ -10975,7 +10977,7 @@ define((function () { 'use strict';
'record_max_ms': MAX_RECORDING_MS,
'record_min_ms': 0,
'record_sessions_percent': 0,
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js'
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js',
};

var DOM_LOADED = false;
Expand Down Expand Up @@ -11900,7 +11902,7 @@ define((function () { 'use strict';
var ret = this._track_or_batch({
type: 'events',
data: data,
endpoint: this.get_config('api_host') + '/' + this.get_config('api_routes')['track'],
endpoint: this._getApiHost('events') + '/' + this.get_config('api_routes')['track'],
batcher: this.request_batchers.events,
should_send_immediately: should_send_immediately,
send_request_options: options
Expand Down Expand Up @@ -12714,6 +12716,17 @@ define((function () { 'use strict';
return this['persistence'].load_prop([property_name]);
};

/**
* Get the API host for a specific endpoint type, falling back to the default api_host if not specified
*
* @param {String} endpoint_type The type of endpoint (e.g., "events", "people", "groups")
* @returns {String} The API host to use for this endpoint
* @private
*/
MixpanelLib.prototype._getApiHost = function(endpoint_type) {
return this.get_config('api_hosts')[endpoint_type] || this.get_config('api_host');
};

MixpanelLib.prototype.toString = function() {
var name = this.get_config('name');
if (name !== PRIMARY_INSTANCE_NAME) {
Expand Down
23 changes: 18 additions & 5 deletions dist/mixpanel.cjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8336,8 +8336,9 @@ SessionRecording.prototype._sendRequest = function(currentReplayId, reqParams, r
retryAfter: response.headers.get('Retry-After')
});
}.bind(this);
const apiHost = this._mixpanel.get_config('api_hosts')['record'] || 'https://api.mixpanel.com';

win['fetch'](this.getConfig('api_host') + '/' + this.getConfig('api_routes')['record'] + '?' + new URLSearchParams(reqParams), {
win['fetch'](apiHost + '/' + this.getConfig('api_routes')['record'] + '?' + new URLSearchParams(reqParams), {
'method': 'POST',
'headers': {
'Authorization': 'Basic ' + btoa(this.getConfig('token') + ':'),
Expand Down Expand Up @@ -9922,7 +9923,7 @@ MixpanelGroup.prototype._send_request = function(data, callback) {
return this._mixpanel._track_or_batch({
type: 'groups',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['groups'],
endpoint: this._mixpanel._getApiHost('groups') + '/' + this._get_config('api_routes')['groups'],
batcher: this._mixpanel.request_batchers.groups
}, callback);
};
Expand Down Expand Up @@ -10284,7 +10285,7 @@ MixpanelPeople.prototype._send_request = function(data, callback) {
return this._mixpanel._track_or_batch({
type: 'people',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['engage'],
endpoint: this._mixpanel._getApiHost('people') + '/' + this._get_config('api_routes')['engage'],
batcher: this._mixpanel.request_batchers.people
}, callback);
};
Expand Down Expand Up @@ -10919,6 +10920,7 @@ var DEFAULT_API_ROUTES = {
*/
var DEFAULT_CONFIG = {
'api_host': 'https://api-js.mixpanel.com',
'api_hosts': {},
'api_routes': DEFAULT_API_ROUTES,
'api_method': 'POST',
'api_transport': 'XHR',
Expand Down Expand Up @@ -10975,7 +10977,7 @@ var DEFAULT_CONFIG = {
'record_max_ms': MAX_RECORDING_MS,
'record_min_ms': 0,
'record_sessions_percent': 0,
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js'
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js',
};

var DOM_LOADED = false;
Expand Down Expand Up @@ -11900,7 +11902,7 @@ MixpanelLib.prototype.track = addOptOutCheckMixpanelLib(function(event_name, pro
var ret = this._track_or_batch({
type: 'events',
data: data,
endpoint: this.get_config('api_host') + '/' + this.get_config('api_routes')['track'],
endpoint: this._getApiHost('events') + '/' + this.get_config('api_routes')['track'],
batcher: this.request_batchers.events,
should_send_immediately: should_send_immediately,
send_request_options: options
Expand Down Expand Up @@ -12714,6 +12716,17 @@ MixpanelLib.prototype.get_property = function(property_name) {
return this['persistence'].load_prop([property_name]);
};

/**
* Get the API host for a specific endpoint type, falling back to the default api_host if not specified
*
* @param {String} endpoint_type The type of endpoint (e.g., "events", "people", "groups")
* @returns {String} The API host to use for this endpoint
* @private
*/
MixpanelLib.prototype._getApiHost = function(endpoint_type) {
return this.get_config('api_hosts')[endpoint_type] || this.get_config('api_host');
};

MixpanelLib.prototype.toString = function() {
var name = this.get_config('name');
if (name !== PRIMARY_INSTANCE_NAME) {
Expand Down
20 changes: 16 additions & 4 deletions dist/mixpanel.globals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4621,7 +4621,7 @@
return this._mixpanel._track_or_batch({
type: 'groups',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['groups'],
endpoint: this._mixpanel._getApiHost('groups') + '/' + this._get_config('api_routes')['groups'],
batcher: this._mixpanel.request_batchers.groups
}, callback);
};
Expand Down Expand Up @@ -4983,7 +4983,7 @@
return this._mixpanel._track_or_batch({
type: 'people',
data: date_encoded_data,
endpoint: this._get_config('api_host') + '/' + this._get_config('api_routes')['engage'],
endpoint: this._mixpanel._getApiHost('people') + '/' + this._get_config('api_routes')['engage'],
batcher: this._mixpanel.request_batchers.people
}, callback);
};
Expand Down Expand Up @@ -5741,6 +5741,7 @@
*/
var DEFAULT_CONFIG = {
'api_host': 'https://api-js.mixpanel.com',
'api_hosts': {},
'api_routes': DEFAULT_API_ROUTES,
'api_method': 'POST',
'api_transport': 'XHR',
Expand Down Expand Up @@ -5797,7 +5798,7 @@
'record_max_ms': MAX_RECORDING_MS,
'record_min_ms': 0,
'record_sessions_percent': 0,
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js'
'recorder_src': 'https://cdn.mxpnl.com/libs/mixpanel-recorder.min.js',
};

var DOM_LOADED = false;
Expand Down Expand Up @@ -6722,7 +6723,7 @@
var ret = this._track_or_batch({
type: 'events',
data: data,
endpoint: this.get_config('api_host') + '/' + this.get_config('api_routes')['track'],
endpoint: this._getApiHost('events') + '/' + this.get_config('api_routes')['track'],
batcher: this.request_batchers.events,
should_send_immediately: should_send_immediately,
send_request_options: options
Expand Down Expand Up @@ -7536,6 +7537,17 @@
return this['persistence'].load_prop([property_name]);
};

/**
* Get the API host for a specific endpoint type, falling back to the default api_host if not specified
*
* @param {String} endpoint_type The type of endpoint (e.g., "events", "people", "groups")
* @returns {String} The API host to use for this endpoint
* @private
*/
MixpanelLib.prototype._getApiHost = function(endpoint_type) {
return this.get_config('api_hosts')[endpoint_type] || this.get_config('api_host');
};

MixpanelLib.prototype.toString = function() {
var name = this.get_config('name');
if (name !== PRIMARY_INSTANCE_NAME) {
Expand Down
1 change: 0 additions & 1 deletion dist/mixpanel.js
View file
Open in desktop

This file was deleted.

Loading