@aspan-corporation/ac-shared 1.2.39 → 1.2.40

package/lib/utils/processMeta.d.ts

@@ -1,5 +1,15 @@
 import { DynamoDBService, LocationService } from "../services/index.js";
 import { Logger } from "@aws-lambda-powertools/logger";
+/** Indexed tag holding the normalized media type of a meta record. */
+export declare const TAG_MEDIA_TYPE = "ac:tau:type";
+/**
+ * Normalizes a file extension into the coarse media type used for search
+ * filtering. Mirrors the allowlists that already gate pipeline dispatch
+ * (thumbsKey.ts's image/video lists, diary.ts's audio list) — kept as a
+ * single derivation point so the index tag and the dispatch gating never
+ * disagree about what an extension is.
+ */
+export declare const deriveMediaType: (extension: string) => "photo" | "video" | "audio" | undefined;
 type ExtractMetadataParams = {
     id: string;
     meta: Array<{
@@ -20,7 +30,7 @@ type ExtractMetadataParams = {
  * 4. add all old tags that are not present in new tags,
  *
  */
-export declare const processMeta: ({ id, meta, metaTableName, placeIndexName, 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.
  *

package/lib/utils/processMeta.js

@@ -1,5 +1,24 @@
-import { getKeyExtension } from "./thumbsKey.js";
+import { ALLOWED_EXTENSIONS, ALLOWED_VIDEO_EXTENSIONS, getKeyExtension, } from "./thumbsKey.js";
+import { AUDIO_EXTENSIONS } from "./diary.js";
 import { parseFolderDate } from "./parseFolderDate.js";
+/** Indexed tag holding the normalized media type of a meta record. */
+export const TAG_MEDIA_TYPE = "ac:tau:type";
+/**
+ * Normalizes a file extension into the coarse media type used for search
+ * filtering. Mirrors the allowlists that already gate pipeline dispatch
+ * (thumbsKey.ts's image/video lists, diary.ts's audio list) — kept as a
+ * single derivation point so the index tag and the dispatch gating never
+ * disagree about what an extension is.
+ */
+export const deriveMediaType = (extension) => {
+    if (ALLOWED_VIDEO_EXTENSIONS.includes(extension))
+        return "video";
+    if (AUDIO_EXTENSIONS.includes(extension))
+        return "audio";
+    if (ALLOWED_EXTENSIONS.includes(extension))
+        return "photo";
+    return undefined;
+};
 /**
  * 1. read <id>
  * 2. if <id> doesn't exist then use PutCommand
@@ -7,7 +26,7 @@ import { parseFolderDate } from "./parseFolderDate.js";
  * 4. add all old tags that are not present in new tags,
  *
  */
-export const processMeta = async ({ id, meta, metaTableName, placeIndexName, 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);
@@ -16,7 +35,7 @@ export const processMeta = async ({ id, meta, metaTableName, placeIndexName, siz
         try {
             const res = await locationService.searchPlaceIndexForPositionCommand({
                 IndexName: placeIndexName,
-                Position: [longitude, latitude]
+                Position: [longitude, latitude],
             });
             if (res?.Results && res?.Results?.length > 0) {
                 geoPositionResult = res?.Results[0];
@@ -27,7 +46,7 @@ export const processMeta = async ({ id, meta, metaTableName, placeIndexName, siz
         }
         catch (error) {
             logger.error("Error fetching geo data", {
-                message: error instanceof Error ? error.message : ""
+                message: error instanceof Error ? error.message : "",
             });
         }
     }
@@ -53,8 +72,12 @@ export const processMeta = async ({ id, meta, metaTableName, placeIndexName, siz
     // Date tags derived from the S3 key path (used when EXIF has no date).
     const keyDateTags = dateCreatedTag ? [] : extractMetaFromKey(id);
     // Sentinel tags — always written so the search index can filter by absence of data.
-    const hasDate = !!(dateCreatedTag || extraDateTags.length > 0 || keyDateTags.length > 0);
+    const hasDate = !!(dateCreatedTag ||
+        extraDateTags.length > 0 ||
+        keyDateTags.length > 0);
     const hasLocation = !!geoPositionResult?.Place?.Country;
+    const extension = id.endsWith("/") ? "" : getKeyExtension(id);
+    const mediaType = deriveMediaType(extension);
     const newTags = [
         ...meta,
         ...extraDateTags,
@@ -62,9 +85,10 @@ export const processMeta = async ({ id, meta, metaTableName, placeIndexName, siz
         ...(id.endsWith("/")
             ? []
             : [
-                { key: "extension", value: getKeyExtension(id) },
+                { key: "extension", value: extension },
                 { key: "size", value: String(size) },
                 { key: "sizeMb", value: String(Math.round(size / 1024 ** 2)) },
+                ...(mediaType ? [{ key: "type", value: mediaType }] : []),
             ]),
         ...(geoPositionResult?.Place?.Label
             ? [{ key: "label", value: geoPositionResult?.Place?.Label }]
@@ -91,15 +115,15 @@ export const processMeta = async ({ id, meta, metaTableName, placeIndexName, siz
         { key: "hasLocation", value: hasLocation ? "true" : "false" },
     ].map((tag) => ({
         key: "ac:tau:" + tag.key,
-        value: tag.value
+        value: tag.value,
     }));
     logger.debug("metaData", { newTags });
     logger.debug("trying to read existing metadata");
     const getResponse = await dynamoDBService.getCommand({
         TableName: metaTableName,
         Key: {
-            id
-        }
+            id,
+        },
     });
     const oldTags = getResponse.Item?.tags;
     logger.debug("existing tags", { getResponse });
@@ -108,17 +132,17 @@ export const processMeta = async ({ id, meta, metaTableName, placeIndexName, siz
     const updateResponse = await dynamoDBService.updateCommand({
         TableName: metaTableName,
         Key: {
-            id
+            id,
         },
         UpdateExpression: "set tags = :tags, #folder = :folder",
         ExpressionAttributeNames: {
-            "#folder": "folder"
+            "#folder": "folder",
         },
         ExpressionAttributeValues: {
             ":tags": reconciledTags,
-            ":folder": deriveFolder(id)
+            ":folder": deriveFolder(id),
         },
-        ReturnValues: "ALL_NEW"
+        ReturnValues: "ALL_NEW",
     });
     logger.debug("sent UpdateCommand", { updateResponse });
 };
@@ -162,7 +186,9 @@ const extractMetaFromKey = (key) => {
     if (!key)
         return [];
     // Look at the parent folder, not the file itself.
-    const parent = key.endsWith("/") ? key : key.slice(0, key.lastIndexOf("/") + 1);
+    const parent = key.endsWith("/")
+        ? key
+        : key.slice(0, key.lastIndexOf("/") + 1);
     const parsed = parseFolderDate(parent);
     if (!parsed)
         return [];

package/package.json

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