@customerio/cdp-analytics-node 0.6.0 → 0.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,6 +12,10 @@ function sleep(timeoutInMs) {
12
12
  return new Promise((resolve) => setTimeout(resolve, timeoutInMs));
13
13
  }
14
14
  function noop() { }
15
+ // Prefixed API keys: {pk|sk}_{us|eu}_..., where us/eu is the data center.
16
+ const PREFIXED_KEY_REGEX = /^(pk|sk)_(us|eu)_/;
17
+ const US_HOST = 'https://cdp.customer.io';
18
+ const EU_HOST = 'https://cdp-eu.customer.io';
15
19
  /**
16
20
  * The Publisher is responsible for batching events and sending them to the API.
17
21
  */
@@ -21,8 +25,22 @@ class Publisher {
21
25
  this._maxRetries = maxRetries;
22
26
  this._maxEventsInBatch = Math.max(maxEventsInBatch, 1);
23
27
  this._flushInterval = flushInterval;
24
- this._auth = (0, base_64_encode_1.b64encode)(`${writeKey}:`);
25
- this._url = (0, create_url_1.tryCreateFormattedUrl)(host ?? 'https://cdp.customer.io', path ?? '/v1/batch');
28
+ // Keys read from secret files often end in a newline, which fails the
29
+ // prefix check and makes node-fetch v2 throw with the key in the message.
30
+ const key = writeKey.trim();
31
+ const prefixedKey = PREFIXED_KEY_REGEX.exec(key);
32
+ this._auth = prefixedKey ? `Bearer ${key}` : `Basic ${(0, base_64_encode_1.b64encode)(`${key}:`)}`;
33
+ const keyRegion = prefixedKey?.[2];
34
+ const defaultHost = keyRegion === 'eu' ? EU_HOST : US_HOST;
35
+ // An explicit host wins so proxies keep working, but the other region's
36
+ // CDP host accepts the request and silently drops every event.
37
+ const otherRegionHost = keyRegion === 'eu' ? US_HOST : EU_HOST;
38
+ if (keyRegion &&
39
+ host &&
40
+ host.replace(/\/+$/, '').toLowerCase() === otherRegionHost) {
41
+ console.warn(`Customer.io: this ${keyRegion} API key is being sent to ${host}, which is the other region's CDP host. Events will be dropped. Remove the host setting or use ${defaultHost}.`);
42
+ }
43
+ this._url = (0, create_url_1.tryCreateFormattedUrl)(host ?? defaultHost, path ?? '/v1/batch');
26
44
  this._httpRequestTimeout = httpRequestTimeout ?? 10000;
27
45
  }
28
46
  createBatch() {
@@ -135,7 +153,7 @@ class Publisher {
135
153
  method: 'POST',
136
154
  headers: {
137
155
  'Content-Type': 'application/json',
138
- Authorization: `Basic ${this._auth}`,
156
+ Authorization: this._auth,
139
157
  'User-Agent': 'cdp-analytics-node/latest',
140
158
  },
141
159
  body: payload,
@@ -1 +1 @@
1
- {"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/plugins/customerio/publisher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/plugins/customerio/publisher.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,10 @@ function sleep(timeoutInMs) {
9
9
  return new Promise((resolve) => setTimeout(resolve, timeoutInMs));
10
10
  }
11
11
  function noop() { }
12
+ // Prefixed API keys: {pk|sk}_{us|eu}_..., where us/eu is the data center.
13
+ const PREFIXED_KEY_REGEX = /^(pk|sk)_(us|eu)_/;
14
+ const US_HOST = 'https://cdp.customer.io';
15
+ const EU_HOST = 'https://cdp-eu.customer.io';
12
16
  /**
13
17
  * The Publisher is responsible for batching events and sending them to the API.
14
18
  */
@@ -18,8 +22,22 @@ export class Publisher {
18
22
  this._maxRetries = maxRetries;
19
23
  this._maxEventsInBatch = Math.max(maxEventsInBatch, 1);
20
24
  this._flushInterval = flushInterval;
21
- this._auth = b64encode(`${writeKey}:`);
22
- this._url = tryCreateFormattedUrl(host ?? 'https://cdp.customer.io', path ?? '/v1/batch');
25
+ // Keys read from secret files often end in a newline, which fails the
26
+ // prefix check and makes node-fetch v2 throw with the key in the message.
27
+ const key = writeKey.trim();
28
+ const prefixedKey = PREFIXED_KEY_REGEX.exec(key);
29
+ this._auth = prefixedKey ? `Bearer ${key}` : `Basic ${b64encode(`${key}:`)}`;
30
+ const keyRegion = prefixedKey?.[2];
31
+ const defaultHost = keyRegion === 'eu' ? EU_HOST : US_HOST;
32
+ // An explicit host wins so proxies keep working, but the other region's
33
+ // CDP host accepts the request and silently drops every event.
34
+ const otherRegionHost = keyRegion === 'eu' ? US_HOST : EU_HOST;
35
+ if (keyRegion &&
36
+ host &&
37
+ host.replace(/\/+$/, '').toLowerCase() === otherRegionHost) {
38
+ console.warn(`Customer.io: this ${keyRegion} API key is being sent to ${host}, which is the other region's CDP host. Events will be dropped. Remove the host setting or use ${defaultHost}.`);
39
+ }
40
+ this._url = tryCreateFormattedUrl(host ?? defaultHost, path ?? '/v1/batch');
23
41
  this._httpRequestTimeout = httpRequestTimeout ?? 10000;
24
42
  }
25
43
  createBatch() {
@@ -132,7 +150,7 @@ export class Publisher {
132
150
  method: 'POST',
133
151
  headers: {
134
152
  'Content-Type': 'application/json',
135
- Authorization: `Basic ${this._auth}`,
153
+ Authorization: this._auth,
136
154
  'User-Agent': 'cdp-analytics-node/latest',
137
155
  },
138
156
  body: payload,
@@ -1 +1 @@
1
- {"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/plugins/customerio/publisher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/plugins/customerio/publisher.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ export interface AnalyticsSettings {
5
5
  writeKey: string;
6
6
  /**
7
7
  /**
8
- * The base URL of the API. Default: "https://cdp.customer.io"
8
+ * The base URL of the API. Default: "https://cdp.customer.io", or "https://cdp-eu.customer.io" for a key with `_eu_` in it.
9
9
  */
10
10
  host?: string;
11
11
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"publisher.d.ts","sourceRoot":"","sources":["../../../../src/plugins/customerio/publisher.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAKhD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAc/C,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,mBAAmB,CAAC,CAA+B;IAC3D,OAAO,CAAC,MAAM,CAAC,CAAc;IAE7B,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,+BAA+B,CAAC,CAAQ;IAChD,OAAO,CAAC,mBAAmB,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAa;gBAE3B,EACE,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,kBAAkB,GACnB,EAAE,cAAc,EACjB,OAAO,EAAE,WAAW;IActB,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,UAAU;IAKlB,eAAe,CAAC,iBAAiB,EAAE,MAAM;IAoBzC;;;;OAIG;IACH,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YA4DzB,IAAI;CA4EnB"}
1
+ {"version":3,"file":"publisher.d.ts","sourceRoot":"","sources":["../../../../src/plugins/customerio/publisher.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAKhD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAmB/C,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,mBAAmB,CAAC,CAA+B;IAC3D,OAAO,CAAC,MAAM,CAAC,CAAc;IAE7B,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,+BAA+B,CAAC,CAAQ;IAChD,OAAO,CAAC,mBAAmB,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAa;gBAE3B,EACE,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,kBAAkB,GACnB,EAAE,cAAc,EACjB,OAAO,EAAE,WAAW;IA6BtB,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,UAAU;IAKlB,eAAe,CAAC,iBAAiB,EAAE,MAAM;IAoBzC;;;;OAIG;IACH,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YA4DzB,IAAI;CA4EnB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@customerio/cdp-analytics-node",
3
- "version": "0.6.0",
3
+ "version": "0.6.2",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/customerio/cdp-analytics-js",
@@ -33,7 +33,7 @@
33
33
  "prepublish": "yarn run -T build"
34
34
  },
35
35
  "dependencies": {
36
- "@customerio/cdp-analytics-core": "0.6.0",
36
+ "@customerio/cdp-analytics-core": "0.6.2",
37
37
  "@lukeed/uuid": "^2.0.0",
38
38
  "buffer": "^6.0.3",
39
39
  "node-fetch": "^2.6.7",
@@ -7,7 +7,7 @@ export interface AnalyticsSettings {
7
7
  writeKey: string
8
8
  /**
9
9
  /**
10
- * The base URL of the API. Default: "https://cdp.customer.io"
10
+ * The base URL of the API. Default: "https://cdp.customer.io", or "https://cdp-eu.customer.io" for a key with `_eu_` in it.
11
11
  */
12
12
  host?: string
13
13
  /**
@@ -12,7 +12,12 @@ function sleep(timeoutInMs: number): Promise<void> {
12
12
  return new Promise((resolve) => setTimeout(resolve, timeoutInMs))
13
13
  }
14
14
 
15
- function noop() { }
15
+ function noop() {}
16
+
17
+ // Prefixed API keys: {pk|sk}_{us|eu}_..., where us/eu is the data center.
18
+ const PREFIXED_KEY_REGEX = /^(pk|sk)_(us|eu)_/
19
+ const US_HOST = 'https://cdp.customer.io'
20
+ const EU_HOST = 'https://cdp-eu.customer.io'
16
21
 
17
22
  interface PendingItem {
18
23
  resolver: (ctx: Context) => void
@@ -60,11 +65,26 @@ export class Publisher {
60
65
  this._maxRetries = maxRetries
61
66
  this._maxEventsInBatch = Math.max(maxEventsInBatch, 1)
62
67
  this._flushInterval = flushInterval
63
- this._auth = b64encode(`${writeKey}:`)
64
- this._url = tryCreateFormattedUrl(
65
- host ?? 'https://cdp.customer.io',
66
- path ?? '/v1/batch'
67
- )
68
+ // Keys read from secret files often end in a newline, which fails the
69
+ // prefix check and makes node-fetch v2 throw with the key in the message.
70
+ const key = writeKey.trim()
71
+ const prefixedKey = PREFIXED_KEY_REGEX.exec(key)
72
+ this._auth = prefixedKey ? `Bearer ${key}` : `Basic ${b64encode(`${key}:`)}`
73
+ const keyRegion = prefixedKey?.[2]
74
+ const defaultHost = keyRegion === 'eu' ? EU_HOST : US_HOST
75
+ // An explicit host wins so proxies keep working, but the other region's
76
+ // CDP host accepts the request and silently drops every event.
77
+ const otherRegionHost = keyRegion === 'eu' ? US_HOST : EU_HOST
78
+ if (
79
+ keyRegion &&
80
+ host &&
81
+ host.replace(/\/+$/, '').toLowerCase() === otherRegionHost
82
+ ) {
83
+ console.warn(
84
+ `Customer.io: this ${keyRegion} API key is being sent to ${host}, which is the other region's CDP host. Events will be dropped. Remove the host setting or use ${defaultHost}.`
85
+ )
86
+ }
87
+ this._url = tryCreateFormattedUrl(host ?? defaultHost, path ?? '/v1/batch')
68
88
  this._httpRequestTimeout = httpRequestTimeout ?? 10000
69
89
  }
70
90
 
@@ -196,7 +216,7 @@ export class Publisher {
196
216
  method: 'POST',
197
217
  headers: {
198
218
  'Content-Type': 'application/json',
199
- Authorization: `Basic ${this._auth}`,
219
+ Authorization: this._auth,
200
220
  'User-Agent': 'cdp-analytics-node/latest',
201
221
  },
202
222
  body: payload,