Improve platform detection, add tests

src/StringClient.ts

@@ -6,10 +6,10 @@ import type Data from './Data'
 import type RemoteObservableEvent from './RemoteObservableEvent'
 import AsyncIterableSubject from './lib/AsyncIterableSubject'
 import Deferred from './lib/Deferred'
+import { detectPlatform } from './lib/Platform'
 import assert from './lib/assert'
 import generateId from './lib/generateId'
 import isNonNull from './lib/isNonNull'
-import platform from './lib/platform'
 
 export type RemoteFunction<I, O> = (arg: I) => Promise<O>
 export type RemoteObservable<T> = AsyncIterable<T>
@@ -147,6 +147,8 @@ export default class StringClient<T extends RemoteInterface> implements Client {
 
     assert(isNonNull(this._context), ErrorMessages.NOT_CONNECTED)
 
+    const platform = detectPlatform(this._context)
+
     if (platform === 'android') {
       const { default: AndroidConnector } = await import('./AndroidConnector')
       return new AndroidConnector({

src/lib/Platform.ts

@@ -0,0 +1,22 @@
+type Platform = 'android' | 'ios'
+
+export function detectPlatform(context: Window): Platform | null {
+  const {
+    navigator: { maxTouchPoints, platform, userAgent },
+  } = context
+
+  if (/android/i.test(userAgent)) {
+    return 'android'
+  }
+
+  if (
+    /iPad|iPhone|iPod/.test(userAgent) ||
+    (platform === 'MacIntel' && maxTouchPoints > 1)
+  ) {
+    return 'ios'
+  }
+
+  return null
+}
+
+export default Platform

src/lib/__tests__/Platform.ts

@@ -0,0 +1,42 @@
+import { detectPlatform } from '../Platform'
+
+describe('detectPlatform', () => {
+  it('should detect iPhone', () => {
+    const context = {
+      navigator: {
+        userAgent:
+          'Mozilla/5.0 (iPhone; CPU iPhone OS 16_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148',
+        platform: 'iPhone',
+        maxTouchPoints: 5,
+      },
+    } as Window
+
+    expect(detectPlatform(context)).toEqual('ios')
+  })
+
+  it('should detect newer iPads', () => {
+    const context = {
+      navigator: {
+        userAgent:
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)',
+        platform: 'MacIntel',
+        maxTouchPoints: 5,
+      },
+    } as Window
+
+    expect(detectPlatform(context)).toEqual('ios')
+  })
+
+  it('should detect older iPads', () => {
+    const context = {
+      navigator: {
+        userAgent:
+          'Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10',
+        platform: 'MacIntel',
+        maxTouchPoints: 5,
+      },
+    } as Window
+
+    expect(detectPlatform(context)).toEqual('ios')
+  })
+})