Move NetInfo JS module to FB internal
Summary: This removes the NetInfo import from RN and moves it to FB internal. Follow-up diffs will move the Android and iOS files as well. Reviewed By: rubennorte Differential Revision: D15392486 fbshipit-source-id: b868b671b8d91661bc7634b4662074ae953835be
This commit is contained in:
Christoph Nakazawa
Facebook Github Bot
Родитель
2ad3bb2e2d
Коммит
5a30c2a205
|
|
@ -1,240 +0,0 @@
|
||||||
/**
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*
|
|
||||||
* @format
|
|
||||||
* @flow
|
|
||||||
*/
|
|
||||||
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter');
|
|
||||||
const NativeModules = require('../BatchedBridge/NativeModules');
|
|
||||||
const Platform = require('../Utilities/Platform');
|
|
||||||
const RCTNetInfo = NativeModules.NetInfo;
|
|
||||||
|
|
||||||
const NetInfoEventEmitter = new NativeEventEmitter(RCTNetInfo);
|
|
||||||
|
|
||||||
const DEVICE_CONNECTIVITY_EVENT = 'networkStatusDidChange';
|
|
||||||
|
|
||||||
type ChangeEventName = $Keys<{
|
|
||||||
connectionChange: string,
|
|
||||||
change: string,
|
|
||||||
}>;
|
|
||||||
|
|
||||||
type ReachabilityStateIOS = $Keys<{
|
|
||||||
cell: string,
|
|
||||||
none: string,
|
|
||||||
unknown: string,
|
|
||||||
wifi: string,
|
|
||||||
}>;
|
|
||||||
|
|
||||||
type ConnectivityStateAndroid = $Keys<{
|
|
||||||
NONE: string,
|
|
||||||
MOBILE: string,
|
|
||||||
WIFI: string,
|
|
||||||
MOBILE_MMS: string,
|
|
||||||
MOBILE_SUPL: string,
|
|
||||||
MOBILE_DUN: string,
|
|
||||||
MOBILE_HIPRI: string,
|
|
||||||
WIMAX: string,
|
|
||||||
BLUETOOTH: string,
|
|
||||||
DUMMY: string,
|
|
||||||
ETHERNET: string,
|
|
||||||
MOBILE_FOTA: string,
|
|
||||||
MOBILE_IMS: string,
|
|
||||||
MOBILE_CBS: string,
|
|
||||||
WIFI_P2P: string,
|
|
||||||
MOBILE_IA: string,
|
|
||||||
MOBILE_EMERGENCY: string,
|
|
||||||
PROXY: string,
|
|
||||||
VPN: string,
|
|
||||||
UNKNOWN: string,
|
|
||||||
}>;
|
|
||||||
|
|
||||||
const _subscriptions = new Map();
|
|
||||||
|
|
||||||
let _isConnectedDeprecated;
|
|
||||||
if (Platform.OS === 'ios') {
|
|
||||||
_isConnectedDeprecated = function(
|
|
||||||
reachability: ReachabilityStateIOS,
|
|
||||||
): boolean {
|
|
||||||
return reachability !== 'none' && reachability !== 'unknown';
|
|
||||||
};
|
|
||||||
} else if (Platform.OS === 'android') {
|
|
||||||
_isConnectedDeprecated = function(
|
|
||||||
connectionType: ConnectivityStateAndroid,
|
|
||||||
): boolean {
|
|
||||||
return connectionType !== 'NONE' && connectionType !== 'UNKNOWN';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function _isConnected(connection) {
|
|
||||||
return connection.type !== 'none' && connection.type !== 'unknown';
|
|
||||||
}
|
|
||||||
|
|
||||||
const _isConnectedSubscriptions = new Map();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* NetInfo exposes info about online/offline status.
|
|
||||||
*
|
|
||||||
* See https://facebook.github.io/react-native/docs/netinfo.html
|
|
||||||
*/
|
|
||||||
const NetInfo = {
|
|
||||||
/**
|
|
||||||
* Adds an event handler.
|
|
||||||
*
|
|
||||||
* See https://facebook.github.io/react-native/docs/netinfo.html#addeventlistener
|
|
||||||
*/
|
|
||||||
addEventListener(
|
|
||||||
eventName: ChangeEventName,
|
|
||||||
handler: Function,
|
|
||||||
): {remove: () => void} {
|
|
||||||
let listener;
|
|
||||||
if (eventName === 'connectionChange') {
|
|
||||||
listener = NetInfoEventEmitter.addListener(
|
|
||||||
DEVICE_CONNECTIVITY_EVENT,
|
|
||||||
appStateData => {
|
|
||||||
handler({
|
|
||||||
type: appStateData.connectionType,
|
|
||||||
effectiveType: appStateData.effectiveConnectionType,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
);
|
|
||||||
} else if (eventName === 'change') {
|
|
||||||
console.warn(
|
|
||||||
'NetInfo\'s "change" event is deprecated. Listen to the "connectionChange" event instead.',
|
|
||||||
);
|
|
||||||
|
|
||||||
listener = NetInfoEventEmitter.addListener(
|
|
||||||
DEVICE_CONNECTIVITY_EVENT,
|
|
||||||
appStateData => {
|
|
||||||
handler(appStateData.network_info);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
console.warn('Trying to subscribe to unknown event: "' + eventName + '"');
|
|
||||||
return {
|
|
||||||
remove: () => {},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
_subscriptions.set(handler, listener);
|
|
||||||
return {
|
|
||||||
remove: () => NetInfo.removeEventListener(eventName, handler),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes the listener for network status changes.
|
|
||||||
*
|
|
||||||
* See https://facebook.github.io/react-native/docs/netinfo.html#removeeventlistener
|
|
||||||
*/
|
|
||||||
removeEventListener(eventName: ChangeEventName, handler: Function): void {
|
|
||||||
const listener = _subscriptions.get(handler);
|
|
||||||
if (!listener) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
listener.remove();
|
|
||||||
_subscriptions.delete(handler);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This function is deprecated. Use `getConnectionInfo` instead.
|
|
||||||
* Returns a promise that resolves with one of the deprecated connectivity
|
|
||||||
* types:
|
|
||||||
*
|
|
||||||
* The following connectivity types are deprecated. They're used by the
|
|
||||||
* deprecated APIs `fetch` and the `change` event.
|
|
||||||
*
|
|
||||||
* iOS connectivity types (deprecated):
|
|
||||||
* - `none` - device is offline
|
|
||||||
* - `wifi` - device is online and connected via wifi, or is the iOS simulator
|
|
||||||
* - `cell` - device is connected via Edge, 3G, WiMax, or LTE
|
|
||||||
* - `unknown` - error case and the network status is unknown
|
|
||||||
*
|
|
||||||
* Android connectivity types (deprecated).
|
|
||||||
* - `NONE` - device is offline
|
|
||||||
* - `BLUETOOTH` - The Bluetooth data connection.
|
|
||||||
* - `DUMMY` - Dummy data connection.
|
|
||||||
* - `ETHERNET` - The Ethernet data connection.
|
|
||||||
* - `MOBILE` - The Mobile data connection.
|
|
||||||
* - `MOBILE_DUN` - A DUN-specific Mobile data connection.
|
|
||||||
* - `MOBILE_HIPRI` - A High Priority Mobile data connection.
|
|
||||||
* - `MOBILE_MMS` - An MMS-specific Mobile data connection.
|
|
||||||
* - `MOBILE_SUPL` - A SUPL-specific Mobile data connection.
|
|
||||||
* - `VPN` - A virtual network using one or more native bearers. Requires
|
|
||||||
* API Level 21
|
|
||||||
* - `WIFI` - The WIFI data connection.
|
|
||||||
* - `WIMAX` - The WiMAX data connection.
|
|
||||||
* - `UNKNOWN` - Unknown data connection.
|
|
||||||
*
|
|
||||||
* The rest of the connectivity types are hidden by the Android API, but can
|
|
||||||
* be used if necessary.
|
|
||||||
*/
|
|
||||||
fetch(): Promise<any> {
|
|
||||||
console.warn(
|
|
||||||
'NetInfo.fetch() is deprecated. Use NetInfo.getConnectionInfo() instead.',
|
|
||||||
);
|
|
||||||
return RCTNetInfo.getCurrentConnectivity().then(resp => resp.network_info);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See https://facebook.github.io/react-native/docs/netinfo.html#getconnectioninfo
|
|
||||||
*/
|
|
||||||
getConnectionInfo(): Promise<any> {
|
|
||||||
return RCTNetInfo.getCurrentConnectivity().then(resp => {
|
|
||||||
return {
|
|
||||||
type: resp.connectionType,
|
|
||||||
effectiveType: resp.effectiveConnectionType,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An object with the same methods as above but the listener receives a
|
|
||||||
* boolean which represents the internet connectivity.
|
|
||||||
*
|
|
||||||
* See https://facebook.github.io/react-native/docs/netinfo.html#isconnected
|
|
||||||
*/
|
|
||||||
isConnected: {
|
|
||||||
addEventListener(
|
|
||||||
eventName: ChangeEventName,
|
|
||||||
handler: Function,
|
|
||||||
): {remove: () => void} {
|
|
||||||
const listener = connection => {
|
|
||||||
if (eventName === 'change') {
|
|
||||||
handler(_isConnectedDeprecated(connection));
|
|
||||||
} else if (eventName === 'connectionChange') {
|
|
||||||
handler(_isConnected(connection));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
_isConnectedSubscriptions.set(handler, listener);
|
|
||||||
NetInfo.addEventListener(eventName, listener);
|
|
||||||
return {
|
|
||||||
remove: () =>
|
|
||||||
NetInfo.isConnected.removeEventListener(eventName, handler),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
removeEventListener(eventName: ChangeEventName, handler: Function): void {
|
|
||||||
const listener = _isConnectedSubscriptions.get(handler);
|
|
||||||
NetInfo.removeEventListener(eventName, listener);
|
|
||||||
_isConnectedSubscriptions.delete(handler);
|
|
||||||
},
|
|
||||||
|
|
||||||
fetch(): Promise<any> {
|
|
||||||
return NetInfo.getConnectionInfo().then(_isConnected);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
isConnectionExpensive(): Promise<boolean> {
|
|
||||||
return Platform.OS === 'android'
|
|
||||||
? RCTNetInfo.isConnectionMetered()
|
|
||||||
: Promise.reject(new Error('Currently not supported on iOS'));
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = NetInfo;
|
|
||||||
|
|
@ -250,15 +250,6 @@ module.exports = {
|
||||||
get NativeEventEmitter() {
|
get NativeEventEmitter() {
|
||||||
return require('NativeEventEmitter');
|
return require('NativeEventEmitter');
|
||||||
},
|
},
|
||||||
get NetInfo() {
|
|
||||||
warnOnce(
|
|
||||||
'netinfo-moved',
|
|
||||||
'NetInfo has been extracted from react-native core and will be removed in a future release. ' +
|
|
||||||
"It can now be installed and imported from '@react-native-community/netinfo' instead of 'react-native'. " +
|
|
||||||
'See https://github.com/react-native-community/react-native-netinfo',
|
|
||||||
);
|
|
||||||
return require('NetInfo');
|
|
||||||
},
|
|
||||||
get PanResponder() {
|
get PanResponder() {
|
||||||
return require('PanResponder');
|
return require('PanResponder');
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,177 +0,0 @@
|
||||||
/**
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*
|
|
||||||
* @format
|
|
||||||
* @flow
|
|
||||||
*/
|
|
||||||
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
const React = require('react');
|
|
||||||
const {NetInfo, Text, View, TouchableWithoutFeedback} = require('react-native');
|
|
||||||
|
|
||||||
class ConnectionInfoSubscription extends React.Component<{}, $FlowFixMeState> {
|
|
||||||
state = {
|
|
||||||
connectionInfoHistory: [],
|
|
||||||
};
|
|
||||||
|
|
||||||
componentDidMount() {
|
|
||||||
NetInfo.addEventListener('change', this._handleConnectionInfoChange);
|
|
||||||
}
|
|
||||||
|
|
||||||
componentWillUnmount() {
|
|
||||||
NetInfo.removeEventListener('change', this._handleConnectionInfoChange);
|
|
||||||
}
|
|
||||||
|
|
||||||
_handleConnectionInfoChange = connectionInfo => {
|
|
||||||
const connectionInfoHistory = this.state.connectionInfoHistory.slice();
|
|
||||||
connectionInfoHistory.push(connectionInfo);
|
|
||||||
this.setState({
|
|
||||||
connectionInfoHistory,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
render() {
|
|
||||||
return (
|
|
||||||
<View>
|
|
||||||
<Text>{JSON.stringify(this.state.connectionInfoHistory)}</Text>
|
|
||||||
</View>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class ConnectionInfoCurrent extends React.Component<{}, $FlowFixMeState> {
|
|
||||||
state = {
|
|
||||||
connectionInfo: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
componentDidMount() {
|
|
||||||
NetInfo.addEventListener('change', this._handleConnectionInfoChange);
|
|
||||||
NetInfo.fetch().done(connectionInfo => {
|
|
||||||
this.setState({connectionInfo});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
componentWillUnmount() {
|
|
||||||
NetInfo.removeEventListener('change', this._handleConnectionInfoChange);
|
|
||||||
}
|
|
||||||
|
|
||||||
_handleConnectionInfoChange = connectionInfo => {
|
|
||||||
this.setState({
|
|
||||||
connectionInfo,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
render() {
|
|
||||||
return (
|
|
||||||
<View>
|
|
||||||
<Text>{this.state.connectionInfo}</Text>
|
|
||||||
</View>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class IsConnected extends React.Component<{}, $FlowFixMeState> {
|
|
||||||
state = {
|
|
||||||
isConnected: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
componentDidMount() {
|
|
||||||
NetInfo.isConnected.addEventListener(
|
|
||||||
'change',
|
|
||||||
this._handleConnectivityChange,
|
|
||||||
);
|
|
||||||
NetInfo.isConnected.fetch().done(isConnected => {
|
|
||||||
this.setState({isConnected});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
componentWillUnmount() {
|
|
||||||
NetInfo.isConnected.removeEventListener(
|
|
||||||
'change',
|
|
||||||
this._handleConnectivityChange,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
_handleConnectivityChange = isConnected => {
|
|
||||||
this.setState({
|
|
||||||
isConnected,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
render() {
|
|
||||||
return (
|
|
||||||
<View>
|
|
||||||
<Text>{this.state.isConnected ? 'Online' : 'Offline'}</Text>
|
|
||||||
</View>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class IsConnectionExpensive extends React.Component<{}, $FlowFixMeState> {
|
|
||||||
state = {
|
|
||||||
isConnectionExpensive: (null: ?boolean),
|
|
||||||
};
|
|
||||||
|
|
||||||
_checkIfExpensive = () => {
|
|
||||||
NetInfo.isConnectionExpensive().then(isConnectionExpensive => {
|
|
||||||
this.setState({isConnectionExpensive});
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
render() {
|
|
||||||
return (
|
|
||||||
<View>
|
|
||||||
<TouchableWithoutFeedback onPress={this._checkIfExpensive}>
|
|
||||||
<View>
|
|
||||||
<Text>
|
|
||||||
Click to see if connection is expensive:
|
|
||||||
{this.state.isConnectionExpensive === true
|
|
||||||
? 'Expensive'
|
|
||||||
: this.state.isConnectionExpensive === false
|
|
||||||
? 'Not expensive'
|
|
||||||
: 'Unknown'}
|
|
||||||
</Text>
|
|
||||||
</View>
|
|
||||||
</TouchableWithoutFeedback>
|
|
||||||
</View>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
exports.title = 'NetInfo';
|
|
||||||
exports.description = 'Monitor network status';
|
|
||||||
exports.examples = [
|
|
||||||
{
|
|
||||||
title: 'NetInfo.isConnected',
|
|
||||||
description: 'Asynchronously load and observe connectivity',
|
|
||||||
render(): React.Element<any> {
|
|
||||||
return <IsConnected />;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'NetInfo.update',
|
|
||||||
description: 'Asynchronously load and observe connectionInfo',
|
|
||||||
render(): React.Element<any> {
|
|
||||||
return <ConnectionInfoCurrent />;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'NetInfo.updateHistory',
|
|
||||||
description: 'Observed updates to connectionInfo',
|
|
||||||
render(): React.Element<any> {
|
|
||||||
return <ConnectionInfoSubscription />;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
platform: 'android',
|
|
||||||
title: 'NetInfo.isConnectionExpensive (Android)',
|
|
||||||
description: 'Asynchronously check isConnectionExpensive',
|
|
||||||
render(): React.Element<any> {
|
|
||||||
return <IsConnectionExpensive />;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
@ -184,10 +184,6 @@ const APIExamples: Array<RNTesterExample> = [
|
||||||
key: 'NativeAnimationsExample',
|
key: 'NativeAnimationsExample',
|
||||||
module: require('./NativeAnimationsExample'),
|
module: require('./NativeAnimationsExample'),
|
||||||
},
|
},
|
||||||
{
|
|
||||||
key: 'NetInfoExample',
|
|
||||||
module: require('./NetInfoExample'),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
key: 'OrientationChangeExample',
|
key: 'OrientationChangeExample',
|
||||||
module: require('./OrientationChangeExample'),
|
module: require('./OrientationChangeExample'),
|
||||||
|
|
|
||||||
|
|
@ -261,11 +261,6 @@ const APIExamples: Array<RNTesterExample> = [
|
||||||
module: require('./NativeAnimationsExample'),
|
module: require('./NativeAnimationsExample'),
|
||||||
supportsTVOS: true,
|
supportsTVOS: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
key: 'NetInfoExample',
|
|
||||||
module: require('./NetInfoExample'),
|
|
||||||
supportsTVOS: true,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
key: 'OrientationChangeExample',
|
key: 'OrientationChangeExample',
|
||||||
module: require('./OrientationChangeExample'),
|
module: require('./OrientationChangeExample'),
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче