Request response workspace

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
       - 'docs'
 
 env:
-  BUILDER_VERSION: v0.9.62
+  BUILDER_VERSION: v0.9.75
   BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-iot-device-sdk-js-v2
@@ -32,46 +32,6 @@ env:
   CI_JOBS_SERVICE_CLIENT_ROLE: arn:aws:iam::180635532705:role/CI_JobsServiceClient_Role
 
 jobs:
-
-  al2:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write # This is required for requesting the JWT
-    steps:
-    - name: configure AWS credentials (containers)
-      uses: aws-actions/configure-aws-credentials@v2
-      with:
-        role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
-        aws-region: ${{ env.AWS_DEFAULT_REGION }}
-      # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
-    - name: Build ${{ env.PACKAGE_NAME }}
-      run: |
-        aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
-        ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-al2-x64 build -p ${{ env.PACKAGE_NAME }}
-
-  raspberry:
-    runs-on: ubuntu-latest # latest
-    permissions:
-      id-token: write # This is required for requesting the JWT
-    strategy:
-      fail-fast: false
-      matrix:
-        image:
-          - raspbian-bullseye
-    steps:
-      - name: configure AWS credentials (containers)
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
-          aws-region: ${{ env.AWS_DEFAULT_REGION }}
-      # set arm arch
-      - name: Install qemu/docker
-        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Build ${{ env.PACKAGE_NAME }}
-        run: |
-          aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
-          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}
-
   windows:
     runs-on: windows-latest
     permissions:
@@ -85,7 +45,7 @@ jobs:
       run: |
         python -m pip install boto3
     - name: configure AWS credentials (PubSub)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_PUBSUB_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -101,7 +61,7 @@ jobs:
       run: |
         python ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_windows_cert_connect_cfg.json
     - name: configure AWS credentials (Device Advisor)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_DEVICE_ADVISOR }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -131,7 +91,7 @@ jobs:
         source .venv/bin/activate
         python3 -m pip install boto3
     - name: configure AWS credentials (PubSub)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_PUBSUB_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -155,7 +115,7 @@ jobs:
         source .venv/bin/activate
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pkcs12_connect_cfg.json
     - name: configure AWS credentials (Device Advisor)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_DEVICE_ADVISOR }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -179,7 +139,7 @@ jobs:
       run: |
         python3 -m pip install boto3
     - name: configure AWS credentials (PubSub)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_PUBSUB_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -194,7 +154,7 @@ jobs:
         sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
         python ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_electron_cfg.json
     - name: configure AWS credentials (Device Advisor)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_DEVICE_ADVISOR }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -203,6 +163,42 @@ jobs:
         cd ./aws-iot-device-sdk-js-v2
         python3 ./deviceadvisor/script/DATestRun.py
 
+  v2-service-client-tests:
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        runner:
+          - macos-13
+          - ubuntu-22.04
+          - windows-2022
+    permissions:
+      id-token: write # This is required for requesting the JWT
+    steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 16
+      - name: Build ${{ env.PACKAGE_NAME }}
+        run: |
+          npm install
+      - name: Install boto3
+        run: |
+          python3 -m pip install boto3
+      - name: configure AWS credentials (MQTT5)
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ env.CI_MQTT5_ROLE }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+      - name: Service tests
+        shell: bash
+        run: |
+          source utils/test_setup.sh s3://iot-sdk-ci-bucket-us-east1/IotUsProdMqtt5EnvironmentVariables.txt us-east-1
+          npm run test -- iotshadowclientv2
+          npm run test -- iotidentityclientv2
+          npm run test -- iotjobsclientv2
+          source utils/test_cleanup.sh
+
   # Runs the samples and ensures that everything is working
   linux-smoke-tests:
     runs-on: ubuntu-22.04
@@ -221,7 +217,7 @@ jobs:
         sudo apt-get install softhsm2 -y
         softhsm2-util --version
     - name: configure AWS credentials (Shadow)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_SHADOW_SERVICE_CLIENT_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -246,7 +242,7 @@ jobs:
         export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-js-v2/utils
         python3 ./test_cases/test_shadow_update.py --config-file test_cases/mqtt5_named_shadow_cfg.json
     - name: configure AWS credentials (Fleet provisioning)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_FLEET_PROVISIONING_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -271,7 +267,7 @@ jobs:
         export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-js-v2/utils
         python3 ./test_cases/test_fleet_provisioning.py --config-file test_cases/mqtt5_fleet_provisioning_with_csr_cfg.json --thing-name-prefix Fleet_Thing_
     - name: configure AWS credentials (Jobs)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_JOBS_SERVICE_CLIENT_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -286,7 +282,7 @@ jobs:
         export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-js-v2/utils
         python3 ./test_cases/test_jobs_execution.py --config-file test_cases/mqtt5_jobs_cfg.json
     - name: configure AWS credentials (Connect and PubSub)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_PUBSUB_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -316,64 +312,64 @@ jobs:
         echo "directories.tokendir = /tmp/tokens" > /tmp/softhsm2.conf
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pkcs11_connect_cfg.json
     - name: configure AWS credentials (Cognito)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_COGNITO_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run Cognito Connect sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_cognito_connect_cfg.json
     - name: configure AWS credentials (X509)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_X509_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run X509 sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_x509_connect_cfg.json
     - name: configure AWS credentials (Custom Authorizer)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_CUSTOM_AUTHORIZER_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run CustomAuthorizerConnect sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_custom_authorizer_connect_cfg.json
     - name: configure AWS credentials (Shadow)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_SHADOW_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
-    - name: run Shadow sample
+    - name: run v1 Shadow sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_shadow_cfg.json
-    - name: run Mqtt5 Shadow sample
+    - name: run v1 Mqtt5 Shadow sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_shadow_mqtt5_cfg.json
     - name: configure AWS credentials (Jobs)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_JOBS_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
-    - name: run Jobs sample
+    - name: run v1 Jobs sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_jobs_cfg.json
-    - name: run Mqtt5 Jobs sample
+    - name: run v1 Mqtt5 Jobs sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_jobs_mqtt5_cfg.json
     - name: configure AWS credentials (Fleet provisioning)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_FLEET_PROVISIONING_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
-    - name: run Fleet Provisioning sample
+    - name: run v1 Fleet Provisioning sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_fleet_provisioning_sample.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_fleet_provisioning_cfg.json --thing-name-prefix "Fleet_Thing_"
-    - name: run Mqtt5 Fleet Provisioning sample
+    - name: run v1 Mqtt5 Fleet Provisioning sample
       run: |
         python3 ./aws-iot-device-sdk-js-v2/utils/run_fleet_provisioning_sample.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_fleet_provisioning_mqtt5_cfg.json --thing-name-prefix "Fleet_Thing_"
     - name: configure AWS credentials (MQTT5 PubSub)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_MQTT5_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}

.github/workflows/ci_run_fleet_provisioning_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "Javascript",
-    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/fleet_provisioning",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/deprecated/fleet_provisioning",
     "runnable_region": "us-east-1",
     "runnable_main_class": "",
     "arguments": [

.github/workflows/ci_run_fleet_provisioning_mqtt5_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "Javascript",
-    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/fleet_provisioning",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/deprecated/fleet_provisioning",
     "runnable_region": "us-east-1",
     "runnable_main_class": "",
     "arguments": [

.github/workflows/ci_run_jobs_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "Javascript",
-    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/jobs",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/deprecated/jobs",
     "runnable_region": "us-east-1",
     "runnable_main_class": "",
     "arguments": [

.github/workflows/ci_run_jobs_mqtt5_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "Javascript",
-    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/jobs",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/deprecated/jobs",
     "runnable_region": "us-east-1",
     "runnable_main_class": "",
     "arguments": [

.github/workflows/ci_run_shadow_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "Javascript",
-    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/shadow",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/deprecated/shadow",
     "runnable_region": "us-east-1",
     "runnable_main_class": "",
     "arguments": [

.github/workflows/ci_run_shadow_mqtt5_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "Javascript",
-    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/shadow",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/deprecated/shadow",
     "runnable_region": "us-east-1",
     "runnable_main_class": "",
     "arguments": [

codebuild/samples/shadow-linux.sh

@@ -5,7 +5,7 @@ set -o pipefail
 
 env
 
-pushd $CODEBUILD_SRC_DIR/samples/node/shadow
+pushd $CODEBUILD_SRC_DIR/samples/node/deprecated/shadow
 
 ENDPOINT=$(aws secretsmanager get-secret-value --secret-id "ci/endpoint" --query "SecretString" | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')
 

docsrc/typedoc-browser.json

@@ -1,9 +1,11 @@
 {
     "entryPoints": [
         "../lib/greengrass/discoveryclient.ts",
-        "../lib/iotidentity/iotidentityclient.ts",
-        "../lib/iotjobs/iotjobsclient.ts",
-        "../lib/iotshadow/iotshadowclient.ts",
+        "../lib/iotidentity/iotidentity.ts",
+        "../lib/iotjobs/iotjobs.ts",
+        "../lib/iotshadow/iotshadow.ts",
+        "../lib/mqtt_request_response.ts",
+        "../lib/mqtt_request_response_utils.ts",
         "../build/docs/aws-crt-nodejs/lib/browser/auth.ts",
         "../build/docs/aws-crt-nodejs/lib/browser/error.ts",
         "../build/docs/aws-crt-nodejs/lib/browser/http.ts",

docsrc/typedoc-node.json

@@ -4,9 +4,11 @@
         "../lib/greengrass/discoveryclient.ts",
         "../lib/greengrasscoreipc.ts",
         "../lib/greengrasscoreipc/client.ts",
-        "../lib/iotidentity/iotidentityclient.ts",
-        "../lib/iotjobs/iotjobsclient.ts",
-        "../lib/iotshadow/iotshadowclient.ts",
+        "../lib/iotidentity/iotidentity.ts",
+        "../lib/iotjobs/iotjobs.ts",
+        "../lib/iotshadow/iotshadow.ts",
+        "../lib/mqtt_request_response.ts",
+        "../lib/mqtt_request_response_utils.ts",
         "../build/docs/aws-crt-nodejs/lib/native/auth.ts",
         "../build/docs/aws-crt-nodejs/lib/native/binding.d.ts",
         "../build/docs/aws-crt-nodejs/lib/native/error.ts",

lib/browser.ts

@@ -10,10 +10,11 @@
  * @mergeTarget
  */
 
-import * as iotidentity from './iotidentity/iotidentityclient';
 import * as greengrass from './greengrass/discoveryclient';
-import * as iotjobs from './iotjobs/iotjobsclient';
-import * as iotshadow from './iotshadow/iotshadowclient';
+import * as iotidentity from './iotidentity/iotidentity';
+import * as iotjobs from './iotjobs/iotjobs';
+import * as iotshadow from './iotshadow/iotshadow';
+import * as mqtt_request_response from './mqtt_request_response';
 
 import {
     auth,
@@ -37,6 +38,7 @@ export {
     iotshadow,
     mqtt,
     mqtt5,
+    mqtt_request_response,
     CrtError,
     ICrtError
 }

lib/eventstream_rpc_utils.ts

@@ -20,7 +20,21 @@ import {CrtError, eventstream} from "aws-crt";
  * @return a base64-encoded string
  */
 export function encodePayloadAsString(payload : eventstream.Payload) : string {
-    return Buffer.from(payload).toString("base64");
+    if (typeof payload === "string") {
+        return Buffer.from(payload).toString("base64");
+    }
+
+    if (ArrayBuffer.isView(payload)) {
+        const view = payload as ArrayBufferView;
+        return Buffer.from(view.buffer, view.byteOffset, view.byteLength).toString("base64");
+    }
+
+    if (payload instanceof ArrayBuffer) {
+        let buffer = payload as ArrayBuffer;
+        return Buffer.from(buffer).toString("base64");
+    }
+
+    throw new TypeError("payload parameter must be a string, ArrayBuffer, or DataView.");
 }
 
 /**