expo 52.0.40 → 52.0.42

package/android/build.gradle

@@ -33,7 +33,7 @@ def getRNVersion() {
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '52.0.40'
+version = '52.0.42'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -46,7 +46,7 @@ android {
   namespace "expo.core"
   defaultConfig {
     versionCode 1
-    versionName "52.0.40"
+    versionName "52.0.42"
     consumerProguardFiles("proguard-rules.pro")
   }
   testOptions {

package/bin/autolinking

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('expo-modules-autolinking/bin/expo-modules-autolinking');

package/bin/fingerprint

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('@expo/fingerprint/bin/cli');

package/build/devtools/DevToolsPluginClient.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter, EventSubscription } from 'fbemitter';
 import { WebSocketBackingStore } from './WebSocketBackingStore';
-import type { ConnectionInfo, DevToolsPluginClientOptions } from './devtools.types';
+import type { ConnectionInfo, DevToolsPluginClientOptions, HandshakeMessageParams } from './devtools.types';
 /**
  * This client is for the Expo DevTools Plugins to communicate between the app and the DevTools webpage hosted in a browser.
  * All the code should be both compatible with browsers and React Native.
@@ -30,6 +30,7 @@ export declare abstract class DevToolsPluginClient {
      * @param params any extra payload.
      */
     sendMessage(method: string, params: any): void;
+    protected sendMessageLegacy(method: string, params: any): void;
     private sendMessageImpl;
     /**
      * Subscribe to a message from the other end of DevTools.
@@ -43,6 +44,16 @@ export declare abstract class DevToolsPluginClient {
      * @param listener Listener to be called when a message is received.
      */
     addMessageListenerOnce(method: string, listener: (params: any) => void): void;
+    /**
+     * Internal handshake message sender.
+     * @hidden
+     */
+    protected sendHandshakeMessage(params: HandshakeMessageParams): void;
+    /**
+     * Internal handshake message listener.
+     * @hidden
+     */
+    protected addHandskakeMessageListener(listener: (params: HandshakeMessageParams) => void): Partial<EventSubscription>;
     /**
      * Returns whether the client is connected to the server.
      */
@@ -51,8 +62,7 @@ export declare abstract class DevToolsPluginClient {
      * The method to create the WebSocket connection.
      */
     protected connectAsync(): Promise<WebSocket>;
-    protected handleMessage: (event: WebSocketMessageEvent) => void;
-    private handleMessageImpl;
+    protected handleMessage: (event: WebSocketMessageEvent) => Promise<void>;
     /**
      * Get the WebSocket backing store. Exposed for testing.
      * @hidden

package/build/devtools/DevToolsPluginClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevToolsPluginClient.d.ts","sourceRoot":"","sources":["../../src/devtools/DevToolsPluginClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AASpF;;;GAGG;AACH,8BAAsB,oBAAoB;aAYtB,cAAc,EAAE,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAZ3B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAsB;IAE1D,OAAO,CAAC,MAAM,CAAC,cAAc,CAAsD;IACnF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8D;IAEtF,SAAS,CAAC,QAAQ,UAAS;IAC3B,SAAS,CAAC,OAAO,SAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CACR;gBAGT,cAAc,EAAE,cAAc,EAC7B,OAAO,CAAC,yCAA6B;IAKxD;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQvC;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWxC;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;YAQhC,eAAe;IAS7B;;;;OAIG;IACI,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,iBAAiB;IAI7F;;;;OAIG;IACI,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAIpF;;OAEG;IACI,WAAW,IAAI,OAAO;IAI7B;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAyB5C,SAAS,CAAC,aAAa,UAAW,qBAAqB,UAErD;IAEF,OAAO,CAAC,iBAAiB,CAiBvB;IAEF;;;OAGG;IACI,wBAAwB,IAAI,qBAAqB;CAGzD"}
+{"version":3,"file":"DevToolsPluginClient.d.ts","sourceRoot":"","sources":["../../src/devtools/DevToolsPluginClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EACV,cAAc,EACd,2BAA2B,EAC3B,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAS1B;;;GAGG;AACH,8BAAsB,oBAAoB;aAYtB,cAAc,EAAE,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAZ3B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAsB;IAE1D,OAAO,CAAC,MAAM,CAAC,cAAc,CAAsD;IACnF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8D;IAEtF,SAAS,CAAC,QAAQ,UAAS;IAC3B,SAAS,CAAC,OAAO,SAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CACR;gBAGT,cAAc,EAAE,cAAc,EAC7B,OAAO,CAAC,yCAA6B;IAKxD;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQvC;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWxC;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IAI9C,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IAIvD,OAAO,CAAC,eAAe;IAsBvB;;;;OAIG;IACI,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,iBAAiB;IAI7F;;;;OAIG;IACI,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAIpF;;;OAGG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,sBAAsB;IAQ7D;;;OAGG;IACH,SAAS,CAAC,2BAA2B,CACnC,QAAQ,EAAE,CAAC,MAAM,EAAE,sBAAsB,KAAK,IAAI,GACjD,OAAO,CAAC,iBAAiB,CAAC;IA2B7B;;OAEG;IACI,WAAW,IAAI,OAAO;IAI7B;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAyB5C,SAAS,CAAC,aAAa,UAAiB,qBAAqB,mBAuB3D;IAEF;;;OAGG;IACI,wBAAwB,IAAI,qBAAqB;CAGzD"}

package/build/devtools/DevToolsPluginClientImplApp.d.ts

@@ -9,6 +9,8 @@ export declare class DevToolsPluginClientImplApp extends DevToolsPluginClient {
      * @hidden
      */
     initAsync(): Promise<void>;
+    sendMessage(method: string, params: any): void;
     private addHandshakeHandler;
+    private terminateBrowserClient;
 }
 //# sourceMappingURL=DevToolsPluginClientImplApp.d.ts.map

package/build/devtools/DevToolsPluginClientImplApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevToolsPluginClientImplApp.d.ts","sourceRoot":"","sources":["../../src/devtools/DevToolsPluginClientImplApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAI9D;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,oBAAoB;IAEnE,OAAO,CAAC,gBAAgB,CAA8B;IAEtD;;;OAGG;IACY,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAKzC,OAAO,CAAC,mBAAmB;CAY5B"}
+{"version":3,"file":"DevToolsPluginClientImplApp.d.ts","sourceRoot":"","sources":["../../src/devtools/DevToolsPluginClientImplApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAS9D;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,oBAAoB;IACnE,OAAO,CAAC,gBAAgB,CAA6C;IAErE;;;OAGG;IACY,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAKhC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IAUhD,OAAO,CAAC,mBAAmB;IAiD3B,OAAO,CAAC,sBAAsB;CAQ/B"}

package/build/devtools/DevToolsPluginClientImplBrowser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevToolsPluginClientImplBrowser.d.ts","sourceRoot":"","sources":["../../src/devtools/DevToolsPluginClientImplBrowser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D;;GAEG;AACH,qBAAa,+BAAgC,SAAQ,oBAAoB;IACvE,OAAO,CAAC,eAAe,CAAiC;IAExD;;;OAGG;IACY,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAKzC,OAAO,CAAC,cAAc;CAavB"}
+{"version":3,"file":"DevToolsPluginClientImplBrowser.d.ts","sourceRoot":"","sources":["../../src/devtools/DevToolsPluginClientImplBrowser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D;;GAEG;AACH,qBAAa,+BAAgC,SAAQ,oBAAoB;IACvE,OAAO,CAAC,eAAe,CAAiC;IAExD;;;OAGG;IACY,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAKzC,OAAO,CAAC,cAAc;CAmBvB"}

package/build/devtools/MessageFramePacker.d.ts

@@ -1,25 +1,33 @@
 /**
- * A message frame packer that serializes a messageKey and a payload into a binary format.
+ * A message frame packer that serializes a messageKey and a payload into either a JSON string
+ * (fast path) or a binary format (for complex payloads).
  *
- * +------------------+-------------------+----------------------------+--------------------------+
- * | 4 bytes (Uint32) | Variable length   | 1 byte (Uint8)             | Variable length          |
- * | MessageKeyLength | MessageKey (JSON) | PayloadTypeIndicator (enum)| Payload (binary data)    |
- * +------------------+-------------------+----------------------------+--------------------------+
+ * Fast Path (JSON.stringify/JSON.parse):
+ * - For simple payloads (e.g., strings, numbers, null, undefined, or plain objects), the packer
+ *   uses `JSON.stringify` for serialization and `JSON.parse` for deserialization, ensuring
+ *   optimal performance.
  *
- * MessageFrame Format:
+ * Binary Format:
+ * - For more complex payloads (e.g., Uint8Array, ArrayBuffer, Blob), the packer uses a binary
+ *   format with the following structure:
  *
- * 1. MessageKeyLength (4 bytes):
- *    - A 4-byte unsigned integer indicating the length of the MessageKey JSON string.
+ *   +------------------+-------------------+----------------------------+--------------------------+
+ *   | 4 bytes (Uint32) | Variable length   | 1 byte (Uint8)             | Variable length          |
+ *   | MessageKeyLength | MessageKey (JSON) | PayloadTypeIndicator (enum)| Payload (binary data)    |
+ *   +------------------+-------------------+----------------------------+--------------------------+
  *
- * 2. MessageKey (Variable length):
- *    - The JSON string representing the message key, encoded as UTF-8.
+ *   1. MessageKeyLength (4 bytes):
+ *      - A 4-byte unsigned integer indicating the length of the MessageKey JSON string.
  *
- * 3. PayloadTypeIndicator (1 byte):
- *    - A single byte enum value representing the type of the payload (e.g., Uint8Array, String, Object, ArrayBuffer, Blob).
+ *   2. MessageKey (Variable length):
+ *      - The JSON string representing the message key, encoded as UTF-8.
  *
- * 4. Payload (Variable length):
- *    - The actual payload data, which can vary in type and length depending on the PayloadType.
+ *   3. PayloadTypeIndicator (1 byte):
+ *      - A single byte enum value representing the type of the payload (e.g., Uint8Array, String,
+ *        Object, ArrayBuffer, Blob).
  *
+ *   4. Payload (Variable length):
+ *      - The actual payload data, which can vary in type and length depending on the PayloadType.
  */
 type MessageKeyTypeBase = string | object;
 type PayloadType = Uint8Array | string | number | null | undefined | object | ArrayBuffer | Blob;
@@ -30,9 +38,11 @@ interface MessageFrame<T extends MessageKeyTypeBase> {
 export declare class MessageFramePacker<T extends MessageKeyTypeBase> {
     private textEncoder;
     private textDecoder;
-    pack({ messageKey, payload }: MessageFrame<T>): Promise<Uint8Array>;
-    unpack(packedData: ArrayBuffer): Promise<MessageFrame<T>>;
+    pack({ messageKey, payload }: MessageFrame<T>, useLegacyTransport?: boolean): string | Uint8Array | Promise<Uint8Array>;
+    unpack(packedData: string | ArrayBuffer): MessageFrame<T>;
+    private isFastPathPayload;
     private payloadToUint8Array;
+    private packImpl;
     private deserializePayload;
     private static getPayloadTypeIndicator;
 }

package/build/devtools/MessageFramePacker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageFramePacker.d.ts","sourceRoot":"","sources":["../../src/devtools/MessageFramePacker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAIH,KAAK,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAAC;AAC1C,KAAK,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,IAAI,CAAC;AAajG,UAAU,YAAY,CAAC,CAAC,SAAS,kBAAkB;IACjD,UAAU,EAAE,CAAC,CAAC;IACd,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,qBAAa,kBAAkB,CAAC,CAAC,SAAS,kBAAkB;IAC1D,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,WAAW,CAAqB;IAE3B,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IA2BnE,MAAM,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAqBxD,mBAAmB;YAuBnB,kBAAkB;IAoChC,OAAO,CAAC,MAAM,CAAC,uBAAuB;CAqBvC"}
+{"version":3,"file":"MessageFramePacker.d.ts","sourceRoot":"","sources":["../../src/devtools/MessageFramePacker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAIH,KAAK,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAAC;AAC1C,KAAK,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,IAAI,CAAC;AAajG,UAAU,YAAY,CAAC,CAAC,SAAS,kBAAkB;IACjD,UAAU,EAAE,CAAC,CAAC;IACd,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,qBAAa,kBAAkB,CAAC,CAAC,SAAS,kBAAkB;IAC1D,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,WAAW,CAAqB;IAEjC,IAAI,CACT,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,EACxC,kBAAkB,CAAC,EAAE,OAAO,GAC3B,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IA2BrC,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC;IA0BhE,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,QAAQ;IA8BhB,OAAO,CAAC,kBAAkB;IAoC1B,OAAO,CAAC,MAAM,CAAC,uBAAuB;CAqBvC"}

package/build/devtools/ProtocolVersion.d.ts

@@ -0,0 +1,7 @@
+/**
+ * A transport protocol version between the app and the webui.
+ * It shows a warning in handshaking stage if the version is different between the app and the webui.
+ * The value should be increased when the protocol is changed.
+ */
+export declare const PROTOCOL_VERSION = 1;
+//# sourceMappingURL=ProtocolVersion.d.ts.map

package/build/devtools/ProtocolVersion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProtocolVersion.d.ts","sourceRoot":"","sources":["../../src/devtools/ProtocolVersion.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,IAAI,CAAC"}

package/build/devtools/devtools.types.d.ts

@@ -15,14 +15,10 @@ export interface ConnectionInfo {
      * @hidden
      */
     wsStore?: WebSocketBackingStore;
-}
-/**
- * Parameters for the `handshake` message.
- * @hidden
- */
-export interface HandshakeMessageParams {
-    browserClientId: string;
-    pluginName: string;
+    /**
+     * The transport protocol version between the app and the webui.
+     */
+    protocolVersion: number;
 }
 /**
  * Options for the devtools plugin client.
@@ -33,4 +29,14 @@ export interface DevToolsPluginClientOptions {
      */
     websocketBinaryType?: 'arraybuffer' | 'blob';
 }
+/**
+ * The handshake messages for the devtools plugin client.
+ * @hidden
+ */
+export interface HandshakeMessageParams {
+    protocolVersion: number;
+    pluginName: string;
+    method: 'handshake' | 'terminateBrowserClient';
+    browserClientId: string;
+}
 //# sourceMappingURL=devtools.types.d.ts.map

package/build/devtools/devtools.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtools.types.d.ts","sourceRoot":"","sources":["../../src/devtools/devtools.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,wDAAwD;IACxD,MAAM,EACF,KAAK,GACL,SAAS,CAAC;IAEd,0BAA0B;IAC1B,SAAS,EAAE,MAAM,CAAC;IAElB,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,mBAAmB,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;CAC9C"}
+{"version":3,"file":"devtools.types.d.ts","sourceRoot":"","sources":["../../src/devtools/devtools.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,wDAAwD;IACxD,MAAM,EACF,KAAK,GACL,SAAS,CAAC;IAEd,0BAA0B;IAC1B,SAAS,EAAE,MAAM,CAAC;IAElB,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAEhC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,mBAAmB,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;CAC9C;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,GAAG,wBAAwB,CAAC;IAC/C,eAAe,EAAE,MAAM,CAAC;CACzB"}

package/build/devtools/getConnectionInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getConnectionInfo.d.ts","sourceRoot":"","sources":["../../src/devtools/getConnectionInfo.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAOtE"}
+{"version":3,"file":"getConnectionInfo.d.ts","sourceRoot":"","sources":["../../src/devtools/getConnectionInfo.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAQtE"}

package/build/devtools/getConnectionInfo.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getConnectionInfo.native.d.ts","sourceRoot":"","sources":["../../src/devtools/getConnectionInfo.native.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAStE"}
+{"version":3,"file":"getConnectionInfo.native.d.ts","sourceRoot":"","sources":["../../src/devtools/getConnectionInfo.native.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAUtE"}

package/bundledNativeModules.json

@@ -1,4 +1,12 @@
 {
+  "@dev-plugins/apollo-client": "~0.2.0",
+  "@dev-plugins/async-storage": "~0.2.0",
+  "@dev-plugins/react-native-mmkv": "~0.2.0",
+  "@dev-plugins/react-navigation": "~0.2.0",
+  "@dev-plugins/react-query": "~0.2.0",
+  "@dev-plugins/redux": "~0.2.0",
+  "@dev-plugins/tinybase": "~0.2.0",
+  "@dev-plugins/vanilla-log-viewer": "~0.2.0",
   "@expo/metro-runtime": "~4.0.1",
   "@expo/vector-icons": "^14.0.2",
   "@react-native-async-storage/async-storage": "1.23.1",
@@ -43,7 +51,7 @@
   "expo-gl": "~15.0.4",
   "expo-google-app-auth": "~8.3.0",
   "expo-haptics": "~14.0.1",
-  "expo-image": "~2.0.6",
+  "expo-image": "~2.0.7",
   "expo-image-loader": "~5.0.0",
   "expo-image-manipulator": "~13.0.6",
   "expo-image-picker": "~16.0.6",
@@ -54,12 +62,12 @@
   "expo-linking": "~7.0.5",
   "expo-local-authentication": "~15.0.2",
   "expo-localization": "~16.0.1",
-  "expo-location": "~18.0.8",
+  "expo-location": "~18.0.9",
   "expo-mail-composer": "~14.0.2",
   "expo-media-library": "~17.0.6",
-  "expo-module-template": "~10.15.13",
+  "expo-module-template": "~10.15.14",
   "expo-modules-core": "~2.2.3",
-  "expo-navigation-bar": "~4.0.8",
+  "expo-navigation-bar": "~4.0.9",
   "expo-network": "~7.0.5",
   "expo-notifications": "~0.29.14",
   "expo-print": "~14.0.3",
@@ -72,11 +80,11 @@
   "expo-sms": "~13.0.1",
   "expo-speech": "~13.0.1",
   "expo-splash-screen": "~0.29.22",
-  "expo-sqlite": "~15.1.2",
+  "expo-sqlite": "~15.1.3",
   "expo-status-bar": "~2.0.1",
   "expo-store-review": "~8.0.1",
   "expo-symbols": "~0.2.2",
-  "expo-system-ui": "~4.0.8",
+  "expo-system-ui": "~4.0.9",
   "expo-task-manager": "~12.0.5",
   "expo-tracking-transparency": "~5.1.1",
   "expo-updates": "~0.27.4",
@@ -87,7 +95,7 @@
   "lottie-react-native": "7.1.0",
   "react": "18.3.1",
   "react-dom": "18.3.1",
-  "react-native": "0.76.7",
+  "react-native": "0.76.8",
   "react-native-web": "~0.19.13",
   "react-native-gesture-handler": "~2.20.2",
   "react-native-get-random-values": "~1.11.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "52.0.40",
+  "version": "52.0.42",
   "description": "The Expo SDK",
   "main": "src/Expo.ts",
   "module": "src/Expo.ts",
@@ -10,7 +10,11 @@
     "*.fx.web.tsx",
     "./src/winter/*.ts"
   ],
-  "bin": "bin/cli",
+  "bin": {
+    "expo": "bin/cli",
+    "expo-modules-autolinking": "bin/autolinking",
+    "fingerprint": "bin/fingerprint"
+  },
   "files": [
     "android",
     "bin",
@@ -68,13 +72,13 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo",
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@expo/cli": "0.22.21",
+    "@expo/cli": "0.22.23",
     "@expo/config": "~10.0.11",
     "@expo/config-plugins": "~9.0.17",
     "@expo/fingerprint": "0.11.11",
     "@expo/metro-config": "0.19.12",
     "@expo/vector-icons": "^14.0.0",
-    "babel-preset-expo": "~12.0.9",
+    "babel-preset-expo": "~12.0.10",
     "expo-asset": "~11.0.5",
     "expo-constants": "~17.0.8",
     "expo-file-system": "~18.0.12",
@@ -92,7 +96,7 @@
     "expo-module-scripts": "^4.0.4",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-native": "0.76.7"
+    "react-native": "0.76.8"
   },
   "peerDependencies": {
     "@expo/dom-webview": "*",
@@ -112,5 +116,5 @@
       "optional": true
     }
   },
-  "gitHead": "0d83355bc0ec72f115de85eb418aaf9500c68528"
+  "gitHead": "efc676ef6dbe6c2eaed19c1a31abb79a935f583a"
 }

package/src/devtools/DevToolsPluginClient.ts

@@ -3,7 +3,11 @@ import { EventEmitter, EventSubscription } from 'fbemitter';
 import { MessageFramePacker } from './MessageFramePacker';
 import { WebSocketBackingStore } from './WebSocketBackingStore';
 import { WebSocketWithReconnect } from './WebSocketWithReconnect';
-import type { ConnectionInfo, DevToolsPluginClientOptions } from './devtools.types';
+import type {
+  ConnectionInfo,
+  DevToolsPluginClientOptions,
+  HandshakeMessageParams,
+} from './devtools.types';
 import * as logger from './logger';
 import { blobToArrayBufferAsync } from '../utils/blobUtils';
 
@@ -66,20 +70,33 @@ export abstract class DevToolsPluginClient {
    * @param params any extra payload.
    */
   public sendMessage(method: string, params: any) {
+    this.sendMessageImpl(method, params, false);
+  }
+
+  protected sendMessageLegacy(method: string, params: any) {
+    this.sendMessageImpl(method, params, true);
+  }
+
+  private sendMessageImpl(method: string, params: any, useLegacyTransport: boolean) {
     if (this.wsStore.ws?.readyState === WebSocket.CLOSED) {
       logger.warn('Unable to send message in a disconnected state.');
       return;
     }
-    this.sendMessageImpl(method, params);
-  }
-
-  private async sendMessageImpl(method: string, params: any) {
     const messageKey: MessageFramePackerMessageKey = {
       pluginName: this.connectionInfo.pluginName,
       method,
     };
-    const packedData = await this.messageFramePacker.pack({ messageKey, payload: params });
-    this.wsStore.ws?.send(packedData);
+    const packedData = this.messageFramePacker.pack(
+      { messageKey, payload: params },
+      useLegacyTransport
+    );
+    if (!(packedData instanceof Promise)) {
+      this.wsStore.ws?.send(packedData);
+      return;
+    }
+    packedData.then((data) => {
+      this.wsStore.ws?.send(data);
+    });
   }
 
   /**
@@ -100,6 +117,51 @@ export abstract class DevToolsPluginClient {
     this.eventEmitter.once(method, listener);
   }
 
+  /**
+   * Internal handshake message sender.
+   * @hidden
+   */
+  protected sendHandshakeMessage(params: HandshakeMessageParams) {
+    if (this.wsStore.ws?.readyState === WebSocket.CLOSED) {
+      logger.warn('Unable to send message in a disconnected state.');
+      return;
+    }
+    this.wsStore.ws?.send(JSON.stringify({ ...params, __isHandshakeMessages: true }));
+  }
+
+  /**
+   * Internal handshake message listener.
+   * @hidden
+   */
+  protected addHandskakeMessageListener(
+    listener: (params: HandshakeMessageParams) => void
+  ): Partial<EventSubscription> {
+    const messageListener = (event: MessageEvent) => {
+      if (typeof event.data !== 'string') {
+        // binary data is not coming from the handshake messages.
+        return;
+      }
+
+      const data = JSON.parse(event.data);
+      if (!data.__isHandshakeMessages) {
+        return;
+      }
+      delete data.__isHandshakeMessages;
+      const params = data as HandshakeMessageParams;
+      if (params.pluginName && params.pluginName !== this.connectionInfo.pluginName) {
+        return;
+      }
+      listener(params);
+    };
+
+    this.wsStore.ws?.addEventListener('message', messageListener);
+    return {
+      remove: () => {
+        this.wsStore.ws?.removeEventListener('message', messageListener);
+      },
+    };
+  }
+
   /**
    * Returns whether the client is connected to the server.
    */
@@ -135,23 +197,25 @@ export abstract class DevToolsPluginClient {
     });
   }
 
-  protected handleMessage = (event: WebSocketMessageEvent) => {
-    this.handleMessageImpl(event);
-  };
-
-  private handleMessageImpl = async (event: WebSocketMessageEvent) => {
-    let buffer: ArrayBuffer;
-    if (event.data instanceof ArrayBuffer) {
-      buffer = event.data;
+  protected handleMessage = async (event: WebSocketMessageEvent) => {
+    let data: ArrayBuffer | string;
+    if (typeof event.data === 'string') {
+      data = event.data;
+    } else if (event.data instanceof ArrayBuffer) {
+      data = event.data;
     } else if (ArrayBuffer.isView(event.data)) {
-      buffer = event.data.buffer;
+      data = event.data.buffer;
     } else if (event.data instanceof Blob) {
-      buffer = await blobToArrayBufferAsync(event.data);
+      data = await blobToArrayBufferAsync(event.data);
     } else {
       logger.warn('Unsupported received data type in handleMessageImpl');
       return;
     }
-    const { messageKey, payload } = await this.messageFramePacker.unpack(buffer);
+    const { messageKey, payload, ...rest } = this.messageFramePacker.unpack(data);
+    // @ts-expect-error: `__isHandshakeMessages` is a private field that is not part of the MessageFramePacker type.
+    if (rest?.__isHandshakeMessages === true) {
+      return;
+    }
     if (messageKey.pluginName && messageKey.pluginName !== this.connectionInfo.pluginName) {
       return;
     }

package/src/devtools/DevToolsPluginClientImplApp.ts

@@ -2,12 +2,16 @@ import { DevToolsPluginClient } from './DevToolsPluginClient';
 import type { HandshakeMessageParams } from './devtools.types';
 import * as logger from './logger';
 
+interface BrowserClientMetadata {
+  browserClientId: string;
+  useLegacyTransport?: boolean;
+}
+
 /**
  * The DevToolsPluginClient for the app -> browser communication.
  */
 export class DevToolsPluginClientImplApp extends DevToolsPluginClient {
-  // Map of pluginName -> browserClientId
-  private browserClientMap: Record<string, string> = {};
+  private browserClientMap: Record<string, BrowserClientMetadata> = {};
 
   /**
    * Initialize the connection.
@@ -18,16 +22,71 @@ export class DevToolsPluginClientImplApp extends DevToolsPluginClient {
     this.addHandshakeHandler();
   }
 
+  override sendMessage(method: string, params: any) {
+    const pluginName = this.connectionInfo.pluginName;
+    const useLegacyTransport = this.browserClientMap[pluginName]?.useLegacyTransport ?? false;
+    if (useLegacyTransport) {
+      this.sendMessageLegacy(method, params);
+    } else {
+      super.sendMessage(method, params);
+    }
+  }
+
   private addHandshakeHandler() {
+    this.addHandskakeMessageListener((params) => {
+      if (params.method === 'handshake') {
+        const { pluginName, protocolVersion } = params;
+
+        // [0] Check protocol version
+        if (protocolVersion !== this.connectionInfo.protocolVersion) {
+          // Use console.warn than logger because we want to show the warning even logging is disabled.
+          console.warn(
+            `Received an incompatible devtools plugin handshake message - pluginName[${pluginName}]`
+          );
+          this.terminateBrowserClient(pluginName, params.browserClientId);
+          return;
+        }
+
+        // [1] Terminate duplicated browser clients for the same plugin
+        const previousBrowserClientMetadata = this.browserClientMap[pluginName];
+        const previousBrowserClientId = previousBrowserClientMetadata?.browserClientId;
+        if (previousBrowserClientId != null && previousBrowserClientId !== params.browserClientId) {
+          logger.info(
+            `Terminate the previous browser client connection - previousBrowserClientId[${previousBrowserClientId}]`
+          );
+          this.terminateBrowserClient(pluginName, previousBrowserClientId);
+        }
+        this.browserClientMap[pluginName] = {
+          browserClientId: params.browserClientId,
+        };
+      }
+    });
+
+    // backward compatible handshaking
     this.addMessageListener('handshake', (params: HandshakeMessageParams) => {
-      const previousBrowserClientId = this.browserClientMap[params.pluginName];
+      console.warn(`Received a legacy plugin handshake message - pluginName[${params.pluginName}]`);
+      const { pluginName } = params;
+      const previousBrowserClientMetadata = this.browserClientMap[pluginName];
+      const previousBrowserClientId = previousBrowserClientMetadata?.browserClientId;
       if (previousBrowserClientId != null && previousBrowserClientId !== params.browserClientId) {
         logger.info(
           `Terminate the previous browser client connection - previousBrowserClientId[${previousBrowserClientId}]`
         );
         this.sendMessage('terminateBrowserClient', { browserClientId: previousBrowserClientId });
       }
-      this.browserClientMap[params.pluginName] = params.browserClientId;
+      this.browserClientMap[pluginName] = {
+        browserClientId: params.browserClientId,
+        useLegacyTransport: true,
+      };
+    });
+  }
+
+  private terminateBrowserClient(pluginName: string, browserClientId: string) {
+    this.sendHandshakeMessage({
+      protocolVersion: this.connectionInfo.protocolVersion,
+      method: 'terminateBrowserClient',
+      browserClientId,
+      pluginName,
     });
   }
 }

package/src/devtools/DevToolsPluginClientImplBrowser.ts

@@ -17,16 +17,22 @@ export class DevToolsPluginClientImplBrowser extends DevToolsPluginClient {
   }
 
   private startHandshake() {
-    this.addMessageListener('terminateBrowserClient', (params) => {
-      if (this.browserClientId !== params.browserClientId) {
-        return;
+    this.addHandskakeMessageListener((params) => {
+      if (
+        params.method === 'terminateBrowserClient' &&
+        this.browserClientId === params.browserClientId
+      ) {
+        logger.info(
+          'Received terminateBrowserClient messages and terminate the current connection'
+        );
+        this.closeAsync();
       }
-      logger.info('Received terminateBrowserClient messages and terminate the current connection');
-      this.closeAsync();
     });
-    this.sendMessage('handshake', {
-      browserClientId: this.browserClientId,
+    this.sendHandshakeMessage({
+      protocolVersion: this.connectionInfo.protocolVersion,
       pluginName: this.connectionInfo.pluginName,
+      method: 'handshake',
+      browserClientId: this.browserClientId,
     });
   }
 }

package/src/devtools/MessageFramePacker.ts

@@ -1,25 +1,33 @@
 /**
- * A message frame packer that serializes a messageKey and a payload into a binary format.
+ * A message frame packer that serializes a messageKey and a payload into either a JSON string
+ * (fast path) or a binary format (for complex payloads).
  *
- * +------------------+-------------------+----------------------------+--------------------------+
- * | 4 bytes (Uint32) | Variable length   | 1 byte (Uint8)             | Variable length          |
- * | MessageKeyLength | MessageKey (JSON) | PayloadTypeIndicator (enum)| Payload (binary data)    |
- * +------------------+-------------------+----------------------------+--------------------------+
+ * Fast Path (JSON.stringify/JSON.parse):
+ * - For simple payloads (e.g., strings, numbers, null, undefined, or plain objects), the packer
+ *   uses `JSON.stringify` for serialization and `JSON.parse` for deserialization, ensuring
+ *   optimal performance.
  *
- * MessageFrame Format:
+ * Binary Format:
+ * - For more complex payloads (e.g., Uint8Array, ArrayBuffer, Blob), the packer uses a binary
+ *   format with the following structure:
  *
- * 1. MessageKeyLength (4 bytes):
- *    - A 4-byte unsigned integer indicating the length of the MessageKey JSON string.
+ *   +------------------+-------------------+----------------------------+--------------------------+
+ *   | 4 bytes (Uint32) | Variable length   | 1 byte (Uint8)             | Variable length          |
+ *   | MessageKeyLength | MessageKey (JSON) | PayloadTypeIndicator (enum)| Payload (binary data)    |
+ *   +------------------+-------------------+----------------------------+--------------------------+
  *
- * 2. MessageKey (Variable length):
- *    - The JSON string representing the message key, encoded as UTF-8.
+ *   1. MessageKeyLength (4 bytes):
+ *      - A 4-byte unsigned integer indicating the length of the MessageKey JSON string.
  *
- * 3. PayloadTypeIndicator (1 byte):
- *    - A single byte enum value representing the type of the payload (e.g., Uint8Array, String, Object, ArrayBuffer, Blob).
+ *   2. MessageKey (Variable length):
+ *      - The JSON string representing the message key, encoded as UTF-8.
  *
- * 4. Payload (Variable length):
- *    - The actual payload data, which can vary in type and length depending on the PayloadType.
+ *   3. PayloadTypeIndicator (1 byte):
+ *      - A single byte enum value representing the type of the payload (e.g., Uint8Array, String,
+ *        Object, ArrayBuffer, Blob).
  *
+ *   4. Payload (Variable length):
+ *      - The actual payload data, which can vary in type and length depending on the PayloadType.
  */
 
 import { blobToArrayBufferAsync } from '../utils/blobUtils';
@@ -47,34 +55,42 @@ export class MessageFramePacker<T extends MessageKeyTypeBase> {
   private textEncoder = new TextEncoder();
   private textDecoder = new TextDecoder();
 
-  public async pack({ messageKey, payload }: MessageFrame<T>): Promise<Uint8Array> {
-    const messageKeyString = JSON.stringify(messageKey);
-    const messageKeyBytes = this.textEncoder.encode(messageKeyString);
-    const messageKeyLength = messageKeyBytes.length;
-    const payloadBinary = await this.payloadToUint8Array(payload);
-
-    const totalLength = 4 + messageKeyLength + 1 + payloadBinary.byteLength;
-    const buffer = new ArrayBuffer(totalLength);
-    const packedArray = new Uint8Array(buffer);
-
-    // [0] messageKeyLength (4 bytes)
-    const messageKeyLengthView = new DataView(buffer, 0, 4);
-    messageKeyLengthView.setUint32(0, messageKeyLength, false);
-
-    // [1] messageKey (variable length)
-    packedArray.set(messageKeyBytes, 4);
-
-    // [2] payloadTypeIndicator (1 byte)
-    const payloadTypeView = new DataView(buffer, 4 + messageKeyLength, 1);
-    payloadTypeView.setUint8(0, MessageFramePacker.getPayloadTypeIndicator(payload));
+  public pack(
+    { messageKey, payload }: MessageFrame<T>,
+    useLegacyTransport?: boolean
+  ): string | Uint8Array | Promise<Uint8Array> {
+    // Fast path to pack as string given `JSON.stringify` is fast.
+    if (this.isFastPathPayload(payload) && !useLegacyTransport) {
+      return JSON.stringify({ messageKey, payload });
+    }
 
-    // [3] payload (variable length)
-    packedArray.set(payloadBinary, 4 + messageKeyLength + 1);
+    // Slowest path for Blob returns a promise.
+    if (payload instanceof Blob) {
+      return new Promise(async (resolve, reject) => {
+        try {
+          const arrayBuffer = await blobToArrayBufferAsync(payload);
+          resolve(
+            this.packImpl(
+              { messageKey, payload: new Uint8Array(arrayBuffer) },
+              PayloadTypeIndicator.Blob
+            )
+          );
+        } catch (error) {
+          reject(error);
+        }
+      });
+    }
 
-    return packedArray;
+    // Slow path for other types returns a Uint8Array.
+    return this.packImpl({ messageKey, payload }, undefined);
   }
 
-  public async unpack(packedData: ArrayBuffer): Promise<MessageFrame<T>> {
+  public unpack(packedData: string | ArrayBuffer): MessageFrame<T> {
+    // Fast path to unpack as string given `JSON.parse` is fast.
+    if (typeof packedData === 'string') {
+      return JSON.parse(packedData);
+    }
+
     // [0] messageKeyLength (4 bytes)
     const messageKeyLengthView = new DataView(packedData, 0, 4);
     const messageKeyLength = messageKeyLengthView.getUint32(0, false);
@@ -90,12 +106,26 @@ export class MessageFramePacker<T extends MessageKeyTypeBase> {
 
     // [3] payload (variable length)
     const payloadBinary = packedData.slice(4 + messageKeyLength + 1);
-    const payload = await this.deserializePayload(payloadBinary, payloadType);
+    const payload = this.deserializePayload(payloadBinary, payloadType);
 
     return { messageKey, payload };
   }
 
-  private async payloadToUint8Array(payload: PayloadType): Promise<Uint8Array> {
+  private isFastPathPayload(payload: PayloadType): boolean {
+    if (payload == null) {
+      return true;
+    }
+    const payloadType = typeof payload;
+    if (payloadType === 'string' || payloadType === 'number') {
+      return true;
+    }
+    if (payloadType === 'object' && payload.constructor === Object) {
+      return true;
+    }
+    return false;
+  }
+
+  private payloadToUint8Array(payload: PayloadType): Uint8Array {
     if (payload instanceof Uint8Array) {
       return payload;
     } else if (typeof payload === 'string') {
@@ -112,16 +142,46 @@ export class MessageFramePacker<T extends MessageKeyTypeBase> {
     } else if (payload instanceof ArrayBuffer) {
       return new Uint8Array(payload);
     } else if (payload instanceof Blob) {
-      return new Uint8Array(await blobToArrayBufferAsync(payload));
+      throw new Error('Blob is not supported in this callsite.');
     } else {
       return this.textEncoder.encode(JSON.stringify(payload));
     }
   }
 
-  private async deserializePayload(
+  private packImpl(
+    { messageKey, payload }: MessageFrame<T>,
+    payloadType: PayloadTypeIndicator | undefined
+  ): Promise<Uint8Array> | Uint8Array {
+    const messageKeyString = JSON.stringify(messageKey);
+    const messageKeyBytes = this.textEncoder.encode(messageKeyString);
+    const messageKeyLength = messageKeyBytes.length;
+    const payloadBinary = this.payloadToUint8Array(payload);
+
+    const totalLength = 4 + messageKeyLength + 1 + payloadBinary.byteLength;
+    const buffer = new ArrayBuffer(totalLength);
+    const packedArray = new Uint8Array(buffer);
+
+    // [0] messageKeyLength (4 bytes)
+    const messageKeyLengthView = new DataView(buffer, 0, 4);
+    messageKeyLengthView.setUint32(0, messageKeyLength, false);
+
+    // [1] messageKey (variable length)
+    packedArray.set(messageKeyBytes, 4);
+
+    // [2] payloadTypeIndicator (1 byte)
+    const payloadTypeView = new DataView(buffer, 4 + messageKeyLength, 1);
+    payloadTypeView.setUint8(0, payloadType ?? MessageFramePacker.getPayloadTypeIndicator(payload));
+
+    // [3] payload (variable length)
+    packedArray.set(payloadBinary, 4 + messageKeyLength + 1);
+
+    return packedArray;
+  }
+
+  private deserializePayload(
     payloadBinary: ArrayBuffer,
     payloadTypeIndicator: PayloadTypeIndicator
-  ): Promise<PayloadType> {
+  ): PayloadType {
     switch (payloadTypeIndicator) {
       case PayloadTypeIndicator.Uint8Array: {
         return new Uint8Array(payloadBinary);

package/src/devtools/ProtocolVersion.ts

@@ -0,0 +1,6 @@
+/**
+ * A transport protocol version between the app and the webui.
+ * It shows a warning in handshaking stage if the version is different between the app and the webui.
+ * The value should be increased when the protocol is changed.
+ */
+export const PROTOCOL_VERSION = 1;

package/src/devtools/__tests__/DevToolsPluginClient-test.ts

@@ -12,6 +12,8 @@ globalThis.WebSocket = MockWebSocket;
 globalThis.TextDecoder ??= TextDecoder;
 globalThis.TextEncoder ??= TextEncoder;
 
+const TEST_PROTOCOL_VERSION = 1;
+
 describe(`DevToolsPluginClient`, () => {
   let appClient: DevToolsPluginClient;
   let testCaseCounter = 0;
@@ -23,6 +25,7 @@ describe(`DevToolsPluginClient`, () => {
     testCaseCounter += 1;
     devServer = `localhost:${8000 + testCaseCounter}`;
     appClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'app',
       pluginName,
@@ -62,12 +65,14 @@ describe(`DevToolsPluginClient (browser <> app)`, () => {
     const message = { foo: 'bar' };
 
     appClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'app',
       pluginName,
       wsStore: new WebSocketBackingStore(),
     });
     browserClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'browser',
       pluginName,
@@ -87,12 +92,14 @@ describe(`DevToolsPluginClient (browser <> app)`, () => {
 
   it('should support ping-pong messages', async () => {
     appClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'app',
       pluginName,
       wsStore: new WebSocketBackingStore(),
     });
     browserClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'browser',
       pluginName,
@@ -123,12 +130,14 @@ describe(`DevToolsPluginClient (browser <> app)`, () => {
     const message = { foo: 'bar' };
 
     appClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'app',
       pluginName,
       wsStore: new WebSocketBackingStore(),
     });
     browserClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'browser',
       pluginName: 'pluginB',
@@ -149,6 +158,7 @@ describe(`DevToolsPluginClient (browser <> app)`, () => {
     const method = 'testMethod';
 
     appClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'app',
       pluginName,
@@ -160,6 +170,7 @@ describe(`DevToolsPluginClient (browser <> app)`, () => {
     });
 
     browserClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'browser',
       pluginName,
@@ -168,6 +179,7 @@ describe(`DevToolsPluginClient (browser <> app)`, () => {
 
     await delayAsync(100);
     const browserClient2 = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'browser',
       pluginName,
@@ -185,6 +197,34 @@ describe(`DevToolsPluginClient (browser <> app)`, () => {
     expect(receivedMessages[0]).toEqual({ from: 'browserClient2' });
     await browserClient2.closeAsync();
   });
+
+  it('should terminate client from incompatible protocol version', async () => {
+    const spyConsoleInfo = jest.spyOn(console, 'info').mockImplementation(() => {});
+    const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation(() => {});
+    appClient = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
+      devServer,
+      sender: 'app',
+      pluginName,
+      wsStore: new WebSocketBackingStore(),
+    });
+    browserClient = await createDevToolsPluginClient({
+      protocolVersion: -1,
+      devServer,
+      sender: 'browser',
+      pluginName,
+      wsStore: new WebSocketBackingStore(),
+    });
+
+    await delayAsync(100);
+    expect(spyConsoleWarn).toHaveBeenCalledWith(
+      `Received an incompatible devtools plugin handshake message - pluginName[${pluginName}]`
+    );
+    expect(browserClient.isConnected()).toBe(false);
+
+    spyConsoleInfo.mockRestore();
+    spyConsoleWarn.mockRestore();
+  });
 });
 
 describe(`DevToolsPluginClient - multiplexing`, () => {
@@ -200,12 +240,14 @@ describe(`DevToolsPluginClient - multiplexing`, () => {
   it('should not close the websocket connection while there are alive clients', async () => {
     const wsStore = new WebSocketBackingStore();
     const appClient1 = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'app',
       pluginName: 'plugin1',
       wsStore,
     });
     const appClient2 = await createDevToolsPluginClient({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       devServer,
       sender: 'app',
       pluginName: 'plugin2',

package/src/devtools/__tests__/DevToolsPluginClientFactory-test.ts

@@ -18,6 +18,8 @@ globalThis.WebSocket = MockWebSocket;
 globalThis.TextDecoder ??= TextDecoder;
 globalThis.TextEncoder ??= TextEncoder;
 
+const TEST_PROTOCOL_VERSION = 1;
+
 describe(getDevToolsPluginClientAsync, () => {
   const mockGetConnectionInfo = getConnectionInfo as jest.MockedFunction<typeof getConnectionInfo>;
 
@@ -28,6 +30,7 @@ describe(getDevToolsPluginClientAsync, () => {
 
   it('should return a DevToolsPluginClientImplApp client when sender is from app', async () => {
     mockGetConnectionInfo.mockReturnValue({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       sender: 'app',
       devServer: 'localhost:8081',
     });
@@ -37,6 +40,7 @@ describe(getDevToolsPluginClientAsync, () => {
 
   it('should return a DevToolsPluginClientImplApp client when sender is from browser', async () => {
     mockGetConnectionInfo.mockReturnValue({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       sender: 'browser',
       devServer: 'localhost:8081',
     });
@@ -46,6 +50,7 @@ describe(getDevToolsPluginClientAsync, () => {
 
   it('should return the same client from the same plugin name when called multiple times', async () => {
     mockGetConnectionInfo.mockReturnValue({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       sender: 'app',
       devServer: 'localhost:8081',
     });
@@ -58,6 +63,7 @@ describe(getDevToolsPluginClientAsync, () => {
 
   it('should return a new client from the same plugin name from disconnected', async () => {
     mockGetConnectionInfo.mockReturnValue({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       sender: 'app',
       devServer: 'localhost:8081',
     });
@@ -73,12 +79,14 @@ describe(getDevToolsPluginClientAsync, () => {
     const pluginName = 'testPlugin';
 
     mockGetConnectionInfo.mockReturnValueOnce({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       sender: 'app',
       devServer: 'localhost:8081',
     });
     const client = await getDevToolsPluginClientAsync(pluginName);
 
     mockGetConnectionInfo.mockReturnValueOnce({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       sender: 'app',
       devServer: 'localhost:8082',
     });
@@ -89,6 +97,7 @@ describe(getDevToolsPluginClientAsync, () => {
 
   it('should have at most one client per plugin name', async () => {
     mockGetConnectionInfo.mockReturnValue({
+      protocolVersion: TEST_PROTOCOL_VERSION,
       sender: 'app',
       devServer: 'localhost:8081',
     });

package/src/devtools/__tests__/MessageFramePack-test.node.ts

@@ -13,8 +13,11 @@ describe(MessageFramePacker, () => {
       payload: 'testPayload',
     };
 
-    const packedData = await packer.pack(messageFrame);
-    const unpackedData = await packer.unpack(packedData.buffer);
+    const packedData = packer.pack(messageFrame);
+    if (packedData instanceof Promise || packedData instanceof Uint8Array) {
+      throw new Error('Unexpected packed data type');
+    }
+    const unpackedData = packer.unpack(packedData);
     expect(unpackedData).toEqual(messageFrame);
   });
 
@@ -24,8 +27,11 @@ describe(MessageFramePacker, () => {
       payload: 12345,
     };
 
-    const packedData = await packer.pack(messageFrame);
-    const unpackedData = await packer.unpack(packedData.buffer);
+    const packedData = packer.pack(messageFrame);
+    if (packedData instanceof Promise || packedData instanceof Uint8Array) {
+      throw new Error('Unexpected packed data type');
+    }
+    const unpackedData = packer.unpack(packedData);
     expect(unpackedData).toEqual(messageFrame);
   });
 
@@ -35,8 +41,11 @@ describe(MessageFramePacker, () => {
       payload: null,
     };
 
-    const packedData = await packer.pack(messageFrame);
-    const unpackedData = await packer.unpack(packedData.buffer);
+    const packedData = packer.pack(messageFrame);
+    if (packedData instanceof Promise || packedData instanceof Uint8Array) {
+      throw new Error('Unexpected packed data type');
+    }
+    const unpackedData = packer.unpack(packedData);
     expect(unpackedData).toEqual(messageFrame);
   });
 
@@ -45,8 +54,11 @@ describe(MessageFramePacker, () => {
       messageKey: 'testKey',
     };
 
-    const packedData = await packer.pack(messageFrame);
-    const unpackedData = await packer.unpack(packedData.buffer);
+    const packedData = packer.pack(messageFrame);
+    if (packedData instanceof Promise || packedData instanceof Uint8Array) {
+      throw new Error('Unexpected packed data type');
+    }
+    const unpackedData = packer.unpack(packedData);
     expect(unpackedData).toEqual(messageFrame);
   });
 
@@ -56,8 +68,11 @@ describe(MessageFramePacker, () => {
       payload: { key: 'value' },
     };
 
-    const packedData = await packer.pack(messageFrame);
-    const unpackedData = await packer.unpack(packedData.buffer);
+    const packedData = packer.pack(messageFrame);
+    if (packedData instanceof Promise || packedData instanceof Uint8Array) {
+      throw new Error('Unexpected packed data type');
+    }
+    const unpackedData = packer.unpack(packedData);
     expect(unpackedData).toEqual(messageFrame);
   });
 
@@ -67,8 +82,11 @@ describe(MessageFramePacker, () => {
       payload: new Uint8Array([1, 2, 3, 4]),
     };
 
-    const packedData = await packer.pack(messageFrame);
-    const unpackedData = await packer.unpack(packedData.buffer);
+    const packedData = packer.pack(messageFrame);
+    if (packedData instanceof Promise || typeof packedData === 'string') {
+      throw new Error('Unexpected packed data type');
+    }
+    const unpackedData = packer.unpack(packedData.buffer);
     expect(unpackedData.messageKey).toEqual(messageFrame.messageKey);
     expect(unpackedData.payload).toEqual(messageFrame.payload);
   });
@@ -83,8 +101,11 @@ describe(MessageFramePacker, () => {
       payload: buffer,
     };
 
-    const packedData = await packer.pack(messageFrame);
-    const unpackedData = await packer.unpack(packedData.buffer);
+    const packedData = packer.pack(messageFrame);
+    if (packedData instanceof Promise || typeof packedData === 'string') {
+      throw new Error('Unexpected packed data type');
+    }
+    const unpackedData = packer.unpack(packedData.buffer);
     expect(unpackedData.messageKey).toEqual(messageFrame.messageKey);
     expect(new Uint8Array(unpackedData.payload as ArrayBuffer)).toEqual(view);
   });
@@ -97,8 +118,12 @@ describe(MessageFramePacker, () => {
       payload: blob,
     };
 
-    const packedData = await packer.pack(messageFrame);
-    const unpackedData = await packer.unpack(packedData.buffer);
+    const packedDataPromise = packer.pack(messageFrame);
+    if (packedDataPromise instanceof Uint8Array || typeof packedDataPromise === 'string') {
+      throw new Error('Unexpected packed data type');
+    }
+    const packedData = await packedDataPromise;
+    const unpackedData = packer.unpack(packedData.buffer);
     expect(unpackedData.messageKey).toEqual(messageFrame.messageKey);
     const unpackedBlob = unpackedData.payload as Blob;
     expect(await unpackedBlob.text()).toEqual(await blob.text());
@@ -111,8 +136,11 @@ describe(MessageFramePacker, () => {
       payload: 'testPayload',
     };
 
-    const packedData = await packerWithObjectKey.pack(messageFrame);
-    const unpackedData = await packerWithObjectKey.unpack(packedData.buffer);
+    const packedData = packerWithObjectKey.pack(messageFrame);
+    if (packedData instanceof Promise || packedData instanceof Uint8Array) {
+      throw new Error('Unexpected packed data type');
+    }
+    const unpackedData = packerWithObjectKey.unpack(packedData);
     expect(unpackedData).toEqual(messageFrame);
   });
 
@@ -122,6 +150,8 @@ describe(MessageFramePacker, () => {
       payload: () => {},
     };
 
-    await expect(packer.pack(messageFrame)).rejects.toThrow('Unsupported payload type');
+    expect(() => {
+      packer.pack(messageFrame);
+    }).toThrow('Unsupported payload type');
   });
 });

package/src/devtools/devtools.types.ts

@@ -21,15 +21,11 @@ export interface ConnectionInfo {
    * @hidden
    */
   wsStore?: WebSocketBackingStore;
-}
 
-/**
- * Parameters for the `handshake` message.
- * @hidden
- */
-export interface HandshakeMessageParams {
-  browserClientId: string;
-  pluginName: string;
+  /**
+   * The transport protocol version between the app and the webui.
+   */
+  protocolVersion: number;
 }
 
 /**
@@ -41,3 +37,14 @@ export interface DevToolsPluginClientOptions {
    */
   websocketBinaryType?: 'arraybuffer' | 'blob';
 }
+
+/**
+ * The handshake messages for the devtools plugin client.
+ * @hidden
+ */
+export interface HandshakeMessageParams {
+  protocolVersion: number;
+  pluginName: string;
+  method: 'handshake' | 'terminateBrowserClient';
+  browserClientId: string;
+}

package/src/devtools/getConnectionInfo.native.ts

@@ -2,6 +2,7 @@
  * Get the dev server address.
  */
 
+import { PROTOCOL_VERSION } from './ProtocolVersion';
 import type { ConnectionInfo } from './devtools.types';
 
 export function getConnectionInfo(): Omit<ConnectionInfo, 'pluginName'> {
@@ -10,6 +11,7 @@ export function getConnectionInfo(): Omit<ConnectionInfo, 'pluginName'> {
     .url.replace(/^https?:\/\//, '')
     .replace(/\/?$/, '') as string;
   return {
+    protocolVersion: PROTOCOL_VERSION,
     sender: 'app',
     devServer,
   };

package/src/devtools/getConnectionInfo.ts

@@ -2,12 +2,14 @@
  * Get the dev server address.
  */
 
+import { PROTOCOL_VERSION } from './ProtocolVersion';
 import type { ConnectionInfo } from './devtools.types';
 
 export function getConnectionInfo(): Omit<ConnectionInfo, 'pluginName'> {
   const devServerQuery = new URLSearchParams(window.location.search).get('devServer');
   const host = window.location.origin.replace(/^https?:\/\//, '');
   return {
+    protocolVersion: PROTOCOL_VERSION,
     sender: 'browser',
     devServer: devServerQuery || host,
   };

package/src/winter/fetch/__tests__/convertFormData-test.native.ts

@@ -40,7 +40,7 @@ describe(convertFormDataAsync, () => {
     const { body, boundary: resultBoundary } = await convertFormDataAsync(formData, boundary);
     expect(new TextDecoder().decode(body)).toMatchInlineSnapshot(`
       "------ExpoFetchFormBoundary0000000000000000
-      content-disposition: form-data; name="blob"; filename="blobFile"; filename*=utf-8''blobFile
+      content-disposition: form-data; name="blob"; filename="blobFile"
       content-type: text/plain
 
       hello blob