@blotoutio/edgetag-sdk-browser 0.68.2 → 0.69.0

package/index.js

@@ -281,21 +281,87 @@
     const fallbackSessionKey = 'fallback_tag_user_id';
     const storageIdKey = 'storageId';
 
-    const getMessage = (error) => {
-        if (error instanceof Error) {
-            return error.message;
+    const encodeString = (name) => {
+        if (typeof btoa === 'undefined') {
+            return Buffer.from(name).toString('base64');
+        }
+        return btoa(name);
+    };
+    const getBasicRandomNumber = () => {
+        return parseInt((Math.random() * 10000000000).toString(), 10);
+    };
+    const generateUUID = () => {
+        let id = '';
+        try {
+            id = crypto.randomUUID();
+            if (!id) {
+                const array = new Uint32Array(20);
+                const numbers = crypto.getRandomValues(array);
+                for (let i = 0; i < 5; i++) {
+                    const y = i * 3;
+                    if (i !== 0) {
+                        id += '-';
+                    }
+                    const sum = numbers[y + 1] + numbers[y + 2] + numbers[y + 3];
+                    id += sum.toString();
+                }
+            }
         }
-        if (typeof error === 'string') {
-            return error;
+        catch {
+            id = `${getBasicRandomNumber()}-${getBasicRandomNumber()}-${getBasicRandomNumber()}-${getBasicRandomNumber()}-${getBasicRandomNumber()}`;
+            console.log('[EdgeTag] Crypto module not found');
         }
+        return id;
+    };
+    const generateEventId = (name) => {
+        let time = Date.now().toString();
+        if (typeof performance !== 'undefined' &&
+            typeof performance.now === 'function') {
+            const perf = performance.now();
+            if (perf) {
+                time = perf.toFixed(4);
+            }
+        }
+        return `${encodeString(name)}-${generateUUID()}-${time}`;
+    };
+
+    const getCookieValue = (key) => {
+        var _a;
         try {
-            return JSON.stringify(error);
+            if (!document || !document.cookie) {
+                return '';
+            }
+            const cookies = parseCookies(document.cookie);
+            return (_a = cookies[key]) !== null && _a !== void 0 ? _a : '';
         }
         catch {
-            return error;
+            return '';
         }
     };
-    const allowLog = () => {
+    const parseCookies = (cookie) => {
+        return Object.fromEntries(cookie
+            .split(/;\s+/)
+            .map((r) => r.split('=').map((str) => str.trim()))
+            .map(([cookieKey, ...cookieValues]) => {
+            const cookieValue = cookieValues.join('=');
+            if (!cookieKey) {
+                return [];
+            }
+            let decodedValue = '';
+            if (cookieValue) {
+                try {
+                    decodedValue = decodeURIComponent(cookieValue);
+                }
+                catch (e) {
+                    console.log(`Unable to decode cookie ${cookieKey}: ${e}`);
+                    decodedValue = cookieValue;
+                }
+            }
+            return [cookieKey, decodedValue];
+        }));
+    };
+
+    const canLog = () => {
         try {
             return localStorage.getItem('edgeTagDebug') === '1';
         }
@@ -303,14 +369,28 @@
             return false;
         }
     };
-    const log = (data) => {
-        if (!allowLog()) {
-            return;
-        }
-        console.log('[EdgeTag]', getMessage(data));
-    };
-    const error = (data) => {
-        console.error('[EdgeTag]', getMessage(data));
+    const prefix = `[EdgeTag]`;
+    const logger = {
+        log: (...args) => {
+            if (canLog()) {
+                console.log(prefix, ...args);
+            }
+        },
+        error: (...args) => {
+            if (canLog()) {
+                console.error(prefix, ...args);
+            }
+        },
+        info: (...args) => {
+            if (canLog()) {
+                console.info(prefix, ...args);
+            }
+        },
+        trace: (...args) => {
+            if (canLog()) {
+                console.trace(prefix, ...args);
+            }
+        },
     };
 
     const initKey = `${keyPrefix}StoreMultiple`;
@@ -380,7 +460,7 @@
             localStorage.setItem(key, JSON.stringify(value));
         }
         catch {
-            log('Local storage not supported.');
+            logger.log('Local storage not supported.');
         }
     };
     const getLocal = (key) => {
@@ -406,7 +486,7 @@
             sessionStorage.setItem(key, JSON.stringify(value));
         }
         catch {
-            log('Session storage not supported.');
+            logger.log('Session storage not supported.');
         }
     };
     const getSession = (key) => {
@@ -425,86 +505,6 @@
         }
     };
 
-    const encodeString = (name) => {
-        if (typeof btoa === 'undefined') {
-            return Buffer.from(name).toString('base64');
-        }
-        return btoa(name);
-    };
-    const getBasicRandomNumber = () => {
-        return parseInt((Math.random() * 10000000000).toString(), 10);
-    };
-    const generateUUID = () => {
-        let id = '';
-        try {
-            id = crypto.randomUUID();
-            if (!id) {
-                const array = new Uint32Array(20);
-                const numbers = crypto.getRandomValues(array);
-                for (let i = 0; i < 5; i++) {
-                    const y = i * 3;
-                    if (i !== 0) {
-                        id += '-';
-                    }
-                    const sum = numbers[y + 1] + numbers[y + 2] + numbers[y + 3];
-                    id += sum.toString();
-                }
-            }
-        }
-        catch {
-            id = `${getBasicRandomNumber()}-${getBasicRandomNumber()}-${getBasicRandomNumber()}-${getBasicRandomNumber()}-${getBasicRandomNumber()}`;
-            console.log('[EdgeTag] Crypto module not found');
-        }
-        return id;
-    };
-    const generateEventId = (name) => {
-        let time = Date.now().toString();
-        if (typeof performance !== 'undefined' &&
-            typeof performance.now === 'function') {
-            const perf = performance.now();
-            if (perf) {
-                time = perf.toFixed(4);
-            }
-        }
-        return `${encodeString(name)}-${generateUUID()}-${time}`;
-    };
-
-    const getCookieValue = (key) => {
-        var _a;
-        try {
-            if (!document || !document.cookie) {
-                return '';
-            }
-            const cookies = parseCookies(document.cookie);
-            return (_a = cookies[key]) !== null && _a !== void 0 ? _a : '';
-        }
-        catch {
-            return '';
-        }
-    };
-    const parseCookies = (cookie) => {
-        return Object.fromEntries(cookie
-            .split(/;\s+/)
-            .map((r) => r.split('=').map((str) => str.trim()))
-            .map(([cookieKey, ...cookieValues]) => {
-            const cookieValue = cookieValues.join('=');
-            if (!cookieKey) {
-                return [];
-            }
-            let decodedValue = '';
-            if (cookieValue) {
-                try {
-                    decodedValue = decodeURIComponent(cookieValue);
-                }
-                catch (e) {
-                    console.log(`Unable to decode cookie ${cookieKey}: ${e}`);
-                    decodedValue = cookieValue;
-                }
-            }
-            return [cookieKey, decodedValue];
-        }));
-    };
-
     const getUserId$1 = (destination) => {
         const userId = getSetting(destination, 'userId');
         if (userId) {
@@ -518,7 +518,7 @@
         }
         const instances = getInstances();
         if (instances.length > 1) {
-            error('Multiple instances detected! Please provide a destination.');
+            logger.error('Multiple instances detected! Please provide a destination.');
             return '';
         }
         return getUserId$1(instances[0]);
@@ -563,7 +563,7 @@
             referrer: getReferrer(destination),
             search: getSearch(destination),
             locale: getLocale(),
-            sdkVersion: "0.68.2" ,
+            sdkVersion: "0.69.0" ,
             ...(payload || {}),
         };
         let storage = {};
@@ -612,7 +612,7 @@
 
     const generateUrl = (destination, path) => {
         if (!destination) {
-            log('URL is not valid');
+            logger.log('URL is not valid');
             return '';
         }
         return `${destination}${path}`;
@@ -665,7 +665,7 @@
             });
         }
         catch (e) {
-            error(e);
+            logger.error(e);
         }
     };
     const addStub = (destination, stub) => {
@@ -713,7 +713,7 @@
         if (providers) {
             payload.providers = providers;
         }
-        postRequest(getTagURL(destination, eventName, options), payload, options).catch(error);
+        postRequest(getTagURL(destination, eventName, options), payload, options).catch(logger.error);
     };
     const processTag = (destination, eventName, data = {}, providers, options) => {
         var _a, _b;
@@ -739,7 +739,7 @@
                 continue;
             }
             if (!configuredTags.has(pkg.name)) {
-                log(`Provider ${pkg.name} is not in allow list`);
+                logger.log(`Provider ${pkg.name} is not in allow list`);
                 continue;
             }
             const variables = getProviderVariables(destination, pkg.name);
@@ -747,11 +747,11 @@
             const executionContext = new Map();
             for (const variable of variables) {
                 if (!isProviderInstanceAllowed(providers, pkg.name, variable.tagName)) {
-                    log(`Provider instance is not allowed (${pkg.name}: ${variable.tagName})`);
+                    logger.log(`Provider instance is not allowed (${pkg.name}: ${variable.tagName})`);
                     continue;
                 }
                 if (!hasUserConsent(consent, pkg.name, variable.tagName)) {
-                    log(`Consent is missing (${pkg.name}: ${variable.tagName})`);
+                    logger.log(`Consent is missing (${pkg.name}: ${variable.tagName})`);
                     continue;
                 }
                 const payload = ((_a = conversion === null || conversion === void 0 ? void 0 : conversion.providers) === null || _a === void 0 ? void 0 : _a.length) === 0 ||
@@ -809,11 +809,11 @@
             .then((result) => {
             callback((result === null || result === void 0 ? void 0 : result.result) || {});
         })
-            .catch(error);
+            .catch(logger.error);
     };
     const handleGetData = (keys, callback, options) => {
         if (!keys || keys.length === 0) {
-            error('Provide keys for get data API.');
+            logger.error('Provide keys for get data API.');
             return;
         }
         if (options === null || options === void 0 ? void 0 : options.destination) {
@@ -822,7 +822,7 @@
         }
         const instances = getInstances();
         if (instances.length > 1) {
-            error('Multiple instances found! Please provide destination.');
+            logger.error('Multiple instances found! Please provide destination.');
             callback({});
             return;
         }
@@ -840,17 +840,17 @@
                 continue;
             }
             if (!configuredTags.has(pkg.name)) {
-                log(`Provider ${pkg.name} is not in allow list`);
+                logger.log(`Provider ${pkg.name} is not in allow list`);
                 continue;
             }
             const variables = getProviderVariables(destination, pkg.name);
             for (const variable of variables) {
                 if (!isProviderInstanceAllowed(providers, pkg.name, variable.tagName)) {
-                    log(`Data not allowed for ${pkg.name} (${variable.tagName})`);
+                    logger.log(`Data not allowed for ${pkg.name} (${variable.tagName})`);
                     continue;
                 }
                 if (!hasUserConsent(consent, pkg.name, variable.tagName)) {
-                    log(`Consent is missing for ${pkg.name} (${variable.tagName})`);
+                    logger.log(`Consent is missing for ${pkg.name} (${variable.tagName})`);
                     continue;
                 }
                 pkg.user({
@@ -860,11 +860,11 @@
                 });
             }
         }
-        postRequest(getDataURL(destination), { data, providers }, options).catch(error);
+        postRequest(getDataURL(destination), { data, providers }, options).catch(logger.error);
     };
     const handleData = (data, providers, options) => {
         if (!data || Object.keys(data).length === 0) {
-            error('Provide data for data API.');
+            logger.error('Provide data for data API.');
             return;
         }
         if (options === null || options === void 0 ? void 0 : options.destination) {
@@ -908,7 +908,7 @@
         };
         saveConsent(destination, consent);
         if (!(options === null || options === void 0 ? void 0 : options.localSave)) {
-            postRequest(getConsentURL(destination), payload).catch(error);
+            postRequest(getConsentURL(destination), payload).catch(logger.error);
         }
         const userId = getUserId$1(destination);
         const providerPackages = getSetting(destination, 'browserPackages');
@@ -939,6 +939,7 @@
                     keyName: `${keyPrefix}Store`,
                     executionContext,
                     session: null,
+                    destination,
                 });
             }
         }
@@ -971,7 +972,7 @@
             return null;
         }
         if (!preferences.edgeURL) {
-            error('Please provide URL for EdgeTag');
+            logger.error('Please provide URL for EdgeTag');
             return null;
         }
         const providersPackages = {};
@@ -1012,7 +1013,7 @@
                 updatedValue = JSON.stringify(value);
             }
             catch {
-                log('Error stringify value.');
+                logger.log('Error stringify value.');
                 return;
             }
         }
@@ -1107,6 +1108,7 @@
         });
     };
 
+    const keyName = `${keyPrefix}Store`;
     const handleManifest = (destination, response) => {
         const providerPackages = getSetting(destination, 'browserPackages');
         const userId = getUserId$1(destination);
@@ -1138,8 +1140,9 @@
                         sendTag: sendTag.bind(null, destination),
                         sendEdgeData: processData.bind(null, destination),
                         getEdgeData: processGetData.bind(null, destination),
-                        keyName: `${keyPrefix}Store`,
+                        keyName,
                         executionContext,
+                        destination,
                     });
                 }
             }
@@ -1200,7 +1203,7 @@
             .then((result) => {
             var _a;
             if (!result) {
-                error('Initialization failed');
+                logger.error('Initialization failed');
                 return;
             }
             if (result.isNewUser && result.consent) {
@@ -1243,7 +1246,7 @@
                 // do nothing
             }
         })
-            .catch(error);
+            .catch(logger.error);
     };
 
     const processUser = (destination, key, value, providers, options) => {
@@ -1259,17 +1262,17 @@
                 continue;
             }
             if (!configuredTags.has(pkg.name)) {
-                log(`Provider ${pkg.name} is not in allow list`);
+                logger.log(`Provider ${pkg.name} is not in allow list`);
                 continue;
             }
             const variables = getProviderVariables(destination, pkg.name);
             for (const variable of variables) {
                 if (!isProviderInstanceAllowed(providers, pkg.name, variable.tagName)) {
-                    log(`User not allowed for ${pkg.name} (${variable.tagName})`);
+                    logger.log(`User not allowed for ${pkg.name} (${variable.tagName})`);
                     continue;
                 }
                 if (!hasUserConsent(consent, pkg.name, variable.tagName)) {
-                    log(`User do not have consent for ${pkg.name} (${variable.tagName})`);
+                    logger.log(`User do not have consent for ${pkg.name} (${variable.tagName})`);
                     continue;
                 }
                 pkg.user({
@@ -1283,11 +1286,11 @@
             key,
             value,
             providers,
-        }, options).catch(error);
+        }, options).catch(logger.error);
     };
     const handleUser = (key, value, providers, options) => {
         if (!key || !value) {
-            error('Key or Value is missing in user API.');
+            logger.error('Key or Value is missing in user API.');
             return;
         }
         if (options === null || options === void 0 ? void 0 : options.destination) {
@@ -1304,7 +1307,7 @@
             .then((result) => {
             callback((result === null || result === void 0 ? void 0 : result.result) || []);
         })
-            .catch(error);
+            .catch(logger.error);
     };
     const handleKeys = (callback, options) => {
         if (options === null || options === void 0 ? void 0 : options.destination) {
@@ -1313,7 +1316,7 @@
         }
         const instances = getInstances();
         if (instances.length > 1) {
-            error('Multiple instances found! Please provide destination.');
+            logger.error('Multiple instances found! Please provide destination.');
             callback([]);
             return;
         }
@@ -1356,7 +1359,7 @@
         }
         const instances = getInstances();
         if (instances.length > 1) {
-            error('Multiple instances found! Please provide destination.');
+            logger.error('Multiple instances found! Please provide destination.');
             return undefined;
         }
         return getSetting(instances[0], 'isNewUser');

package/package.json

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