@blotoutio/edgetag-sdk-browser 0.7.0 → 0.7.2

package/README.md

@@ -1,3 +1,3 @@
 # EdgeTag SDK Browser
 
-More info on https://app.edgetag.io/integration/js
+More info on https://app.edgetag.io/docs/js

package/index.js

@@ -38,11 +38,32 @@
         });
     }
 
+    const getMessage = (error) => {
+        if (error instanceof Error) {
+            return error.message;
+        }
+        if (typeof error === 'string') {
+            return error;
+        }
+        try {
+            return JSON.stringify(error);
+        }
+        catch (_a) {
+            return error;
+        }
+    };
+    const log = (data) => {
+        console.log('[EdgeTag]', getMessage(data));
+    };
+    const error = (data) => {
+        console.error('[EdgeTag]', getMessage(data));
+    };
+
     let endpointUrl = '';
     const generateUrl = (path) => {
         const endpoint = getUrl();
         if (!endpoint) {
-            console.log('URL is not valid');
+            log('URL is not valid');
             return '';
         }
         return `${endpoint}${path}`;
@@ -88,7 +109,7 @@
             return false;
         }
         if (!preferences.edgeURL) {
-            console.error('Please provide URL for EdgeTag');
+            error('Please provide URL for EdgeTag');
             return false;
         }
         consentDisabled = !!preferences.disableConsentCheck;
@@ -125,6 +146,39 @@
         allowedProvider = providers;
     };
 
+    const checkConsent = (providers) => {
+        if (isConsentDisabled()) {
+            return true;
+        }
+        const consent = getConsent();
+        if (!consent) {
+            return false;
+        }
+        const consentLength = Object.keys(consent).length;
+        if (!consentLength || (consentLength === 1 && consent['all'] === false)) {
+            return false;
+        }
+        const providersLength = Object.keys(providers || {}).length;
+        if (!providers ||
+            providersLength === 0 ||
+            (providersLength === 1 && providers['all'])) {
+            return (Object.values(consent).find((isAllowed) => isAllowed) || false);
+        }
+        for (const [key, value] of Object.entries(providers)) {
+            if (value === false || consent[key] === false) {
+                continue;
+            }
+            // we have consent
+            if (consent[key] ||
+                (consent['all'] === true && consent[key] === undefined)) {
+                // we have provider
+                if (value || (providers['all'] && providers[key] === undefined)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
     const getUserAgent = () => {
         try {
             const nav = navigator;
@@ -140,23 +194,20 @@
         return (providerValue || (providers['all'] === true && providerValue === undefined));
     };
     const allowTag = (providers) => {
-        const consent = getConsent();
-        if (isConsentDisabled()) {
-            return true;
-        }
-        if (!consent) {
+        if (!checkConsent(providers)) {
             return false;
         }
-        if (consent['all']) {
+        const providersLength = Object.values(providers || {}).length;
+        if (!providers || providersLength === 0) {
             return true;
         }
-        if (!providers) {
-            return (Object.values(consent).find((isAllowed) => isAllowed) || false);
-        }
         const allProviders = getAllowedProviders();
+        const allProvidersLength = Object.keys(allProviders || {}).length;
+        if (allProvidersLength === 0) {
+            return true;
+        }
         for (const provider of allProviders) {
-            if (isProviderIncluded(providers, !!providers[provider]) &&
-                consent[provider]) {
+            if (isProviderIncluded(providers, providers[provider])) {
                 return true;
             }
         }
@@ -195,25 +246,15 @@
         if (!allowProvider(providerId)) {
             return false;
         }
+        if (!checkConsent(providers)) {
+            return false;
+        }
         if (providers && Object.keys(providers).length) {
-            const tagProvider = providers[providerId];
-            if (!(tagProvider ||
-                (providers['all'] === true && tagProvider === undefined) ||
-                (providers['all'] === false && tagProvider === true))) {
+            if (!isProviderIncluded(providers, providers[providerId])) {
                 return false;
             }
         }
-        const consent = getConsent();
-        if (isConsentDisabled()) {
-            return true;
-        }
-        if (!consent) {
-            return false;
-        }
-        if (consent['all']) {
-            return true;
-        }
-        return consent[providerId];
+        return true;
     };
 
     const tagStorage = 'edgeTag';
@@ -302,7 +343,7 @@
             localStorage.setItem(key, JSON.stringify(value));
         }
         catch (_a) {
-            console.log('Local storage not supported');
+            log('Local storage not supported.');
         }
     };
     const getLocal = (key) => {
@@ -328,7 +369,7 @@
             sessionStorage.setItem(key, JSON.stringify(value));
         }
         catch (_a) {
-            console.log('Session storage not supported');
+            log('Session storage not supported.');
         }
     };
     const getSession = (key) => {
@@ -358,34 +399,80 @@
         initUserId = userId;
     };
 
+    const getHeaders = () => ({
+        'Content-type': 'application/json; charset=utf-8',
+        Accept: 'application/json; charset=utf-8',
+        EdgeTagUserId: handleGetUserId(),
+    });
     const beacon = (url, payload) => {
-        let blob;
-        if (payload) {
-            blob = new Blob([JSON.stringify(payload)], { type: 'application/json' });
+        try {
+            let blob;
+            if (payload) {
+                blob = new Blob([JSON.stringify(payload)], { type: 'application/json' });
+            }
+            return navigator.sendBeacon(url, blob);
+        }
+        catch (e) {
+            return Promise.reject(new Error('Beacon not supported.'));
         }
-        return navigator.sendBeacon(url, blob);
     };
+    const fallbackAjax = (method, url, payload) => __awaiter(void 0, void 0, void 0, function* () {
+        const https = yield import('https');
+        const options = {
+            method,
+            headers: getHeaders(),
+        };
+        return new Promise((resolve, reject) => {
+            const req = https.request(url, options, (res) => {
+                res.on('data', (data) => {
+                    try {
+                        data = JSON.parse(data);
+                    }
+                    catch (_a) {
+                        // do nothing
+                    }
+                    resolve({
+                        body: data,
+                        status: res.statusCode || 500,
+                    });
+                });
+            });
+            req.on('error', (e) => {
+                reject(new Error(e.message));
+            });
+            if (payload && method !== 'GET') {
+                req.write(JSON.stringify(payload));
+            }
+            req.end();
+        });
+    });
     const ajax = (method, url, payload) => __awaiter(void 0, void 0, void 0, function* () {
+        if (typeof fetch === 'undefined') {
+            return yield fallbackAjax(method, url, payload)
+                .then((data) => {
+                if (data.status < 200 || data.status >= 300) {
+                    return Promise.reject(new Error(`Request failed with code ${data.status} occurred: ${JSON.stringify(data.body)}`));
+                }
+                return Promise.resolve(data.body);
+            })
+                .catch((error) => {
+                return Promise.reject(new Error(error));
+            });
+        }
         return yield fetch(url, {
             method,
-            headers: {
-                'Content-type': 'application/json; charset=utf-8',
-                Accept: 'application/json; charset=utf-8',
-                EdgeTagUserId: handleGetUserId(),
-            },
+            headers: getHeaders(),
             body: JSON.stringify(payload),
             credentials: 'include',
         })
             .then((response) => response.json().then((data) => ({ status: response.status, body: data })))
             .then((data) => {
             if (data.status < 200 || data.status >= 300) {
-                // Q: do we need to retry?
-                return Promise.reject(new Error(JSON.stringify(data.body)));
+                return Promise.reject(new Error(`Request failed with code ${data.status}: ${JSON.stringify(data.body)}`));
             }
             return Promise.resolve(data.body);
         })
             .catch((error) => {
-            // Q: do we need to retry?
             return Promise.reject(new Error(error));
         });
     });
@@ -413,7 +500,7 @@
     function postRequest(url, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!url) {
-                return Promise.reject(new Error('URL is empty'));
+                return Promise.reject(new Error('URL is empty.'));
             }
             const payload = getStandardPayload(data);
             if (options && options.method === 'beacon') {
@@ -425,7 +512,7 @@
     function getRequest(url, options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!url) {
-                return Promise.reject(new Error('URL is empty'));
+                return Promise.reject(new Error('URL is empty.'));
             }
             if (options && options.method === 'beacon') {
                 return {
@@ -436,9 +523,6 @@
         });
     }
 
-    const info = (data) => {
-    };
-
     let memoryConsent;
     const saveConsent = (consent) => {
         setConsent(consent);
@@ -449,7 +533,7 @@
             consentString: consent,
         };
         saveConsent(consent);
-        postRequest(getConsentURL(), payload).catch(info);
+        postRequest(getConsentURL(), payload).catch(error);
     };
     const setConsent = (newConsent) => {
         memoryConsent = newConsent;
@@ -942,6 +1026,12 @@
 
     v35('v5', 0x50, sha1);
 
+    const encodeString = (name) => {
+        if (typeof btoa === 'undefined') {
+            return Buffer.from(name).toString('base64');
+        }
+        return btoa(name);
+    };
     const generateEventId = (name) => {
         let time = Date.now().toString();
         if (typeof performance !== 'undefined' &&
@@ -951,7 +1041,7 @@
                 time = perf.toFixed(4);
             }
         }
-        return `${btoa(name)}-${v4()}-${time}`;
+        return `${encodeString(name)}-${v4()}-${time}`;
     };
 
     const manifestVariables = {};
@@ -975,13 +1065,13 @@
             stubs = [];
         }
         catch (e) {
-            console.error(e);
+            error(e);
         }
     };
 
     const sendTag = ({ eventName, eventId, data, providerData, providers, options, }) => {
         if (!allowProviders(providers)) {
-            console.log('Provider is not allowed.');
+            log('Provider is not allowed.');
             return;
         }
         const payload = {
@@ -994,7 +1084,7 @@
         if (providers) {
             payload.providers = providers;
         }
-        postRequest(getTagURL(), payload, options).catch(info);
+        postRequest(getTagURL(), payload, options).catch(error);
     };
     const handleTag = (eventName, data = {}, providers, options) => {
         if (!isInitialized()) {
@@ -1005,11 +1095,11 @@
             return;
         }
         if (!allowProviders(providers)) {
-            console.log('Provider is not allowed.');
+            log('Provider is not allowed.');
             return;
         }
         if (!allowTag(providers)) {
-            console.log('No consent');
+            log('Consent is missing.');
             return;
         }
         let eventId = data['eventId'];
@@ -1049,11 +1139,11 @@
 
     const handleData = (data, options) => {
         if (!data || Object.keys(data).length === 0) {
-            console.error('Provide data for data API.');
+            error('Provide data for data API.');
             return;
         }
         saveKV(data);
-        postRequest(getDataURL(), { data }, options).catch(info);
+        postRequest(getDataURL(), { data }, options).catch(error);
     };
 
     const saveDataToEdge = (key, value, provider) => {
@@ -1065,7 +1155,7 @@
                 value = JSON.stringify(value);
             }
             catch (_a) {
-                console.log('Error stringify value');
+                log('Error stringify value.');
                 return;
             }
         }
@@ -1185,17 +1275,17 @@
         getRequest(url.href)
             .then((result) => {
             if (!result) {
-                console.log('init failed');
+                log('Initialization failed');
                 return;
             }
             handleManifest(result.result);
         })
-            .catch(info);
+            .catch(error);
     };
 
     const handleUser = (key, value, options) => {
         if (!key || !value) {
-            console.error('Key or Value is missing in user API.');
+            error('Key or Value is missing in user API.');
             return;
         }
         saveKV({
@@ -1204,19 +1294,19 @@
         postRequest(getUserURL(), {
             key,
             value,
-        }, options).catch(info);
+        }, options).catch(error);
     };
 
     const handleGetData = (keys, callback) => {
         if (!keys || keys.length === 0) {
-            console.error('Provide keys for get data API.');
+            error('Provide keys for get data API.');
             return;
         }
         getRequest(getGetDataURL(keys))
             .then((result) => {
             callback((result === null || result === void 0 ? void 0 : result.result) || {});
         })
-            .catch(info);
+            .catch(error);
     };
 
     const handleKeys = (callback) => {
@@ -1224,7 +1314,7 @@
             .then((result) => {
             callback((result === null || result === void 0 ? void 0 : result.result) || []);
         })
-            .catch(info);
+            .catch(error);
     };
 
     const init = (preferences) => {
@@ -1282,6 +1372,10 @@
       keys(callback) {
         keys(callback);
       }
+
+      getUserId() {
+        return getUserId()
+      }
     }
 
     var api = new API();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blotoutio/edgetag-sdk-browser",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Browser SDK for EdgeTag",
   "author": "Blotout",
   "license": "MIT",