@yuno-payments/sdk-event-log 0.3.0-beta.9 → 1.0.0-beta.1
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.
- package/dist/cjs/api/__tests__/api.test.js +2 -7
- package/dist/cjs/api/api.d.ts +2 -2
- package/dist/cjs/api/api.js +9 -5
- package/dist/cjs/cron/cron.d.ts +3 -2
- package/dist/cjs/cron/cron.js +21 -8
- package/dist/cjs/cron/cron.test.js +7 -6
- package/dist/cjs/database/database.d.ts +1 -2
- package/dist/cjs/database/database.js +5 -16
- package/dist/cjs/database/database.test.js +2 -2
- package/dist/cjs/database/database.types.d.ts +2 -2
- package/dist/cjs/database/index.d.ts +1 -0
- package/dist/cjs/database/index.js +1 -0
- package/dist/cjs/database/local-storage/local-storage.d.ts +3 -3
- package/dist/cjs/database/local-storage/local-storage.js +17 -8
- package/dist/cjs/database/local-storage/local-storage.test.js +7 -6
- package/dist/cjs/database/memory-storage/memory-storage.d.ts +4 -2
- package/dist/cjs/database/memory-storage/memory-storage.js +10 -5
- package/dist/cjs/database/memory-storage/memory-storage.test.js +2 -2
- package/dist/cjs/index.d.ts +7 -10
- package/dist/cjs/index.js +36 -25
- package/dist/cjs/index.test.js +168 -84
- package/dist/cjs/index.types.d.ts +3 -3
- package/dist/cjs/index.utils.d.ts +5 -2
- package/dist/cjs/index.utils.js +12 -4
- package/dist/cjs/types/index.d.ts +11 -1
- package/dist/cjs/utils/__tests__/check-environment.test.d.ts +1 -0
- package/dist/cjs/utils/__tests__/check-environment.test.js +30 -0
- package/dist/cjs/utils/__tests__/client-detection.test.d.ts +1 -0
- package/dist/cjs/utils/__tests__/client-detection.test.js +40 -0
- package/dist/cjs/utils/check-environment.d.ts +2 -0
- package/dist/cjs/utils/check-environment.js +17 -0
- package/dist/cjs/utils/client-detection.d.ts +8 -0
- package/dist/cjs/utils/client-detection.js +216 -0
- package/dist/cjs/utils/index.d.ts +3 -0
- package/dist/cjs/utils/index.js +19 -0
- package/dist/cjs/utils/stringyfy.d.ts +1 -0
- package/dist/cjs/utils/stringyfy.js +20 -0
- package/dist/esm/api/__tests__/api.test.js +2 -7
- package/dist/esm/api/api.d.ts +2 -2
- package/dist/esm/api/api.js +9 -5
- package/dist/esm/cron/cron.d.ts +3 -2
- package/dist/esm/cron/cron.js +12 -10
- package/dist/esm/cron/cron.test.js +7 -6
- package/dist/esm/database/database.d.ts +1 -2
- package/dist/esm/database/database.js +5 -16
- package/dist/esm/database/database.test.js +2 -2
- package/dist/esm/database/database.types.d.ts +2 -2
- package/dist/esm/database/index.d.ts +1 -0
- package/dist/esm/database/index.js +1 -0
- package/dist/esm/database/local-storage/local-storage.d.ts +3 -3
- package/dist/esm/database/local-storage/local-storage.js +17 -8
- package/dist/esm/database/local-storage/local-storage.test.js +7 -6
- package/dist/esm/database/memory-storage/memory-storage.d.ts +4 -2
- package/dist/esm/database/memory-storage/memory-storage.js +10 -5
- package/dist/esm/database/memory-storage/memory-storage.test.js +2 -2
- package/dist/esm/index.d.ts +7 -10
- package/dist/esm/index.js +31 -27
- package/dist/esm/index.test.js +199 -75
- package/dist/esm/index.types.d.ts +3 -3
- package/dist/esm/index.utils.d.ts +5 -2
- package/dist/esm/index.utils.js +21 -4
- package/dist/esm/types/index.d.ts +11 -1
- package/dist/esm/utils/__tests__/check-environment.test.d.ts +1 -0
- package/dist/esm/utils/__tests__/check-environment.test.js +30 -0
- package/dist/esm/utils/__tests__/client-detection.test.d.ts +1 -0
- package/dist/esm/utils/__tests__/client-detection.test.js +31 -0
- package/dist/esm/utils/check-environment.d.ts +2 -0
- package/dist/esm/utils/check-environment.js +17 -0
- package/dist/esm/utils/client-detection.d.ts +8 -0
- package/dist/esm/utils/client-detection.js +205 -0
- package/dist/esm/utils/index.d.ts +3 -0
- package/dist/esm/utils/index.js +19 -0
- package/dist/esm/utils/stringyfy.d.ts +1 -0
- package/dist/esm/utils/stringyfy.js +20 -0
- package/package.json +9 -6
|
@@ -0,0 +1,216 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/* eslint-disable no-magic-numbers */
|
|
3
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
4
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
5
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
6
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
7
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
8
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
9
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
10
|
+
});
|
|
11
|
+
};
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.clientDetection = void 0;
|
|
14
|
+
/**
|
|
15
|
+
* JavaScript Client Detection
|
|
16
|
+
* (C) viazenetti GmbH (Christian Ludwig)
|
|
17
|
+
* https://stackoverflow.com/questions/9514179/how-to-find-the-operating-system-details-using-javascript
|
|
18
|
+
* this package is better but too weighty: https://www.npmjs.com/package/ua-parser-js
|
|
19
|
+
*/
|
|
20
|
+
function clientDetection() {
|
|
21
|
+
var _a, _b, _c;
|
|
22
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
const unknown = '-';
|
|
24
|
+
// screen
|
|
25
|
+
let screenSize = '';
|
|
26
|
+
if (screen.width) {
|
|
27
|
+
const width = screen.width ? screen.width : '';
|
|
28
|
+
const height = screen.height ? screen.height : '';
|
|
29
|
+
screenSize += '' + width + ' x ' + height;
|
|
30
|
+
}
|
|
31
|
+
// browser
|
|
32
|
+
const nVer = navigator.appVersion;
|
|
33
|
+
const nAgt = navigator.userAgent;
|
|
34
|
+
let browser = navigator.appName;
|
|
35
|
+
let version = '' + parseFloat(nVer);
|
|
36
|
+
let nameOffset, verOffset, ix;
|
|
37
|
+
// Yandex Browser
|
|
38
|
+
if ((verOffset = nAgt.indexOf('YaBrowser')) !== -1) {
|
|
39
|
+
browser = 'Yandex';
|
|
40
|
+
version = nAgt.substring(verOffset + 10);
|
|
41
|
+
}
|
|
42
|
+
// Samsung Browser
|
|
43
|
+
else if ((verOffset = nAgt.indexOf('SamsungBrowser')) !== -1) {
|
|
44
|
+
browser = 'Samsung';
|
|
45
|
+
version = nAgt.substring(verOffset + 15);
|
|
46
|
+
}
|
|
47
|
+
// UC Browser
|
|
48
|
+
else if ((verOffset = nAgt.indexOf('UCBrowser')) !== -1) {
|
|
49
|
+
browser = 'UC Browser';
|
|
50
|
+
version = nAgt.substring(verOffset + 10);
|
|
51
|
+
}
|
|
52
|
+
// Opera Next
|
|
53
|
+
else if ((verOffset = nAgt.indexOf('OPR')) !== -1) {
|
|
54
|
+
browser = 'Opera';
|
|
55
|
+
version = nAgt.substring(verOffset + 4);
|
|
56
|
+
}
|
|
57
|
+
// Opera
|
|
58
|
+
else if ((verOffset = nAgt.indexOf('Opera')) !== -1) {
|
|
59
|
+
browser = 'Opera';
|
|
60
|
+
version = nAgt.substring(verOffset + 6);
|
|
61
|
+
if ((verOffset = nAgt.indexOf('Version')) !== -1) {
|
|
62
|
+
version = nAgt.substring(verOffset + 8);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
// Legacy Edge
|
|
66
|
+
else if ((verOffset = nAgt.indexOf('Edge')) !== -1) {
|
|
67
|
+
browser = 'Microsoft Legacy Edge';
|
|
68
|
+
version = nAgt.substring(verOffset + 5);
|
|
69
|
+
}
|
|
70
|
+
// Edge (Chromium)
|
|
71
|
+
else if ((verOffset = nAgt.indexOf('Edg')) !== -1) {
|
|
72
|
+
browser = 'Microsoft Edge';
|
|
73
|
+
version = nAgt.substring(verOffset + 4);
|
|
74
|
+
}
|
|
75
|
+
// MSIE
|
|
76
|
+
else if ((verOffset = nAgt.indexOf('MSIE')) !== -1) {
|
|
77
|
+
browser = 'Microsoft Internet Explorer';
|
|
78
|
+
version = nAgt.substring(verOffset + 5);
|
|
79
|
+
}
|
|
80
|
+
// Chrome
|
|
81
|
+
else if ((verOffset = nAgt.indexOf('Chrome')) !== -1) {
|
|
82
|
+
browser = 'Chrome';
|
|
83
|
+
version = nAgt.substring(verOffset + 7);
|
|
84
|
+
}
|
|
85
|
+
// Safari
|
|
86
|
+
else if ((verOffset = nAgt.indexOf('Safari')) !== -1) {
|
|
87
|
+
browser = 'Safari';
|
|
88
|
+
version = nAgt.substring(verOffset + 7);
|
|
89
|
+
if ((verOffset = nAgt.indexOf('Version')) !== -1) {
|
|
90
|
+
version = nAgt.substring(verOffset + 8);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
// Firefox
|
|
94
|
+
else if ((verOffset = nAgt.indexOf('Firefox')) !== -1) {
|
|
95
|
+
browser = 'Firefox';
|
|
96
|
+
version = nAgt.substring(verOffset + 8);
|
|
97
|
+
}
|
|
98
|
+
// MSIE 11+
|
|
99
|
+
else if (nAgt.indexOf('Trident/') !== -1) {
|
|
100
|
+
browser = 'Microsoft Internet Explorer';
|
|
101
|
+
version = nAgt.substring(nAgt.indexOf('rv:') + 3);
|
|
102
|
+
}
|
|
103
|
+
// Other browsers
|
|
104
|
+
else if ((nameOffset = nAgt.lastIndexOf(' ') + 1) <
|
|
105
|
+
(verOffset = nAgt.lastIndexOf('/'))) {
|
|
106
|
+
browser = nAgt.substring(nameOffset, verOffset);
|
|
107
|
+
version = nAgt.substring(verOffset + 1);
|
|
108
|
+
if (browser.toLowerCase() === browser.toUpperCase()) {
|
|
109
|
+
browser = navigator.appName;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
// trim the version string
|
|
113
|
+
if ((ix = version.indexOf(';')) !== -1)
|
|
114
|
+
version = version.substring(0, ix);
|
|
115
|
+
if ((ix = version.indexOf(' ')) !== -1)
|
|
116
|
+
version = version.substring(0, ix);
|
|
117
|
+
if ((ix = version.indexOf(')')) !== -1)
|
|
118
|
+
version = version.substring(0, ix);
|
|
119
|
+
let majorVersion = parseInt('' + version, 10);
|
|
120
|
+
if (isNaN(majorVersion)) {
|
|
121
|
+
version = '' + parseFloat(nVer);
|
|
122
|
+
majorVersion = parseInt(nVer, 10);
|
|
123
|
+
}
|
|
124
|
+
// mobile version
|
|
125
|
+
const mobile = /Mobile|mini|Fennec|Android|iP(ad|od|hone)/.test(nVer);
|
|
126
|
+
// cookie
|
|
127
|
+
let cookieEnabled = navigator.cookieEnabled ? true : false;
|
|
128
|
+
if (typeof navigator.cookieEnabled === 'undefined' && !cookieEnabled) {
|
|
129
|
+
document.cookie = 'testcookie';
|
|
130
|
+
cookieEnabled = document.cookie.indexOf('testcookie') !== -1 ? true : false;
|
|
131
|
+
}
|
|
132
|
+
// system
|
|
133
|
+
let os = unknown;
|
|
134
|
+
const clientStrings = [
|
|
135
|
+
{ s: 'Windows 10', r: /(Windows 10.0|Windows NT 10.0)/ },
|
|
136
|
+
{ s: 'Windows 8.1', r: /(Windows 8.1|Windows NT 6.3)/ },
|
|
137
|
+
{ s: 'Windows 8', r: /(Windows 8|Windows NT 6.2)/ },
|
|
138
|
+
{ s: 'Windows 7', r: /(Windows 7|Windows NT 6.1)/ },
|
|
139
|
+
{ s: 'Windows Vista', r: /Windows NT 6.0/ },
|
|
140
|
+
{ s: 'Windows Server 2003', r: /Windows NT 5.2/ },
|
|
141
|
+
{ s: 'Windows XP', r: /(Windows NT 5.1|Windows XP)/ },
|
|
142
|
+
{ s: 'Windows 2000', r: /(Windows NT 5.0|Windows 2000)/ },
|
|
143
|
+
{ s: 'Windows ME', r: /(Win 9x 4.90|Windows ME)/ },
|
|
144
|
+
{ s: 'Windows 98', r: /(Windows 98|Win98)/ },
|
|
145
|
+
{ s: 'Windows 95', r: /(Windows 95|Win95|Windows_95)/ },
|
|
146
|
+
{ s: 'Windows NT 4.0', r: /(Windows NT 4.0|WinNT4.0|WinNT|Windows NT)/ },
|
|
147
|
+
{ s: 'Windows CE', r: /Windows CE/ },
|
|
148
|
+
{ s: 'Windows 3.11', r: /Win16/ },
|
|
149
|
+
{ s: 'Android', r: /Android/ },
|
|
150
|
+
{ s: 'Open BSD', r: /OpenBSD/ },
|
|
151
|
+
{ s: 'Sun OS', r: /SunOS/ },
|
|
152
|
+
{ s: 'Chrome OS', r: /CrOS/ },
|
|
153
|
+
{ s: 'Linux', r: /(Linux|X11(?!.*CrOS))/ },
|
|
154
|
+
{ s: 'iOS', r: /(iPhone|iPad|iPod)/ },
|
|
155
|
+
{ s: 'Mac OS X', r: /Mac OS X/ },
|
|
156
|
+
{ s: 'Mac OS', r: /(Mac OS|MacPPC|MacIntel|Mac_PowerPC|Macintosh)/ },
|
|
157
|
+
{ s: 'QNX', r: /QNX/ },
|
|
158
|
+
{ s: 'UNIX', r: /UNIX/ },
|
|
159
|
+
{ s: 'BeOS', r: /BeOS/ },
|
|
160
|
+
{ s: 'OS/2', r: /OS\/2/ },
|
|
161
|
+
{
|
|
162
|
+
s: 'Search Bot',
|
|
163
|
+
r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/,
|
|
164
|
+
},
|
|
165
|
+
];
|
|
166
|
+
for (const id in clientStrings) {
|
|
167
|
+
const cs = clientStrings[id];
|
|
168
|
+
if (cs.r.test(nAgt)) {
|
|
169
|
+
os = cs.s;
|
|
170
|
+
break;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
let osVersion = unknown;
|
|
174
|
+
if (/Windows/.test(os)) {
|
|
175
|
+
osVersion = (_a = /Windows (.*)/.exec(os)) === null || _a === void 0 ? void 0 : _a[1];
|
|
176
|
+
if (osVersion && parseInt(osVersion) === 10 && navigator.userAgentData) {
|
|
177
|
+
osVersion = yield navigator.userAgentData
|
|
178
|
+
.getHighEntropyValues(['platformVersion'])
|
|
179
|
+
.then((ua) => { var _a, _b; return parseInt((_b = (_a = ua.platformVersion) === null || _a === void 0 ? void 0 : _a.split('.')[0]) !== null && _b !== void 0 ? _b : '0') < 13 ? 10 : 11; });
|
|
180
|
+
}
|
|
181
|
+
os = 'Windows';
|
|
182
|
+
}
|
|
183
|
+
switch (os) {
|
|
184
|
+
case 'Mac OS':
|
|
185
|
+
case 'Mac OS X':
|
|
186
|
+
case 'Android':
|
|
187
|
+
osVersion =
|
|
188
|
+
(_c = (_b = /(?:Android|Mac OS|Mac OS X|MacPPC|MacIntel|Mac_PowerPC|Macintosh) ([._\d]+)/.exec(nAgt)) === null || _b === void 0 ? void 0 : _b[1]) !== null && _c !== void 0 ? _c : osVersion;
|
|
189
|
+
break;
|
|
190
|
+
case 'iOS':
|
|
191
|
+
{
|
|
192
|
+
const osVersionRegexp = /OS (\d+)_(\d+)_?(\d+)?/.exec(nVer);
|
|
193
|
+
if (osVersionRegexp) {
|
|
194
|
+
osVersion =
|
|
195
|
+
osVersionRegexp[1] +
|
|
196
|
+
'.' +
|
|
197
|
+
osVersionRegexp[2] +
|
|
198
|
+
'.' +
|
|
199
|
+
osVersionRegexp[3];
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
break;
|
|
203
|
+
}
|
|
204
|
+
return {
|
|
205
|
+
screen: screenSize,
|
|
206
|
+
browser,
|
|
207
|
+
browserVersion: version,
|
|
208
|
+
browserMajorVersion: majorVersion,
|
|
209
|
+
mobile,
|
|
210
|
+
os,
|
|
211
|
+
osVersion: osVersion,
|
|
212
|
+
cookies: cookieEnabled,
|
|
213
|
+
};
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
exports.clientDetection = clientDetection;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./check-environment"), exports);
|
|
18
|
+
__exportStar(require("./client-detection"), exports);
|
|
19
|
+
__exportStar(require("./stringyfy"), exports);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function stringify(obj: object): string;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.stringify = void 0;
|
|
4
|
+
const DO_NOT_EXIST = -1;
|
|
5
|
+
function stringify(obj) {
|
|
6
|
+
const cache = [];
|
|
7
|
+
const str = JSON.stringify(obj, function (key, value) {
|
|
8
|
+
if (typeof value === 'object' && value !== null) {
|
|
9
|
+
if (cache.indexOf(value) !== DO_NOT_EXIST) {
|
|
10
|
+
// Circular reference found, discard key
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
// Store value in our collection
|
|
14
|
+
cache.push(value);
|
|
15
|
+
}
|
|
16
|
+
return value;
|
|
17
|
+
});
|
|
18
|
+
return str;
|
|
19
|
+
}
|
|
20
|
+
exports.stringify = stringify;
|
|
@@ -10,15 +10,10 @@ describe('Api', () => {
|
|
|
10
10
|
let api;
|
|
11
11
|
beforeEach(() => {
|
|
12
12
|
// Reset the instance before each test
|
|
13
|
-
api = new api_1.Api(
|
|
14
|
-
});
|
|
15
|
-
it('should thorw an error if the instance is not initialized well', () => {
|
|
16
|
-
expect(() => new api_1.Api('', '')).toThrowError();
|
|
13
|
+
api = new api_1.Api(platform, true);
|
|
17
14
|
});
|
|
18
15
|
it('should initialize the instance with the correct headers', () => {
|
|
19
16
|
const instance = api.getInstances();
|
|
20
|
-
expect(instance === null || instance === void 0 ? void 0 : instance.defaults.baseURL).toBe('https://api-staging.y.uno/v1');
|
|
21
|
-
expect(instance === null || instance === void 0 ? void 0 : instance.defaults.headers['public-api-key']).toBe(publicApiKey);
|
|
22
17
|
expect(instance === null || instance === void 0 ? void 0 : instance.defaults.headers['X-Platform']).toBe(platform);
|
|
23
18
|
});
|
|
24
19
|
it('should send a batch of events to the server', async () => {
|
|
@@ -31,7 +26,7 @@ describe('Api', () => {
|
|
|
31
26
|
type: types_1.EventLogType.EVENT,
|
|
32
27
|
},
|
|
33
28
|
];
|
|
34
|
-
const response = await api.sendBatch(batches);
|
|
29
|
+
const response = await api.sendBatch(batches, publicApiKey);
|
|
35
30
|
expect(response === null || response === void 0 ? void 0 : response.status).toBe(STATUS_CREATED);
|
|
36
31
|
});
|
|
37
32
|
it('should return the instance', () => {
|
package/dist/esm/api/api.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { AxiosInstance } from 'axios';
|
|
|
2
2
|
import { Batch } from '../types';
|
|
3
3
|
export declare class Api {
|
|
4
4
|
#private;
|
|
5
|
-
constructor(
|
|
6
|
-
sendBatch(batches: Batch[]): Promise<import("axios").AxiosResponse<any, any>> | undefined;
|
|
5
|
+
constructor(platform: string, debug?: boolean);
|
|
6
|
+
sendBatch(batches: Batch[], publicApiKey: string): Promise<import("axios").AxiosResponse<any, any>> | undefined;
|
|
7
7
|
getInstances(): AxiosInstance | null;
|
|
8
8
|
}
|
package/dist/esm/api/api.js
CHANGED
|
@@ -19,22 +19,26 @@ exports.Api = void 0;
|
|
|
19
19
|
const axios_1 = __importDefault(require("axios"));
|
|
20
20
|
const api_utils_1 = require("./api.utils");
|
|
21
21
|
class Api {
|
|
22
|
-
constructor(
|
|
22
|
+
constructor(platform, debug = false) {
|
|
23
23
|
_Api_instance.set(this, null);
|
|
24
24
|
_Api_debug.set(this, false);
|
|
25
25
|
__classPrivateFieldSet(this, _Api_debug, debug, "f");
|
|
26
26
|
__classPrivateFieldSet(this, _Api_instance, axios_1.default.create({
|
|
27
|
-
baseURL: (0, api_utils_1.getBaseUrl)(publicApiKey),
|
|
28
27
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
29
|
-
headers: { '
|
|
28
|
+
headers: { 'X-Platform': platform },
|
|
30
29
|
}), "f");
|
|
31
30
|
}
|
|
32
|
-
sendBatch(batches) {
|
|
31
|
+
sendBatch(batches, publicApiKey) {
|
|
33
32
|
var _a;
|
|
34
33
|
if (__classPrivateFieldGet(this, _Api_debug, "f")) {
|
|
35
34
|
console.dir(batches, { depth: null });
|
|
35
|
+
console.log(publicApiKey);
|
|
36
36
|
}
|
|
37
|
-
return (_a = __classPrivateFieldGet(this, _Api_instance, "f")) === null || _a === void 0 ? void 0 : _a.post('/sdk/event-log/publish', { batch: batches }
|
|
37
|
+
return (_a = __classPrivateFieldGet(this, _Api_instance, "f")) === null || _a === void 0 ? void 0 : _a.post('/sdk/event-log/publish', { batch: batches }, {
|
|
38
|
+
baseURL: (0, api_utils_1.getBaseUrl)(publicApiKey),
|
|
39
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
40
|
+
headers: { 'public-api-key': publicApiKey }
|
|
41
|
+
});
|
|
38
42
|
}
|
|
39
43
|
getInstances() {
|
|
40
44
|
return __classPrivateFieldGet(this, _Api_instance, "f");
|
package/dist/esm/cron/cron.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Api } from '../api';
|
|
3
|
+
import { Database } from '../database';
|
|
3
4
|
export declare class Cron {
|
|
4
5
|
#private;
|
|
5
|
-
constructor(batchTime: number, api: Api);
|
|
6
|
-
sendBatch(): void
|
|
6
|
+
constructor(batchTime: number, api: Api, database: Database);
|
|
7
|
+
sendBatch(): Promise<void>;
|
|
7
8
|
stop(): void;
|
|
8
9
|
getInterval(): NodeJS.Timeout | undefined;
|
|
9
10
|
}
|
package/dist/esm/cron/cron.js
CHANGED
|
@@ -10,26 +10,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _Cron_interval, _Cron_api;
|
|
13
|
+
var _Cron_interval, _Cron_api, _Cron_database;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.Cron = void 0;
|
|
16
|
-
const database_1 = require("../database");
|
|
17
16
|
const NONE_ITEMS = 0;
|
|
18
17
|
class Cron {
|
|
19
|
-
constructor(batchTime, api) {
|
|
18
|
+
constructor(batchTime, api, database) {
|
|
20
19
|
_Cron_interval.set(this, void 0);
|
|
21
20
|
_Cron_api.set(this, void 0);
|
|
21
|
+
_Cron_database.set(this, void 0);
|
|
22
22
|
this.stop();
|
|
23
23
|
__classPrivateFieldSet(this, _Cron_api, api, "f");
|
|
24
|
+
__classPrivateFieldSet(this, _Cron_database, database, "f");
|
|
24
25
|
__classPrivateFieldSet(this, _Cron_interval, setInterval(this.sendBatch.bind(this), batchTime), "f");
|
|
25
26
|
}
|
|
26
|
-
sendBatch() {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
async sendBatch() {
|
|
28
|
+
const items = await __classPrivateFieldGet(this, _Cron_database, "f").getAllItems();
|
|
29
|
+
const keys = Object.keys(items);
|
|
30
|
+
if (keys.length > NONE_ITEMS) {
|
|
31
|
+
for (const key of keys) {
|
|
32
|
+
__classPrivateFieldGet(this, _Cron_api, "f").sendBatch(items[key], key);
|
|
31
33
|
}
|
|
32
|
-
}
|
|
34
|
+
}
|
|
33
35
|
}
|
|
34
36
|
stop() {
|
|
35
37
|
if (__classPrivateFieldGet(this, _Cron_interval, "f")) {
|
|
@@ -42,4 +44,4 @@ class Cron {
|
|
|
42
44
|
}
|
|
43
45
|
}
|
|
44
46
|
exports.Cron = Cron;
|
|
45
|
-
_Cron_interval = new WeakMap(), _Cron_api = new WeakMap();
|
|
47
|
+
_Cron_interval = new WeakMap(), _Cron_api = new WeakMap(), _Cron_database = new WeakMap();
|
|
@@ -4,19 +4,20 @@ const cron_1 = require("./cron");
|
|
|
4
4
|
const api_1 = require("../api");
|
|
5
5
|
const database_1 = require("../database");
|
|
6
6
|
const types_1 = require("../types");
|
|
7
|
-
const PUBLIC_API_KEY = 'staging_gAAAAABj-NC2WEf3XA4lHnN6RfGbjETf6qL27jlU7c1tm01ERV-Y-E6ddee1QPyV_CA8cxjVlGy-qDNA2-mqa9msQlTJit-Fmbvv6f2AZdfbFd_CUo1stvixnF4_8MzM_IYVWYz7KK86VfEBvxNpjRCyp7BDef-QzrT1-yqa8HAYTuA1GU3Hjjo=';
|
|
8
7
|
const TIME_INTERVAL = 1000;
|
|
9
8
|
describe('Cron', () => {
|
|
10
9
|
let spy;
|
|
11
10
|
let cron;
|
|
12
11
|
let api;
|
|
12
|
+
let database;
|
|
13
13
|
beforeEach(async () => {
|
|
14
14
|
// restore the spy created with spyOn
|
|
15
15
|
jest.restoreAllMocks();
|
|
16
|
-
api = new api_1.Api(
|
|
17
|
-
|
|
16
|
+
api = new api_1.Api('web', true);
|
|
17
|
+
database = (0, database_1.databaseFactory)('testOrganization');
|
|
18
|
+
cron = new cron_1.Cron(TIME_INTERVAL, api, database);
|
|
18
19
|
spy = jest.spyOn(api, 'sendBatch');
|
|
19
|
-
await
|
|
20
|
+
await database.reset();
|
|
20
21
|
});
|
|
21
22
|
it('should send a batch of items to the API if there are items in the database', async () => {
|
|
22
23
|
const batch = {
|
|
@@ -26,9 +27,9 @@ describe('Cron', () => {
|
|
|
26
27
|
original_created_at: new Date().toISOString(),
|
|
27
28
|
type: types_1.EventLogType.EVENT,
|
|
28
29
|
};
|
|
29
|
-
|
|
30
|
+
database.setItem(batch, 'sandbox_1');
|
|
30
31
|
await cron.sendBatch();
|
|
31
|
-
expect(spy).toHaveBeenCalledWith([batch]);
|
|
32
|
+
expect(spy).toHaveBeenCalledWith([batch], 'sandbox_1');
|
|
32
33
|
});
|
|
33
34
|
it('should not send a batch of items to the API if there are no items in the database', async () => {
|
|
34
35
|
await cron.sendBatch();
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.databaseFactory = void 0;
|
|
4
4
|
const local_storage_1 = require("./local-storage");
|
|
5
5
|
const memory_storage_1 = require("./memory-storage");
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
const utils_1 = require("../utils");
|
|
7
|
+
function databaseFactory(organizationName) {
|
|
8
|
+
const databaseType = (0, utils_1.isLocalStorageEnabled)()
|
|
8
9
|
? 'local-storage'
|
|
9
10
|
: 'memory-storage';
|
|
10
11
|
switch (databaseType) {
|
|
11
12
|
case 'local-storage':
|
|
12
|
-
return new local_storage_1.LocalStorage();
|
|
13
|
+
return new local_storage_1.LocalStorage(organizationName);
|
|
13
14
|
case 'memory-storage':
|
|
14
15
|
return new memory_storage_1.MemoryStorage();
|
|
15
16
|
default:
|
|
@@ -17,15 +18,3 @@ function databaseFactory() {
|
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
20
|
exports.databaseFactory = databaseFactory;
|
|
20
|
-
function isLocalStorageEnabled() {
|
|
21
|
-
try {
|
|
22
|
-
const key = '__yuno_storage__test';
|
|
23
|
-
window.localStorage.setItem(key, 'test_value');
|
|
24
|
-
window.localStorage.removeItem(key);
|
|
25
|
-
return true;
|
|
26
|
-
}
|
|
27
|
-
catch (e) {
|
|
28
|
-
return false;
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
exports.database = databaseFactory();
|
|
@@ -11,7 +11,7 @@ describe('databaseFactory', () => {
|
|
|
11
11
|
it('should return a LocalStorage instance if local storage is enabled', () => {
|
|
12
12
|
jest.spyOn(Storage.prototype, 'setItem').mockImplementation(() => { });
|
|
13
13
|
jest.spyOn(Storage.prototype, 'removeItem').mockImplementation(() => { });
|
|
14
|
-
const result = (0, database_1.databaseFactory)();
|
|
14
|
+
const result = (0, database_1.databaseFactory)('testOrganization');
|
|
15
15
|
expect(result).toBeInstanceOf(local_storage_1.LocalStorage);
|
|
16
16
|
});
|
|
17
17
|
it('should return a MemoryStorage instance if local storage is not enabled', () => {
|
|
@@ -19,7 +19,7 @@ describe('databaseFactory', () => {
|
|
|
19
19
|
throw new Error('Local storage not available');
|
|
20
20
|
});
|
|
21
21
|
jest.spyOn(Storage.prototype, 'removeItem').mockImplementation(() => { });
|
|
22
|
-
const result = (0, database_1.databaseFactory)();
|
|
22
|
+
const result = (0, database_1.databaseFactory)('testOrganization');
|
|
23
23
|
expect(result).toBeInstanceOf(memory_storage_1.MemoryStorage);
|
|
24
24
|
});
|
|
25
25
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Batch } from '../types';
|
|
2
2
|
export interface Database {
|
|
3
|
-
setItem(item: Batch): Promise<void>;
|
|
3
|
+
setItem(item: Batch, publicApiKey: string): Promise<void>;
|
|
4
4
|
getItem(id: string): Promise<Batch>;
|
|
5
5
|
removeItem(id: string): Promise<void>;
|
|
6
|
-
getAllItems(): Promise<Batch[]
|
|
6
|
+
getAllItems(): Promise<Record<string, Batch[]>>;
|
|
7
7
|
reset(): Promise<void>;
|
|
8
8
|
}
|
|
@@ -2,10 +2,10 @@ import { Batch } from '../../types';
|
|
|
2
2
|
import { Database } from '../database.types';
|
|
3
3
|
export declare class LocalStorage implements Database {
|
|
4
4
|
#private;
|
|
5
|
-
constructor();
|
|
5
|
+
constructor(organizationName: string);
|
|
6
6
|
reset(): Promise<void>;
|
|
7
|
-
setItem(item: Batch): Promise<void>;
|
|
7
|
+
setItem(item: Batch, publicApiKey: string): Promise<void>;
|
|
8
8
|
getItem(id: string): Promise<Batch>;
|
|
9
9
|
removeItem(id: string): Promise<void>;
|
|
10
|
-
getAllItems(): Promise<Batch[]
|
|
10
|
+
getAllItems(): Promise<Record<string, Batch[]>>;
|
|
11
11
|
}
|
|
@@ -13,23 +13,30 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
13
13
|
var _LocalStorage_instances, _LocalStorage_localStorage, _LocalStorage_databaseName, _LocalStorage_getDatabase;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.LocalStorage = void 0;
|
|
16
|
+
const utils_1 = require("../../utils");
|
|
17
|
+
const DATABASE_NAME_SPACE = 'YUNO_EVENT_LOGS';
|
|
16
18
|
class LocalStorage {
|
|
17
|
-
constructor() {
|
|
19
|
+
constructor(organizationName) {
|
|
18
20
|
_LocalStorage_instances.add(this);
|
|
19
21
|
_LocalStorage_localStorage.set(this, void 0);
|
|
20
|
-
_LocalStorage_databaseName.set(this,
|
|
22
|
+
_LocalStorage_databaseName.set(this, void 0);
|
|
21
23
|
__classPrivateFieldSet(this, _LocalStorage_localStorage, window.localStorage, "f");
|
|
24
|
+
__classPrivateFieldSet(this, _LocalStorage_databaseName, `${DATABASE_NAME_SPACE}_${organizationName}`, "f");
|
|
22
25
|
const database = __classPrivateFieldGet(this, _LocalStorage_localStorage, "f").getItem(__classPrivateFieldGet(this, _LocalStorage_databaseName, "f"));
|
|
23
26
|
if (database === null || database === undefined) {
|
|
24
|
-
|
|
27
|
+
this.reset();
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
async reset() {
|
|
28
|
-
__classPrivateFieldGet(this, _LocalStorage_localStorage, "f").setItem(__classPrivateFieldGet(this, _LocalStorage_databaseName, "f"), JSON.stringify(
|
|
31
|
+
__classPrivateFieldGet(this, _LocalStorage_localStorage, "f").setItem(__classPrivateFieldGet(this, _LocalStorage_databaseName, "f"), JSON.stringify({}));
|
|
29
32
|
}
|
|
30
|
-
async setItem(item) {
|
|
33
|
+
async setItem(item, publicApiKey) {
|
|
31
34
|
const database = __classPrivateFieldGet(this, _LocalStorage_instances, "m", _LocalStorage_getDatabase).call(this);
|
|
32
|
-
|
|
35
|
+
if (database[publicApiKey] === undefined) {
|
|
36
|
+
database[publicApiKey] = [];
|
|
37
|
+
}
|
|
38
|
+
database[publicApiKey].push(item);
|
|
39
|
+
__classPrivateFieldGet(this, _LocalStorage_localStorage, "f").setItem(__classPrivateFieldGet(this, _LocalStorage_databaseName, "f"), (0, utils_1.stringify)(database));
|
|
33
40
|
}
|
|
34
41
|
getItem(id) {
|
|
35
42
|
throw new Error('Method not implemented.' + id);
|
|
@@ -38,14 +45,16 @@ class LocalStorage {
|
|
|
38
45
|
throw new Error('Method not implemented.' + id);
|
|
39
46
|
}
|
|
40
47
|
getAllItems() {
|
|
41
|
-
|
|
48
|
+
const database = __classPrivateFieldGet(this, _LocalStorage_instances, "m", _LocalStorage_getDatabase).call(this);
|
|
49
|
+
this.reset();
|
|
50
|
+
return Promise.resolve(database);
|
|
42
51
|
}
|
|
43
52
|
}
|
|
44
53
|
exports.LocalStorage = LocalStorage;
|
|
45
54
|
_LocalStorage_localStorage = new WeakMap(), _LocalStorage_databaseName = new WeakMap(), _LocalStorage_instances = new WeakSet(), _LocalStorage_getDatabase = function _LocalStorage_getDatabase() {
|
|
46
55
|
let database = __classPrivateFieldGet(this, _LocalStorage_localStorage, "f").getItem(__classPrivateFieldGet(this, _LocalStorage_databaseName, "f"));
|
|
47
56
|
if (database === null || database === undefined) {
|
|
48
|
-
database = JSON.stringify(
|
|
57
|
+
database = JSON.stringify({});
|
|
49
58
|
__classPrivateFieldGet(this, _LocalStorage_localStorage, "f").setItem(__classPrivateFieldGet(this, _LocalStorage_databaseName, "f"), database);
|
|
50
59
|
}
|
|
51
60
|
return JSON.parse(database);
|
|
@@ -12,19 +12,20 @@ const batch = {
|
|
|
12
12
|
describe('LocalStorageDatabase', () => {
|
|
13
13
|
let localStorageDatabase;
|
|
14
14
|
beforeEach(() => {
|
|
15
|
-
localStorageDatabase = new local_storage_1.LocalStorage();
|
|
15
|
+
localStorageDatabase = new local_storage_1.LocalStorage('test');
|
|
16
16
|
});
|
|
17
17
|
afterEach(() => {
|
|
18
18
|
localStorage.clear();
|
|
19
19
|
});
|
|
20
20
|
it('should set an item in the database', async () => {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
const testKey = 'testKey';
|
|
22
|
+
await localStorageDatabase.setItem(batch, testKey);
|
|
23
|
+
const database = JSON.parse(localStorage.getItem('YUNO_EVENT_LOGS_test') || '[]');
|
|
24
|
+
expect(database).toEqual({ [testKey]: [batch] });
|
|
24
25
|
});
|
|
25
26
|
it('should get an item from the database', async () => {
|
|
26
|
-
localStorage.setItem('
|
|
27
|
+
localStorage.setItem('YUNO_EVENT_LOGS_test', JSON.stringify({ testKey: [batch] }));
|
|
27
28
|
const result = await localStorageDatabase.getAllItems();
|
|
28
|
-
expect(result).toEqual([batch]);
|
|
29
|
+
expect(result).toEqual({ testKey: [batch] });
|
|
29
30
|
});
|
|
30
31
|
});
|
|
@@ -4,8 +4,10 @@ export declare class MemoryStorage implements Database {
|
|
|
4
4
|
#private;
|
|
5
5
|
constructor();
|
|
6
6
|
reset(): Promise<void>;
|
|
7
|
-
setItem(item: Batch): Promise<void>;
|
|
7
|
+
setItem(item: Batch, publicApiKey: string): Promise<void>;
|
|
8
8
|
getItem(id: string): Promise<Batch>;
|
|
9
9
|
removeItem(id: string): Promise<void>;
|
|
10
|
-
getAllItems(): Promise<
|
|
10
|
+
getAllItems(): Promise<{
|
|
11
|
+
[x: string]: Batch[];
|
|
12
|
+
}>;
|
|
11
13
|
}
|