Store stable buffer ID as a string

In WeeChat, the buffer ID is of type `long long`, which cannot be safely represented as a JavaScript number. BigInt can't be serialized, so we store the ID as a string.
mhoran · Dec 12, 2024 · 2931ab9 · 2931ab9
1 parent 6b3f9d9
commit 2931ab9
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/__tests__/lib/weechat/action_transformer.ts b/__tests__/lib/weechat/action_transformer.ts
@@ -149,7 +149,7 @@ describe('transformToReduxAction', () => {
 
       expect(store.getState().buffers).toHaveProperty('83a41cd80');
       const buffer = store.getState().buffers['83a41cd80'];
-      expect(buffer._id).toEqual(1730555173010842);
+      expect(buffer._id).toEqual('1730555173010842');
     });
 
     it('defaults _id to the buffer pointer', () => {
@@ -175,7 +175,7 @@ describe('transformToReduxAction', () => {
 
       expect(store.getState().buffers).toHaveProperty('83a41cd80');
       const buffer = store.getState().buffers['83a41cd80'];
-      expect(buffer._id).toEqual(parseInt('83a41cd80', 16));
+      expect(buffer._id).toEqual(BigInt('0x83a41cd80').toString());
     });
   });
 
@@ -203,7 +203,7 @@ describe('transformToReduxAction', () => {
 
       expect(store.getState().buffers).toHaveProperty('83a41cd80');
       const buffer = store.getState().buffers['83a41cd80'];
-      expect(buffer._id).toEqual(1730555173010842);
+      expect(buffer._id).toEqual('1730555173010842');
     });
 
     it('defaults _id to the buffer pointer', () => {
@@ -229,7 +229,7 @@ describe('transformToReduxAction', () => {
 
       expect(store.getState().buffers).toHaveProperty('83a41cd80');
       const buffer = store.getState().buffers['83a41cd80'];
-      expect(buffer._id).toEqual(parseInt('83a41cd80', 16));
+      expect(buffer._id).toEqual(BigInt('0x83a41cd80').toString());
     });
   });
 

diff --git a/__tests__/store/listeners.ts b/__tests__/store/listeners.ts
@@ -19,7 +19,7 @@ describe(PendingBufferNotificationListener, () => {
       preloadedState: {
         buffers: {
           ['83a41cd80']: {
-            _id: 1730555173010842,
+            _id: '1730555173010842',
             full_name: 'irc.libera.#weechat',
             hidden: 0,
             id: '83a41cd80',
@@ -50,7 +50,7 @@ describe(PendingBufferNotificationListener, () => {
     store.dispatch(
       actions.pendingBufferNotificationAction({
         identifier: '1fb4fc1d-530b-466f-85be-de27772de0a9',
-        bufferId: 1730555173010842,
+        bufferId: '1730555173010842',
         lineId: 0
       })
     );
@@ -88,15 +88,15 @@ describe(PendingBufferNotificationListener, () => {
     store.dispatch(
       actions.pendingBufferNotificationAction({
         identifier: '1fb4fc1d-530b-466f-85be-de27772de0a9',
-        bufferId: 1730555173010842,
+        bufferId: '1730555173010842',
         lineId: 0
       })
     );
 
     store.dispatch(
       actions.fetchBuffersAction({
         ['83a41cd80']: {
-          _id: 1730555173010842,
+          _id: '1730555173010842',
           full_name: 'irc.libera.#weechat',
           hidden: 0,
           id: '83a41cd80',
@@ -146,7 +146,7 @@ describe(PendingBufferNotificationListener, () => {
     store.dispatch(
       actions.pendingBufferNotificationAction({
         identifier: '1fb4fc1d-530b-466f-85be-de27772de0a9',
-        bufferId: 1730555173010842,
+        bufferId: '1730555173010842',
         lineId: 0
       })
     );

diff --git a/__tests__/usecase/App.tsx b/__tests__/usecase/App.tsx
@@ -20,7 +20,7 @@ describe('App', () => {
         preloadedState: {
           buffers: {
             [bufferId]: {
-              _id: 1730555173010842,
+              _id: '1730555173010842',
               full_name: 'irc.libera.#weechat',
               hidden: 0,
               id: bufferId,
@@ -78,7 +78,7 @@ describe('App', () => {
         preloadedState: {
           buffers: {
             [bufferId]: {
-              _id: 1730555173010842,
+              _id: '1730555173010842',
               full_name: 'irc.libera.#weechat',
               hidden: 0,
               id: bufferId,

diff --git a/__tests__/usecase/buffers/ui/BufferContainer.tsx b/__tests__/usecase/buffers/ui/BufferContainer.tsx
@@ -21,7 +21,7 @@ describe('BufferContainer', () => {
       preloadedState: {
         buffers: {
           [bufferId]: {
-            _id: 1730555173010842,
+            _id: '1730555173010842',
             full_name: 'irc.libera.#weechat',
             hidden: 0,
             id: bufferId,
@@ -114,7 +114,7 @@ describe('BufferContainer', () => {
       preloadedState: {
         buffers: {
           [bufferId]: {
-            _id: 1730555173010842,
+            _id: '1730555173010842',
             full_name: 'irc.libera.#weechat',
             hidden: 0,
             id: bufferId,

diff --git a/src/lib/weechat/action_transformer.ts b/src/lib/weechat/action_transformer.ts
@@ -114,8 +114,8 @@ export const transformToReduxAction = (
       const buffer = object.content[0];
       buffer._id =
         buffer.id !== undefined
-          ? parseInt(buffer.id)
-          : parseInt(buffer.pointers[0], 16);
+          ? buffer.id
+          : BigInt(`0x${buffer.pointers[0]}`).toString();
       buffer.id = buffer.pointers[0];
 
       return actions.bufferOpenedAction(buffer);
@@ -201,8 +201,8 @@ export const transformToReduxAction = (
             id: buf.pointers[0],
             _id:
               buf.id !== undefined
-                ? parseInt(buf.id)
-                : parseInt(buf.pointers[0], 16)
+                ? buf.id
+                : BigInt(`0x${buf.pointers[0]}`).toString()
           })
         );
         const removed = Object.keys(buffers).filter((buffer) => {

diff --git a/src/lib/weechat/types.d.ts b/src/lib/weechat/types.d.ts
@@ -18,7 +18,7 @@ interface WeechatInfoList {
 
 interface WeechatBuffer {
   id: string;
-  _id: number;
+  _id: string;
   pointers: string[];
   local_variables: Localvariables;
   notify: number;

diff --git a/src/store/actions.ts b/src/store/actions.ts
@@ -21,7 +21,7 @@ export const changeCurrentBufferAction = createAction<string>(
 
 export const pendingBufferNotificationAction = createAction<{
   identifier: string;
-  bufferId: number;
+  bufferId: string;
   lineId: number;
 }>('PENDING_BUFFER_NOTIFICATION');
 export const bufferNotificationAction = createAction<{

diff --git a/src/usecase/Root.tsx b/src/usecase/Root.tsx
@@ -60,7 +60,7 @@ export default class WeechatNative extends React.Component<null, State> {
       store.dispatch(
         actions.pendingBufferNotificationAction({
           identifier: request.identifier,
-          bufferId: Number(bufferId),
+          bufferId: BigInt(bufferId as string).toString(),
           lineId: Number(lineId)
         })
       );