Node20 update II

README.md

@@ -1,5 +1,23 @@
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
 
+
+# StateVoices Hack-a-thon Branches for Development
+
+This github workflow is designed to secure the successful completion of our technical priorities.
+
+- See our live updates from our Hackathon here on our [project board](https://github.com/orgs/StateVoicesNational/projects/3).
+- Register for the [Merge Party Sunday Nov 19, 2023 3pmPST/6pmEST](https://www.mobilize.us/statevoices/event/592881/)
+
+Github Workflow
+
+- `main` - is our branch where our community depends on us to maintain it free of bugs and deprecations.
+
+- `hackathon2023-staging` - is our branch where all passing code is developed during State Voices Hack-a-thon.  This branch will recieve a full QA before being merged to main.
+
+- `hackathon2023-testing` - is our branch where volunteer developers bring together their code for peer-review.
+
+## Spoke
+
 # StateVoices is the new community steward for Spoke!
 
 On November 19th, the repo Spoke was transfered from MoveOn to StateVoices.
@@ -8,6 +26,7 @@ On November 19th, the repo Spoke was transfered from MoveOn to StateVoices.
 
 ## Spoke History
 
+
 Spoke is an open source text-distribution tool for organizations to mobilize supporters and members into action. Spoke allows you to upload phone numbers, customize scripts and assign volunteers to communicate with supporters while allowing organizations to manage the process.
 
 Spoke was created by Saikat Chakrabarti and Sheena Pakanati, and is now maintained by MoveOn.org.

lambda.js

@@ -1,5 +1,4 @@
-"use strict";
-const AWS = require("aws-sdk");
+"use strict";;
 const awsServerlessExpress = require("aws-serverless-express");
 let app, server, jobs, dispatcher;
 

package.json

@@ -4,8 +4,8 @@
   "description": "Spoke",
   "main": "src/server",
   "engines": {
-    "node": ">=16.18.0",
-    "npm": "8.19.2"
+    "node": ">=20.0.0",
+    "npm": "9.6.4"
   },
   "scripts": {
     "test": "jest --forceExit --runInBand --detectOpenHandles --verbose=false",
@@ -81,14 +81,24 @@
   "homepage": "https://github.com/MoveOnOrg/Spoke/#readme",
   "dependencies": {
     "@aoberoi/passport-slack": "^1.0.5",
-    "@babel/cli": "^7.19.3",
+    "@aws-sdk/client-cloudwatch": "^3.465.0",
+    "@aws-sdk/client-cloudwatch-events": "^3.465.0",
+    "@aws-sdk/client-lambda": "^3.465.0",
+    "@aws-sdk/client-s3": "^3.465.0",
+    "@aws-sdk/client-sqs": "^3.465.0",
+    "@aws-sdk/s3-request-presigner": "^3.465.0",
+    "@babel/cli": "^7.23.4",
     "@babel/core": "^7.19.6",
     "@babel/plugin-proposal-export-default-from": "^7.18.10",
+    "@babel/plugin-transform-class-properties": "^7.23.3",
+    "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+    "@babel/plugin-transform-optional-chaining": "^7.23.4",
     "@babel/plugin-transform-runtime": "^7.19.6",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@babel/register": "^7.18.9",
+    "@babel/traverse": "^7.23.2",
     "@bandwidth/messaging": "^3.0.0",
     "@bandwidth/numbers": "^1.7.0",
     "@date-io/core": "^1.3.13",
@@ -153,6 +163,7 @@
     "prop-types": "^15.6.0",
     "query-string": "^4.1.0",
     "react": "16.14.0",
+    "react-dnd": "^7.7.0",
     "redis": "3",
     "request": "^2.81.0",
     "rethink-knex-adapter": "0.4.20",
@@ -230,7 +241,6 @@
     "react-formal": "2.2.2",
     "react-router": "^3.2.0",
     "react-tooltip": "^4.2.13",
-    "recompose": "^0.30.0",
-    "webpack-cli": "^4.7.2"
+    "recompose": "^0.30.0"
   }
 }

src/extensions/action-handlers/mobilecommons-signup.js

@@ -1,5 +1,4 @@
 import request from "request";
-import aws from "aws-sdk";
 import { r } from "../../server/models";
 import { actionKitSignup } from "./helper-ak-sync.js";
 import { getConfig } from "../../server/api/lib/config";

src/extensions/action-handlers/revere-signup.js

@@ -1,9 +1,9 @@
 import request from "request";
-import aws from "aws-sdk";
+import { SQS } from "@aws-sdk/client-sqs";
 import { r } from "../../server/models";
 import { actionKitSignup } from "./helper-ak-sync.js";
 
-const sqs = new aws.SQS();
+const sqs = new SQS();
 
 export const name = "revere-signup";
 

src/extensions/contact-loaders/csv-s3-upload/index.js

@@ -3,7 +3,8 @@ import { unzipPayload } from "../../../workers/jobs";
 import { getConfig, hasConfig } from "../../../server/api/lib/config";
 import { gunzip } from "../../../lib";
 
-import AWS from "aws-sdk";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import { PutObjectCommand, S3 } from "@aws-sdk/client-s3";
 
 export const name = "csv-s3-upload";
 
@@ -67,8 +68,11 @@ export async function getClientChoiceData(
   /// The react-component will be sent this data as a property
   /// return a json object which will be cached for expiresSeconds long
   /// `data` should be a single string -- it can be JSON which you can parse in the client component
-  const s3 = new AWS.S3({
+  const s3 = new S3({
+    // The key signatureVersion is no longer supported in v3, and can be removed.
+    // @deprecated SDK v3 only supports signature v4.
     signatureVersion: "v4",
+
     region: getConfig("AWS_REGION")
   });
   const key = `contacts-upload/${campaign.id}/contacts.json.gz`;
@@ -80,7 +84,9 @@ export async function getClientChoiceData(
     Expires: 1800 // 30 minutes
   };
 
-  const result = await s3.getSignedUrl("putObject", params);
+  const result = await getSignedUrl(s3, new PutObjectCommand(params), {
+    expiresIn: "/* add value from 'Expires' from v2 call if present, else remove */"
+  });
 
   return {
     data: JSON.stringify({ s3Url: result, s3key: key }),
@@ -116,16 +122,19 @@ export async function processContactLoad(job, maxContacts, organization) {
   /// * Batching
   /// * Error handling
   /// * "Request of Doom" scenarios -- queries or jobs too big to complete
-  const s3 = new AWS.S3({
+  const s3 = new S3({
+    // The key signatureVersion is no longer supported in v3, and can be removed.
+    // @deprecated SDK v3 only supports signature v4.
     signatureVersion: "v4",
+
     region: getConfig("AWS_REGION")
   });
   var params = {
     Bucket: getConfig("AWS_S3_BUCKET_NAME"),
     Key: job.payload
   };
 
-  const contactsData = (await s3.getObject(params).promise()).Body.toString(
+  const contactsData = (await s3.getObject(params)).Body.toString(
     "utf-8"
   );
   const parsedData = JSON.parse(

src/extensions/contact-loaders/s3-pull/index.js

@@ -11,7 +11,7 @@ import { log, gunzip } from "../../../lib";
 
 import path from "path";
 import Papa from "papaparse";
-import AWS from "aws-sdk";
+import { S3 } from "@aws-sdk/client-s3";
 
 export const name = "s3-pull";
 
@@ -89,8 +89,11 @@ export async function loadContactS3PullProcessFile(jobEvent, contextVars) {
     customIndexes,
     region
   } = jobEvent;
-  const s3 = new AWS.S3({
+  const s3 = new S3({
     region,
+
+    // The key signatureVersion is no longer supported in v3, and can be removed.
+    // @deprecated SDK v3 only supports signature v4.
     signatureVersion: "v4"
   });
 
@@ -111,8 +114,7 @@ export async function loadContactS3PullProcessFile(jobEvent, contextVars) {
         .split("/")
         .slice(3)
         .join("/")
-    })
-    .promise();
+    });
   const fileString = await gunzip(fileData.Body);
   const { data, errors } = await new Promise((resolve, reject) => {
     Papa.parse(fileString.toString(), {
@@ -256,8 +258,11 @@ export async function processContactLoad(job, maxContacts, organization) {
   const s3Path = JSON.parse(job.payload).s3Path;
   const s3Bucket = getConfig("AWS_S3_BUCKET_NAME", organization);
   const region = getConfig("AWS_REGION", organization);
-  const s3 = new AWS.S3({
+  const s3 = new S3({
     region,
+
+    // The key signatureVersion is no longer supported in v3, and can be removed.
+    // @deprecated SDK v3 only supports signature v4.
     signatureVersion: "v4"
   });
 
@@ -271,8 +276,7 @@ export async function processContactLoad(job, maxContacts, organization) {
       .getObject({
         Bucket: s3Bucket,
         Key: manifestPath.replace(/^\//, "")
-      })
-      .promise();
+      });
     manifestData = JSON.parse(manifestFile.Body.toString("utf-8"));
   } catch (err) {
     await failedContactLoad(

src/extensions/job-runners/lambda-async/index.js

@@ -1,11 +1,11 @@
-import AWS from "aws-sdk";
+import { Lambda } from "@aws-sdk/client-lambda";
 import { saveJob } from "../helpers";
 
 const functionName =
   process.env.WORKER_LAMBDA_FUNCTION_NAME ||
   process.env.AWS_LAMBDA_FUNCTION_NAME;
 
-const client = new AWS.Lambda();
+const client = new Lambda();
 
 export const fullyConfigured = () => !!functionName;
 
@@ -33,8 +33,7 @@ export const dispatchJob = async (
       FunctionName: functionName,
       InvocationType: "Event",
       Payload: JSON.stringify({ type: "JOB", jobId: job.id })
-    })
-    .promise();
+    });
   return job;
 };
 
@@ -44,6 +43,5 @@ export const dispatchTask = async (taskName, payload) => {
       FunctionName: functionName,
       InvocationType: "Event",
       Payload: JSON.stringify({ type: "TASK", taskName, payload })
-    })
-    .promise();
+    });
 };

src/server/telemetry.js

@@ -1,5 +1,6 @@
 import moment from "moment";
-import AWS from "aws-sdk";
+import { CloudWatch } from "@aws-sdk/client-cloudwatch";
+import { CloudWatchEvents } from "@aws-sdk/client-cloudwatch-events";
 import { log } from "../lib";
 import { getConfig } from "./api/lib/config";
 import _ from "lodash";
@@ -55,13 +56,13 @@ const makeCloudwatchErrorEvent = (err, details) => {
 
 // Specific to the Warren AWS deploy: report a cloudwatch event to "Mission Control"
 if (getConfig("ENABLE_CLOUDWATCH_REPORTING", null, { truthy: 1 })) {
-  const cloudwatchEventsClient = new AWS.CloudWatchEvents();
-  const cloudwatchMetricsClient = new AWS.CloudWatch();
+  const cloudwatchEventsClient = new CloudWatchEvents();
+  const cloudwatchMetricsClient = new CloudWatch();
 
   reportErrorCallbacks.push(async (err, details) => {
     const payload = makeCloudwatchErrorEvent(err, details);
     try {
-      await cloudwatchEventsClient.putEvents(payload).promise();
+      await cloudwatchEventsClient.putEvents(payload);
     } catch (e) {
       log.error({
         msg: "Error posting exception to Cloudwatch:",
@@ -74,7 +75,7 @@ if (getConfig("ENABLE_CLOUDWATCH_REPORTING", null, { truthy: 1 })) {
   reportEventCallbacks.push(async (detailType, details) => {
     const payload = makeCloudwatchEvent(detailType, details);
     try {
-      await cloudwatchEventsClient.putEvents(payload).promise();
+      await cloudwatchEventsClient.putEvents(payload);
       if (details.count) {
         const metricData = {
           MetricData: [
@@ -87,7 +88,7 @@ if (getConfig("ENABLE_CLOUDWATCH_REPORTING", null, { truthy: 1 })) {
           ],
           Namespace: `Spoke/${stage}/Data`
         };
-        await cloudwatchMetricsClient.putMetricData(metricData).promise();
+        await cloudwatchMetricsClient.putMetricData(metricData);
       }
     } catch (e) {
       log.error({
@@ -124,7 +125,7 @@ if (getConfig("ENABLE_CLOUDWATCH_REPORTING", null, { truthy: 1 })) {
             awsEvent: req.awsEvent,
             path: JSON.stringify(err.path)
           });
-          await cloudwatchEventsClient.putEvents(payload).promise();
+          await cloudwatchEventsClient.putEvents(payload);
         }
         const metricData = {
           MetricData: [
@@ -137,7 +138,7 @@ if (getConfig("ENABLE_CLOUDWATCH_REPORTING", null, { truthy: 1 })) {
           ],
           Namespace: `Spoke/${stage}/Error`
         };
-        await cloudwatchMetricsClient.putMetricData(metricData).promise();
+        await cloudwatchMetricsClient.putMetricData(metricData);
       }
     } catch (e) {
       log.error({

src/workers/jobs.js

@@ -26,7 +26,10 @@ import {
 import importScriptFromDocument from "../server/api/lib/import-script";
 import { rawIngestMethod } from "../extensions/contact-loaders";
 
-import AWS from "aws-sdk";
+import { Lambda } from "@aws-sdk/client-lambda";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import { GetObjectCommand, S3 } from "@aws-sdk/client-s3";
+import { SQS } from "@aws-sdk/client-sqs";
 import Papa from "papaparse";
 import moment from "moment";
 import { sendEmail } from "../server/mail";
@@ -131,7 +134,7 @@ export async function sendJobToAWSLambda(job) {
     console.log("LAMBDA INVOCATION FAILED: JOB NOT INVOKABLE", job);
     return Promise.reject("Job type not available in job-processes");
   }
-  const lambda = new AWS.Lambda();
+  const lambda = new Lambda();
   const lambdaPayload = JSON.stringify(job);
   if (lambdaPayload.length > 128000) {
     console.log("LAMBDA INVOCATION FAILED PAYLOAD TOO LARGE");
@@ -169,7 +172,7 @@ export async function processSqsMessages(TWILIO_SQS_QUEUE_URL) {
     return Promise.reject("TWILIO_SQS_QUEUE_URL not set");
   }
 
-  const sqs = new AWS.SQS();
+  const sqs = new SQS();
 
   const params = {
     QueueUrl: TWILIO_SQS_QUEUE_URL,
@@ -206,7 +209,6 @@ export async function processSqsMessages(TWILIO_SQS_QUEUE_URL) {
                 QueueUrl: TWILIO_SQS_QUEUE_URL,
                 ReceiptHandle: message.ReceiptHandle
               })
-              .promise()
               .catch(reject);
             if (process.env.DEBUG) {
               console.log("processSqsMessages deleteresult", delMessageData);
@@ -859,7 +861,10 @@ export async function exportCampaign(job) {
     (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY)
   ) {
     try {
-      const s3bucket = new AWS.S3({
+      const s3bucket = new S3({
+        // The transformation for params is not implemented.
+        // Refer to UPGRADING.md on aws-sdk-js-v3 for changes needed.
+        // Please create/upvote feature request on aws-sdk-js-codemod for params.
         params: { Bucket: process.env.AWS_S3_BUCKET_NAME }
       });
       const campaignTitle = campaign.title
@@ -870,19 +875,17 @@ export async function exportCampaign(job) {
       )}.csv`;
       const messageKey = `${key}-messages.csv`;
       let params = { Key: key, Body: campaignCsv };
-      await s3bucket.putObject(params).promise();
+      await s3bucket.putObject(params);
       params = { Key: key, Expires: 86400 };
-      const campaignExportUrl = await s3bucket.getSignedUrl(
-        "getObject",
-        params
-      );
+      const campaignExportUrl = await getSignedUrl(s3bucket, new GetObjectCommand(params), {
+        expiresIn: "/* add value from 'Expires' from v2 call if present, else remove */"
+      });
       params = { Key: messageKey, Body: messageCsv };
-      await s3bucket.putObject(params).promise();
+      await s3bucket.putObject(params);
       params = { Key: messageKey, Expires: 86400 };
-      const campaignMessagesExportUrl = await s3bucket.getSignedUrl(
-        "getObject",
-        params
-      );
+      const campaignMessagesExportUrl = await getSignedUrl(s3bucket, new GetObjectCommand(params), {
+        expiresIn: "/* add value from 'Expires' from v2 call if present, else remove */"
+      });
       exportResults.campaignExportUrl = campaignExportUrl;
       exportResults.campaignMessagesExportUrl = campaignMessagesExportUrl;