homebridge 1.7.0-beta.1 → 1.7.0-beta.2
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/README.md +1 -1
- package/lib/api.d.ts +9 -9
- package/lib/api.d.ts.map +1 -1
- package/lib/api.js +20 -20
- package/lib/api.js.map +1 -1
- package/lib/bridgeService.js +34 -25
- package/lib/bridgeService.js.map +1 -1
- package/lib/childBridgeFork.js +27 -17
- package/lib/childBridgeFork.js.map +1 -1
- package/lib/childBridgeService.d.ts.map +1 -1
- package/lib/childBridgeService.js +46 -39
- package/lib/childBridgeService.js.map +1 -1
- package/lib/externalPortService.js +4 -1
- package/lib/externalPortService.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/ipcService.js +3 -3
- package/lib/ipcService.js.map +1 -1
- package/lib/logger.js +14 -13
- package/lib/logger.js.map +1 -1
- package/lib/platformAccessory.d.ts +1 -1
- package/lib/platformAccessory.d.ts.map +1 -1
- package/lib/platformAccessory.js +23 -14
- package/lib/platformAccessory.js.map +1 -1
- package/lib/plugin.js +14 -4
- package/lib/plugin.js.map +1 -1
- package/lib/pluginManager.js +15 -11
- package/lib/pluginManager.js.map +1 -1
- package/lib/server.js +42 -36
- package/lib/server.js.map +1 -1
- package/lib/storageService.js +1 -0
- package/lib/storageService.js.map +1 -1
- package/lib/user.js +2 -1
- package/lib/user.js.map +1 -1
- package/lib/util/mac.d.ts +2 -1
- package/lib/util/mac.d.ts.map +1 -1
- package/package.json +19 -19
|
@@ -43,7 +43,7 @@ var ChildProcessMessageEventType;
|
|
|
43
43
|
* Sent from the child to update it's current status
|
|
44
44
|
*/
|
|
45
45
|
ChildProcessMessageEventType["STATUS_UPDATE"] = "status";
|
|
46
|
-
})(ChildProcessMessageEventType
|
|
46
|
+
})(ChildProcessMessageEventType || (exports.ChildProcessMessageEventType = ChildProcessMessageEventType = {}));
|
|
47
47
|
var ChildBridgeStatus;
|
|
48
48
|
(function (ChildBridgeStatus) {
|
|
49
49
|
/**
|
|
@@ -58,12 +58,31 @@ var ChildBridgeStatus;
|
|
|
58
58
|
* The bridge is shutting down, or the process ended unexpectedly
|
|
59
59
|
*/
|
|
60
60
|
ChildBridgeStatus["DOWN"] = "down";
|
|
61
|
-
})(ChildBridgeStatus
|
|
61
|
+
})(ChildBridgeStatus || (exports.ChildBridgeStatus = ChildBridgeStatus = {}));
|
|
62
62
|
/**
|
|
63
63
|
* Manages the child processes of platforms/accessories being exposed as seperate forked bridges.
|
|
64
64
|
* A child bridge runs a single platform or accessory.
|
|
65
65
|
*/
|
|
66
66
|
class ChildBridgeService {
|
|
67
|
+
type;
|
|
68
|
+
identifier;
|
|
69
|
+
plugin;
|
|
70
|
+
bridgeConfig;
|
|
71
|
+
homebridgeConfig;
|
|
72
|
+
homebridgeOptions;
|
|
73
|
+
api;
|
|
74
|
+
ipcService;
|
|
75
|
+
externalPortService;
|
|
76
|
+
child;
|
|
77
|
+
args = [];
|
|
78
|
+
shuttingDown = false;
|
|
79
|
+
lastBridgeStatus = "pending" /* ChildBridgeStatus.PENDING */;
|
|
80
|
+
pairedStatus = null;
|
|
81
|
+
manuallyStopped = false;
|
|
82
|
+
setupUri = null;
|
|
83
|
+
pluginConfig = [];
|
|
84
|
+
log;
|
|
85
|
+
displayName;
|
|
67
86
|
constructor(type, identifier, plugin, bridgeConfig, homebridgeConfig, homebridgeOptions, api, ipcService, externalPortService) {
|
|
68
87
|
this.type = type;
|
|
69
88
|
this.identifier = identifier;
|
|
@@ -74,13 +93,6 @@ class ChildBridgeService {
|
|
|
74
93
|
this.api = api;
|
|
75
94
|
this.ipcService = ipcService;
|
|
76
95
|
this.externalPortService = externalPortService;
|
|
77
|
-
this.args = [];
|
|
78
|
-
this.shuttingDown = false;
|
|
79
|
-
this.lastBridgeStatus = "pending" /* PENDING */;
|
|
80
|
-
this.pairedStatus = null;
|
|
81
|
-
this.manuallyStopped = false;
|
|
82
|
-
this.setupUri = null;
|
|
83
|
-
this.pluginConfig = [];
|
|
84
96
|
this.log = logger_1.Logger.withPrefix(this.plugin.getPluginIdentifier());
|
|
85
97
|
this.api.on("shutdown", () => {
|
|
86
98
|
this.shuttingDown = true;
|
|
@@ -93,7 +105,6 @@ class ChildBridgeService {
|
|
|
93
105
|
* Start the child bridge service
|
|
94
106
|
*/
|
|
95
107
|
start() {
|
|
96
|
-
var _a;
|
|
97
108
|
this.setProcessFlags();
|
|
98
109
|
this.startChildProcess();
|
|
99
110
|
// set display name
|
|
@@ -101,7 +112,7 @@ class ChildBridgeService {
|
|
|
101
112
|
this.displayName = this.plugin.getPluginIdentifier();
|
|
102
113
|
}
|
|
103
114
|
else {
|
|
104
|
-
this.displayName =
|
|
115
|
+
this.displayName = this.pluginConfig[0]?.name || this.plugin.getPluginIdentifier();
|
|
105
116
|
}
|
|
106
117
|
// re-configured log with display name
|
|
107
118
|
this.log = logger_1.Logger.withPrefix(this.displayName);
|
|
@@ -125,40 +136,39 @@ class ChildBridgeService {
|
|
|
125
136
|
* Start the child bridge process
|
|
126
137
|
*/
|
|
127
138
|
startChildProcess() {
|
|
128
|
-
this.bridgeStatus = "pending" /* PENDING */;
|
|
139
|
+
this.bridgeStatus = "pending" /* ChildBridgeStatus.PENDING */;
|
|
129
140
|
this.child = child_process_1.default.fork(path_1.default.resolve(__dirname, "childBridgeFork.js"), this.args, {
|
|
130
141
|
silent: true,
|
|
131
142
|
});
|
|
132
|
-
this.child.stdout
|
|
143
|
+
this.child.stdout?.on("data", (data) => {
|
|
133
144
|
process.stdout.write(data);
|
|
134
145
|
});
|
|
135
|
-
this.child.stderr
|
|
146
|
+
this.child.stderr?.on("data", (data) => {
|
|
136
147
|
process.stderr.write(data);
|
|
137
148
|
});
|
|
138
149
|
this.child.on("exit", () => {
|
|
139
150
|
this.log.warn("Child bridge process ended");
|
|
140
151
|
});
|
|
141
152
|
this.child.on("error", (e) => {
|
|
142
|
-
this.bridgeStatus = "down" /* DOWN */;
|
|
153
|
+
this.bridgeStatus = "down" /* ChildBridgeStatus.DOWN */;
|
|
143
154
|
this.log.error("Child process error", e);
|
|
144
155
|
});
|
|
145
156
|
this.child.once("close", (code, signal) => {
|
|
146
|
-
this.bridgeStatus = "down" /* DOWN */;
|
|
157
|
+
this.bridgeStatus = "down" /* ChildBridgeStatus.DOWN */;
|
|
147
158
|
this.handleProcessClose(code, signal);
|
|
148
159
|
});
|
|
149
160
|
// handle incoming ipc messages from the child process
|
|
150
161
|
this.child.on("message", (message) => {
|
|
151
|
-
var _a;
|
|
152
162
|
if (typeof message !== "object" || !message.id) {
|
|
153
163
|
return;
|
|
154
164
|
}
|
|
155
165
|
switch (message.id) {
|
|
156
|
-
case "ready" /* READY */: {
|
|
157
|
-
this.log(`Launched child bridge with PID ${
|
|
166
|
+
case "ready" /* ChildProcessMessageEventType.READY */: {
|
|
167
|
+
this.log(`Launched child bridge with PID ${this.child?.pid}`);
|
|
158
168
|
this.loadPlugin();
|
|
159
169
|
break;
|
|
160
170
|
}
|
|
161
|
-
case "loaded" /* LOADED */: {
|
|
171
|
+
case "loaded" /* ChildProcessMessageEventType.LOADED */: {
|
|
162
172
|
const version = message.data.version;
|
|
163
173
|
if (this.pluginConfig.length > 1) {
|
|
164
174
|
this.log(`Loaded ${this.plugin.getPluginIdentifier()} v${version} child bridge successfully with ${this.pluginConfig.length} accessories`);
|
|
@@ -169,15 +179,15 @@ class ChildBridgeService {
|
|
|
169
179
|
this.startBridge();
|
|
170
180
|
break;
|
|
171
181
|
}
|
|
172
|
-
case "online" /* ONLINE */: {
|
|
173
|
-
this.bridgeStatus = "ok" /* OK */;
|
|
182
|
+
case "online" /* ChildProcessMessageEventType.ONLINE */: {
|
|
183
|
+
this.bridgeStatus = "ok" /* ChildBridgeStatus.OK */;
|
|
174
184
|
break;
|
|
175
185
|
}
|
|
176
|
-
case "portRequest" /* PORT_REQUEST */: {
|
|
186
|
+
case "portRequest" /* ChildProcessMessageEventType.PORT_REQUEST */: {
|
|
177
187
|
this.handlePortRequest(message.data);
|
|
178
188
|
break;
|
|
179
189
|
}
|
|
180
|
-
case "status" /* STATUS_UPDATE */: {
|
|
190
|
+
case "status" /* ChildProcessMessageEventType.STATUS_UPDATE */: {
|
|
181
191
|
this.pairedStatus = message.data.paired;
|
|
182
192
|
this.setupUri = message.data.setupUri;
|
|
183
193
|
this.sendStatusUpdate();
|
|
@@ -261,7 +271,7 @@ class ChildBridgeService {
|
|
|
261
271
|
};
|
|
262
272
|
// shallow copy the homebridge options to the bridge options object
|
|
263
273
|
Object.assign(bridgeOptions, this.homebridgeOptions);
|
|
264
|
-
this.sendMessage("load" /* LOAD */, {
|
|
274
|
+
this.sendMessage("load" /* ChildProcessMessageEventType.LOAD */, {
|
|
265
275
|
type: this.type,
|
|
266
276
|
identifier: this.identifier,
|
|
267
277
|
pluginPath: this.plugin.getPluginPath(),
|
|
@@ -282,14 +292,14 @@ class ChildBridgeService {
|
|
|
282
292
|
* Tell the child bridge to start broadcasting
|
|
283
293
|
*/
|
|
284
294
|
startBridge() {
|
|
285
|
-
this.sendMessage("start" /* START */);
|
|
295
|
+
this.sendMessage("start" /* ChildProcessMessageEventType.START */);
|
|
286
296
|
}
|
|
287
297
|
/**
|
|
288
298
|
* Handle external port requests from child
|
|
289
299
|
*/
|
|
290
300
|
async handlePortRequest(request) {
|
|
291
301
|
const port = await this.externalPortService.requestPort(request.username);
|
|
292
|
-
this.sendMessage("portAllocated" /* PORT_ALLOCATED */, {
|
|
302
|
+
this.sendMessage("portAllocated" /* ChildProcessMessageEventType.PORT_ALLOCATED */, {
|
|
293
303
|
username: request.username,
|
|
294
304
|
port: port,
|
|
295
305
|
});
|
|
@@ -299,7 +309,7 @@ class ChildBridgeService {
|
|
|
299
309
|
*/
|
|
300
310
|
teardown() {
|
|
301
311
|
if (this.child && this.child.connected) {
|
|
302
|
-
this.bridgeStatus = "down" /* DOWN */;
|
|
312
|
+
this.bridgeStatus = "down" /* ChildBridgeStatus.DOWN */;
|
|
303
313
|
this.child.kill("SIGTERM");
|
|
304
314
|
}
|
|
305
315
|
}
|
|
@@ -307,7 +317,7 @@ class ChildBridgeService {
|
|
|
307
317
|
* Trigger sending child bridge metdata to the process parent via IPC
|
|
308
318
|
*/
|
|
309
319
|
sendStatusUpdate() {
|
|
310
|
-
this.ipcService.sendMessage("childBridgeStatusUpdate" /* CHILD_BRIDGE_STATUS_UPDATE */, this.getMetadata());
|
|
320
|
+
this.ipcService.sendMessage("childBridgeStatusUpdate" /* IpcOutgoingEvent.CHILD_BRIDGE_STATUS_UPDATE */, this.getMetadata());
|
|
311
321
|
}
|
|
312
322
|
/**
|
|
313
323
|
* Restarts the child bridge process
|
|
@@ -326,12 +336,11 @@ class ChildBridgeService {
|
|
|
326
336
|
* Stops the child bridge, not starting it again
|
|
327
337
|
*/
|
|
328
338
|
stopChildBridge() {
|
|
329
|
-
var _a;
|
|
330
339
|
if (!this.shuttingDown) {
|
|
331
340
|
this.log.warn("Stopping child bridge (will not restart)...");
|
|
332
341
|
this.shuttingDown = true;
|
|
333
342
|
this.manuallyStopped = true;
|
|
334
|
-
|
|
343
|
+
this.child?.removeAllListeners("close");
|
|
335
344
|
this.teardown();
|
|
336
345
|
}
|
|
337
346
|
else {
|
|
@@ -342,7 +351,7 @@ class ChildBridgeService {
|
|
|
342
351
|
* Starts the child bridge, only if it was manually stopped and is no longer running
|
|
343
352
|
*/
|
|
344
353
|
startChildBridge() {
|
|
345
|
-
if (this.manuallyStopped && this.bridgeStatus === "down" /* DOWN */ && (!this.child || !this.child.connected)) {
|
|
354
|
+
if (this.manuallyStopped && this.bridgeStatus === "down" /* ChildBridgeStatus.DOWN */ && (!this.child || !this.child.connected)) {
|
|
346
355
|
this.log.warn("Starting child bridge...");
|
|
347
356
|
this.refreshConfig();
|
|
348
357
|
this.startChildProcess();
|
|
@@ -357,11 +366,10 @@ class ChildBridgeService {
|
|
|
357
366
|
* Read the config.json file from disk and refresh the plugin config block for just this plugin
|
|
358
367
|
*/
|
|
359
368
|
async refreshConfig() {
|
|
360
|
-
var _a, _b;
|
|
361
369
|
try {
|
|
362
370
|
const homebridgeConfig = await fs_extra_1.default.readJson(user_1.User.configPath());
|
|
363
|
-
if (this.type === "platform" /* PLATFORM */) {
|
|
364
|
-
const config =
|
|
371
|
+
if (this.type === "platform" /* PluginType.PLATFORM */) {
|
|
372
|
+
const config = homebridgeConfig.platforms?.filter(x => x.platform === this.identifier && x._bridge?.username === this.bridgeConfig.username);
|
|
365
373
|
if (config.length) {
|
|
366
374
|
this.pluginConfig = config;
|
|
367
375
|
this.bridgeConfig = this.pluginConfig[0]._bridge || this.bridgeConfig;
|
|
@@ -370,8 +378,8 @@ class ChildBridgeService {
|
|
|
370
378
|
this.log.warn("Platform config could not be found, using existing config.");
|
|
371
379
|
}
|
|
372
380
|
}
|
|
373
|
-
else if (this.type === "accessory" /* ACCESSORY */) {
|
|
374
|
-
const config =
|
|
381
|
+
else if (this.type === "accessory" /* PluginType.ACCESSORY */) {
|
|
382
|
+
const config = homebridgeConfig.accessories?.filter(x => x.accessory === this.identifier && x._bridge?.username === this.bridgeConfig.username);
|
|
375
383
|
if (config.length) {
|
|
376
384
|
this.pluginConfig = config;
|
|
377
385
|
this.bridgeConfig = this.pluginConfig[0]._bridge || this.bridgeConfig;
|
|
@@ -389,7 +397,6 @@ class ChildBridgeService {
|
|
|
389
397
|
* Returns metadata about this child bridge
|
|
390
398
|
*/
|
|
391
399
|
getMetadata() {
|
|
392
|
-
var _a;
|
|
393
400
|
return {
|
|
394
401
|
status: this.bridgeStatus,
|
|
395
402
|
paired: this.pairedStatus,
|
|
@@ -399,7 +406,7 @@ class ChildBridgeService {
|
|
|
399
406
|
name: this.bridgeConfig.name || this.displayName || this.plugin.getPluginIdentifier(),
|
|
400
407
|
plugin: this.plugin.getPluginIdentifier(),
|
|
401
408
|
identifier: this.identifier,
|
|
402
|
-
pid:
|
|
409
|
+
pid: this.child?.pid,
|
|
403
410
|
manuallyStopped: this.manuallyStopped,
|
|
404
411
|
};
|
|
405
412
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"childBridgeService.js","sourceRoot":"","sources":["../src/childBridgeService.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA0C;AAC1C,gDAAwB;AACxB,wDAA0B;AAO1B,qCAA2C;AAE3C,iCAA8B;AAS9B,IAAkB,4BAwCjB;AAxCD,WAAkB,4BAA4B;IAC5C;;OAEG;IACH,+CAAe,CAAA;IAEf;;OAEG;IACH,6CAAa,CAAA;IAEb;;OAEG;IACH,iDAAiB,CAAA;IAEjB;;OAEG;IACH,+CAAe,CAAA;IAEf;;OAEG;IACH,iDAAiB,CAAA;IAEjB;;OAEG;IACH,4DAA4B,CAAA;IAE5B;;OAEG;IACH,gEAA+B,CAAA;IAE/B;;OAEG;IACH,wDAAwB,CAAA;AAC1B,CAAC,EAxCiB,4BAA4B,GAA5B,oCAA4B,KAA5B,oCAA4B,QAwC7C;AAED,IAAkB,iBAejB;AAfD,WAAkB,iBAAiB;IACjC;;OAEG;IACH,wCAAmB,CAAA;IAEnB;;OAEG;IACH,8BAAS,CAAA;IAET;;OAEG;IACH,kCAAa,CAAA;AACf,CAAC,EAfiB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAelC;AAgDD;;;GAGG;AACH,MAAa,kBAAkB;IAY7B,YACS,IAAgB,EAChB,UAAkB,EACjB,MAAc,EACd,YAAiC,EACjC,gBAAkC,EAClC,iBAAoC,EACpC,GAAkB,EAClB,UAAsB,EACtB,mBAAwC;QARzC,SAAI,GAAJ,IAAI,CAAY;QAChB,eAAU,GAAV,UAAU,CAAQ;QACjB,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAqB;QACjC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,QAAG,GAAH,GAAG,CAAe;QAClB,eAAU,GAAV,UAAU,CAAY;QACtB,wBAAmB,GAAnB,mBAAmB,CAAqB;QAnB1C,SAAI,GAAa,EAAE,CAAC;QACpB,iBAAY,GAAG,KAAK,CAAC;QACrB,qBAAgB,2BAAgD;QAChE,iBAAY,GAAmB,IAAI,CAAC;QACpC,oBAAe,GAAG,KAAK,CAAC;QACxB,aAAQ,GAAkB,IAAI,CAAC;QAC/B,iBAAY,GAA4C,EAAE,CAAC;QAC3D,QAAG,GAAY,eAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAc1E,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;YAC3B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,iDAAiD;QACjD,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACI,KAAK;;QACV,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,mBAAmB;QACnB,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAClE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;SACtD;aAAM;YACL,IAAI,CAAC,WAAW,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,0CAAE,IAAI,KAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;SACpF;QAED,sCAAsC;QACtC,IAAI,CAAC,GAAG,GAAG,eAAM,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACI,SAAS,CAAC,MAAwC;QACvD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,IAAY,YAAY;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAY,YAAY,CAAC,KAAwB;QAC/C,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED;;OAEG;IACK,iBAAiB;QACvB,IAAI,CAAC,YAAY,0BAA4B,CAAC;QAE9C,IAAI,CAAC,KAAK,GAAG,uBAAa,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE;YACxF,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YAC3B,IAAI,CAAC,YAAY,oBAAyB,CAAC;YAC3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACxC,IAAI,CAAC,YAAY,oBAAyB,CAAC;YAC3C,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,sDAAsD;QACtD,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAA0C,EAAE,EAAE;;YACtE,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;gBAC9C,OAAO;aACR;YAED,QAAO,OAAO,CAAC,EAAE,EAAE;gBACjB,wBAAuC,CAAC,CAAC;oBACvC,IAAI,CAAC,GAAG,CAAC,kCAAkC,MAAA,IAAI,CAAC,KAAK,0CAAE,GAAG,EAAE,CAAC,CAAC;oBAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;oBAClB,MAAM;iBACP;gBACD,0BAAwC,CAAC,CAAC;oBACxC,MAAM,OAAO,GAAI,OAAO,CAAC,IAA0C,CAAC,OAAO,CAAC;oBAC5E,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;wBAChC,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,KAAK,OAAO,mCAAmC,IAAI,CAAC,YAAY,CAAC,MAAM,cAAc,CAAC,CAAC;qBAC5I;yBAAM;wBACL,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,KAAK,OAAO,4BAA4B,CAAC,CAAC;qBAC/F;oBACD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACnB,MAAM;iBACP;gBACD,0BAAwC,CAAC,CAAC;oBACxC,IAAI,CAAC,YAAY,gBAAuB,CAAC;oBACzC,MAAM;iBACP;gBACD,qCAA8C,CAAC,CAAC;oBAC9C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAwC,CAAC,CAAC;oBACzE,MAAM;iBACP;gBACD,iCAA+C,CAAC,CAAC;oBAC/C,IAAI,CAAC,YAAY,GAAI,OAAO,CAAC,IAAyC,CAAC,MAAM,CAAC;oBAC9E,IAAI,CAAC,QAAQ,GAAI,OAAO,CAAC,IAAyC,CAAC,QAAQ,CAAC;oBAC5E,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACxB,MAAM;iBACP;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACK,kBAAkB,CAAC,IAAY,EAAE,MAAc;QACrD,IAAI,CAAC,GAAG,CAAC,wBAAwB,IAAI,aAAa,MAAM,EAAE,CAAC,CAAC;QAE5D,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;gBACtB,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;gBAClC,IAAI,CAAC,iBAAiB,EAAE,CAAC;aAC1B;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IAED;;;;OAIG;IACK,WAAW,CAAc,IAAkC,EAAE,IAAQ;QAC3E,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACd,EAAE,EAAE,IAAI;gBACR,IAAI;aACL,CAAC,CAAC;SACJ;IACH,CAAC;IAED;;;OAGG;IACK,eAAe;QACrB,IAAI,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE;YAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACtB;QAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACtB;QAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE;YACzC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACtB;QAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACtB;QAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,6BAA6B,EAAE;YACxD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACtB;QAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE;YAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;SAChE;QAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE;YAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;SAC/D;IACH,CAAC;IAED;;OAEG;IACK,UAAU;QAChB,MAAM,YAAY,GAAwB;YACxC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACrF,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;YAC5B,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ;YACpC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU;YACnD,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG;YAC9D,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI;YACvC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO;YAClC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,YAAY;YACzF,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK;SACrE,CAAC;QAEF,MAAM,aAAa,GAAkB;YACnC,oBAAoB,EAAE,WAAI,CAAC,mBAAmB,EAAE;YAChD,yBAAyB,EAAE,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE;SAC7G,CAAC;QAEF,mEAAmE;QACnE,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAErD,IAAI,CAAC,WAAW,oBAA+D;YAC7E,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACvC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,YAAY;YACZ,aAAa;YACb,gBAAgB,EAAE;gBAChB,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;gBACpC,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI;gBAChC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK;gBAClC,eAAe,EAAE,EAAE;gBACnB,WAAW,EAAE,EAAE;gBACf,SAAS,EAAE,EAAE,EAAE,4BAA4B;aAC5C;SACF,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,WAAW;QACjB,IAAI,CAAC,WAAW,qBAAoC,CAAC;IACvD,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,iBAAiB,CAAC,OAAyC;QACvE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1E,IAAI,CAAC,WAAW,uCAAkF;YAChG,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,QAAQ;QACd,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YACtC,IAAI,CAAC,YAAY,oBAAyB,CAAC;YAC3C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC5B;IACH,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,IAAI,CAAC,UAAU,CAAC,WAAW,6DAA8C,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED;;OAEG;IACI,kBAAkB;QACvB,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,IAAI,CAAC,gBAAgB,EAAE,CAAC;SACzB;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC5C,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;SACjB;IACH,CAAC;IAED;;OAEG;IACI,eAAe;;QACpB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;YAC7D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5B,MAAA,IAAI,CAAC,KAAK,0CAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;SACjB;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;SAC3D;IACH,CAAC;IAED;;OAEG;IACI,gBAAgB;QACrB,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,YAAY,sBAA2B,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;YAClH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YAC1C,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;SAC9B;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;SAC7F;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,aAAa;;QACxB,IAAI;YACF,MAAM,gBAAgB,GAAqB,MAAM,kBAAE,CAAC,QAAQ,CAAC,WAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAEhF,IAAI,IAAI,CAAC,IAAI,8BAAwB,EAAE;gBACrC,MAAM,MAAM,GAAG,MAAA,gBAAgB,CAAC,SAAS,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,UAAU,IAAI,CAAA,MAAA,CAAC,CAAC,OAAO,0CAAE,QAAQ,MAAK,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAA,EAAA,CAAC,CAAC;gBAC7I,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC;oBAC3B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC;iBACvE;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;iBAC7E;aACF;iBAAM,IAAI,IAAI,CAAC,IAAI,gCAAyB,EAAE;gBAC7C,MAAM,MAAM,GAAG,MAAA,gBAAgB,CAAC,WAAW,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,UAAU,IAAI,CAAA,MAAA,CAAC,CAAC,OAAO,0CAAE,QAAQ,MAAK,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAA,EAAA,CAAC,CAAC;gBAChJ,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC;oBAC3B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC;iBACvE;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;iBAC9E;aACF;SAEF;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SAC/D;IACH,CAAC;IAED;;OAEG;IACI,WAAW;;QAChB,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,YAAY;YACzB,MAAM,EAAE,IAAI,CAAC,YAAY;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ;YACpC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG;YAC9D,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACrF,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACzC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG,EAAE,MAAA,IAAI,CAAC,KAAK,0CAAE,GAAG;YACpB,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAC;IACJ,CAAC;CAEF;AApXD,gDAoXC"}
|
|
1
|
+
{"version":3,"file":"childBridgeService.js","sourceRoot":"","sources":["../src/childBridgeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,11 @@ const logger_1 = require("./logger");
|
|
|
7
7
|
* This service is used to allocate ports for external accessories on the main bridge, and child bridges.
|
|
8
8
|
*/
|
|
9
9
|
class ExternalPortService {
|
|
10
|
+
externalPorts;
|
|
11
|
+
nextExternalPort;
|
|
12
|
+
allocatedPorts = new Map();
|
|
10
13
|
constructor(externalPorts) {
|
|
11
14
|
this.externalPorts = externalPorts;
|
|
12
|
-
this.allocatedPorts = new Map();
|
|
13
15
|
}
|
|
14
16
|
/**
|
|
15
17
|
* Returns the next available port in the external port config.
|
|
@@ -49,6 +51,7 @@ exports.ExternalPortService = ExternalPortService;
|
|
|
49
51
|
* It requests a free port from the main bridge's port service.
|
|
50
52
|
*/
|
|
51
53
|
class ChildBridgeExternalPortService extends ExternalPortService {
|
|
54
|
+
childBridge;
|
|
52
55
|
constructor(childBridge) {
|
|
53
56
|
super();
|
|
54
57
|
this.childBridge = childBridge;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"externalPortService.js","sourceRoot":"","sources":["../src/externalPortService.ts"],"names":[],"mappings":";;;AAEA,qCAAkC;AAOlC;;;GAGG;AACH,MAAa,mBAAmB;
|
|
1
|
+
{"version":3,"file":"externalPortService.js","sourceRoot":"","sources":["../src/externalPortService.ts"],"names":[],"mappings":";;;AAEA,qCAAkC;AAOlC;;;GAGG;AACH,MAAa,mBAAmB;IAKpB;IAJF,gBAAgB,CAAU;IAC1B,cAAc,GAAwC,IAAI,GAAG,EAAE,CAAC;IAExE,YACU,aAA0C;QAA1C,kBAAa,GAAb,aAAa,CAA6B;IAChD,CAAC;IAEL;;;;OAIG;IACI,KAAK,CAAC,WAAW,CAAC,QAAoB;QAC3C,qEAAqE;QACrE,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjE,IAAI,sBAAsB,EAAE;YAC1B,OAAO,sBAAsB,CAAC;SAC/B;QAED,2BAA2B;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACpC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,eAAe;QACrB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,OAAO,SAAS,CAAC;SAClB;QAED,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE;YACvC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;YACjD,OAAO,IAAI,CAAC,gBAAgB,CAAC;SAC9B;QAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAExB,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;YACnD,OAAO,IAAI,CAAC,gBAAgB,CAAC;SAC9B;QAED,eAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;QAErG,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA9CD,kDA8CC;AAED;;;GAGG;AACH,MAAa,8BAA+B,SAAQ,mBAAmB;IAE3D;IADV,YACU,WAA4B;QAEpC,KAAK,EAAE,CAAC;QAFA,gBAAW,GAAX,WAAW,CAAiB;IAGtC,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,QAAoB;QAC3C,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;CACF;AAVD,wEAUC"}
|
package/lib/index.d.ts
CHANGED
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAGjC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/ipcService.js
CHANGED
|
@@ -8,13 +8,13 @@ var IpcIncomingEvent;
|
|
|
8
8
|
IpcIncomingEvent["STOP_CHILD_BRIDGE"] = "stopChildBridge";
|
|
9
9
|
IpcIncomingEvent["START_CHILD_BRIDGE"] = "startChildBridge";
|
|
10
10
|
IpcIncomingEvent["CHILD_BRIDGE_METADATA_REQUEST"] = "childBridgeMetadataRequest";
|
|
11
|
-
})(IpcIncomingEvent
|
|
11
|
+
})(IpcIncomingEvent || (exports.IpcIncomingEvent = IpcIncomingEvent = {}));
|
|
12
12
|
var IpcOutgoingEvent;
|
|
13
13
|
(function (IpcOutgoingEvent) {
|
|
14
14
|
IpcOutgoingEvent["SERVER_STATUS_UPDATE"] = "serverStatusUpdate";
|
|
15
15
|
IpcOutgoingEvent["CHILD_BRIDGE_METADATA_RESPONSE"] = "childBridgeMetadataResponse";
|
|
16
16
|
IpcOutgoingEvent["CHILD_BRIDGE_STATUS_UPDATE"] = "childBridgeStatusUpdate";
|
|
17
|
-
})(IpcOutgoingEvent
|
|
17
|
+
})(IpcOutgoingEvent || (exports.IpcOutgoingEvent = IpcOutgoingEvent = {}));
|
|
18
18
|
class IpcService extends events_1.EventEmitter {
|
|
19
19
|
constructor() {
|
|
20
20
|
super();
|
|
@@ -25,7 +25,7 @@ class IpcService extends events_1.EventEmitter {
|
|
|
25
25
|
*/
|
|
26
26
|
start() {
|
|
27
27
|
process.on("message", (message) => {
|
|
28
|
-
if (typeof message !== "object" || !message.id) {
|
|
28
|
+
if (!message || typeof message !== "object" || !message.id) {
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
31
|
this.emit(message.id, message.data);
|
package/lib/ipcService.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipcService.js","sourceRoot":"","sources":["../src/ipcService.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,IAAkB,gBAKjB;AALD,WAAkB,gBAAgB;IAChC,+DAA2C,CAAA;IAC3C,yDAAqC,CAAA;IACrC,2DAAuC,CAAA;IACvC,gFAA4D,CAAA;AAC9D,CAAC,EALiB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"ipcService.js","sourceRoot":"","sources":["../src/ipcService.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,IAAkB,gBAKjB;AALD,WAAkB,gBAAgB;IAChC,+DAA2C,CAAA;IAC3C,yDAAqC,CAAA;IACrC,2DAAuC,CAAA;IACvC,gFAA4D,CAAA;AAC9D,CAAC,EALiB,gBAAgB,gCAAhB,gBAAgB,QAKjC;AAED,IAAkB,gBAIjB;AAJD,WAAkB,gBAAgB;IAChC,+DAA2C,CAAA;IAC3C,kFAA8D,CAAA;IAC9D,0EAAsD,CAAA;AACxD,CAAC,EAJiB,gBAAgB,gCAAhB,gBAAgB,QAIjC;AASD,MAAa,UAAW,SAAQ,qBAAY;IAC1C;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED;;;OAGG;IACI,KAAK;QACV,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAoC,EAAE,EAAE;YAC7D,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;gBAC1D,OAAO;aACR;YACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,WAAW,CAAC,EAAoB,EAAE,IAAa;QACpD,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,OAAO,CAAC,IAAI,CAAC;gBACX,EAAE;gBACF,IAAI;aACL,CAAC,CAAC;SACJ;IACH,CAAC;CAEF;AAhCD,gCAgCC"}
|
package/lib/logger.js
CHANGED
|
@@ -24,11 +24,16 @@ var LogLevel;
|
|
|
24
24
|
LogLevel["WARN"] = "warn";
|
|
25
25
|
LogLevel["ERROR"] = "error";
|
|
26
26
|
LogLevel["DEBUG"] = "debug";
|
|
27
|
-
})(LogLevel
|
|
27
|
+
})(LogLevel || (exports.LogLevel = LogLevel = {}));
|
|
28
28
|
/**
|
|
29
29
|
* Logger class
|
|
30
30
|
*/
|
|
31
31
|
class Logger {
|
|
32
|
+
static internal = new Logger();
|
|
33
|
+
static loggerCache = new Map(); // global cache of logger instances by plugin name
|
|
34
|
+
static debugEnabled = false;
|
|
35
|
+
static timestampEnabled = true;
|
|
36
|
+
prefix;
|
|
32
37
|
constructor(prefix) {
|
|
33
38
|
this.prefix = prefix;
|
|
34
39
|
}
|
|
@@ -81,33 +86,33 @@ class Logger {
|
|
|
81
86
|
chalk_1.default.level = 1; // `1` - Basic 16 colors support.
|
|
82
87
|
}
|
|
83
88
|
info(message, ...parameters) {
|
|
84
|
-
this.log("info" /* INFO */, message, ...parameters);
|
|
89
|
+
this.log("info" /* LogLevel.INFO */, message, ...parameters);
|
|
85
90
|
}
|
|
86
91
|
warn(message, ...parameters) {
|
|
87
|
-
this.log("warn" /* WARN */, message, ...parameters);
|
|
92
|
+
this.log("warn" /* LogLevel.WARN */, message, ...parameters);
|
|
88
93
|
}
|
|
89
94
|
error(message, ...parameters) {
|
|
90
|
-
this.log("error" /* ERROR */, message, ...parameters);
|
|
95
|
+
this.log("error" /* LogLevel.ERROR */, message, ...parameters);
|
|
91
96
|
}
|
|
92
97
|
debug(message, ...parameters) {
|
|
93
|
-
this.log("debug" /* DEBUG */, message, ...parameters);
|
|
98
|
+
this.log("debug" /* LogLevel.DEBUG */, message, ...parameters);
|
|
94
99
|
}
|
|
95
100
|
log(level, message, ...parameters) {
|
|
96
|
-
if (level === "debug" /* DEBUG */ && !Logger.debugEnabled) {
|
|
101
|
+
if (level === "debug" /* LogLevel.DEBUG */ && !Logger.debugEnabled) {
|
|
97
102
|
return;
|
|
98
103
|
}
|
|
99
104
|
message = util_1.default.format(message, ...parameters);
|
|
100
105
|
let loggingFunction = console.log;
|
|
101
106
|
switch (level) {
|
|
102
|
-
case "warn" /* WARN */:
|
|
107
|
+
case "warn" /* LogLevel.WARN */:
|
|
103
108
|
message = chalk_1.default.yellow(message);
|
|
104
109
|
loggingFunction = console.error;
|
|
105
110
|
break;
|
|
106
|
-
case "error" /* ERROR */:
|
|
111
|
+
case "error" /* LogLevel.ERROR */:
|
|
107
112
|
message = chalk_1.default.red(message);
|
|
108
113
|
loggingFunction = console.error;
|
|
109
114
|
break;
|
|
110
|
-
case "debug" /* DEBUG */:
|
|
115
|
+
case "debug" /* LogLevel.DEBUG */:
|
|
111
116
|
message = chalk_1.default.gray(message);
|
|
112
117
|
break;
|
|
113
118
|
}
|
|
@@ -122,10 +127,6 @@ class Logger {
|
|
|
122
127
|
}
|
|
123
128
|
}
|
|
124
129
|
exports.Logger = Logger;
|
|
125
|
-
Logger.internal = new Logger();
|
|
126
|
-
Logger.loggerCache = new Map(); // global cache of logger instances by plugin name
|
|
127
|
-
Logger.debugEnabled = false;
|
|
128
|
-
Logger.timestampEnabled = true;
|
|
129
130
|
/**
|
|
130
131
|
* Creates a new Logging device with a specified prefix.
|
|
131
132
|
*
|
package/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,gDAAwB;AACxB,kDAA0B;AAE1B;;;;;;;;;;GAUG;AACH,IAAkB,QAKjB;AALD,WAAkB,QAAQ;IACxB,yBAAa,CAAA;IACb,yBAAa,CAAA;IACb,2BAAe,CAAA;IACf,2BAAe,CAAA;AACjB,CAAC,EALiB,QAAQ,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { EventEmitter } from "events";
|
|
|
3
3
|
import { Accessory, CameraController, Categories, Controller, ControllerConstructor, LegacyCameraSource, SerializedAccessory, Service, WithUUID } from "hap-nodejs";
|
|
4
4
|
import { PlatformName, PluginIdentifier, PluginName } from "./api";
|
|
5
5
|
import { ConstructorArgs } from "hap-nodejs/dist/types";
|
|
6
|
-
export
|
|
6
|
+
export type UnknownContext = Record<string, any>;
|
|
7
7
|
export interface SerializedPlatformAccessory<T extends UnknownContext = UnknownContext> extends SerializedAccessory {
|
|
8
8
|
plugin: PluginName;
|
|
9
9
|
platform: PlatformName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EACL,SAAS,EAET,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,OAAO,EACP,QAAQ,EACT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,
|
|
1
|
+
{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EACL,SAAS,EAET,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,OAAO,EACP,QAAQ,EACT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEjD,MAAM,WAAW,2BAA2B,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,mBAAmB;IAEjH,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,CAAC,CAAC;CAEZ;AAED,0BAAkB,sBAAsB;IACtC,QAAQ,aAAa;CACtB;AAED,MAAM,CAAC,OAAO,WAAW,iBAAiB;IAExC,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAElD,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC;CAElC;AAGD,qBAAa,iBAAiB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAAG,SAAQ,YAAY;IAG7F,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAY;IAE7C,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,mBAAmB,CAAC,EAAE,YAAY,CAAC;IAEnC,uBAAuB,EAAE,SAAS,CAAC;IAGnC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,UAAU,CAAC;IACrB,QAAQ,EAAE,OAAO,EAAE,CAAM;IACzB;;OAEG;IACH,SAAS,UAAS;IAGlB;;OAEG;IACI,OAAO,EAAE,CAAC,CAAW;gBAEhB,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,UAAU;IAyB7D,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IACrC,UAAU,CAAC,CAAC,SAAS,OAAO,OAAO,EAAE,kBAAkB,EAAE,CAAC,EAAE,GAAG,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO;IAQ5G,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIrC,UAAU,CAAC,CAAC,SAAS,QAAQ,CAAC,OAAO,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,OAAO,GAAG,SAAS;IAI5F;;;;;OAKG;IACI,0BAA0B,CAAC,CAAC,SAAS,QAAQ,CAAC,OAAO,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAItH,cAAc,CAAC,CAAC,SAAS,QAAQ,CAAC,OAAO,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAIjH;;;;OAIG;IACI,kBAAkB,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAInD;;;;OAIG;IACI,qBAAqB,CAAC,YAAY,EAAE,kBAAkB,GAAG,gBAAgB;IAIhF;;;;;OAKG;IACI,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,qBAAqB,GAAG,IAAI;IAIhF;;;;;OAKG;IACI,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAKrD,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,2BAA2B;IAS3E,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,2BAA2B,GAAG,iBAAiB;CAezE"}
|
package/lib/platformAccessory.js
CHANGED
|
@@ -6,20 +6,29 @@ const hap_nodejs_1 = require("hap-nodejs");
|
|
|
6
6
|
var PlatformAccessoryEvent;
|
|
7
7
|
(function (PlatformAccessoryEvent) {
|
|
8
8
|
PlatformAccessoryEvent["IDENTIFY"] = "identify";
|
|
9
|
-
})(PlatformAccessoryEvent
|
|
9
|
+
})(PlatformAccessoryEvent || (exports.PlatformAccessoryEvent = PlatformAccessoryEvent = {}));
|
|
10
10
|
class PlatformAccessory extends events_1.EventEmitter {
|
|
11
|
+
// somewhat ugly way to inject custom Accessory object, while not changing the publicly exposed constructor signature
|
|
12
|
+
static injectedAccessory;
|
|
13
|
+
_associatedPlugin; // present as soon as it is registered
|
|
14
|
+
_associatedPlatform; // not present for external accessories
|
|
15
|
+
_associatedHAPAccessory;
|
|
16
|
+
// ---------------- HAP Accessory mirror ----------------
|
|
17
|
+
displayName;
|
|
18
|
+
UUID;
|
|
19
|
+
category;
|
|
20
|
+
services = [];
|
|
21
|
+
/**
|
|
22
|
+
* @deprecated reachability has no effect and isn't supported anymore
|
|
23
|
+
*/
|
|
24
|
+
reachable = false;
|
|
25
|
+
// ------------------------------------------------------
|
|
26
|
+
/**
|
|
27
|
+
* This is a way for Plugin developers to store custom data with their accessory
|
|
28
|
+
*/
|
|
29
|
+
context = {}; // providing something to store
|
|
11
30
|
constructor(displayName, uuid, category) {
|
|
12
31
|
super();
|
|
13
|
-
this.services = [];
|
|
14
|
-
/**
|
|
15
|
-
* @deprecated reachability has no effect and isn't supported anymore
|
|
16
|
-
*/
|
|
17
|
-
this.reachable = false;
|
|
18
|
-
// ------------------------------------------------------
|
|
19
|
-
/**
|
|
20
|
-
* This is a way for Plugin developers to store custom data with their accessory
|
|
21
|
-
*/
|
|
22
|
-
this.context = {}; // providing something to store
|
|
23
32
|
this._associatedHAPAccessory = PlatformAccessory.injectedAccessory
|
|
24
33
|
? PlatformAccessory.injectedAccessory
|
|
25
34
|
: new hap_nodejs_1.Accessory(displayName, uuid);
|
|
@@ -28,14 +37,14 @@ class PlatformAccessory extends events_1.EventEmitter {
|
|
|
28
37
|
}
|
|
29
38
|
this.displayName = this._associatedHAPAccessory.displayName;
|
|
30
39
|
this.UUID = this._associatedHAPAccessory.UUID;
|
|
31
|
-
this.category = category || 1 /* OTHER */;
|
|
40
|
+
this.category = category || 1 /* Categories.OTHER */;
|
|
32
41
|
this.services = this._associatedHAPAccessory.services;
|
|
33
42
|
// forward identify event
|
|
34
|
-
this._associatedHAPAccessory.on("identify" /* IDENTIFY */, (paired, callback) => {
|
|
43
|
+
this._associatedHAPAccessory.on("identify" /* AccessoryEventTypes.IDENTIFY */, (paired, callback) => {
|
|
35
44
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
36
45
|
// @ts-ignore
|
|
37
46
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
38
|
-
this.emit("identify" /* IDENTIFY */, paired, () => { }); // empty callback for backwards compatibility
|
|
47
|
+
this.emit("identify" /* PlatformAccessoryEvent.IDENTIFY */, paired, () => { }); // empty callback for backwards compatibility
|
|
39
48
|
callback();
|
|
40
49
|
});
|
|
41
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AACtC,2CAWoB;AAepB,IAAkB,sBAEjB;AAFD,WAAkB,sBAAsB;IACtC,+CAAqB,CAAA;AACvB,CAAC,EAFiB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"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"}
|
package/lib/plugin.js
CHANGED
|
@@ -18,11 +18,21 @@ const _importDynamic = new Function("modulePath", "return import(modulePath)");
|
|
|
18
18
|
* Represents a loaded Homebridge plugin.
|
|
19
19
|
*/
|
|
20
20
|
class Plugin {
|
|
21
|
+
pluginName;
|
|
22
|
+
scope; // npm package scope
|
|
23
|
+
pluginPath; // like "/usr/local/lib/node_modules/homebridge-lockitron"
|
|
24
|
+
isESM;
|
|
25
|
+
disabled = false; // mark the plugin as disabled
|
|
26
|
+
// ------------------ package.json content ------------------
|
|
27
|
+
version;
|
|
28
|
+
main;
|
|
29
|
+
loadContext;
|
|
30
|
+
// ----------------------------------------------------------
|
|
31
|
+
pluginInitializer; // default exported function from the plugin that initializes it
|
|
32
|
+
registeredAccessories = new Map();
|
|
33
|
+
registeredPlatforms = new Map();
|
|
34
|
+
activeDynamicPlatforms = new Map();
|
|
21
35
|
constructor(name, path, packageJSON, scope) {
|
|
22
|
-
this.disabled = false; // mark the plugin as disabled
|
|
23
|
-
this.registeredAccessories = new Map();
|
|
24
|
-
this.registeredPlatforms = new Map();
|
|
25
|
-
this.activeDynamicPlatforms = new Map();
|
|
26
36
|
this.pluginName = name;
|
|
27
37
|
this.scope = scope;
|
|
28
38
|
this.pluginPath = path;
|