js: dont leak as many globals as enumerable

2026-02-07 09:28:51 +00:00 · 2024-08-05 21:29:16 -07:00
2 changed files with 64 additions and 65 deletions
--- a/src/bun.js/bindings/ZigGlobalObject.cpp
+++ b/src/bun.js/bindings/ZigGlobalObject.cpp
@@ -3433,8 +3433,8 @@ void GlobalObject::addBuiltinGlobals(JSC::VM& vm)
        PropertyAttribute::Accessor | 0);

    // TODO: this should be usable on the lookup table. it crashed las time i tried it
-    putDirectCustomAccessor(vm, JSC::Identifier::fromString(vm, "onmessage"_s), JSC::CustomGetterSetter::create(vm, globalOnMessage, setGlobalOnMessage), 0);
-    putDirectCustomAccessor(vm, JSC::Identifier::fromString(vm, "onerror"_s), JSC::CustomGetterSetter::create(vm, globalOnError, setGlobalOnError), 0);
+    putDirectCustomAccessor(vm, JSC::Identifier::fromString(vm, "onmessage"_s), JSC::CustomGetterSetter::create(vm, globalOnMessage, setGlobalOnMessage), 1 << 2);
+    putDirectCustomAccessor(vm, JSC::Identifier::fromString(vm, "onerror"_s), JSC::CustomGetterSetter::create(vm, globalOnError, setGlobalOnError), 1 << 2);

    // ----- Extensions to Built-in objects -----

--- a/src/bun.js/bindings/ZigGlobalObject.lut.txt
+++ b/src/bun.js/bindings/ZigGlobalObject.lut.txt
@@ -2,87 +2,86 @@

 /* Source for ZigGlobalObject.lut.h
@begin bunGlobalObjectTable
-  addEventListener                jsFunctionAddEventListener                           Function 2
-  alert                           WebCore__alert                                       Function 1
+  addEventListener                jsFunctionAddEventListener                           DontEnum|Function 2
+  alert                           WebCore__alert                                       DontEnum|Function 1
  atob                            functionATOB                                         Function 1
  btoa                            functionBTOA                                         Function 1
  clearImmediate                  functionClearTimeout                                 Function 1
  clearInterval                   functionClearInterval                                Function 1
  clearTimeout                    functionClearTimeout                                 Function 1
-  confirm                         WebCore__confirm                                     Function 1
-  dispatchEvent                   jsFunctionDispatchEvent                              Function 1
+  confirm                         WebCore__confirm                                     DontEnum|Function 1
+  dispatchEvent                   jsFunctionDispatchEvent                              DontEnum|Function 1
  fetch                           constructBunFetchObject                              PropertyCallback
-  postMessage                     jsFunctionPostMessage                                Function 1
-  prompt                          WebCore__prompt                                      Function 1
+  postMessage                     jsFunctionPostMessage                                DontEnum|Function 1
+  prompt                          WebCore__prompt                                      DontEnum|Function 1
  queueMicrotask                  functionQueueMicrotask                               Function 2
-  removeEventListener             jsFunctionRemoveEventListener                        Function 2
-  reportError                     functionReportError                                  Function 1
+  removeEventListener             jsFunctionRemoveEventListener                        DontEnum|Function 2
+  reportError                     functionReportError                                  DontEnum|Function 1
  setImmediate                    functionSetImmediate                                 Function 1
  setInterval                     functionSetInterval                                  Function 1
  setTimeout                      functionSetTimeout                                   Function 1
  structuredClone                 functionStructuredClone                              Function 2
  
  global                          GlobalObject_getGlobalThis                           PropertyCallback
-  EventSource                     getEventSourceConstructor                            PropertyCallback
  
-  Bun                             GlobalObject::m_bunObject                            CellProperty|DontDelete|ReadOnly
-  File                            GlobalObject::m_JSDOMFileConstructor                 CellProperty
+  Bun                             GlobalObject::m_bunObject                            DontEnum|CellProperty|DontDelete|ReadOnly
+  File                            GlobalObject::m_JSDOMFileConstructor                 DontEnum|CellProperty
  crypto                          GlobalObject::m_cryptoObject                         CellProperty
  navigator                       GlobalObject::m_navigatorObject                      CellProperty
  performance                     GlobalObject::m_performanceObject                    CellProperty
-  process                         GlobalObject::m_processObject                        CellProperty
+  process                         GlobalObject::m_processObject                        DontEnum|CellProperty

-  Blob                            GlobalObject::m_JSBlob                               ClassStructure
-  Buffer                          GlobalObject::m_JSBufferClassStructure               ClassStructure
-  BuildError                      GlobalObject::m_JSBuildMessage                       ClassStructure
-  BuildMessage                    GlobalObject::m_JSBuildMessage                       ClassStructure
-  Crypto                          GlobalObject::m_JSCrypto                             ClassStructure
-  HTMLRewriter                    GlobalObject::m_JSHTMLRewriter                       ClassStructure
-  Request                         GlobalObject::m_JSRequest                            ClassStructure
-  ResolveError                    GlobalObject::m_JSResolveMessage                     ClassStructure
-  ResolveMessage                  GlobalObject::m_JSResolveMessage                     ClassStructure
-  Response                        GlobalObject::m_JSResponse                           ClassStructure
-  TextDecoder                     GlobalObject::m_JSTextDecoder                        ClassStructure
+  Blob                            GlobalObject::m_JSBlob                               DontEnum|ClassStructure
+  Buffer                          GlobalObject::m_JSBufferClassStructure               DontEnum|ClassStructure
+  BuildError                      GlobalObject::m_JSBuildMessage                       DontEnum|ClassStructure
+  BuildMessage                    GlobalObject::m_JSBuildMessage                       DontEnum|ClassStructure
+  Crypto                          GlobalObject::m_JSCrypto                             DontEnum|ClassStructure
+  HTMLRewriter                    GlobalObject::m_JSHTMLRewriter                       DontEnum|ClassStructure
+  Request                         GlobalObject::m_JSRequest                            DontEnum|ClassStructure
+  ResolveError                    GlobalObject::m_JSResolveMessage                     DontEnum|ClassStructure
+  ResolveMessage                  GlobalObject::m_JSResolveMessage                     DontEnum|ClassStructure
+  Response                        GlobalObject::m_JSResponse                           DontEnum|ClassStructure
+  TextDecoder                     GlobalObject::m_JSTextDecoder                        DontEnum|ClassStructure

-  AbortController                 AbortControllerConstructorCallback                   PropertyCallback
-  AbortSignal                     AbortSignalConstructorCallback                       PropertyCallback
-  BroadcastChannel                BroadcastChannelConstructorCallback                  PropertyCallback
-  ByteLengthQueuingStrategy       ByteLengthQueuingStrategyConstructorCallback         PropertyCallback
-  CloseEvent                      CloseEventConstructorCallback                        PropertyCallback
-  CountQueuingStrategy            CountQueuingStrategyConstructorCallback              PropertyCallback
-  CryptoKey                       CryptoKeyConstructorCallback                         PropertyCallback
-  CustomEvent                     CustomEventConstructorCallback                       PropertyCallback
-  DOMException                    DOMExceptionConstructorCallback                      PropertyCallback
-  ErrorEvent                      ErrorEventConstructorCallback                        PropertyCallback
-  Event                           EventConstructorCallback                             PropertyCallback
-  EventTarget                     EventTargetConstructorCallback                       PropertyCallback
-  FormData                        DOMFormDataConstructorCallback                       PropertyCallback
-  Headers                         FetchHeadersConstructorCallback                      PropertyCallback
-  MessageChannel                  MessageChannelConstructorCallback                    PropertyCallback
-  MessageEvent                    MessageEventConstructorCallback                      PropertyCallback
-  MessagePort                     MessagePortConstructorCallback                       PropertyCallback
-  Performance                     PerformanceConstructorCallback                       PropertyCallback
-  PerformanceEntry                PerformanceEntryConstructorCallback                  PropertyCallback
-  PerformanceMark                 PerformanceMarkConstructorCallback                   PropertyCallback
-  PerformanceMeasure              PerformanceMeasureConstructorCallback                PropertyCallback
-  PerformanceObserver             PerformanceObserverConstructorCallback               PropertyCallback
-  PerformanceObserverEntryList    PerformanceObserverEntryListConstructorCallback      PropertyCallback
-  ReadableByteStreamController    ReadableByteStreamControllerConstructorCallback      PropertyCallback
-  ReadableStream                  ReadableStreamConstructorCallback                    PropertyCallback
-  ReadableStreamBYOBReader        ReadableStreamBYOBReaderConstructorCallback          PropertyCallback
-  ReadableStreamBYOBRequest       ReadableStreamBYOBRequestConstructorCallback         PropertyCallback
-  ReadableStreamDefaultController ReadableStreamDefaultControllerConstructorCallback   PropertyCallback
-  ReadableStreamDefaultReader     ReadableStreamDefaultReaderConstructorCallback       PropertyCallback
-  SubtleCrypto                    SubtleCryptoConstructorCallback                      PropertyCallback
-  TextEncoder                     TextEncoderConstructorCallback                       PropertyCallback
-  TransformStream                 TransformStreamConstructorCallback                   PropertyCallback
-  TransformStreamDefaultController TransformStreamDefaultControllerConstructorCallback PropertyCallback
-  URL                             DOMURLConstructorCallback                            PropertyCallback
-  URLSearchParams                 URLSearchParamsConstructorCallback                   PropertyCallback
-  WebSocket                       WebSocketConstructorCallback                         PropertyCallback
-  Worker                          WorkerConstructorCallback                            PropertyCallback
-  WritableStream                  WritableStreamConstructorCallback                    PropertyCallback
-  WritableStreamDefaultController WritableStreamDefaultControllerConstructorCallback   PropertyCallback
-  WritableStreamDefaultWriter     WritableStreamDefaultWriterConstructorCallback       PropertyCallback
+  AbortController                 AbortControllerConstructorCallback                   DontEnum|PropertyCallback
+  AbortSignal                     AbortSignalConstructorCallback                       DontEnum|PropertyCallback
+  BroadcastChannel                BroadcastChannelConstructorCallback                  DontEnum|PropertyCallback
+  ByteLengthQueuingStrategy       ByteLengthQueuingStrategyConstructorCallback         DontEnum|PropertyCallback
+  CloseEvent                      CloseEventConstructorCallback                        DontEnum|PropertyCallback
+  CountQueuingStrategy            CountQueuingStrategyConstructorCallback              DontEnum|PropertyCallback
+  CryptoKey                       CryptoKeyConstructorCallback                         DontEnum|PropertyCallback
+  CustomEvent                     CustomEventConstructorCallback                       DontEnum|PropertyCallback
+  DOMException                    DOMExceptionConstructorCallback                      DontEnum|PropertyCallback
+  ErrorEvent                      ErrorEventConstructorCallback                        DontEnum|PropertyCallback
+  Event                           EventConstructorCallback                             DontEnum|PropertyCallback
+  EventTarget                     EventTargetConstructorCallback                       DontEnum|PropertyCallback
+  FormData                        DOMFormDataConstructorCallback                       DontEnum|PropertyCallback
+  Headers                         FetchHeadersConstructorCallback                      DontEnum|PropertyCallback
+  MessageChannel                  MessageChannelConstructorCallback                    DontEnum|PropertyCallback
+  MessageEvent                    MessageEventConstructorCallback                      DontEnum|PropertyCallback
+  MessagePort                     MessagePortConstructorCallback                       DontEnum|PropertyCallback
+  Performance                     PerformanceConstructorCallback                       DontEnum|PropertyCallback
+  PerformanceEntry                PerformanceEntryConstructorCallback                  DontEnum|PropertyCallback
+  PerformanceMark                 PerformanceMarkConstructorCallback                   DontEnum|PropertyCallback
+  PerformanceMeasure              PerformanceMeasureConstructorCallback                DontEnum|PropertyCallback
+  PerformanceObserver             PerformanceObserverConstructorCallback               DontEnum|PropertyCallback
+  PerformanceObserverEntryList    PerformanceObserverEntryListConstructorCallback      DontEnum|PropertyCallback
+  ReadableByteStreamController    ReadableByteStreamControllerConstructorCallback      DontEnum|PropertyCallback
+  ReadableStream                  ReadableStreamConstructorCallback                    DontEnum|PropertyCallback
+  ReadableStreamBYOBReader        ReadableStreamBYOBReaderConstructorCallback          DontEnum|PropertyCallback
+  ReadableStreamBYOBRequest       ReadableStreamBYOBRequestConstructorCallback         DontEnum|PropertyCallback
+  ReadableStreamDefaultController ReadableStreamDefaultControllerConstructorCallback   DontEnum|PropertyCallback
+  ReadableStreamDefaultReader     ReadableStreamDefaultReaderConstructorCallback       DontEnum|PropertyCallback
+  SubtleCrypto                    SubtleCryptoConstructorCallback                      DontEnum|PropertyCallback
+  TextEncoder                     TextEncoderConstructorCallback                       DontEnum|PropertyCallback
+  TransformStream                 TransformStreamConstructorCallback                   DontEnum|PropertyCallback
+  TransformStreamDefaultController TransformStreamDefaultControllerConstructorCallback DontEnum|PropertyCallback
+  URL                             DOMURLConstructorCallback                            DontEnum|PropertyCallback
+  URLSearchParams                 URLSearchParamsConstructorCallback                   DontEnum|PropertyCallback
+  WebSocket                       WebSocketConstructorCallback                         DontEnum|PropertyCallback
+  Worker                          WorkerConstructorCallback                            DontEnum|PropertyCallback
+  WritableStream                  WritableStreamConstructorCallback                    DontEnum|PropertyCallback
+  WritableStreamDefaultController WritableStreamDefaultControllerConstructorCallback   DontEnum|PropertyCallback
+  WritableStreamDefaultWriter     WritableStreamDefaultWriterConstructorCallback       DontEnum|PropertyCallback
@end
 */