Request response browser2

.builder/actions/crt_size_check.py

@@ -11,7 +11,7 @@ def run(self, env):
         # Maximum package size (for current platform) in bytes
         # NOTE: if you increase this, you might also need to increase the
         # limit in continuous-delivery/pack.sh
-        max_size = 7_750_000
+        max_size = 8_000_000
         # size of current folder
         folder_size = 0
         # total size in bytes

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
       - 'docs'
 
 env:
-  BUILDER_VERSION: v0.9.56
+  BUILDER_VERSION: v0.9.62
   BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-crt-nodejs
@@ -129,8 +129,21 @@ jobs:
         cd aws-crt-nodejs
         node ./scripts/build --target-arch ia32 -DAWS_WARNINGS_ARE_ERRORS=ON
 
-  osx:
-    runs-on: macos-12 # latest
+  macos:
+    runs-on: macos-14 # latest
+    steps:
+    - name: Build ${{ env.PACKAGE_NAME }} + consumers
+      run: |
+        python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
+        chmod a+x builder
+        ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
+    - name: Check backward compatibility for Macos
+      run: |
+        cd aws-crt-nodejs
+        python3 codebuild/macos_compatibility_check.py arm64
+
+  macos-x64:
+    runs-on: macos-14-large # latest
     steps:
     - name: Build ${{ env.PACKAGE_NAME }} + consumers
       run: |

CMakeLists.txt

@@ -43,11 +43,17 @@ if (BUILD_DEPS)
 
     add_subdirectory(crt/aws-c-common)
     if (UNIX AND NOT APPLE)
-        set(SEARCH_LIBCRYPTO OFF)
-        set(DISABLE_GO ON)
-        set(DISABLE_PERL ON)
-        set(BUILD_LIBSSL OFF)
-        add_subdirectory(crt/aws-lc)
+        include(AwsPrebuildDependency)
+        # s2n-tls uses libcrypto during its configuration, so we need to prebuild aws-lc.
+        prebuild_dependency(
+            DEPENDENCY_NAME AWSLC
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/aws-lc
+            CMAKE_ARGUMENTS
+                -DDISABLE_GO=ON
+                -DDISABLE_PERL=ON
+                -DBUILD_LIBSSL=OFF
+                -DBUILD_TESTING=OFF
+        )
         set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF)
         add_subdirectory(crt/s2n)
     endif()

builder.json

@@ -66,6 +66,14 @@
         "al2012": {
             "!packages": [],
             "!imports": [ "node-14" ]
+        },
+        "macos": {
+            "architectures": {
+                "arm64": {
+                    "_comment": "Mac OS (arm64) has only experimental support for Node v15 and earlier, so stick to Node v16, see Node v15 docs: https://github.com/nodejs/node/blob/v15.x/BUILDING.md#platform-list",
+                    "!imports": [ "node-16" ]
+                }
+            }
         }
     },
     "targets": {

continuous-delivery/pack.sh

@@ -39,7 +39,7 @@ mkdir $UNZIP
 tar -xf aws-crt-$CURRENT_TAG.tgz -C $UNZIP
 PACK_FILE_SIZE_KB=$(du -sk $UNZIP | awk '{print $1}')
 echo "Current package size: ${PACK_FILE_SIZE_KB}"
-if expr $PACK_FILE_SIZE_KB \> "$((25000))" ; then
+if expr $PACK_FILE_SIZE_KB \> "$((26000))" ; then
     # the package size is too large, return -1
     echo "Package size is too large!"
     exit -1

continuous-delivery/pack.yml

@@ -2,7 +2,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 10
+      nodejs: 14
   pre_build:
     commands:
       - cd aws-crt-nodejs

continuous-delivery/publish.yml

@@ -2,7 +2,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 10
+      nodejs: 14
   build:
     commands:
       - cd aws-crt-nodejs

continuous-delivery/test-version-exists.yml

@@ -2,7 +2,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 10
+      nodejs: 14
   build:
     commands:
       - cd aws-crt-nodejs

lib/browser/io.ts

@@ -19,8 +19,10 @@
  * @mergeTarget
  */
 
-export { TlsVersion, SocketType, SocketDomain } from "../common/io";
-import { SocketType, SocketDomain } from "../common/io";
+import { setLogLevel, LogLevel, SocketType, SocketDomain } from "../common/io";
+// Do not re-export the logging functions in common; they are package-private
+export { setLogLevel, LogLevel, TlsVersion, SocketType, SocketDomain } from "../common/io";
+
 
 /**
  * @return false, as ALPN is not configurable from the browser
@@ -112,3 +114,7 @@ export class SocketOptions {
         public keep_alive_max_failed_probes = 0) {
     }
 }
+
+export function enable_logging(level: LogLevel) {
+    setLogLevel(level);
+}

lib/browser/mqtt_request_response/protocol_adapter.spec.ts

@@ -27,12 +27,22 @@ interface TestingOptions {
     builder_mutator311?: (builder: aws_iot_mqtt311.AwsIotMqttConnectionConfigBuilder) => aws_iot_mqtt311.AwsIotMqttConnectionConfigBuilder,
 }
 
-function build_protocol_client_mqtt5(builder_mutator?: (builder: aws_iot_mqtt5.AwsIotMqtt5ClientConfigBuilder) => aws_iot_mqtt5.AwsIotMqtt5ClientConfigBuilder) : mqtt5.Mqtt5Client {
-    let provider: auth.StaticCredentialProvider = new auth.StaticCredentialProvider({
+function getTestingCredentials() : auth.AWSCredentials {
+    let credentials : auth.AWSCredentials = {
         aws_access_id: test_utils.ClientEnvironmentalConfig.AWS_IOT_ACCESS_KEY_ID,
         aws_secret_key: test_utils.ClientEnvironmentalConfig.AWS_IOT_SECRET_ACCESS_KEY,
         aws_region: "us-east-1"
-    });
+    };
+
+    if (test_utils.ClientEnvironmentalConfig.AWS_IOT_SESSION_TOKEN !== "") {
+        credentials.aws_sts_token = test_utils.ClientEnvironmentalConfig.AWS_IOT_SESSION_TOKEN;
+    }
+
+    return credentials;
+}
+
+function build_protocol_client_mqtt5(builder_mutator?: (builder: aws_iot_mqtt5.AwsIotMqtt5ClientConfigBuilder) => aws_iot_mqtt5.AwsIotMqtt5ClientConfigBuilder) : mqtt5.Mqtt5Client {
+    let provider: auth.StaticCredentialProvider = new auth.StaticCredentialProvider(getTestingCredentials());
 
     let builder = aws_iot_mqtt5.AwsIotMqtt5ClientConfigBuilder.newWebsocketMqttBuilderWithSigv4Auth(
         test_utils.ClientEnvironmentalConfig.AWS_IOT_HOST,
@@ -56,11 +66,7 @@ function build_protocol_client_mqtt5(builder_mutator?: (builder: aws_iot_mqtt5.A
 }
 
 function build_protocol_client_mqtt311(builder_mutator?: (builder: aws_iot_mqtt311.AwsIotMqttConnectionConfigBuilder) => aws_iot_mqtt311.AwsIotMqttConnectionConfigBuilder) : mqtt311.MqttClientConnection {
-    let provider: auth.StaticCredentialProvider = new auth.StaticCredentialProvider({
-        aws_access_id: test_utils.ClientEnvironmentalConfig.AWS_IOT_ACCESS_KEY_ID,
-        aws_secret_key: test_utils.ClientEnvironmentalConfig.AWS_IOT_SECRET_ACCESS_KEY,
-        aws_region: "us-east-1"
-    });
+    let provider: auth.StaticCredentialProvider = new auth.StaticCredentialProvider(getTestingCredentials());
 
     let builder = aws_iot_mqtt311.AwsIotMqttConnectionConfigBuilder.new_builder_for_websocket();
     builder.with_credential_provider(provider);
@@ -353,11 +359,11 @@ async function do_get_connection_state_test(version: ProtocolVersion) {
         version: version
     });
 
-    expect(context.adapter.getConnectionState()).toEqual(protocol_adapter.ConnectionState.DISCONNECTED);
+    expect(context.adapter.getConnectionState()).toEqual(protocol_adapter.ConnectionState.Disconnected);
 
     await context.open();
 
-    expect(context.adapter.getConnectionState()).toEqual(protocol_adapter.ConnectionState.CONNECTED);
+    expect(context.adapter.getConnectionState()).toEqual(protocol_adapter.ConnectionState.Connected);
 
     await context.close();
 }
@@ -380,15 +386,15 @@ async function do_connection_event_test(version: ProtocolVersion) {
     await context.open();
 
     let connection_event1 : protocol_adapter.ConnectionStatusEvent = (await event1_promise)[0];
-    expect(connection_event1.status).toEqual(protocol_adapter.ConnectionState.CONNECTED);
+    expect(connection_event1.status).toEqual(protocol_adapter.ConnectionState.Connected);
     expect(connection_event1.joinedSession).toEqual(false);
 
     let event2_promise = once(context.adapter, protocol_adapter.ProtocolClientAdapter.CONNECTION_STATUS);
 
     await context.stopProtocolClient();
 
     let connection_event2 : protocol_adapter.ConnectionStatusEvent = (await event2_promise)[0];
-    expect(connection_event2.status).toEqual(protocol_adapter.ConnectionState.DISCONNECTED);
+    expect(connection_event2.status).toEqual(protocol_adapter.ConnectionState.Disconnected);
 }
 
 test_utils.conditional_test(test_utils.ClientEnvironmentalConfig.hasIoTCoreEnvironmentCred())('Protocol Adapter Connection Event Sequence - Mqtt5', async () => {