allow individual devices to be retrievable

Device.ts

@@ -1,6 +1,7 @@
 export type Device = {
   deviceId: string
   template: string
+  retrievable: boolean
   friendlyName: string
   thingId: string
 }

db.ts

@@ -177,6 +177,7 @@ export function upsertDevice({
   deviceId,
   friendlyName,
   template,
+  retrievable,
   thingId,
 }): Promise<any> {
   let params = {
@@ -186,10 +187,11 @@ export function upsertDevice({
       SK: `THING#${thingId}#DEVICE#${deviceId}`,
     },
     UpdateExpression:
-      'set friendlyName = :fn, template = :te, thingId = :th, deviceId = :de, updatedAt = :ua',
+      'set friendlyName = :fn, template = :te, retrievable = :rt, thingId = :th, deviceId = :de, updatedAt = :ua',
     ExpressionAttributeValues: {
       ':fn': friendlyName,
       ':te': template,
+      ':rt': retrievable ? true : false,
       ':th': thingId,
       ':de': deviceId,
       ':ua': dayjs().toISOString(),
@@ -252,6 +254,12 @@ export async function getDevicesOfUser(userId: string): Promise<Device[]> {
     })
   })
 
+  // ensure 'retrievable' attribute is present (old records in DB might not have it yet):
+  devices = devices.map((device) => {
+    device.retrievable = device.retrievable ?? false
+    return device
+  })
+
   return devices as Device[]
 }
 
@@ -290,6 +298,12 @@ export async function getDevicesOfThing(
     })
   })
 
+  // ensure 'retrievable' attribute is present (old records in DB might not have it yet):
+  devices = devices.map((device) => {
+    device.retrievable = device.retrievable ?? false
+    return device
+  })
+
   return devices as Device[]
 }
 

handler.ts

@@ -186,6 +186,7 @@ async function handleBackchannelBulkDiscover(event) {
       thingId: event.thingId,
       friendlyName: deviceStub['friendlyName'],
       template: deviceStub['template'],
+      retrievable: deviceStub['retrievable'] ?? false,
     }
 
     devicesToDiscover.push(device)
@@ -223,6 +224,7 @@ export async function handleBackchannelBulkUndiscover({ thingId, devices }) {
       thingId: thingId,
       friendlyName: deviceStub['friendlyName'],
       template: deviceStub['template'],
+      retrievable: deviceStub['retrievable'] ?? false,
     }
 
     devicesToUndiscover.push(device)

handlers/discover.ts

@@ -23,9 +23,10 @@ function getEndpointForDevice(device: Device, asRetrievable: boolean) {
 
 export function getEndpointsForDevices(
   devices: Device[],
-  asRetrievable: boolean
+  asRetrievableAllowed: boolean
 ) {
   return devices.reduce((acc, curr) => {
+    const asRetrievable = asRetrievableAllowed && curr.retrievable
     const endpoint = getEndpointForDevice(curr, asRetrievable)
 
     if (endpoint) {