@aspan-corporation/ac-shared 1.2.24 → 1.2.26

package/lib/services/s3.d.ts

@@ -22,6 +22,13 @@ export declare class S3Service {
     putObject(putObjectCommandInput: PutObjectCommandInput): Promise<PutObjectCommandOutput>;
     headObject(headObjectCommandInput: HeadObjectCommandInput): Promise<import("@aws-sdk/client-s3").HeadObjectCommandOutput>;
     checkIfObjectExists(headObjectCommandInput: HeadObjectCommandInput): Promise<boolean>;
+    checkIfObjectExistsAndNonEmpty(headObjectCommandInput: HeadObjectCommandInput): Promise<boolean>;
+    /**
+     * Returns true for both 404 (NotFound) and 403 responses.
+     * Some S3 bucket policies return 403 instead of 404 for missing keys
+     * to avoid revealing whether a key exists — treat both as "not found".
+     */
+    private isNotFound;
     deleteObject(deleteObjectCommandInput: DeleteObjectCommandInput): Promise<DeleteObjectCommandOutput>;
     deleteObjects(deleteObjectsCommandInput: DeleteObjectsCommandInput): Promise<DeleteObjectsCommandOutput>;
 }

package/lib/services/s3.js

@@ -75,12 +75,33 @@ export class S3Service {
             return true;
         }
         catch (error) {
-            if (error.name === "NotFound") {
+            if (this.isNotFound(error))
                 return false;
-            }
             throw error;
         }
     }
+    async checkIfObjectExistsAndNonEmpty(headObjectCommandInput) {
+        this.logger.debug("checkIfObjectExistsAndNonEmpty", { headObjectCommandInput });
+        try {
+            const head = await this.headObject(headObjectCommandInput);
+            return (head.ContentLength ?? 0) > 0;
+        }
+        catch (error) {
+            if (this.isNotFound(error))
+                return false;
+            throw error;
+        }
+    }
+    /**
+     * Returns true for both 404 (NotFound) and 403 responses.
+     * Some S3 bucket policies return 403 instead of 404 for missing keys
+     * to avoid revealing whether a key exists — treat both as "not found".
+     */
+    isNotFound(error) {
+        return (error.name === "NotFound" ||
+            error.$metadata?.httpStatusCode === 404 ||
+            error.$metadata?.httpStatusCode === 403);
+    }
     async deleteObject(deleteObjectCommandInput) {
         this.logger.debug("deleteObject", { deleteObjectCommandInput });
         return await this.client.send(new DeleteObjectCommand(deleteObjectCommandInput));

package/lib/services/ssm.d.ts

@@ -1,16 +1,18 @@
-import { GetParameterCommandInput, GetParameterCommandOutput, PutParameterCommandInput, PutParameterCommandOutput, SSMClient } from "@aws-sdk/client-ssm";
+import { GetParameterCommandInput, GetParameterCommandOutput, GetParametersByPathCommandInput, PutParameterCommandInput, PutParameterCommandOutput, SSMClient, type Parameter } from "@aws-sdk/client-ssm";
 import { AssumeRoleCommandOutput } from "@aws-sdk/client-sts";
 import { Logger } from "@aws-lambda-powertools/logger";
 export declare class SSMService {
-    logger: Logger;
+    logger?: Logger;
     client: SSMClient;
     constructor({ logger, client, assumeRoleCommandOutput, region }: {
-        logger: Logger;
+        logger?: Logger;
         client?: SSMClient;
         assumeRoleCommandOutput?: AssumeRoleCommandOutput;
         region?: string;
     });
     getParameter(params: GetParameterCommandInput): Promise<GetParameterCommandOutput>;
     putParameter(params: PutParameterCommandInput): Promise<PutParameterCommandOutput>;
+    /** Fetches all parameters under the given path, handling pagination automatically. */
+    getParametersByPath(params: GetParametersByPathCommandInput): Promise<Parameter[]>;
 }
-export type { GetParameterCommandInput, GetParameterCommandOutput, PutParameterCommandInput, PutParameterCommandOutput } from "@aws-sdk/client-ssm";
+export type { GetParameterCommandInput, GetParameterCommandOutput, GetParametersByPathCommandInput, Parameter, PutParameterCommandInput, PutParameterCommandOutput } from "@aws-sdk/client-ssm";

package/lib/services/ssm.js

@@ -1,4 +1,4 @@
-import { GetParameterCommand, PutParameterCommand, SSMClient } from "@aws-sdk/client-ssm";
+import { GetParameterCommand, GetParametersByPathCommand, PutParameterCommand, SSMClient } from "@aws-sdk/client-ssm";
 import assert from "node:assert/strict";
 import { getObjectWithAssumeRoleCommandOutputAttribute } from "../utils/index.js";
 export class SSMService {
@@ -23,4 +23,15 @@ export class SSMService {
     async putParameter(params) {
         return await this.client.send(new PutParameterCommand(params));
     }
+    /** Fetches all parameters under the given path, handling pagination automatically. */
+    async getParametersByPath(params) {
+        const results = [];
+        let nextToken;
+        do {
+            const response = await this.client.send(new GetParametersByPathCommand({ ...params, NextToken: nextToken }));
+            results.push(...(response.Parameters ?? []));
+            nextToken = response.NextToken;
+        } while (nextToken);
+        return results;
+    }
 }

package/lib/utils/processMeta.d.ts

@@ -10,6 +10,7 @@ type ExtractMetadataParams = {
     locationService: LocationService;
     dynamoDBService: DynamoDBService;
     metaTableName: string;
+    placeIndexName: string;
     size: number;
 };
 /**
@@ -19,5 +20,16 @@ type ExtractMetadataParams = {
  * 4. add all old tags that are not present in new tags,
  *
  */
-export declare const processMeta: ({ id, meta, metaTableName, size, logger, locationService, dynamoDBService }: ExtractMetadataParams) => Promise<void>;
+export declare const processMeta: ({ id, meta, metaTableName, placeIndexName, size, logger, locationService, dynamoDBService }: ExtractMetadataParams) => Promise<void>;
+/**
+ * Parent folder of an S3 key, used as the `folder` GSI partition key on the meta table.
+ *
+ *   "2024/08/15/photo.jpg" → "2024/08/15/"
+ *   "2024/08/15/"          → "2024/08/"
+ *   "2024/"                → "/"
+ *   ""                     → "/"
+ *
+ * Root sentinel "/" lets us partition top-level entries under a single PK.
+ */
+export declare const deriveFolder: (id: string) => string;
 export {};

package/lib/utils/processMeta.js

@@ -7,7 +7,7 @@ import { getKeyExtension } from "./thumbsKey.js";
  * 4. add all old tags that are not present in new tags,
  *
  */
-export const processMeta = async ({ id, meta, metaTableName, size, logger, locationService, dynamoDBService }) => {
+export const processMeta = async ({ id, meta, metaTableName, placeIndexName, size, logger, locationService, dynamoDBService }) => {
     // expand location data
     const latitude = Number(meta.find((tag) => tag.key === "latitude")?.value);
     const longitude = Number(meta.find((tag) => tag.key === "longitude")?.value);
@@ -15,7 +15,7 @@ export const processMeta = async ({ id, meta, metaTableName, size, logger, locat
     if (!Number.isNaN(longitude) && !Number.isNaN(latitude)) {
         try {
             const res = await locationService.searchPlaceIndexForPositionCommand({
-                IndexName: "TauPlaceIndex",
+                IndexName: placeIndexName,
                 Position: [longitude, latitude]
             });
             if (res?.Results && res?.Results?.length > 0) {
@@ -85,9 +85,13 @@ export const processMeta = async ({ id, meta, metaTableName, size, logger, locat
         Key: {
             id
         },
-        UpdateExpression: "set tags = :tags",
+        UpdateExpression: "set tags = :tags, #folder = :folder",
+        ExpressionAttributeNames: {
+            "#folder": "folder"
+        },
         ExpressionAttributeValues: {
-            ":tags": reconciledTags
+            ":tags": reconciledTags,
+            ":folder": deriveFolder(id)
         },
         ReturnValues: "ALL_NEW"
     });
@@ -102,6 +106,25 @@ const reconcileTags = ({ oldTags = [], newTags = [] }, logger) => oldTags.reduce
         return [...acc, cur];
     }
 }, newTags);
+/**
+ * Parent folder of an S3 key, used as the `folder` GSI partition key on the meta table.
+ *
+ *   "2024/08/15/photo.jpg" → "2024/08/15/"
+ *   "2024/08/15/"          → "2024/08/"
+ *   "2024/"                → "/"
+ *   ""                     → "/"
+ *
+ * Root sentinel "/" lets us partition top-level entries under a single PK.
+ */
+export const deriveFolder = (id) => {
+    if (!id)
+        return "/";
+    const trimmed = id.endsWith("/") ? id.slice(0, -1) : id;
+    const lastSlash = trimmed.lastIndexOf("/");
+    if (lastSlash < 0)
+        return "/";
+    return trimmed.slice(0, lastSlash + 1);
+};
 const SUBSTRING_ANSI_DATES_BEGIN_WITH = "20";
 const extractMetaFromKey = (key) => {
     if (!key)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspan-corporation/ac-shared",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "description": "",
   "keywords": [],
   "exports": {