0.1.11

bump version
Merge pull request #80 from jambonz/fix/aws_arnrole
2026-10-03 23:33:59 +00:00 · 2024-06-14 07:37:19 -04:00 · 2024-06-14 07:36:53 -04:00 · 2024-06-14 07:34:22 -04:00 · 2024-06-14 15:04:19 +07:00 · 2024-06-14 15:00:56 +07:00
6 changed files with 51 additions and 33 deletions
@@ -5,16 +5,16 @@ const EXPIRY = 3600;

 async function getAwsAuthToken(
  logger, createHash, retrieveHash,
-  awsAccessKeyId, awsSecretAccessKey, awsRegion, roleArn = null) {
+  {accessKeyId, secretAccessKey, region, roleArn}) {
  logger = logger || noopLogger;
  try {
-    const key = makeAwsKey(roleArn || awsAccessKeyId);
+    const key = makeAwsKey(roleArn || accessKeyId);
    const obj = await retrieveHash(key);
    if (obj) return {...obj, servedFromCache: true};

    let data;
    if (roleArn) {
-      const stsClient = new STSClient({ region: awsRegion});
+      const stsClient = new STSClient({ region });
      const roleToAssume = { RoleArn: roleArn, RoleSessionName: 'Jambonz_Speech', DurationSeconds: EXPIRY};
      const command = new AssumeRoleCommand(roleToAssume);

@@ -22,10 +22,10 @@ async function getAwsAuthToken(
    } else {
      /* access token not found in cache, so generate it using STS */
      const stsClient = new STSClient({
-        region: awsRegion,
+        region,
        credentials: {
-          accessKeyId: awsAccessKeyId,
-          secretAccessKey: awsSecretAccessKey,
+          accessKeyId,
+          secretAccessKey,
        }
      });
      const command = new GetSessionTokenCommand({DurationSeconds: EXPIRY});
@@ -107,7 +107,12 @@ const getAwsVoices = async(_client, createHash, retrieveHash, logger, credential
    } else if (roleArn) {
      client = new PollyClient({
        region,
-        credentials: await getAwsAuthToken(logger, createHash, retrieveHash, null, null, region, roleArn),
+        credentials: await getAwsAuthToken(
+          logger, createHash, retrieveHash,
+          {
+            region,
+            roleArn
+          }),
      });
    } else {
      client = new PollyClient({region});
@@ -281,7 +281,12 @@ const synthPolly = async(createHash, retrieveHash, logger,
    } else if (roleArn) {
      polly = new PollyClient({
        region,
-        credentials: await getAwsAuthToken(logger, createHash, retrieveHash, null, null, region, roleArn),
+        credentials: await getAwsAuthToken(
+          logger, createHash, retrieveHash,
+          {
+            region,
+            roleArn
+          }),
      });
    } else {
      // AWS RoleArn assigned to Instance profile
@@ -1,12 +1,12 @@
 {
  "name": "@jambonz/speech-utils",
-  "version": "0.1.9",
+  "version": "0.1.11",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@jambonz/speech-utils",
-      "version": "0.1.9",
+      "version": "0.1.11",
      "license": "MIT",
      "dependencies": {
        "@aws-sdk/client-polly": "^3.496.0",
@@ -1137,9 +1137,9 @@
      }
    },
    "node_modules/@grpc/grpc-js": {
-      "version": "1.9.14",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.14.tgz",
-      "integrity": "sha512-nOpuzZ2G3IuMFN+UPPpKrC6NsLmWsTqSsm66IRfnBt1D4pwTqE27lmbpcPM+l2Ua4gE7PfjRHI6uedAy7hoXUw==",
+      "version": "1.9.15",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
+      "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
      "dependencies": {
        "@grpc/proto-loader": "^0.7.8",
        "@types/node": ">=12.12.47"
@@ -2497,11 +2497,11 @@
      }
    },
    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
      "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
      },
      "engines": {
        "node": ">=8"
@@ -3557,9 +3557,9 @@
      }
    },
    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -8170,9 +8170,9 @@
      }
    },
    "@grpc/grpc-js": {
-      "version": "1.9.14",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.14.tgz",
-      "integrity": "sha512-nOpuzZ2G3IuMFN+UPPpKrC6NsLmWsTqSsm66IRfnBt1D4pwTqE27lmbpcPM+l2Ua4gE7PfjRHI6uedAy7hoXUw==",
+      "version": "1.9.15",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
+      "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
      "requires": {
        "@grpc/proto-loader": "^0.7.8",
        "@types/node": ">=12.12.47"
@@ -9262,11 +9262,11 @@
      }
    },
    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
      "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
      }
    },
    "browserslist": {
@@ -10031,9 +10031,9 @@
      }
    },
    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
      "requires": {
        "to-regex-range": "^5.0.1"
      }
@@ -1,6 +1,6 @@
 {
  "name": "@jambonz/speech-utils",
-  "version": "0.1.9",
+  "version": "0.1.11",
  "description": "TTS-related speech utilities for jambonz",
  "main": "index.js",
  "author": "Dave Horton",
@@ -19,12 +19,20 @@ test('AWS - create and cache auth token', async(t) => {
      return;
  }
  try {
-    let obj = await getAwsAuthToken(process.env.AWS_ACCESS_KEY_ID, process.env.AWS_SECRET_ACCESS_KEY, process.env.AWS_REGION);
+    let obj = await getAwsAuthToken({
+      accessKeyId: process.env.AWS_ACCESS_KEY_ID, 
+      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+      region: process.env.AWS_REGION
+    });
    //console.log({obj}, 'received auth token from AWS');
    t.ok(obj.securityToken && !obj.servedFromCache, 'successfullY generated auth token from AWS');

    await sleep(250);
-    obj = await getAwsAuthToken(process.env.AWS_ACCESS_KEY_ID, process.env.AWS_SECRET_ACCESS_KEY, process.env.AWS_REGION);
+    obj = await getAwsAuthToken({
+      accessKeyId: process.env.AWS_ACCESS_KEY_ID, 
+      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+      region: process.env.AWS_REGION
+    });
    //console.log({obj}, 'received auth token from AWS - second request');
    t.ok(obj.securityToken && obj.servedFromCache, 'successfully received access token from cache');
Author	SHA1	Message	Date
Dave Horton	7f6a3d349c	0.1.11	2024-06-14 07:37:19 -04:00
Dave Horton	50429ff535	bump version	2024-06-14 07:36:53 -04:00
Dave Horton	3bf0ef8ea3	Merge pull request #80 from jambonz/fix/aws_arnrole fix aws arnrole	2024-06-14 07:34:22 -04:00
Quan HL	e9a5e83e36	wip	2024-06-14 15:04:19 +07:00
Quan HL	86a64ac091	wip	2024-06-14 15:00:56 +07:00
Quan HL	97e06b3ab3	wip	2024-06-14 10:23:22 +07:00
Quan HL	09e833d910	wip	2024-06-14 10:19:55 +07:00
Quan HL	8c4e12e54f	wip	2024-06-14 10:18:41 +07:00
Quan HL	2642bd71a4	wip	2024-06-14 10:16:57 +07:00
Quan HL	c4feac916f	fix aws arnrole	2024-06-14 10:15:23 +07:00