Fixing pipeline

.drone.yml

@@ -5,6 +5,9 @@ name: default
 clone:
   disable: true
 
+node:
+  lan: internal
+
 steps:
   - name: clone
     image: alpine/git
@@ -34,14 +37,14 @@ steps:
           - master
 
   - name: publish pre
-    image: plugins/npm
+    image: node
-    settings:
+    environment:
-      username:
+      token:
-        from_secret: npm_username
+        from_secret: npm_token
-      password:
+    commands:
-        from_secret: npm_password
+      - npm config set @watsonb8:registry https://gitea.watsonlabs.net/api/packages/watsonb8/npm/
-      email: brandon@watsonlabs.net
+      - npm config set -- '//gitea.watsonlabs.net/api/packages/watsonb8/npm/:_authToken' "$token"
-      registry: "http://10.44.1.6:4873/"
+      - npm publish
     when:
       event:
         exclude:
@@ -52,14 +55,70 @@ steps:
           - master
 
   - name: publish tagged version
-    image: plugins/npm
+    image: node
+    environment:
+      token:
+        from_secret: npm_token
+    commands:
+      - npm config set @watsonb8:registry https://gitea.watsonlabs.net/api/packages/watsonb8/npm/
+      - npm config set -- '//gitea.watsonlabs.net/api/packages/watsonb8/npm/:_authToken' "$token"
+      - npm publish
+    when:
+      event:
+        - tag
+      exclude:
+        - pull_request
+
+  - name: remove old package
+    image: appleboy/drone-ssh
+    environment:
+      SSH_USER:
+        from_secret: ssh_user
     settings:
+      host: homebridge.me
+      envs:
+        - SSH_USER
       username:
-        from_secret: npm_username
+        from_secret: ssh_user
-      password:
+      key:
-        from_secret: npm_password
+        from_secret: ssh_key
-      email: brandon@watsonlabs.net
+      port: 22
-      registry: "http://10.44.1.6:4873/"
+      script:
+        - rm -r /home/$SSH_USER/.npm-global/lib/node_modules/@watsonb8/homebridge-harmony-control || true
+    when:
+      event:
+        - tag
+      exclude:
+        - pull_request
+
+  - name: deploy
+    image: appleboy/drone-ssh
+    settings:
+      host: homebridge.me
+      username:
+        from_secret: ssh_user
+      key:
+        from_secret: ssh_key
+      port: 22
+      script:
+        - npm install -g @watsonb8/homebridge-harmony-control
+    when:
+      event:
+        - tag
+      exclude:
+        - pull_request
+
+  - name: restart homebridge
+    image: appleboy/drone-ssh
+    settings:
+      host: homebridge.me
+      username:
+        from_secret: elevated_ssh_user
+      key:
+        from_secret: ssh_key
+      port: 22
+      script:
+        - systemctl restart homebridge
     when:
       event:
         - tag

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@watsonb8/homebridge-harmony-control",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,10 +1,10 @@
 {
     "name": "@watsonb8/homebridge-harmony-control",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "description": "Homebridge platform to control smart home equipment by room.",
     "main": "bin/index.js",
     "publishConfig": {
-        "registry": "http://10.44.1.6:4873/"
+        "registry": "https://gitea.watsonlabs.net"
     },
     "scripts": {
         "build": "tsc --build",
@@ -44,4 +44,4 @@
         "request": "^2.88.0",
         "tsyringe": "^4.6.0"
     }
-}
+}

src/services/activityService.ts

@@ -117,7 +117,7 @@ export class ActivityService {
       let currentOtherState: IActivityState =
         this._stateDataProvider.states[controlUnitKey]!;
 
-      if (!currentOtherState) {
+      if (!currentOtherState || !currentOtherState.currentActivity) {
         return devicesToTurnOn;
       }