Skip to content

Commit e6ab5aa

Browse files
GoetzGoerischGoetzGoerisch
authored
fix(build): fix formatting and complete TS v7 migration (#758)
Signed-off-by: Goetz Goerisch <g.goerisch@vdw.de>
1 parent 892964a commit e6ab5aa

7 files changed

Lines changed: 104 additions & 41 deletions

File tree

‎2nd_hackathon/byte-brownies-studer-sl20/ua-server/src/mqtt.service.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ export class MqttService {
2929
try {
3030
await this._client.publish(topic, message);
3131
} catch (e) {
32-
this._logger.log(e.stack);
32+
if (e instanceof Error) {
33+
this._logger.log(e.stack);
34+
} else {
35+
this._logger.log(String(e));
36+
}
3337
}
3438
}
3539
}

‎2nd_hackathon/byte-brownies-studer-sl20/ua-server/src/opcua-facade.service.ts‎

Lines changed: 72 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,40 @@ export class OpcuaFacadeService {
6767
switch (signal) {
6868
case Signal.SteuerungEin:
6969
console.log(signal, value);
70-
if(value == true){
71-
this._server.writeSingleNode(6, 6014, DataType.LocalizedText, new LocalizedText({locale: "en", text: "Initializing"}));
72-
this._server.writeSingleNode(6, 6016, DataType.UInt32, ProductionState.Initializing);
70+
if (value == true) {
71+
this._server.writeSingleNode(
72+
6,
73+
6014,
74+
DataType.LocalizedText,
75+
new LocalizedText({ locale: 'en', text: 'Initializing' }),
76+
);
77+
this._server.writeSingleNode(
78+
6,
79+
6016,
80+
DataType.UInt32,
81+
ProductionState.Initializing,
82+
);
7383
}
7484
break;
7585
case Signal.Notaus:
7686
console.log(signal, value);
7787
let readStatus = this._server.readSingleNode(6, 6016);
78-
if(value === false && readStatus.value?.value === ProductionState.Running){
79-
this._server.writeSingleNode(6, 6014, DataType.LocalizedText, new LocalizedText({locale: "en", text: "Aborted"}));
80-
this._server.writeSingleNode(6, 6016, DataType.UInt32, ProductionState.Aborted);
88+
if (
89+
value === false &&
90+
readStatus.value?.value === ProductionState.Running
91+
) {
92+
this._server.writeSingleNode(
93+
6,
94+
6014,
95+
DataType.LocalizedText,
96+
new LocalizedText({ locale: 'en', text: 'Aborted' }),
97+
);
98+
this._server.writeSingleNode(
99+
6,
100+
6016,
101+
DataType.UInt32,
102+
ProductionState.Aborted,
103+
);
81104
}
82105
break;
83106
case Signal.EnergieEin:
@@ -86,31 +109,61 @@ export class OpcuaFacadeService {
86109
break;
87110
case Signal.SpindelEin:
88111
console.log(signal, value);
89-
this._server.writeSingleNode(6, 6023, DataType.Boolean, value);
112+
this._server.writeSingleNode(6, 6023, DataType.Boolean, value);
90113
break;
91114
case Signal.WerkzeugSpindelEin:
92115
console.log(signal, value);
93-
this._server.writeSingleNode(6, 6042, DataType.Boolean, value);
94-
break;
116+
this._server.writeSingleNode(6, 6042, DataType.Boolean, value);
117+
break;
95118
case Signal.StartLader:
96119
console.log(signal, value);
97-
if(value == true){
98-
this._server.writeSingleNode(6, 6014, DataType.LocalizedText, new LocalizedText({locale: "en", text: "Ended"}));
99-
this._server.writeSingleNode(6, 6016, DataType.UInt32, ProductionState.Ended);
120+
if (value == true) {
121+
this._server.writeSingleNode(
122+
6,
123+
6014,
124+
DataType.LocalizedText,
125+
new LocalizedText({ locale: 'en', text: 'Ended' }),
126+
);
127+
this._server.writeSingleNode(
128+
6,
129+
6016,
130+
DataType.UInt32,
131+
ProductionState.Ended,
132+
);
100133
}
101134
break;
102135
case Signal.ZyklusStart:
103136
console.log(signal, value);
104-
if(value == true){
105-
this._server.writeSingleNode(6, 6014, DataType.LocalizedText, new LocalizedText({locale: "en", text: "Running"}));
106-
this._server.writeSingleNode(6, 6016, DataType.UInt32, ProductionState.Running);
137+
if (value == true) {
138+
this._server.writeSingleNode(
139+
6,
140+
6014,
141+
DataType.LocalizedText,
142+
new LocalizedText({ locale: 'en', text: 'Running' }),
143+
);
144+
this._server.writeSingleNode(
145+
6,
146+
6016,
147+
DataType.UInt32,
148+
ProductionState.Running,
149+
);
107150
}
108151
break;
109152
case Signal.ZyklusStopp:
110153
console.log(signal, value);
111-
if(value == true){
112-
this._server.writeSingleNode(6, 6014, DataType.LocalizedText, new LocalizedText({locale: "en", text: "Aborted"}));
113-
this._server.writeSingleNode(6, 6016, DataType.UInt32, ProductionState.Aborted);
154+
if (value == true) {
155+
this._server.writeSingleNode(
156+
6,
157+
6014,
158+
DataType.LocalizedText,
159+
new LocalizedText({ locale: 'en', text: 'Aborted' }),
160+
);
161+
this._server.writeSingleNode(
162+
6,
163+
6016,
164+
DataType.UInt32,
165+
ProductionState.Aborted,
166+
);
114167
}
115168
break;
116169
}
@@ -149,7 +202,7 @@ export class OpcuaFacadeService {
149202
id: 6023,
150203
dt: DataType.Boolean,
151204
value: false,
152-
}
205+
},
153206
]);
154207
}
155208
}

‎2nd_hackathon/byte-brownies-studer-sl20/ua-server/src/opcua-server.service.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { Injectable, ConsoleLogger } from '@nestjs/common';
22
import { ConfigService } from '@nestjs/config';
3-
import { OpcuaServerConfig, OpcuaServerInfoConfig } from 'config/opcua.config';
3+
import {
4+
OpcuaServerConfig,
5+
OpcuaServerInfoConfig,
6+
} from '../config/opcua.config';
47
import { AttributeIds, DataType, OPCUAServer, UAVariable } from 'node-opcua';
58
import { catchError, from, tap } from 'rxjs';
69

‎2nd_hackathon/byte-brownies-studer-sl20/ua-server/src/opcua.module.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Module, ConsoleLogger } from '@nestjs/common';
22
import { OpcuaServerService } from './opcua-server.service';
33
import { ConfigModule } from '@nestjs/config';
44
import { OpcuaFacadeService } from './opcua-facade.service';
5-
import opcuaConfig from 'config/opcua.config';
5+
import opcuaConfig from '../config/opcua.config';
66
import { MqttService } from './mqtt.service';
77

88
@Module({
@@ -13,6 +13,11 @@ import { MqttService } from './mqtt.service';
1313
}),
1414
],
1515
controllers: [],
16-
providers: [OpcuaServerService, ConsoleLogger, OpcuaFacadeService, MqttService],
16+
providers: [
17+
OpcuaServerService,
18+
ConsoleLogger,
19+
OpcuaFacadeService,
20+
MqttService,
21+
],
1722
})
1823
export class AppModule {}

‎2nd_hackathon/byte-brownies-studer-sl20/ua-server/src/productionstate.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
export enum ProductionState {
2-
Initializing = 0,
3-
Running = 1,
4-
Ended = 2,
5-
Interrupted = 3,
6-
Aborted = 4,
7-
}
8-
2+
Initializing = 0,
3+
Running = 1,
4+
Ended = 2,
5+
Interrupted = 3,
6+
Aborted = 4,
7+
}

‎2nd_hackathon/byte-brownies-studer-sl20/ua-server/src/signal.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
export enum Signal {
2-
SteuerungEin = 1,
3-
Notaus = 3,
4-
EnergieEin = 5,
5-
SpindelEin = 6,
6-
WerkzeugSpindelEin = 8,
7-
ZyklusStopp = 9,
8-
ZyklusStart = 10,
9-
StartLader = 14
10-
}
1+
export enum Signal {
2+
SteuerungEin = 1,
3+
Notaus = 3,
4+
EnergieEin = 5,
5+
SpindelEin = 6,
6+
WerkzeugSpindelEin = 8,
7+
ZyklusStopp = 9,
8+
ZyklusStart = 10,
9+
StartLader = 14,
10+
}

‎2nd_hackathon/byte-brownies-studer-sl20/ua-server/tsconfig.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"target": "es2017",
1010
"sourceMap": true,
1111
"outDir": "./dist",
12-
"baseUrl": "./",
1312
"incremental": true,
1413
"skipLibCheck": true,
1514
"strictNullChecks": false,

0 commit comments

Comments
 (0)