React 0.30 update; Cross-platform Linking, Android support, Promises

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["react-native"]
+}

AppLinkNavigation.js

@@ -11,8 +11,8 @@
  */
 'use strict';
 
-var React = require('react-native');
-var { LinkingIOS } = React;
+var React = require('react');
+var { Linking, Platform } = require('react-native');
 var AppLinkURL = require('./AppLinkURL');
 
 var USER_AGENT = 'react-native-applinks 0.0.1';
@@ -30,63 +30,66 @@ class AppLinkNavigation {
   ) {
     this._appLinkResolver = app_link_resolver;
     this._refererAppLink = referer_app_link;
-    this._platform = platform || 'ios';
+    this._platform = platform || Platform.OS;
     switch (this._platform) {
       case 'iphone':
       case 'ipad':
       case 'ios':
+      case 'android':
         break;
       default:
         throw 'Unexpected platform: ' + platform;
     }
   }
 
-  fetchUrlFromWebUrl(web_url: string, success: Function, error: Function) {
-    this._appLinkResolver.resolve(
-      web_url,
-      (al) => { this.fetchUrlFromAppLink(al, success, error) },
-      error
-    );
+  fetchUrlFromWebUrl(web_url: string): Promise<any> {
+    return this._appLinkResolver.resolve(web_url)
+      .then((al) => this.fetchUrlFromAppLink(al));
   }
 
-  fetchUrlFromAppLink(al: AppLink, success: Function, error: Function) {
+  fetchUrlFromAppLink(al: AppLink): Promise<any> {
     if (!al) {
-      error('Empty applink object.');
+      return Promise.reject(new Error('Empty applink object.'));
     }
 
-    var targets = al.getTargets('ios');
+    var targets;
 
     if (this._platform === 'iphone') {
+      targets = al.getTargets('ios');
       targets = al.getTargets('iphone').concat(targets);
     } else if (this._platform === 'ipad') {
+      targets = al.getTargets('ios');
       targets = al.getTargets('ipad').concat(targets);
+    } else {
+      targets = al.getTargets(this._platform);
     }
 
-    this._findBestTarget(targets, 0,
-      (target) => {
-        success(this._addApplinkDataToUrl(target.url, al.getURL()))
-      },
-      () => {
-        success(this._addApplinkDataToUrl(al.getWebUrl(), al.getURL()))
-      }
-    );
+    return this._findBestTarget(targets, 0)
+      .then((target) => {
+        if (target) {
+          return this._addApplinkDataToUrl(target.url, al.getURL());
+        } else {
+          return this._addApplinkDataToUrl(al.getWebUrl(), al.getURL());
+        }
+      });
   }
 
   /**
    * Iterating through the collection of app link targets.
    * Selecting first one that can be opened.
    */
-  _findBestTarget(targets: Array, index: number, onFound: Function, onNotFound: Function) {
+  _findBestTarget(targets: Array, index: number): Promise<any> {
     if (index >= targets.length) {
-      onNotFound();
+      return Promise.resolve(false);
     } else {
-      LinkingIOS.canOpenURL(targets[index].url, (supported) => {
-        if (supported) {
-          onFound(targets[index]);
-        } else {
-          this._findBestTarget(targets, ++index, onFound, onNotFound);
-        }
-      });
+      return Linking.canOpenURL(targets[index].url)
+        .then((supported) => {
+          if (supported) {
+            return targets[index];
+          } else {
+            return this._findBestTarget(targets, ++index);
+          }
+        });
     }
   }
 

AppLinkResolver.js

@@ -14,8 +14,8 @@
 var URL = require('url');
 
 class AppLinkResolver {
-  resolve(web_url: String, success, error) {
-    throw 'Not implemented';
+  resolve(web_url: String): Promise<any> {
+    return Promise.reject(new Error('Not implemented'));
   }
 
   normalizeUrl(url: String): String {

IndexAPIAppLinkResolver.js

@@ -20,7 +20,7 @@ class IndexAPIAppLinkResolver extends AppLinkResolver {
     this._facebookToken = facebook_token;
   }
 
-  resolve(web_url, success, error) {
+  resolve(web_url) {
     var webUrl = super.normalizeUrl(web_url);
 
     if (!this._facebookToken) {
@@ -35,13 +35,10 @@ class IndexAPIAppLinkResolver extends AppLinkResolver {
       + encodeURIComponent(this._facebookToken);
     indexAPIEndpoint = super.normalizeUrl(indexAPIEndpoint);
 
-    fetch(indexAPIEndpoint)
+    return fetch(indexAPIEndpoint)
       .then(res => res.json())
       .then((json) => {
-        success(new AppLink(webUrl, json[webUrl].app_links));
-      })
-      .catch(function(err) {
-        error(err);
+        return new AppLink(webUrl, json[webUrl].app_links);
       });
   }
 }

NativeAppLinkResolver.js

@@ -13,21 +13,18 @@
 
 var AppLinkResolver = require('./AppLinkResolver');
 
-var Parser = require('parse5').Parser;
+var Parser = require('parse5/lib/parser');
 var AppLink = require('./AppLink');
 
 class NativeAppLinkResolver extends AppLinkResolver {
-  resolve(web_url: string, success: Function, error: Function) {
+  resolve(web_url: string) {
     var webUrl = super.normalizeUrl(web_url);
 
-    fetch(webUrl, {method: 'get', headers: {'Prefer-Html-Meta-Tags': 'al'}})
+    return fetch(webUrl, {method: 'get', headers: {'Prefer-Html-Meta-Tags': 'al'}})
       .then(res => res.text())
       .then((body) => {
         var appLinkHost = NativeAppLinkResolver.parseHTML(body);
-        success(new AppLink(webUrl, appLinkHost));
-      })
-      .catch(function(err) {
-        error(err);
+        return new AppLink(webUrl, appLinkHost);
       });
   }
 

__tests__/main-test.js

@@ -8,13 +8,6 @@
  */
 'use strict';
 
-jest
-  .dontMock('parse5')
-  .dontMock('url')
-  .dontMock('../AppLinkURL')
-  .dontMock('../NativeAppLinkResolver')
-  .dontMock('../AppLink');
-
 var AppLink = require('../AppLink');
 var NativeAppLinkResolver = require('../NativeAppLinkResolver');
 var AppLinkURL = require('../AppLinkURL');

__tests__/navigation-test.js

@@ -8,65 +8,54 @@
  */
 'use strict';
 
-jest
-  .dontMock('parse5')
-  .dontMock('url')
-  .dontMock('../AppLinkURL')
-  .dontMock('../NativeAppLinkResolver')
-  .dontMock('../AppLink')
-  .dontMock('../AppLinkNavigation');
-
 var AppLink = require('../AppLink');
 var AppLinkNavigation = require('../AppLinkNavigation');
 var AppLinkResolver = require('../AppLinkResolver');
-var LinkingIOS = require('LinkingIOS');
+var Linking = require('Linking');
 
 /**
- * Mocking LinkingIOS calls
+ * Mocking Linking calls
  */
-LinkingIOS.canOpenURL = jest.genMockFunction()
-  .mockImplementation(function(url, supported) {
-  console.log('Mock call LinkingIOS.canOpenURL:' + url);
-  var isSupported = url.indexOf('_v1') >= 0;
-  supported(isSupported);
-});
+Linking.canOpenURL = jest.genMockFunction()
+  .mockImplementation(function(url) {
+    console.log('Mock call Linking.canOpenURL:' + url);
+    var isSupported = url.indexOf('_v1') >= 0;
+    return Promise.resolve(isSupported);
+  });
 
 describe('App Links Navigation', function() {
   it('Targets priorities test', function() {
     var resolver = new AppLinkResolver();
     var alNavigationIOS = new AppLinkNavigation(resolver, null, 'ios');
     var alNavigationIPhone = new AppLinkNavigation(resolver, null, 'iphone');
     var alNavigationIPad = new AppLinkNavigation(resolver, null, 'ipad');
+    var alNavigationAndroid = new AppLinkNavigation(resolver, null, 'android');
     var alNavigationDefault = new AppLinkNavigation(resolver);
 
     var al = new AppLink(
       'http://example.com/home',
       {
         ios: [{url: 'ios_v2://home'}, {url: 'ios_v1://home'}],
         iphone: [{url: 'iphone_v2://home'}, {url: 'iphone_v1://home'}],
-        ipad: [{url: 'ipad_v2://home'}, {url: 'ipad_v1://home'}]
+        ipad: [{url: 'ipad_v2://home'}, {url: 'ipad_v1://home'}],
+        android: [{url: 'android_v2://home'}, {url: 'android_v1://home'}]
       }
     );
 
-    alNavigationIOS.fetchUrlFromAppLink(
-      al,
-      (url) => { expect(url).toContain('ios_v1') }
-    );
+    alNavigationIOS.fetchUrlFromAppLink(al)
+      .then((url) => { expect(url).toContain('ios_v1') });
 
-    alNavigationIPhone.fetchUrlFromAppLink(
-      al,
-      (url) => { expect(url).toContain('iphone_v1') }
-    );
+    alNavigationIPhone.fetchUrlFromAppLink(al)
+      .then((url) => { expect(url).toContain('iphone_v1') });
 
-    alNavigationIPad.fetchUrlFromAppLink(
-      al,
-      (url) => { expect(url).toContain('ipad_v1') }
-    );
+    alNavigationIPad.fetchUrlFromAppLink(al)
+      .then((url) => { expect(url).toContain('ipad_v1') });
 
-    alNavigationDefault.fetchUrlFromAppLink(
-      al,
-      (url) => { expect(url).toContain('ios_v1') }
-    );
+    alNavigationAndroid.fetchUrlFromAppLink(al)
+      .then((url) => { expect(url).toContain('android_v1') });
+
+    alNavigationDefault.fetchUrlFromAppLink(al)
+      .then((url) => { expect(url).toContain('ios_v1') });
   });
 
   it('Wrong platform test', function() {

package.json

@@ -8,25 +8,34 @@
     "email": "nov@facebook.com",
     "url": "https://github.com/knovikov"
   },
+  "repository": "facebook/react-native-applinks",
   "scripts": {
     "test": "jest"
   },
+  "jest": {
+    "preset": "jest-react-native"
+  },
   "devDependencies": {
-    "jest": "~0.1.5"
+    "babel-jest": "^15.0.0",
+    "babel-preset-react-native": "^1.9.0",
+    "jest": "^15.1.1",
+    "jest-react-native": "^15.0.0",
+    "react": "^15.3.1",
+    "react-native": ">=0.30.0"
   },
   "dependencies": {
-    "parse5": "~1.4.2",
-    "url": "~0.10.3"
+    "parse5": "^2.2.1",
+    "url": "^0.11.0"
   },
   "peerDependencies": {
-    "react-native": ">=0.17.0"
+    "react-native": ">=0.30.0"
   },
   "homepage": "https://github.com/facebook/react-native-applinks/",
   "keywords": [
     "react",
     "applinks",
     "react native",
     "react native applinks"
-   ],
-  "license": "BSD License"
+  ],
+  "license": "BSD-3-Clause"
 }