remove command utils

sbSteveK · sbSteveK · commit bb4914347d5e · 2025-09-26T14:41:05.000-07:00
diff --git a/samples/node/greengrass/basic_discovery/index.ts b/samples/node/greengrass/basic_discovery/index.ts
@@ -6,63 +6,82 @@
 import { mqtt, io, iot, greengrass } from 'aws-iot-device-sdk-v2';
 import { TextDecoder } from 'util';
 
-type Args = { [index: string]: any };
+// --------------------------------- ARGUMENT PARSING -----------------------------------------
+const args = require('yargs')
+    .option('ca_file', {
+        alias: 'r',
+        description: '<path>: path to a Root CA certificate file in PEM format (optional, system trust store used by default)',
+        type: 'string',
+        required: false
+    })
+    .option('cert', {
+        alias: 'c',
+        description: '<path>: path to a PEM encoded certificate to use with mTLS',
+        type: 'string',
+        required: true
+    })
+    .option('key', {
+        alias: 'k',
+        description: '<path>: Path to a PEM encoded private key that matches cert',
+        type: 'string',
+        required: true
+    })
+    .option('thing_name', {
+        alias: 'T',
+        description: 'Targeted Thing name',
+        type: 'string',
+        required: true
+    })
+    .option('topic', {
+        alias: 't',
+        description: 'Topic to publish/subscribe to',
+        type: 'string',
+        default: 'test/topic'
+    })
+    .option('message', {
+        alias: 'M',
+        description: 'Message to publish',
+        type: 'string',
+        default: 'Hello World!'
+    })
+    .option('count', {
+        alias: 'n',
+        description: 'Number of messages to publish',
+        type: 'number',
+        default: 10
+    })
+    .option('mode', {
+        alias: 'm',
+        description: 'Mode options: [publish, subscribe, both] (optional)',
+        type: 'string',
+        default: 'both',
+        choices: ['publish', 'subscribe', 'both']
+    })
+    .option('region', {
+        description: 'AWS Region',
+        type: 'string',
+        required: true
+    })
+    .option('print_discover_resp_only', {
+        description: 'Only print the response from Greengrass discovery (optional)',
+        type: 'boolean',
+        default: false
+    })
+    .option('is_ci', {
+        description: 'Adjusts sample to output/run in CI mode (optional)',
+        type: 'boolean',
+        default: false
+    })
+    .option('verbose', {
+        alias: 'v',
+        description: 'Verbose logging level',
+        type: 'string',
+        default: 'none'
+    })
+    .help()
+    .argv;
 
-const common_args = require('aws-iot-samples-util/cli_args');
-
-const yargs = require('yargs');
-yargs.command('*', false, (yargs: any) => {
-    common_args.add_universal_arguments(yargs);
-    common_args.add_topic_message_arguments(yargs);
-
-    yargs
-        .option('ca_file', {
-            alias: 'r',
-            description: '<path>: path to a Root CA certificate file in PEM format (optional, system trust store used by default).',
-            type: 'string',
-            required: false
-        })
-        .option('cert', {
-            alias: 'c',
-            description: '<path>: path to a PEM encoded certificate to use with mTLS.',
-            type: 'string',
-            required: true
-        })
-        .option('key', {
-            alias: 'k',
-            description: '<path>: Path to a PEM encoded private key that matches cert.',
-            type: 'string',
-            required: true
-        })
-        .option('thing_name', {
-            alias: 'T',
-            description: 'Targeted Thing name.',
-            type: 'string',
-            required: true
-        })
-        .option('mode', {
-            alias: 'm',
-            description: 'Mode options: [publish, subscribe, both] (optional).',
-            type: 'string',
-            default: 'both',
-            choices: ['publish', 'subscribe', 'both']
-        })
-        .option('region', {
-            description: 'AWS Region.',
-            type: 'string',
-            required: true
-        })
-        .option('print_discover_resp_only', {
-            description: 'Only print the response from Greengrass discovery (optional).',
-            type: 'boolean',
-            default: false
-        })
-        .option('is_ci', {
-            description: 'Adjusts sample to output/run in CI mode (optional).',
-            type: 'boolean',
-            default: false
-        })
-}, main).parse();
+// --------------------------------- ARGUMENT PARSING END -----------------------------------------
 
 function firstResolved<T>(promises: Promise<T>[]) {
     let rejects: Error[] = [];
@@ -82,7 +101,7 @@ function firstResolved<T>(promises: Promise<T>[]) {
     });
 }
 
-async function connect_to_iot(mqtt_client: mqtt.MqttClient, argv: Args, discovery_response: greengrass.model.DiscoverResponse) {
+async function connect_to_iot(mqtt_client: mqtt.MqttClient, discovery_response: greengrass.model.DiscoverResponse) {
     return new Promise<mqtt.MqttClientConnection>((resolve, reject) => {
         const start_connections = () => {
             let attempted_cores: string[] = [];
@@ -91,9 +110,9 @@ async function connect_to_iot(mqtt_client: mqtt.MqttClient, argv: Args, discover
                 for (const core of gg_group.cores) {
                     attempted_cores.push(core.thing_arn.toString());
                     for (const endpoint of core.connectivity) {
-                        const mqtt_config = iot.AwsIotMqttConnectionConfigBuilder.new_mtls_builder_from_path(argv.cert, argv.key)
+                        const mqtt_config = iot.AwsIotMqttConnectionConfigBuilder.new_mtls_builder_from_path(args.cert, args.key)
                             .with_certificate_authority(gg_group.certificate_authorities[0])
-                            .with_client_id(argv.thing_name)
+                            .with_client_id(args.thing_name)
                             .with_clean_session(false)
                             .with_socket_options(new io.SocketOptions(io.SocketType.STREAM, io.SocketDomain.IPV4, 3000))
                             .build();
@@ -126,45 +145,45 @@ async function connect_to_iot(mqtt_client: mqtt.MqttClient, argv: Args, discover
     });
 }
 
-async function execute_session(connection: mqtt.MqttClientConnection, argv: Args) {
-    console.log("execute_session: topic is " + argv.topic);
+async function execute_session(connection: mqtt.MqttClientConnection) {
+    console.log("execute_session: topic is " + args.topic);
     return new Promise<void>(async (resolve, reject) => {
         try {
             let published = false;
             let subscribed = false;
             const decoder = new TextDecoder('utf8');
-            if (argv.mode == 'both' || argv.mode == 'subscribe') {
+            if (args.mode == 'both' || args.mode == 'subscribe') {
                 const on_publish = (topic: string, payload: ArrayBuffer, dup: boolean, qos: mqtt.QoS, retain: boolean) => {
                     const json = decoder.decode(payload);
                     console.log(`Publish received. topic:"${topic}" dup:${dup} qos:${qos} retain:${retain}`);
                     console.log(json);
                     const message = JSON.parse(json);
-                    if (message.sequence == argv.count) {
+                    if (message.sequence == args.count) {
                         subscribed = true;
                         if (subscribed && published) {
                             resolve();
                         }
                     }
                 }
-                await connection.subscribe(argv.topic, mqtt.QoS.AtLeastOnce, on_publish);
+                await connection.subscribe(args.topic, mqtt.QoS.AtLeastOnce, on_publish);
             }
             else {
                 subscribed = true;
             }
 
-            if (argv.mode == 'both' || argv.mode == 'publish') {
+            if (args.mode == 'both' || args.mode == 'publish') {
                 let published_counts = 0;
-                for (let op_idx = 0; op_idx < argv.count; ++op_idx) {
+                for (let op_idx = 0; op_idx < args.count; ++op_idx) {
                     const publish = async () => {
                         const msg = {
-                            message: argv.message,
+                            message: args.message,
                             sequence: op_idx + 1,
                         };
                         const json = JSON.stringify(msg);
                         console.log("execute_session: publishing...");
-                        connection.publish(argv.topic, json, mqtt.QoS.AtLeastOnce).then(() => {
+                        connection.publish(args.topic, json, mqtt.QoS.AtLeastOnce).then(() => {
                             ++published_counts;
-                            if (published_counts == argv.count) {
+                            if (published_counts == args.count) {
                                 published = true;
                                 if (subscribed && published) {
                                     resolve();
@@ -185,49 +204,49 @@ async function execute_session(connection: mqtt.MqttClientConnection, argv: Args
     });
 }
 
-async function main(argv: Args) {
-    if (argv.verbose && argv.verbose != 'none') {
-        const level: io.LogLevel = parseInt(io.LogLevel[argv.verbose.toUpperCase()]);
+async function main() {
+    if (args.verbose && args.verbose != 'none') {
+        const level: io.LogLevel = parseInt(io.LogLevel[args.verbose.toUpperCase()]);
         io.enable_logging(level);
     }
 
     const client_bootstrap = new io.ClientBootstrap();
     const socket_options = new io.SocketOptions(io.SocketType.STREAM, io.SocketDomain.IPV4, 3000);
     const tls_options = new io.TlsContextOptions();
-    if (argv.ca_file) {
-        tls_options.override_default_trust_store_from_path(undefined, argv.ca_file);
+    if (args.ca_file) {
+        tls_options.override_default_trust_store_from_path(undefined, args.ca_file);
     }
-    tls_options.certificate_filepath = argv.cert;
-    tls_options.private_key_filepath = argv.key;
+    tls_options.certificate_filepath = args.cert;
+    tls_options.private_key_filepath = args.key;
     if (io.is_alpn_available()) {
         tls_options.alpn_list.push('x-amzn-http-ca');
     }
     const tls_ctx = new io.ClientTlsContext(tls_options);
-    const discovery = new greengrass.DiscoveryClient(client_bootstrap, socket_options, tls_ctx, argv.region);
+    const discovery = new greengrass.DiscoveryClient(client_bootstrap, socket_options, tls_ctx, args.region);
 
     // force node to wait 60 seconds before killing itself, promises do not keep node alive
     const timer = setTimeout(() => { }, 60 * 1000);
 
-    console.log("Starting discovery for thing " + argv.thing_name);
+    console.log("Starting discovery for thing " + args.thing_name);
 
-    await discovery.discover(argv.thing_name)
+    await discovery.discover(args.thing_name)
         .then(async (discovery_response: greengrass.model.DiscoverResponse) => {
             console.log("Discovery Response:");
 
-            if (argv.is_ci != true) {
+            if (args.is_ci != true) {
                 console.log(JSON.stringify(discovery_response));
             } else {
                 console.log("Received a greengrass discovery result! Not showing result in CI for possible data sensitivity.");
             }
 
-            if (argv.print_discover_resp_only) {
+            if (args.print_discover_resp_only) {
                 process.exit(0);
             }
 
             const mqtt_client = new mqtt.MqttClient(client_bootstrap);
-            return connect_to_iot(mqtt_client, argv, discovery_response);
+            return connect_to_iot(mqtt_client, discovery_response);
         }).then(async (connection) => {
-            await execute_session(connection, argv);
+            await execute_session(connection);
             console.log("Disconnecting...");
             return connection.disconnect();
         }).then(() => {
@@ -242,3 +261,8 @@ async function main(argv: Args) {
     clearTimeout(timer);
     process.exit(0);
 }
+
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});
diff --git a/samples/node/greengrass/basic_discovery/package.json b/samples/node/greengrass/basic_discovery/package.json
@@ -17,12 +17,11 @@
         "prepare": "npm run tsc"
     },
     "devDependencies": {
-        "@types/node": "^10.17.50",
+        "@types/node": "^14.18.63",
         "typescript": "^4.7.4"
     },
     "dependencies": {
-        "aws-iot-device-sdk-v2": "file:../../..",
-        "aws-iot-samples-util": "file:../../util",
+        "aws-iot-device-sdk-v2": "file:../../../..",
         "yargs": "^16.2.0"
     }
 }
diff --git a/samples/node/greengrass/gg_ipc/artifacts/com.amazon.RpcTest/1.0.0/index.ts b/samples/node/greengrass/gg_ipc/artifacts/com.amazon.RpcTest/1.0.0/index.ts
@@ -7,24 +7,33 @@ import {eventstream_rpc, greengrasscoreipc} from 'aws-iot-device-sdk-v2';
 import {once} from "events";
 import {toUtf8} from "@aws-sdk/util-utf8-browser";
 
-type Args = { [index: string]: any };
-
-const yargs = require('yargs');
-
-const common_args = require('aws-iot-samples-util/cli_args');
-
-yargs.command('*', false, (yargs: any) => {
-    common_args.add_topic_message_arguments(yargs);
-}, main).parse();
-
-async function main(argv: Args) {
+// --------------------------------- ARGUMENT PARSING -----------------------------------------
+const args = require('yargs')
+    .option('topic', {
+        alias: 't',
+        description: 'Topic to publish/subscribe to',
+        type: 'string',
+        default: 'test/topic'
+    })
+    .option('message', {
+        alias: 'm',
+        description: 'Message to publish',
+        type: 'string',
+        default: 'Hello World!'
+    })
+    .help()
+    .argv;
+
+// --------------------------------- ARGUMENT PARSING END -----------------------------------------
+
+async function main() {
     try {
         let client : greengrasscoreipc.Client = greengrasscoreipc.createClient();
 
         await client.connect();
 
         await client.subscribeToIoTCore({
-            topicName: argv.topic,
+            topicName: args.topic,
             qos: greengrasscoreipc.model.QOS.AT_LEAST_ONCE
         }).on("message", (message: greengrasscoreipc.model.IoTCoreMessage) => {
             if (message.message) {
@@ -34,8 +43,8 @@ async function main(argv: Args) {
 
         setInterval(async () => {
             await client.publishToIoTCore({
-                topicName: argv.topic,
-                payload: argv.message,
+                topicName: args.topic,
+                payload: args.message,
                 qos : greengrasscoreipc.model.QOS.AT_LEAST_ONCE
             });
         }, 10000);
@@ -47,3 +56,8 @@ async function main(argv: Args) {
         console.log("Aw shucks: " + (err as eventstream_rpc.RpcError) .toString());
     }
 }
+
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});
diff --git a/samples/node/greengrass/gg_ipc/artifacts/com.amazon.RpcTest/1.0.0/package.json b/samples/node/greengrass/gg_ipc/artifacts/com.amazon.RpcTest/1.0.0/package.json
@@ -17,14 +17,13 @@
         "prepare": "npm run tsc"
     },
     "devDependencies": {
-        "@types/node": "^10.17.50",
+        "@types/node": "^14.18.63",
         "typescript": "^4.7.4"
     },
     "dependencies": {
         "@types/ws": "8.5.4",
-        "aws-iot-device-sdk-v2": "^1.12.0",
+        "aws-iot-device-sdk-v2": "file:../../../../../..",
         "@aws-sdk/util-utf8-browser": "^3.109.0",
-        "yargs": "^16.2.0",
-        "aws-iot-samples-util": "../../../../../util"
+        "yargs": "^16.2.0"
     }
 }
