From 2f7bc2c926de969bdaa0a1c6ece990a886dac32c Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Tue, 7 Feb 2023 15:48:45 +0100
Subject: [PATCH 1/7] feat(chalice): force SSO for wrong user credentials

---
 ee/api/chalicelib/core/users.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py
index f050811ab..df713dca8 100644
--- a/ee/api/chalicelib/core/users.py
+++ b/ee/api/chalicelib/core/users.py
@@ -740,6 +740,8 @@ def authenticate(email, password, for_change_password=False):
             "email": email,
             **r
         }
+    if config("enforce_SSO", cast=bool, default=False) and helper.is_saml2_available():
+        return {"errors": ["must sign-in with SSO, enforced by admin"]}
     return None
 
 

From e02f1fa278db5a08a637fdd46fd3f7ec689073c6 Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Tue, 7 Feb 2023 13:02:54 +0100
Subject: [PATCH 2/7] fix(ui): fix notes asking for channels too much

---
 .../Player/Controls/components/CreateNote.tsx | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/app/components/Session_/Player/Controls/components/CreateNote.tsx b/frontend/app/components/Session_/Player/Controls/components/CreateNote.tsx
index 0daf840ec..c51f8a54c 100644
--- a/frontend/app/components/Session_/Player/Controls/components/CreateNote.tsx
+++ b/frontend/app/components/Session_/Player/Controls/components/CreateNote.tsx
@@ -68,9 +68,11 @@ function CreateNote({
 
   React.useEffect(() => {
     if (inputRef.current && isVisible) {
-      fetchSlack();
-      fetchTeams();
       inputRef.current.focus();
+      if (teamsChannels.size === 0 || slackChannels.size === 0) {
+        fetchSlack();
+        fetchTeams();
+      }
     }
   }, [isVisible]);
 
@@ -79,7 +81,7 @@ function CreateNote({
   const cleanUp = () => {
     setCreateNoteTooltip({ isVisible: false, time: 0 });
     setText('');
-    setTag(undefined);
+    setTag(TAGS[0]);
   }
   const onSubmit = () => {
     if (text === '') return;
@@ -100,12 +102,12 @@ function CreateNote({
     };
     if (isEdit) {
       return notesStore
-        .updateNote(editNote.noteId, note)
+        .updateNote(editNote.noteId!, note)
         .then((r) => {
           toast.success('Note updated');
-          notesStore.fetchSessionNotes(sessionId).then((notes) => {
-            onSuccess(editNote.noteId);
-            updateNote(r);
+          notesStore.fetchSessionNotes(sessionId).then(() => {
+            onSuccess(editNote.noteId!);
+            updateNote(r as Note);
           });
         })
         .catch((e) => {
@@ -120,10 +122,10 @@ function CreateNote({
     return notesStore
       .addNote(sessionId, note)
       .then((r) => {
-        onSuccess(r.noteId as unknown as string);
+        onSuccess(r!.noteId as unknown as string);
         toast.success('Note added');
-        notesStore.fetchSessionNotes(sessionId).then((notes) => {
-          addNote(r);
+        notesStore.fetchSessionNotes(sessionId).then(() => {
+          addNote(r as Note);
         });
       })
       .catch((e) => {
@@ -159,14 +161,16 @@ function CreateNote({
     }))
     .toJS() as unknown as { value: string; label: string }[];
 
+  // @ts-ignore
   slackChannelsOptions.unshift({ value: null, label: 'Pick a channel' });
+  // @ts-ignore
   teamsChannelsOptions.unshift({ value: null, label: 'Pick a channel' });
 
-  const changeSlackChannel = ({ value, name }: { value: Record<string, string>; name: string }) => {
+  const changeSlackChannel = ({ value }: { value: Record<string, string>; name: string }) => {
     setSlackChannel(value.value);
   };
 
-  const changeTeamsChannel = ({ value, name }: { value: Record<string, string>; name: string }) => {
+  const changeTeamsChannel = ({ value }: { value: Record<string, string>; name: string }) => {
     setTeamsChannel(value.value);
   };
 

From faefe14ac533ab2138ce680143fcb9a2adce4b4c Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Tue, 7 Feb 2023 13:44:20 +0100
Subject: [PATCH 3/7] fix(ui): restrict changing playtime in live without file,
 remove unnec /channel calls and add loader

---
 .../Session/Player/LivePlayer/Timeline.tsx    |   7 +-
 .../shared/SharePopup/SharePopup.js           | 196 ++++++++++--------
 .../app/components/ui/Popover/Popover.tsx     |   7 +-
 frontend/app/player/web/WebLivePlayer.ts      |   3 +
 4 files changed, 118 insertions(+), 95 deletions(-)

diff --git a/frontend/app/components/Session/Player/LivePlayer/Timeline.tsx b/frontend/app/components/Session/Player/LivePlayer/Timeline.tsx
index 2bddec240..cba5547b9 100644
--- a/frontend/app/components/Session/Player/LivePlayer/Timeline.tsx
+++ b/frontend/app/components/Session/Player/LivePlayer/Timeline.tsx
@@ -95,11 +95,10 @@ function Timeline(props: IProps) {
 
   const loadAndSeek = async (e: React.MouseEvent<HTMLDivElement>) => {
     e.persist();
-    await player.toggleTimetravel();
-
-    setTimeout(() => {
+    const result = await player.toggleTimetravel();
+    if (result) {
       seekProgress(e);
-    });
+    }
   };
 
   const jumpToTime = (e: React.MouseEvent<HTMLDivElement>) => {
diff --git a/frontend/app/components/shared/SharePopup/SharePopup.js b/frontend/app/components/shared/SharePopup/SharePopup.js
index 5e01dde3d..984ce0060 100644
--- a/frontend/app/components/shared/SharePopup/SharePopup.js
+++ b/frontend/app/components/shared/SharePopup/SharePopup.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { toast } from 'react-toastify';
-import { Icon, Button, Popover } from 'UI';
+import { Icon, Button, Popover, Loader } from 'UI';
 import styles from './sharePopup.module.css';
 import IntegrateSlackButton from '../IntegrateSlackButton/IntegrateSlackButton';
 import SessionCopyLink from './SessionCopyLink';
@@ -29,12 +29,14 @@ export default class SharePopup extends React.PureComponent {
     loadingTeams: false,
   };
 
-  componentDidMount() {
-    if (this.props.channels.size === 0) {
-      this.props.fetchSlack();
-    }
-    if (this.props.msTeamsChannels.size === 0) {
-      this.props.fetchTeams();
+  componentDidUpdate() {
+    if (this.state.isOpen) {
+      if (this.props.channels.size === 0) {
+        this.props.fetchSlack();
+      }
+      if (this.props.msTeamsChannels.size === 0) {
+        this.props.fetchTeams();
+      }
     }
   }
 
@@ -76,7 +78,10 @@ export default class SharePopup extends React.PureComponent {
   };
 
   handleSuccess = (endpoint) => {
-    const obj = endpoint === 'Slack' ? { isOpen: false, comment: '', loadingSlack: false } : { isOpen: false, comment: '', loadingTeams: false }
+    const obj =
+      endpoint === 'Slack'
+        ? { isOpen: false, comment: '', loadingSlack: false }
+        : { isOpen: false, comment: '', loadingTeams: false };
     this.setState(obj);
     toast.success(`Sent to ${endpoint}.`);
   };
@@ -103,91 +108,104 @@ export default class SharePopup extends React.PureComponent {
 
     return (
       <Popover
+        onOpen={() => this.setState({ isOpen: true })}
+        onClose={() => this.setState({ isOpen: false })}
         render={() => (
           <div className={styles.wrapper}>
-            <div className={styles.header}>
-              <div className={cn(styles.title, 'text-lg')}>
-                Share this session link to Slack/MS Teams
-              </div>
-            </div>
-            {slackOptions.length > 0 || msTeamsOptions.length > 0 ? (
-              <div>
-                <div className={styles.body}>
-                  <textarea
-                    name="message"
-                    id="message"
-                    cols="30"
-                    rows="4"
-                    resize="none"
-                    onChange={this.editMessage}
-                    value={comment}
-                    placeholder="Add Message (Optional)"
-                    className="p-4 text-figmaColors-text-primary text-base"
-                  />
-
-                  {slackOptions.length > 0 && (
-                    <>
-                      <span>Share to slack</span>
-                      <div className="flex items-center justify-between mb-2">
-                        <Select
-                          options={slackOptions}
-                          defaultValue={channelId}
-                          onChange={this.changeSlackChannel}
-                          className="mr-4"
-                        />
-                        {this.state.channelId && (
-                          <Button onClick={this.shareToSlack} variant="primary">
-                            <div className="flex items-center">
-                              <Icon name="integrations/slack-bw" color="white" size="18" marginRight="10" />
-                              {loadingSlack ? 'Sending...' : 'Send'}
-                            </div>
-                          </Button>
-                        )}
-                      </div>
-                    </>
-                  )}
-                  {msTeamsOptions.length > 0 && (
-                    <>
-                      <span>Share to MS Teams</span>
-                      <div className="flex items-center justify-between">
-                        <Select
-                          options={msTeamsOptions}
-                          defaultValue={teamsChannel}
-                          onChange={this.changeTeamsChannel}
-                          className="mr-4"
-                        />
-                        {this.state.teamsChannel && (
-                          <Button onClick={this.shareToMSTeams} variant="primary">
-                            <div className="flex items-center">
-                              <Icon
-                                name="integrations/teams-white"
-                                color="white"
-                                size="18"
-                                marginRight="10"
-                              />
-                              {loadingTeams ? 'Sending...' : 'Send'}
-                            </div>
-                          </Button>
-                        )}
-                      </div>
-                    </>
-                  )}
-                </div>
-                <div className={styles.footer}>
-                  <SessionCopyLink />
-                </div>
-              </div>
-            ) : (
+            {this.state.loadingTeams || this.state.loadingSlack ? (
+              <Loader loading />
+            ) :(
               <>
-                <div className={styles.body}>
-                  <IntegrateSlackButton />
-                </div>
-                {showCopyLink && (
-                  <>
-                  <div className="border-t -mx-2" />
-                  <div>
-                    <SessionCopyLink />
+                <div className={styles.header}>
+                  <div className={cn(styles.title, 'text-lg')}>
+                    Share this session link to Slack/MS Teams
                   </div>
+                </div>
+                {slackOptions.length > 0 || msTeamsOptions.length > 0 ? (
+                  <div>
+                    <div className={styles.body}>
+                      <textarea
+                        name="message"
+                        id="message"
+                        cols="30"
+                        rows="4"
+                        resize="none"
+                        onChange={this.editMessage}
+                        value={comment}
+                        placeholder="Add Message (Optional)"
+                        className="p-4 text-figmaColors-text-primary text-base"
+                      />
+
+                      {slackOptions.length > 0 && (
+                        <>
+                          <span>Share to slack</span>
+                          <div className="flex items-center justify-between mb-2">
+                            <Select
+                              options={slackOptions}
+                              defaultValue={channelId}
+                              onChange={this.changeSlackChannel}
+                              className="mr-4"
+                            />
+                            {this.state.channelId && (
+                              <Button onClick={this.shareToSlack} variant="primary">
+                                <div className="flex items-center">
+                                  <Icon
+                                    name="integrations/slack-bw"
+                                    color="white"
+                                    size="18"
+                                    marginRight="10"
+                                  />
+                                  {loadingSlack ? 'Sending...' : 'Send'}
+                                </div>
+                              </Button>
+                            )}
+                          </div>
+                        </>
+                      )}
+                      {msTeamsOptions.length > 0 && (
+                        <>
+                          <span>Share to MS Teams</span>
+                          <div className="flex items-center justify-between">
+                            <Select
+                              options={msTeamsOptions}
+                              defaultValue={teamsChannel}
+                              onChange={this.changeTeamsChannel}
+                              className="mr-4"
+                            />
+                            {this.state.teamsChannel && (
+                              <Button onClick={this.shareToMSTeams} variant="primary">
+                                <div className="flex items-center">
+                                  <Icon
+                                    name="integrations/teams-white"
+                                    color="white"
+                                    size="18"
+                                    marginRight="10"
+                                  />
+                                  {loadingTeams ? 'Sending...' : 'Send'}
+                                </div>
+                              </Button>
+                            )}
+                          </div>
+                        </>
+                      )}
+                    </div>
+                    <div className={styles.footer}>
+                      <SessionCopyLink />
+                    </div>
+                  </div>
+                ) : (
+                  <>
+                    <div className={styles.body}>
+                      <IntegrateSlackButton />
+                    </div>
+                    {showCopyLink && (
+                      <>
+                        <div className="border-t -mx-2" />
+                        <div>
+                          <SessionCopyLink />
+                        </div>
+                      </>
+                    )}
                   </>
                 )}
               </>
diff --git a/frontend/app/components/ui/Popover/Popover.tsx b/frontend/app/components/ui/Popover/Popover.tsx
index d8a0e260f..8170df7fd 100644
--- a/frontend/app/components/ui/Popover/Popover.tsx
+++ b/frontend/app/components/ui/Popover/Popover.tsx
@@ -21,14 +21,17 @@ interface Props {
   placement?: Placement;
   children: JSX.Element;
   onOpen?: () => void;
+  onClose?: () => void;
 }
 
-const Popover = ({ children, render, placement, onOpen = () => {} }: Props) => {
+const Popover = ({ children, render, placement, onOpen, onClose }: Props) => {
   const [open, setOpen] = useState(false);
 
   useEffect(() => {
     if (open) {
-      onOpen();
+      onOpen?.();
+    } else {
+      onClose?.();
     }
   }, [open]);
 
diff --git a/frontend/app/player/web/WebLivePlayer.ts b/frontend/app/player/web/WebLivePlayer.ts
index ae512df43..709692d20 100644
--- a/frontend/app/player/web/WebLivePlayer.ts
+++ b/frontend/app/player/web/WebLivePlayer.ts
@@ -47,6 +47,7 @@ export default class WebLivePlayer extends WebPlayer {
     if (this.wpState.get().liveTimeTravel) {
       return
     }
+    let result = false;
     this.historyFileIsLoading = true
     this.messageManager.setMessagesLoading(true) // do it in one place. update unique  loading states each time instead
     this.messageManager.resetMessageManagers()
@@ -60,6 +61,7 @@ export default class WebLivePlayer extends WebPlayer {
       this.wpState.update({
         liveTimeTravel: true,
       })
+      result = true
       // here we need to update also lists state, if we gonna use them this.messageManager.onFileReadSuccess
     } catch(e) {
       toast.error('Error requesting a session file')
@@ -74,6 +76,7 @@ export default class WebLivePlayer extends WebPlayer {
 
     this.historyFileIsLoading = false
     this.messageManager.setMessagesLoading(false)
+    return result;
   }
 
   jumpToLive = () => {

From 8fe01ac46e9b5425f2a33505811d5a6f48035480 Mon Sep 17 00:00:00 2001
From: Alex Kaminskii <alex@openreplay.com>
Date: Mon, 6 Feb 2023 12:15:17 +0100
Subject: [PATCH 4/7] feat(tracker;player): use string dectionaries for
 attributes

---
 .../app/player/web/managers/DOM/DOMManager.ts | 65 ++++++++++++-------
 tracker/tracker/src/webworker/BatchWriter.ts  | 18 +++++
 .../tracker/src/webworker/StringDictionary.ts | 13 ++++
 3 files changed, 73 insertions(+), 23 deletions(-)
 create mode 100644 tracker/tracker/src/webworker/StringDictionary.ts

diff --git a/frontend/app/player/web/managers/DOM/DOMManager.ts b/frontend/app/player/web/managers/DOM/DOMManager.ts
index 198c096ad..559f45e27 100644
--- a/frontend/app/player/web/managers/DOM/DOMManager.ts
+++ b/frontend/app/player/web/managers/DOM/DOMManager.ts
@@ -43,6 +43,7 @@ export default class DOMManager extends ListWalker<Message> {
   private activeIframeRoots: Map<number, number> = new Map()
   private styleSheets: Map<number, CSSStyleSheet> = new Map()
   private ppStyleSheets: Map<number, PostponedStyleSheet> = new Map()
+  private stringDict: Record<string,string> = {}
 
 
   private upperBodyId: number = -1;
@@ -134,6 +135,31 @@ export default class DOMManager extends ListWalker<Message> {
     parent.insertChildAt(child, index)
   }
 
+  private setNodeAttribute(msg: { id: number, name: string, value: string }) {
+    let { name, value } = msg;
+    const vn = this.vElements.get(msg.id)
+    if (!vn) { logger.error("Node not found", msg); return }
+    if (vn.node.tagName === "INPUT" && name === "name") {
+      // Otherwise binds local autocomplete values (maybe should ignore on the tracker level)
+      return
+    }
+    if (name === "href" && vn.node.tagName === "LINK") {
+      // @ts-ignore  ?global ENV type   // It've been done on backend (remove after testing in saas)
+      // if (value.startsWith(window.env.ASSETS_HOST || window.location.origin + '/assets')) {
+      //   value = value.replace("?", "%3F");
+      // }
+      if (!value.startsWith("http")) { return }
+      // blob:... value happened here. https://foss.openreplay.com/3/session/7013553567419137
+      // that resulted in that link being unable to load and having 4sec timeout in the below function.
+      this.stylesManager.setStyleHandlers(vn.node as HTMLLinkElement, value);
+    }
+    if (vn.node.namespaceURI === 'http://www.w3.org/2000/svg' && value.startsWith("url(")) {
+      value = "url(#" + (value.split("#")[1] ||")")
+    }
+    vn.setAttribute(name, value)
+    this.removeBodyScroll(msg.id, vn)
+  }
+
   private applyMessage = (msg: Message): Promise<any> | undefined => {
     let node: Node | undefined
     let vn: VNode | undefined
@@ -160,10 +186,11 @@ export default class DOMManager extends ListWalker<Message> {
         this.vRoots.clear()
         this.vRoots.set(0, vDoc) // watchout: id==0 for both Document and documentElement
         // this is done for the AdoptedCSS logic
-        // todo: start from 0 (sync logic with tracker)
+        // todo: start from 0-node (sync logic with tracker)
         this.vTexts.clear()
         this.stylesManager.reset()
         this.activeIframeRoots.clear()
+        this.stringDict = {}
         return
       case MType.CreateTextNode:
         vn = new VText()
@@ -200,28 +227,20 @@ export default class DOMManager extends ListWalker<Message> {
         vn.parentNode.removeChild(vn)
         return
       case MType.SetNodeAttribute:
-        let { name, value } = msg;
-        vn = this.vElements.get(msg.id)
-        if (!vn) { logger.error("Node not found", msg); return }
-        if (vn.node.tagName === "INPUT" && name === "name") {
-          // Otherwise binds local autocomplete values (maybe should ignore on the tracker level)
-          return
-        }
-        if (name === "href" && vn.node.tagName === "LINK") {
-          // @ts-ignore  ?global ENV type   // It've been done on backend (remove after testing in saas)
-          // if (value.startsWith(window.env.ASSETS_HOST || window.location.origin + '/assets')) {
-          //   value = value.replace("?", "%3F");
-          // }
-          if (!value.startsWith("http")) { return }
-          // blob:... value happened here. https://foss.openreplay.com/3/session/7013553567419137
-          // that resulted in that link being unable to load and having 4sec timeout in the below function.
-          this.stylesManager.setStyleHandlers(vn.node as HTMLLinkElement, value);
-        }
-        if (vn.node.namespaceURI === 'http://www.w3.org/2000/svg' && value.startsWith("url(")) {
-          value = "url(#" + (value.split("#")[1] ||")")
-        }
-        vn.setAttribute(name, value)
-        this.removeBodyScroll(msg.id, vn)
+        this.setNodeAttribute(msg)
+        return
+      case MType.StringDict:
+        this.stringDict[msg.key] = msg.value
+        return
+      case MType.SetNodeAttributeDict:
+        this.stringDict[msg.name] === undefined && logger.error("No dictionary key for msg 'name': ", msg)
+        this.stringDict[msg.value] === undefined  && logger.error("No dictionary key for msg 'value': ", msg)
+        if (!this.stringDict[msg.name] || !this.stringDict[msg.value]) { return }
+        this.setNodeAttribute({ 
+          id: msg.id,
+          name: this.stringDict[msg.name],
+          value: this.stringDict[msg.value],
+        })
         return
       case MType.RemoveNodeAttribute:
         vn = this.vElements.get(msg.id)
diff --git a/tracker/tracker/src/webworker/BatchWriter.ts b/tracker/tracker/src/webworker/BatchWriter.ts
index 167c1aff6..b08b71416 100644
--- a/tracker/tracker/src/webworker/BatchWriter.ts
+++ b/tracker/tracker/src/webworker/BatchWriter.ts
@@ -1,6 +1,7 @@
 import type Message from '../common/messages.gen.js'
 import * as Messages from '../common/messages.gen.js'
 import MessageEncoder from './MessageEncoder.gen.js'
+import StringDictionary from './StringDictionary.js'
 
 const SIZE_BYTES = 3
 const MAX_M_SIZE = (1 << (SIZE_BYTES * 8)) - 1
@@ -9,6 +10,7 @@ export default class BatchWriter {
   private nextIndex = 0
   private beaconSize = 2 * 1e5 // Default 200kB
   private encoder = new MessageEncoder(this.beaconSize)
+  private strDict = new StringDictionary()
   private readonly sizeBuffer = new Uint8Array(SIZE_BYTES)
   private isEmpty = true
 
@@ -84,6 +86,14 @@ export default class BatchWriter {
     this.beaconSizeLimit = limit
   }
 
+  private applyDict(str: string): string {
+    const [key, isNew] = this.strDict.getKey(str)
+    if (isNew) {
+      this.writeMessage([Messages.Type.StringDict, key, str])
+    }
+    return key
+  }
+
   writeMessage(message: Message) {
     if (message[0] === Messages.Type.Timestamp) {
       this.timestamp = message[1] // .timestamp
@@ -91,6 +101,14 @@ export default class BatchWriter {
     if (message[0] === Messages.Type.SetPageLocation) {
       this.url = message[1] // .url
     }
+    if (message[0] === Messages.Type.SetNodeAttribute) {
+      message = [
+        Messages.Type.SetNodeAttributeDict,
+        message[1],
+        this.applyDict(message[2]),
+        this.applyDict(message[3]),
+      ] as Messages.SetNodeAttributeDict
+    }
     if (this.writeWithSize(message)) {
       return
     }
diff --git a/tracker/tracker/src/webworker/StringDictionary.ts b/tracker/tracker/src/webworker/StringDictionary.ts
new file mode 100644
index 000000000..52632c9f0
--- /dev/null
+++ b/tracker/tracker/src/webworker/StringDictionary.ts
@@ -0,0 +1,13 @@
+export default class StringDictionary {
+  private idx = 0
+  private backDict: Record<string, string> = {}
+
+  getKey(str: string): [string, boolean] {
+    let isNew = false
+    if (!this.backDict[str]) {
+      isNew = true
+      this.backDict[str] = `${this.idx++}`
+    }
+    return [this.backDict[str], isNew]
+  }
+}

From e0ea7d511fd9772e5d4586e505725f98132e4f44 Mon Sep 17 00:00:00 2001
From: Alex Kaminskii <alex@openreplay.com>
Date: Mon, 6 Feb 2023 12:30:48 +0100
Subject: [PATCH 5/7] fix(message-protocol;tracker;player): use uint for
 StringDict keys

---
 backend/pkg/messages/messages.go               | 18 +++++++++---------
 backend/pkg/messages/read-message.go           |  6 +++---
 ee/connectors/msgcodec/messages.py             |  6 +++---
 ee/connectors/msgcodec/msgcodec.py             |  6 +++---
 .../app/player/web/managers/DOM/DOMManager.ts  | 12 ++++++------
 .../web/messages/RawMessageReader.gen.ts       | 10 +++++-----
 frontend/app/player/web/messages/raw.gen.ts    |  6 +++---
 .../app/player/web/messages/tracker.gen.ts     | 10 +++++-----
 mobs/messages.rb                               |  6 +++---
 tracker/tracker/src/common/messages.gen.ts     |  6 +++---
 tracker/tracker/src/main/app/messages.gen.ts   | 10 +++++-----
 tracker/tracker/src/webworker/BatchWriter.ts   |  2 +-
 .../src/webworker/MessageEncoder.gen.ts        |  4 ++--
 .../tracker/src/webworker/StringDictionary.ts  |  6 +++---
 14 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/backend/pkg/messages/messages.go b/backend/pkg/messages/messages.go
index e778f812c..a96f98de8 100644
--- a/backend/pkg/messages/messages.go
+++ b/backend/pkg/messages/messages.go
@@ -1320,15 +1320,15 @@ func (msg *PerformanceTrack) TypeID() int {
 
 type StringDict struct {
 	message
-	Key   string
+	Key   uint64
 	Value string
 }
 
 func (msg *StringDict) Encode() []byte {
-	buf := make([]byte, 21+len(msg.Key)+len(msg.Value))
+	buf := make([]byte, 21+len(msg.Value))
 	buf[0] = 50
 	p := 1
-	p = WriteString(msg.Key, buf, p)
+	p = WriteUint(msg.Key, buf, p)
 	p = WriteString(msg.Value, buf, p)
 	return buf[:p]
 }
@@ -1343,18 +1343,18 @@ func (msg *StringDict) TypeID() int {
 
 type SetNodeAttributeDict struct {
 	message
-	ID    uint64
-	Name  string
-	Value string
+	ID       uint64
+	NameKey  uint64
+	ValueKey uint64
 }
 
 func (msg *SetNodeAttributeDict) Encode() []byte {
-	buf := make([]byte, 31+len(msg.Name)+len(msg.Value))
+	buf := make([]byte, 31)
 	buf[0] = 51
 	p := 1
 	p = WriteUint(msg.ID, buf, p)
-	p = WriteString(msg.Name, buf, p)
-	p = WriteString(msg.Value, buf, p)
+	p = WriteUint(msg.NameKey, buf, p)
+	p = WriteUint(msg.ValueKey, buf, p)
 	return buf[:p]
 }
 
diff --git a/backend/pkg/messages/read-message.go b/backend/pkg/messages/read-message.go
index 0531c7d1c..ecc00183f 100644
--- a/backend/pkg/messages/read-message.go
+++ b/backend/pkg/messages/read-message.go
@@ -795,7 +795,7 @@ func DecodePerformanceTrack(reader BytesReader) (Message, error) {
 func DecodeStringDict(reader BytesReader) (Message, error) {
 	var err error = nil
 	msg := &StringDict{}
-	if msg.Key, err = reader.ReadString(); err != nil {
+	if msg.Key, err = reader.ReadUint(); err != nil {
 		return nil, err
 	}
 	if msg.Value, err = reader.ReadString(); err != nil {
@@ -810,10 +810,10 @@ func DecodeSetNodeAttributeDict(reader BytesReader) (Message, error) {
 	if msg.ID, err = reader.ReadUint(); err != nil {
 		return nil, err
 	}
-	if msg.Name, err = reader.ReadString(); err != nil {
+	if msg.NameKey, err = reader.ReadUint(); err != nil {
 		return nil, err
 	}
-	if msg.Value, err = reader.ReadString(); err != nil {
+	if msg.ValueKey, err = reader.ReadUint(); err != nil {
 		return nil, err
 	}
 	return msg, err
diff --git a/ee/connectors/msgcodec/messages.py b/ee/connectors/msgcodec/messages.py
index 1df1b06a8..54f8df955 100644
--- a/ee/connectors/msgcodec/messages.py
+++ b/ee/connectors/msgcodec/messages.py
@@ -464,10 +464,10 @@ class StringDict(Message):
 class SetNodeAttributeDict(Message):
     __id__ = 51
 
-    def __init__(self, id, name, value):
+    def __init__(self, id, name_key, value_key):
         self.id = id
-        self.name = name
-        self.value = value
+        self.name_key = name_key
+        self.value_key = value_key
 
 
 class DOMDrop(Message):
diff --git a/ee/connectors/msgcodec/msgcodec.py b/ee/connectors/msgcodec/msgcodec.py
index 36d297998..0ba21ea12 100644
--- a/ee/connectors/msgcodec/msgcodec.py
+++ b/ee/connectors/msgcodec/msgcodec.py
@@ -433,15 +433,15 @@ class MessageCodec(Codec):
 
         if message_id == 50:
             return StringDict(
-                key=self.read_string(reader),
+                key=self.read_uint(reader),
                 value=self.read_string(reader)
             )
 
         if message_id == 51:
             return SetNodeAttributeDict(
                 id=self.read_uint(reader),
-                name=self.read_string(reader),
-                value=self.read_string(reader)
+                name_key=self.read_uint(reader),
+                value_key=self.read_uint(reader)
             )
 
         if message_id == 52:
diff --git a/frontend/app/player/web/managers/DOM/DOMManager.ts b/frontend/app/player/web/managers/DOM/DOMManager.ts
index 559f45e27..bb4c999ae 100644
--- a/frontend/app/player/web/managers/DOM/DOMManager.ts
+++ b/frontend/app/player/web/managers/DOM/DOMManager.ts
@@ -43,7 +43,7 @@ export default class DOMManager extends ListWalker<Message> {
   private activeIframeRoots: Map<number, number> = new Map()
   private styleSheets: Map<number, CSSStyleSheet> = new Map()
   private ppStyleSheets: Map<number, PostponedStyleSheet> = new Map()
-  private stringDict: Record<string,string> = {}
+  private stringDict: Record<number,string> = {}
 
 
   private upperBodyId: number = -1;
@@ -233,13 +233,13 @@ export default class DOMManager extends ListWalker<Message> {
         this.stringDict[msg.key] = msg.value
         return
       case MType.SetNodeAttributeDict:
-        this.stringDict[msg.name] === undefined && logger.error("No dictionary key for msg 'name': ", msg)
-        this.stringDict[msg.value] === undefined  && logger.error("No dictionary key for msg 'value': ", msg)
-        if (!this.stringDict[msg.name] || !this.stringDict[msg.value]) { return }
+        this.stringDict[msg.nameKey] === undefined && logger.error("No dictionary key for msg 'name': ", msg)
+        this.stringDict[msg.valueKey] === undefined && logger.error("No dictionary key for msg 'value': ", msg)
+        if (this.stringDict[msg.nameKey] === undefined || this.stringDict[msg.valueKey] === undefined ) { return }
         this.setNodeAttribute({ 
           id: msg.id,
-          name: this.stringDict[msg.name],
-          value: this.stringDict[msg.value],
+          name: this.stringDict[msg.nameKey],
+          value: this.stringDict[msg.valueKey],
         })
         return
       case MType.RemoveNodeAttribute:
diff --git a/frontend/app/player/web/messages/RawMessageReader.gen.ts b/frontend/app/player/web/messages/RawMessageReader.gen.ts
index f76f9fb36..793f609f5 100644
--- a/frontend/app/player/web/messages/RawMessageReader.gen.ts
+++ b/frontend/app/player/web/messages/RawMessageReader.gen.ts
@@ -372,7 +372,7 @@ export default class RawMessageReader extends PrimitiveReader {
     }
 
     case 50: {
-      const key = this.readString(); if (key === null) { return resetPointer() }
+      const key = this.readUint(); if (key === null) { return resetPointer() }
       const value = this.readString(); if (value === null) { return resetPointer() }
       return {
         tp: MType.StringDict,
@@ -383,13 +383,13 @@ export default class RawMessageReader extends PrimitiveReader {
 
     case 51: {
       const id = this.readUint(); if (id === null) { return resetPointer() }
-      const name = this.readString(); if (name === null) { return resetPointer() }
-      const value = this.readString(); if (value === null) { return resetPointer() }
+      const nameKey = this.readUint(); if (nameKey === null) { return resetPointer() }
+      const valueKey = this.readUint(); if (valueKey === null) { return resetPointer() }
       return {
         tp: MType.SetNodeAttributeDict,
         id,
-        name,
-        value,
+        nameKey,
+        valueKey,
       };
     }
 
diff --git a/frontend/app/player/web/messages/raw.gen.ts b/frontend/app/player/web/messages/raw.gen.ts
index 517bdc834..b51edb40e 100644
--- a/frontend/app/player/web/messages/raw.gen.ts
+++ b/frontend/app/player/web/messages/raw.gen.ts
@@ -271,15 +271,15 @@ export interface RawPerformanceTrack {
 
 export interface RawStringDict {
   tp: MType.StringDict,
-  key: string,
+  key: number,
   value: string,
 }
 
 export interface RawSetNodeAttributeDict {
   tp: MType.SetNodeAttributeDict,
   id: number,
-  name: string,
-  value: string,
+  nameKey: number,
+  valueKey: number,
 }
 
 export interface RawResourceTiming {
diff --git a/frontend/app/player/web/messages/tracker.gen.ts b/frontend/app/player/web/messages/tracker.gen.ts
index 220c4f3da..2c171011c 100644
--- a/frontend/app/player/web/messages/tracker.gen.ts
+++ b/frontend/app/player/web/messages/tracker.gen.ts
@@ -260,15 +260,15 @@ type TrPerformanceTrack = [
 
 type TrStringDict = [
   type: 50,
-  key: string,
+  key: number,
   value: string,
 ]
 
 type TrSetNodeAttributeDict = [
   type: 51,
   id: number,
-  name: string,
-  value: string,
+  nameKey: number,
+  valueKey: number,
 ]
 
 type TrResourceTiming = [
@@ -705,8 +705,8 @@ export default function translate(tMsg: TrackerMessage): RawMessage | null {
       return {
         tp: MType.SetNodeAttributeDict,
         id: tMsg[1],
-        name: tMsg[2],
-        value: tMsg[3],
+        nameKey: tMsg[2],
+        valueKey: tMsg[3],
       }
     }
     
diff --git a/mobs/messages.rb b/mobs/messages.rb
index ab1b29c00..ef36ebfa7 100644
--- a/mobs/messages.rb
+++ b/mobs/messages.rb
@@ -279,14 +279,14 @@ message 49, 'PerformanceTrack' do  #, :replayer => :devtools --> requires player
 end
 # since 4.1.9
 message 50, "StringDict" do
-  string "Key"
+  uint "Key"
   string "Value"
 end
 # since 4.1.9
 message 51, "SetNodeAttributeDict" do
   uint 'ID'
-  string 'Name'
-  string 'Value'
+  uint 'NameKey'
+  uint 'ValueKey'
 end
 
 ## 50,51
diff --git a/tracker/tracker/src/common/messages.gen.ts b/tracker/tracker/src/common/messages.gen.ts
index 66a1c5c7b..8f61ab917 100644
--- a/tracker/tracker/src/common/messages.gen.ts
+++ b/tracker/tracker/src/common/messages.gen.ts
@@ -321,15 +321,15 @@ export type PerformanceTrack = [
 
 export type StringDict = [
   /*type:*/ Type.StringDict,
-  /*key:*/ string,
+  /*key:*/ number,
   /*value:*/ string,
 ]
 
 export type SetNodeAttributeDict = [
   /*type:*/ Type.SetNodeAttributeDict,
   /*id:*/ number,
-  /*name:*/ string,
-  /*value:*/ string,
+  /*nameKey:*/ number,
+  /*valueKey:*/ number,
 ]
 
 export type ResourceTiming = [
diff --git a/tracker/tracker/src/main/app/messages.gen.ts b/tracker/tracker/src/main/app/messages.gen.ts
index d3a7c3b08..bdec57a0f 100644
--- a/tracker/tracker/src/main/app/messages.gen.ts
+++ b/tracker/tracker/src/main/app/messages.gen.ts
@@ -475,7 +475,7 @@ export function PerformanceTrack(
 }
 
 export function StringDict(
-  key: string,
+  key: number,
   value: string,
 ): Messages.StringDict {
   return [
@@ -487,14 +487,14 @@ export function StringDict(
 
 export function SetNodeAttributeDict(
   id: number,
-  name: string,
-  value: string,
+  nameKey: number,
+  valueKey: number,
 ): Messages.SetNodeAttributeDict {
   return [
     Messages.Type.SetNodeAttributeDict,
     id,
-    name,
-    value,
+    nameKey,
+    valueKey,
   ]
 }
 
diff --git a/tracker/tracker/src/webworker/BatchWriter.ts b/tracker/tracker/src/webworker/BatchWriter.ts
index b08b71416..d9275ada3 100644
--- a/tracker/tracker/src/webworker/BatchWriter.ts
+++ b/tracker/tracker/src/webworker/BatchWriter.ts
@@ -86,7 +86,7 @@ export default class BatchWriter {
     this.beaconSizeLimit = limit
   }
 
-  private applyDict(str: string): string {
+  private applyDict(str: string): number {
     const [key, isNew] = this.strDict.getKey(str)
     if (isNew) {
       this.writeMessage([Messages.Type.StringDict, key, str])
diff --git a/tracker/tracker/src/webworker/MessageEncoder.gen.ts b/tracker/tracker/src/webworker/MessageEncoder.gen.ts
index 5bd3f6a01..e6e522dd4 100644
--- a/tracker/tracker/src/webworker/MessageEncoder.gen.ts
+++ b/tracker/tracker/src/webworker/MessageEncoder.gen.ts
@@ -159,11 +159,11 @@ export default class MessageEncoder extends PrimitiveEncoder {
     break
 
     case Messages.Type.StringDict:
-      return  this.string(msg[1]) && this.string(msg[2])
+      return  this.uint(msg[1]) && this.string(msg[2])
     break
 
     case Messages.Type.SetNodeAttributeDict:
-      return  this.uint(msg[1]) && this.string(msg[2]) && this.string(msg[3])
+      return  this.uint(msg[1]) && this.uint(msg[2]) && this.uint(msg[3])
     break
 
     case Messages.Type.ResourceTiming:
diff --git a/tracker/tracker/src/webworker/StringDictionary.ts b/tracker/tracker/src/webworker/StringDictionary.ts
index 52632c9f0..1d968af4a 100644
--- a/tracker/tracker/src/webworker/StringDictionary.ts
+++ b/tracker/tracker/src/webworker/StringDictionary.ts
@@ -1,12 +1,12 @@
 export default class StringDictionary {
   private idx = 0
-  private backDict: Record<string, string> = {}
+  private backDict: Record<string, number> = {}
 
-  getKey(str: string): [string, boolean] {
+  getKey(str: string): [number, boolean] {
     let isNew = false
     if (!this.backDict[str]) {
       isNew = true
-      this.backDict[str] = `${this.idx++}`
+      this.backDict[str] = this.idx++
     }
     return [this.backDict[str], isNew]
   }

From 8ab23b1f19ad57113f6caf1df8b3afe95dbb39e0 Mon Sep 17 00:00:00 2001
From: Alex Kaminskii <alex@openreplay.com>
Date: Mon, 6 Feb 2023 16:09:16 +0100
Subject: [PATCH 6/7] feat(tracker): unit tests for StringDictionary

---
 tracker/tracker/src/webworker/StringDictionary.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tracker/tracker/src/webworker/StringDictionary.ts b/tracker/tracker/src/webworker/StringDictionary.ts
index 1d968af4a..b183ce862 100644
--- a/tracker/tracker/src/webworker/StringDictionary.ts
+++ b/tracker/tracker/src/webworker/StringDictionary.ts
@@ -1,5 +1,5 @@
 export default class StringDictionary {
-  private idx = 0
+  private idx = 1
   private backDict: Record<string, number> = {}
 
   getKey(str: string): [number, boolean] {

From 0c2a273074a8ec0a887b6e6dc220984949b98cc8 Mon Sep 17 00:00:00 2001
From: Alex Kaminskii <alex@openreplay.com>
Date: Mon, 6 Feb 2023 16:31:56 +0100
Subject: [PATCH 7/7] fixup! feat(tracker): unit tests for StringDictionary

---
 .../webworker/StringDictionary.unit.test.ts   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tracker/tracker/src/webworker/StringDictionary.unit.test.ts

diff --git a/tracker/tracker/src/webworker/StringDictionary.unit.test.ts b/tracker/tracker/src/webworker/StringDictionary.unit.test.ts
new file mode 100644
index 000000000..8bf17e14b
--- /dev/null
+++ b/tracker/tracker/src/webworker/StringDictionary.unit.test.ts
@@ -0,0 +1,33 @@
+import { describe, expect, test, jest, beforeEach, afterEach } from '@jest/globals'
+import StringDictionary from './StringDictionary.js'
+
+describe('StringDictionary', () => {
+  test('key is non-zero', () => {
+    const dict = new StringDictionary()
+
+    const [key, isNew] = dict.getKey('We are Asayer')
+
+    expect(key).not.toBe(0)
+    expect(isNew).toBe(true)
+  })
+
+  test('Different strings have different keys', () => {
+    const dict = new StringDictionary()
+
+    const [key1, isNew1] = dict.getKey('Datadog')
+    const [key2, isNew2] = dict.getKey('PostHog')
+
+    expect(key1).not.toBe(key2)
+    expect(isNew2).toBe(true)
+  })
+
+  test('Similar strings have similar keys', () => {
+    const dict = new StringDictionary()
+
+    const [key1, isNew1] = dict.getKey("What's up?")
+    const [key2, isNew2] = dict.getKey("What's up?")
+
+    expect(key1).toBe(key2)
+    expect(isNew2).toBe(false)
+  })
+})