remove dep on Buffer (#25980)

Author: chrisnojima

protocol/bin/flow.js

@@ -477,7 +477,7 @@ ${project.import.map(n => importMap[n] || '').join('\n')}
 ${project.import.map(n => `export {${n}}`).join('\n')}
 export type Bool = boolean
 export type Boolean = boolean
-export type Bytes = Buffer
+export type Bytes = Uint8Array
 export type Double = number
 export type Int = number
 export type Int64 = number

rnmodules/react-native-kb/android/CMakeLists.txt

@@ -16,7 +16,7 @@ message(INFO "params: ${NODE_MODULES_DIR}")
 # Specifies a path to native header files.
 include_directories(
    ../cpp
-   "${NODE_MODULES_DIR}/msgpack-cxx-4.1.1/include"
+   "${NODE_MODULES_DIR}/msgpack-cxx-6.1.0/include"
 )
 
 set_target_properties(

rnmodules/react-native-kb/cpp/react-native-kb.cpp

@@ -78,21 +78,19 @@ Value convertMPToJSI(Runtime &runtime, msgpack::object &o) {
   case msgpack::type::BIN: {
     auto ptr = o.via.bin.ptr;
     int size = o.via.bin.size;
-    // make ArrayBuffer and copy in data
-    Function arrayBufferCtor =
-        runtime.global().getPropertyAsFunction(runtime, "ArrayBuffer");
-    Value ab = arrayBufferCtor.callAsConstructor(runtime, size);
-    Object abo = ab.getObject(runtime);
-    ArrayBuffer abbuf = abo.getArrayBuffer(runtime);
-    std::copy(ptr, ptr + size, abbuf.data(runtime));
-
-    // Wrap in Buffer like framed-msg-pack
-    Object bufObj = runtime.global().getPropertyAsObject(runtime, "Buffer");
-    Function bufFrom = bufObj.getPropertyAsFunction(runtime, "from");
-    Value buf = bufFrom.callWithThis(
-        runtime, bufObj,
-        std::move(ab)); // Buffer shares the memory and just wraps
-    return buf;
+    
+      // make ArrayBuffer and copy in data
+      Function arrayBufferCtor =
+          runtime.global().getPropertyAsFunction(runtime, "ArrayBuffer");
+      Value ab = arrayBufferCtor.callAsConstructor(runtime, size);
+      Object abo = ab.getObject(runtime);
+      ArrayBuffer abbuf = abo.getArrayBuffer(runtime);
+      std::copy(ptr, ptr + size, abbuf.data(runtime));
+  
+      // Wrap in Uint8Array
+      Function uCtor = runtime.global().getPropertyAsFunction(runtime, "Uint8Array");
+      Value uc = uCtor.callAsConstructor(runtime, std::move(abbuf));
+      return uc;
   }
   case msgpack::type::ARRAY: {
     auto size = o.via.array.size;

rnmodules/react-native-kb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-kb",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "misc kb",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

rnmodules/react-native-kb/react-native-kb.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
     s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
     s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" $(PODS_ROOT)/../../node_modules/msgpack-cxx-4.1.1/include $(PODS_ROOT)/../keybase.xcframework/ios-arm64/Keybase.framework/Headers",
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" $(PODS_ROOT)/../../node_modules/msgpack-cxx-6.1.0/include $(PODS_ROOT)/../keybase.xcframework/ios-arm64/Keybase.framework/Headers",
         "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DMSGPACK_NO_BOOST=1",
         "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
     }
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
     s.dependency "ReactCommon/turbomodule/core"
   else
     s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" $(PODS_ROOT)/../../node_modules/msgpack-cxx-4.1.1/include $(PODS_ROOT)/../keybase.xcframework/ios-arm64/Keybase.framework/Headers",
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" $(PODS_ROOT)/../../node_modules/msgpack-cxx-6.1.0/include $(PODS_ROOT)/../keybase.xcframework/ios-arm64/Keybase.framework/Headers",
         "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DMSGPACK_NO_BOOST=1",
         "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
     }

shared/app/globals.native.tsx

@@ -2,10 +2,7 @@
 // >>>>>>>>>>>>>>>>>>>>>>>      DO NOT REORDER ANYTHING in this file      <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 // This is supposed to bootstrap / polyfill / fixup the app. Do NOT add things here or change things unless you really know
 // what's happening
-//
-// Needed for purepack
-// @ts-ignore
-globalThis.buffer = global.Buffer = window.Buffer = require('buffer/').Buffer
+import 'fastestsmallesttextencoderdecoder'
 __FILE_SUFFIX__ = ''
 __PROFILE__ = false
 __HOT__ = false

shared/chat/conversation/fwd-msg/team-picker.tsx

@@ -20,7 +20,7 @@ const TeamPicker = (props: Props) => {
   const message = C.useChatContext(s => s.messageMap.get(ordinal))
   const [pickerState, setPickerState] = React.useState<PickerState>('picker')
   const [term, setTerm] = React.useState('')
-  const dstConvIDRef = React.useRef<Buffer | undefined>()
+  const dstConvIDRef = React.useRef<Uint8Array | undefined>()
   const [results, setResults] = React.useState<Array<T.RPCChat.ConvSearchHit>>([])
   const [waiting, setWaiting] = React.useState(false)
   const [error, setError] = React.useState('')

shared/chat/conversation/normal/index.d.ts

@@ -6,7 +6,7 @@ export type Props = {
   requestScrollToBottomRef: React.MutableRefObject<undefined | (() => void)>
   requestScrollUpRef: React.MutableRefObject<undefined | (() => void)>
   requestScrollDownRef: React.MutableRefObject<undefined | (() => void)>
-  onPaste: (data: Buffer) => void
+  onPaste: (data: Uint8Array) => void
   onAttach?: (paths: Array<string>) => void
   onFocusInput: () => void
   onRequestScrollDown: () => void

shared/common-adapters/markdown/service-decoration.tsx

@@ -15,6 +15,7 @@ import type {
   renderEmoji as renderEmojiType,
   RPCToEmojiData as RPCToEmojiDataType,
 } from '../../util/emoji'
+import {base64ToUint8Array, uint8ArrayToString} from 'uint8array-extras'
 
 const prefix = 'keybase://'
 export const linkIsKeybaseLink = (link: string) => link.startsWith(prefix)
@@ -112,7 +113,7 @@ const ServiceDecoration = (p: Props) => {
   // Parse JSON to get the type of the decoration
   let parsed: T.RPCChat.UITextDecoration
   try {
-    const jsonString = Buffer.from(json, 'base64').toString()
+    const jsonString = uint8ArrayToString(base64ToUint8Array(json))
     parsed = JSON.parse(jsonString)
   } catch (e) {
     return null

shared/common-adapters/plain-input.desktop.tsx

@@ -5,6 +5,7 @@ import pick from 'lodash/pick'
 import logger from '../logger'
 import {checkTextInfo} from './input.shared'
 import type {InternalProps, TextInfo, Selection} from './plain-input'
+import {stringToUint8Array} from 'uint8array-extras'
 
 const maybeParseInt = (input: string | number, radix: number): number =>
   typeof input === 'string' ? parseInt(input, radix) : input
@@ -30,7 +31,7 @@ class PlainInput extends React.PureComponent<InternalProps> {
   _onChange = ({target: {value = ''}}) => {
     if (this.props.maxBytes) {
       const {maxBytes} = this.props
-      if (Buffer.byteLength(value) > maxBytes) {
+      if (stringToUint8Array(value).byteLength > maxBytes) {
         return
       }
     }