iobroker.solarviewdatareader 1.0.4 → 1.0.5

package/README.md

@@ -64,6 +64,11 @@ TKK= Temperature inverter
 	Placeholder for the next version (at the beginning of the line):
 	### __WORK IN PROGRESS__
 -->
+### 1.0.5 (2022-02-17)
+* (afuerhoff) dependencies updated
+* (afuerhoff) test and release updated
+* (afuerhoff) smaller changes
+
 ### 1.0.4 (2022-02-09)
 * (afuerhoff) dependencies updated
 * (afuerhoff) issue #20 fixed
@@ -78,12 +83,6 @@ TKK= Temperature inverter
 ### 1.0.1 (2021-05-01)
 * (afuerhoff) changes due to js-controller 3.3.x
 
-### 1.0.0 (2021-04-25)
-* (afuerhoff) dependencies updated
-* (afuerhoff) documentation changed
-* (afuerhoff) minor changes
-* (afuerhoff) due to stable state version set to 1.0.0
-
 ## License
 MIT License
 

package/admin/style.css

@@ -1,13 +1,35 @@
 /* You can delete those if you want. I just found them very helpful */
 * {
-	box-sizing: border-box
+   box-sizing: border-box
 }
 .m {
-	/* Don't cut off dropdowns! */
-	overflow: initial;
+   /* Don't cut off dropdowns! */
+   overflow: initial;
+}
+.m.adapter-container {
+   /* Fix layout/scrolling issues with tabs */
+   height: 100%;
+   width: 100%;
+   position: relative;
+}
+.m .select-wrapper + label {
+   /* The positioning for dropdown labels is messed up */
+   transform: none !important;
+}
+
+label > i[title] {
+   /* Display the help cursor for the tooltip icons and fix their positioning */
+   cursor: help;
+   margin-left: 0.25em;
+}
+
+.dropdown-content {
+   /* Don't wrap text in dropdowns */
+   white-space: nowrap;
 }
 
 /* Add your styles here */
+
 /* Tooltip container */
 .tooltip {
    position: relative;

package/io-package.json

@@ -1,8 +1,20 @@
 {
   "common": {
     "name": "solarviewdatareader",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "news": {
+      "1.0.5": {
+        "en": "dependencies updated\ntest and release updated\nsmaller changes",
+        "de": "Abhängigkeiten aktualisiert\nTest und Release aktualisiert\nkleinere Änderungen",
+        "ru": "зависимости обновлены\nтест и выпуск обновлены\nнебольшие изменения",
+        "pt": "dependências atualizadas\nteste e lançamento atualizado\nmudanças menores",
+        "nl": "afhankelijkheden bijgewerkt\ntest en release bijgewerkt\nkleinere veranderingen",
+        "fr": "dépendances mises à jour\ntest et version mis à jour\npetits changements",
+        "it": "dipendenze aggiornate\ntest e rilascio aggiornati\npiccoli cambiamenti",
+        "es": "dependencias actualizadas\nprueba y versión actualizada\npequeños cambios",
+        "pl": "zaktualizowano zależności\nzaktualizowano test i wydanie\nmniejsze zmiany",
+        "zh-cn": "已更新依赖项\n测试和发布更新\n较小的变化"
+      },
       "1.0.4": {
         "en": "dependencies updated\nissue #20 fixed",
         "de": "Abhängigkeiten aktualisiert\nProblem Nr. 20 behoben",
@@ -74,18 +86,6 @@
         "es": "medidor de autoconsumo optimizado",
         "pl": "miernik zużycia własnego zoptymalizowany",
         "zh-cn": "自耗表优化"
-      },
-      "0.2.0": {
-        "en": "Error handling optimized, self consumption meter implemented",
-        "de": "Fehlerbehandlung optimiert, Eigenverbrauchsmesser implementiert",
-        "ru": "Оптимизирована обработка ошибок, реализован счетчик собственного потребления",
-        "pt": "Tratamento de erros otimizado, medidor de autoconsumo implementado",
-        "nl": "Foutafhandeling geoptimaliseerd, eigen verbruiksmeter geïmplementeerd",
-        "fr": "Gestion des erreurs optimisée, compteur d'autoconsommation mis en œuvre",
-        "it": "Gestione degli errori ottimizzata, misuratore di autoconsumo implementato",
-        "es": "Manejo de errores optimizado, medidor de autoconsumo implementado",
-        "pl": "Zoptymalizowana obsługa błędów, zaimplementowano miernik zużycia własnego",
-        "zh-cn": "优化错误处理，实施自耗电表"
       }
     },
     "title": "SolarViewDataReader",

package/main.js

@@ -554,7 +554,7 @@ class Solarviewdatareader extends utils.Adapter {
 }
 
 // @ts-ignore parent is a valid property on module
-if (module.parent) {
+if (require.main !== module) {
     // Export the constructor in compact mode
     /**
 	 * @param {Partial<ioBroker.AdapterOptions>} [options={}]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.solarviewdatareader",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Get data from SolarView",
   "author": {
     "name": "Achim Fürhoff",
@@ -24,30 +24,36 @@
     "@alcalzone/release-script": "^3.5.2",
     "@alcalzone/release-script-plugin-iobroker": "^3.5.1",
     "@alcalzone/release-script-plugin-license": "^3.5.0",
+    "@iobroker/adapter-dev": "^0.1.0",
     "@iobroker/testing": "^2.5.4",
     "@types/chai": "^4.3.0",
-    "@types/chai-as-promised": "^7.1.4",
+    "@types/chai-as-promised": "^7.1.5",
     "@types/gulp": "^4.0.9",
-    "@types/mocha": "^8.2.3",
-    "@types/node": "^14.18.0",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^17.0.18",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.6",
+    "@types/sinon": "^10.0.11",
     "@types/sinon-chai": "^3.2.8",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^7.32.0",
-    "gulp": "^4.0.2",
+    "eslint": "^8.9.0",
     "hosted-git-info": "^4.1.0",
-    "mocha": "^8.4.0",
+    "mocha": "^9.2.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^10.0.0",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0"
   },
   "main": "main.js",
+  "files": [
+    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*).json",
+    "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
+    "lib/",
+    "www/",
+    "io-package.json",
+    "LICENSE",
+    "main.js"
+  ],
   "scripts": {
-    "watch:parcel": "parcel admin/src/index.jsx -d admin/build",
-    "build:parcel": "parcel build admin/src/index.jsx -d admin/build",
-    "build": "npm run build:parcel",
     "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
@@ -56,7 +62,8 @@
     "aftest": "mocha test/af_test.js --exit",
     "check": "tsc --noEmit -p tsconfig.check.json",
     "lint": "eslint --ext .js,.jsx",
-    "release": "release-script"
+    "release": "release-script",
+    "translate": "translate-adapter"
   },
   "bugs": {
     "url": "https://github.com/afuerhoff/ioBroker.solarviewdatareader/issues"

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Something is not working as it should
-title: ''
-labels: ''
-assignees: ''
----
-
-**Describe the bug**  
-A clear and concise description of what the bug is.
-
-**To Reproduce**  
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '...'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**  
-A clear and concise description of what you expected to happen.
-
-**Screenshots & Logfiles**  
-If applicable, add screenshots and logfiles to help explain your problem.
-
-**Versions:**  
- - Adapter version: <adapter-version>
- - JS-Controller version: <js-controller-version> <!-- determine this with `iobroker -v` on the console -->
- - Node version: <node-version> <!-- determine this with `node -v` on the console -->
- - Operating system: <os-name>
-
-**Additional context**  
-Add any other context about the problem here.

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

@@ -1,155 +0,0 @@
-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: {}
-
-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: [14.x]
-
-        steps:
-            - name: Checkout code
-              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: [12.x, 14.x, 16.x]
-                os: [ubuntu-latest, windows-latest, macos-latest]
-
-        steps:
-            - name: Checkout code
-              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 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
-        strategy:
-            matrix:
-                node-version: [14.x]
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v2
-
-            - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@v1
-              with:
-                  node-version: ${{ matrix.node-version }}
-
-            - name: Extract the version and commit body from the tag
-              id: extract_release
-              # The body may be multiline, therefore newlines and % need to be escaped
-              run: |
-                  VERSION="${{ github.ref }}"
-                  VERSION=${VERSION##*/v}
-                  echo "::set-output name=VERSION::$VERSION"
-                  BODY=$(git show -s --format=%b)
-                  BODY="${BODY//'%'/'%25'}"
-                  BODY="${BODY//$'\n'/'%0A'}"
-                  BODY="${BODY//$'\r'/'%0D'}"
-                  echo "::set-output name=BODY::$BODY"
-
-            - name: Publish package to npm
-              run: |
-                  npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
-                  npm whoami
-                  npm publish
-
-            - name: Create Github Release
-              uses: actions/create-release@v1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              with:
-                  tag_name: ${{ github.ref }}
-                  release_name: Release v${{ steps.extract_release.outputs.VERSION }}
-                  draft: false
-                  # Prerelease versions create prereleases on Github
-                  prerelease: ${{ contains(steps.extract_release.outputs.VERSION, '-') }}
-                  body: ${{ steps.extract_release.outputs.BODY }}
-
-#            # When using Sentry for error reporting, Sentry could 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:
-#            #- name: Notify Sentry.io about the release
-#            #  run: |
-#            #      npm i -g @sentry/cli
-#            #      export SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-#            #      export SENTRY_URL=https://sentry.iobroker.net
-#            #      export SENTRY_ORG=iobroker
-#            #      export SENTRY_PROJECT=iobroker-fb-checkpresence
-#            #      export SENTRY_VERSION=iobroker.fb-checkpresence@${{ steps.extract_release.outputs.VERSION }}
-#            #      sentry-cli releases new $SENTRY_VERSION
-#            #      sentry-cli releases finalize $SENTRY_VERSION
-#            #      # Add the following line BEFORE finalize if repositories are connected in Sentry
-#            #      #sentry-cli releases set-commits $SENTRY_VERSION --auto
-#            #      # Add the following line BEFORE finalize if sourcemap uploads are needed
-#            #      #sentry-cli releases files $SENTRY_VERSION upload-sourcemaps build/

package/.releaseconfig.json

@@ -1,10 +0,0 @@
-{
-	"dry": false,
-    "addPlaceholder": true,
-	"verbose": true,
-	"all": false,
-	"plugins": ["iobroker", "license"],
-	"exec": {
-		"before_commit": "echo Hello World!"
-	}
-}

package/CHANGELOG_OLD.md

@@ -1,24 +0,0 @@
-# Older changes
-## 0.2.1
-* (afuerhoff) self consumption meter optimized
-
-## 0.2.0
-* (afuerhoff) Error handling optimized, self consumption meter implemented
-
-## 0.1.0
-* (afuerhoff) optimizations for adding to latest repository
-
-## 0.0.5
-* (afuerhoff) Code optimized, unload optimized, documentation added
-
-## 0.0.4
-* (afuerhoff) Objects, Telnet client and checksum calculation changed
-
-## 0.0.3
-* (afuerhoff) inverter selection added
-
-## 0.0.2
-* (afuerhoff) test version
-
-## 0.0.1
-* (afuerhoff) initial release

package/admin/admin.d.ts

@@ -1 +0,0 @@
-declare let systemDictionary: Record<string, Record<string, string>>;

package/main.test.js

@@ -1,30 +0,0 @@
-"use strict";
-
-/**
- * This is a dummy TypeScript test file using chai and mocha
- *
- * It's automatically excluded from npm and its build output is excluded from both git and npm.
- * It is advised to test all your modules with accompanying *.test.js-files
- */
-
-// tslint:disable:no-unused-expression
-
-const { expect } = require("chai");
-// import { functionToTest } from "./moduleToTest";
-
-describe("module to test => function to test", () => {
-	// initializing logic
-	const expected = 5;
-
-	it(`should return ${expected}`, () => {
-		const result = 5;
-		// assign result a value from functionToTest
-		expect(result).to.equal(expected);
-		// or using the should() syntax
-		result.should.equal(expected);
-	});
-	// ... more tests => it
-
-});
-
-// ... more test suites => describe

package/scripts/gulp.sh

@@ -1,3 +0,0 @@
-pwd
-#cd /opt/iobroker/node_modules/iobroker.fb-checkpresence/
-gulp translateAndUpdateWordsJS

package/scripts/upload.sh

@@ -1 +0,0 @@
-/opt/iobroker/iobroker upload solarviewdatareader