feat: use global variable to be more reliable

Author: cy-moi

packages/plugins/rum/src/built/privacy-helpers.ts

@@ -7,7 +7,7 @@
 const globalAny: any = globalThis;
 globalAny.$DD_ALLOW = new Set();
 
-export function $(newValues: string[] | TemplateStringsArray) {
+const $DD_ADD_TO_DICTIONARY = (newValues: string[] | TemplateStringsArray) => {
     const initialSize = globalAny.$DD_ALLOW.size;
     if ((newValues as unknown as TemplateStringsArray).raw) {
         // We're being used as a template tag function. The invocation will look like this:
@@ -36,4 +36,23 @@ export function $(newValues: string[] | TemplateStringsArray) {
     }
 
     return newValues;
-}
+};
+
+// Process any queued items and set up the queue mechanism
+(() => {
+    const queueName = '$DD_A_Q';
+    const global = globalThis as any;
+    const addToDictionary = $DD_ADD_TO_DICTIONARY;
+
+    // Initialize queue if it doesn't exist
+    global[queueName] = global[queueName] || [];
+
+    // Process all existing items in the queue
+    global[queueName].forEach(addToDictionary);
+
+    // Clear the queue
+    global[queueName].length = 0;
+
+    // Replace push method with our add function
+    global[queueName].push = addToDictionary;
+})();

packages/plugins/rum/src/privacy/index.ts

@@ -3,12 +3,12 @@
 // Copyright 2019-Present Datadog, Inc.
 
 import { instrument } from '@datadog/js-instrumentation-wasm';
-import { readFileSync } from '@dd/core/helpers/fs';
 import type { GlobalContext, PluginOptions } from '@dd/core/types';
+import { InjectPosition } from '@dd/core/types';
 import { createFilter } from '@rollup/pluginutils';
 import path from 'node:path';
 
-import { PLUGIN_NAME, PRIVACY_HELPERS_FILE_NAME } from './constants';
+import { PLUGIN_NAME } from './constants';
 import { buildTransformOptions } from './transform';
 import type { PrivacyOptionsWithDefaults } from './types';
 
@@ -22,40 +22,20 @@ export const getPrivacyPlugin = (
         return;
     }
 
+    context.inject({
+        type: 'file',
+        position: InjectPosition.BEFORE,
+        value: path.join(__dirname, './privacy-helpers.js'),
+    });
+
     const transformOptions = buildTransformOptions(pluginOptions);
     const transformFilter = createFilter(pluginOptions.include, pluginOptions.exclude);
-    const { helpersModule } = pluginOptions;
     return {
         name: PLUGIN_NAME,
         // Enforce when the plugin will be executed.
         // Not supported by Rollup and ESBuild.
         // https://vitejs.dev/guide/api-plugin.html#plugin-ordering
         enforce: 'post',
-        // webpack's id filter is outside of loader logic,
-        // an additional hook is needed for better perf on webpack
-        async resolveId(source) {
-            if (source.includes(helpersModule)) {
-                return { id: source };
-            }
-            return null;
-        },
-
-        loadInclude(id) {
-            if (id.includes(helpersModule)) {
-                return true;
-            }
-            return false;
-        },
-
-        async load(id) {
-            if (id.includes(helpersModule)) {
-                const filename = `${path.join(__dirname, PRIVACY_HELPERS_FILE_NAME)}.${id.endsWith('.cjs') ? 'js' : 'mjs'}`;
-                return { code: readFileSync(filename), map: null };
-            }
-            return null;
-        },
-        // webpack's id filter is outside of loader logic,
-        // an additional hook is needed for better perf on webpack
         transformInclude(id) {
             return transformFilter(id);
         },
@@ -68,8 +48,7 @@ export const getPrivacyPlugin = (
                         embedCodeInSourceMap: true,
                     };
                 }
-                const result = instrument({ id, code }, transformOptions);
-                return result;
+                return instrument({ id, code }, transformOptions);
             } catch (e) {
                 log.error(`Instrumentation Error: ${e}`);
                 return {

packages/plugins/rum/src/privacy/transform.ts

@@ -17,11 +17,14 @@ export function buildTransformOptions(
     return {
         privacy: {
             addToDictionaryHelper: {
-                import: {
-                    cjsModule: `${pluginOptions.helpersModule}.cjs`,
-                    esmModule: `${pluginOptions.helpersModule}.mjs`,
-                    func: pluginOptions.addToDictionaryFunctionName ?? '$',
+                expression: {
+                    code: `((q='$DD_A_Q',g=globalThis)=>(g[q]=g[q]||[],(v=>(g[q].push(v),v))))()`,
                 },
+                // import: {
+                //     cjsModule: `${pluginOptions.helpersModule}.cjs`,
+                //     esmModule: `${pluginOptions.helpersModule}.mjs`,
+                //     func: pluginOptions.addToDictionaryFunctionName ?? '$',
+                // },
             },
         },
     };

packages/plugins/rum/src/validate.ts

@@ -130,7 +130,14 @@ export const validatePrivacyOptions = (
         };
     }
 
-    log.debug(`datadog-rum-privacy plugin options: ${JSON.stringify(toReturn.config)}`);
+    log.debug(
+        `datadog-rum-privacy plugin options: ${JSON.stringify(toReturn.config, (_, value) => {
+            if (value instanceof RegExp) {
+                return value.toString();
+            }
+            return value;
+        })}`,
+    );
 
     return toReturn;
 };