@bitblit/ratchet-aws 4.0.115-alpha → 4.0.116-alpha

package/lib/route53/route-53-ratchet.d.ts

@@ -3,5 +3,6 @@ export declare class Route53Ratchet {
     private route53;
     private hostedZoneId;
     constructor(route53: Route53Client, hostedZoneId: string);
+    get route53Client(): Route53Client;
     changeCnameRecordTarget(domainName: string, target: string, hostedZoneId?: string, ttlSeconds?: number): Promise<boolean>;
 }

package/lib/s3/s3-cache-ratchet.d.ts

@@ -1,11 +1,12 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" />
+/// <reference types="node" />
 import { CompleteMultipartUploadCommandOutput, CopyObjectCommandOutput, DeleteObjectCommandOutput, GetObjectCommandOutput, HeadObjectCommandOutput, PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3';
 import { Readable } from 'stream';
 export declare class S3CacheRatchet {
     private s3;
     private defaultBucket;
     constructor(s3: S3Client, defaultBucket?: string);
+    get s3Client(): S3Client;
     static applyCacheControlMaxAge(input: PutObjectCommandInput, seconds: number): PutObjectCommandInput;
     static applyUserMetaData(input: PutObjectCommandInput, key: string, value: string): PutObjectCommandInput;
     getDefaultBucket(): string;

package/lib/s3/s3-cache-to-local-disk-ratchet.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" />
 import { S3CacheRatchet } from './s3-cache-ratchet.js';
 export declare class S3CacheToLocalDiskRatchet {
     private s3;

package/lib/ses/mailer.d.ts

@@ -8,6 +8,7 @@ export declare class Mailer implements MailerLike {
     private config;
     static readonly EMAIL: RegExp;
     constructor(ses: SESClient, config?: MailerConfig);
+    get sESClient(): SESClient;
     fillEmailBody(rts: ReadyToSendEmail, context: any, htmlTemplateName: string, txtTemplateName?: string, layoutName?: string, partialNames?: string[]): Promise<ReadyToSendEmail>;
     fillEmailBodyAndSend(rts: ReadyToSendEmail, context: any, htmlTemplateName: string, txtTemplateName?: string, layoutName?: string, partialNames?: string[]): Promise<SendRawEmailResponse>;
     filterEmailsToValid(emails: string[]): string[];

package/lib/sns/sns-ratchet.d.ts

@@ -3,6 +3,7 @@ export declare class SnsRatchet {
     private sns;
     private topicArn;
     constructor(sns: SNSClient, topicArn: string);
+    get snsClient(): SNSClient;
     sendMessage(inMsg: any, suppressErrors?: boolean): Promise<PublishCommandOutput>;
     conditionallySendMessage(inMsg: any, condition: boolean, suppressErrors?: boolean): Promise<PublishCommandOutput>;
 }

package/package.json

@@ -1,14 +1,21 @@
 {
   "name": "@bitblit/ratchet-aws",
-  "version": "4.0.115-alpha",
+  "version": "4.0.116-alpha",
   "description": "Common tools for use with AWS browser and node",
   "sideEffects": false,
   "type": "module",
-  "module": "index.js",
+  "_module": "lib/index.js",
+  "_typings": "lib/index.d.ts",
   "files": [
     "lib/*",
     "bin/*"
   ],
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.mjs"
+    }
+  },
   "contributors": [
     "Christopher Weiss <bitblit@gmail.com>",
     "William Weiss <npm@codification.org>",
@@ -35,9 +42,16 @@
     "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 && tsc",
-    "build": "tsc",
+    "generate-barrels": "barrelsby -q --delete -d src -e .*\\.spec\\.ts && sed -i 's/\\x27;/.js\\x27;/' src/index.ts",
+    "__build": "yarn build-code && yarn build-types",
+    "__build-code": "yarn run generate-barrels && node esbuild-conf.mjs",
+    "__build-types": " npm-dts generate --output lib/index.d.ts",
+    "__build-types": "tsc --emitDeclarationOnly",
+    "__build": "tsc",
+    "___build": "rollup src/index.ts -f esm -o lib/t.mjs",
+    "_build": "yarn clean && yarn generate-barrels && tsc && rollup -c rollup.config.js && cp src/index.ts.bak lib/index.d.ts",
+    "build": "yarn clean && yarn generate-barrels && rollup -c rollup.config.js",
+    "_1build": "yarn clean && yarn generate-barrels && tsc",
     "force-build": "tsc --build --force"
   },
   "repository": {
@@ -57,9 +71,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@bitblit/ratchet-common": "4.0.115-alpha"
-  },
-  "optionalDependencies": {
+    "@bitblit/ratchet-common": "4.0.116-alpha",
     "@aws-sdk/abort-controller": "3.310.0",
     "@aws-sdk/client-athena": "3.328.0",
     "@aws-sdk/client-batch": "3.328.0",
@@ -78,86 +90,15 @@
     "@aws-sdk/s3-request-presigner": "3.328.0",
     "@aws-sdk/smithy-client": "3.325.0",
     "@aws-sdk/types": "3.310.0",
-    "@aws-sdk/util-waiter": "3.310.0",
-    "@types/aws-lambda": "8.10.115"
+    "@aws-sdk/util-waiter": "3.310.0"
   },
-  "peerDependencies": {
-    "@aws-sdk/abort-controller": "^3.310.0",
-    "@aws-sdk/client-athena": "^3.328.0",
-    "@aws-sdk/client-batch": "^3.328.0",
-    "@aws-sdk/client-cloudwatch": "^3.328.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.328.0",
-    "@aws-sdk/client-dynamodb": "^3.328.0",
-    "@aws-sdk/client-ec2": "^3.328.0",
-    "@aws-sdk/client-ec2-instance-connect": "^3.328.0",
-    "@aws-sdk/client-route-53": "^3.328.0",
-    "@aws-sdk/client-s3": "^3.328.0",
-    "@aws-sdk/client-ses": "^3.328.0",
-    "@aws-sdk/client-sns": "^3.328.0",
-    "@aws-sdk/client-ssm": "^3.328.0",
-    "@aws-sdk/lib-dynamodb": "^3.328.0",
-    "@aws-sdk/lib-storage": "^3.328.0",
-    "@aws-sdk/s3-request-presigner": "^3.328.0",
-    "@aws-sdk/smithy-client": "^3.328.0",
-    "@aws-sdk/types": "^3.310.0",
-    "@aws-sdk/util-waiter": "^3.310.0",
-    "@bitblit/ratchet-common": "4.0.115-alpha",
-    "@types/aws-lambda": "^8.10.115"
-  },
-  "peerDependenciesMeta": {
-    "@aws-sdk/client-athena": {
-      "optional": true
-    },
-    "@aws-sdk/client-batch": {
-      "optional": true
-    },
-    "@aws-sdk/client-cloudwatch": {
-      "optional": true
-    },
-    "@aws-sdk/client-cloudwatch-logs": {
-      "optional": true
-    },
-    "@aws-sdk/client-dynamodb": {
-      "optional": true
-    },
-    "@aws-sdk/client-ec2": {
-      "optional": true
-    },
-    "@aws-sdk/client-ec2-instance-connect": {
-      "optional": true
-    },
-    "@aws-sdk/client-route-53": {
-      "optional": true
-    },
-    "@aws-sdk/client-s3": {
-      "optional": true
-    },
-    "@aws-sdk/client-ses": {
-      "optional": true
-    },
-    "@aws-sdk/client-sns": {
-      "optional": true
-    },
-    "@aws-sdk/client-ssm": {
-      "optional": true
-    },
-    "@aws-sdk/lib-dynamodb": {
-      "optional": true
-    },
-    "@aws-sdk/lib-storage": {
-      "optional": true
-    },
-    "@aws-sdk/s3-request-presigner": {
-      "optional": true
-    },
-    "@aws-sdk/smithy-client": {
-      "optional": true
-    }
+  "optionalDependencies": {
   },
   "resolutions": {},
   "devDependencies": {
-    "@bitblit/ratchet-jest": "4.0.115-alpha",
-    "@bitblit/ratchet-node-only": "4.0.115-alpha",
+    "@types/aws-lambda": "8.10.115",
+    "@bitblit/ratchet-jest": "4.0.116-alpha",
+    "@bitblit/ratchet-node-only": "4.0.116-alpha",
     "aws-sdk-client-mock": "2.1.1"
   }
 }

package/lib/batch/aws-batch-background-processor.js

@@ -1,45 +0,0 @@
-import { DateTime } from 'luxon';
-import { ErrorRatchet } from '@bitblit/ratchet-common/lib/lang/error-ratchet.js';
-import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
-import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
-import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
-export class AwsBatchBackgroundProcessor {
-    batchRatchet;
-    validTaskNames;
-    constructor(batchRatchet, validTaskNames) {
-        this.batchRatchet = batchRatchet;
-        this.validTaskNames = validTaskNames;
-        RequireRatchet.notNullOrUndefined(this.batchRatchet, 'batchRatchet');
-        RequireRatchet.notNullOrUndefined(this.batchRatchet.batchClient, 'batchRatchet.batchClient');
-        RequireRatchet.notNullOrUndefined(this.batchRatchet.defaultJobDefinition, 'batchRatchet.defaultJobDefinition');
-        RequireRatchet.notNullOrUndefined(this.batchRatchet.defaultQueueName, 'batchRatchet.defaultQueueName');
-    }
-    async scheduleBackgroundTask(taskName, data = {}, meta = {}) {
-        if (this.validTaskNames &&
-            this.validTaskNames.length &&
-            (!StringRatchet.trimToNull(taskName) || !this.validTaskNames.includes(taskName))) {
-            ErrorRatchet.throwFormattedErr('Cannot start task %s - not found in valid task list', taskName);
-        }
-        Logger.info('Submitting background task to AWS batch: %s %j %s', taskName, data, this.batchRatchet.defaultQueueName);
-        let rval = null;
-        const jobName = `${this.batchRatchet.defaultJobDefinition}-${taskName}_${DateTime.utc().toFormat('yyyy-MM-dd-HH-mm')}`;
-        const options = {
-            jobName: jobName,
-            jobDefinition: this.batchRatchet.defaultJobDefinition,
-            jobQueue: this.batchRatchet.defaultQueueName,
-            parameters: {
-                taskName,
-                taskData: JSON.stringify(data),
-                taskMetadata: JSON.stringify(meta),
-            },
-        };
-        try {
-            rval = await this.batchRatchet.scheduleJob(options);
-            Logger.info('Job %s(%s) submitted', rval.jobName, rval.jobId);
-        }
-        catch (err) {
-            Logger.error('Cannot submit batch job taskName: %s jobDef: %s queue: %s jobName: %s data: %j', taskName, this.batchRatchet.defaultJobDefinition, this.batchRatchet.defaultQueueName, jobName, data, err);
-        }
-        return rval;
-    }
-}

package/lib/batch/aws-batch-background-processor.spec.js

@@ -1,15 +0,0 @@
-import { JestRatchet } from '@bitblit/ratchet-jest/lib/jest/jest-ratchet.js';
-import { AwsBatchBackgroundProcessor } from './aws-batch-background-processor.js';
-import { jest } from '@jest/globals';
-let mockBatchRatchet;
-describe('#AwsBatchBackgroundProcessor', () => {
-    beforeEach(() => {
-        mockBatchRatchet = JestRatchet.mock(jest.fn);
-    });
-    it('Should schedule background task', async () => {
-        mockBatchRatchet.scheduleJob.mockResolvedValue({ jobId: 'newID', jobName: 'name', $metadata: null });
-        const svc = new AwsBatchBackgroundProcessor(mockBatchRatchet, null);
-        const res = await svc.scheduleBackgroundTask('BACKGROUND_TASK_NAME', {}, {});
-        expect(res).not.toBeNull();
-    });
-});

package/lib/batch/aws-batch-ratchet.js

@@ -1,55 +0,0 @@
-import { ListJobsCommand, SubmitJobCommand, } from '@aws-sdk/client-batch';
-import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
-import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
-export class AwsBatchRatchet {
-    _batchClient;
-    _defaultQueueName;
-    _defaultJobDefinition;
-    constructor(_batchClient, _defaultQueueName, _defaultJobDefinition) {
-        this._batchClient = _batchClient;
-        this._defaultQueueName = _defaultQueueName;
-        this._defaultJobDefinition = _defaultJobDefinition;
-    }
-    get batchClient() {
-        return this._batchClient;
-    }
-    get defaultQueueName() {
-        return this._defaultQueueName;
-    }
-    get defaultJobDefinition() {
-        return this._defaultJobDefinition;
-    }
-    async scheduleJob(options) {
-        Logger.info('Submitting batch job %s', options.jobName);
-        try {
-            const rval = await this._batchClient.send(new SubmitJobCommand(options));
-            Logger.info('Job %s(%s) submitted', rval.jobName, rval.jobId);
-            return rval;
-        }
-        catch (err) {
-            Logger.error('Cannot submit batch job %s: %s', options.jobName, err);
-        }
-        return null;
-    }
-    async jobCountInState(jobStatus, queueName = this.defaultQueueName) {
-        const all = await this.listJobs(queueName, jobStatus);
-        return all.length;
-    }
-    async listJobs(queueName = this.defaultQueueName, jobStatus = null) {
-        RequireRatchet.notNullOrUndefined(queueName, 'queueName');
-        let rval = [];
-        const request = {
-            jobQueue: queueName,
-            jobStatus: jobStatus,
-            nextToken: null,
-        };
-        Logger.info('Fetching %j', request);
-        do {
-            Logger.info('Pulling page...');
-            const tmp = await this._batchClient.send(new ListJobsCommand(request));
-            rval = rval.concat(tmp.jobSummaryList);
-            request.nextToken = tmp.nextToken;
-        } while (request.nextToken);
-        return rval;
-    }
-}

package/lib/batch/aws-batch-ratchet.spec.js

@@ -1,33 +0,0 @@
-import { AwsBatchRatchet } from './aws-batch-ratchet.js';
-import { BatchClient, JobStatus, ListJobsCommand, SubmitJobCommand } from '@aws-sdk/client-batch';
-import { mockClient } from 'aws-sdk-client-mock';
-let mockBatch;
-describe('#AwsBatchService', () => {
-    mockBatch = mockClient(BatchClient);
-    beforeEach(() => {
-        mockBatch.reset();
-    });
-    it('Should schedule batch job', async () => {
-        const svc = new AwsBatchRatchet(mockBatch);
-        mockBatch.on(SubmitJobCommand).resolves({ jobName: 'b' });
-        const res = await svc.scheduleJob({
-            jobName: 'testName',
-            jobDefinition: 'testDefinition',
-            jobQueue: 'testQueue',
-        });
-        expect(res).not.toBeNull();
-    });
-    it('Should list jobs', async () => {
-        const svc = new AwsBatchRatchet(mockBatch);
-        mockBatch.on(ListJobsCommand).resolves([{}]);
-        const res = await svc.listJobs('testQueue');
-        expect(res).not.toBeNull();
-        expect(res.length).toEqual(1);
-    });
-    it('Should count jobs in state', async () => {
-        const svc = new AwsBatchRatchet(mockBatch);
-        mockBatch.on(ListJobsCommand).resolves([{}]);
-        const res = await svc.jobCountInState(JobStatus.RUNNABLE, 'testQueue');
-        expect(res).toEqual(1);
-    });
-});

package/lib/build/ratchet-aws-info.js

@@ -1,14 +0,0 @@
-export class RatchetAwsInfo {
-    constructor() { }
-    static buildInformation() {
-        const val = {
-            version: 'LOCAL-SNAPSHOT',
-            hash: 'LOCAL-HASH',
-            branch: 'LOCAL-BRANCH',
-            tag: 'LOCAL-TAG',
-            timeBuiltISO: 'LOCAL-TIME-ISO',
-            notes: 'LOCAL-NOTES',
-        };
-        return val;
-    }
-}

package/lib/cache/dynamo-db-storage-provider.js

@@ -1,109 +0,0 @@
-import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
-export class DynamoDbStorageProvider {
-    dynamo;
-    opts;
-    constructor(dynamo, opts) {
-        this.dynamo = dynamo;
-        this.opts = opts;
-        RequireRatchet.notNullOrUndefined(this.dynamo, 'dynamo');
-        RequireRatchet.notNullOrUndefined(this.opts, 'opts');
-        RequireRatchet.notNullOrUndefined(this.opts.tableName, 'opts.tableName');
-        RequireRatchet.notNullOrUndefined(this.opts.hashKeyName, 'opts.hashKeyName');
-        RequireRatchet.true(!this.opts.useRangeKeys || (!!this.opts.rangeKeyName && !!this.opts.hashKeyValue), 'invalid range configuration');
-    }
-    static createDefaultOptions() {
-        const rval = {
-            tableName: 'simple-cache',
-            useRangeKeys: false,
-            hashKeyName: 'cache-key',
-            rangeKeyName: null,
-            hashKeyValue: null,
-        };
-        return rval;
-    }
-    createKeyObject(cacheKey) {
-        const keys = {};
-        if (this.opts.useRangeKeys) {
-            keys[this.opts.hashKeyName] = this.opts.hashKeyValue;
-            keys[this.opts.rangeKeyName] = cacheKey;
-        }
-        else {
-            keys[this.opts.hashKeyName] = cacheKey;
-        }
-        return keys;
-    }
-    cleanDynamoFieldsFromObjectInPlace(rval) {
-        if (rval) {
-            delete rval[this.opts.hashKeyName];
-            if (this.opts.rangeKeyName) {
-                delete rval[this.opts.rangeKeyName];
-            }
-            if (this.opts.dynamoExpiresColumnName) {
-                delete rval[this.opts.dynamoExpiresColumnName];
-            }
-        }
-    }
-    extractKeysFromObject(rval) {
-        let keys = null;
-        if (rval) {
-            keys = {};
-            if (this.opts.useRangeKeys) {
-                keys[this.opts.hashKeyName] = this.opts.hashKeyValue;
-                keys[this.opts.rangeKeyName] = rval.cacheKey;
-            }
-            else {
-                keys[this.opts.hashKeyName] = rval.cacheKey;
-            }
-        }
-        return keys;
-    }
-    async readFromCache(cacheKey) {
-        const dKey = this.createKeyObject(cacheKey);
-        const rval = await this.dynamo.simpleGet(this.opts.tableName, dKey);
-        this.cleanDynamoFieldsFromObjectInPlace(rval);
-        return rval;
-    }
-    async storeInCache(value) {
-        RequireRatchet.notNullOrUndefined(value, 'value');
-        RequireRatchet.notNullOrUndefined(value.cacheKey, 'value.cacheKey');
-        const toSave = Object.assign({}, value, this.createKeyObject(value.cacheKey));
-        if (this.opts.dynamoExpiresColumnName && value.expiresEpochMS) {
-            toSave[this.opts.dynamoExpiresColumnName] = Math.floor(value.expiresEpochMS / 1000);
-        }
-        const wrote = await this.dynamo.simplePut(this.opts.tableName, toSave);
-        return !!wrote;
-    }
-    async removeFromCache(cacheKey) {
-        await this.dynamo.simpleDelete(this.opts.tableName, this.createKeyObject(cacheKey));
-    }
-    async clearCache() {
-        const allValues = await this.readAll();
-        const allKeys = allValues.map((a) => this.extractKeysFromObject(a));
-        const rval = await this.dynamo.deleteAllInBatches(this.opts.tableName, allKeys, 25);
-        return rval;
-    }
-    async readAll() {
-        let rval = null;
-        if (this.opts.useRangeKeys) {
-            const qry = {
-                TableName: this.opts.tableName,
-                KeyConditionExpression: '#cacheKey = :cacheKey',
-                ExpressionAttributeNames: {
-                    '#cacheKey': this.opts.hashKeyName,
-                },
-                ExpressionAttributeValues: {
-                    ':cacheKey': this.opts.hashKeyValue,
-                },
-            };
-            rval = await this.dynamo.fullyExecuteQuery(qry);
-        }
-        else {
-            const scan = {
-                TableName: this.opts.tableName,
-            };
-            rval = await this.dynamo.fullyExecuteScan(scan);
-        }
-        rval.forEach((r) => this.cleanDynamoFieldsFromObjectInPlace(r));
-        return rval;
-    }
-}

package/lib/cache/s3-storage-provider.js

@@ -1,43 +0,0 @@
-import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
-import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
-export class S3StorageProvider {
-    s3CacheRatchet;
-    prefix;
-    constructor(s3CacheRatchet, prefix) {
-        this.s3CacheRatchet = s3CacheRatchet;
-        this.prefix = prefix;
-        RequireRatchet.notNullOrUndefined(this.s3CacheRatchet, 's3CacheRatchet');
-        RequireRatchet.notNullOrUndefined(this.s3CacheRatchet.getDefaultBucket(), 's3CacheRatchet.defaultBucket');
-    }
-    keyToPath(cacheKey) {
-        let rval = StringRatchet.trimToEmpty(this.prefix);
-        if (rval.length > 0 && !rval.endsWith('/')) {
-            rval += '/';
-        }
-        rval += cacheKey;
-        return rval;
-    }
-    async readFromCache(cacheKey) {
-        const rval = await this.s3CacheRatchet.fetchCacheFileAsObject(this.keyToPath(cacheKey));
-        return rval;
-    }
-    async storeInCache(value) {
-        RequireRatchet.notNullOrUndefined(value, 'value');
-        RequireRatchet.notNullOrUndefined(value.cacheKey, 'value.cacheKey');
-        const tmp = await this.s3CacheRatchet.writeObjectToCacheFile(this.keyToPath(value.cacheKey), value);
-        return !!tmp;
-    }
-    async removeFromCache(cacheKey) {
-        await this.s3CacheRatchet.removeCacheFile(this.keyToPath(cacheKey));
-    }
-    async clearCache() {
-        const keys = await this.s3CacheRatchet.directChildrenOfPrefix(this.keyToPath(''));
-        const removed = await Promise.all(keys.map((k) => this.removeFromCache(k)));
-        return keys.length;
-    }
-    async readAll() {
-        const keys = await this.s3CacheRatchet.directChildrenOfPrefix(this.keyToPath(''));
-        const rval = await Promise.all(keys.map((k) => this.readFromCache(k)));
-        return rval;
-    }
-}

package/lib/cache/simple-cache-object-wrapper.js

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

package/lib/cache/simple-cache-read-options.js

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

package/lib/cache/simple-cache-storage-provider.js

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

package/lib/cache/simple-cache.js

@@ -1,64 +0,0 @@
-import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
-export class SimpleCache {
-    provider;
-    defaultTimeToLiveMS;
-    constructor(provider, defaultTimeToLiveMS = 1_000 * 60) {
-        this.provider = provider;
-        this.defaultTimeToLiveMS = defaultTimeToLiveMS;
-    }
-    createDefaultReadOptions() {
-        return {
-            maxStalenessMS: null,
-            timeToLiveMS: this.defaultTimeToLiveMS,
-            cacheNullValues: false,
-        };
-    }
-    async fetchWrapper(cacheKey, producer, opts = this.createDefaultReadOptions()) {
-        Logger.silly('Fetching %s', cacheKey);
-        const now = new Date().getTime();
-        let rval = await this.provider.readFromCache(cacheKey);
-        if (rval && rval.expiresEpochMS < now) {
-            Logger.debug('Object found, but expired - removing');
-            rval = null;
-        }
-        if (rval && opts && opts.maxStalenessMS && now - rval.createdEpochMS > opts.maxStalenessMS) {
-            Logger.debug('Object found by too stale - removing');
-            rval = null;
-        }
-        if (!rval) {
-            Logger.debug('%s not found in cache, generating', cacheKey);
-            const tmp = await producer();
-            if (tmp || opts?.cacheNullValues) {
-                Logger.debug('Writing %j to cache');
-                rval = {
-                    cacheKey: cacheKey,
-                    createdEpochMS: now,
-                    expiresEpochMS: opts && opts.timeToLiveMS ? now + opts.timeToLiveMS : null,
-                    value: tmp,
-                    generated: false,
-                };
-                await this.provider.storeInCache(rval);
-                rval.generated = true;
-            }
-        }
-        return rval;
-    }
-    async fetch(cacheKey, producer, opts = null) {
-        const wrapper = await this.fetchWrapper(cacheKey, producer, opts);
-        return wrapper ? wrapper.value : null;
-    }
-    async removeFromCache(cacheKey, returnOldValue) {
-        let rval = null;
-        if (returnOldValue) {
-            rval = await this.fetchWrapper(cacheKey, () => null);
-        }
-        await this.provider.removeFromCache(cacheKey);
-        return rval;
-    }
-    async clearCache() {
-        return this.provider.clearCache();
-    }
-    async readAll() {
-        return this.provider.readAll();
-    }
-}

package/lib/cache/simple-cache.spec.js

@@ -1,67 +0,0 @@
-import { S3StorageProvider } from './s3-storage-provider.js';
-import { SimpleCache } from './simple-cache.js';
-import { S3CacheRatchet } from '../s3/s3-cache-ratchet.js';
-import { DynamoRatchet } from '../dynamodb/dynamo-ratchet.js';
-import { DynamoDbStorageProvider } from './dynamo-db-storage-provider.js';
-import { S3Client } from '@aws-sdk/client-s3';
-import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb';
-import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
-describe('#simpleCache', function () {
-    xit('should read/write/delete with an S3 handler', async () => {
-        const s3 = new S3Client({ region: 'us-east-1' });
-        const cache = new S3CacheRatchet(s3, 'test-bucket');
-        const s3StorageProvider = new S3StorageProvider(cache, 'test-cache');
-        const simpleCache = new SimpleCache(s3StorageProvider, 2000000);
-        await simpleCache.removeFromCache('test1');
-        const test1a = await simpleCache.fetchWrapper('test1', () => Promise.resolve({ x: 1 }));
-        expect(test1a).not.toBeNull();
-        expect(test1a.generated).toBeTruthy();
-        expect(test1a.value).not.toBeNull();
-        expect(test1a.value['x']).toEqual(1);
-        const test1b = await simpleCache.fetchWrapper('test1', () => Promise.resolve({ x: 1 }));
-        expect(test1b).not.toBeNull();
-        expect(test1b.generated).toBeFalsy();
-        expect(test1b.value).not.toBeNull();
-        expect(test1b.value['x']).toEqual(1);
-        await simpleCache.removeFromCache('test1');
-    }, 60_000);
-    xit('should read/write/delete with an dynamo handler', async () => {
-        const dr = new DynamoRatchet(DynamoDBDocument.from(new DynamoDBClient({ region: 'us-east-1' })));
-        const opts = DynamoDbStorageProvider.createDefaultOptions();
-        opts.tableName = 'test-table';
-        opts.useRangeKeys = false;
-        opts.hashKeyName = 'cacheUid';
-        opts.dynamoExpiresColumnName = 'expiresEpochSeconds';
-        const ddbStorage = new DynamoDbStorageProvider(dr, opts);
-        const simpleCache = new SimpleCache(ddbStorage, 2000000);
-        await simpleCache.removeFromCache('test1');
-        const test1a = await simpleCache.fetchWrapper('test1', () => Promise.resolve({ x: 1 }));
-        expect(test1a).not.toBeNull();
-        expect(test1a.generated).toBeTruthy();
-        expect(test1a.value).not.toBeNull();
-        expect(test1a.value['x']).toEqual(1);
-        const test1b = await simpleCache.fetchWrapper('test1', () => Promise.resolve({ x: 1 }));
-        expect(test1b).not.toBeNull();
-        expect(test1b.generated).toBeFalsy();
-        expect(test1b.value).not.toBeNull();
-        expect(test1b.value['x']).toEqual(1);
-        await simpleCache.removeFromCache('test1');
-    }, 60_000);
-    xit('should write a bunch', async () => {
-        const dr = new DynamoRatchet(DynamoDBDocument.from(new DynamoDBClient({ region: 'us-east-1' })));
-        const opts = DynamoDbStorageProvider.createDefaultOptions();
-        opts.tableName = 'test-table';
-        opts.useRangeKeys = false;
-        opts.hashKeyName = 'cacheUid';
-        opts.dynamoExpiresColumnName = 'expiresEpochSeconds';
-        const ddbStorage = new DynamoDbStorageProvider(dr, opts);
-        const simpleCache = new SimpleCache(ddbStorage, 1000);
-        for (let i = 0; i < 10; i++) {
-            const tests = await simpleCache.fetchWrapper('test' + i, () => Promise.resolve({ x: i }));
-        }
-        const all = await simpleCache.readAll();
-        expect(all).not.toBeNull();
-        expect(all.length).toBeGreaterThan(9);
-        await simpleCache.clearCache();
-    }, 60_000);
-});