luneski/mqtt-explorer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix certificate selection

Browse Source
This commit is contained in:
Thomas Nordquist
2022-02-27 13:33:22 +01:00
parent e4add31793
commit 13b8f8d5da
42 changed files with 23477 additions and 5471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/index.html
View File

@@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" /> <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" />
<title>MQTT Explorer</title> <title>MQTT Explorer</title>
@@ -21,12 +22,15 @@
0% { 0% {
background-color: none; background-color: none;
} }
25% { 25% {
background-color: #595585; background-color: #595585;
} }
50% { 50% {
background-color: #595585; background-color: #595585;
} }
100% { 100% {
background-color: none; background-color: none;
} }
@@ -37,12 +41,15 @@
background-color: none; background-color: none;
color: inherit; color: inherit;
} }
25% { 25% {
background-color: #c0c8c0; background-color: #c0c8c0;
} }
50% { 50% {
background-color: #c0c8c0; background-color: #c0c8c0;
} }
100% { 100% {
background-color: none; background-color: none;
color: inherit; color: inherit;
@@ -139,6 +146,7 @@
.Resizer.disabled { .Resizer.disabled {
cursor: not-allowed; cursor: not-allowed;
} }
.Resizer.disabled:hover { .Resizer.disabled:hover {
border-color: transparent; border-color: transparent;
} }
@@ -146,20 +154,27 @@
.example-enter { .example-enter {
opacity: 0; opacity: 0;
} }
.example-enter-active { .example-enter-active {
opacity: 1; opacity: 1;
transition: opacity 300ms ease-in; transition: opacity 300ms ease-in;
} }
.example-exit { .example-exit {
opacity: 1; opacity: 1;
} }
.example-exit-active { .example-exit-active {
opacity: 0; opacity: 0;
transition: opacity 300ms ease-in; transition: opacity 300ms ease-in;
} }
</style> </style>
</head> <script>
<body> global = globalThis //<- this should be enough
</script>
</head>
<body>
<div id="app" style="font: -webkit-control;"></div> <div id="app" style="font: -webkit-control;"></div>
<script> <script>
function loadScript(path) { function loadScript(path) {
@@ -177,5 +192,6 @@
<% _.forEach(htmlWebpackPlugin.files.js, function(file) { %> <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %>
<script src="<%- file %>"></script> <script src="<%- file %>"></script>
<% }); %> <% }); %>
</body> </body>
</html> </html>

30
app/package.json
View File

@@ -13,20 +13,19 @@
"author": "", "author": "",
"license": "CC-BY-ND-4.0", "license": "CC-BY-ND-4.0",
"dependencies": { "dependencies": {
"@material-ui/core": "^4", "@material-ui/core": "4.12",
"@material-ui/icons": "^4", "@material-ui/icons": "^4",
"@material-ui/lab": "^4.0.0-alpha", "@material-ui/lab": "^4.0.0-alpha",
"@material-ui/styles": "^4", "@material-ui/styles": "4.11",
"@types/react-transition-group": "^4", "@types/react-transition-group": "^4",
"ace-builds": "^1.4.11", "ace-builds": "^1.4.11",
"axios": "^0.19.0", "axios": "^0.26.0",
"compare-versions": "^3.5.0", "compare-versions": "^3.5.0",
"copy-text-to-clipboard": "^2.1.0", "copy-text-to-clipboard": "^2.1.0",
"d3": "^5.9.7", "d3": "^5.9.7",
"d3-shape": "^1.3.5", "d3-shape": "^1.3.5",
"diff": "^4.0.1", "diff": "^4.0.1",
"dot-prop": "^5.0.0", "dot-prop": "^5.0.0",
"electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist",
"file-loader": "6", "file-loader": "6",
"get-value": "^3.0.1", "get-value": "^3.0.1",
"immutable": "^4.0.0-rc.12", "immutable": "^4.0.0-rc.12",
@@ -35,7 +34,6 @@
"json-to-ast": "^2.1.0", "json-to-ast": "^2.1.0",
"lodash.debounce": "^4.0.8", "lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.1.1", "lodash.throttle": "^4.1.1",
"moment": "^2.24.0",
"moving-average": "^1.0.0", "moving-average": "^1.0.0",
"number-abbreviate": "^2.0.0", "number-abbreviate": "^2.0.0",
"parse-duration": "^0.1.1", "parse-duration": "^0.1.1",
@@ -56,6 +54,7 @@
"uuid": "7" "uuid": "7"
}, },
"devDependencies": { "devDependencies": {
"@babel/runtime": "^7.17.2",
"@types/d3": "^5.7.2", "@types/d3": "^5.7.2",
"@types/diff": "^4.0.1", "@types/diff": "^4.0.1",
"@types/get-value": "^3.0.1", "@types/get-value": "^3.0.1",
@@ -69,24 +68,25 @@
"@types/socket.io-client": "^1.4.32", "@types/socket.io-client": "^1.4.32",
"@types/uuid": "^7.0.2", "@types/uuid": "^7.0.2",
"@types/vis": "^4.21.9", "@types/vis": "^4.21.9",
"awesome-typescript-loader": "^5.2.1",
"chai": "^4.2.0", "chai": "^4.2.0",
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"css-loader": "^3.0.0", "css-loader": "^3.0.0",
"hard-source-webpack-plugin": "^0.13.1",
"heapdump": "^0.3.12", "heapdump": "^0.3.12",
"html-webpack-plugin": "^4.0.0-beta.5", "html-webpack-plugin": "^5.5.0",
"mocha": "^7.1.1", "lodash": "^4.17.21",
"mocha": "^9.2.1",
"moment": "^2.29.1",
"node-loader": "^0.6.0", "node-loader": "^0.6.0",
"source-map-loader": "^0.2.4", "source-map-loader": "^0.2.4",
"style-loader": "^1", "style-loader": "^1",
"typescript": "^3.6.3", "ts-loader": "^9.2.6",
"webpack": "^4.28.2", "typescript": "^4.5.5",
"webpack-bundle-analyzer": "^3.0.3", "webpack": "^5.69.1",
"webpack-cli": "^3.3.6", "webpack-bundle-analyzer": "^4.5.0",
"webpack-dev-server": "^3.1.14" "webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.7.4"
}, },
"peerDependencies": { "peerDependencies": {
"electron": "^5.0.5" "electron": "^17"
} }
} }

24
app/src/actions/ConnectionManager.ts
View File

@@ -9,12 +9,14 @@ import {
import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage' import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
import { Dispatch } from 'redux' import { Dispatch } from 'redux'
import { showError } from './Global' import { showError } from './Global'
import { remote } from 'electron' import * as electron from 'electron'
import { promises as fsPromise } from 'fs' import { promises as fsPromise } from 'fs'
import * as path from 'path' import * as path from 'path'
import { ActionTypes, Action } from '../reducers/ConnectionManager' import { ActionTypes, Action } from '../reducers/ConnectionManager'
import { Subscription } from '../../../backend/src/DataSource/MqttSource' import { Subscription } from '../../../backend/src/DataSource/MqttSource'
import { connectionsMigrator } from './migrations/Connection' import { connectionsMigrator } from './migrations/Connection'
import { EventDispatcher, openDialogResponse, OpenDialogResponse, rendererEvents, requestOpenDialog } from '../../../events'
import { v4 } from 'uuid'
export interface ConnectionDictionary { export interface ConnectionDictionary {
[s: string]: ConnectionOptions [s: string]: ConnectionOptions
@@ -72,10 +74,28 @@ async function openCertificate(): Promise<CertificateParameters> {
certificateSizeDoesNotMatch: 'Certificate size larger/smaller then expected.', certificateSizeDoesNotMatch: 'Certificate size larger/smaller then expected.',
} }
const openDialogReturnValue = await remote.dialog.showOpenDialog(remote.getCurrentWindow(), { let requestId = v4();
const response = new Promise<OpenDialogResponse>((resolve, reject) => {
let callback = (result: OpenDialogResponse) => {
rendererEvents.unsubscribe(openDialogResponse(), callback)
if (result.identifier == requestId) {
resolve(result)
} else {
reject(new Error("Unexpected file select"))
}
}
rendererEvents.subscribe(openDialogResponse(), callback)
})
rendererEvents.emit(requestOpenDialog(), {
identifier: requestId,
options: {
properties: ['openFile'], properties: ['openFile'],
securityScopedBookmarks: true, securityScopedBookmarks: true,
}
}) })
const openDialogReturnValue = (await response).result;
const selectedFile = openDialogReturnValue.filePaths && openDialogReturnValue.filePaths[0] const selectedFile = openDialogReturnValue.filePaths && openDialogReturnValue.filePaths[0]
if (!selectedFile) { if (!selectedFile) {

2
app/src/actions/Global.ts
View File

@@ -1,7 +1,7 @@
import { ActionTypes, ConfirmationRequest } from '../reducers/Global' import { ActionTypes, ConfirmationRequest } from '../reducers/Global'
import { Dispatch } from 'redux' import { Dispatch } from 'redux'
export const showError = (error?: string) => ({ export const showError = (error?: string | unknown) => ({
error, error,
type: ActionTypes.showError, type: ActionTypes.showError,
}) })

6
app/src/components/App.tsx
View File

@@ -13,6 +13,8 @@ import { connect } from 'react-redux'
import { globalActions, settingsActions } from '../actions' import { globalActions, settingsActions } from '../actions'
import { Theme, withStyles } from '@material-ui/core/styles' import { Theme, withStyles } from '@material-ui/core/styles'
(window as any).global = window
const Settings = React.lazy(() => import('./SettingsDrawer/Settings')) const Settings = React.lazy(() => import('./SettingsDrawer/Settings'))
const ContentView = React.lazy(() => import('./Layout/ContentView')) const ContentView = React.lazy(() => import('./Layout/ContentView'))
@@ -66,6 +68,8 @@ class App extends React.PureComponent<Props, {}> {
return null return null
} }
const anyProps: any = {};
return ( return (
<div className={centerContent}> <div className={centerContent}>
<CssBaseline /> <CssBaseline />
@@ -73,7 +77,7 @@ class App extends React.PureComponent<Props, {}> {
<ConfirmationDialog confirmationRequests={this.props.confirmationRequests} /> <ConfirmationDialog confirmationRequests={this.props.confirmationRequests} />
{this.renderNotification()} {this.renderNotification()}
<React.Suspense fallback={<div></div>}> <React.Suspense fallback={<div></div>}>
<Settings /> <Settings {...anyProps} />
</React.Suspense> </React.Suspense>
<div className={centerContent}> <div className={centerContent}>
<div className={`${settingsVisible ? contentShift : content}`}> <div className={`${settingsVisible ? contentShift : content}`}>

6
app/src/components/Demo/Mouse.tsx
View File

@@ -1,6 +1,6 @@
import * as React from 'react' import * as React from 'react'
import { Theme, withStyles } from '@material-ui/core' import { Theme, withStyles } from '@material-ui/core'
import cursor from './cursor.png' const cursor = require('./cursor.png')
interface State { interface State {
enabled: boolean enabled: boolean
@@ -43,10 +43,10 @@ class Demo extends React.Component<{ classes: any }, State> {
} }
public componentDidMount() { public componentDidMount() {
;(window as any).demo.enableMouse = () => { ; (window as any).demo.enableMouse = () => {
this.setState({ enabled: true }) this.setState({ enabled: true })
} }
;(window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => { ; (window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => {
const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval) const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval)
const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval) const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval)
this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } }) this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } })

4
app/src/components/Demo/index.tsx
View File

@@ -5,14 +5,14 @@ let heapdump: any
function writeHeapdump(path?: string) { function writeHeapdump(path?: string) {
if (!heapdump) { if (!heapdump) {
heapdump = require('heapdump') //heapdump = require('heapdump')
} }
heapdump.writeSnapshot(path || `${Date.now()}.heapsnapshot`) heapdump.writeSnapshot(path || `${Date.now()}.heapsnapshot`)
return path return path
} }
;(window as any).demo = { ; (window as any).demo = {
writeHeapdump, writeHeapdump,
} }

3
app/src/components/ErrorBoundary.tsx
View File

@@ -2,7 +2,6 @@ import * as React from 'react'
import PersistentStorage from '../utils/PersistentStorage' import PersistentStorage from '../utils/PersistentStorage'
import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied' import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
import Warning from '@material-ui/icons/Warning' import Warning from '@material-ui/icons/Warning'
import { electronRendererTelemetry } from 'electron-telemetry'
import { Theme, withStyles } from '@material-ui/core/styles' import { Theme, withStyles } from '@material-ui/core/styles'
import { Button, Modal, Paper, Toolbar, Typography } from '@material-ui/core' import { Button, Modal, Paper, Toolbar, Typography } from '@material-ui/core'
@@ -33,7 +32,7 @@ class ErrorBoundary extends React.PureComponent<Props, State> {
} }
public componentDidCatch(error: Error, errorInfo: any) { public componentDidCatch(error: Error, errorInfo: any) {
electronRendererTelemetry.trackError(error) // electronRendererTelemetry.trackError(error)
console.log('did catch', error) console.log('did catch', error)
} }

4
app/src/components/SettingsDrawer/TimeLocale.tsx
View File

@@ -3,10 +3,10 @@ import DateFormatter from '../helper/DateFormatter'
import { AppState } from '../../reducers' import { AppState } from '../../reducers'
import { bindActionCreators } from 'redux' import { bindActionCreators } from 'redux'
import { connect } from 'react-redux' import { connect } from 'react-redux'
import { Input, InputLabel, MenuItem, Select, StyleRulesCallback, Theme } from '@material-ui/core' import { Input, InputLabel, MenuItem, Select, Theme } from '@material-ui/core'
import { settingsActions } from '../../actions' import { settingsActions } from '../../actions'
import { withStyles } from '@material-ui/styles' import { withStyles } from '@material-ui/styles'
const moment = require('moment/min/moment-with-locales') const moment = require('moment')
interface Props { interface Props {
actions: { actions: {

2
app/src/components/Sidebar/Publish/Publish.tsx
View File

@@ -122,7 +122,7 @@ const EditorMode = memo(function EditorMode(props: {
const str = JSON.stringify(JSON.parse(props.payload), undefined, ' ') const str = JSON.stringify(JSON.parse(props.payload), undefined, ' ')
updatePayload(str) updatePayload(str)
} catch (error) { } catch (error) {
props.globalActions.showError(`Format error: ${error.message}`) props.globalActions.showError(`Format error: ${(error as Error)?.message}`)
} }
} }
}, [props.payload]) }, [props.payload])

2
app/src/components/UpdateNotifier.tsx
View File

@@ -50,7 +50,7 @@ class UpdateNotifier extends React.PureComponent<Props, State> {
super(props) super(props)
this.state = { newerVersions: [] } this.state = { newerVersions: [] }
const ownVersion = electron.remote.app.getVersion() const ownVersion = electron.app.getVersion()
this.fetchReleases().then(releases => { this.fetchReleases().then(releases => {
const newerVersions = releases const newerVersions = releases
.filter(release => this.allowPrereleaseIfOwnVersionIsBeta(release, ownVersion)) .filter(release => this.allowPrereleaseIfOwnVersionIsBeta(release, ownVersion))

6
app/src/utils/bugtracking.ts
View File

@@ -1,4 +1,4 @@
import { electronRendererTelemetry } from 'electron-telemetry' // import { electronRendererTelemetry } from 'electron-telemetry'
const telemetry = electronRendererTelemetry // const telemetry = electronRendererTelemetry
electronRendererTelemetry.registerErrorHandler() // electronRendererTelemetry.registerErrorHandler()

4
app/src/utils/tracking.ts
View File

@@ -1,4 +1,4 @@
import { electronRendererTelemetry } from 'electron-telemetry' // import { electronRendererTelemetry } from 'electron-telemetry'
// Used to determine long-time-stability and memory leaks // Used to determine long-time-stability and memory leaks
function trackProcessStatistics() { function trackProcessStatistics() {
@@ -30,6 +30,6 @@ export function trackEvent(name: string) {
} }
const blacklist = ['CONNECTION_SET_HEALTH'] const blacklist = ['CONNECTION_SET_HEALTH']
if (blacklist.indexOf(name) === -1) { if (blacklist.indexOf(name) === -1) {
electronRendererTelemetry.trackEvent(name) // electronRendererTelemetry.trackEvent(name)
} }
} }

21
app/tsconfig.json
View File

@@ -4,18 +4,29 @@
"noImplicitAny": true, "noImplicitAny": true,
"strictNullChecks": true, "strictNullChecks": true,
"strict": true, "strict": true,
"lib": ["es2017", "dom"], "lib": [
"es2017",
"dom"
],
"moduleResolution": "node", "moduleResolution": "node",
"outDir": "./build/", "outDir": "./build/",
"sourceMap": true, "sourceMap": true,
"module": "esnext", "module": "esnext",
"target": "es2017", "target": "es2017",
"jsx": "react", "jsx": "react",
"types": ["react"], "types": [
"allowSyntheticDefaultImports": true "react"
],
"allowSyntheticDefaultImports": true,
"skipLibCheck": true
}, },
"include": ["./src/**/*"], "include": [
"exclude": ["**/*.d.ts", ".src/**/*.png"], "./src/**/*"
],
"exclude": [
"**/*.d.ts",
".src/**/*.png"
],
"awesomeTypescriptLoaderOptions": { "awesomeTypescriptLoaderOptions": {
"useCache": true, "useCache": true,
"transpileModule": true, "transpileModule": true,

2
backend/src/DataSource/MqttSource.ts
View File

@@ -43,7 +43,7 @@ export class MqttSource implements DataSource<MqttOptions> {
try { try {
url = Url.parse(urlStr) url = Url.parse(urlStr)
} catch (error) { } catch (error) {
this.stateMachine.setError(error) this.stateMachine.setError(error as Error)
throw error throw error
} }

6
backend/tsconfig.json
View File

@@ -1,11 +1,15 @@
{ {
"compileOnSave": true, "compileOnSave": true,
"compilerOptions": { "compilerOptions": {
"skipLibCheck": true,
"noImplicitAny": true, "noImplicitAny": true,
"strictNullChecks": true, "strictNullChecks": true,
"outDir": "./build", "outDir": "./build",
"strict": true, "strict": true,
"lib": ["es2017", "dom"], "lib": [
"es2017",
"dom"
],
"sourceMap": true "sourceMap": true
}, },
"includes": [ "includes": [

26
events/Events.ts
View File

@@ -1,8 +1,9 @@
import { Base64Message } from '../backend/src/Model/Base64Message' import { Base64Message } from '../backend/src/Model/Base64Message'
import { DataSourceState, MqttOptions } from '../backend/src/DataSource' import { DataSourceState, MqttOptions } from '../backend/src/DataSource'
import { UpdateInfo } from 'builder-util-runtime' import { UpdateInfo } from 'builder-util-runtime'
import { OpenDialogOptions, OpenDialogReturnValue } from 'electron'
export interface Event<MessageType> { export type Event<MessageType> = {
topic: string topic: string
} }
@@ -49,3 +50,26 @@ export function makeConnectionMessageEvent(connectionId: string): Event<MqttMess
topic: `conn/${connectionId}`, topic: `conn/${connectionId}`,
} }
} }
export interface OpenDialogRequest {
identifier: string
options: OpenDialogOptions
}
export function requestOpenDialog(): Event<OpenDialogRequest> {
return {
topic: `requestOpenDialog`,
}
}
export interface OpenDialogResponse {
identifier: string
result: OpenDialogReturnValue
}
export function openDialogResponse(): Event<OpenDialogResponse> {
return {
topic: `openDialogResponse`,
}
}

17827
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
package.json
View File

@@ -79,12 +79,12 @@
"@types/node": "^12.6.8", "@types/node": "^12.6.8",
"@types/semver": "7", "@types/semver": "7",
"@types/sha1": "^1.1.1", "@types/sha1": "^1.1.1",
"builder-util-runtime": "^8.2.5", "builder-util-runtime": "^9",
"chai": "^4.2.0", "chai": "^4.2.0",
"cspell": "^4.0.28", "cspell": "^4.0.28",
"electron": "8.2.3", "electron": "17",
"electron-builder": "22.5.1", "electron-builder": "22",
"electron-notarize": "^0.3.0", "electron-notarize": "^1.1.1",
"mocha": "7.1", "mocha": "7.1",
"mustache": "4", "mustache": "4",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
@@ -92,23 +92,17 @@
"prettier": "2", "prettier": "2",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",
"source-map-support": "^0.5.9", "source-map-support": "^0.5.9",
"spectron": "10", "spectron": "19",
"ts-node": "^8.2.0", "ts-node": "^10.5.0",
"tslint": "6", "typescript": "^4.5.5",
"tslint-config-airbnb": "^5.11.1", "webdriverio": "7.16"
"tslint-react": "^4.0.0",
"tslint-react-recommended": "^1.0.15",
"tslint-strict-null-checks": "^1.0.1",
"typescript": "^3.2.2",
"webdriverio": "6"
}, },
"dependencies": { "dependencies": {
"about-window": "^1.12.1", "about-window": "^1.12.1",
"axios": "^0.19.0", "axios": "^0.19.0",
"dot-prop": "^5.0.0", "dot-prop": "^5.0.0",
"electron-log": "4.1.1", "electron-log": "4.4.6",
"electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist", "electron-updater": "^4.6",
"electron-updater": "^4.0.6",
"fs-extra": "9", "fs-extra": "9",
"js-base64": "^2.5.1", "js-base64": "^2.5.1",
"json-to-ast": "^2.1.0", "json-to-ast": "^2.1.0",
@@ -117,6 +111,5 @@
"mqtt": "^3.0.0", "mqtt": "^3.0.0",
"sha1": "^1.1.1", "sha1": "^1.1.1",
"yarn-run-all": "^3.1.1" "yarn-run-all": "^3.1.1"
}, }
"optionalDependencies": {}
} }

4
scripts/uploadVideoAsset.ts
View File

@@ -53,12 +53,12 @@ async function uploadAsset() {
try { try {
uploadUrl = await createDraft(tag) uploadUrl = await createDraft(tag)
} catch (error) { } catch (error) {
console.error('failed to create draft', error.stack) console.error('failed to create draft', (error as Error).stack)
process.exit(1) process.exit(1)
} }
} }
} catch (error) { } catch (error) {
console.error('failed to find tag release', error.stack) console.error('failed to find tag release', (error as Error).stack)
process.exit(1) process.exit(1)
} }

2
scripts/util.ts
View File

@@ -23,7 +23,7 @@ function redirectOutputFor(child: ChildProcess) {
} }
async function waitFor(child: ChildProcess) { async function waitFor(child: ChildProcess) {
return new Promise(resolve => { return new Promise<void>(resolve => {
child.once('close', () => resolve()) child.once('close', () => resolve())
}) })
} }

4
src/autoUpdater.ts
View File

@@ -1,7 +1,7 @@
import { autoUpdater, UpdateInfo } from 'electron-updater' import { autoUpdater, UpdateInfo } from 'electron-updater'
import { BuildInfo } from 'electron-telemetry/build/Model' // import { BuildInfo } from 'electron-telemetry/build/Model'
export function shouldAutoUpdate(build: BuildInfo) { export function shouldAutoUpdate(build: any) {
return ( return (
build.package !== 'portable' && build.package !== 'portable' &&
build.package !== 'appx' && build.package !== 'appx' &&

4
src/buildOptions.ts
View File

@@ -1,8 +1,8 @@
import * as fs from 'fs' import * as fs from 'fs'
import * as path from 'path' import * as path from 'path'
import { BuildInfo } from 'electron-telemetry/build/Model' // import { BuildInfo } from 'electron-telemetry/build/Model'
let buildOptions: BuildInfo = { let buildOptions: any = {
platform: process.platform, platform: process.platform,
package: 'unpacked', package: 'unpacked',
} as any } as any

21
src/electron.ts
View File

@@ -1,23 +1,34 @@
import * as log from 'electron-log' import * as log from 'electron-log'
import * as path from 'path' import * as path from 'path'
import ConfigStorage from '../backend/src/ConfigStorage' import ConfigStorage from '../backend/src/ConfigStorage'
import { app, BrowserWindow, Menu } from 'electron' import { ipcMain, app, BrowserWindow, Menu, dialog } from 'electron'
import { autoUpdater } from 'electron-updater' import { autoUpdater } from 'electron-updater'
import { ConnectionManager } from '../backend/src/index' import { ConnectionManager } from '../backend/src/index'
import { electronTelemetryFactory } from 'electron-telemetry' // import { electronTelemetryFactory } from 'electron-telemetry'
import { menuTemplate } from './MenuTemplate' import { menuTemplate } from './MenuTemplate'
import buildOptions from './buildOptions' import buildOptions from './buildOptions'
import { waitForDevServer, isDev, runningUiTestOnCi, loadDevTools } from './development' import { waitForDevServer, isDev, runningUiTestOnCi, loadDevTools } from './development'
import { shouldAutoUpdate, handleAutoUpdate } from './autoUpdater' import { shouldAutoUpdate, handleAutoUpdate } from './autoUpdater'
import { registerCrashReporter } from './registerCrashReporter' import { registerCrashReporter } from './registerCrashReporter'
import { backendEvents, EventDispatcher, OpenDialogRequest, openDialogResponse, OpenDialogResponse, requestOpenDialog } from '../events'
registerCrashReporter() registerCrashReporter()
if (!isDev() && !runningUiTestOnCi()) { // if (!isDev() && !runningUiTestOnCi()) {
const electronTelemetry = electronTelemetryFactory('9b0c8ca04a361eb8160d98c5', buildOptions) // const electronTelemetry = electronTelemetryFactory('9b0c8ca04a361eb8160d98c5', buildOptions)
} // }
app.commandLine.appendSwitch('--no-sandbox') app.commandLine.appendSwitch('--no-sandbox')
app.whenReady().then(() => {
backendEvents.subscribe(requestOpenDialog(), async (request) => {
let result = await dialog.showOpenDialog(BrowserWindow.getFocusedWindow() ?? BrowserWindow.getAllWindows()[0], request.options)
backendEvents.emit(openDialogResponse(), {
identifier: request.identifier,
result: result
})
})
})
autoUpdater.logger = log autoUpdater.logger = log
log.info('App starting...') log.info('App starting...')

2
src/spec/scenarios/clearOldTopics.ts
View File

@@ -1,7 +1,7 @@
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
import { clickOn, expandTopic, moveToCenterOfElement, sleep, writeText } from '../util' import { clickOn, expandTopic, moveToCenterOfElement, sleep, writeText } from '../util'
export async function clearOldTopics(browser: Browser) { export async function clearOldTopics(browser: Browser<'async'>) {
const topics = ['hello', 'test 123'] const topics = ['hello', 'test 123']
for (const topic of topics) { for (const topic of topics) {
await expandTopic(topic, browser) await expandTopic(topic, browser)

2
src/spec/scenarios/connect.ts
View File

@@ -1,7 +1,7 @@
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
import { clickOn, setTextInInput } from '../util' import { clickOn, setTextInInput } from '../util'
export async function connectTo(host: string, browser: Browser) { export async function connectTo(host: string, browser: Browser<'async'>) {
await setTextInInput('Host', host, browser) await setTextInInput('Host', host, browser)
await browser.saveScreenshot('screen1.png') await browser.saveScreenshot('screen1.png')

2
src/spec/scenarios/copyTopicToClipboard.ts
View File

@@ -1,7 +1,7 @@
import { Browser } from 'webdriverio' import { Browser } from 'webdriverio'
import { clickOn } from '../util' import { clickOn } from '../util'
export async function copyTopicToClipboard(browser: Browser) { export async function copyTopicToClipboard(browser: Browser<'async'>) {
const copyButton = await browser.$('//span[contains(text(), "Topic")]//button') const copyButton = await browser.$('//span[contains(text(), "Topic")]//button')
await clickOn(copyButton, browser, 1) await clickOn(copyButton, browser, 1)
} }

2
src/spec/scenarios/copyValueToClipboard.ts
View File

@@ -1,7 +1,7 @@
import { Browser } from 'webdriverio' import { Browser } from 'webdriverio'
import { clickOn } from '../util' import { clickOn } from '../util'
export async function copyValueToClipboard(browser: Browser) { export async function copyValueToClipboard(browser: Browser<'async'>) {
const copyButton = await browser.$('//span[contains(text(), "Value")]//button') const copyButton = await browser.$('//span[contains(text(), "Value")]//button')
await clickOn(copyButton, browser, 1) await clickOn(copyButton, browser, 1)
} }

2
src/spec/scenarios/disconnect.ts
View File

@@ -1,7 +1,7 @@
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
import { clickOn } from '../util' import { clickOn } from '../util'
export async function disconnect(browser: Browser) { export async function disconnect(browser: Browser<'async'>) {
const disconnectButton = await browser.$('//button/span[contains(text(),"Disconnect")]') const disconnectButton = await browser.$('//button/span[contains(text(),"Disconnect")]')
await clickOn(disconnectButton, browser) await clickOn(disconnectButton, browser)
} }

2
src/spec/scenarios/publishTopic.ts
View File

@@ -9,7 +9,7 @@ import {
showText, showText,
} from '../util' } from '../util'
export async function publishTopic(browser: Browser) { export async function publishTopic(browser: Browser<'async'>) {
await expandTopic('kitchen/lamp/state', browser) await expandTopic('kitchen/lamp/state', browser)
const topicInput = await browser.$('//input[contains(@value,"kitchen/lamp/state")][1]') const topicInput = await browser.$('//input[contains(@value,"kitchen/lamp/state")][1]')
await clickOn(topicInput, browser) await clickOn(topicInput, browser)

2
src/spec/scenarios/reconnect.ts
View File

@@ -1,7 +1,7 @@
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
import { clickOn } from '../util' import { clickOn } from '../util'
export async function reconnect(browser: Browser) { export async function reconnect(browser: Browser<'async'>) {
const disconnectButton = await browser.$('//button/span[contains(text(),"Disconnect")]') const disconnectButton = await browser.$('//button/span[contains(text(),"Disconnect")]')
await clickOn(disconnectButton, browser) await clickOn(disconnectButton, browser)
const connectButton = await browser.$('//button/span[contains(text(),"Connect")]') const connectButton = await browser.$('//button/span[contains(text(),"Connect")]')

4
src/spec/scenarios/searchTree.ts
View File

@@ -1,14 +1,14 @@
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
import { clickOn, deleteTextWithBackspaces, showText, sleep, writeText } from '../util' import { clickOn, deleteTextWithBackspaces, showText, sleep, writeText } from '../util'
export async function searchTree(text: string, browser: Browser) { export async function searchTree(text: string, browser: Browser<'async'>) {
const searchField = await browser.$('//input[contains(@placeholder, "Search")]') const searchField = await browser.$('//input[contains(@placeholder, "Search")]')
await clickOn(searchField, browser, 1) await clickOn(searchField, browser, 1)
await writeText(text, browser, 100) await writeText(text, browser, 100)
await sleep(1500) await sleep(1500)
} }
export async function clearSearch(browser: Browser) { export async function clearSearch(browser: Browser<'async'>) {
const searchField = await browser.$('//input[contains(@placeholder, "Search")]') const searchField = await browser.$('//input[contains(@placeholder, "Search")]')
await clickOn(searchField, browser, 1) await clickOn(searchField, browser, 1)
await deleteTextWithBackspaces(searchField, browser, 100) await deleteTextWithBackspaces(searchField, browser, 100)

4
src/spec/scenarios/showAdvancedConnectionSettings.ts
View File

@@ -1,7 +1,7 @@
import { Browser } from 'webdriverio' import { Browser } from 'webdriverio'
import { clickOn, sleep, setInputText } from '../util' import { clickOn, sleep, setInputText } from '../util'
export async function showAdvancedConnectionSettings(browser: Browser) { export async function showAdvancedConnectionSettings(browser: Browser<'async'>) {
const advancedSettingsButton = await browser.$('//button/span[contains(text(),"Advanced")]') const advancedSettingsButton = await browser.$('//button/span[contains(text(),"Advanced")]')
const addButton = await browser.$('//button/span[contains(text(),"Add")]') const addButton = await browser.$('//button/span[contains(text(),"Add")]')
const topicInput = await browser.$('//*[contains(@class, "advanced-connection-settings-topic-input")]//input') const topicInput = await browser.$('//*[contains(@class, "advanced-connection-settings-topic-input")]//input')
@@ -24,7 +24,7 @@ export async function showAdvancedConnectionSettings(browser: Browser) {
await clickOn(connectButton, browser) await clickOn(connectButton, browser)
} }
async function deleteFirstSubscribedTopic(browser: Browser) { async function deleteFirstSubscribedTopic(browser: Browser<'async'>) {
const deleteButton = await browser.$('.advanced-connection-settings-topic-list button') const deleteButton = await browser.$('.advanced-connection-settings-topic-list button')
await clickOn(deleteButton, browser) await clickOn(deleteButton, browser)
} }

2
src/spec/scenarios/showJsonPreview.ts
View File

@@ -1,7 +1,7 @@
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
import { expandTopic, sleep } from '../util' import { expandTopic, sleep } from '../util'
export async function showJsonPreview(browser: Browser) { export async function showJsonPreview(browser: Browser<'async'>) {
await expandTopic('actuality/showcase', browser) await expandTopic('actuality/showcase', browser)
await browser.saveScreenshot('screen3.png') await browser.saveScreenshot('screen3.png')
await sleep(1000) await sleep(1000)

2
src/spec/scenarios/showMenu.ts
View File

@@ -1,7 +1,7 @@
import { Browser } from 'webdriverio' import { Browser } from 'webdriverio'
import { clickOn, showText, sleep } from '../util' import { clickOn, showText, sleep } from '../util'
export async function showMenu(browser: Browser) { export async function showMenu(browser: Browser<'async'>) {
const menuButton = await browser.$('//button[contains(@aria-label, "Menu")]') const menuButton = await browser.$('//button[contains(@aria-label, "Menu")]')
await clickOn(menuButton, browser) await clickOn(menuButton, browser)

12
src/spec/scenarios/showNumericPlot.ts
View File

@@ -1,7 +1,7 @@
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
import { moveToCenterOfElement, clickOn, clickOnHistory, expandTopic, sleep, writeText } from '../util' import { moveToCenterOfElement, clickOn, clickOnHistory, expandTopic, sleep, writeText } from '../util'
export async function showNumericPlot(browser: Browser) { export async function showNumericPlot(browser: Browser<'async'>) {
await expandTopic('kitchen/coffee_maker', browser) await expandTopic('kitchen/coffee_maker', browser)
let heater = await valuePreviewGuttersShowChartIcon('heater', browser) let heater = await valuePreviewGuttersShowChartIcon('heater', browser)
await moveToCenterOfElement(heater, browser) await moveToCenterOfElement(heater, browser)
@@ -42,7 +42,7 @@ export async function showNumericPlot(browser: Browser) {
await clickOnHistory(browser) await clickOnHistory(browser)
} }
async function valuePreviewGuttersShowChartIcon(name: string, browser: Browser) { async function valuePreviewGuttersShowChartIcon(name: string, browser: Browser<'async'>) {
for (let retries = 0; retries < 2; retries += 1) { for (let retries = 0; retries < 2; retries += 1) {
try { try {
return await browser.$(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`) return await browser.$(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`)
@@ -53,23 +53,23 @@ async function valuePreviewGuttersShowChartIcon(name: string, browser: Browser)
return browser.$(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`) return browser.$(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`)
} }
async function chartSettings(name: string, browser: Browser) { async function chartSettings(name: string, browser: Browser<'async'>) {
const settings = await browser.$(`//*[contains(@data-test-type, "ChartSettings")][contains(@data-test, "${name}")]`) const settings = await browser.$(`//*[contains(@data-test-type, "ChartSettings")][contains(@data-test, "${name}")]`)
return clickOn(settings, browser) return clickOn(settings, browser)
} }
async function clickAway(name: string, browser: Browser) { async function clickAway(name: string, browser: Browser<'async'>) {
const settings = await browser.$(`//*[contains(@data-test-type, "ChartPaper")][contains(@data-test, "${name}")]`) const settings = await browser.$(`//*[contains(@data-test-type, "ChartPaper")][contains(@data-test, "${name}")]`)
await moveToCenterOfElement(settings, browser) await moveToCenterOfElement(settings, browser)
await browser.keys(['Escape']) await browser.keys(['Escape'])
} }
async function removeChart(name: string, browser: Browser) { async function removeChart(name: string, browser: Browser<'async'>) {
const remove = await browser.$(`//*[contains(@data-test-type, "RemoveChart")][contains(@data-test, "${name}")]`) const remove = await browser.$(`//*[contains(@data-test-type, "RemoveChart")][contains(@data-test, "${name}")]`)
return clickOn(remove, browser) return clickOn(remove, browser)
} }
async function clickOnMenuPoint(name: string, browser: Browser) { async function clickOnMenuPoint(name: string, browser: Browser<'async'>) {
const item = await browser.$(`//li/span[contains(text(), "${name}")]`) const item = await browser.$(`//li/span[contains(text(), "${name}")]`)
return clickOn(item, browser) return clickOn(item, browser)
} }

2
src/spec/scenarios/showOffDiffCapability.ts
View File

@@ -2,7 +2,7 @@ import { Browser, Element } from 'webdriverio'
import { clickOn, showText, sleep } from '../util' import { clickOn, showText, sleep } from '../util'
// Expects a topic with at least two messages to be selected // Expects a topic with at least two messages to be selected
export async function showOffDiffCapability(browser: Browser) { export async function showOffDiffCapability(browser: Browser<'async'>) {
await showText('Compare messages', 2000, browser, 'top') await showText('Compare messages', 2000, browser, 'top')
await showText('Show raw message', 2000, browser, 'bottom') await showText('Show raw message', 2000, browser, 'bottom')

2
src/spec/scenarios/showZoomLevel.ts
View File

@@ -1,7 +1,7 @@
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
import { showKeys, showText, sleep } from '../util' import { showKeys, showText, sleep } from '../util'
export async function showZoomLevel(browser: Browser) { export async function showZoomLevel(browser: Browser<'async'>) {
await showKeys('Zoom in', 2000, browser, 'top', ['Ctrl', '+']) await showKeys('Zoom in', 2000, browser, 'top', ['Ctrl', '+'])
await sleep(2000) await sleep(2000)
await showKeys('Zoom out', 2000, browser, 'middle', ['Ctrl', '-']) await showKeys('Zoom out', 2000, browser, 'middle', ['Ctrl', '-'])

4
src/spec/util/expandTopic.ts
View File

@@ -1,7 +1,7 @@
import { clickOn } from './' import { clickOn } from './'
import { Browser, Element } from 'webdriverio' import { Browser, Element } from 'webdriverio'
export async function expandTopic(path: string, browser: Browser) { export async function expandTopic(path: string, browser: Browser<'async'>) {
const originalTopics = path.split('/') const originalTopics = path.split('/')
let topics = path.split('/') let topics = path.split('/')
while (topics.length > 0 && !(await topicMatches(topics, browser))) { while (topics.length > 0 && !(await topicMatches(topics, browser))) {
@@ -18,7 +18,7 @@ export async function expandTopic(path: string, browser: Browser) {
} }
} }
async function topicMatches(topics: Array<string>, browser: Browser) { async function topicMatches(topics: Array<string>, browser: Browser<'async'>) {
const result = await browser.$(topicSelector(topics)) const result = await browser.$(topicSelector(topics))
return result.isExisting() return result.isExisting()
} }

24
src/spec/util/index.ts
View File

@@ -18,7 +18,7 @@ export function sleep(ms: number, required = false) {
}) })
} }
export async function writeText(text: string, browser: Browser, delay = 0) { export async function writeText(text: string, browser: Browser<'async'>, delay = 0) {
if (fast) { if (fast) {
return browser.keys(text.split('')) return browser.keys(text.split(''))
} }
@@ -29,7 +29,7 @@ export async function writeText(text: string, browser: Browser, delay = 0) {
} }
} }
export async function deleteTextWithBackspaces(element: Element, browser: Browser, delay = 0, count = 0) { export async function deleteTextWithBackspaces(element: Element<'async'>, browser: Browser<'async'>, delay = 0, count = 0) {
const length = count > 0 ? count : (await element.getValue()).length const length = count > 0 ? count : (await element.getValue()).length
for (let i = 0; i < length; i += 1) { for (let i = 0; i < length; i += 1) {
await browser.keys(['Backspace']) await browser.keys(['Backspace'])
@@ -37,13 +37,13 @@ export async function deleteTextWithBackspaces(element: Element, browser: Browse
} }
} }
export async function setInputText(input: Element, text: string, browser: Browser) { export async function setInputText(input: Element<'async'>, text: string, browser: Browser<'async'>) {
await clickOn(input, browser, 1) await clickOn(input, browser, 1)
await deleteTextWithBackspaces(input, browser) await deleteTextWithBackspaces(input, browser)
await input.setValue(text) await input.setValue(text)
} }
export async function setTextInInput(name: string, text: string, browser: Browser) { export async function setTextInInput(name: string, text: string, browser: Browser<'async'>) {
const input = await browser.$(`//label[contains(text(), "${name}")]/..//input`) const input = await browser.$(`//label[contains(text(), "${name}")]/..//input`)
await clickOn(input, browser, 1) await clickOn(input, browser, 1)
await browser.$(`//label[contains(text(), "${name}")]/..//input`) await browser.$(`//label[contains(text(), "${name}")]/..//input`)
@@ -52,7 +52,7 @@ export async function setTextInInput(name: string, text: string, browser: Browse
await input.setValue(text) await input.setValue(text)
} }
export async function moveToCenterOfElement(element: Element, browser: Browser) { export async function moveToCenterOfElement(element: Element<'async'>, browser: Browser<'async'>) {
const { x, y } = await element.getLocation() const { x, y } = await element.getLocation()
const { width, height } = await element.getSize() const { width, height } = await element.getSize()
@@ -69,12 +69,12 @@ export async function moveToCenterOfElement(element: Element, browser: Browser)
await element.moveTo() await element.moveTo()
} }
export async function clickOnHistory(browser: Browser) { export async function clickOnHistory(browser: Browser<'async'>) {
const messageHistory = await browser.$('//span/*[contains(text(), "History")]') const messageHistory = await browser.$('//span/*[contains(text(), "History")]')
await clickOn(messageHistory, browser) await clickOn(messageHistory, browser)
} }
export async function clickOn(element: Element, browser: Browser, clicks = 1) { export async function clickOn(element: Element<'async'>, browser: Browser<'async'>, clicks = 1) {
await moveToCenterOfElement(element, browser) await moveToCenterOfElement(element, browser)
for (let i = 0; i < clicks; i += 1) { for (let i = 0; i < clicks; i += 1) {
await element.click() await element.click()
@@ -82,7 +82,7 @@ export async function clickOn(element: Element, browser: Browser, clicks = 1) {
} }
} }
export async function createFakeMousePointer(browser: Browser) { export async function createFakeMousePointer(browser: Browser<'async'>) {
const js = 'window.demo.enableMouse();' const js = 'window.demo.enableMouse();'
await browser.execute(js) await browser.execute(js)
@@ -91,7 +91,7 @@ export async function createFakeMousePointer(browser: Browser) {
export async function showText( export async function showText(
text: string, text: string,
duration: number = 0, duration: number = 0,
browser: Browser, browser: Browser<'async'>,
location: 'top' | 'bottom' | 'middle' = 'bottom', location: 'top' | 'bottom' | 'middle' = 'bottom',
keys = [] keys = []
) { ) {
@@ -102,7 +102,7 @@ export async function showText(
type HeapDump = any type HeapDump = any
export async function getHeapDump(browser: Browser): Promise<HeapDump> { export async function getHeapDump(browser: Browser<'async'>): Promise<HeapDump> {
const filename = 'heapdump.json' const filename = 'heapdump.json'
const js = `window.demo.writeHeapdump('${filename}');` const js = `window.demo.writeHeapdump('${filename}');`
await browser.execute(js) await browser.execute(js)
@@ -125,7 +125,7 @@ export async function countInstancesOf(heapDump: HeapDump, className: ClassNameM
export async function showKeys( export async function showKeys(
text: string, text: string,
duration: number = 0, duration: number = 0,
browser: Browser, browser: Browser<'async'>,
location: 'top' | 'bottom' | 'middle' = 'bottom', location: 'top' | 'bottom' | 'middle' = 'bottom',
keys: Array<string> = [] keys: Array<string> = []
) { ) {
@@ -134,7 +134,7 @@ export async function showKeys(
await browser.execute(js) await browser.execute(js)
} }
export async function hideText(browser: Browser) { export async function hideText(browser: Browser<'async'>) {
const js = 'window.demo.hideMessage();' const js = 'window.demo.hideMessage();'
await browser.execute(js) await browser.execute(js)
await sleep(600) await sleep(600)

13
tsconfig.json
View File

@@ -8,9 +8,15 @@
"module": "commonjs", "module": "commonjs",
"moduleResolution": "node", "moduleResolution": "node",
"sourceRoot": "src/", "sourceRoot": "src/",
"lib": ["es2017", "dom"], "lib": [
"es2017",
"dom"
],
"sourceMap": true, "sourceMap": true,
"types": ["node"] "types": [
"node"
],
"skipLibCheck": true
}, },
"include": [ "include": [
"src/electron.ts", "src/electron.ts",
@@ -18,5 +24,8 @@
"src/spec/demoVideo.ts", "src/spec/demoVideo.ts",
"src/spec/leakTest.ts", "src/spec/leakTest.ts",
"scripts/*.ts" "scripts/*.ts"
],
"exclude": [
"node_modules"
] ]
} }

10486
yarn.lock
View File

File diff suppressed because it is too large Load Diff