@blotoutio/edgetag-sdk-browser 0.52.0 → 0.52.2

package/index.js

@@ -142,11 +142,12 @@
             destination,
             initialized: false,
             stubs: [],
+            browserPackages: [],
             channels: new Map(),
             ...options,
         };
     };
-    const setSetting = (options, destination) => {
+    const setSetting = (destination, options) => {
         if (!edgeTagSettings) {
             return;
         }
@@ -173,7 +174,7 @@
     };
     const addChannel = (destination, pkg, tagName) => upsert(getSetting(destination, 'channels'), pkg, (names) => names.add(tagName), () => new Set());
     const getProviderVariables = (destination, packageId) => {
-        const setting = getSetting(destination, 'packages');
+        const setting = getSetting(destination, 'manifest');
         if (!setting) {
             return [];
         }
@@ -276,6 +277,7 @@
     const tagStorage = 'edgeTag';
     const consentKey = 'consent';
     const keyPrefix = `_worker`;
+    const cookieKey = 'tag_user_id';
 
     const getMessage = (error) => {
         if (error instanceof Error) {
@@ -421,8 +423,80 @@
         }
     };
 
+    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) => {
+        try {
+            if (!document || !document.cookie) {
+                return '';
+            }
+            const name = `${key}=`;
+            const decodedCookie = decodeURIComponent(document.cookie);
+            const ca = decodedCookie.split(';');
+            for (let i = 0; i < ca.length; i++) {
+                let c = ca[i];
+                while (c.charAt(0) === ' ') {
+                    c = c.substring(1);
+                }
+                if (c.indexOf(name) === 0) {
+                    return c.substring(name.length, c.length);
+                }
+            }
+            return '';
+        }
+        catch {
+            return '';
+        }
+    };
+
     const getUserId$1 = (destination) => {
-        return getSetting(destination, 'userId');
+        const userId = getSetting(destination, 'userId');
+        if (userId) {
+            return userId;
+        }
+        return getCookieValue(cookieKey);
     };
     const handleGetUserId = (options) => {
         if (options === null || options === void 0 ? void 0 : options.destination) {
@@ -431,7 +505,7 @@
         const instances = getInstances();
         if (instances.length > 1) {
             error('Multiple instances detected! Please provide a destination.');
-            return null;
+            return '';
         }
         return getUserId$1(instances[0]);
     };
@@ -475,7 +549,7 @@
             referrer: getReferrer(destination),
             search: getSearch(destination),
             locale: getLocale(),
-            sdkVersion: "0.52.0" ,
+            sdkVersion: "0.52.2" ,
             ...(payload || {}),
         };
         let storage = {};
@@ -555,121 +629,6 @@
         return generateUrl(destination, `/keys`);
     };
 
-    const providersPackages = {};
-    const setPreferences = (preferences) => {
-        var _a;
-        if (!preferences) {
-            return false;
-        }
-        if (!preferences.edgeURL) {
-            error('Please provide URL for EdgeTag');
-            return false;
-        }
-        (_a = preferences.providers) === null || _a === void 0 ? void 0 : _a.forEach((provider) => {
-            if (!provider.name) {
-                return;
-            }
-            providersPackages[provider.name] = provider;
-        });
-        try {
-            if (window && Array.isArray(window.edgetagProviders)) {
-                window.edgetagProviders.forEach((provider) => {
-                    if (!provider.name) {
-                        return;
-                    }
-                    providersPackages[provider.name] = provider;
-                });
-            }
-        }
-        catch {
-            // do nothing
-        }
-        initSettings(preferences.edgeURL, {
-            disableConsent: !!preferences.disableConsentCheck,
-        });
-        return true;
-    };
-    const getProvidersPackage = (destination) => {
-        const packages = getSetting(destination, 'packages');
-        const providers = [];
-        packages === null || packages === void 0 ? void 0 : packages.forEach((pkg) => {
-            const provider = providersPackages[pkg.package];
-            if (!provider) {
-                return;
-            }
-            providers.push(provider);
-        });
-        return providers;
-    };
-
-    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) => {
-        try {
-            if (!document || !document.cookie) {
-                return '';
-            }
-            const name = `${key}=`;
-            const decodedCookie = decodeURIComponent(document.cookie);
-            const ca = decodedCookie.split(';');
-            for (let i = 0; i < ca.length; i++) {
-                let c = ca[i];
-                while (c.charAt(0) === ' ') {
-                    c = c.substring(1);
-                }
-                if (c.indexOf(name) === 0) {
-                    return c.substring(name.length, c.length);
-                }
-            }
-            return '';
-        }
-        catch {
-            return '';
-        }
-    };
-
     const getConsent$1 = (destination) => {
         const storageConsent = getDataPerKey(destination, 'local', tagStorage, consentKey);
         if (storageConsent) {
@@ -684,9 +643,9 @@
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             stubs.forEach((stub) => api$1[stub.name](...(stub.arguments || [])));
-            setSetting({
+            setSetting(destination, {
                 stubs: [],
-            }, destination);
+            });
         }
         catch (e) {
             error(e);
@@ -694,9 +653,9 @@
     };
     const addStub = (destination, stub) => {
         const otherStubs = getSetting(destination, 'stubs') || [];
-        setSetting({
+        setSetting(destination, {
             stubs: [...otherStubs, stub],
-        }, destination);
+        });
     };
 
     const sendTag = (destination, { eventName, eventId, data, providerData, providers, options }) => {
@@ -724,12 +683,12 @@
         if (!eventId) {
             eventId = generateEventId(eventName);
         }
-        const providerPackages = getProvidersPackage(destination);
+        const providerPackages = getSetting(destination, 'browserPackages');
         const configuredTags = getSetting(destination, 'channels');
         const userId = getUserId$1(destination);
         const providerData = {};
         const consent = getConsent$1(destination);
-        for (const pkg of Object.values(providerPackages)) {
+        for (const pkg of providerPackages) {
             if (!pkg || !pkg.name || !pkg.tag) {
                 continue;
             }
@@ -821,11 +780,11 @@
 
     const processData = (destination, data, providers, options) => {
         saveKV(destination, data);
-        const providerPackages = getProvidersPackage(destination);
+        const providerPackages = getSetting(destination, 'browserPackages');
         const configuredTags = getSetting(destination, 'channels');
         const userId = getUserId$1(destination);
         const consent = getConsent$1(destination);
-        for (const pkg of Object.values(providerPackages)) {
+        for (const pkg of providerPackages) {
             if (!pkg || !pkg.user || !pkg.name) {
                 continue;
             }
@@ -876,9 +835,9 @@
         });
     };
     const saveConsent = (destination, consent) => {
-        setSetting({
+        setSetting(destination, {
             consent,
-        }, destination);
+        });
         savePerKey(destination, 'local', tagStorage, consent, consentKey);
     };
     const processConsent = (destination, consent, localSave) => {
@@ -894,10 +853,10 @@
             postRequest(getConsentURL(destination), payload).catch(error);
         }
         const userId = getUserId$1(destination);
-        const providerPackages = getProvidersPackage(destination);
+        const providerPackages = getSetting(destination, 'browserPackages');
         const executionContext = new Map();
         /* Calling Init for all provider instances based on consent check */
-        for (const pkg of Object.values(providerPackages)) {
+        for (const pkg of providerPackages) {
             if (!pkg || !pkg.name || !pkg.init) {
                 continue;
             }
@@ -948,6 +907,41 @@
         }
     };
 
+    const setPreferences = (preferences) => {
+        var _a;
+        if (!preferences) {
+            return null;
+        }
+        if (!preferences.edgeURL) {
+            error('Please provide URL for EdgeTag');
+            return null;
+        }
+        const providersPackages = {};
+        (_a = preferences.providers) === null || _a === void 0 ? void 0 : _a.forEach((provider) => {
+            if (!provider.name) {
+                return;
+            }
+            providersPackages[provider.name] = provider;
+        });
+        try {
+            if (window && Array.isArray(window.edgetagProviders)) {
+                window.edgetagProviders.forEach((provider) => {
+                    if (!provider.name) {
+                        return;
+                    }
+                    providersPackages[provider.name] = provider;
+                });
+            }
+        }
+        catch {
+            // do nothing
+        }
+        initSettings(preferences.edgeURL, {
+            disableConsent: !!preferences.disableConsentCheck,
+        });
+        return providersPackages;
+    };
+
     const cacheKey = `${keyPrefix}Cache`;
     const identity = (v) => v;
     const saveDataToEdge = (destination, key, value, provider) => {
@@ -1056,13 +1050,13 @@
     };
 
     const handleManifest = (destination, response) => {
-        const providerPackages = getProvidersPackage(destination);
+        const providerPackages = getSetting(destination, 'browserPackages');
         const userId = getUserId$1(destination);
         const executionContext = new Map();
         const manifest = response.result;
         manifest.forEach((provider) => {
             addChannel(destination, provider.package, provider.tagName);
-            const pkg = providerPackages[provider.package];
+            const pkg = providerPackages.find((pkg) => pkg.name === provider.package);
             if (provider.rules) {
                 Object.entries(provider.rules).forEach(([name, recipe]) => {
                     switch (name) {
@@ -1092,21 +1086,21 @@
                 }
             }
         });
-        setSetting({
+        setSetting(destination, {
             initialized: true,
-        }, destination);
+        });
         processStubs(destination);
     };
 
     const handleInit = (preferences) => {
-        const success = setPreferences(preferences);
-        if (!success) {
+        const browserPackages = setPreferences(preferences);
+        if (!browserPackages) {
             return;
         }
         if (preferences.afterManifestEvents) {
-            setSetting({
+            setSetting(preferences.edgeURL, {
                 stubs: preferences.afterManifestEvents,
-            }, preferences.edgeURL);
+            });
         }
         const url = new URL(getInitURL(preferences.edgeURL));
         if (preferences.disableConsentCheck) {
@@ -1114,21 +1108,31 @@
             saveConsent(preferences.edgeURL, { all: true });
         }
         if (preferences.userId) {
-            setSetting({ userId: preferences.userId }, preferences.edgeURL);
+            setSetting(preferences.edgeURL, { userId: preferences.userId });
             url.searchParams.set('userId', preferences.userId);
         }
         getRequest(url.href)
             .then((result) => {
+            var _a;
             if (!result) {
                 error('Initialization failed');
                 return;
             }
-            setSetting({
+            const providers = {};
+            (_a = result.result) === null || _a === void 0 ? void 0 : _a.forEach((pkg) => {
+                const provider = browserPackages[pkg.package];
+                if (!provider) {
+                    return;
+                }
+                providers[pkg.package] = provider;
+            });
+            setSetting(preferences.edgeURL, {
                 isNewUser: result.isNewUser,
                 consent: getConsent$1(preferences.edgeURL) || result.consent,
                 userId: result.userId,
-                packages: result.result,
-            }, preferences.edgeURL);
+                manifest: result.result,
+                browserPackages: Object.values(providers),
+            });
             handleManifest(preferences.edgeURL, result);
             try {
                 window.dispatchEvent(new CustomEvent('edgetag-initialized', {
@@ -1153,11 +1157,11 @@
         saveKV(destination, {
             [key]: value,
         });
-        const providerPackages = getProvidersPackage(destination);
+        const providerPackages = getSetting(destination, 'browserPackages');
         const configuredTags = getSetting(destination, 'channels');
         const consent = getConsent$1(destination);
         const userId = getUserId$1(destination);
-        for (const pkg of Object.values(providerPackages)) {
+        for (const pkg of providerPackages) {
             if (!pkg || !pkg.name || !pkg.user) {
                 continue;
             }
@@ -1172,7 +1176,7 @@
                     continue;
                 }
                 if (!hasUserConsent(consent, pkg.name, variable.tagName)) {
-                    log(`User doesn't have consent for ${pkg.name} (${variable.tagName})`);
+                    log(`User do not have consent for ${pkg.name} (${variable.tagName})`);
                     continue;
                 }
                 pkg.user({
@@ -1267,12 +1271,12 @@
 
     const processConfig = (destination, config) => {
         const existingConfig = getSetting(destination, 'config');
-        setSetting({
+        setSetting(destination, {
             config: {
                 ...existingConfig,
                 ...config,
             },
-        }, destination);
+        });
     };
     const handleConfig = (config, options) => {
         if (options === null || options === void 0 ? void 0 : options.destination) {
@@ -1379,23 +1383,25 @@
 
       const library = api;
       let stubs = [];
-      if (window.edgetag) {
+      if (!window.edgetag?.live) {
         stubs = window.edgetag.stubs || [];
-      }
 
-      // this needs to be regular function for arguments to work
-      window.edgetag = function () {
-        const sliced = [].slice.call(arguments);
-        if (!Array.isArray(sliced)) {
-          return
-        }
+        // this needs to be regular function for arguments to work
+        window.edgetag = function () {
+          const sliced = [].slice.call(arguments);
+          if (!Array.isArray(sliced)) {
+            return
+          }
 
-        try {
-          return library[sliced[0]](...sliced.slice(1))
-        } catch (e) {
-          console.error(e);
-        }
-      };
+          try {
+            return library[sliced[0]](...sliced.slice(1))
+          } catch (e) {
+            console.error(e);
+          }
+        };
+
+        window.edgetag.live = true;
+      }
 
       const beforeManifestEvents = [];
       const afterManifestEvents = [];

package/package.json

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