WIP

cli/device/connect.ts

@@ -1,5 +1,5 @@
 import { promises as fs } from 'fs'
-import { thingShadow } from 'aws-iot-device-sdk'
+import { mqtt, io, iot } from 'aws-crt'
 import { deviceFileLocations } from '../jitp/deviceFileLocations'
 import * as chalk from 'chalk'
 import { uiServer, WebSocketConnection } from '@bifravst/device-ui-server'
@@ -14,6 +14,8 @@ const defaultConfig = {
 	acct: 1, // Accelerometer threshold: minimal absolute value for and accelerometer reading to be considered movement.
 } as const
 
+io.enable_logging(io.LogLevel.DEBUG)
+
 /**
  * Connect to the AWS IoT broker using a generated device certificate
  */
@@ -96,14 +98,21 @@ export const connect = async ({
 		console.timeLog(note)
 	}, 5000)
 
-	const connection = new thingShadow({
-		privateKey: deviceFiles.key,
-		clientCert: deviceFiles.certWithCA,
-		caCert,
-		clientId: deviceId,
-		host: endpoint,
-		region: endpoint.split('.')[2],
-	})
+	const config_builder = iot.AwsIotMqttConnectionConfigBuilder.new_mtls_builder_from_path(
+		deviceFiles.certWithCA,
+		deviceFiles.key,
+	)
+		.with_certificate_authority_from_path(undefined, caCert)
+		.with_clean_session(true)
+		.with_client_id(deviceId)
+		.with_endpoint(endpoint)
+
+	const config = config_builder.build()
+	const client = new mqtt.MqttClient(new io.ClientBootstrap())
+	const connection = client.new_connection(config)
+	await connection.connect()
+
+	// FIXME: Implement shadow, see https://github.com/aws/aws-iot-device-sdk-python-v2/blob/master/samples/shadow.py
 
 	let wsConnection: WebSocketConnection
 

package.json

@@ -31,7 +31,7 @@
     "@bifravst/device-ui-server": "^1.3.2",
     "@bifravst/random-words": "^4.2.0",
     "ajv": "^6.12.2",
-    "aws-iot-device-sdk": "^2.2.6",
+    "aws-iot-device-sdk-v2": "^1.2.1",
     "aws-sdk": "^2.707.0",
     "backoff": "^2.5.0",
     "chalk": "^4.1.0",
@@ -62,7 +62,6 @@
     "@bifravst/package-layered-lambdas": "^3.10.0",
     "@commitlint/cli": "^9.0.1",
     "@commitlint/config-angular": "^9.0.1",
-    "@types/aws-iot-device-sdk": "^2.2.2",
     "@types/aws-lambda": "^8.10.57",
     "@types/aws-sdk": "^2.7.0",
     "@types/backoff": "^2.5.1",