@izara_project/izara-core-generate-service-code 1.0.68 → 1.0.70

package/src/emit/system/emitSystemWebSocketArtifacts.js

@@ -1,18 +1,55 @@
+import { readFile } from 'node:fs/promises';
+import ejsLib from 'ejs';
+
+const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 const SOURCE = 'app/src/generatedCode/SystemFlowSchemas/WebSocketMain/source';
 
-export async function emitSystemWebSocketArtifacts(flows, { includeRelationshipOwnTopic = false } = {}) {
-  if (!hasSystemWebSocket(flows, { includeRelationshipOwnTopic })) return { artifacts: [], functions: [] };
+async function _renderSystemTemplate(templateName, data = {}) {
+  const templatePath = new URL(templateName, TEMPLATE_URL);
+  const content = await readFile(templatePath, 'utf8');
+  return ejsLib.render(content, data);
+}
+
+export async function emitSystemWebSocketArtifacts(
+  flows,
+  { includeRelationshipOwnTopic = false } = {}
+) {
+  if (!hasSystemWebSocket(flows, { includeRelationshipOwnTopic })) {
+    return { artifacts: [], functions: [] };
+  }
+
+  const webSocketConnectContent = await _renderSystemTemplate(
+    'WebSocketConnect.ejs'
+  );
+  const webSocketCompleteMainContent = await _renderSystemTemplate(
+    'WebSocketComplete_Main.ejs'
+  );
+  const webSocketCompleteHdrSqsContent = await _renderSystemTemplate(
+    'WebSocketComplete_HdrSqs.ejs'
+  );
+  const webSocketConnectYaml = await _renderSystemTemplate(
+    'WebSocketConnect_Yaml.ejs'
+  );
+  const webSocketCompleteYaml = await _renderSystemTemplate(
+    'WebSocketComplete_Yaml.ejs'
+  );
 
   return {
     artifacts: [
-      { path: `${SOURCE}/WebSocketConnect.js`, content: webSocketConnect() },
-      { path: `${SOURCE}/WebSocketComplete_Main.js`, content: webSocketCompleteMain() },
-      { path: `${SOURCE}/WebSocketComplete_HdrSqs.js`, content: webSocketCompleteHandler() }
+      {
+        path: `${SOURCE}/WebSocketConnect.js`,
+        content: webSocketConnectContent
+      },
+      {
+        path: `${SOURCE}/WebSocketComplete_Main.js`,
+        content: webSocketCompleteMainContent
+      },
+      {
+        path: `${SOURCE}/WebSocketComplete_HdrSqs.js`,
+        content: webSocketCompleteHdrSqsContent
+      }
     ],
-    functions: [
-      renderWebSocketConnectYaml(),
-      renderWebSocketCompleteYaml()
-    ]
+    functions: [webSocketConnectYaml, webSocketCompleteYaml]
   };
 }
 
@@ -24,160 +61,19 @@ export function systemWebSocketManagedPaths() {
   ];
 }
 
-export function hasSystemWebSocket(flows, { includeRelationshipOwnTopic = false } = {}) {
-  // return true;
-  return Array.isArray(flows) && flows.some(flow => Array.isArray(flow?.event) && (flow.event.includes('s3') || (includeRelationshipOwnTopic && flow.event.includes('ownTopic') && flow.initiateBy === 'user')));
-}
-
-function renderWebSocketConnectYaml() {
-  return `WebSocketConnect:
-  handler: src/generatedCode/SystemFlowSchemas/WebSocketMain/source/WebSocketConnect.main
-  name: \${self:custom.iz_resourcePrefix}WebSocketConnect
-  role: WebSocketMainRole
-  events:
-    - websocket:
-        route: $connect
-    - websocket:
-        route: $disconnect
-    - websocket:
-        route: $default
-`;
-}
-
-function renderWebSocketCompleteYaml() {
-  return `WebSocketCompleteHdrSqs:
-  handler: src/generatedCode/SystemFlowSchemas/WebSocketMain/source/WebSocketComplete_HdrSqs.main
-  name: \${self:custom.iz_resourcePrefix}WebSocketCompleteHdrSqs
-  role: WebSocketMainRole
-  events:
-    - sqs:
-        arn: arn:aws:sqs:\${self:custom.iz_region}:\${self:custom.iz_accountId}:\${self:custom.iz_resourcePrefix}WebSocketCompleteHdrSqs
-        batchSize: 10
-        filterPatterns:
-          - body:
-              MessageAttributes:
-                callingFlow:
-                  Value:
-                    - \${self:custom.iz_resourcePrefix}WebSocketCompleteHdrSqs
-          - body:
-              MessageAttributes:
-                callingFlow:
-                  Value:
-                    - exists: false
-`;
-}
-
-function webSocketConnect() {
-  return `import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import { middlewareHandler as middleware, response } from '@izara_project/izara-middleware';
-
-export const main = middleware.wrap(async event => {
-  const { eventType, connectionId } = event.requestContext ?? {};
-  try {
-    event._izContext.logger.debug('Event:', event);
-    if (eventType === 'CONNECT') {
-      const { userId, submittedByUserId } = event.queryStringParameters ?? {};
-      await dynamodbSharedLib.putItem(event._izContext, await dynamodbSharedLib.tableName(event._izContext, 'UserUploadRecords'), {
-        connectionId, userId, submittedByUserId, expirationTime: Math.floor(Date.now() / 1000) + 7200
-      });
-      //(<webSocketConnect>)
-      //(</webSocketConnect>)
-    } else if (eventType === 'DISCONNECT') {
-      await dynamodbSharedLib.deleteItem(event._izContext, await dynamodbSharedLib.tableName(event._izContext, 'UserUploadRecords'), { connectionId });
-      //(<webSocketDisconnect>)
-      //(</webSocketDisconnect>)
-    }
-    return response.webSocketSuccess();
-  } catch (error) {
-    event._izContext.logger.error('Error, WebSocketConnect: ', error);
-    return response.failure(error);
-  }
-});
-`;
-}
-
-function webSocketCompleteMain() {
-  return `import { NoRetryError } from '@izara_project/izara-core-library-core';
-import { consts } from '@izara_project/izara-middleware';
-import { getObjectSchema, utils } from '@izara_project/izara-core-library-service-schemas';
-import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import { webSocket } from '@izara_project/izara-core-library-external-request';
-
-const { createFlowTypeConcat } = utils;
-const { postToConnection } = webSocket;
-
-export default async function WebSocketComplete(_izContext, topicArn, requestParams, callingFlowConfig = {}) {
-  try {
-    _izContext.logger.debug('WebSocketComplete _izContext', _izContext);
-    _izContext.logger.debug('WebSocketComplete requestParams', requestParams);
-    _izContext.logger.debug('WebSocketComplete callingFlowConfig', callingFlowConfig);
-    const correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID);
-    if (!topicArn) throw new NoRetryError('not have TopicArn for get FlowSchemas');
-    const topicName = topicArn.split(':')[5].split('_');
-    let flowTag = topicName[2];
-    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, { flowTag, serviceTag: topicName[0] });
-    if (!flowSchema) {
-      if (!requestParams?.hasOwnProperty('flowTag')) throw new NoRetryError('Could not find flowSchema from topicArn or requestParams.flowTag');
-      flowTag = requestParams.flowTag;
-      flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, { flowTag, serviceTag: process.env.iz_serviceTag });
-    }
-    //(<createIdentifiersFlow>)
-    let identifiers;
-    //(</createIdentifiersFlow>)
-    let taskKey;
-    if (flowSchema.statusType === 'statusField' || flowSchema.statusType === 'storedCache' || flowSchema.statusType === 'triggerCache') {
-      taskKey = createFlowTypeConcat(_izContext, { flowTag, serviceTag: topicName[0] }) + identifiers;
-    } else if (flowSchema.statusType === 'none') {
-      taskKey = createFlowTypeConcat(_izContext, { flowTag, serviceTag: topicName[0] }) + correlationId;
-    }
-    if (!taskKey) return;
-    const tasks = await dynamodbSharedLib.query(_izContext, await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'), { taskKey });
-    await Promise.all((tasks.Items ?? []).map(async task => {
-      //(<beforePostMessage>)
-      //(</beforePostMessage>)
-      await postToConnection({ message: requestParams }, task.connectionId);
-      await dynamodbSharedLib.deleteItem(_izContext, await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'), { taskKey: task.taskKey, connectionId: task.connectionId });
-    }));
-  } catch (error) {
-    _izContext.logger.error('error WebSocketInvoke: ', error);
-    throw error;
-  }
-}
-`;
-}
-
-function webSocketCompleteHandler() {
-  return `import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
-import Logger from '@izara_project/izara-core-library-logger';
-import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
-import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
-import WebSocketComplete from './WebSocketComplete_Main.js';
-
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
-const perRecordsValidatorSchema = {};
-export const main = middleware.wrap(async (event, context, callback) => {
-  try {
-    const recordPromises = [];
-    await Promise.all(event.Records.map(async record => {
-      record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
-      await recordHandlerSharedLib.validateRecord(record, 'WebSocketCompleteHdrSqs', perRecordsValidatorSchema);
-      recordPromises.push(recordHandlerSharedLib.recordHandler(
-        record,
-        WebSocketComplete,
-        'WebSocketCompleteHdrSqs',
-        [record.body.TopicArn, record.body.Message, callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)]
-      ));
-    }));
-    try {
-      await Promise.all(recordPromises);
-      return event.Records;
-    } catch {
-      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
-    }
-  } catch (error) {
-    Logger.error('Unhandled Error, WebSocketComplete_HdrSqs: ', error);
-    throw error;
-  }
-});
-`;
+export function hasSystemWebSocket(
+  flows,
+  { includeRelationshipOwnTopic = false } = {}
+) {
+  return (
+    Array.isArray(flows) &&
+    flows.some(
+      (flow) =>
+        Array.isArray(flow?.event) &&
+        (flow.event.includes('s3') ||
+          (includeRelationshipOwnTopic &&
+            flow.event.includes('ownTopic') &&
+            flow.initiateBy === 'user'))
+    )
+  );
 }

package/src/emit/system/templates/WebSocketComplete_HdrSqs.ejs

@@ -0,0 +1,48 @@
+import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
+import Logger from '@izara_project/izara-core-library-logger';
+import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import WebSocketComplete from './WebSocketComplete_Main.js';
+
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+const perRecordsValidatorSchema = {};
+export const main = middleware.wrap(async (event, context, callback) => {
+  try {
+    const recordPromises = [];
+    await Promise.all(
+      event.Records.map(async (record) => {
+        record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+        await recordHandlerSharedLib.validateRecord(
+          record,
+          'WebSocketCompleteHdrSqs',
+          perRecordsValidatorSchema
+        );
+        recordPromises.push(
+          recordHandlerSharedLib.recordHandler(
+            record,
+            WebSocketComplete,
+            'WebSocketCompleteHdrSqs',
+            [
+              record.body.TopicArn,
+              record.body.Message,
+              callingFlowSharedLib.addCallingFlowToPassOnProperties(
+                record.body.Message
+              )
+            ]
+          )
+        );
+      })
+    );
+    try {
+      await Promise.all(recordPromises);
+      return event.Records;
+    } catch {
+      Logger.debug(
+        'Promise.all(recordPromises) in handler threw error (at least one record did no resolve)'
+      );
+    }
+  } catch (error) {
+    Logger.error('Unhandled Error, WebSocketComplete_HdrSqs: ', error);
+    throw error;
+  }
+});

package/src/emit/system/templates/WebSocketComplete_Main.ejs

@@ -0,0 +1,91 @@
+import { NoRetryError } from '@izara_project/izara-core-library-core';
+import { consts } from '@izara_project/izara-middleware';
+import {
+  getObjectSchema,
+  utils
+} from '@izara_project/izara-core-library-service-schemas';
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import { webSocket } from '@izara_project/izara-core-library-external-request';
+
+const { createFlowTypeConcat } = utils;
+const { postToConnection } = webSocket;
+
+export default async function WebSocketComplete(
+  _izContext,
+  topicArn,
+  requestParams,
+  callingFlowConfig = {}
+) {
+  try {
+    _izContext.logger.debug('WebSocketComplete _izContext', _izContext);
+    _izContext.logger.debug('WebSocketComplete requestParams', requestParams);
+    _izContext.logger.debug(
+      'WebSocketComplete callingFlowConfig',
+      callingFlowConfig
+    );
+    const correlationId = _izContext.correlationIds.get(
+      consts.X_CORRELATION_ID
+    );
+    if (!topicArn)
+      throw new NoRetryError('not have TopicArn for get FlowSchemas');
+    const topicName = topicArn.split(':')[5].split('_');
+    let flowTag = topicName[2];
+    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+      _izContext,
+      { flowTag, serviceTag: topicName[0] }
+    );
+    if (!flowSchema) {
+      if (!requestParams?.hasOwnProperty('flowTag'))
+        throw new NoRetryError(
+          'Could not find flowSchema from topicArn or requestParams.flowTag'
+        );
+      flowTag = requestParams.flowTag;
+      flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+        flowTag,
+        serviceTag: process.env.iz_serviceTag
+      });
+    }
+    //(<createIdentifiersFlow>)
+    let identifiers;
+    //(</createIdentifiersFlow>)
+    let taskKey;
+    if (
+      flowSchema.statusType === 'statusField' ||
+      flowSchema.statusType === 'storedCache' ||
+      flowSchema.statusType === 'triggerCache'
+    ) {
+      taskKey =
+        createFlowTypeConcat(_izContext, {
+          flowTag,
+          serviceTag: topicName[0]
+        }) + identifiers;
+    } else if (flowSchema.statusType === 'none') {
+      taskKey =
+        createFlowTypeConcat(_izContext, {
+          flowTag,
+          serviceTag: topicName[0]
+        }) + correlationId;
+    }
+    if (!taskKey) return;
+    const tasks = await dynamodbSharedLib.query(
+      _izContext,
+      await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'),
+      { taskKey }
+    );
+    await Promise.all(
+      (tasks.Items ?? []).map(async (task) => {
+        //(<beforePostMessage>)
+        //(</beforePostMessage>)
+        await postToConnection({ message: requestParams }, task.connectionId);
+        await dynamodbSharedLib.deleteItem(
+          _izContext,
+          await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'),
+          { taskKey: task.taskKey, connectionId: task.connectionId }
+        );
+      })
+    );
+  } catch (error) {
+    _izContext.logger.error('error WebSocketInvoke: ', error);
+    throw error;
+  }
+}

package/src/emit/system/templates/WebSocketComplete_Yaml.ejs

@@ -0,0 +1,19 @@
+WebSocketCompleteHdrSqs:
+  handler: src/generatedCode/SystemFlowSchemas/WebSocketMain/source/WebSocketComplete_HdrSqs.main
+  name: ${self:custom.iz_resourcePrefix}WebSocketCompleteHdrSqs
+  role: WebSocketMainRole
+  events:
+    - sqs:
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}WebSocketCompleteHdrSqs
+        batchSize: 10
+        filterPatterns:
+          - body:
+              MessageAttributes:
+                callingFlow:
+                  Value:
+                    - ${self:custom.iz_resourcePrefix}WebSocketCompleteHdrSqs
+          - body:
+              MessageAttributes:
+                callingFlow:
+                  Value:
+                    - exists: false

package/src/emit/system/templates/WebSocketConnect.ejs

@@ -0,0 +1,45 @@
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import {
+  middlewareHandler as middleware,
+  response
+} from '@izara_project/izara-middleware';
+
+export const main = middleware.wrap(async (event) => {
+  const { eventType, connectionId } = event.requestContext ?? {};
+  try {
+    event._izContext.logger.debug('Event:', event);
+    if (eventType === 'CONNECT') {
+      const { userId, submittedByUserId } = event.queryStringParameters ?? {};
+      await dynamodbSharedLib.putItem(
+        event._izContext,
+        await dynamodbSharedLib.tableName(
+          event._izContext,
+          'UserUploadRecords'
+        ),
+        {
+          connectionId,
+          userId,
+          submittedByUserId,
+          expirationTime: Math.floor(Date.now() / 1000) + 7200
+        }
+      );
+      //(<webSocketConnect>)
+      //(</webSocketConnect>)
+    } else if (eventType === 'DISCONNECT') {
+      await dynamodbSharedLib.deleteItem(
+        event._izContext,
+        await dynamodbSharedLib.tableName(
+          event._izContext,
+          'UserUploadRecords'
+        ),
+        { connectionId }
+      );
+      //(<webSocketDisconnect>)
+      //(</webSocketDisconnect>)
+    }
+    return response.webSocketSuccess();
+  } catch (error) {
+    event._izContext.logger.error('Error, WebSocketConnect: ', error);
+    return response.failure(error);
+  }
+});

package/src/emit/system/templates/WebSocketConnect_Yaml.ejs

@@ -0,0 +1,11 @@
+WebSocketConnect:
+  handler: src/generatedCode/SystemFlowSchemas/WebSocketMain/source/WebSocketConnect.main
+  name: ${self:custom.iz_resourcePrefix}WebSocketConnect
+  role: WebSocketMainRole
+  events:
+    - websocket:
+        route: $connect
+    - websocket:
+        route: $disconnect
+    - websocket:
+        route: $default