@bitblit/ratchet-aws-node-only 4.0.99-alpha → 4.0.102-alpha

package/dist/{types/athena → athena}/alb-athena-log-ratchet.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import { ReadStream } from 'fs';
-import { AthenaRatchet } from './athena-ratchet';
+import { AthenaRatchet } from './athena-ratchet.js';
 import { S3Client } from '@aws-sdk/client-s3';
 export declare class AlbAthenaLogRatchet {
     private athena;

package/dist/{es/athena → athena}/alb-athena-log-ratchet.js

@@ -1,11 +1,14 @@
 import { readFileSync } from 'fs';
 import path from 'path';
-import { Logger } from '@bitblit/ratchet-common';
-import { RequireRatchet } from '@bitblit/ratchet-common';
-import { StringRatchet } from '@bitblit/ratchet-common';
-import { S3Ratchet } from '@bitblit/ratchet-aws';
-import { CsvRatchet } from '@bitblit/ratchet-node-only';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
+import { RequireRatchet } from '@bitblit/ratchet-common/dist/lang/require-ratchet.js';
+import { StringRatchet } from '@bitblit/ratchet-common/dist/lang/string-ratchet.js';
+import { EsmRatchet } from '@bitblit/ratchet-common/dist/lang/esm-ratchet.js';
+import { S3Ratchet } from '@bitblit/ratchet-aws/dist/s3/s3-ratchet.js';
+import { CsvRatchet } from '@bitblit/ratchet-node-only/dist/csv/csv-ratchet.js';
 export class AlbAthenaLogRatchet {
+    athena;
+    athenaTableName;
     constructor(athena, athenaTableName) {
         this.athena = athena;
         this.athenaTableName = athenaTableName;
@@ -59,7 +62,7 @@ export class AlbAthenaLogRatchet {
                 Logger.info('Drop error : %j', err);
             }
         }
-        let tableCreateQry = readFileSync(path.join(__dirname, '../static/albAthenaTableCreate.txt')).toString();
+        let tableCreateQry = readFileSync(path.join(EsmRatchet.fetchDirName(), '../static/albAthenaTableCreate.txt')).toString();
         tableCreateQry = tableCreateQry.split('{{TABLE NAME}}').join(this.athenaTableName);
         tableCreateQry = tableCreateQry.split('{{ALB_LOG_ROOT}}').join(rootPath);
         Logger.info('Creating table with %s', tableCreateQry);
@@ -104,50 +107,50 @@ export class AlbAthenaLogRatchet {
         const result = await this.athena.runQueryToFile(qrySt, null, outputFileName);
         return result;
     }
+    static CREATE_TABLE_STATEMENT = 'CREATE EXTERNAL TABLE IF NOT EXISTS `{{TABLE NAME}}`(\n' +
+        "  `type` string COMMENT '',\n" +
+        "  `time` string COMMENT '',\n" +
+        "  `elb` string COMMENT '',\n" +
+        "  `client_ip` string COMMENT '',\n" +
+        "  `client_port` int COMMENT '',\n" +
+        "  `target_ip` string COMMENT '',\n" +
+        "  `target_port` int COMMENT '',\n" +
+        "  `request_processing_time` double COMMENT '',\n" +
+        "  `target_processing_time` double COMMENT '',\n" +
+        "  `response_processing_time` double COMMENT '',\n" +
+        "  `elb_status_code` string COMMENT '',\n" +
+        "  `target_status_code` string COMMENT '',\n" +
+        "  `received_bytes` bigint COMMENT '',\n" +
+        "  `sent_bytes` bigint COMMENT '',\n" +
+        "  `request_verb` string COMMENT '',\n" +
+        "  `request_url` string COMMENT '',\n" +
+        "  `request_proto` string COMMENT '',\n" +
+        "  `user_agent` string COMMENT '',\n" +
+        "  `ssl_cipher` string COMMENT '',\n" +
+        "  `ssl_protocol` string COMMENT '',\n" +
+        "  `target_group_arn` string COMMENT '',\n" +
+        "  `trace_id` string COMMENT '',\n" +
+        "  `domain_name` string COMMENT '',\n" +
+        "  `chosen_cert_arn` string COMMENT '',\n" +
+        "  `matched_rule_priority` string COMMENT '',\n" +
+        "  `request_creation_time` string COMMENT '',\n" +
+        "  `actions_executed` string COMMENT '',\n" +
+        "  `redirect_url` string COMMENT '',\n" +
+        "  `lambda_error_reason` string COMMENT '',\n" +
+        "  `target_port_list` string COMMENT '',\n" +
+        "  `target_status_code_list` string COMMENT '',\n" +
+        "  `new_field` string COMMENT '')\n" +
+        'PARTITIONED BY (\n' +
+        '  `date_utc_partition` string\n' +
+        ')\n' +
+        'ROW FORMAT SERDE\n' +
+        "  'org.apache.hadoop.hive.serde2.RegexSerDe'\n" +
+        'WITH SERDEPROPERTIES (\n' +
+        '  \'input.regex\'=\'([^ ]*) ([^ ]*) ([^ ]*) ([^ ]*):([0-9]*) ([^ ]*)[:-]([0-9]*) ([-.0-9]*) ([-.0-9]*) ([-.0-9]*) (|[-0-9]*) (-|[-0-9]*) ([-0-9]*) ([-0-9]*) \\"([^ ]*) ([^ ]*) (- |[^ ]*)\\" \\"([^\\"]*)\\" ([A-Z0-9-]+) ([A-Za-z0-9.-]*) ([^ ]*) \\"([^\\"]*)\\" \\"([^\\"]*)\\" \\"([^\\"]*)\\" ([-.0-9]*) ([^ ]*) \\"([^\\"]*)\\" \\"([^\\"]*)\\" \\"([^ ]*)\\" \\"([^s]+)\\" \\"([^s]+)\\"(.*)\')\n' +
+        'STORED AS INPUTFORMAT\n' +
+        "  'org.apache.hadoop.mapred.TextInputFormat'\n" +
+        'OUTPUTFORMAT\n' +
+        "  'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'\n" +
+        'LOCATION\n' +
+        "  '{{ALB_LOG_ROOT}}'\n";
 }
-AlbAthenaLogRatchet.CREATE_TABLE_STATEMENT = 'CREATE EXTERNAL TABLE IF NOT EXISTS `{{TABLE NAME}}`(\n' +
-    "  `type` string COMMENT '',\n" +
-    "  `time` string COMMENT '',\n" +
-    "  `elb` string COMMENT '',\n" +
-    "  `client_ip` string COMMENT '',\n" +
-    "  `client_port` int COMMENT '',\n" +
-    "  `target_ip` string COMMENT '',\n" +
-    "  `target_port` int COMMENT '',\n" +
-    "  `request_processing_time` double COMMENT '',\n" +
-    "  `target_processing_time` double COMMENT '',\n" +
-    "  `response_processing_time` double COMMENT '',\n" +
-    "  `elb_status_code` string COMMENT '',\n" +
-    "  `target_status_code` string COMMENT '',\n" +
-    "  `received_bytes` bigint COMMENT '',\n" +
-    "  `sent_bytes` bigint COMMENT '',\n" +
-    "  `request_verb` string COMMENT '',\n" +
-    "  `request_url` string COMMENT '',\n" +
-    "  `request_proto` string COMMENT '',\n" +
-    "  `user_agent` string COMMENT '',\n" +
-    "  `ssl_cipher` string COMMENT '',\n" +
-    "  `ssl_protocol` string COMMENT '',\n" +
-    "  `target_group_arn` string COMMENT '',\n" +
-    "  `trace_id` string COMMENT '',\n" +
-    "  `domain_name` string COMMENT '',\n" +
-    "  `chosen_cert_arn` string COMMENT '',\n" +
-    "  `matched_rule_priority` string COMMENT '',\n" +
-    "  `request_creation_time` string COMMENT '',\n" +
-    "  `actions_executed` string COMMENT '',\n" +
-    "  `redirect_url` string COMMENT '',\n" +
-    "  `lambda_error_reason` string COMMENT '',\n" +
-    "  `target_port_list` string COMMENT '',\n" +
-    "  `target_status_code_list` string COMMENT '',\n" +
-    "  `new_field` string COMMENT '')\n" +
-    'PARTITIONED BY (\n' +
-    '  `date_utc_partition` string\n' +
-    ')\n' +
-    'ROW FORMAT SERDE\n' +
-    "  'org.apache.hadoop.hive.serde2.RegexSerDe'\n" +
-    'WITH SERDEPROPERTIES (\n' +
-    '  \'input.regex\'=\'([^ ]*) ([^ ]*) ([^ ]*) ([^ ]*):([0-9]*) ([^ ]*)[:-]([0-9]*) ([-.0-9]*) ([-.0-9]*) ([-.0-9]*) (|[-0-9]*) (-|[-0-9]*) ([-0-9]*) ([-0-9]*) \\"([^ ]*) ([^ ]*) (- |[^ ]*)\\" \\"([^\\"]*)\\" ([A-Z0-9-]+) ([A-Za-z0-9.-]*) ([^ ]*) \\"([^\\"]*)\\" \\"([^\\"]*)\\" \\"([^\\"]*)\\" ([-.0-9]*) ([^ ]*) \\"([^\\"]*)\\" \\"([^\\"]*)\\" \\"([^ ]*)\\" \\"([^s]+)\\" \\"([^s]+)\\"(.*)\')\n' +
-    'STORED AS INPUTFORMAT\n' +
-    "  'org.apache.hadoop.mapred.TextInputFormat'\n" +
-    'OUTPUTFORMAT\n' +
-    "  'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'\n" +
-    'LOCATION\n' +
-    "  '{{ALB_LOG_ROOT}}'\n";

package/dist/athena/alb-athena-log-ratchet.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/athena/alb-athena-log-ratchet.spec.js

@@ -0,0 +1,25 @@
+import { AthenaRatchet } from './athena-ratchet.js';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
+import { LoggerLevelName } from '@bitblit/ratchet-common/dist/logger/logger-level-name.js';
+import { TimeZoneRatchet } from '@bitblit/ratchet-common/dist/lang/time-zone-ratchet.js';
+import { AlbAthenaLogRatchet } from './alb-athena-log-ratchet.js';
+import { S3Client } from '@aws-sdk/client-s3';
+import { AthenaClient } from '@aws-sdk/client-athena';
+describe('#AlbAthenaLogRatchet', function () {
+    xit('should test a query', async () => {
+        Logger.setLevel(LoggerLevelName.debug);
+        const athena = new AthenaClient({ region: 'us-east-1' });
+        const s3 = new S3Client({ region: 'us-east-1' });
+        const outputDir = 's3://alb-log-bucket/temp';
+        const athRatchet = new AthenaRatchet(athena, s3, outputDir);
+        const srv = new AlbAthenaLogRatchet(athRatchet, 'alb_logs.log_table');
+        const qry = {
+            startTimeEpochMS: TimeZoneRatchet.PACIFIC.startOfTodayEpochMS(),
+            endTimeEpochMS: TimeZoneRatchet.PACIFIC.startOfTodayEpochMS() + 1000 * 60 * 10,
+            limit: 10,
+        };
+        const result = await srv.fetchAlbLogRecords(qry);
+        expect(result).toBeTruthy();
+        Logger.info('Got objects : %j', result);
+    });
+});

package/dist/{es/athena → athena}/athena-ratchet.js

@@ -1,14 +1,17 @@
 import { GetNamedQueryCommand, GetQueryExecutionCommand, ListNamedQueriesCommand, StartQueryExecutionCommand, } from '@aws-sdk/client-athena';
-import { StringRatchet } from '@bitblit/ratchet-common';
-import { Logger } from '@bitblit/ratchet-common';
-import { StopWatch } from '@bitblit/ratchet-common';
-import { PromiseRatchet } from '@bitblit/ratchet-common';
+import { StringRatchet } from '@bitblit/ratchet-common/dist/lang/string-ratchet.js';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
+import { StopWatch } from '@bitblit/ratchet-common/dist/lang/stop-watch.js';
+import { PromiseRatchet } from '@bitblit/ratchet-common/dist/lang/promise-ratchet.js';
 import { GetObjectCommand } from '@aws-sdk/client-s3';
 import tmp from 'tmp';
 import fs from 'fs';
-import { CsvRatchet } from '@bitblit/ratchet-node-only';
-import { RequireRatchet } from '@bitblit/ratchet-common';
+import { CsvRatchet } from '@bitblit/ratchet-node-only/dist/csv/csv-ratchet.js';
+import { RequireRatchet } from '@bitblit/ratchet-common/dist/lang/require-ratchet.js';
 export class AthenaRatchet {
+    athena;
+    s3;
+    outputLocation;
     constructor(athena, s3, outputLocation) {
         this.athena = athena;
         this.s3 = s3;

package/dist/athena/athena-ratchet.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/athena/athena-ratchet.spec.js

@@ -0,0 +1,27 @@
+import { AthenaRatchet } from './athena-ratchet.js';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
+import { AthenaClient, GetQueryExecutionCommand, StartQueryExecutionCommand, } from '@aws-sdk/client-athena';
+import { S3Client } from '@aws-sdk/client-s3';
+import { mockClient } from 'aws-sdk-client-mock';
+let mockAthena;
+let mockS3;
+describe('#AthenaRatchet', function () {
+    mockAthena = mockClient(AthenaClient);
+    mockS3 = mockClient(S3Client);
+    beforeEach(() => {
+        mockAthena.reset();
+        mockS3.reset();
+    });
+    xit('should test a query', async () => {
+        const outputDir = 's3://your-bucket/your-prefix';
+        const qry = 'select * from test limit 20000';
+        mockAthena.on(StartQueryExecutionCommand).resolves({ jobName: 'b' });
+        mockAthena.on(GetQueryExecutionCommand).resolves({
+            QueryExecution: { ResultConfiguration: { OutputLocation: 'test' }, Status: { State: 'SUCCEEDED' } },
+        });
+        const ratchet = new AthenaRatchet(mockAthena, mockS3, outputDir);
+        const result = await ratchet.runQueryToObjects(qry);
+        expect(result).toBeTruthy();
+        Logger.info('Got objects : %j', result);
+    });
+});

package/dist/{types/build → build}/ratchet-aws-node-only-info.d.ts

@@ -1,4 +1,4 @@
-import { BuildInformation } from '@bitblit/ratchet-common';
+import { BuildInformation } from '@bitblit/ratchet-common/dist/build/build-information.js';
 export declare class RatchetAwsNodeOnlyInfo {
     private constructor();
     static buildInformation(): BuildInformation;

package/dist/{types/cli → cli}/dynamo-exporter.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import { WriteStream } from 'fs';
-import { DynamoRatchet } from '@bitblit/ratchet-aws';
+import { DynamoRatchet } from '@bitblit/ratchet-aws/dist/dynamodb/dynamo-ratchet.js';
 import { QueryCommandInput, ScanCommandInput } from '@aws-sdk/client-dynamodb';
 export declare class DynamoExporter {
     private constructor();

package/dist/{es/cli → cli}/dynamo-exporter.js

@@ -1,7 +1,7 @@
-import { StringRatchet } from '@bitblit/ratchet-common';
-import { Logger } from '@bitblit/ratchet-common';
-import { PromiseRatchet } from '@bitblit/ratchet-common';
-import { RequireRatchet } from '@bitblit/ratchet-common';
+import { StringRatchet } from '@bitblit/ratchet-common/dist/lang/string-ratchet.js';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
+import { PromiseRatchet } from '@bitblit/ratchet-common/dist/lang/promise-ratchet.js';
+import { RequireRatchet } from '@bitblit/ratchet-common/dist/lang/require-ratchet.js';
 import fs from 'fs';
 import readline from 'readline';
 export class DynamoExporter {

package/dist/{types/cli → cli}/ratchet-cli-handler.d.ts

@@ -1,5 +1,5 @@
-import { AbstractRatchetCliHandler } from '@bitblit/ratchet-node-only';
-import { BuildInformation } from '@bitblit/ratchet-common/dist/types/build/build-information';
+import { AbstractRatchetCliHandler } from '@bitblit/ratchet-node-only/dist/cli/abstract-ratchet-cli-handler.js';
+import { BuildInformation } from '@bitblit/ratchet-common/dist/build/build-information.js';
 export declare class RatchetCliHandler extends AbstractRatchetCliHandler {
     fetchHandlerMap(): Record<string, any>;
     fetchVersionInfo(): BuildInformation;

package/dist/{es/cli → cli}/ratchet-cli-handler.js

@@ -1,7 +1,7 @@
-import { AbstractRatchetCliHandler } from '@bitblit/ratchet-node-only';
-import { SiteUploader } from './site-uploader/site-uploader';
-import { StartInstanceAndSsh } from './start-instance-and-ssh';
-import { RatchetAwsNodeOnlyInfo } from '../build/ratchet-aws-node-only-info';
+import { AbstractRatchetCliHandler } from '@bitblit/ratchet-node-only/dist/cli/abstract-ratchet-cli-handler.js';
+import { SiteUploader } from './site-uploader/site-uploader.js';
+import { StartInstanceAndSsh } from './start-instance-and-ssh.js';
+import { RatchetAwsNodeOnlyInfo } from '../build/ratchet-aws-node-only-info.js';
 export class RatchetCliHandler extends AbstractRatchetCliHandler {
     fetchHandlerMap() {
         return {

package/dist/{es/cli → cli}/site-uploader/site-uploader.js

@@ -3,11 +3,14 @@ import walk from 'walk';
 import { S3Client } from '@aws-sdk/client-s3';
 import path from 'path';
 import mime from 'mime-types';
-import { Logger } from '@bitblit/ratchet-common';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
 import { Upload } from '@aws-sdk/lib-storage';
 export class SiteUploader {
+    srcDir;
+    bucketName;
+    config;
+    s3 = new S3Client({ region: 'us-east-1' });
     constructor(srcDir, bucketName, configFile) {
-        this.s3 = new S3Client({ region: 'us-east-1' });
         this.srcDir = srcDir;
         this.bucketName = bucketName;
         this.config = JSON.parse(fs.readFileSync(configFile).toString('ascii'));

package/dist/{es/cli → cli}/start-instance-and-ssh.js

@@ -1,10 +1,16 @@
-import { Logger } from '@bitblit/ratchet-common';
-import { Ec2Ratchet } from '@bitblit/ratchet-aws';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
+import { Ec2Ratchet } from '@bitblit/ratchet-aws/dist/ec2/ec2-ratchet.js';
 import { spawnSync } from 'child_process';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
 export class StartInstanceAndSsh {
+    instanceId;
+    publicKeyFile;
+    instanceOsUser;
+    region;
+    availabilityZone;
+    ec2Ratchet;
     constructor(instanceId, publicKeyFile = path.join(os.homedir(), '.ssh', 'id_rsa.pub'), instanceOsUser = 'ec2-user', region = 'us-east-1', availabilityZone = 'us-east-1a') {
         this.instanceId = instanceId;
         this.publicKeyFile = publicKeyFile;

package/dist/index.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/index.js

@@ -0,0 +1 @@
+export {};

package/dist/mail/inbound/email-to-db-insert-processor.d.ts

@@ -0,0 +1,10 @@
+import { ParsedEmailProcessor } from './parsed-email-processor.js';
+import { ParsedMail } from 'mailparser';
+export declare class EmailToDbInsertProcessor implements ParsedEmailProcessor<EmailToDbStatement[]> {
+    canProcess(mail: ParsedMail): boolean;
+    processEmail(msg: ParsedMail): Promise<EmailToDbStatement[]>;
+}
+export interface EmailToDbStatement {
+    statement: string;
+    params?: any[];
+}

package/dist/mail/inbound/email-to-db-insert-processor.js

@@ -0,0 +1,89 @@
+import { RequireRatchet } from '@bitblit/ratchet-common/dist/lang/require-ratchet.js';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
+import { MultiStream } from '@bitblit/ratchet-common/dist/stream/multi-stream.js';
+import unzipper from 'unzipper';
+import { CsvRatchet } from '@bitblit/ratchet-node-only/dist/csv/csv-ratchet.js';
+import { DateTime } from 'luxon';
+export class EmailToDbInsertProcessor {
+    canProcess(mail) {
+        return true;
+    }
+    async processEmail(msg) {
+        const rval = [];
+        try {
+            RequireRatchet.notNullOrUndefined(msg, 'msg');
+            Logger.info('Processing Broadsign reach inbound inventory email');
+            const data = msg.attachments[0].content;
+            Logger.info('Unzipping attachment');
+            const rs = new MultiStream(data);
+            let wBuf = null;
+            const prom = rs
+                .pipe(unzipper.Parse())
+                .on('entry', async (entry) => {
+                if (entry.path.toLowerCase().endsWith('csv')) {
+                    wBuf = await entry.buffer();
+                }
+                else {
+                    Logger.info('Pass: %s', entry.path);
+                    entry.autodrain();
+                }
+            })
+                .promise();
+            await prom;
+            const csvParsed = await CsvRatchet.stringParse(wBuf.toString(), (o) => o, {
+                columns: false,
+                skip_empty_lines: true,
+            });
+            if (csvParsed.length > 1) {
+                const dropTable = 'drop table if exists sample';
+                let createTable = 'create table sample (pump_date varchar(255),';
+                const colNames = csvParsed[0];
+                let insertPrefix = 'insert into sample (pump_date,';
+                let insertQ = '?,';
+                for (let i = 0; i < colNames.length; i++) {
+                    if (i > 0) {
+                        createTable += ', ';
+                        insertPrefix += ', ';
+                        insertQ += ', ';
+                    }
+                    const kOut = colNames[i].toLowerCase().split(' ').join('_');
+                    insertPrefix += kOut;
+                    insertQ += '?';
+                    createTable += kOut + ' varchar(255)';
+                    if (kOut === 'id') {
+                        createTable += ' primary key';
+                    }
+                    else if (kOut === 'device_id') {
+                        createTable += ' unique';
+                    }
+                }
+                createTable += ')';
+                insertPrefix += ') values ';
+                Logger.info('Recreating table');
+                const dropRes = rval.push({ statement: dropTable });
+                const createRes = rval.push({ statement: createTable });
+                const pumpDate = DateTime.utc().toISO();
+                let insertStmt = insertPrefix;
+                let insertParams = [];
+                for (let i = 1; i < csvParsed.length; i++) {
+                    if (insertStmt > insertPrefix) {
+                        insertStmt += ',';
+                    }
+                    insertStmt += '(' + insertQ + ')';
+                    insertParams = insertParams.concat(pumpDate, csvParsed[i]);
+                    if (i % 25 === 0 || i === csvParsed.length - 1) {
+                        rval.push({ statement: insertStmt, params: insertParams });
+                        insertStmt = insertPrefix;
+                        insertParams = [];
+                        Logger.info('Inserted %d of %d rows', i, csvParsed.length);
+                    }
+                }
+                Logger.info('Finished insertion of %d rows', csvParsed.length);
+            }
+        }
+        catch (err) {
+            Logger.error('Failure: %s : %j', err, rval, err);
+        }
+        return rval;
+    }
+}

package/dist/mail/inbound/inbound-email-ratchet.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="node" resolution-mode="require"/>
+import { S3CacheRatchet } from '@bitblit/ratchet-aws/dist/s3/s3-cache-ratchet.js';
+import { ParsedEmailProcessor } from './parsed-email-processor.js';
+export declare class InboundEmailRatchet {
+    private cache;
+    private processors;
+    constructor(cache: S3CacheRatchet, processors: ParsedEmailProcessor<any>[]);
+    processEmailFromS3(key: string): Promise<boolean>;
+    processEmailFromBuffer(buf: Buffer): Promise<boolean>;
+}

package/dist/{es/mail → mail}/inbound/inbound-email-ratchet.js

@@ -1,9 +1,12 @@
 import { simpleParser } from 'mailparser';
-import { Readable } from 'stream';
-import { Logger, RequireRatchet } from '@bitblit/ratchet-common';
+import { Logger } from '@bitblit/ratchet-common/dist/logger/logger.js';
+import { RequireRatchet } from '@bitblit/ratchet-common/dist/lang/require-ratchet.js';
 export class InboundEmailRatchet {
-    constructor(cache) {
+    cache;
+    processors;
+    constructor(cache, processors) {
         this.cache = cache;
+        this.processors = processors;
         RequireRatchet.notNullOrUndefined(this.cache, 'cache');
         RequireRatchet.notNullOrUndefined(this.cache.getDefaultBucket(), 'cache.defaultBucket');
     }
@@ -23,27 +26,16 @@ export class InboundEmailRatchet {
         RequireRatchet.notNullOrUndefined(buf, 'buf');
         Logger.info('Processing inbound email - size %d bytes', buf.length);
         const message = await simpleParser(buf);
-        Logger.info('Found mail from "%s" subject "%s" with %d attachments', message.from.text, message.subject, message.attachments.length);
-        if (!!message &&
-            !!message.subject &&
-            message.subject.toLowerCase().startsWith('reach inventory') &&
-            !!message.attachments &&
-            message.attachments.length === 1 &&
-            message.attachments[0].contentType.toLowerCase() === 'application/zip') {
+        Logger.info('Found mail from "%s" subject "%s" with %d attachments', message?.from?.text, message?.subject, message?.attachments?.length);
+        let procd = false;
+        for (let i = 0; i < this.processors.length && !procd; i++) {
+            if (this.processors[i].canProcess(message)) {
+                Logger.info('Processing message with processor %d', i);
+                const result = await this.processors[i].processEmail(message);
+                Logger.info('Result was : %j', result);
+                procd = true;
+            }
         }
-        else {
-            Logger.info('Unrecognized email - not processing');
-        }
-        return rval;
-    }
-}
-export class MultiStream extends Readable {
-    constructor(object, options = {}) {
-        super(object instanceof Buffer || typeof object === 'string' ? options : { objectMode: true });
-        this._object = object;
-    }
-    _read() {
-        this.push(this._object);
-        this._object = null;
+        return procd;
     }
 }

package/dist/mail/inbound/inbound-email-ratchet.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/mail/inbound/inbound-email-ratchet.spec.js

@@ -0,0 +1,18 @@
+import { InboundEmailRatchet } from './inbound-email-ratchet.js';
+import { JestRatchet } from '@bitblit/ratchet-jest/dist/jest/jest-ratchet.js';
+import { jest } from '@jest/globals';
+import { SampleEmailProcessor } from './sample-email-processor.js';
+let mockS3CR;
+describe('#inboundEmailService', () => {
+    beforeEach(() => {
+        mockS3CR = JestRatchet.mock(jest.fn);
+    });
+    it('should process an email from S3', async () => {
+        mockS3CR.getDefaultBucket.mockReturnValueOnce('TEST-BUCKET');
+        mockS3CR.fileExists.mockResolvedValueOnce(true);
+        mockS3CR.fetchCacheFileAsString.mockResolvedValue('TEST');
+        const svc = new InboundEmailRatchet(mockS3CR, [new SampleEmailProcessor()]);
+        const res = await svc.processEmailFromS3('some-key');
+        expect(res).not.toBeUndefined();
+    });
+});

package/dist/mail/inbound/parsed-email-processor.d.ts

@@ -0,0 +1,5 @@
+import { ParsedMail } from 'mailparser';
+export interface ParsedEmailProcessor<T> {
+    canProcess(mail: ParsedMail): boolean;
+    processEmail(msg: ParsedMail): Promise<T>;
+}

package/dist/mail/inbound/parsed-email-processor.js

@@ -0,0 +1 @@
+export {};

package/dist/mail/inbound/sample-email-processor.d.ts

@@ -0,0 +1,6 @@
+import { ParsedEmailProcessor } from './parsed-email-processor.js';
+import { ParsedMail } from 'mailparser';
+export declare class SampleEmailProcessor implements ParsedEmailProcessor<string> {
+    canProcess(mail: ParsedMail): boolean;
+    processEmail(msg: ParsedMail): Promise<string>;
+}

package/dist/mail/inbound/sample-email-processor.js

@@ -0,0 +1,8 @@
+export class SampleEmailProcessor {
+    canProcess(mail) {
+        return true;
+    }
+    async processEmail(msg) {
+        return msg.body;
+    }
+}

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@bitblit/ratchet-aws-node-only",
-  "version": "4.0.99-alpha",
+  "version": "4.0.102-alpha",
   "description": "Common tools for use with AWS (Node only)",
   "note-on-side-effects": "Technically the entries in 'bin' below might be side effects, but they are called explicitly",
   "sideEffects": false,
   "bin": {
     "ratchet-aws-cli": "./includes/cli.js"
   },
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
+  "type": "module",
+  "module": "index.js",
   "files": [
     "dist/*",
     "includes/*"
@@ -36,15 +35,13 @@
   "scripts": {
     "watch": "tsc-watch",
     "clean": "shx rm -Rf dist",
-    "test": "jest",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest",
     "docs": "typedoc",
     "lint": "eslint src/**/*.ts",
     "lint-fix": "eslint --fix src/**/*.ts",
-    "generate-barrels": "barrelsby -q --delete -d src -e .*\\.spec\\.ts",
-    "build": "yarn run generate-barrels && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:es": "tsc -p tsconfig.es.json",
-    "build:types": "tsc -p tsconfig.types.json"
+    "__generate-barrels": "barrelsby -q --delete -d src -e .*\\.spec\\.ts",
+    "__build": "yarn run generate-barrels && tsc",
+    "build": "tsc"
   },
   "repository": {
     "type": "git",
@@ -75,6 +72,7 @@
     "mailparser": "3.6.4",
     "mime-types": "2.1.35",
     "tmp": "0.2.1",
+    "unzipper": "0.10.11",
     "walk": "2.3.15"
   },
   "peerDependencies": {