Merge remote-tracking branch 'origin/main'

* origin/main:
  chore: release v2.0.0-alpha.1
  gha
  Changelog and license year
  Alpha1 Preparations (Apollon77#140)
  Bump braces from 3.0.2 to 3.0.3 (Apollon77#135)
  Bump actions/checkout from 3 to 4 (Apollon77#119)
  Bump actions/setup-node from 3 to 4 (Apollon77#121)

.github/workflows/dependabot-automerge.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check if PR should be auto-merged
         uses: ahmadnassri/action-dependabot-auto-merge@v2

.github/workflows/test-and-release.yml

@@ -25,18 +25,19 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
-
       - name: Install Dependencies
         run: npm ci
+      - name: Build project
+        run: npm run build
 
   # Runs adapter tests on all supported node versions and OSes
   lib-tests:
@@ -47,18 +48,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [16.x, 18.x, 20.x, 22.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Install Dependencies
         run: npm ci
+      - name: Build project
+        run: npm run build
 
 #      - name: Run local tests
 #        run: npm test
@@ -79,10 +82,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -99,17 +102,21 @@ jobs:
           BODY="${BODY//$'\n'/'%0A'}"
           BODY="${BODY//$'\r'/'%0D'}"
           echo "::set-output name=BODY::$BODY"
+          if [[ $VERSION == *"-"* ]] ; then
+            echo "::set-output name=TAG::--tag next"
+          fi
 
       - name: Install Dependencies
         run: npm ci
-        #Automatically generate binaries for Win/MacOS/Linux
-      - name: Create Tokensaver binaries
-        run: npm run build-tokensaver
+
+      - name: Build project
+        run: npm run build
+
       - name: Publish package to npm
         run: |
           npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
           npm whoami
-          npm publish
+          npm publish ${{ steps.extract_release.outputs.TAG }}
 
       - name: Create Github Release
         id: create_release

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021-2022 Apollon77 <ingo@fischer-ka.de>
+Copyright (c) 2021-2024 Apollon77 <ingo@fischer-ka.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -74,11 +74,12 @@ See [`src/example.ts`](./src/example.ts).
 * Implement interval data update in library or only from outside?
 
 ## Changelog:
-
-### __WORK IN PROGRESS__
+### 2.0.0-alpha.1 (2024-07-02)
 * BREAKING: Username/Passwort and Proxy Authentications are removed and replaced by the new Daikin Portal Authentication! You need to re-authenticate!
+* BREAKING: DaikinCloudController class constructor changed and has new options structure!
 * (jacoscaz) Port to Typescript
 * (jacoscaz) Switch to Daikin's OIDC-based Onecta API
+* (Apollon77) Enhancements to restore some make sure former functionality is still possible to use
 
 ### 1.2.4 (2023-09-09)
 * (Apollon77) Make sure to store only existing refresh tokens

cert/cert.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCl2ofZKAqpOUtE
-HOaedkYs3pv86P6CV3tRKXCV6BMoF0oj2HhYD6jxL92L0YyMjVi+Ysv4sWGjFB3L
-UburXuDxKsU8EoksRFVFxRKRQFjtIO2tfnnkVWkdcyXUcnSgEBWfj8Gwt0Ouunxl
-lS9OLUp/1zKaAk+mTU22nNkc/dy6D8REDj28UsAae4iuw5No4RYVNY28lvUbMLrP
-fPVOhOMUU8cUvvrnpf7/9FkP8Sm2nG4vVpO6efYJ0wz7UiGmJUQQYRQEE/AZZSC0
-O7wwNBtkxY5JO6nnLZ3MoOPHXJkF1ptUikOBNh9Db46/DHIr0JJZSaACkLsKta8C
-4MM74bTZAgMBAAECggEAJDAD3x5tARJmuURjD2U4F5c0yuCdk5v55LIZhiPeditq
-ulqDm5dDIejzOows0ggPOm89GRS+/IGppJC/VXt8sjJGWb6jnnyEbJY84GN9Y7QB
-GA9WEjuOlWXn9axJhRktVqTbuq6p/mhjNxjveuvH6w/t0wu5DEymrbcYakp7zD7F
-c9Q6iLd7MNt+EGFJQ9HXIFfvd8aGC3lUWTfVIqhQ1YjBeQXHWuK8Z6FKj/ecJ6kV
-VBD2pmTPvCS2oc5/TuEstfWkhUXbJkDJUx37SqOtp5F/N/IGUndOYZGcQM5QZ0dk
-eQUzslFqxmiOur6ncYO0c9DdMS/iHbF7BOLJrLVG/wKBgQDWO4vdR5BGDyRADxm4
-avfdCi05lc7mAjD1ZKSzCZONOWXdKXtAk8W7UPDbTZtJ/nHXVui+gSMVSzpkqEvQ
-gRs1E5m6lsp5NHwq6Q6/nrpn7aAlo9q2hBKXT6VZFkpqKQQQZfa/4Gb9KSCmNvoI
-Dm62K+vx8BtWFUiXZMYIJca1MwKBgQDGMF3QG38VZehVPQpCTnr4SSCEx8x5p5sC
-RJMO+mogDR43FW4Pn0olFNKqxVlV/SjBIQT0cupLq1oQjbmzQPoPk2fpBrKXMpvl
-frUsm6mfEd4iBVLyLcn5NzBgOlkQrUtaz5w/L4lbDfDBZAksX8x4rGp4qI28lQuL
-o3qLi7WVwwKBgD1Qe55Qbh1vFfvzlnPuwZQU5o61rqqr8+E39d98HSvtQpdC2RDJ
-em07JERP+OL7nQ95w1FK2oSsrEDE3jYFzYiqXHRH1hlMiUEqxNrZDhbSruQ2+lEE
-ieGenP9bXt71cEFVPYL7Md7BF6Qa1gLaRpuDBJuREfHYU5do8zi/vxh7AoGAD9S/
-OadooFnylBR7JE7Gjdyxh0m6cKFNxYGayaCBJ6xElJvWndLYhlvCdDetaiv9vGeZ
-0Lj5NDAs0pOvmL0A/IuGyltpmqBFSbC0YirRAs7XkpogRQ4ZSxn4eEdQ4/8jvM5G
-qdlvPGHBsIEAJpZEbANBwf+cysqREIdve4QebicCgYBSTgudClfJIObL/KhR9ET5
-yiJuye80x6cvGOFrkmI1XVRIykpIqtbvM32kBBN/2EmPVkOf9O79ohJnET4B6tTG
-d2SMBjm/tBW6KhP0wQ8t69RWPMp3i/2HKGNqZvHQOKLbLTzEehNqnc616yx3d+UX
-JM3DmzgTfECrhsicFzzoYA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDIOEfVJ4LFb3Dx
+jbTgi/2giXy86Ty1zbIUCg43vaoM+6vSKfKwKSMW7gA01nsTRVuOzWCWsPhUdymy
+UCZBWG2E1yI04LP30SpPqBaE9FfUN6dzI92C1bRe6t/iJxJLa1SgHcdjgSiRUo6Y
+8xSzwd/TKNiRc3qxGGg/eSvYRasvg2QQC2arncmF4LI1yvz+dgrtRdoF1jr8NPXY
+6bdSuAsGfMnmt74UH7Z7cDVfZsYuLVHMVW+fqxaxWr/2vLbygFcttEXxEx7Dspav
+R36oX0MsI7yZCsxiVxXxO9ey8Ax4nes8/C2OISUnxH8EE9t6GvI9TyqETCrA4gzr
+Pv1D18xjAgMBAAECggEAGSX14nsU/Nwzhn5IaCU36nslFMwC7nRIrXsEhXx9fdCl
+Uz97lnmESR6vHfPhVO6oQmE02Zie3b/Il/djPAqcWaF1UB5NMeUEIyniB48dR7A5
+3cd1IjgvcKCgav/XV2vCybMT1pa5froCOTSHDCZfiQlKB8hGcooLRgsKi8lXEson
+6/C9LPyUMUKPAM1+Dy90LE7iOz38vOhxEm7DNu0H7u0hXYbTTBldRj2I3e+cioR6
+DTbOMdkaDSyi7XGuKu6POaZmfsvsNPrRjc9oGochx+k5zOBZMj+GlvQ839mDBR7O
+NwyKwX11GvQiF1kZwXriUxK6VrhsbGiQ160WOTuoCQKBgQD6E1r1Pa1ql9PLaKBc
+MXkuVSgZC8S7pR+hON0BDqfy7suvAirvi8T+Q8+tb1SN27//qa2P/twpFaUivGTd
+KYOzen2tZ6XQqd7O+Ybl6kfMXCEr7/4Boxlf09SNdxln7A9vs1hH01Je7XGJYIZk
+wyB7lPFL1HzT0UZPlu0uOYrwbwKBgQDM9pAV8YnfOFAr+dyX99j2Oj7+H+4l/ATG
+o7l67XGAeU+WxbwlQsj/Ms1ffnCU3qypuzaTd1KlzS11MKmnfRo4cSjNzdKDSK7T
+6Zilnqc3e4CZaA7U+HZWjVs6jpJU74U0WwpFuOTGMb5a0kdXeQ9uOyd+yxdsbk7F
+Zbd50WG1TQKBgBMmxlF/vrcqF3s9cQJ+e3RT6zU31II2XBzBuRMqpywQo6KsfNNJ
+lfWPBemXXBddG/Adc4BSmVPAJ5xoZyUU19Q37kYIaQd46upY677R2VvKNnQh9gb0
+Ea5oD6Ah3d06k9gPGRSvF2DTuF03+jLfSq6MMoqHJGQoY8UWnuVqXLybAoGAc2pE
+KJcis/fZ7Wl9tnVyTvTtk9wXFnybk9+OCpK6X0Xwc05VbAX3ePz6eNOSQcJCKDGr
+wc5nU8X92wfUAOSJZ08RUxKbgCHlkJ7xvhFgx/VbrQbTk0l2GbbvsEGoVPurXpgF
+aM18xb4tGqdeVPtunPvieZuTTROwd6eXcZleE+ECgYEAgHKVr8N9UDU3o3DLIdlR
+GFLj8yct7Ui1YV3F2aYu+ihG4QHLsc6MAHkcaswNvzbyEHtHpyKHTMiIYcIGxdvi
+bqFXDSQRowxXsgyRDWmnP6u2fEF68dSXlJ5BOtgqqF2OCaCjHnl+E7x28WeksZRJ
+fYPhkGQ3UceMHd9oEWo//Uo=
 -----END PRIVATE KEY-----

cert/cert.pem

@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIUcjAWwfDOv7FkmvXGaNs3oxLmsyIwDQYJKoZIhvcNAQEL
-BQAwgY0xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVTdGF0ZTERMA8GA1UEBwwITG9j
+MIID8TCCAtmgAwIBAgIUTl+duPkIUXI1h7w2hiMbymkFUx8wDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVTdGF0ZTERMA8GA1UEBwwITG9j
 YXRpb24xGjAYBgNVBAoMEU9yZ2FuaXphdGlvbiBOYW1lMRwwGgYDVQQLDBNPcmdh
-bml6YXRpb25hbCBVbml0MSEwHwYDVQQDDBhkYWlraW4tb25lY3RhMm1xdHQubG9j
-YWwwHhcNMjQwNjI4MDc1MjEwWhcNMzQwNjI2MDc1MjEwWjCBjTELMAkGA1UEBhMC
-VVMxDjAMBgNVBAgMBVN0YXRlMREwDwYDVQQHDAhMb2NhdGlvbjEaMBgGA1UECgwR
-T3JnYW5pemF0aW9uIE5hbWUxHDAaBgNVBAsME09yZ2FuaXphdGlvbmFsIFVuaXQx
-ITAfBgNVBAMMGGRhaWtpbi1vbmVjdGEybXF0dC5sb2NhbDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKXah9koCqk5S0Qc5p52Rizem/zo/oJXe1EpcJXo
-EygXSiPYeFgPqPEv3YvRjIyNWL5iy/ixYaMUHctRu6te4PEqxTwSiSxEVUXFEpFA
-WO0g7a1+eeRVaR1zJdRydKAQFZ+PwbC3Q666fGWVL04tSn/XMpoCT6ZNTbac2Rz9
-3LoPxEQOPbxSwBp7iK7Dk2jhFhU1jbyW9Rswus989U6E4xRTxxS++uel/v/0WQ/x
-Kbacbi9Wk7p59gnTDPtSIaYlRBBhFAQT8BllILQ7vDA0G2TFjkk7qectncyg48dc
-mQXWm1SKQ4E2H0Nvjr8McivQkllJoAKQuwq1rwLgwzvhtNkCAwEAAaNrMGkwDgYD
-VR0PAQH/BAQDAgOIMBMGA1UdJQQMMAoGCCsGAQUFBwMBMCMGA1UdEQQcMBqCGGRh
-aWtpbi1vbmVjdGEybXF0dC5sb2NhbDAdBgNVHQ4EFgQUPxzrRNuFqDHzBmOnSv/t
-IuL36mswDQYJKoZIhvcNAQELBQADggEBAClB4bQdPo50TlRODy/5WAWqq6i5HSqO
-sylSvRJN6Qzcy4oiKTaUuUHR5yBL3mXzfiZc9LiSRDB3kTOzJv50Bm8S8dct3vFP
-2WjMQm7bwk6yxYKZdVPqBXuAxzzW+4t5NkuepZp3lfbYS6tNNrnDnzdZBDKXWrB1
-1YUEi2mtTp0cFE3klMYfcJtUV+EgyjKMjbYcp2HFHYN2l2yV5jkH+Uik7pdzEfS+
-xWQ+v5TkVKcXCS+scDocAFz1r+mHJArycXfTv2BLpdmAWSFBrsEFl72BiIW4XZ+f
-avgUUJSZcEW1yxpS3YXzq44MFmUJe6Xqpu8788Wl0xCJ3dLNRUHiL1w=
+bml6YXRpb25hbCBVbml0MRUwEwYDVQQDDAxkYWlraW4ubG9jYWwwHhcNMjQwNzAy
+MTAxNDI3WhcNMzQwNjMwMTAxNDI3WjCBgTELMAkGA1UEBhMCVVMxDjAMBgNVBAgM
+BVN0YXRlMREwDwYDVQQHDAhMb2NhdGlvbjEaMBgGA1UECgwRT3JnYW5pemF0aW9u
+IE5hbWUxHDAaBgNVBAsME09yZ2FuaXphdGlvbmFsIFVuaXQxFTATBgNVBAMMDGRh
+aWtpbi5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMg4R9Un
+gsVvcPGNtOCL/aCJfLzpPLXNshQKDje9qgz7q9Ip8rApIxbuADTWexNFW47NYJaw
++FR3KbJQJkFYbYTXIjTgs/fRKk+oFoT0V9Q3p3Mj3YLVtF7q3+InEktrVKAdx2OB
+KJFSjpjzFLPB39Mo2JFzerEYaD95K9hFqy+DZBALZqudyYXgsjXK/P52Cu1F2gXW
+Ovw09djpt1K4CwZ8yea3vhQftntwNV9mxi4tUcxVb5+rFrFav/a8tvKAVy20RfET
+HsOylq9HfqhfQywjvJkKzGJXFfE717LwDHid6zz8LY4hJSfEfwQT23oa8j1PKoRM
+KsDiDOs+/UPXzGMCAwEAAaNfMF0wDgYDVR0PAQH/BAQDAgOIMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMBcGA1UdEQQQMA6CDGRhaWtpbi5sb2NhbDAdBgNVHQ4EFgQUtMiA
+5rZoHyT32uu5Uw5WF9mUKXEwDQYJKoZIhvcNAQELBQADggEBAIH7BId2vX8XWs2A
+qcBHAlGpt2GEdC0xSdGx/L70t/pFvYcwYLnTFYgPaDU/XzaBtwPSH71wTGTujjPF
+GgDevYQxCU6/92vXO2GLgX2OAooD0+r53OO1H+dKMoRqpkX4IAqSMgZ7D5UxF76l
+pG0N+bNu5TvkIXxLRojhpAmO1H82/hSRV6mObPUqL3rKHzMb5yGuCBXMbfqiF68e
+QaKeHEuwBt9EiC+QJbu1GLVuh38Yih2v2TtfZQEkasisZqr7wjJSSCosZ04U56t0
+qbx3M8TrjsNWJB51WOGCzmWIqh+26DK2T8KXFmfJg2W+thygEItFAhXMCILhAOwQ
+UpMJ67w=
 -----END CERTIFICATE-----

cert/req.cnf

@@ -7,11 +7,11 @@ C = US
 ST = State
 L = Location
 O = Organization Name
-OU = Organizational Unit 
-CN = daikin-onecta2mqtt.local
+OU = Organizational Unit
+CN = daikin.local
 [v3_req]
 keyUsage = critical, digitalSignature, keyAgreement
 extendedKeyUsage = serverAuth
 subjectAltName = @alt_names
 [alt_names]
-DNS.1 = daikin-onecta2mqtt.local
+DNS.1 = daikin.local

package.json

@@ -1,6 +1,6 @@
 {
   "name": "daikin-controller-cloud",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "description": "Interact with Daikin Cloud devices and retrieve Tokens",
   "author": "Apollon77 <iobroker@fischer-ka.de>",
   "contributors": [],
@@ -26,7 +26,7 @@
     "url": "https://github.com/Apollon77/daikin-controller-cloud/issues"
   },
   "scripts": {
-    "prepare": "npm run build",
+    "prepublish": "npm run build",
     "build": "tsc -p .",
     "release": "release-script",
     "build-tokensaver": "pkg example/tokensaver.js"