Delete action internally on DELETE. (#6)

.eslintrc.js

@@ -16,5 +16,6 @@ module.exports = {
     quotes: ['error', 'single', {
       allowTemplateLiterals: true,
     }],
+    semi: ['error', 'always'],
   }
 };

lib/property.js

@@ -61,8 +61,8 @@ class Property {
       this.value = value;
     }
 
-    this.thing.propertyNotify(this)
-    return this.value
+    this.thing.propertyNotify(this);
+    return this.value;
   }
 
   /**

lib/server.js

@@ -391,14 +391,11 @@ class ActionIDHandler extends BaseHandler {
     const actionName = req.params.actionName;
     const actionId = req.params.actionId;
 
-    const action = thing.getAction(actionName, actionId);
-    if (action === null) {
+    if (thing.removeAction(actionName, actionId)) {
+      res.status(204).end();
+    } else {
       res.status(404).end();
-      return;
     }
-
-    action.cancel()
-    res.status(204).end();
   }
 }
 

lib/thing.js

@@ -47,7 +47,7 @@ class Thing {
     }
 
     for (const property of Object.values(this.properties)) {
-      property.setHrefPrefix(prefix)
+      property.setHrefPrefix(prefix);
     }
 
     for (const actionName in this.actions) {
@@ -327,7 +327,7 @@ class Thing {
     this.availableEvents[name] = {
       metadata: metadata,
       subscribers: new Set(),
-    }
+    };
   }
 
   /**
@@ -351,6 +351,30 @@ class Thing {
     return action;
   }
 
+  /**
+   * Remove an existing action.
+   *
+   * @param {String} actionName Name of the action
+   * @param {String} actionId ID of the action
+   * @returns boolean indicating the presence of the action.
+   */
+  removeAction(actionName, actionId) {
+    const action = this.getAction(actionName, actionId);
+    if (action === null) {
+      return false;
+    }
+
+    action.cancel();
+    for (let i = 0; i < this.actions[actionName].length; ++i) {
+      if (this.actions[actionName][i].id === actionId) {
+        this.actions[actionName].splice(i, 1);
+        break;
+      }
+    }
+
+    return true;
+  }
+
   /**
    * Add an available action.
    *
@@ -369,7 +393,7 @@ class Thing {
     this.availableActions[name] = {
       metadata: metadata,
       class: cls,
-    }
+    };
     this.actions[name] = [];
   }
 
@@ -379,7 +403,7 @@ class Thing {
    * @param {Object} ws The websocket
    */
   addSubscriber(ws) {
-    this.subscribers.add(ws)
+    this.subscribers.add(ws);
   }
 
   /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webthing",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "HTTP Web Thing implementation",
   "main": "index.js",
   "scripts": {