iobroker.sbfspot 4.1.3 → 4.1.5

package/.github/FUNDING.yml

@@ -0,0 +1,16 @@
+# These are supported funding model platforms
+
+#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+
+
+custom: "https://www.paypal.com/donate/?hosted_button_id=34ESBMJ932QZC"

package/.github/dependabot.yml

@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+ 
+version: 2
+updates:
+- package-ecosystem: "npm"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  target-branch: "master"
+  open-pull-requests-limit: 30

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

@@ -1,120 +1,79 @@
-# This is a composition of lint and test scripts
-# Make sure to update this file along with the others
-
 name: Test and Release
 
 # Run this job on all pushes and pull requests
 # as well as tags with a semantic version
 on:
-    push:
-        branches:
-            - "*"
-        tags:
-            # normal versions
-            - "v[0-9]+.[0-9]+.[0-9]+"
-            # pre-releases
-            - "v[0-9]+.[0-9]+.[0-9]+-**"
-    pull_request: {}
+  push:
+    branches:
+      - "master"
+    tags:
+      # normal versions
+      - "v[0-9]+.[0-9]+.[0-9]+"
+      # pre-releases
+      - "v[0-9]+.[0-9]+.[0-9]+-**"
+  pull_request: {}
 
 jobs:
-    # Performs quick checks before the expensive test runs
-    check-and-lint:
-        if: contains(github.event.head_commit.message, '[skip ci]') == false
-
-        runs-on: ubuntu-latest
-
-        strategy:
-            matrix:
-                node-version: [16.x]
-
-        steps:
-            - uses: actions/checkout@v2
-            - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@v1
-              with:
-                  node-version: ${{ matrix.node-version }}
-
-            - name: Install Dependencies
-              run: npm ci
-
-            - name: Lint source code
-              run: npm run lint
-            - name: Test package files
-              run: npm run test:package
-
-    # Runs adapter tests on all supported node versions and OSes
-    adapter-tests:
-        if: contains(github.event.head_commit.message, '[skip ci]') == false
-
-        needs: [check-and-lint]
-
-        runs-on: ${{ matrix.os }}
-        strategy:
-            matrix:
-                node-version: [ 16.x, 18.x]
-                os: [ubuntu-latest, windows-latest, macos-latest]
-                exclude:
-                    # Don't test Node.js 8 on Windows. npm is weird here
-                    - os: windows-latest
-                      node-version: 8.x
-        steps:
-            - uses: actions/checkout@v2
-            - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@v1
-              with:
-                  node-version: ${{ matrix.node-version }}
-
-            - name: Install Dependencies
-              run: npm ci
-
-            - name: Run unit tests
-              run: npm run test:unit
-
-            - name: Run integration tests (unix only)
-              if: startsWith(runner.OS, 'windows') == false
-              run: DEBUG=testing:* npm run test:integration
-
-            - name: Run integration tests (windows only)
-              if: startsWith(runner.OS, 'windows')
-              run: set DEBUG=testing:* & npm run test:integration
-
-# TODO: To enable automatic npm releases, create a token on npmjs.org
-# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options
-# Then uncomment the following block:
-
-#    # Deploys the final package to NPM
-#    deploy:
-#        needs: [adapter-tests]
-#
-#        # Trigger this step only when a commit on master is tagged with a version number
-#        if: |
-#            contains(github.event.head_commit.message, '[skip ci]') == false &&
-#            github.event_name == 'push' &&
-#            github.event.base_ref == 'refs/heads/master' &&
-#            startsWith(github.ref, 'refs/tags/v')
-#
-#        runs-on: ubuntu-latest
-#        strategy:
-#            matrix:
-#                node-version: [12.x]
-#
-#        steps:
-#            - uses: actions/checkout@v2
-#            - name: Use Node.js ${{ matrix.node-version }}
-#              uses: actions/setup-node@v1
-#              with:
-#                  node-version: ${{ matrix.node-version }}
-#
-#            - name: Publish package to npm
-#              run: |
-#                  npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
-#                  npm whoami
-#                  npm publish
-
-    # Dummy job for skipped builds - without this, github reports the build as failed
-    skip-ci:
-        if: contains(github.event.head_commit.message, '[skip ci]')
-        runs-on: ubuntu-latest
-        steps:
-            - name: Skip build
-              run: echo "Build skipped!"
+  # Performs quick checks before the expensive test runs
+  check-and-lint:
+    if: contains(github.event.head_commit.message, '[skip ci]') == false
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: ioBroker/testing-action-check@v1
+        with:
+          node-version: '18.x'
+          # Uncomment the following line if your adapter cannot be installed using 'npm ci'
+          # install-command: 'npm install'
+          lint: true
+
+  # Runs adapter tests on all supported node versions and OSes
+  adapter-tests:
+    if: contains(github.event.head_commit.message, '[skip ci]') == false
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node-version: [16.x, 18.x, 20.x]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+      - uses: ioBroker/testing-action-adapter@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+          os: ${{ matrix.os }}
+          # Uncomment the following line if your adapter cannot be installed using 'npm ci'
+          # install-command: 'npm install'
+
+  # Deploys the final package to NPM
+  deploy:
+    needs: [check-and-lint, adapter-tests]
+
+    # Trigger this step only when a commit on any branch is tagged with a version number
+    if: |
+      contains(github.event.head_commit.message, '[skip ci]') == false &&
+      github.event_name == 'push' &&
+      startsWith(github.ref, 'refs/tags/v')
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: ioBroker/testing-action-deploy@v1
+        with:
+          node-version: '18.x'
+          # Uncomment the following line if your adapter cannot be installed using 'npm ci'
+          # install-command: 'npm install'
+          npm-token: ${{ secrets.NPM_TOKEN }}
+          github-token: ${{ secrets.secrets.AUTOMERGER }}
+
+          # When using Sentry for error reporting, Sentry can be informed about new releases
+          # To enable create a API-Token in Sentry (User settings, API keys)
+          # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options
+          # Then uncomment and customize the following block:
+          #sentry: true
+          #sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          #sentry-project: "xxx"
+          #sentry-version-prefix: "xxx"
+          # If your sentry project is linked to a GitHub repository, you can enable the following option
+          # sentry-github-integration: true

package/README.md

@@ -18,7 +18,7 @@ For more details and for information how to disable the error reporting see [Sen
 
 **If you like it, please consider a donation:**
                                                                           
-[![paypal](https://www.paypalobjects.com/en_US/DK/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YBAZTEBT9SYC2&source=url) 
+[![paypal](https://www.paypalobjects.com/en_US/DK/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/donate/?hosted_button_id=34ESBMJ932QZC) 
 
 This adapter reads data from SMA power inverters using sbfspot.
 Now both database types (mySQL and sqlite) are supported.
@@ -51,6 +51,12 @@ sometimes npm intall must be called more then one time to successfully install a
 
 ## Changelog
 
+### 4.1.5 (2023-07-30)
+* (René) dependencies updated
+
+### 4.1.4 (2023-04-07)
+* (René) dependencies updated
+
 ### 4.1.3 (2023-01-31)
 * (René) dependencies updated
 

package/io-package.json

@@ -1,9 +1,9 @@
 {
     "common": {
         "name": "sbfspot",
-        "version": "4.1.3",
+        "version": "4.1.5",
         "news": {
-            "4.1.3": {
+            "4.1.5": {
                 "en": "dependencies updated",
                 "de": "Abhängigkeiten aktualisiert",
                 "ru": "зависимости обновлены",

package/lib/SMA_Bluetooth.js

@@ -0,0 +1,27 @@
+const bluetooth = require('node-bluetooth');
+
+
+
+let parentAdapter;
+
+function test(adapter) {
+
+    parentAdapter = adapter;
+
+    const device = new bluetooth.DeviceINQ();
+
+
+    device
+        .on('finished', function () {
+            parentAdapter.log.warn("finished ");
+            })
+        .on('found', function found(address, name) {
+            parentAdapter.log.warn('Found: ' + address + ' with name ' + name);
+        }).scan();
+
+}
+
+
+module.exports = {
+    test
+}

package/main.js

@@ -18,7 +18,7 @@ const utils = require("@iobroker/adapter-core");
 //const { json } = require("stream/consumers");
 const SunCalc = require("suncalc2");
 
-
+//const bluetooth_test = require("./lib/SMA_Bluetooth").test;
 
 
 let adapter;
@@ -56,7 +56,11 @@ let killTimer;
 
 async function main() {
 
-    if (typeof adapter.config.databasetype == "undefined") {
+
+    //bluetooth_test();
+
+
+    if (adapter.config.databasetype === undefined) {
         adapter.log.error("databasetype not defined. check and update settings and save");
         adapter.terminate ? adapter.terminate(11) : process.exit(11);
     }
@@ -187,7 +191,7 @@ async function GetSystemDateformat() {
     try {
         const ret = await adapter.getForeignObjectAsync("system.config");
 
-        if (typeof ret != undefined && ret != null) {
+        if (ret !== undefined && ret != null) {
             //dateformat = ret.common.dateFormat;
             longitude = ret.common.longitude;
             latitude = ret.common.latitude;
@@ -1116,11 +1120,11 @@ function DB_Disconnect() {
 
     adapter.log.debug("disconnect database");
     if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
-        if (typeof mysql_connection != undefined && mysql_connection != null) {
+        if (mysql_connection !== undefined && mysql_connection != null) {
             mysql_connection.end();
         }
     } else {
-        if (typeof sqlite_db != undefined && sqlite_db != null) {
+        if (sqlite_db !== undefined && sqlite_db != null) {
             sqlite_db.close();
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sbfspot",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "sbfspot (SMA inverter) Adapter",
   "author": {
     "name": "René G.",
@@ -18,31 +18,31 @@
     "url": "https://github.com/rg-engineering/ioBroker.sbfspot"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "2.6.7",
-    "better-sqlite3": "8.0.1",
-    "mysql2": "3.1.0",
+    "@iobroker/adapter-core": "3.0.1",
+    "better-sqlite3": "8.5.0",
+    "mysql2": "3.5.2",
     "suncalc2": "1.8.1"
   },
   "devDependencies": {
     "@iobroker/adapter-dev": "1.2.0",
     "@iobroker/testing": "4.1.0",
-    "@types/chai": "4.3.4",
+    "@types/chai": "4.3.5",
     "@types/chai-as-promised": "7.1.5",
-    "@types/gulp": "4.0.10",
+    "@types/gulp": "4.0.13",
     "@types/mocha": "10.0.1",
-    "@types/node": "18.11.18",
+    "@types/node": "20.4.5",
     "@types/proxyquire": "1.3.28",
     "@types/request-promise-native": "1.0.18",
-    "@types/sinon": "10.0.13",
+    "@types/sinon": "10.0.15",
     "@types/sinon-chai": "3.2.9",
-    "axios": "0.27.2",
+    "axios": "1.4.0",
     "chai": "4.3.7",
     "chai-as-promised": "7.1.1",
-    "eslint": "8.31.0",
+    "eslint": "8.45.0",
     "gulp": "4.0.2",
     "mocha": "10.2.0",
     "proxyquire": "2.1.3",
-    "sinon": "15.0.1",
+    "sinon": "15.2.0",
     "sinon-chai": "3.7.0"
   },
   "main": "main.js",

package/sbfspot.njsproj

@@ -28,6 +28,8 @@
     <Compile Include="test\unit.js" />
     <Compile Include="widgets\sbfspot\lib\js\flot\jquery.flot.js" />
     <Compile Include="widgets\sbfspot\lib\js\flot\jquery.flot.time.js" />
+    <Content Include=".github\dependabot.yml" />
+    <Content Include=".github\FUNDING.yml" />
     <Content Include=".github\ISSUE_TEMPLATE\BugReport.md" />
     <Content Include=".github\ISSUE_TEMPLATE\Enhancement.md" />
     <Content Include=".github\workflows\npmpublish.yml" />
@@ -49,6 +51,9 @@
     <Content Include="docs\en\install_arm.md">
       <SubType>Code</SubType>
     </Content>
+    <Content Include="lib\SMA_Bluetooth.js">
+      <SubType>Code</SubType>
+    </Content>
     <Content Include="lib\tools.js">
       <SubType>Code</SubType>
     </Content>