.drone.yml

@@ -0,0 +1,80 @@
+kind: pipeline
+type: docker
+name: default
+
+clone:
+  disable: true
+
+steps:
+  - name: clone
+    image: alpine/git
+    commands:
+      - git clone https://gitea.watsonlabs.net/watsonb8/homebridge-harmony-control.git .
+      - git checkout $DRONE_COMMIT
+
+  - name: build
+    image: node
+    commands:
+      - npm install
+      - npm run build
+
+  - name: version
+    image: node
+    commands:
+      - export version=`node -p "require('./package.json').version"`
+      - export commit=`echo $DRONE_COMMIT | cut -c1-5`
+      - npm version prerelease --preid=$commit --git-tag-version=false --allow-same-version=true
+    when:
+      event:
+        exclude:
+          - tag
+          - pull_request
+      branch:
+        include:
+          - master
+
+  - name: publish pre
+    image: plugins/npm
+    settings:
+      username:
+        from_secret: npm_username
+      password:
+        from_secret: npm_password
+      email: brandon@watsonlabs.net
+      registry: "http://10.44.1.6:4873/"
+    when:
+      event:
+        exclude:
+          - tag
+          - pull_request
+      branch:
+        include:
+          - master
+
+  - name: publish tagged version
+    image: plugins/npm
+    settings:
+      username:
+        from_secret: npm_username
+      password:
+        from_secret: npm_password
+      email: brandon@watsonlabs.net
+      registry: "http://10.44.1.6:4873/"
+    when:
+      event:
+        - tag
+      exclude:
+        - pull_request
+
+  - name: Notify
+    image: drillster/drone-email
+    settings:
+      host: 10.44.1.13
+      username: srvGitea
+      password:
+        from_secret: smtp_password
+      from: drone@watsonlabs.net
+      skip_verify: true
+    when:
+      status:
+        - failure

.gitea/workflows/ci.yaml

@@ -1,82 +0,0 @@
-name: Build homebridge-harmony-control
-on: 
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: Build
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - run: |
-          npm ci
-          npm run build
-
-  version:
-    name: Version
-    outputs:
-      version: ${{ steps.get_version.outputs.version }}
-      commit: ${{ steps.get_version.outputs.commit }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - id: get_version
-        name: Set Version
-        run: |
-          export version=`node -p "require('./package.json').version"`
-          export commit=`echo $GITHUB_SHA | cut -c1-5`
-          echo "version=$version" >> "$GITHUB_OUTPUT"
-          echo "commit=$commit" >> "$GITHUB_OUTPUT"
-
-  publish_tagged:
-    name: Publish Latest
-    needs: 
-      - build
-      - version
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-      - run: npm config set @watsonb8:registry https://gitea.watsonlabs.net/api/packages/watsonb8/npm/
-      - name: Publish
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          COMMIT: ${{ needs.version.outputs.commit }}
-        run: |
-          npm ci
-          npm config set -- '//gitea.watsonlabs.net/api/packages/watsonb8/npm/:_authToken' "$NPM_TOKEN"
-          npm version prerelease --preid="$COMMIT" --git-tag-version=false --allow-same-version=true
-          npm publish
-  
-  deploy:
-    runs-on: 
-      - ubuntu-latest
-      - internal
-    name: Deploy
-    needs: publish_tagged
-    steps:
-      - name: Set up SSH key
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.ELEVATED_HOMEBRIDGE_SSH_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -p 22 homebridge.me >> ~/.ssh/known_hosts
-          sudo apt update
-          sudo apt install sshpass
-
-      - name: Remove old Package
-        run: |
-          sshpass -p '${{ secrets.ELEVATED_HOMEBRIDGE_PASSWORD }}' ssh -v -o StrictHostKeyChecking=no ${{ secrets.ELEVATED_HOMEBRIDGE_USER }}@${{ secrets.HOMEBRIDGE_HOST }} <<'ENDSSH'
-          rm -r /home/${{ secrets.HOMEBRIDGE_USER }}/.npm-global/lib/node_modules/@watsonb8/homebridge-harmony-control
-          ENDSSH
-      - name: Deploy
-        run: |
-          sshpass -p '${{ secrets.ELEVATED_HOMEBRIDGE_PASSWORD }}' ssh -v -o StrictHostKeyChecking=no ${{ secrets.ELEVATED_HOMEBRIDGE_USER }}@${{ secrets.HOMEBRIDGE_HOST }} <<'ENDSSH'
-          npm install -g @watsonb8/homebridge-harmony-control
-          ENDSSH

package-lock.json

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

package.json

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

src/services/activityService.ts

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