rename epxiry to expiration; update type number to object

Author: Bnonni

json-schemas/interface-methods/protocol-rule-set.json

@@ -107,10 +107,25 @@
         }
       }
     },
-    "$expiry": {
-      "$comment": "Time in milliseconds from dateCreated to wait until the record expires",
-      "type": "number",
-      "minimum": 1
+    "$expiration": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "duration": {
+          "type": "number",
+          "minimum": 1,
+          "$comment": "Amount of milliseconds to add to dateCreated to determine expiration date"
+        },
+        "timespan": {
+          "type": "string",
+          "minimum": "1s",
+          "$comment": "Time span to add to dateCreated to determine expiration date (e.g. 30s, 45m, 10h, 2D, 3W, 6M, 2Y)"
+        },
+        "datetime": {
+          "type": "string",
+          "$comment": "Datetime string in ISO8601 format (YYYY-MM-DDThh:mm:ssZ) after which a record expires"
+        }
+      }
     }
   },
   "patternProperties": {