quidproquo-actionprocessor-awslambda 0.1.6 → 0.1.8

package/lib/esm/getActionProcessor/core/event/sqs/queue/getEventMatchStoryActionProcessor.js

@@ -1,14 +1,18 @@
 import { actionResult, actionResultError, ErrorTypeEnum, EventActionType, qpqCoreUtils, } from 'quidproquo-core';
 import { matchUrl } from '../../../../../awsLambdaUtils';
-export const getQueueConfigSetting = () => {
-    const queueQPQConfigSetting = JSON.parse(process.env.queueQPQConfigSetting);
-    // TODO: Validate here
+export const getQueueConfigSetting = (qpqConfig) => {
+    // Only the queue name travels via the environment - the full setting lives in
+    // the bundled qpqConfig (serializing it into env blows the lambda 4KB limit).
+    const queueName = process.env.queueName;
+    const queueQPQConfigSetting = qpqCoreUtils.getQueueConfigSettingByName(queueName, qpqConfig);
+    if (!queueQPQConfigSetting) {
+        throw new Error(`No queue config setting found for queue [${queueName}]`);
+    }
     return queueQPQConfigSetting;
 };
 const getProcessMatchStory = (qpqConfig) => {
-    // TODO: Get this out of the qpqconfig like the other event processors
-    const queueQPQConfigSetting = getQueueConfigSetting();
-    const queueQueueProcessors = qpqCoreUtils.getQueueQueueProcessors(queueQPQConfigSetting.name, qpqConfig);
+    const queueQPQConfigSetting = getQueueConfigSetting(qpqConfig);
+    const queueQueueProcessors = queueQPQConfigSetting.qpqQueueProcessors;
     const queueTypes = Object.keys(queueQueueProcessors).sort();
     return async ({ qpqEventRecord }) => {
         console.log('qpqEventRecord', JSON.stringify(qpqEventRecord, null, 2));

package/lib/esm/getActionProcessor/core/event/sqs/queue/getEventMatchStoryActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getEventMatchStoryActionProcessor.js","sourceRoot":"","sources":["../../../../../../../src/getActionProcessor/core/event/sqs/queue/getEventMatchStoryActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,eAAe,EAGf,YAAY,GAEb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAGzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAA0B,EAAE;IAC/D,MAAM,qBAAqB,GAA0B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,qBAA+B,CAAC,CAAC;IAE7G,sBAAsB;IAEtB,OAAO,qBAAqB,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,SAAoB,EAAgF,EAAE;IAClI,sEAAsE;IACtE,MAAM,qBAAqB,GAAG,qBAAqB,EAAE,CAAC;IACtD,MAAM,oBAAoB,GAAG,YAAY,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACzG,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,CAAC;IAE5D,OAAO,KAAK,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEvE,+BAA+B;QAC/B,MAAM,gBAAgB,GAAG,UAAU;aAChC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACZ,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;YAChD,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;aACF,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEjC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,mFAAmF;YACnF,uCAAuC;YACvC,IAAI,qBAAqB,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3D,OAAO,YAAY,CAAc,EAAE,CAAC,CAAC;YACvC,CAAC;YAED,OAAO,iBAAiB,CAAC,aAAa,CAAC,QAAQ,EAAE,wBAAwB,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1G,CAAC;QAED,MAAM,WAAW,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAErE,OAAO,YAAY,CAAc;YAC/B,OAAO,EAAE,WAAW;YACpB,cAAc,EAAE,gBAAgB,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE;YACnD,MAAM,EAAE,gBAAgB,CAAC,SAAS;SACnC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC3I,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC;CAC9D,CAAC,CAAC","sourcesContent":["import {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  ErrorTypeEnum,\n  EventActionType,\n  EventMatchStoryActionProcessor,\n  QPQConfig,\n  qpqCoreUtils,\n  QueueQPQConfigSetting,\n} from 'quidproquo-core';\n\nimport { matchUrl } from '../../../../../awsLambdaUtils';\nimport { EventInput, InternalEventRecord, MatchResult } from './types';\n\nexport const getQueueConfigSetting = (): QueueQPQConfigSetting => {\n  const queueQPQConfigSetting: QueueQPQConfigSetting = JSON.parse(process.env.queueQPQConfigSetting as string);\n\n  // TODO: Validate here\n\n  return queueQPQConfigSetting;\n};\n\nconst getProcessMatchStory = (qpqConfig: QPQConfig): EventMatchStoryActionProcessor<InternalEventRecord, MatchResult, EventInput> => {\n  // TODO: Get this out of the qpqconfig like the other event processors\n  const queueQPQConfigSetting = getQueueConfigSetting();\n  const queueQueueProcessors = qpqCoreUtils.getQueueQueueProcessors(queueQPQConfigSetting.name, qpqConfig);\n  const queueTypes = Object.keys(queueQueueProcessors).sort();\n\n  return async ({ qpqEventRecord }) => {\n    console.log('qpqEventRecord', JSON.stringify(qpqEventRecord, null, 2));\n\n    // Find the most relevant match\n    const matchedQueueType = queueTypes\n      .map((qt) => ({\n        match: matchUrl(qt, qpqEventRecord.message.type),\n        queueType: qt,\n      }))\n      .find((m) => m.match.didMatch);\n\n    if (!matchedQueueType) {\n      // If we have event bus subscriptions then we don't want to error if we can't match\n      // early exit will just exit gracefully\n      if (queueQPQConfigSetting.eventBusSubscriptions.length > 0) {\n        return actionResult<MatchResult>({});\n      }\n\n      return actionResultError(ErrorTypeEnum.NotFound, `queue type not found ${qpqEventRecord.message.type}`);\n    }\n\n    const sourceEntry = queueQueueProcessors[matchedQueueType.queueType];\n\n    return actionResult<MatchResult>({\n      runtime: sourceEntry,\n      runtimeOptions: matchedQueueType.match.params || {},\n      config: matchedQueueType.queueType,\n    });\n  };\n};\n\nexport const getEventMatchStoryActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [EventActionType.MatchStory]: getProcessMatchStory(qpqConfig),\n});\n"]}
+{"version":3,"file":"getEventMatchStoryActionProcessor.js","sourceRoot":"","sources":["../../../../../../../src/getActionProcessor/core/event/sqs/queue/getEventMatchStoryActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,eAAe,EAGf,YAAY,GAEb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAGzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAoB,EAAyB,EAAE;IACnF,8EAA8E;IAC9E,8EAA8E;IAC9E,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAmB,CAAC;IAClD,MAAM,qBAAqB,GAAG,YAAY,CAAC,2BAA2B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAE7F,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,4CAA4C,SAAS,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,qBAAqB,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,SAAoB,EAAgF,EAAE;IAClI,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,kBAAkB,CAAC;IACtE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,CAAC;IAE5D,OAAO,KAAK,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEvE,+BAA+B;QAC/B,MAAM,gBAAgB,GAAG,UAAU;aAChC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACZ,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;YAChD,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;aACF,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEjC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,mFAAmF;YACnF,uCAAuC;YACvC,IAAI,qBAAqB,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3D,OAAO,YAAY,CAAc,EAAE,CAAC,CAAC;YACvC,CAAC;YAED,OAAO,iBAAiB,CAAC,aAAa,CAAC,QAAQ,EAAE,wBAAwB,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1G,CAAC;QAED,MAAM,WAAW,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAErE,OAAO,YAAY,CAAc;YAC/B,OAAO,EAAE,WAAW;YACpB,cAAc,EAAE,gBAAgB,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE;YACnD,MAAM,EAAE,gBAAgB,CAAC,SAAS;SACnC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC3I,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC;CAC9D,CAAC,CAAC","sourcesContent":["import {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  ErrorTypeEnum,\n  EventActionType,\n  EventMatchStoryActionProcessor,\n  QPQConfig,\n  qpqCoreUtils,\n  QueueQPQConfigSetting,\n} from 'quidproquo-core';\n\nimport { matchUrl } from '../../../../../awsLambdaUtils';\nimport { EventInput, InternalEventRecord, MatchResult } from './types';\n\nexport const getQueueConfigSetting = (qpqConfig: QPQConfig): QueueQPQConfigSetting => {\n  // Only the queue name travels via the environment - the full setting lives in\n  // the bundled qpqConfig (serializing it into env blows the lambda 4KB limit).\n  const queueName = process.env.queueName as string;\n  const queueQPQConfigSetting = qpqCoreUtils.getQueueConfigSettingByName(queueName, qpqConfig);\n\n  if (!queueQPQConfigSetting) {\n    throw new Error(`No queue config setting found for queue [${queueName}]`);\n  }\n\n  return queueQPQConfigSetting;\n};\n\nconst getProcessMatchStory = (qpqConfig: QPQConfig): EventMatchStoryActionProcessor<InternalEventRecord, MatchResult, EventInput> => {\n  const queueQPQConfigSetting = getQueueConfigSetting(qpqConfig);\n  const queueQueueProcessors = queueQPQConfigSetting.qpqQueueProcessors;\n  const queueTypes = Object.keys(queueQueueProcessors).sort();\n\n  return async ({ qpqEventRecord }) => {\n    console.log('qpqEventRecord', JSON.stringify(qpqEventRecord, null, 2));\n\n    // Find the most relevant match\n    const matchedQueueType = queueTypes\n      .map((qt) => ({\n        match: matchUrl(qt, qpqEventRecord.message.type),\n        queueType: qt,\n      }))\n      .find((m) => m.match.didMatch);\n\n    if (!matchedQueueType) {\n      // If we have event bus subscriptions then we don't want to error if we can't match\n      // early exit will just exit gracefully\n      if (queueQPQConfigSetting.eventBusSubscriptions.length > 0) {\n        return actionResult<MatchResult>({});\n      }\n\n      return actionResultError(ErrorTypeEnum.NotFound, `queue type not found ${qpqEventRecord.message.type}`);\n    }\n\n    const sourceEntry = queueQueueProcessors[matchedQueueType.queueType];\n\n    return actionResult<MatchResult>({\n      runtime: sourceEntry,\n      runtimeOptions: matchedQueueType.match.params || {},\n      config: matchedQueueType.queueType,\n    });\n  };\n};\n\nexport const getEventMatchStoryActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [EventActionType.MatchStory]: getProcessMatchStory(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileDeleteActionProcessor.js

@@ -1,12 +1,13 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileDeleteErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, FileActionType, FileDeleteErrorTypeEnum, } from 'quidproquo-core';
 import { deleteFiles } from '../../../logic/s3/s3Utils';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileDelete = (qpqConfig) => {
-    return async ({ drive, filepaths }) => {
+    return async ({ drive, filepaths, scope }) => {
         const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
         try {
-            const errored = await deleteFiles(s3BucketName, filepaths, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig));
+            const keys = filepaths.map((filepath) => composeScopedFilePath(scope, filepath));
+            const errored = await deleteFiles(s3BucketName, keys, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig));
             // errored deletes are a graceful success ~ Retry
             // if (errored.length > 0) {
             //   return actionResultError(
@@ -20,6 +21,7 @@ const getProcessFileDelete = (qpqConfig) => {
             return actionResultErrorFromCaughtError(error, {
                 AccessDenied: () => actionResultError(FileDeleteErrorTypeEnum.AccessDenied, 'Access denied deleting files'),
                 NoSuchBucket: () => actionResultError(FileDeleteErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),
+                InvalidScopeError: (error) => actionResultError(FileDeleteErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };

package/lib/esm/getActionProcessor/core/file/getFileDeleteActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileDeleteActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileDeleteActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,cAAc,EAEd,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,oBAAoB,GAAG,CAAC,SAAoB,EAA6B,EAAE;IAC/E,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,SAAS,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC;YAE1H,iDAAiD;YACjD,4BAA4B;YAC5B,8BAA8B;YAC9B,kCAAkC;YAClC,kDAAkD;YAClD,OAAO;YACP,IAAI;YAEJ,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,8BAA8B,CAAC;gBAC3G,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,aAAa,EAAE,4BAA4B,KAAK,EAAE,CAAC;aAClH,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IACtI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC;CACzD,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport { ActionProcessorList, ActionProcessorListResolver, QPQConfig } from 'quidproquo-core';\nimport {\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  FileActionType,\n  FileDeleteActionProcessor,\n  FileDeleteErrorTypeEnum,\n} from 'quidproquo-core';\n\nimport { deleteFiles } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileDelete = (qpqConfig: QPQConfig): FileDeleteActionProcessor => {\n  return async ({ drive, filepaths }) => {\n    const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n    try {\n      const errored = await deleteFiles(s3BucketName, filepaths, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig));\n\n      // errored deletes are a graceful success ~ Retry\n      // if (errored.length > 0) {\n      //   return actionResultError(\n      //     ErrorTypeEnum.GenericError,\n      //     `Could not delete files ${errored.length}`,\n      //   );\n      // }\n\n      return actionResult(errored);\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        AccessDenied: () => actionResultError(FileDeleteErrorTypeEnum.AccessDenied, 'Access denied deleting files'),\n        NoSuchBucket: () => actionResultError(FileDeleteErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),\n      });\n    }\n  };\n};\n\nexport const getFileDeleteActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.Delete]: getProcessFileDelete(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileDeleteActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileDeleteActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,qBAAqB,EACrB,cAAc,EAEd,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,oBAAoB,GAAG,CAAC,SAAoB,EAA6B,EAAE;IAC/E,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3C,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjF,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,IAAI,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC;YAErH,iDAAiD;YACjD,4BAA4B;YAC5B,8BAA8B;YAC9B,kCAAkC;YAClC,kDAAkD;YAClD,OAAO;YACP,IAAI;YAEJ,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,8BAA8B,CAAC;gBAC3G,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,aAAa,EAAE,4BAA4B,KAAK,EAAE,CAAC;gBACjH,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aACrG,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IACtI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC;CACzD,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport { ActionProcessorList, ActionProcessorListResolver, QPQConfig } from 'quidproquo-core';\nimport {\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  composeScopedFilePath,\n  FileActionType,\n  FileDeleteActionProcessor,\n  FileDeleteErrorTypeEnum,\n} from 'quidproquo-core';\n\nimport { deleteFiles } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileDelete = (qpqConfig: QPQConfig): FileDeleteActionProcessor => {\n  return async ({ drive, filepaths, scope }) => {\n    const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n    try {\n      const keys = filepaths.map((filepath) => composeScopedFilePath(scope, filepath));\n      const errored = await deleteFiles(s3BucketName, keys, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig));\n\n      // errored deletes are a graceful success ~ Retry\n      // if (errored.length > 0) {\n      //   return actionResultError(\n      //     ErrorTypeEnum.GenericError,\n      //     `Could not delete files ${errored.length}`,\n      //   );\n      // }\n\n      return actionResult(errored);\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        AccessDenied: () => actionResultError(FileDeleteErrorTypeEnum.AccessDenied, 'Access denied deleting files'),\n        NoSuchBucket: () => actionResultError(FileDeleteErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),\n        InvalidScopeError: (error) => actionResultError(FileDeleteErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileDeleteActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.Delete]: getProcessFileDelete(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileExistsActionProcessor.js

@@ -1,17 +1,19 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileExistsErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, FileActionType, FileExistsErrorTypeEnum, } from 'quidproquo-core';
 import { objectExists } from '../../../logic/s3/s3Utils';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileExists = (qpqConfig) => {
-    return async ({ drive, filepath }) => {
+    return async ({ drive, filepath, scope }) => {
         const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
         try {
-            return actionResult(await objectExists(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));
+            const key = composeScopedFilePath(scope, filepath);
+            return actionResult(await objectExists(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));
         }
         catch (error) {
             return actionResultErrorFromCaughtError(error, {
                 AccessDenied: () => actionResultError(FileExistsErrorTypeEnum.AccessDenied, 'Access denied checking file existence'),
                 Forbidden: () => actionResultError(FileExistsErrorTypeEnum.AccessDenied, 'Access denied checking file existence'),
+                InvalidScopeError: (error) => actionResultError(FileExistsErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };

package/lib/esm/getActionProcessor/core/file/getFileExistsActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileExistsActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileExistsActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,cAAc,EAEd,uBAAuB,GAExB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,oBAAoB,GAAG,CAAC,SAAoB,EAA6B,EAAE;IAC/E,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACnC,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,OAAO,YAAY,CAAC,MAAM,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACjI,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,uCAAuC,CAAC;gBACpH,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,uCAAuC,CAAC;aAClH,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IACtI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC;CACzD,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  FileActionType,\n  FileExistsActionProcessor,\n  FileExistsErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { objectExists } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileExists = (qpqConfig: QPQConfig): FileExistsActionProcessor => {\n  return async ({ drive, filepath }) => {\n    const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n    try {\n      return actionResult(await objectExists(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        AccessDenied: () => actionResultError(FileExistsErrorTypeEnum.AccessDenied, 'Access denied checking file existence'),\n        Forbidden: () => actionResultError(FileExistsErrorTypeEnum.AccessDenied, 'Access denied checking file existence'),\n      });\n    }\n  };\n};\n\nexport const getFileExistsActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.Exists]: getProcessFileExists(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileExistsActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileExistsActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,qBAAqB,EACrB,cAAc,EAEd,uBAAuB,GAExB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,oBAAoB,GAAG,CAAC,SAAoB,EAA6B,EAAE;IAC/E,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACnD,OAAO,YAAY,CAAC,MAAM,YAAY,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC5H,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,uCAAuC,CAAC;gBACpH,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,uCAAuC,CAAC;gBACjH,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aACrG,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IACtI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC;CACzD,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  composeScopedFilePath,\n  FileActionType,\n  FileExistsActionProcessor,\n  FileExistsErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { objectExists } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileExists = (qpqConfig: QPQConfig): FileExistsActionProcessor => {\n  return async ({ drive, filepath, scope }) => {\n    const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n    try {\n      const key = composeScopedFilePath(scope, filepath);\n      return actionResult(await objectExists(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        AccessDenied: () => actionResultError(FileExistsErrorTypeEnum.AccessDenied, 'Access denied checking file existence'),\n        Forbidden: () => actionResultError(FileExistsErrorTypeEnum.AccessDenied, 'Access denied checking file existence'),\n        InvalidScopeError: (error) => actionResultError(FileExistsErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileExistsActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.Exists]: getProcessFileExists(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileGenerateTemporarySecureUrlActionProcessor.js

@@ -1,22 +1,26 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResultError, ErrorTypeEnum } from 'quidproquo-core';
-import { actionResult, FileActionType, FileGenerateTemporarySecureUrlErrorTypeEnum, } from 'quidproquo-core';
+import { actionResultError, actionResultErrorFromCaughtError } from 'quidproquo-core';
+import { actionResult, composeScopedFilePath, FileActionType, FileGenerateTemporarySecureUrlErrorTypeEnum, } from 'quidproquo-core';
 import { generatePresignedUrl } from '../../../logic/s3/generatePresignedUrl';
 import { resolveStorageDriveBucketName } from './utils';
 // SigV4 presigned URLs cannot expire more than 7 days in the future
 const maxExpirationMs = 7 * 24 * 60 * 60 * 1000;
 const getProcessFileGenerateTemporarySecureUrl = (qpqConfig) => {
-    return async ({ drive, filepath, expirationMs }) => {
+    return async ({ drive, filepath, expirationMs, scope }) => {
         if (expirationMs > maxExpirationMs) {
             return actionResultError(FileGenerateTemporarySecureUrlErrorTypeEnum.ExpirationTooLong, 'Expiration exceeds the 7 day maximum for presigned URLs');
         }
         try {
             const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
-            const url = await generatePresignedUrl(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), expirationMs);
+            const url = await generatePresignedUrl(s3BucketName, composeScopedFilePath(scope, filepath), qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), expirationMs);
             return actionResult(url);
         }
         catch (error) {
-            return actionResultError(ErrorTypeEnum.GenericError, 'Unable to generate temporary secure URL', error);
+            // Name-keyed, not instanceof: under npm link / module federation the
+            // error can come from another copy of quidproquo-core.
+            return actionResultErrorFromCaughtError(error, {
+                InvalidScopeError: (error) => actionResultError(FileGenerateTemporarySecureUrlErrorTypeEnum.InvalidScope, error.message),
+            });
         }
     };
 };

package/lib/esm/getActionProcessor/core/file/getFileGenerateTemporarySecureUrlActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileGenerateTemporarySecureUrlActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileGenerateTemporarySecureUrlActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAoD,iBAAiB,EAAE,aAAa,EAAa,MAAM,iBAAiB,CAAC;AAChI,OAAO,EACL,YAAY,EACZ,cAAc,EAEd,2CAA2C,GAC5C,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,oEAAoE;AACpE,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhD,MAAM,wCAAwC,GAAG,CAAC,SAAoB,EAAiD,EAAE;IACvH,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;QACjD,IAAI,YAAY,GAAG,eAAe,EAAE,CAAC;YACnC,OAAO,iBAAiB,CACtB,2CAA2C,CAAC,iBAAiB,EAC7D,yDAAyD,CAC1D,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,YAAY,EAAE,QAAQ,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,CAAC;YAE5I,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,iBAAiB,CAAC,aAAa,CAAC,YAAY,EAAE,yCAAyC,EAAE,KAAK,CAAC,CAAC;QACzG,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gDAAgD,GAAgC,KAAK,EAChG,SAAoB,EACU,EAAE,CAAC,CAAC;IAClC,CAAC,cAAc,CAAC,0BAA0B,CAAC,EAAE,wCAAwC,CAAC,SAAS,CAAC;CACjG,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport { ActionProcessorList, ActionProcessorListResolver, actionResultError, ErrorTypeEnum, QPQConfig } from 'quidproquo-core';\nimport {\n  actionResult,\n  FileActionType,\n  FileGenerateTemporarySecureUrlActionProcessor,\n  FileGenerateTemporarySecureUrlErrorTypeEnum,\n} from 'quidproquo-core';\n\nimport { generatePresignedUrl } from '../../../logic/s3/generatePresignedUrl';\nimport { resolveStorageDriveBucketName } from './utils';\n\n// SigV4 presigned URLs cannot expire more than 7 days in the future\nconst maxExpirationMs = 7 * 24 * 60 * 60 * 1000;\n\nconst getProcessFileGenerateTemporarySecureUrl = (qpqConfig: QPQConfig): FileGenerateTemporarySecureUrlActionProcessor => {\n  return async ({ drive, filepath, expirationMs }) => {\n    if (expirationMs > maxExpirationMs) {\n      return actionResultError(\n        FileGenerateTemporarySecureUrlErrorTypeEnum.ExpirationTooLong,\n        'Expiration exceeds the 7 day maximum for presigned URLs',\n      );\n    }\n\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const url = await generatePresignedUrl(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), expirationMs);\n\n      return actionResult(url);\n    } catch (error: any) {\n      return actionResultError(ErrorTypeEnum.GenericError, 'Unable to generate temporary secure URL', error);\n    }\n  };\n};\n\nexport const getFileGenerateTemporarySecureUrlActionProcessor: ActionProcessorListResolver = async (\n  qpqConfig: QPQConfig,\n): Promise<ActionProcessorList> => ({\n  [FileActionType.GenerateTemporarySecureUrl]: getProcessFileGenerateTemporarySecureUrl(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileGenerateTemporarySecureUrlActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileGenerateTemporarySecureUrlActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAoD,iBAAiB,EAAE,gCAAgC,EAAa,MAAM,iBAAiB,CAAC;AACnJ,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,cAAc,EAEd,2CAA2C,GAC5C,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,oEAAoE;AACpE,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhD,MAAM,wCAAwC,GAAG,CAAC,SAAoB,EAAiD,EAAE;IACvH,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE;QACxD,IAAI,YAAY,GAAG,eAAe,EAAE,CAAC;YACnC,OAAO,iBAAiB,CACtB,2CAA2C,CAAC,iBAAiB,EAC7D,yDAAyD,CAC1D,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,MAAM,oBAAoB,CACpC,YAAY,EACZ,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,EACtC,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,EAC7D,YAAY,CACb,CAAC;YAEF,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,qEAAqE;YACrE,uDAAuD;YACvD,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,2CAA2C,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aACzH,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gDAAgD,GAAgC,KAAK,EAChG,SAAoB,EACU,EAAE,CAAC,CAAC;IAClC,CAAC,cAAc,CAAC,0BAA0B,CAAC,EAAE,wCAAwC,CAAC,SAAS,CAAC;CACjG,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport { ActionProcessorList, ActionProcessorListResolver, actionResultError, actionResultErrorFromCaughtError, QPQConfig } from 'quidproquo-core';\nimport {\n  actionResult,\n  composeScopedFilePath,\n  FileActionType,\n  FileGenerateTemporarySecureUrlActionProcessor,\n  FileGenerateTemporarySecureUrlErrorTypeEnum,\n} from 'quidproquo-core';\n\nimport { generatePresignedUrl } from '../../../logic/s3/generatePresignedUrl';\nimport { resolveStorageDriveBucketName } from './utils';\n\n// SigV4 presigned URLs cannot expire more than 7 days in the future\nconst maxExpirationMs = 7 * 24 * 60 * 60 * 1000;\n\nconst getProcessFileGenerateTemporarySecureUrl = (qpqConfig: QPQConfig): FileGenerateTemporarySecureUrlActionProcessor => {\n  return async ({ drive, filepath, expirationMs, scope }) => {\n    if (expirationMs > maxExpirationMs) {\n      return actionResultError(\n        FileGenerateTemporarySecureUrlErrorTypeEnum.ExpirationTooLong,\n        'Expiration exceeds the 7 day maximum for presigned URLs',\n      );\n    }\n\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const url = await generatePresignedUrl(\n        s3BucketName,\n        composeScopedFilePath(scope, filepath),\n        qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig),\n        expirationMs,\n      );\n\n      return actionResult(url);\n    } catch (error: unknown) {\n      // Name-keyed, not instanceof: under npm link / module federation the\n      // error can come from another copy of quidproquo-core.\n      return actionResultErrorFromCaughtError(error, {\n        InvalidScopeError: (error) => actionResultError(FileGenerateTemporarySecureUrlErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileGenerateTemporarySecureUrlActionProcessor: ActionProcessorListResolver = async (\n  qpqConfig: QPQConfig,\n): Promise<ActionProcessorList> => ({\n  [FileActionType.GenerateTemporarySecureUrl]: getProcessFileGenerateTemporarySecureUrl(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileGenerateTemporaryUploadSecureUrlActionProcessor.js

@@ -1,22 +1,26 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResultError, ErrorTypeEnum } from 'quidproquo-core';
-import { actionResult, FileActionType, FileGenerateTemporaryUploadSecureUrlErrorTypeEnum, } from 'quidproquo-core';
+import { actionResultError, actionResultErrorFromCaughtError } from 'quidproquo-core';
+import { actionResult, composeScopedFilePath, FileActionType, FileGenerateTemporaryUploadSecureUrlErrorTypeEnum, } from 'quidproquo-core';
 import { generatePresignedUploadUrl } from '../../../logic/s3/generatePresignedUploadUrl';
 import { resolveStorageDriveBucketName } from './utils';
 // SigV4 presigned URLs cannot expire more than 7 days in the future
 const maxExpirationMs = 7 * 24 * 60 * 60 * 1000;
 const getProcessFileGenerateTemporaryUploadSecureUrl = (qpqConfig) => {
-    return async ({ drive, filepath, expirationMs, contentType }, session) => {
+    return async ({ drive, filepath, expirationMs, contentType, scope }, session) => {
         if (expirationMs > maxExpirationMs) {
             return actionResultError(FileGenerateTemporaryUploadSecureUrlErrorTypeEnum.ExpirationTooLong, 'Expiration exceeds the 7 day maximum for presigned URLs');
         }
         try {
             const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
-            const url = await generatePresignedUploadUrl(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), expirationMs, session.correlation, contentType);
+            const url = await generatePresignedUploadUrl(s3BucketName, composeScopedFilePath(scope, filepath), qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), expirationMs, session.correlation, contentType);
             return actionResult(url);
         }
         catch (error) {
-            return actionResultError(ErrorTypeEnum.GenericError, 'Unable to generate temporary upload secure URL', error);
+            // Name-keyed, not instanceof: under npm link / module federation the
+            // error can come from another copy of quidproquo-core.
+            return actionResultErrorFromCaughtError(error, {
+                InvalidScopeError: (error) => actionResultError(FileGenerateTemporaryUploadSecureUrlErrorTypeEnum.InvalidScope, error.message),
+            });
         }
     };
 };

package/lib/esm/getActionProcessor/core/file/getFileGenerateTemporaryUploadSecureUrlActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileGenerateTemporaryUploadSecureUrlActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileGenerateTemporaryUploadSecureUrlActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAoD,iBAAiB,EAAE,aAAa,EAAa,MAAM,iBAAiB,CAAC;AAChI,OAAO,EACL,YAAY,EACZ,cAAc,EAEd,iDAAiD,GAClD,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,oEAAoE;AACpE,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhD,MAAM,8CAA8C,GAAG,CAAC,SAAoB,EAAuD,EAAE;IACnI,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE;QACvE,IAAI,YAAY,GAAG,eAAe,EAAE,CAAC;YACnC,OAAO,iBAAiB,CACtB,iDAAiD,CAAC,iBAAiB,EACnE,yDAAyD,CAC1D,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,MAAM,0BAA0B,CAC1C,YAAY,EACZ,QAAQ,EACR,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,EAC7D,YAAY,EACZ,OAAO,CAAC,WAAW,EACnB,WAAW,CACZ,CAAC;YAEF,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,iBAAiB,CAAC,aAAa,CAAC,YAAY,EAAE,gDAAgD,EAAE,KAAK,CAAC,CAAC;QAChH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sDAAsD,GAAgC,KAAK,EACtG,SAAoB,EACU,EAAE,CAAC,CAAC;IAClC,CAAC,cAAc,CAAC,gCAAgC,CAAC,EAAE,8CAA8C,CAAC,SAAS,CAAC;CAC7G,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport { ActionProcessorList, ActionProcessorListResolver, actionResultError, ErrorTypeEnum, QPQConfig } from 'quidproquo-core';\nimport {\n  actionResult,\n  FileActionType,\n  FileGenerateTemporaryUploadSecureUrlActionProcessor,\n  FileGenerateTemporaryUploadSecureUrlErrorTypeEnum,\n} from 'quidproquo-core';\n\nimport { generatePresignedUploadUrl } from '../../../logic/s3/generatePresignedUploadUrl';\nimport { resolveStorageDriveBucketName } from './utils';\n\n// SigV4 presigned URLs cannot expire more than 7 days in the future\nconst maxExpirationMs = 7 * 24 * 60 * 60 * 1000;\n\nconst getProcessFileGenerateTemporaryUploadSecureUrl = (qpqConfig: QPQConfig): FileGenerateTemporaryUploadSecureUrlActionProcessor => {\n  return async ({ drive, filepath, expirationMs, contentType }, session) => {\n    if (expirationMs > maxExpirationMs) {\n      return actionResultError(\n        FileGenerateTemporaryUploadSecureUrlErrorTypeEnum.ExpirationTooLong,\n        'Expiration exceeds the 7 day maximum for presigned URLs',\n      );\n    }\n\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const url = await generatePresignedUploadUrl(\n        s3BucketName,\n        filepath,\n        qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig),\n        expirationMs,\n        session.correlation,\n        contentType,\n      );\n\n      return actionResult(url);\n    } catch (error: any) {\n      return actionResultError(ErrorTypeEnum.GenericError, 'Unable to generate temporary upload secure URL', error);\n    }\n  };\n};\n\nexport const getFileGenerateTemporaryUploadSecureUrlActionProcessor: ActionProcessorListResolver = async (\n  qpqConfig: QPQConfig,\n): Promise<ActionProcessorList> => ({\n  [FileActionType.GenerateTemporaryUploadSecureUrl]: getProcessFileGenerateTemporaryUploadSecureUrl(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileGenerateTemporaryUploadSecureUrlActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileGenerateTemporaryUploadSecureUrlActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAoD,iBAAiB,EAAE,gCAAgC,EAAa,MAAM,iBAAiB,CAAC;AACnJ,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,cAAc,EAEd,iDAAiD,GAClD,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,oEAAoE;AACpE,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhD,MAAM,8CAA8C,GAAG,CAAC,SAAoB,EAAuD,EAAE;IACnI,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE;QAC9E,IAAI,YAAY,GAAG,eAAe,EAAE,CAAC;YACnC,OAAO,iBAAiB,CACtB,iDAAiD,CAAC,iBAAiB,EACnE,yDAAyD,CAC1D,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,MAAM,0BAA0B,CAC1C,YAAY,EACZ,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,EACtC,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,EAC7D,YAAY,EACZ,OAAO,CAAC,WAAW,EACnB,WAAW,CACZ,CAAC;YAEF,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,qEAAqE;YACrE,uDAAuD;YACvD,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,iDAAiD,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aAC/H,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sDAAsD,GAAgC,KAAK,EACtG,SAAoB,EACU,EAAE,CAAC,CAAC;IAClC,CAAC,cAAc,CAAC,gCAAgC,CAAC,EAAE,8CAA8C,CAAC,SAAS,CAAC;CAC7G,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport { ActionProcessorList, ActionProcessorListResolver, actionResultError, actionResultErrorFromCaughtError, QPQConfig } from 'quidproquo-core';\nimport {\n  actionResult,\n  composeScopedFilePath,\n  FileActionType,\n  FileGenerateTemporaryUploadSecureUrlActionProcessor,\n  FileGenerateTemporaryUploadSecureUrlErrorTypeEnum,\n} from 'quidproquo-core';\n\nimport { generatePresignedUploadUrl } from '../../../logic/s3/generatePresignedUploadUrl';\nimport { resolveStorageDriveBucketName } from './utils';\n\n// SigV4 presigned URLs cannot expire more than 7 days in the future\nconst maxExpirationMs = 7 * 24 * 60 * 60 * 1000;\n\nconst getProcessFileGenerateTemporaryUploadSecureUrl = (qpqConfig: QPQConfig): FileGenerateTemporaryUploadSecureUrlActionProcessor => {\n  return async ({ drive, filepath, expirationMs, contentType, scope }, session) => {\n    if (expirationMs > maxExpirationMs) {\n      return actionResultError(\n        FileGenerateTemporaryUploadSecureUrlErrorTypeEnum.ExpirationTooLong,\n        'Expiration exceeds the 7 day maximum for presigned URLs',\n      );\n    }\n\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const url = await generatePresignedUploadUrl(\n        s3BucketName,\n        composeScopedFilePath(scope, filepath),\n        qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig),\n        expirationMs,\n        session.correlation,\n        contentType,\n      );\n\n      return actionResult(url);\n    } catch (error: unknown) {\n      // Name-keyed, not instanceof: under npm link / module federation the\n      // error can come from another copy of quidproquo-core.\n      return actionResultErrorFromCaughtError(error, {\n        InvalidScopeError: (error) => actionResultError(FileGenerateTemporaryUploadSecureUrlErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileGenerateTemporaryUploadSecureUrlActionProcessor: ActionProcessorListResolver = async (\n  qpqConfig: QPQConfig,\n): Promise<ActionProcessorList> => ({\n  [FileActionType.GenerateTemporaryUploadSecureUrl]: getProcessFileGenerateTemporaryUploadSecureUrl(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileIsColdStorageActionProcessor.js

@@ -1,12 +1,13 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileIsColdStorageErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, FileActionType, FileIsColdStorageErrorTypeEnum, } from 'quidproquo-core';
 import { getObjectStorageClass } from '../../../logic/s3/getObjectStorageClass';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileIsColdStorage = (qpqConfig) => {
-    return async ({ drive, filepath }) => {
+    return async ({ drive, filepath, scope }) => {
         const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
         try {
-            const isColdStorage = (await getObjectStorageClass(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig))) === 'cold_storage';
+            const key = composeScopedFilePath(scope, filepath);
+            const isColdStorage = (await getObjectStorageClass(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig))) === 'cold_storage';
             return actionResult(isColdStorage);
         }
         catch (error) {
@@ -16,6 +17,7 @@ const getProcessFileIsColdStorage = (qpqConfig) => {
                 NotFound: () => actionResultError(FileIsColdStorageErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
                 NoSuchKey: () => actionResultError(FileIsColdStorageErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
                 NoSuchBucket: () => actionResultError(FileIsColdStorageErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),
+                InvalidScopeError: (error) => actionResultError(FileIsColdStorageErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };

package/lib/esm/getActionProcessor/core/file/getFileIsColdStorageActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileIsColdStorageActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileIsColdStorageActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,cAAc,EAEd,8BAA8B,GAE/B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,2BAA2B,GAAG,CAAC,SAAoB,EAAoC,EAAE;IAC7F,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACnC,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,aAAa,GACjB,CAAC,MAAM,qBAAqB,CAAC,YAAY,EAAE,QAAQ,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC;YAE1I,OAAO,YAAY,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,0CAA0C,CAAC;gBAC9H,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,0CAA0C,CAAC;gBAC3H,QAAQ,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAC7G,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAC9G,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,aAAa,EAAE,4BAA4B,KAAK,EAAE,CAAC;aACzH,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC7I,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,2BAA2B,CAAC,SAAS,CAAC;CACvE,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  FileActionType,\n  FileIsColdStorageActionProcessor,\n  FileIsColdStorageErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { getObjectStorageClass } from '../../../logic/s3/getObjectStorageClass';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileIsColdStorage = (qpqConfig: QPQConfig): FileIsColdStorageActionProcessor => {\n  return async ({ drive, filepath }) => {\n    const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n    try {\n      const isColdStorage =\n        (await getObjectStorageClass(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig))) === 'cold_storage';\n\n      return actionResult(isColdStorage);\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        AccessDenied: () => actionResultError(FileIsColdStorageErrorTypeEnum.AccessDenied, 'Access denied reading file storage class'),\n        Forbidden: () => actionResultError(FileIsColdStorageErrorTypeEnum.AccessDenied, 'Access denied reading file storage class'),\n        NotFound: () => actionResultError(FileIsColdStorageErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NoSuchKey: () => actionResultError(FileIsColdStorageErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NoSuchBucket: () => actionResultError(FileIsColdStorageErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),\n      });\n    }\n  };\n};\n\nexport const getFileIsColdStorageActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.IsColdStorage]: getProcessFileIsColdStorage(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileIsColdStorageActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileIsColdStorageActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,qBAAqB,EACrB,cAAc,EAEd,8BAA8B,GAE/B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,2BAA2B,GAAG,CAAC,SAAoB,EAAoC,EAAE;IAC7F,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACnD,MAAM,aAAa,GACjB,CAAC,MAAM,qBAAqB,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC;YAErI,OAAO,YAAY,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,0CAA0C,CAAC;gBAC9H,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,0CAA0C,CAAC;gBAC3H,QAAQ,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAC7G,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAC9G,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,aAAa,EAAE,4BAA4B,KAAK,EAAE,CAAC;gBACxH,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aAC5G,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC7I,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,2BAA2B,CAAC,SAAS,CAAC;CACvE,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  composeScopedFilePath,\n  FileActionType,\n  FileIsColdStorageActionProcessor,\n  FileIsColdStorageErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { getObjectStorageClass } from '../../../logic/s3/getObjectStorageClass';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileIsColdStorage = (qpqConfig: QPQConfig): FileIsColdStorageActionProcessor => {\n  return async ({ drive, filepath, scope }) => {\n    const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n    try {\n      const key = composeScopedFilePath(scope, filepath);\n      const isColdStorage =\n        (await getObjectStorageClass(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig))) === 'cold_storage';\n\n      return actionResult(isColdStorage);\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        AccessDenied: () => actionResultError(FileIsColdStorageErrorTypeEnum.AccessDenied, 'Access denied reading file storage class'),\n        Forbidden: () => actionResultError(FileIsColdStorageErrorTypeEnum.AccessDenied, 'Access denied reading file storage class'),\n        NotFound: () => actionResultError(FileIsColdStorageErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NoSuchKey: () => actionResultError(FileIsColdStorageErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NoSuchBucket: () => actionResultError(FileIsColdStorageErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),\n        InvalidScopeError: (error) => actionResultError(FileIsColdStorageErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileIsColdStorageActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.IsColdStorage]: getProcessFileIsColdStorage(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileListDirectoryActionProcessor.js

@@ -1,15 +1,17 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileListDirectoryErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, FileActionType, FileListDirectoryErrorTypeEnum, stripScopedFilePath, } from 'quidproquo-core';
 import { listFiles } from '../../../logic/s3/s3Utils';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileListDirectory = (qpqConfig) => {
-    return async ({ drive, folderPath, maxFiles, pageToken }) => {
+    return async ({ drive, folderPath, maxFiles, pageToken, scope }) => {
         const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
         try {
-            const s3FileList = await listFiles(s3BucketName, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), folderPath, maxFiles, pageToken);
-            // Add the drive onto the list
+            const s3FileList = await listFiles(s3BucketName, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), composeScopedFilePath(scope, folderPath), maxFiles, pageToken);
+            // S3 keys carry the scope prefix; strip it so callers see the same
+            // scope-relative paths they passed in. Add the drive onto the list.
             const fileInfos = s3FileList.fileInfos.map((s3fi) => ({
                 ...s3fi,
+                filepath: stripScopedFilePath(scope, s3fi.filepath),
                 drive,
             }));
             return actionResult({
@@ -22,6 +24,7 @@ const getProcessFileListDirectory = (qpqConfig) => {
                 AccessDenied: () => actionResultError(FileListDirectoryErrorTypeEnum.AccessDenied, 'Access denied listing directory'),
                 Forbidden: () => actionResultError(FileListDirectoryErrorTypeEnum.AccessDenied, 'Access denied listing directory'),
                 NoSuchBucket: () => actionResultError(FileListDirectoryErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),
+                InvalidScopeError: (error) => actionResultError(FileListDirectoryErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };

package/lib/esm/getActionProcessor/core/file/getFileListDirectoryActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileListDirectoryActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileListDirectoryActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,cAAc,EAEd,8BAA8B,GAE/B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,2BAA2B,GAAG,CAAC,SAAoB,EAAoC,EAAE;IAC7F,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;QAC1D,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,SAAS,CAChC,YAAY,EACZ,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,EAC7D,UAAU,EACV,QAAQ,EACR,SAAS,CACV,CAAC;YAEF,8BAA8B;YAC9B,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACpD,GAAG,IAAI;gBACP,KAAK;aACN,CAAC,CAAC,CAAC;YAEJ,OAAO,YAAY,CAAC;gBAClB,SAAS;gBACT,SAAS,EAAE,UAAU,CAAC,SAAS;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,iCAAiC,CAAC;gBACrH,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,iCAAiC,CAAC;gBAClH,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,aAAa,EAAE,4BAA4B,KAAK,EAAE,CAAC;aACzH,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC7I,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,2BAA2B,CAAC,SAAS,CAAC;CACvE,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  FileActionType,\n  FileListDirectoryActionProcessor,\n  FileListDirectoryErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { listFiles } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileListDirectory = (qpqConfig: QPQConfig): FileListDirectoryActionProcessor => {\n  return async ({ drive, folderPath, maxFiles, pageToken }) => {\n    const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n    try {\n      const s3FileList = await listFiles(\n        s3BucketName,\n        qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig),\n        folderPath,\n        maxFiles,\n        pageToken,\n      );\n\n      // Add the drive onto the list\n      const fileInfos = s3FileList.fileInfos.map((s3fi) => ({\n        ...s3fi,\n        drive,\n      }));\n\n      return actionResult({\n        fileInfos,\n        pageToken: s3FileList.pageToken,\n      });\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        AccessDenied: () => actionResultError(FileListDirectoryErrorTypeEnum.AccessDenied, 'Access denied listing directory'),\n        Forbidden: () => actionResultError(FileListDirectoryErrorTypeEnum.AccessDenied, 'Access denied listing directory'),\n        NoSuchBucket: () => actionResultError(FileListDirectoryErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),\n      });\n    }\n  };\n};\n\nexport const getFileListDirectoryActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.ListDirectory]: getProcessFileListDirectory(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileListDirectoryActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileListDirectoryActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,qBAAqB,EACrB,cAAc,EAEd,8BAA8B,EAE9B,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,2BAA2B,GAAG,CAAC,SAAoB,EAAoC,EAAE;IAC7F,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;QACjE,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,SAAS,CAChC,YAAY,EACZ,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,EAC7D,qBAAqB,CAAC,KAAK,EAAE,UAAU,CAAC,EACxC,QAAQ,EACR,SAAS,CACV,CAAC;YAEF,mEAAmE;YACnE,oEAAoE;YACpE,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACpD,GAAG,IAAI;gBACP,QAAQ,EAAE,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC;gBACnD,KAAK;aACN,CAAC,CAAC,CAAC;YAEJ,OAAO,YAAY,CAAC;gBAClB,SAAS;gBACT,SAAS,EAAE,UAAU,CAAC,SAAS;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,iCAAiC,CAAC;gBACrH,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,iCAAiC,CAAC;gBAClH,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,aAAa,EAAE,4BAA4B,KAAK,EAAE,CAAC;gBACxH,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aAC5G,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC7I,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,2BAA2B,CAAC,SAAS,CAAC;CACvE,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  composeScopedFilePath,\n  FileActionType,\n  FileListDirectoryActionProcessor,\n  FileListDirectoryErrorTypeEnum,\n  QPQConfig,\n  stripScopedFilePath,\n} from 'quidproquo-core';\n\nimport { listFiles } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileListDirectory = (qpqConfig: QPQConfig): FileListDirectoryActionProcessor => {\n  return async ({ drive, folderPath, maxFiles, pageToken, scope }) => {\n    const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n    try {\n      const s3FileList = await listFiles(\n        s3BucketName,\n        qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig),\n        composeScopedFilePath(scope, folderPath),\n        maxFiles,\n        pageToken,\n      );\n\n      // S3 keys carry the scope prefix; strip it so callers see the same\n      // scope-relative paths they passed in. Add the drive onto the list.\n      const fileInfos = s3FileList.fileInfos.map((s3fi) => ({\n        ...s3fi,\n        filepath: stripScopedFilePath(scope, s3fi.filepath),\n        drive,\n      }));\n\n      return actionResult({\n        fileInfos,\n        pageToken: s3FileList.pageToken,\n      });\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        AccessDenied: () => actionResultError(FileListDirectoryErrorTypeEnum.AccessDenied, 'Access denied listing directory'),\n        Forbidden: () => actionResultError(FileListDirectoryErrorTypeEnum.AccessDenied, 'Access denied listing directory'),\n        NoSuchBucket: () => actionResultError(FileListDirectoryErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),\n        InvalidScopeError: (error) => actionResultError(FileListDirectoryErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileListDirectoryActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.ListDirectory]: getProcessFileListDirectory(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileReadBinaryContentsActionProcessor.js

@@ -1,18 +1,20 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileReadBinaryContentsErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, FileActionType, FileReadBinaryContentsErrorTypeEnum, } from 'quidproquo-core';
 import { readBinaryFile } from '../../../logic/s3/s3Utils';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileReadBinaryContents = (qpqConfig) => {
-    return async ({ drive, filepath }) => {
+    return async ({ drive, filepath, scope }) => {
         try {
             const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
-            return actionResult(await readBinaryFile(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));
+            const key = composeScopedFilePath(scope, filepath);
+            return actionResult(await readBinaryFile(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));
         }
         catch (error) {
             return actionResultErrorFromCaughtError(error, {
                 InvalidObjectState: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),
                 NoSuchKey: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
                 NotFound: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
+                InvalidScopeError: (error) => actionResultError(FileReadBinaryContentsErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };

package/lib/esm/getActionProcessor/core/file/getFileReadBinaryContentsActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileReadBinaryContentsActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileReadBinaryContentsActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,cAAc,EAEd,mCAAmC,GAEpC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,gCAAgC,GAAG,CAAC,SAAoB,EAAyC,EAAE;IACvG,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACnC,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAErE,OAAO,YAAY,CAAC,MAAM,cAAc,CAAC,YAAY,EAAE,QAAQ,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACnI,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,kBAAkB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,mCAAmC,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;gBAC1I,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,mCAAmC,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBACnH,QAAQ,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,mCAAmC,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;aACnH,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wCAAwC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAClJ,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,SAAS,CAAC;CACjF,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  FileActionType,\n  FileReadBinaryContentsActionProcessor,\n  FileReadBinaryContentsErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { readBinaryFile } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileReadBinaryContents = (qpqConfig: QPQConfig): FileReadBinaryContentsActionProcessor => {\n  return async ({ drive, filepath }) => {\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n      return actionResult(await readBinaryFile(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        InvalidObjectState: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),\n        NoSuchKey: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NotFound: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n      });\n    }\n  };\n};\n\nexport const getFileReadBinaryContentsActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.ReadBinaryContents]: getProcessFileReadBinaryContents(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileReadBinaryContentsActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileReadBinaryContentsActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,qBAAqB,EACrB,cAAc,EAEd,mCAAmC,GAEpC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,gCAAgC,GAAG,CAAC,SAAoB,EAAyC,EAAE;IACvG,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAEnD,OAAO,YAAY,CAAC,MAAM,cAAc,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9H,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,kBAAkB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,mCAAmC,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;gBAC1I,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,mCAAmC,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBACnH,QAAQ,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,mCAAmC,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAClH,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,mCAAmC,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aACjH,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wCAAwC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAClJ,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,SAAS,CAAC;CACjF,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  composeScopedFilePath,\n  FileActionType,\n  FileReadBinaryContentsActionProcessor,\n  FileReadBinaryContentsErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { readBinaryFile } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileReadBinaryContents = (qpqConfig: QPQConfig): FileReadBinaryContentsActionProcessor => {\n  return async ({ drive, filepath, scope }) => {\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const key = composeScopedFilePath(scope, filepath);\n\n      return actionResult(await readBinaryFile(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        InvalidObjectState: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),\n        NoSuchKey: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NotFound: () => actionResultError(FileReadBinaryContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        InvalidScopeError: (error) => actionResultError(FileReadBinaryContentsErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileReadBinaryContentsActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.ReadBinaryContents]: getProcessFileReadBinaryContents(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileReadObjectJsonActionProcessor.js

@@ -1,18 +1,23 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileReadObjectJsonErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, FileActionType, FileReadObjectJsonErrorTypeEnum, } from 'quidproquo-core';
 import { readTextFile } from '../../../logic/s3/s3Utils';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileReadObjectJson = (qpqConfig) => {
-    return async ({ drive, filepath }) => {
+    return async ({ drive, filepath, scope }) => {
         try {
             const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
-            const json = await readTextFile(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig));
+            const key = composeScopedFilePath(scope, filepath);
+            const json = await readTextFile(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig));
             const obj = JSON.parse(json);
             return actionResult(obj);
         }
         catch (error) {
             return actionResultErrorFromCaughtError(error, {
                 InvalidObjectState: () => actionResultError(FileReadObjectJsonErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),
+                NoSuchKey: () => actionResultError(FileReadObjectJsonErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
+                NotFound: () => actionResultError(FileReadObjectJsonErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
+                SyntaxError: () => actionResultError(FileReadObjectJsonErrorTypeEnum.InvalidJson, `Invalid JSON in file: ${filepath}`), // JSON.parse failure
+                InvalidScopeError: (error) => actionResultError(FileReadObjectJsonErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };

package/lib/esm/getActionProcessor/core/file/getFileReadObjectJsonActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileReadObjectJsonActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileReadObjectJsonActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,cAAc,EAEd,+BAA+B,GAEhC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,4BAA4B,GAAG,CAAC,SAAoB,EAA6C,EAAE;IACvG,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACnC,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAErE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC;YAEvH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE7B,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,kBAAkB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;aACvI,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC9I,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,4BAA4B,CAAC,SAAS,CAAC;CACzE,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  FileActionType,\n  FileReadObjectJsonActionProcessor,\n  FileReadObjectJsonErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { readTextFile } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileReadObjectJson = (qpqConfig: QPQConfig): FileReadObjectJsonActionProcessor<object> => {\n  return async ({ drive, filepath }) => {\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n      const json = await readTextFile(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig));\n\n      const obj = JSON.parse(json);\n\n      return actionResult(obj);\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        InvalidObjectState: () => actionResultError(FileReadObjectJsonErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),\n      });\n    }\n  };\n};\n\nexport const getFileReadObjectJsonActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.ReadObjectJson]: getProcessFileReadObjectJson(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileReadObjectJsonActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileReadObjectJsonActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,qBAAqB,EACrB,cAAc,EAEd,+BAA+B,GAEhC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,4BAA4B,GAAG,CAAC,SAAoB,EAA6C,EAAE;IACvG,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAEnD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC;YAElH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE7B,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,kBAAkB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;gBACtI,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAC/G,QAAQ,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAC9G,WAAW,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,WAAW,EAAE,yBAAyB,QAAQ,EAAE,CAAC,EAAE,qBAAqB;gBAC7I,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aAC7G,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC9I,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,4BAA4B,CAAC,SAAS,CAAC;CACzE,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  composeScopedFilePath,\n  FileActionType,\n  FileReadObjectJsonActionProcessor,\n  FileReadObjectJsonErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { readTextFile } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileReadObjectJson = (qpqConfig: QPQConfig): FileReadObjectJsonActionProcessor<object> => {\n  return async ({ drive, filepath, scope }) => {\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const key = composeScopedFilePath(scope, filepath);\n\n      const json = await readTextFile(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig));\n\n      const obj = JSON.parse(json);\n\n      return actionResult(obj);\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        InvalidObjectState: () => actionResultError(FileReadObjectJsonErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),\n        NoSuchKey: () => actionResultError(FileReadObjectJsonErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NotFound: () => actionResultError(FileReadObjectJsonErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        SyntaxError: () => actionResultError(FileReadObjectJsonErrorTypeEnum.InvalidJson, `Invalid JSON in file: ${filepath}`), // JSON.parse failure\n        InvalidScopeError: (error) => actionResultError(FileReadObjectJsonErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileReadObjectJsonActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.ReadObjectJson]: getProcessFileReadObjectJson(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileReadTextContentsActionProcessor.js

@@ -1,16 +1,20 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileReadTextContentsErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, FileActionType, FileReadTextContentsErrorTypeEnum, } from 'quidproquo-core';
 import { readTextFile } from '../../../logic/s3/s3Utils';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileReadTextContents = (qpqConfig) => {
-    return async ({ drive, filepath }) => {
+    return async ({ drive, filepath, scope }) => {
         try {
             const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
-            return actionResult(await readTextFile(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));
+            const key = composeScopedFilePath(scope, filepath);
+            return actionResult(await readTextFile(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));
         }
         catch (error) {
             return actionResultErrorFromCaughtError(error, {
                 InvalidObjectState: () => actionResultError(FileReadTextContentsErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),
+                NoSuchKey: () => actionResultError(FileReadTextContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
+                NotFound: () => actionResultError(FileReadTextContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
+                InvalidScopeError: (error) => actionResultError(FileReadTextContentsErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };

package/lib/esm/getActionProcessor/core/file/getFileReadTextContentsActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileReadTextContentsActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileReadTextContentsActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,cAAc,EAEd,iCAAiC,GAElC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,8BAA8B,GAAG,CAAC,SAAoB,EAAuC,EAAE;IACnG,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACnC,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAErE,OAAO,YAAY,CAAC,MAAM,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACjI,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,kBAAkB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;aACzI,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAChJ,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,8BAA8B,CAAC,SAAS,CAAC;CAC7E,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  FileActionType,\n  FileReadTextContentsActionProcessor,\n  FileReadTextContentsErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { readTextFile } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileReadTextContents = (qpqConfig: QPQConfig): FileReadTextContentsActionProcessor => {\n  return async ({ drive, filepath }) => {\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n\n      return actionResult(await readTextFile(s3BucketName, filepath, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        InvalidObjectState: () => actionResultError(FileReadTextContentsErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),\n      });\n    }\n  };\n};\n\nexport const getFileReadTextContentsActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.ReadTextContents]: getProcessFileReadTextContents(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileReadTextContentsActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileReadTextContentsActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,qBAAqB,EACrB,cAAc,EAEd,iCAAiC,GAElC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,8BAA8B,GAAG,CAAC,SAAoB,EAAuC,EAAE;IACnG,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAEnD,OAAO,YAAY,CAAC,MAAM,YAAY,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC5H,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,kBAAkB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;gBACxI,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBACjH,QAAQ,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAChH,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;aAC/G,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAChJ,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,8BAA8B,CAAC,SAAS,CAAC;CAC7E,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  composeScopedFilePath,\n  FileActionType,\n  FileReadTextContentsActionProcessor,\n  FileReadTextContentsErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { readTextFile } from '../../../logic/s3/s3Utils';\nimport { resolveStorageDriveBucketName } from './utils';\n\nconst getProcessFileReadTextContents = (qpqConfig: QPQConfig): FileReadTextContentsActionProcessor => {\n  return async ({ drive, filepath, scope }) => {\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const key = composeScopedFilePath(scope, filepath);\n\n      return actionResult(await readTextFile(s3BucketName, key, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig)));\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        InvalidObjectState: () => actionResultError(FileReadTextContentsErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),\n        NoSuchKey: () => actionResultError(FileReadTextContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NotFound: () => actionResultError(FileReadTextContentsErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        InvalidScopeError: (error) => actionResultError(FileReadTextContentsErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileReadTextContentsActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.ReadTextContents]: getProcessFileReadTextContents(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileStreamOpenActionProcessor.js

@@ -1,5 +1,5 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, ErrorTypeEnum, FileActionType, FileStreamOpenErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, ErrorTypeEnum, FileActionType, FileStreamOpenErrorTypeEnum, } from 'quidproquo-core';
 import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { randomGuid } from '../../../awsLambdaUtils';
 import { createAwsClient } from '../../../logic/createAwsClient';
@@ -19,13 +19,13 @@ async function* chunkedReadableIterator(stream, chunkSize, transform) {
     }
 }
 const getProcessFileStreamOpen = (qpqConfig) => {
-    return async ({ drive, filepath, encoding, chunkSize }, session, actionProcessors, logger, updateSession, dynamicModuleLoader, streamRegistry) => {
+    return async ({ drive, filepath, encoding, chunkSize, scope }, session, actionProcessors, logger, updateSession, dynamicModuleLoader, streamRegistry) => {
         try {
             const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
             const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
             const s3Client = createAwsClient(S3Client, { region });
             const response = await s3Client.send(new GetObjectCommand({
-                Key: filepath,
+                Key: composeScopedFilePath(scope, filepath),
                 Bucket: s3BucketName,
             }));
             if (!response.Body) {
@@ -44,6 +44,7 @@ const getProcessFileStreamOpen = (qpqConfig) => {
                 InvalidObjectState: () => actionResultError(FileStreamOpenErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),
                 NoSuchKey: () => actionResultError(FileStreamOpenErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
                 NotFound: () => actionResultError(FileStreamOpenErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),
+                InvalidScopeError: (error) => actionResultError(FileStreamOpenErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };

package/lib/esm/getActionProcessor/core/file/getFileStreamOpenActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileStreamOpenActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileStreamOpenActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,YAAY,EACZ,iBAAiB,EACjB,gCAAgC,EAChC,aAAa,EACb,cAAc,EAEd,2BAA2B,GAE5B,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,KAAK,SAAS,CAAC,CAAC,uBAAuB,CAAC,MAAgB,EAAE,SAAiB,EAAE,SAAkC;IAC7G,IAAI,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE7B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAE,KAAgB,CAAC;QAC5F,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE3C,OAAO,MAAM,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;YAClC,MAAM,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/C,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,MAAM,wBAAwB,GAAG,CAAC,SAAoB,EAAiC,EAAE;IACvF,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE;QAC/I,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,MAAM,GAAG,iBAAiB,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC;YAC7E,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;YAEvD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAClC,IAAI,gBAAgB,CAAC;gBACnB,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,YAAY;aACrB,CAAC,CACH,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACnB,OAAO,iBAAiB,CAAC,aAAa,CAAC,YAAY,EAAE,4BAA4B,QAAQ,EAAE,CAAC,CAAC;YAC/F,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,UAAU,EAAE,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,QAAQ,KAAK,MAAM,CAAC;YACnC,MAAM,IAAI,GAAG,SAAS,IAAI,KAAK,CAAC;YAChC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3G,MAAM,QAAQ,GAAG,uBAAuB,CAAC,QAAQ,CAAC,IAAgB,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YACrF,cAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAE5C,OAAO,YAAY,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC,KAAK,EAAE;gBAC7C,kBAAkB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;gBAClI,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;gBAC3G,QAAQ,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,YAAY,EAAE,mBAAmB,QAAQ,EAAE,CAAC;aAC3G,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAgC,KAAK,EAAE,SAAoB,EAAgC,EAAE,CAAC,CAAC;IAC1I,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,wBAAwB,CAAC,SAAS,CAAC;CACjE,CAAC,CAAC","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  ErrorTypeEnum,\n  FileActionType,\n  FileStreamOpenActionProcessor,\n  FileStreamOpenErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { Readable } from 'stream';\nimport { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';\n\nimport { randomGuid } from '../../../awsLambdaUtils';\nimport { createAwsClient } from '../../../logic/createAwsClient';\nimport { resolveStorageDriveBucketName } from './utils';\n\nasync function* chunkedReadableIterator(stream: Readable, chunkSize: number, transform: (buf: Buffer) => string): AsyncIterableIterator<string> {\n  let buffer = Buffer.alloc(0);\n\n  for await (const chunk of stream) {\n    const incoming = typeof chunk === 'string' ? Buffer.from(chunk, 'utf8') : (chunk as Buffer);\n    buffer = Buffer.concat([buffer, incoming]);\n\n    while (buffer.length >= chunkSize) {\n      yield transform(buffer.subarray(0, chunkSize));\n      buffer = buffer.subarray(chunkSize);\n    }\n  }\n\n  if (buffer.length > 0) {\n    yield transform(buffer);\n  }\n}\n\nconst getProcessFileStreamOpen = (qpqConfig: QPQConfig): FileStreamOpenActionProcessor => {\n  return async ({ drive, filepath, encoding, chunkSize }, session, actionProcessors, logger, updateSession, dynamicModuleLoader, streamRegistry) => {\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);\n      const s3Client = createAwsClient(S3Client, { region });\n\n      const response = await s3Client.send(\n        new GetObjectCommand({\n          Key: filepath,\n          Bucket: s3BucketName,\n        }),\n      );\n\n      if (!response.Body) {\n        return actionResultError(ErrorTypeEnum.GenericError, `Empty response body for: ${filepath}`);\n      }\n\n      const streamId = `s3-${randomGuid()}`;\n      const isText = encoding === 'text';\n      const size = chunkSize ?? 65536;\n      const transform = isText ? (buf: Buffer) => buf.toString('utf8') : (buf: Buffer) => buf.toString('base64');\n      const iterator = chunkedReadableIterator(response.Body as Readable, size, transform);\n      streamRegistry.register(streamId, iterator);\n\n      return actionResult({ id: streamId, encoding });\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        InvalidObjectState: () => actionResultError(FileStreamOpenErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),\n        NoSuchKey: () => actionResultError(FileStreamOpenErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NotFound: () => actionResultError(FileStreamOpenErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n      });\n    }\n  };\n};\n\nexport const getFileStreamOpenActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.StreamOpen]: getProcessFileStreamOpen(qpqConfig),\n});\n"]}
+{"version":3,"file":"getFileStreamOpenActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/file/getFileStreamOpenActionProcessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { qpqConfigAwsUtils } from 'quidproquo-config-aws';\nimport {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  actionResultErrorFromCaughtError,\n  composeScopedFilePath,\n  ErrorTypeEnum,\n  FileActionType,\n  FileStreamOpenActionProcessor,\n  FileStreamOpenErrorTypeEnum,\n  QPQConfig,\n} from 'quidproquo-core';\n\nimport { Readable } from 'stream';\nimport { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';\n\nimport { randomGuid } from '../../../awsLambdaUtils';\nimport { createAwsClient } from '../../../logic/createAwsClient';\nimport { resolveStorageDriveBucketName } from './utils';\n\nasync function* chunkedReadableIterator(stream: Readable, chunkSize: number, transform: (buf: Buffer) => string): AsyncIterableIterator<string> {\n  let buffer = Buffer.alloc(0);\n\n  for await (const chunk of stream) {\n    const incoming = typeof chunk === 'string' ? Buffer.from(chunk, 'utf8') : (chunk as Buffer);\n    buffer = Buffer.concat([buffer, incoming]);\n\n    while (buffer.length >= chunkSize) {\n      yield transform(buffer.subarray(0, chunkSize));\n      buffer = buffer.subarray(chunkSize);\n    }\n  }\n\n  if (buffer.length > 0) {\n    yield transform(buffer);\n  }\n}\n\nconst getProcessFileStreamOpen = (qpqConfig: QPQConfig): FileStreamOpenActionProcessor => {\n  return async (\n    { drive, filepath, encoding, chunkSize, scope },\n    session,\n    actionProcessors,\n    logger,\n    updateSession,\n    dynamicModuleLoader,\n    streamRegistry,\n  ) => {\n    try {\n      const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);\n      const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);\n      const s3Client = createAwsClient(S3Client, { region });\n\n      const response = await s3Client.send(\n        new GetObjectCommand({\n          Key: composeScopedFilePath(scope, filepath),\n          Bucket: s3BucketName,\n        }),\n      );\n\n      if (!response.Body) {\n        return actionResultError(ErrorTypeEnum.GenericError, `Empty response body for: ${filepath}`);\n      }\n\n      const streamId = `s3-${randomGuid()}`;\n      const isText = encoding === 'text';\n      const size = chunkSize ?? 65536;\n      const transform = isText ? (buf: Buffer) => buf.toString('utf8') : (buf: Buffer) => buf.toString('base64');\n      const iterator = chunkedReadableIterator(response.Body as Readable, size, transform);\n      streamRegistry.register(streamId, iterator);\n\n      return actionResult({ id: streamId, encoding });\n    } catch (error: unknown) {\n      return actionResultErrorFromCaughtError(error, {\n        InvalidObjectState: () => actionResultError(FileStreamOpenErrorTypeEnum.InvalidStorageClass, 'File is in the wrong storage class'),\n        NoSuchKey: () => actionResultError(FileStreamOpenErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        NotFound: () => actionResultError(FileStreamOpenErrorTypeEnum.FileNotFound, `File not found: ${filepath}`),\n        InvalidScopeError: (error) => actionResultError(FileStreamOpenErrorTypeEnum.InvalidScope, error.message),\n      });\n    }\n  };\n};\n\nexport const getFileStreamOpenActionProcessor: ActionProcessorListResolver = async (qpqConfig: QPQConfig): Promise<ActionProcessorList> => ({\n  [FileActionType.StreamOpen]: getProcessFileStreamOpen(qpqConfig),\n});\n"]}

package/lib/esm/getActionProcessor/core/file/getFileWriteBinaryContentsActionProcessor.js

@@ -1,13 +1,13 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileWriteBinaryContentsErrorTypeEnum, } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, composeScopedFilePath, FileActionType, FileWriteBinaryContentsErrorTypeEnum, } from 'quidproquo-core';
 import { getS3BucketStorageClassFromStorageDriveTier } from '../../../awsLambdaUtils';
 import { writeBinaryFile } from '../../../logic/s3/s3Utils';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileWriteBinaryContents = (qpqConfig) => {
-    return async ({ drive, filepath, data, storageDriveAdvancedWriteOptions }) => {
+    return async ({ drive, filepath, data, storageDriveAdvancedWriteOptions, scope }) => {
         const s3BucketName = resolveStorageDriveBucketName(drive, qpqConfig);
         try {
-            await writeBinaryFile(s3BucketName, filepath, data, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), getS3BucketStorageClassFromStorageDriveTier(storageDriveAdvancedWriteOptions?.storageDriveTier));
+            await writeBinaryFile(s3BucketName, composeScopedFilePath(scope, filepath), data, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), getS3BucketStorageClassFromStorageDriveTier(storageDriveAdvancedWriteOptions?.storageDriveTier));
             return actionResult(void 0);
         }
         catch (error) {
@@ -15,6 +15,7 @@ const getProcessFileWriteBinaryContents = (qpqConfig) => {
                 AccessDenied: () => actionResultError(FileWriteBinaryContentsErrorTypeEnum.AccessDenied, 'Access denied writing file'),
                 Forbidden: () => actionResultError(FileWriteBinaryContentsErrorTypeEnum.AccessDenied, 'Access denied writing file'),
                 NoSuchBucket: () => actionResultError(FileWriteBinaryContentsErrorTypeEnum.DriveNotFound, `Storage drive not found: ${drive}`),
+                InvalidScopeError: (error) => actionResultError(FileWriteBinaryContentsErrorTypeEnum.InvalidScope, error.message),
             });
         }
     };