@iobroker/db-states-file 4.0.21 → 4.1.0-alpha.0-20220819-74ceeddc

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.
@@ -0,0 +1,5 @@
1
+ export const StatesInMemoryFileDB: typeof import("./lib/states/statesInMemFileDB");
2
+ export const Client: typeof import("@iobroker/db-states-redis").Client;
3
+ export const Server: typeof import("./lib/states/statesInMemServerClass.js");
4
+ export function getDefaultPort(_host: any): number;
5
+ //# sourceMappingURL=index.d.ts.map
@@ -1,3 +1,4 @@
1
+ "use strict";
1
2
  module.exports = {
2
3
  StatesInMemoryFileDB: require('./lib/states/statesInMemFileDB'),
3
4
  Client: require('@iobroker/db-states-redis').Client,
@@ -6,3 +7,4 @@ module.exports = {
6
7
  return 9000;
7
8
  }
8
9
  };
10
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1,53 @@
1
+ export = StatesInMemoryFileDB;
2
+ /**
3
+ * This class inherits InMemoryFileDB class and adds all relevant logic for states
4
+ * including the available methods for use by js-controller directly
5
+ **/
6
+ declare class StatesInMemoryFileDB extends InMemoryFileDB {
7
+ constructor(settings: any);
8
+ logs: {};
9
+ session: {};
10
+ globalMessageId: number;
11
+ globalLogId: number;
12
+ stateExpires: {};
13
+ sessionExpires: {};
14
+ ONE_DAY_IN_SECS: number;
15
+ writeFileInterval: number;
16
+ _expireAll(): void;
17
+ _expireState(id: any, dontPublish: any): void;
18
+ _expireSession(id: any): void;
19
+ _getStates(keys: any): any[];
20
+ _getState(id: any): any;
21
+ _ensureMetaDict(): any;
22
+ /**
23
+ * Get value of given meta id
24
+ *
25
+ * @param {string} id
26
+ * @returns {*}
27
+ */
28
+ getMeta(id: string): any;
29
+ /**
30
+ * Sets given value to id in metaNamespace
31
+ *
32
+ * @param {string} id
33
+ * @param {string} value
34
+ */
35
+ setMeta(id: string, value: string): void;
36
+ _setStateDirect(id: any, obj: any, expire: any): void;
37
+ _delState(id: any): void;
38
+ _getKeys(pattern: any): string[];
39
+ _subscribeForClient(client: any, pattern: any): void;
40
+ _subscribeMeta(client: any, pattern: any): void;
41
+ _unsubscribeForClient(client: any, pattern: any): void;
42
+ _subscribeMessageForClient(client: any, id: any): void;
43
+ _unsubscribeMessageForClient(client: any, id: any): void;
44
+ _subscribeLogForClient(client: any, id: any): void;
45
+ _unsubscribeLogForClient(client: any, id: any): void;
46
+ _getSession(id: any): any;
47
+ _handleSessionExpire(id: any, expireDate: any): void;
48
+ _setSession(id: any, expire: any, obj: any): void;
49
+ _destroySession(id: any): void;
50
+ _setBinaryState(id: any, data: any): void;
51
+ }
52
+ import { InMemoryFileDB } from "@iobroker/db-base";
53
+ //# sourceMappingURL=statesInMemFileDB.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"statesInMemFileDB.d.ts","sourceRoot":"","sources":["../../../src/lib/states/statesInMemFileDB.js"],"names":[],"mappings":";AAwCA;;;IAGI;AACJ;IACI,2BA4BC;IApBG,SAAc;IACd,YAAiB;IACjB,wBAA4D;IAC5D,oBAAwD;IAExD,iBAAsB;IACtB,mBAAwB;IACxB,wBAA0C;IAC1C,0BAGe;IAYnB,mBAeC;IAGD,8CAaC;IAGD,8BASC;IAgBD,6BAQC;IAGD,wBAEC;IAED,uBAOC;IAED;;;;;OAKG;IACH,YAHW,MAAM,OAMhB;IAED;;;;;OAKG;IACH,YAHW,MAAM,SACN,MAAM,QAiBhB;IAGD,sDAiCC;IAGD,yBAiBC;IAGD,iCAGC;IAGD,qDAEC;IAED,gDAEC;IAGD,uDAEC;IAGD,uDAEC;IAGD,yDAEC;IAGD,mDAEC;IAGD,qDAEC;IAGD,0BAEC;IAGD,qDAyBC;IAGD,kDAUC;IAGD,+BAIC;IAGD,0CAmBC;CACJ"}
@@ -6,17 +6,13 @@
6
6
  * MIT License
7
7
  *
8
8
  */
9
-
10
9
  /** @module StatesInMemoryFileDB */
11
-
12
10
  /* jshint -W097 */
13
11
  /* jshint strict:false */
14
12
  /* jslint node: true */
15
13
  'use strict';
16
-
17
- const InMemoryFileDB = require('@iobroker/db-base').inMemoryFileDB;
14
+ const { InMemoryFileDB } = require('@iobroker/db-base');
18
15
  const tools = require('@iobroker/db-base').tools;
19
-
20
16
  // settings = {
21
17
  // change: function (id, state) {},
22
18
  // connected: function (nameOfServer) {},
@@ -37,7 +33,6 @@ const tools = require('@iobroker/db-base').tools;
37
33
  // host: localhost
38
34
  // };
39
35
  //
40
-
41
36
  /**
42
37
  * This class inherits InMemoryFileDB class and adds all relevant logic for states
43
38
  * including the available methods for use by js-controller directly
@@ -50,12 +45,10 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
50
45
  backupDirName: 'backup-objects'
51
46
  };
52
47
  super(settings);
53
-
54
48
  this.logs = {};
55
49
  this.session = {};
56
50
  this.globalMessageId = Math.round(Math.random() * 100000000);
57
51
  this.globalLogId = Math.round(Math.random() * 100000000);
58
-
59
52
  this.stateExpires = {};
60
53
  this.sessionExpires = {};
61
54
  this.ONE_DAY_IN_SECS = 24 * 60 * 60 * 1000;
@@ -66,13 +59,10 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
66
59
  if (settings.jsonlDB) {
67
60
  this.log.silly(`${this.namespace} States DB uses file write interval of ${this.writeFileInterval} ms`);
68
61
  }
69
-
70
62
  //this.settings.connection.maxQueue = this.settings.connection.maxQueue || 1000;
71
-
72
63
  // Reset expires, that are still in DB
73
64
  this._expireAll();
74
65
  }
75
-
76
66
  // internal functionality
77
67
  _expireAll() {
78
68
  Object.keys(this.stateExpires).forEach(id => {
@@ -85,53 +75,43 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
85
75
  this._expireState(id, true);
86
76
  }
87
77
  });
88
-
89
78
  if (!this.stateTimer) {
90
79
  this.stateTimer = setTimeout(() => this.saveState(), this.writeFileInterval);
91
80
  }
92
81
  }
93
-
94
82
  // internal functionality
95
83
  _expireState(id, dontPublish) {
96
84
  if (this.stateExpires[id] !== undefined) {
97
85
  delete this.stateExpires[id];
98
86
  }
99
-
100
87
  if (this.dataset[id] !== undefined) {
101
88
  delete this.dataset[id];
102
89
  !dontPublish && setImmediate(() => this.publishAll('state', id, null));
103
90
  }
104
-
105
91
  if (!this.stateTimer) {
106
92
  this.stateTimer = setTimeout(() => this.saveState(), this.writeFileInterval);
107
93
  }
108
94
  }
109
-
110
95
  // internal functionality
111
96
  _expireSession(id) {
112
97
  if (this.sessionExpires[id] && this.sessionExpires[id].timeout) {
113
98
  clearTimeout(this.sessionExpires[id].timeout);
114
99
  delete this.sessionExpires[id];
115
100
  }
116
-
117
101
  if (this.session[id] !== undefined) {
118
102
  delete this.session[id];
119
103
  }
120
104
  }
121
-
122
105
  // Destructor of the class. Called by shutting down.
123
106
  // internal functionality
124
107
  async destroy() {
125
108
  this._expireAll();
126
-
127
109
  await super.destroy();
128
-
129
110
  if (this.stateTimer) {
130
111
  clearTimeout(this.stateTimer);
131
112
  this.stateTimer = null;
132
113
  }
133
114
  }
134
-
135
115
  // needed by Server
136
116
  _getStates(keys) {
137
117
  if (!keys || !Array.isArray(keys)) {
@@ -142,12 +122,10 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
142
122
  return obj !== undefined ? obj : null;
143
123
  });
144
124
  }
145
-
146
125
  // needed by Server
147
126
  _getState(id) {
148
127
  return this.dataset[id];
149
128
  }
150
-
151
129
  _ensureMetaDict() {
152
130
  let meta = this.dataset['**META**'];
153
131
  if (!meta) {
@@ -156,7 +134,6 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
156
134
  }
157
135
  return meta;
158
136
  }
159
-
160
137
  /**
161
138
  * Get value of given meta id
162
139
  *
@@ -167,7 +144,6 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
167
144
  const meta = this._ensureMetaDict();
168
145
  return meta[id];
169
146
  }
170
-
171
147
  /**
172
148
  * Sets given value to id in metaNamespace
173
149
  *
@@ -179,32 +155,26 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
179
155
  meta[id] = value;
180
156
  // Make sure the object gets re-written, especially when using an external DB
181
157
  this.dataset['**META**'] = meta;
182
-
183
158
  setImmediate(() => {
184
159
  // publish event in states
185
160
  this.log.silly(`${this.namespace} memory publish meta ${id} ${value}`);
186
161
  this.publishAll('meta', id, value);
187
162
  });
188
-
189
163
  if (!this.stateTimer) {
190
164
  this.stateTimer = setTimeout(() => this.saveState(), this.writeFileInterval);
191
165
  }
192
166
  }
193
-
194
167
  // needed by Server
195
168
  _setStateDirect(id, obj, expire) {
196
169
  if (this.stateExpires[id]) {
197
170
  clearTimeout(this.stateExpires[id]);
198
171
  delete this.stateExpires[id];
199
172
  }
200
-
201
173
  if (expire) {
202
174
  this.stateExpires[id] = setTimeout(() => this._expireState(id), expire * 1000);
203
-
204
175
  obj.expire = true;
205
176
  }
206
177
  this.dataset[id] = obj;
207
-
208
178
  // If val === undefined, the state was just created and not filled with value
209
179
  if (obj.val !== undefined) {
210
180
  setImmediate(() => {
@@ -213,77 +183,71 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
213
183
  this.publishAll('state', id, obj);
214
184
  });
215
185
  }
216
-
186
+ else if ((obj || obj === 0) && typeof obj !== 'object') {
187
+ // it is binary state
188
+ setImmediate(() => {
189
+ const event = { val: null, binary: true, size: obj.length, ack: true };
190
+ // publish event in states
191
+ this.log.silly(`${this.namespace} memory publish ${id} ${JSON.stringify(event)}`);
192
+ this.publishAll('state', id, event);
193
+ });
194
+ }
217
195
  if (!this.stateTimer) {
218
196
  this.stateTimer = setTimeout(() => this.saveState(), this.writeFileInterval);
219
197
  }
220
198
  }
221
-
222
199
  // needed by Server
223
200
  _delState(id) {
224
201
  if (this.stateExpires[id]) {
225
202
  clearTimeout(this.stateExpires[id]);
226
203
  delete this.stateExpires[id];
227
204
  }
228
-
229
205
  const state = this.dataset[id];
230
206
  if (state) {
231
207
  const isBinary = Buffer.isBuffer(state);
232
208
  delete this.dataset[id];
233
-
234
209
  !isBinary && setImmediate(() => this.publishAll('state', id, null));
235
210
  }
236
-
237
211
  if (!this.stateTimer) {
238
212
  this.stateTimer = setTimeout(() => this.saveState(), this.writeFileInterval);
239
213
  }
240
214
  }
241
-
242
215
  // needed by Server
243
216
  _getKeys(pattern) {
244
217
  const r = new RegExp(tools.pattern2RegEx(pattern));
245
218
  return Object.keys(this.dataset).filter(id => r.test(id));
246
219
  }
247
-
248
220
  // needed by Server
249
221
  _subscribeForClient(client, pattern) {
250
222
  this.handleSubscribe(client, 'state', pattern);
251
223
  }
252
-
253
224
  _subscribeMeta(client, pattern) {
254
225
  this.handleSubscribe(client, 'meta', pattern);
255
226
  }
256
-
257
227
  // needed by Server
258
228
  _unsubscribeForClient(client, pattern) {
259
229
  this.handleUnsubscribe(client, 'state', pattern);
260
230
  }
261
-
262
231
  // needed by Server
263
232
  _subscribeMessageForClient(client, id) {
264
233
  this.handleSubscribe(client, 'messagebox', 'messagebox.' + id);
265
234
  }
266
-
267
235
  // needed by Server
268
236
  _unsubscribeMessageForClient(client, id) {
269
237
  this.handleUnsubscribe(client, 'messagebox', 'messagebox.' + id);
270
238
  }
271
-
272
239
  // needed by Server
273
240
  _subscribeLogForClient(client, id) {
274
241
  this.handleSubscribe(client, 'log', 'log.' + id);
275
242
  }
276
-
277
243
  // needed by Server
278
244
  _unsubscribeLogForClient(client, id) {
279
245
  this.handleUnsubscribe(client, 'log', 'log.' + id);
280
246
  }
281
-
282
247
  // needed by Server
283
248
  _getSession(id) {
284
249
  return this.session[id];
285
250
  }
286
-
287
251
  // internal functionality
288
252
  _handleSessionExpire(id, expireDate) {
289
253
  if (this.sessionExpires[id] && this.sessionExpires[id].timeout) {
@@ -293,7 +257,8 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
293
257
  const expireDelay = expireDate - Date.now();
294
258
  if (expireDelay <= 0) {
295
259
  this._expireSession(id);
296
- } else if (expireDate <= this.ONE_DAY_IN_SECS) {
260
+ }
261
+ else if (expireDate <= this.ONE_DAY_IN_SECS) {
297
262
  this.sessionExpires[id] = {
298
263
  sessionEnd: expireDate,
299
264
  timeout: setTimeout(() => {
@@ -301,7 +266,8 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
301
266
  this._expireSession(id);
302
267
  }, expireDate)
303
268
  };
304
- } else {
269
+ }
270
+ else {
305
271
  this.sessionExpires[id] = {
306
272
  sessionEnd: expireDate,
307
273
  timeout: setTimeout(() => {
@@ -311,38 +277,41 @@ class StatesInMemoryFileDB extends InMemoryFileDB {
311
277
  };
312
278
  }
313
279
  }
314
-
315
280
  // needed by Server
316
281
  _setSession(id, expire, obj) {
317
282
  this.session[id] = obj || {};
318
-
319
283
  if (this.sessionExpires[id] && this.sessionExpires[id].timeout) {
320
284
  clearTimeout(this.sessionExpires[id].timeout);
321
285
  delete this.sessionExpires[id];
322
286
  }
323
-
324
287
  this._handleSessionExpire(id, Date.now() + expire * 1000);
325
288
  this.session[id]._expire = true;
326
289
  }
327
-
328
290
  // needed by Server
329
291
  _destroySession(id) {
330
292
  if (this.session[id]) {
331
293
  delete this.session[id];
332
294
  }
333
295
  }
334
-
335
296
  // needed by Server
336
297
  _setBinaryState(id, data) {
337
298
  if (!Buffer.isBuffer(data)) {
338
299
  data = Buffer.from(data);
339
300
  }
340
301
  this.dataset[id] = data;
341
-
302
+ // If data === undefined, the state was just created and not filled with value
303
+ if (data !== undefined) {
304
+ setImmediate(() => {
305
+ const event = { val: null, binary: true, size: data.byteLength, ack: true };
306
+ // publish event in states
307
+ this.log.silly(`${this.namespace} memory publish ${id} ${JSON.stringify(event)}`);
308
+ this.publishAll('state', id, event);
309
+ });
310
+ }
342
311
  if (!this.stateTimer) {
343
312
  this.stateTimer = setTimeout(() => this.saveState(), this.writeFileInterval);
344
313
  }
345
314
  }
346
315
  }
347
-
348
316
  module.exports = StatesInMemoryFileDB;
317
+ //# sourceMappingURL=statesInMemFileDB.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"statesInMemFileDB.js","sourceRoot":"","sources":["../../../src/lib/states/statesInMemFileDB.js"],"names":[],"mappings":"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"}
@@ -0,0 +1,9 @@
1
+ export = StatesInMemoryServerClass;
2
+ declare class StatesInMemoryServerClass extends StatesInRedisClient {
3
+ constructor(settings: any);
4
+ statesServer: StatesInMemServer;
5
+ }
6
+ import StatesInRedisClient_1 = require("@iobroker/db-states-redis/build/lib/states/statesInRedisClient");
7
+ import StatesInRedisClient = StatesInRedisClient_1.Client;
8
+ import StatesInMemServer = require("./statesInMemServerRedis");
9
+ //# sourceMappingURL=statesInMemServerClass.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"statesInMemServerClass.d.ts","sourceRoot":"","sources":["../../../src/lib/states/statesInMemServerClass.js"],"names":[],"mappings":";AAmBA;IACI,2BAcC;IADG,gCAAyD;CAWhE;;mDA5BgE,MAAM"}
@@ -6,22 +6,17 @@
6
6
  * MIT License
7
7
  *
8
8
  */
9
-
10
9
  /** @module statesInMemory */
11
-
12
10
  /* jshint -W097 */
13
11
  /* jshint strict:false */
14
12
  /* jslint node: true */
15
13
  'use strict';
16
-
17
14
  const StatesInRedisClient = require('@iobroker/db-states-redis').Client;
18
15
  const StatesInMemServer = require('./statesInMemServerRedis');
19
-
20
16
  class StatesInMemoryServerClass extends StatesInRedisClient {
21
17
  constructor(settings) {
22
18
  settings.autoConnect = false; // delay Client connection to when we need it
23
19
  super(settings);
24
-
25
20
  const serverSettings = {
26
21
  namespace: settings.namespace ? `${settings.namespace}-Server` : 'Server',
27
22
  connection: settings.connection,
@@ -33,15 +28,13 @@ class StatesInMemoryServerClass extends StatesInRedisClient {
33
28
  };
34
29
  this.statesServer = new StatesInMemServer(serverSettings);
35
30
  }
36
-
37
31
  async destroy() {
38
32
  await super.destroy(); // destroy client first
39
33
  await this.statesServer.destroy(); // server afterwards too
40
34
  }
41
-
42
35
  getStatus() {
43
36
  return this.statesServer.getStatus(); // return Status as Server
44
37
  }
45
38
  }
46
-
47
39
  module.exports = StatesInMemoryServerClass;
40
+ //# sourceMappingURL=statesInMemServerClass.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"statesInMemServerClass.js","sourceRoot":"","sources":["../../../src/lib/states/statesInMemServerClass.js"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,6BAA6B;AAE7B,kBAAkB;AAClB,yBAAyB;AACzB,uBAAuB;AACvB,YAAY,CAAC;AAEb,MAAM,mBAAmB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC,MAAM,CAAC;AACxE,MAAM,iBAAiB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAE9D,MAAM,yBAA0B,SAAQ,mBAAmB;IACvD,YAAY,QAAQ;QAChB,QAAQ,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC,6CAA6C;QAC3E,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEhB,MAAM,cAAc,GAAG;YACnB,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,QAAQ;YACzE,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,mDAAmD;YACzE,CAAC;SACJ,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,IAAI,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,uBAAuB;QAC9C,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,wBAAwB;IAC/D,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,0BAA0B;IACpE,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,yBAAyB,CAAC"}
@@ -0,0 +1,67 @@
1
+ /// <reference types="node" />
2
+ export = StatesInMemoryServer;
3
+ /**
4
+ * This class inherits statesInMemoryFileDB class and adds socket.io communication layer
5
+ * to access the methods via socket.io
6
+ **/
7
+ declare class StatesInMemoryServer extends StatesInMemoryFileDB {
8
+ /**
9
+ * Constructor
10
+ * @param settings State and InMem-DB settings
11
+ */
12
+ constructor(settings: any);
13
+ serverConnections: {};
14
+ namespaceStates: string;
15
+ namespaceMsg: string;
16
+ namespaceLog: string;
17
+ namespaceSession: string;
18
+ namespaceMsgLen: number;
19
+ namespaceLogLen: number;
20
+ metaNamespace: string;
21
+ metaNamespaceLen: number;
22
+ /**
23
+ * Separate Namespace from ID and return both
24
+ * @param idWithNamespace ID or Array of IDs containing a redis namespace and the real ID
25
+ * @returns {{namespace: (string), id: string}} Object with namespace and the
26
+ * ID/Array of IDs without the namespace
27
+ * @private
28
+ */
29
+ private _normalizeId;
30
+ /**
31
+ * Publish a subscribed value to one of the redis connections in redis format
32
+ * @param client Instance of RedisHandler
33
+ * @param type Type of subscribed key
34
+ * @param id Subscribed ID
35
+ * @param obj Object to publish
36
+ * @returns {number} Publish counter 0 or 1 depending on if send out or not
37
+ */
38
+ publishToClients(client: any, type: any, id: any, obj: any): number;
39
+ /**
40
+ * Register all event listeners for Handler and implement the relevant logic
41
+ * @param handler RedisHandler instance
42
+ * @private
43
+ */
44
+ private _socketEvents;
45
+ /**
46
+ * Return connected RedisHandlers/Connections
47
+ * @returns {{}|*}
48
+ */
49
+ getClients(): {} | any;
50
+ /**
51
+ * Initialize RedisHandler for a new network connection
52
+ * @param socket Network socket
53
+ * @private
54
+ */
55
+ private _initSocket;
56
+ /**
57
+ * Initialize Redis Server
58
+ * @param settings Settings object
59
+ * @private
60
+ * @return {Promise<void>}
61
+ */
62
+ private _initRedisServer;
63
+ server: net.Server | undefined;
64
+ }
65
+ import StatesInMemoryFileDB = require("./statesInMemFileDB");
66
+ import net = require("net");
67
+ //# sourceMappingURL=statesInMemServerRedis.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"statesInMemServerRedis.d.ts","sourceRoot":"","sources":["../../../src/lib/states/statesInMemServerRedis.js"],"names":[],"mappings":";;AA0CA;;;IAGI;AACJ;IACI;;;OAGG;IACH,2BAoCC;IAjCG,sBAA2B;IAC3B,wBAAmE;IACnE,qBAAsE;IACtE,qBAA+D;IAC/D,yBAA2E;IAE3E,wBAA+C;IAC/C,wBAA+C;IAE/C,sBAAkE;IAClE,yBAAiD;IAyBrD;;;;;;OAMG;IACH,qBAsBC;IAED;;;;;;;OAOG;IACH,6DAFa,MAAM,CAkClB;IAED;;;;OAIG;IACH,sBA6SC;IAED;;;OAGG;IACH,cAFa,EAAE,MAAE,CAIhB;IA2BD;;;;OAIG;IACH,oBAoBC;IAED;;;;;OAKG;IACH,yBAyBC;IAnBW,+BAAgC;CAoB/C"}
@@ -6,19 +6,15 @@
6
6
  * MIT License
7
7
  *
8
8
  */
9
-
10
9
  /** @module statesInMemory */
11
-
12
10
  /* jshint -W097 */
13
11
  /* jshint strict:false */
14
12
  /* jslint node: true */
15
13
  'use strict';
16
14
  const net = require('net');
17
15
  const { inspect } = require('util');
18
-
19
- const RedisHandler = require('@iobroker/db-base').redisHandler;
16
+ const { RedisHandler } = require('@iobroker/db-base');
20
17
  const StatesInMemoryFileDB = require('./statesInMemFileDB');
21
-
22
18
  // settings = {
23
19
  // change: function (id, state) {},
24
20
  // connected: function (nameOfServer) {},
@@ -39,7 +35,6 @@ const StatesInMemoryFileDB = require('./statesInMemFileDB');
39
35
  // host: localhost
40
36
  // };
41
37
  //
42
-
43
38
  /**
44
39
  * This class inherits statesInMemoryFileDB class and adds socket.io communication layer
45
40
  * to access the methods via socket.io
@@ -51,7 +46,6 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
51
46
  */
52
47
  constructor(settings) {
53
48
  super(settings);
54
-
55
49
  this.serverConnections = {};
56
50
  this.namespaceStates = (this.settings.redisNamespace || 'io') + '.';
57
51
  this.namespaceMsg = (this.settings.namespaceMsg || 'messagebox') + '.';
@@ -63,30 +57,21 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
63
57
  //this.namespaceSessionlen = this.namespaceSession.length;
64
58
  this.metaNamespace = (this.settings.metaNamespace || 'meta') + '.';
65
59
  this.metaNamespaceLen = this.metaNamespace.length;
66
-
67
60
  this.open()
68
61
  .then(() => {
69
- return this._initRedisServer(this.settings.connection);
70
- })
62
+ return this._initRedisServer(this.settings.connection);
63
+ })
71
64
  .then(() => {
72
- this.log.debug(
73
- `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-states listening on port ${
74
- this.settings.port || 9000
75
- }`
76
- );
77
-
78
- if (typeof this.settings.connected === 'function') {
79
- setImmediate(() => this.settings.connected());
80
- }
81
- })
65
+ this.log.debug(`${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-states listening on port ${this.settings.port || 9000}`);
66
+ if (typeof this.settings.connected === 'function') {
67
+ setImmediate(() => this.settings.connected());
68
+ }
69
+ })
82
70
  .catch(e => {
83
- this.log.error(
84
- `${this.namespace} Cannot start inMem-states on port ${this.settings.port || 9000}: ${e.message}`
85
- );
86
- process.exit(24); // todo: replace it with exitcode
87
- });
71
+ this.log.error(`${this.namespace} Cannot start inMem-states on port ${this.settings.port || 9000}: ${e.message}`);
72
+ process.exit(24); // todo: replace it with exitcode
73
+ });
88
74
  }
89
-
90
75
  /**
91
76
  * Separate Namespace from ID and return both
92
77
  * @param idWithNamespace ID or Array of IDs containing a redis namespace and the real ID
@@ -105,7 +90,8 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
105
90
  ns = namespace; // we ignore the pot. case from arrays with different namespaces
106
91
  });
107
92
  id = ids;
108
- } else {
93
+ }
94
+ else {
109
95
  id = idWithNamespace;
110
96
  const pointIdx = idWithNamespace.indexOf('.');
111
97
  if (pointIdx !== -1) {
@@ -115,41 +101,39 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
115
101
  }
116
102
  }
117
103
  }
118
- return { id: id, namespace: ns };
104
+ return { id, namespace: ns };
119
105
  }
120
-
121
106
  /**
122
107
  * Publish a subscribed value to one of the redis connections in redis format
123
108
  * @param client Instance of RedisHandler
124
109
  * @param type Type of subscribed key
125
110
  * @param id Subscribed ID
126
111
  * @param obj Object to publish
127
- * @returns {number} Publish counter 0 or 1 depending if send out or not
112
+ * @returns {number} Publish counter 0 or 1 depending on if send out or not
128
113
  */
129
114
  publishToClients(client, type, id, obj) {
130
115
  if (!client._subscribe || !client._subscribe[type]) {
131
116
  return 0;
132
117
  }
133
118
  const s = client._subscribe[type];
134
-
135
119
  const found = s.find(sub => sub.regex.test(id));
136
-
137
120
  if (found) {
138
121
  if (type === 'meta') {
139
122
  this.log.silly(`${this.namespace} Redis Publish Meta ${id}=${obj}`);
140
123
  const sendPattern = this.metaNamespace + found.pattern;
141
124
  const sendId = this.metaNamespace + id;
142
125
  client.sendArray(null, ['pmessage', sendPattern, sendId, obj]);
143
- } else {
126
+ }
127
+ else {
144
128
  let objString;
145
129
  try {
146
130
  objString = JSON.stringify(obj);
147
- } catch (e) {
131
+ }
132
+ catch (e) {
148
133
  // mainly catch circular structures - thus log object with inspect
149
134
  this.log.error(`${this.namespace} Error on publishing state: ${id}=${inspect(obj)}: ${e.message}`);
150
135
  return 0;
151
136
  }
152
-
153
137
  this.log.silly(`${this.namespace} Redis Publish State ${id}=${objString}`);
154
138
  const sendPattern = (type === 'state' ? '' : this.namespaceStates) + found.pattern;
155
139
  const sendId = (type === 'state' ? '' : this.namespaceStates) + id;
@@ -159,7 +143,6 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
159
143
  }
160
144
  return 0;
161
145
  }
162
-
163
146
  /**
164
147
  * Register all event listeners for Handler and implement the relevant logic
165
148
  * @param handler RedisHandler instance
@@ -168,7 +151,6 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
168
151
  _socketEvents(handler) {
169
152
  let connectionName = null;
170
153
  let namespaceLog = this.namespace;
171
-
172
154
  // Handle Redis "INFO" request
173
155
  handler.on('info', (_data, responseId) => {
174
156
  let infoString = '# Server\r\n';
@@ -181,19 +163,15 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
181
163
  infoString += '# CPU\r\n';
182
164
  infoString += '# Cluster\r\n';
183
165
  infoString += '# Keyspace\r\n';
184
- infoString += `db0:keys=${Object.keys(this.dataset).length},expires=${
185
- Object.keys(this.stateExpires).length + Object.keys(this.sessionExpires).length
186
- },avg_ttl=98633637897`;
166
+ infoString += `db0:keys=${Object.keys(this.dataset).length},expires=${Object.keys(this.stateExpires).length + Object.keys(this.sessionExpires).length},avg_ttl=98633637897`;
187
167
  handler.sendBulk(responseId, infoString);
188
168
  });
189
-
190
169
  // Handle Redis "QUIT" request
191
170
  handler.on('quit', (_data, responseId) => {
192
171
  this.log.silly(`${namespaceLog} Redis QUIT received, close connection`);
193
172
  handler.sendString(responseId, 'OK');
194
173
  handler.close();
195
174
  });
196
-
197
175
  // Handle Redis "PUBLISH" request
198
176
  handler.on('publish', (data, responseId) => {
199
177
  const { id, namespace } = this._normalizeId(data[0]);
@@ -204,30 +182,26 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
204
182
  const publishCount = this.publishAll(namespace.substr(0, namespace.length - 1), id, JSON.parse(data[1]));
205
183
  handler.sendInteger(responseId, publishCount);
206
184
  });
207
-
208
185
  // Handle Redis "MGET" request for state namespace
209
186
  handler.on('mget', (data, responseId) => {
210
187
  if (!data || !data[0]) {
211
188
  return void handler.sendArray(responseId, []);
212
189
  }
213
190
  const { id, namespace } = this._normalizeId(data);
214
-
215
191
  if (namespace === this.namespaceStates) {
216
192
  try {
217
193
  const states = this._getStates(id);
218
194
  const result = states.map(el => (el ? JSON.stringify(el) : null));
219
195
  handler.sendArray(responseId, result);
220
- } catch (err) {
196
+ }
197
+ catch (err) {
221
198
  handler.sendError(responseId, new Error('ERROR _getStates: ' + err.message));
222
199
  }
223
- } else {
224
- handler.sendError(
225
- responseId,
226
- new Error(`MGET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
227
- );
200
+ }
201
+ else {
202
+ handler.sendError(responseId, new Error(`MGET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
228
203
  }
229
204
  });
230
-
231
205
  // Handle Redis "GET" request for state and session namespace
232
206
  handler.on('get', (data, responseId) => {
233
207
  const { id, namespace } = this._normalizeId(data[0]);
@@ -235,35 +209,38 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
235
209
  const result = this._getState(id);
236
210
  if (!result) {
237
211
  handler.sendNull(responseId);
238
- } else {
212
+ }
213
+ else {
239
214
  if (Buffer.isBuffer(result)) {
240
215
  handler.sendBufBulk(responseId, result);
241
- } else {
216
+ }
217
+ else {
242
218
  handler.sendBulk(responseId, JSON.stringify(result));
243
219
  }
244
220
  }
245
- } else if (namespace === this.namespaceSession) {
221
+ }
222
+ else if (namespace === this.namespaceSession) {
246
223
  const result = this._getSession(id);
247
224
  if (result === undefined || result === null) {
248
225
  handler.sendNull(responseId);
249
- } else {
226
+ }
227
+ else {
250
228
  handler.sendBulk(responseId, JSON.stringify(result));
251
229
  }
252
- } else if (namespace === this.metaNamespace) {
230
+ }
231
+ else if (namespace === this.metaNamespace) {
253
232
  const result = this.getMeta(id);
254
233
  if (result === undefined || result === null) {
255
234
  handler.sendNull(responseId);
256
- } else {
235
+ }
236
+ else {
257
237
  handler.sendBulk(responseId, result);
258
238
  }
259
- } else {
260
- handler.sendError(
261
- responseId,
262
- new Error(`GET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
263
- );
239
+ }
240
+ else {
241
+ handler.sendError(responseId, new Error(`GET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
264
242
  }
265
243
  });
266
-
267
244
  // Handle Redis "SET" request for state namespace
268
245
  handler.on('set', (data, responseId) => {
269
246
  const { id, namespace } = this._normalizeId(data[0]);
@@ -272,27 +249,27 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
272
249
  let state;
273
250
  try {
274
251
  state = JSON.parse(data[1].toString('utf-8'));
275
- } catch {
252
+ }
253
+ catch {
276
254
  // No JSON, so handle as binary data and set as Buffer
277
255
  this._setBinaryState(id, data[1]);
278
256
  return void handler.sendString(responseId, 'OK');
279
257
  }
280
258
  this._setStateDirect(id, state);
281
259
  handler.sendString(responseId, 'OK');
282
- } catch (err) {
260
+ }
261
+ catch (err) {
283
262
  handler.sendError(responseId, new Error(`ERROR setState id=${id}: ${err.message}`));
284
263
  }
285
- } else if (namespace === this.metaNamespace) {
264
+ }
265
+ else if (namespace === this.metaNamespace) {
286
266
  this.setMeta(id, data[1].toString('utf-8'));
287
267
  handler.sendString(responseId, 'OK');
288
- } else {
289
- handler.sendError(
290
- responseId,
291
- new Error(`SET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
292
- );
268
+ }
269
+ else {
270
+ handler.sendError(responseId, new Error(`SET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
293
271
  }
294
272
  });
295
-
296
273
  // Handle Redis "SETEX" request for state and session namespace
297
274
  handler.on('setex', (data, responseId) => {
298
275
  const { id, namespace } = this._normalizeId(data[0]);
@@ -301,62 +278,55 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
301
278
  let state;
302
279
  try {
303
280
  state = JSON.parse(data[2].toString('utf-8'));
304
- } catch {
281
+ }
282
+ catch {
305
283
  // No JSON, so handle as binary data and set as Buffer
306
284
  state = data[2];
307
285
  }
308
286
  const expire = parseInt(data[1].toString('utf-8'), 10);
309
287
  if (isNaN(expire)) {
310
- return void handler.sendError(
311
- responseId,
312
- new Error(`ERROR parsing expire value ${data[1].toString('utf-8')}`)
313
- );
288
+ return void handler.sendError(responseId, new Error(`ERROR parsing expire value ${data[1].toString('utf-8')}`));
314
289
  }
315
290
  this._setStateDirect(id, state, expire);
316
291
  handler.sendString(responseId, 'OK');
317
- } catch (err) {
292
+ }
293
+ catch (err) {
318
294
  handler.sendError(responseId, new Error(`ERROR setStateEx id=${id}: ${err.message}`));
319
295
  }
320
- } else if (namespace === this.namespaceSession) {
296
+ }
297
+ else if (namespace === this.namespaceSession) {
321
298
  try {
322
299
  const state = JSON.parse(data[2].toString('utf-8'));
323
300
  const expire = parseInt(data[1].toString('utf-8'), 10);
324
301
  if (isNaN(expire)) {
325
- return void handler.sendError(
326
- responseId,
327
- new Error(`ERROR parsing expire value ${data[1].toString('utf-8')}`)
328
- );
302
+ return void handler.sendError(responseId, new Error(`ERROR parsing expire value ${data[1].toString('utf-8')}`));
329
303
  }
330
304
  this._setSession(id, expire, state);
331
305
  handler.sendString(responseId, 'OK');
332
- } catch (err) {
306
+ }
307
+ catch (err) {
333
308
  handler.sendError(responseId, new Error(`ERROR _setSession ${id}: ${err.message}`));
334
309
  }
335
- } else {
336
- handler.sendError(
337
- responseId,
338
- new Error(`SETEX-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
339
- );
310
+ }
311
+ else {
312
+ handler.sendError(responseId, new Error(`SETEX-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
340
313
  }
341
314
  });
342
-
343
315
  // Handle Redis "DEL" request for state and session namespace
344
316
  handler.on('del', (data, responseId) => {
345
317
  const { id, namespace } = this._normalizeId(data[0]);
346
318
  if (namespace === this.namespaceStates) {
347
319
  this._delState(id);
348
320
  handler.sendInteger(responseId, 1);
349
- } else if (namespace === this.namespaceSession) {
321
+ }
322
+ else if (namespace === this.namespaceSession) {
350
323
  this._destroySession(id);
351
324
  handler.sendInteger(responseId, 1);
352
- } else {
353
- handler.sendError(
354
- responseId,
355
- new Error(`DEL-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
356
- );
325
+ }
326
+ else {
327
+ handler.sendError(responseId, new Error(`DEL-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
357
328
  }
358
329
  });
359
-
360
330
  // Handle Redis "KEYS" request for state namespace
361
331
  handler.on('keys', (data, responseId) => {
362
332
  if (!data || !data.length) {
@@ -372,98 +342,97 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
372
342
  const keys = this._getKeys(pattern);
373
343
  const result = keys.map(id => this.namespaceStates + id);
374
344
  handler.sendArray(responseId, result);
375
- } else {
376
- handler.sendError(
377
- responseId,
378
- new Error(`KEYS-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
379
- );
345
+ }
346
+ else {
347
+ handler.sendError(responseId, new Error(`KEYS-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
380
348
  }
381
349
  });
382
-
383
350
  // Handle Redis "PSUBSCRIBE" request for state, log and session namespace
384
351
  handler.on('psubscribe', (data, responseId) => {
385
352
  const { id, namespace } = this._normalizeId(data[0]);
386
353
  if (namespace === this.namespaceMsg) {
387
354
  this._subscribeMessageForClient(handler, id.substr(this.namespaceMsgLen));
388
355
  handler.sendArray(responseId, ['psubscribe', data[0], 1]);
389
- } else if (namespace === this.namespaceLog) {
356
+ }
357
+ else if (namespace === this.namespaceLog) {
390
358
  this._subscribeLogForClient(handler, id.substr(this.namespaceLogLen));
391
359
  handler.sendArray(responseId, ['psubscribe', data[0], 1]);
392
- } else if (namespace === this.namespaceStates) {
360
+ }
361
+ else if (namespace === this.namespaceStates) {
393
362
  this._subscribeForClient(handler, id);
394
363
  handler.sendArray(responseId, ['psubscribe', data[0], 1]);
395
- } else if (namespace === this.metaNamespace) {
364
+ }
365
+ else if (namespace === this.metaNamespace) {
396
366
  this._subscribeMeta(handler, id);
397
367
  handler.sendArray(responseId, ['psubscribe', data[0], 1]);
398
- } else {
399
- handler.sendError(
400
- responseId,
401
- new Error(`PSUBSCRIBE-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
402
- );
368
+ }
369
+ else {
370
+ handler.sendError(responseId, new Error(`PSUBSCRIBE-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
403
371
  }
404
372
  });
405
-
406
373
  // Handle Redis "UNSUBSCRIBE" request for state, log and session namespace
407
374
  handler.on('punsubscribe', (data, responseId) => {
408
375
  const { id, namespace } = this._normalizeId(data[0]);
409
376
  if (namespace === this.namespaceMsg) {
410
377
  this._unsubscribeMessageForClient(handler, id.substr(this.namespaceMsgLen));
411
378
  handler.sendArray(responseId, ['punsubscribe', data[0], 1]);
412
- } else if (namespace === this.namespaceLog) {
379
+ }
380
+ else if (namespace === this.namespaceLog) {
413
381
  this._unsubscribeLogForClient(handler, id.substr(this.namespaceLogLen));
414
382
  handler.sendArray(responseId, ['punsubscribe', data[0], 1]);
415
- } else if (namespace === this.namespaceStates) {
383
+ }
384
+ else if (namespace === this.namespaceStates) {
416
385
  this._unsubscribeForClient(handler, id);
417
386
  handler.sendArray(responseId, ['punsubscribe', data[0], 1]);
418
- } else {
419
- handler.sendError(
420
- responseId,
421
- new Error(`PUNSUBSCRIBE-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
422
- );
387
+ }
388
+ else {
389
+ handler.sendError(responseId, new Error(`PUNSUBSCRIBE-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
423
390
  }
424
391
  });
425
-
426
392
  // Handle Redis "SUBSCRIBE" ... currently mainly ignored
427
393
  handler.on('subscribe', (data, responseId) => {
428
394
  if (data[0].startsWith('__keyevent@')) {
429
395
  // we ignore these type of events because we publish expires anyway directly
430
396
  handler.sendArray(responseId, ['subscribe', data[0], 1]);
431
- } else {
397
+ }
398
+ else {
432
399
  handler.sendError(responseId, new Error(`SUBSCRIBE-UNSUPPORTED for ${data[0]}`));
433
400
  }
434
401
  });
435
-
436
402
  // Handle Redis "CONFIG" ... currently mainly ignored
437
403
  handler.on('config', (data, responseId) => {
438
- if (data[0] === 'set' && data[1] === 'notify-keyspace-events') {
404
+ if (typeof data[0] === 'string' &&
405
+ data[0].toLowerCase() === 'set' &&
406
+ data[1] === 'notify-keyspace-events') {
439
407
  // we ignore these type of commands for now, should only be to subscribe to keyspace events
440
408
  handler.sendString(responseId, 'OK');
441
- } else {
409
+ }
410
+ else {
442
411
  handler.sendError(responseId, new Error(`CONFIG-UNSUPPORTED for ${JSON.stringify(data)}`));
443
412
  }
444
413
  });
445
-
446
414
  // handle client SETNAME/GETNAME
447
415
  handler.on('client', (data, responseId) => {
448
416
  if (data[0] === 'setname' && typeof data[1] === 'string') {
449
417
  connectionName = data[1];
450
418
  namespaceLog = connectionName;
451
419
  handler.sendString(responseId, 'OK');
452
- } else if (data[0] === 'getname') {
420
+ }
421
+ else if (data[0] === 'getname') {
453
422
  if (connectionName && typeof connectionName === 'string') {
454
423
  handler.sendString(responseId, connectionName);
455
- } else {
424
+ }
425
+ else {
456
426
  // redis sends null if no name defined
457
427
  handler.sendNull(responseId);
458
428
  }
459
- } else {
429
+ }
430
+ else {
460
431
  handler.sendError(responseId, new Error(`CLIENT-UNSUPPORTED for ${JSON.stringify(data)}`));
461
432
  }
462
433
  });
463
-
464
434
  handler.on('error', err => this.log.warn(`${namespaceLog} Redis states: ${err}`));
465
435
  }
466
-
467
436
  /**
468
437
  * Return connected RedisHandlers/Connections
469
438
  * @returns {{}|*}
@@ -471,7 +440,6 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
471
440
  getClients() {
472
441
  return this.serverConnections;
473
442
  }
474
-
475
443
  /**
476
444
  * Destructor of the class. Called by shutting down.
477
445
  */
@@ -481,14 +449,14 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
481
449
  this.serverConnections[s].close();
482
450
  delete this.serverConnections[s];
483
451
  }
484
-
485
452
  await new Promise(resolve => {
486
453
  if (!this.server) {
487
454
  return void resolve();
488
455
  }
489
456
  try {
490
457
  this.server.close(() => resolve());
491
- } catch (e) {
458
+ }
459
+ catch (e) {
492
460
  console.log(e.message);
493
461
  resolve();
494
462
  }
@@ -496,7 +464,6 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
496
464
  }
497
465
  await super.destroy();
498
466
  }
499
-
500
467
  /**
501
468
  * Initialize RedisHandler for a new network connection
502
469
  * @param socket Network socket
@@ -505,7 +472,6 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
505
472
  _initSocket(socket) {
506
473
  this.settings.connection.enhancedLogging &&
507
474
  this.log.silly(`${this.namespace} Handling new Redis States connection`);
508
-
509
475
  const options = {
510
476
  log: this.log,
511
477
  logScope: this.namespace + ' States',
@@ -514,16 +480,13 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
514
480
  };
515
481
  const handler = new RedisHandler(socket, options);
516
482
  this._socketEvents(handler);
517
-
518
483
  this.serverConnections[socket.remoteAddress + ':' + socket.remotePort] = handler;
519
-
520
484
  socket.on('close', () => {
521
485
  if (this.serverConnections[socket.remoteAddress + ':' + socket.remotePort]) {
522
486
  delete this.serverConnections[socket.remoteAddress + ':' + socket.remotePort];
523
487
  }
524
488
  });
525
489
  }
526
-
527
490
  /**
528
491
  * Initialize Redis Server
529
492
  * @param settings Settings object
@@ -537,25 +500,15 @@ class StatesInMemoryServer extends StatesInMemoryFileDB {
537
500
  }
538
501
  try {
539
502
  this.server = net.createServer();
540
- this.server.on('error', err =>
541
- this.log.info(
542
- `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-objects listening on port ${
543
- settings.port || 9001
544
- }: ${err}`
545
- )
546
- );
503
+ this.server.on('error', err => this.log.info(`${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-objects listening on port ${settings.port || 9001}: ${err}`));
547
504
  this.server.on('connection', socket => this._initSocket(socket));
548
-
549
- this.server.listen(
550
- settings.port || 9000,
551
- settings.host === 'localhost' ? '127.0.0.1' : settings.host ? settings.host : undefined,
552
- () => resolve()
553
- );
554
- } catch (err) {
505
+ this.server.listen(settings.port || 9000, settings.host === 'localhost' ? '127.0.0.1' : settings.host ? settings.host : undefined, () => resolve());
506
+ }
507
+ catch (err) {
555
508
  reject(err);
556
509
  }
557
510
  });
558
511
  }
559
512
  }
560
-
561
513
  module.exports = StatesInMemoryServer;
514
+ //# sourceMappingURL=statesInMemServerRedis.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"statesInMemServerRedis.js","sourceRoot":"","sources":["../../../src/lib/states/statesInMemServerRedis.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@iobroker/db-states-file",
3
- "version": "4.0.21",
3
+ "version": "4.1.0-alpha.0-20220819-74ceeddc",
4
4
  "engines": {
5
5
  "node": ">=12.0.0"
6
6
  },
7
7
  "dependencies": {
8
- "@iobroker/db-base": "4.0.21",
9
- "@iobroker/db-states-redis": "4.0.21"
8
+ "@iobroker/db-base": "4.1.0-alpha.0-20220819-74ceeddc",
9
+ "@iobroker/db-states-redis": "4.1.0-alpha.0-20220819-74ceeddc"
10
10
  },
11
11
  "keywords": [
12
12
  "ioBroker",
@@ -23,15 +23,19 @@
23
23
  "type": "git",
24
24
  "url": "https://github.com/ioBroker/ioBroker.js-controller/packages/db-states-file"
25
25
  },
26
- "scripts": {},
27
- "main": "index.js",
26
+ "scripts": {
27
+ "build": "tsc -b tsconfig.build.json"
28
+ },
29
+ "main": "build/index.js",
30
+ "types": "build/index.d.ts",
28
31
  "license": "MIT",
29
32
  "publishConfig": {
30
33
  "access": "public"
31
34
  },
32
35
  "files": [
33
- "lib/",
34
- "index.js"
36
+ "build/lib/",
37
+ "build/index.js",
38
+ "build/index.d.ts"
35
39
  ],
36
- "gitHead": "4749d256d312623ae7621e7ae47d44580b3aa8c1"
40
+ "gitHead": "febfe24ecb050ec02f848cc869d84aa30d69c615"
37
41
  }