Skip to content

Commit

Permalink
Stop calling RCTNetworking.(add|remove)Listeners?
Browse files Browse the repository at this point in the history
Summary:
RCTNetworking.startObserving and RCTNetworking.stopObserving don't exist. The main purpose of RCTEventEmitter.addListener is to call these methods, and increment the `_listeners` counter, so that we can start dispatching events when `_listeners > 0`. In D24272560, I made RCTEventEmitter dispatch events even when _listeners <= 0. This is sufficient for us to stop calling these two RCTNetworking methods entirely.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24272663

fbshipit-source-id: de9c968bc71e6e6d69a22b934644e6dfa3266b3f
  • Loading branch information
RSNara authored and facebook-github-bot committed Oct 15, 2020
1 parent 82187bf commit dabca52
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 5 deletions.
22 changes: 18 additions & 4 deletions Libraries/EventEmitter/NativeEventEmitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,29 @@ type NativeModule = {
...
};

type NativeEventEmitterOptions = $ReadOnly<{|
__SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: boolean,
|}>;

const DEFAULT_NATIVE_EVENT_EMITTER_OPTIONS = {
__SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: false,
};

/**
* Abstract base class for implementing event-emitting modules. This implements
* a subset of the standard EventEmitter node module API.
*/
export default class NativeEventEmitter extends EventEmitter {
_nativeModule: ?NativeModule;
_disableCallsIntoModule: boolean;

constructor(nativeModule: ?NativeModule) {
constructor(
nativeModule: ?NativeModule,
options: NativeEventEmitterOptions = DEFAULT_NATIVE_EVENT_EMITTER_OPTIONS,
) {
super(RCTDeviceEventEmitter.sharedSubscriber);
this._disableCallsIntoModule =
options.__SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
if (Platform.OS === 'ios') {
invariant(nativeModule, 'Native module cannot be null.');
this._nativeModule = nativeModule;
Expand All @@ -42,7 +56,7 @@ export default class NativeEventEmitter extends EventEmitter {
listener: Function,
context: ?Object,
): EventSubscription {
if (this._nativeModule != null) {
if (this._nativeModule != null && !this._disableCallsIntoModule) {
this._nativeModule.addListener(eventType);
}
return super.addListener(eventType, listener, context);
Expand All @@ -51,14 +65,14 @@ export default class NativeEventEmitter extends EventEmitter {
removeAllListeners(eventType: string) {
invariant(eventType, 'eventType argument is required.');
const count = this.listenerCount(eventType);
if (this._nativeModule != null) {
if (this._nativeModule != null && !this._disableCallsIntoModule) {
this._nativeModule.removeListeners(count);
}
super.removeAllListeners(eventType);
}

removeSubscription(subscription: EventSubscription) {
if (this._nativeModule != null) {
if (this._nativeModule != null && !this._disableCallsIntoModule) {
this._nativeModule.removeListeners(1);
}
super.removeSubscription(subscription);
Expand Down
9 changes: 8 additions & 1 deletion Libraries/Network/RCTNetworking.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@ import type {RequestBody} from './convertRequestBody';

class RCTNetworking extends NativeEventEmitter {
constructor() {
super(NativeNetworkingIOS);
const disableCallsIntoModule =
typeof global.__disableRCTNetworkingExtraneousModuleCalls === 'function'
? global.__disableRCTNetworkingExtraneousModuleCalls()
: false;

super(NativeNetworkingIOS, {
__SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: disableCallsIntoModule,
});
}

sendRequest(
Expand Down

0 comments on commit dabca52

Please sign in to comment.