iobroker.ring 6.4.0 → 7.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -0
- package/README.md +29 -418
- package/admin/assets/index-QX4NxbDg.js +693 -0
- package/admin/i18n/de.json +3 -1
- package/admin/i18n/en.json +3 -1
- package/admin/i18n/es.json +3 -2
- package/admin/i18n/fr.json +3 -1
- package/admin/i18n/it.json +3 -1
- package/admin/i18n/nl.json +5 -3
- package/admin/i18n/pl.json +3 -1
- package/admin/i18n/pt.json +3 -1
- package/admin/i18n/ru.json +3 -1
- package/admin/i18n/uk.json +3 -1
- package/admin/i18n/zh-cn.json +3 -1
- package/admin/tab_m.html +13 -34
- package/build/lib/constants.js +204 -204
- package/build/lib/constants.js.map +1 -1
- package/build/lib/lastAction.js +2 -0
- package/build/lib/lastAction.js.map +1 -1
- package/build/lib/ownRingCamera.js +269 -237
- package/build/lib/ownRingCamera.js.map +1 -1
- package/build/lib/ownRingDevice.js +57 -44
- package/build/lib/ownRingDevice.js.map +1 -1
- package/build/lib/ownRingIntercom.js +45 -40
- package/build/lib/ownRingIntercom.js.map +1 -1
- package/build/lib/ownRingLocation.js +27 -19
- package/build/lib/ownRingLocation.js.map +1 -1
- package/build/lib/ringApiClient.js +61 -49
- package/build/lib/ringApiClient.js.map +1 -1
- package/build/lib/services/event-blocker.js +13 -10
- package/build/lib/services/event-blocker.js.map +1 -1
- package/build/lib/services/file-service.js +29 -27
- package/build/lib/services/file-service.js.map +1 -1
- package/build/lib/services/image-service.js +8 -4
- package/build/lib/services/image-service.js.map +1 -1
- package/build/lib/services/text-service.js +169 -85
- package/build/lib/services/text-service.js.map +1 -1
- package/build/main.js +84 -100
- package/build/main.js.map +1 -1
- package/io-package.json +26 -25
- package/package.json +42 -89
- package/admin/admin.d.ts +0 -112
- package/admin/convert.js +0 -447
- package/admin/index_m.html +0 -318
- package/admin/style.css +0 -33
- package/admin/tab_m.js +0 -154
- package/admin/tsconfig.json +0 -11
- package/admin/words.js +0 -470
- package/build/lib/tools.js +0 -98
- package/build/lib/tools.js.map +0 -1
|
@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.OwnRingLocation = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_util_1 = __importDefault(require("node:util"));
|
|
8
8
|
const constants_1 = require("./constants");
|
|
9
9
|
class OwnRingLocation {
|
|
10
|
+
_currentLocationMode = 'unset';
|
|
10
11
|
get loc() {
|
|
11
12
|
return this._loc;
|
|
12
13
|
}
|
|
@@ -19,35 +20,38 @@ class OwnRingLocation {
|
|
|
19
20
|
get name() {
|
|
20
21
|
return this._loc.name;
|
|
21
22
|
}
|
|
23
|
+
_fullId;
|
|
24
|
+
_adapter;
|
|
25
|
+
_client;
|
|
26
|
+
_loc;
|
|
22
27
|
constructor(location, adapter, apiClient) {
|
|
23
|
-
this._currentLocationMode = "unset";
|
|
24
28
|
this._loc = location;
|
|
25
29
|
this._fullId = `Location_${this.id}`;
|
|
26
30
|
this._adapter = adapter;
|
|
27
31
|
this._client = apiClient;
|
|
28
32
|
this._loc.onDataUpdate.subscribe((message) => {
|
|
29
|
-
this.debug(`Received Location Update Event: "${message}"`);
|
|
33
|
+
this.debug(`Received Location Update Event: "${JSON.stringify(message)}"`);
|
|
30
34
|
});
|
|
31
35
|
this._loc.onConnected.subscribe((connected) => {
|
|
32
36
|
this.debug(`Received Location Connection Status Change to ${connected}`);
|
|
33
37
|
if (!connected && !apiClient.refreshing) {
|
|
34
38
|
this.warn(`Lost connection to Location ${this._loc.name}... Will try a reconnect in 5s`);
|
|
35
|
-
setTimeout(() => {
|
|
36
|
-
this._client.refreshAll();
|
|
39
|
+
this._adapter.setTimeout(() => {
|
|
40
|
+
void this._client.refreshAll();
|
|
37
41
|
}, 5000);
|
|
38
42
|
}
|
|
39
43
|
});
|
|
40
44
|
this._loc.onLocationMode.subscribe((newMode) => {
|
|
41
|
-
this.updateModeObject(newMode);
|
|
45
|
+
this.updateModeObject(newMode).catch(e => this._adapter.log.error(`Failed to update Location Mode for ${this.id}: ${e}`));
|
|
42
46
|
});
|
|
43
|
-
this.silly(`Location Debug Data: ${
|
|
44
|
-
this.recreateDeviceObjectTree();
|
|
45
|
-
this.getLocationMode();
|
|
47
|
+
this.silly(`Location Debug Data: ${node_util_1.default.inspect(this._loc, false, 2)}`);
|
|
48
|
+
this.recreateDeviceObjectTree().catch(e => this._adapter.log.error(`Failed to recreate Location Object Tree for ${this.id}: ${e}`));
|
|
49
|
+
this.getLocationMode().catch(e => this._adapter.log.error(`Failed to get Location Mode for ${this.id}: ${e}`));
|
|
46
50
|
}
|
|
47
51
|
async recreateDeviceObjectTree() {
|
|
48
52
|
this.silly(`Recreate LocationObjectTree`);
|
|
49
53
|
await this._adapter.setObjectNotExistsAsync(this._fullId, {
|
|
50
|
-
type:
|
|
54
|
+
type: 'device',
|
|
51
55
|
common: {
|
|
52
56
|
name: `Location ${this.id} ("${this.name}")`,
|
|
53
57
|
},
|
|
@@ -69,13 +73,13 @@ class OwnRingLocation {
|
|
|
69
73
|
}
|
|
70
74
|
processUserInput(channelID, stateID, state) {
|
|
71
75
|
switch (channelID) {
|
|
72
|
-
case
|
|
76
|
+
case '':
|
|
73
77
|
if (stateID === constants_1.STATE_ID_DEBUG_REQUEST) {
|
|
74
78
|
this.performDebugOnUserRequest(state);
|
|
75
79
|
return;
|
|
76
80
|
}
|
|
77
81
|
if (stateID === constants_1.STATE_ID_LOCATIONMODE) {
|
|
78
|
-
this.performLocationModeChange(state);
|
|
82
|
+
this.performLocationModeChange(state).catch(e => this._adapter.log.error(`Failed to perform Location Mode Change for ${this.id} with input "${state.val}": ${e}`));
|
|
79
83
|
return;
|
|
80
84
|
}
|
|
81
85
|
this._adapter.log.error(`Unknown State/Switch with channel "${channelID}" and state "${stateID}"`);
|
|
@@ -87,14 +91,16 @@ class OwnRingLocation {
|
|
|
87
91
|
performDebugOnUserRequest(state) {
|
|
88
92
|
const targetVal = state.val;
|
|
89
93
|
if (targetVal) {
|
|
90
|
-
this._adapter.log.info(`Location Debug Data for ${this.id}: ${
|
|
91
|
-
this._adapter
|
|
94
|
+
this._adapter.log.info(`Location Debug Data for ${this.id}: ${node_util_1.default.inspect(this._loc, false, 1)}`);
|
|
95
|
+
this._adapter
|
|
96
|
+
.upsertState(`${this._fullId}.${constants_1.STATE_ID_DEBUG_REQUEST}`, constants_1.COMMON_DEBUG_REQUEST, false)
|
|
97
|
+
.catch(e => this._adapter.log.error(`Failed to reset Debug Request State for ${this.id} after user request: ${e}`));
|
|
92
98
|
}
|
|
93
99
|
}
|
|
94
100
|
async performLocationModeChange(state) {
|
|
95
101
|
const parsedNumber = parseInt(state.val, 10);
|
|
96
102
|
let desiredState;
|
|
97
|
-
if (typeof state.val ==
|
|
103
|
+
if (typeof state.val == 'number') {
|
|
98
104
|
desiredState = constants_1.LOCATION_MODE_OPTIONS[state.val];
|
|
99
105
|
}
|
|
100
106
|
else if (!isNaN(parsedNumber)) {
|
|
@@ -106,13 +112,14 @@ class OwnRingLocation {
|
|
|
106
112
|
if (desiredState == this._currentLocationMode) {
|
|
107
113
|
return;
|
|
108
114
|
}
|
|
109
|
-
if ([
|
|
110
|
-
this.updateModeObject(this._currentLocationMode, true);
|
|
115
|
+
if (['home', 'away', 'disarmed'].indexOf(desiredState) === -1) {
|
|
116
|
+
this.updateModeObject(this._currentLocationMode, true).catch(e => this._adapter.log.error(`Failed to update mode object for ${this.id}: ${e}`));
|
|
111
117
|
this.warn(`Invalid input "${desiredState}"... Only "home","away" and "disarmed" are choose-able by user.`);
|
|
112
118
|
return;
|
|
113
119
|
}
|
|
114
120
|
this.debug(`Change Location Mode to ${desiredState}`);
|
|
115
|
-
this._loc
|
|
121
|
+
await this._loc
|
|
122
|
+
.setLocationMode(desiredState)
|
|
116
123
|
.then((r) => this.updateModeObject(r.mode))
|
|
117
124
|
.catch((reason) => {
|
|
118
125
|
this._adapter.logCatch(`Failed setting location mode`, reason);
|
|
@@ -126,7 +133,8 @@ class OwnRingLocation {
|
|
|
126
133
|
await this._adapter.upsertState(`${this._fullId}.locationMode`, constants_1.COMMON_LOCATIONMODE, newMode, true, true);
|
|
127
134
|
}
|
|
128
135
|
async getLocationMode() {
|
|
129
|
-
this._loc
|
|
136
|
+
await this._loc
|
|
137
|
+
.getLocationMode()
|
|
130
138
|
.then((r) => this.updateModeObject(r.mode))
|
|
131
139
|
.catch((reason) => this._adapter.logCatch("Couldn't retrieve Location Mode", reason));
|
|
132
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownRingLocation.js","sourceRoot":"","sources":["../../src/lib/ownRingLocation.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ownRingLocation.js","sourceRoot":"","sources":["../../src/lib/ownRingLocation.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.RingApiClient = void 0;
|
|
7
|
-
const ring_client_api_1 = require("ring-client-api");
|
|
8
7
|
const ffmpeg_static_1 = __importDefault(require("ffmpeg-static"));
|
|
9
8
|
const ownRingCamera_1 = require("./ownRingCamera");
|
|
10
9
|
const constants_1 = require("./constants");
|
|
@@ -12,12 +11,18 @@ const ownRingLocation_1 = require("./ownRingLocation");
|
|
|
12
11
|
const ownRingDevice_1 = require("./ownRingDevice");
|
|
13
12
|
const ownRingIntercom_1 = require("./ownRingIntercom");
|
|
14
13
|
class RingApiClient {
|
|
14
|
+
refreshing = false;
|
|
15
|
+
cameras = {};
|
|
16
|
+
intercoms = {};
|
|
17
|
+
_refreshInterval = null;
|
|
18
|
+
_retryTimeout = null;
|
|
15
19
|
get locations() {
|
|
16
20
|
return this._locations;
|
|
17
21
|
}
|
|
22
|
+
_locations = {};
|
|
18
23
|
validateRefreshToken() {
|
|
19
24
|
const token = this.adapter.config.refreshtoken;
|
|
20
|
-
if (!token || token ===
|
|
25
|
+
if (!token || token === '') {
|
|
21
26
|
this.adapter.log.error(`Refresh Token missing.`);
|
|
22
27
|
return false;
|
|
23
28
|
}
|
|
@@ -32,10 +37,12 @@ class RingApiClient {
|
|
|
32
37
|
return this._api;
|
|
33
38
|
}
|
|
34
39
|
if (!this.adapter.config.refreshtoken) {
|
|
35
|
-
throw (
|
|
40
|
+
throw new Error('Refresh Token needed.');
|
|
36
41
|
}
|
|
37
|
-
|
|
38
|
-
|
|
42
|
+
// "ring-client-api" is ESM only and cannot be require()d from this CommonJS build
|
|
43
|
+
const { RingApi: RingApiCtor } = await import('ring-client-api');
|
|
44
|
+
this._api = new RingApiCtor({
|
|
45
|
+
controlCenterDisplayName: 'iobroker.ring',
|
|
39
46
|
refreshToken: await this.adapter.getRefreshToken(),
|
|
40
47
|
systemId: `${this.adapter.host}.ring_v${this.adapter.version}_${Math.random() * Math.pow(10, 6)}`,
|
|
41
48
|
cameraStatusPollingSeconds: 120,
|
|
@@ -46,55 +53,60 @@ class RingApiClient {
|
|
|
46
53
|
});
|
|
47
54
|
this._api.onRefreshTokenUpdated.subscribe((data) => {
|
|
48
55
|
this.adapter.log.info(`Received new Refresh Token. Will use the new one until the token in config gets changed`);
|
|
49
|
-
this.adapter
|
|
50
|
-
|
|
56
|
+
this.adapter
|
|
57
|
+
.upsertState('next_refresh_token', constants_1.COMMON_NEW_TOKEN, data.newRefreshToken)
|
|
58
|
+
.catch((e) => {
|
|
59
|
+
this.adapter.log.error(`Failed to store new refresh token: ${e}`);
|
|
60
|
+
});
|
|
61
|
+
this.adapter
|
|
62
|
+
.upsertState('old_user_refresh_token', constants_1.COMMON_OLD_TOKEN, this.adapter.config.refreshtoken)
|
|
63
|
+
.catch((e) => {
|
|
64
|
+
this.adapter.log.error(`Failed to store old refresh token: ${e}`);
|
|
65
|
+
});
|
|
51
66
|
});
|
|
52
|
-
const profile = await this._api
|
|
67
|
+
const profile = await this._api
|
|
68
|
+
.getProfile()
|
|
53
69
|
.catch((reason) => this.handleApiError(reason));
|
|
54
70
|
if (profile === undefined) {
|
|
55
71
|
this.warn("Couldn't Retrieve profile, please make sure your api-token is fresh and correct");
|
|
56
72
|
}
|
|
57
73
|
return this._api;
|
|
58
74
|
}
|
|
75
|
+
adapter;
|
|
76
|
+
_api;
|
|
59
77
|
constructor(adapter) {
|
|
60
|
-
this.refreshing = false;
|
|
61
|
-
this.cameras = {};
|
|
62
|
-
this.intercoms = {};
|
|
63
|
-
this._refreshInterval = null;
|
|
64
|
-
this._retryTimeout = null;
|
|
65
|
-
this._locations = {};
|
|
66
78
|
this.adapter = adapter;
|
|
67
79
|
}
|
|
68
80
|
async init() {
|
|
69
81
|
await this.refreshAll(true);
|
|
70
82
|
if (this.adapter.config.renew_registration > 0) {
|
|
71
|
-
this._refreshInterval =
|
|
83
|
+
this._refreshInterval =
|
|
84
|
+
this.adapter.setInterval(this.refreshAll.bind(this), this.adapter.config.renew_registration * 3600 * 1000) ?? null;
|
|
72
85
|
}
|
|
73
86
|
}
|
|
74
87
|
async refreshAll(initial = false) {
|
|
75
|
-
var _a;
|
|
76
88
|
/**
|
|
77
89
|
* TH 2022-05-30: It seems like Ring Api drops its socket connection from time to time,
|
|
78
90
|
* so we should reconnect ourselves
|
|
79
91
|
*/
|
|
80
92
|
this.debug(`Refresh Ring Connection`);
|
|
81
93
|
this.refreshing = true;
|
|
82
|
-
|
|
94
|
+
this._api?.disconnect();
|
|
83
95
|
this._api = undefined;
|
|
84
|
-
if (!await this.retrieveLocations()) {
|
|
96
|
+
if (!(await this.retrieveLocations())) {
|
|
85
97
|
if (initial) {
|
|
86
98
|
this.adapter.terminate(`Failed to retrieve any locations for your ring Account.`);
|
|
87
99
|
}
|
|
88
100
|
if (this._retryTimeout !== null) {
|
|
89
|
-
clearTimeout(this._retryTimeout);
|
|
101
|
+
this.adapter.clearTimeout(this._retryTimeout);
|
|
90
102
|
this._retryTimeout = null;
|
|
91
103
|
}
|
|
92
104
|
this.warn(`Couldn't load data from Ring Server on reconnect, will retry in 5 Minutes...`);
|
|
93
|
-
this._retryTimeout = setTimeout(this.refreshAll.bind(this), 5 * 60 * 1000);
|
|
105
|
+
this._retryTimeout = this.adapter.setTimeout(this.refreshAll.bind(this), 5 * 60 * 1000) ?? null;
|
|
94
106
|
}
|
|
95
107
|
else {
|
|
96
108
|
if (this._retryTimeout !== null) {
|
|
97
|
-
clearTimeout(this._retryTimeout);
|
|
109
|
+
this.adapter.clearTimeout(this._retryTimeout);
|
|
98
110
|
this._retryTimeout = null;
|
|
99
111
|
}
|
|
100
112
|
}
|
|
@@ -119,15 +131,16 @@ class RingApiClient {
|
|
|
119
131
|
this.debug(`Refresh complete`);
|
|
120
132
|
}
|
|
121
133
|
processUserInput(targetId, channelID, stateID, state) {
|
|
122
|
-
|
|
123
|
-
const targetDevice = (_a = this.cameras[targetId]) !== null && _a !== void 0 ? _a : this.intercoms[targetId];
|
|
134
|
+
const targetDevice = this.cameras[targetId] ?? this.intercoms[targetId];
|
|
124
135
|
const targetLocation = this._locations[targetId];
|
|
125
136
|
if (!targetDevice && !targetLocation) {
|
|
126
137
|
this.adapter.log.error(`Received State Change on Subscribed State, for unknown Device/Location "${targetId}"`);
|
|
127
138
|
return;
|
|
128
139
|
}
|
|
129
140
|
else if (targetDevice) {
|
|
130
|
-
targetDevice.processUserInput(channelID, stateID, state)
|
|
141
|
+
targetDevice.processUserInput(channelID, stateID, state).catch((e) => {
|
|
142
|
+
this.adapter.log.error(`Failed to process user input for device ${channelID} stateID ${stateID}: ${e}`);
|
|
143
|
+
});
|
|
131
144
|
}
|
|
132
145
|
else if (targetLocation) {
|
|
133
146
|
targetLocation.processUserInput(channelID, stateID, state);
|
|
@@ -135,43 +148,42 @@ class RingApiClient {
|
|
|
135
148
|
}
|
|
136
149
|
unload() {
|
|
137
150
|
if (this._refreshInterval) {
|
|
138
|
-
clearInterval(this._refreshInterval);
|
|
151
|
+
this.adapter.clearInterval(this._refreshInterval);
|
|
139
152
|
this._refreshInterval = null;
|
|
140
153
|
}
|
|
141
154
|
if (this._retryTimeout !== null) {
|
|
142
|
-
clearTimeout(this._retryTimeout);
|
|
155
|
+
this.adapter.clearTimeout(this._retryTimeout);
|
|
143
156
|
this._retryTimeout = null;
|
|
144
157
|
}
|
|
145
158
|
}
|
|
146
159
|
async retrieveLocations() {
|
|
147
160
|
this.debug(`Retrieve Locations`);
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
.
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
this.
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
});
|
|
161
|
+
try {
|
|
162
|
+
// getApi() belongs inside the try: it throws on a missing refresh token, and
|
|
163
|
+
// refreshAll() is built around this method returning false, not rejecting.
|
|
164
|
+
const api = await this.getApi();
|
|
165
|
+
const locs = await api.getLocations();
|
|
166
|
+
if (!locs.length) {
|
|
167
|
+
this.debug('getLocations was successful, but received no locations');
|
|
168
|
+
return false;
|
|
169
|
+
}
|
|
170
|
+
this.debug(`Received ${locs.length} Locations`);
|
|
171
|
+
this._locations = {};
|
|
172
|
+
for (const loc of locs) {
|
|
173
|
+
const newLoc = new ownRingLocation_1.OwnRingLocation(loc, this.adapter, this);
|
|
174
|
+
this._locations[newLoc.fullId] = newLoc;
|
|
175
|
+
}
|
|
176
|
+
return true;
|
|
177
|
+
}
|
|
178
|
+
catch (reason) {
|
|
179
|
+
this.handleApiError(reason);
|
|
180
|
+
return false;
|
|
181
|
+
}
|
|
170
182
|
}
|
|
171
183
|
handleApiError(reason) {
|
|
172
184
|
this.adapter.log.error(`Api Call failed`);
|
|
173
185
|
this.adapter.log.debug(`Failure reason:\n${reason}`);
|
|
174
|
-
this.adapter.log.debug(`Call Stack: \n${
|
|
186
|
+
this.adapter.log.debug(`Call Stack: \n${new Error().stack}`);
|
|
175
187
|
}
|
|
176
188
|
debug(message) {
|
|
177
189
|
this.adapter.log.debug(message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ringApiClient.js","sourceRoot":"","sources":["../../src/lib/ringApiClient.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"ringApiClient.js","sourceRoot":"","sources":["../../src/lib/ringApiClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EventBlocker = void 0;
|
|
4
4
|
class EventBlocker {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
_blockActive = false;
|
|
6
|
+
_blockTimeout = null;
|
|
7
|
+
_blockDuration;
|
|
8
|
+
_extendIfActive;
|
|
9
|
+
_adapter;
|
|
10
|
+
constructor(adapter, blockDuration, extendIfActive) {
|
|
11
|
+
this._adapter = adapter;
|
|
10
12
|
this._blockDuration = blockDuration;
|
|
11
13
|
this._extendIfActive = extendIfActive;
|
|
12
14
|
}
|
|
@@ -26,12 +28,13 @@ class EventBlocker {
|
|
|
26
28
|
}
|
|
27
29
|
setUnblockTimeout() {
|
|
28
30
|
if (this._blockTimeout) {
|
|
29
|
-
clearTimeout(this._blockTimeout);
|
|
31
|
+
this._adapter.clearTimeout(this._blockTimeout);
|
|
30
32
|
}
|
|
31
|
-
this._blockTimeout =
|
|
32
|
-
this.
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
this._blockTimeout =
|
|
34
|
+
this._adapter.setTimeout(() => {
|
|
35
|
+
this._blockActive = false;
|
|
36
|
+
this._blockTimeout = null;
|
|
37
|
+
}, this._blockDuration * 1000) ?? null;
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
40
|
exports.EventBlocker = EventBlocker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-blocker.js","sourceRoot":"","sources":["../../../src/lib/services/event-blocker.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"event-blocker.js","sourceRoot":"","sources":["../../../src/lib/services/event-blocker.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAY;IACb,YAAY,GAAY,KAAK,CAAC;IAC9B,aAAa,GAAqB,IAAI,CAAC;IAC9B,cAAc,CAAS;IACvB,eAAe,CAAU;IACzB,QAAQ,CAAc;IAEvC,YAAmB,OAAoB,EAAE,aAAqB,EAAE,cAAuB;QACnF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;IAC1C,CAAC;IAEM,UAAU;QACb,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACvB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7B,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,iBAAiB;QACrB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,CAAC,aAAa;YACd,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAS,EAAE;gBAChC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC1B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC9B,CAAC,EAAE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC;IAC/C,CAAC;CACJ;AAtCD,oCAsCC"}
|
|
@@ -4,37 +4,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.FileService = void 0;
|
|
7
|
-
const
|
|
8
|
-
const
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
9
9
|
require("@iobroker/types");
|
|
10
10
|
const main_1 = require("../../main");
|
|
11
11
|
class FileService {
|
|
12
|
+
static IOBROKER_FILES_REGEX = new RegExp(/.*iobroker-data\/files.*/);
|
|
12
13
|
static getFormattedDate() {
|
|
13
14
|
const now = new Date();
|
|
14
15
|
const YYYY = now.getFullYear();
|
|
15
|
-
const MM = String(now.getMonth() + 1).padStart(2,
|
|
16
|
-
const DD = String(now.getDate()).padStart(2,
|
|
16
|
+
const MM = String(now.getMonth() + 1).padStart(2, '0');
|
|
17
|
+
const DD = String(now.getDate()).padStart(2, '0');
|
|
17
18
|
return `${YYYY}${MM}${DD}`;
|
|
18
19
|
}
|
|
19
20
|
static getFormattedTime() {
|
|
20
21
|
const now = new Date();
|
|
21
|
-
const HH = String(now.getHours()).padStart(2,
|
|
22
|
-
const ii = String(now.getMinutes()).padStart(2,
|
|
23
|
-
const ss = String(now.getSeconds()).padStart(2,
|
|
22
|
+
const HH = String(now.getHours()).padStart(2, '0');
|
|
23
|
+
const ii = String(now.getMinutes()).padStart(2, '0');
|
|
24
|
+
const ss = String(now.getSeconds()).padStart(2, '0');
|
|
24
25
|
return `${HH}${ii}${ss}`;
|
|
25
26
|
}
|
|
26
27
|
static getPath(basePath, extendedPath, count, shortId, fullId, kind) {
|
|
27
|
-
const fullPath =
|
|
28
|
-
.
|
|
29
|
-
.replace(
|
|
30
|
-
.replace(
|
|
31
|
-
.replace(
|
|
32
|
-
.replace(
|
|
33
|
-
.replace(
|
|
28
|
+
const fullPath = node_path_1.default
|
|
29
|
+
.join(basePath, fullId, extendedPath)
|
|
30
|
+
.replace('%d', String(Date.now()))
|
|
31
|
+
.replace('%g', this.getFormattedDate())
|
|
32
|
+
.replace('%t', this.getFormattedTime())
|
|
33
|
+
.replace('%n', String(count))
|
|
34
|
+
.replace('%i', shortId)
|
|
35
|
+
.replace('%k', kind);
|
|
34
36
|
return {
|
|
35
37
|
fullPath: fullPath,
|
|
36
|
-
dirname:
|
|
37
|
-
filename:
|
|
38
|
+
dirname: node_path_1.default.dirname(fullPath),
|
|
39
|
+
filename: node_path_1.default.basename(fullPath),
|
|
38
40
|
};
|
|
39
41
|
}
|
|
40
42
|
static async prepareFolder(dirname) {
|
|
@@ -42,17 +44,17 @@ class FileService {
|
|
|
42
44
|
return true;
|
|
43
45
|
}
|
|
44
46
|
return new Promise((resolve) => {
|
|
45
|
-
if (!
|
|
46
|
-
|
|
47
|
+
if (!node_fs_1.default.existsSync(dirname)) {
|
|
48
|
+
node_fs_1.default.mkdirSync(dirname, { recursive: true });
|
|
47
49
|
if (!main_1.RingAdapter.isWindows) {
|
|
48
|
-
|
|
50
|
+
node_fs_1.default.chmodSync(dirname, 508);
|
|
49
51
|
}
|
|
50
52
|
}
|
|
51
53
|
resolve(true);
|
|
52
54
|
});
|
|
53
55
|
}
|
|
54
56
|
static deleteFileIfExistSync(fullPath, adapter) {
|
|
55
|
-
if (!
|
|
57
|
+
if (!node_fs_1.default.existsSync(fullPath)) {
|
|
56
58
|
return;
|
|
57
59
|
}
|
|
58
60
|
if (this.IOBROKER_FILES_REGEX.test(fullPath)) {
|
|
@@ -63,32 +65,33 @@ class FileService {
|
|
|
63
65
|
});
|
|
64
66
|
return;
|
|
65
67
|
}
|
|
66
|
-
|
|
68
|
+
node_fs_1.default.unlinkSync(fullPath);
|
|
67
69
|
}
|
|
68
70
|
static async getVisUrl(adapter, fullId, fileName) {
|
|
69
|
-
const vis = await adapter
|
|
71
|
+
const vis = await adapter
|
|
72
|
+
.getForeignObjectAsync('system.adapter.web.0')
|
|
70
73
|
.catch((reason) => {
|
|
71
74
|
adapter.logCatch(`Couldn't load "web.0" Adapter object.`, reason);
|
|
72
75
|
});
|
|
73
76
|
if (vis && vis.native) {
|
|
74
|
-
const secure = vis.native.secure ?
|
|
77
|
+
const secure = vis.native.secure ? 'https' : 'http';
|
|
75
78
|
const prefix = `${adapter.namespace}/${adapter.name}_${adapter.instance}_${fullId}_${fileName}`;
|
|
76
79
|
return {
|
|
77
80
|
visURL: `${secure}://${adapter.host}:${vis.native.port}/${prefix}`,
|
|
78
81
|
visPath: `${adapter.absoluteDefaultDir}files/${prefix}`,
|
|
79
82
|
};
|
|
80
83
|
}
|
|
81
|
-
return { visURL:
|
|
84
|
+
return { visURL: '', visPath: '' };
|
|
82
85
|
}
|
|
83
86
|
static async getTempDir(adapter) {
|
|
84
|
-
const tempPath =
|
|
87
|
+
const tempPath = node_path_1.default.join(adapter.absoluteInstanceDir);
|
|
85
88
|
await this.prepareFolder(tempPath);
|
|
86
89
|
return tempPath;
|
|
87
90
|
}
|
|
88
91
|
static async writeFile(fullPath, data, adapter) {
|
|
89
92
|
return new Promise((resolve, reject) => {
|
|
90
93
|
if (!this.IOBROKER_FILES_REGEX.test(fullPath)) {
|
|
91
|
-
|
|
94
|
+
node_fs_1.default.writeFile(fullPath, data, (r) => {
|
|
92
95
|
if (r) {
|
|
93
96
|
adapter.logCatch(`Failed to write File '${fullPath}'`, r.message);
|
|
94
97
|
reject(r);
|
|
@@ -117,5 +120,4 @@ class FileService {
|
|
|
117
120
|
}
|
|
118
121
|
}
|
|
119
122
|
exports.FileService = FileService;
|
|
120
|
-
FileService.IOBROKER_FILES_REGEX = new RegExp(/.*iobroker-data\/files.*/);
|
|
121
123
|
//# sourceMappingURL=file-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-service.js","sourceRoot":"","sources":["../../../src/lib/services/file-service.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"file-service.js","sourceRoot":"","sources":["../../../src/lib/services/file-service.ts"],"names":[],"mappings":"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"}
|