From 0e1e7545a2ad62856c47055c0bf9d11ddce52956 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Sun, 12 Jul 2020 13:01:44 -0600 Subject: [PATCH 1/3] Hang after exiting DoorParty! #282 --- core/door_party.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/door_party.js b/core/door_party.js index 184416f7..aee4438c 100644 --- a/core/door_party.js +++ b/core/door_party.js @@ -67,6 +67,7 @@ exports.getModule = class DoorPartyModule extends MenuModule { if(doorTracking) { trackDoorRunEnd(doorTracking); + doorTracking = null; } } }; @@ -103,6 +104,10 @@ exports.getModule = class DoorPartyModule extends MenuModule { self.client.term.rawWrite(d); }); + stream.on('end', () => { + sshClient.end(); + }); + stream.on('close', () => { restorePipe(); sshClient.end(); From c3a19eb2087679bb536a476a5d4ae607c12fdd28 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Sun, 12 Jul 2020 13:58:46 -0600 Subject: [PATCH 2/3] Slight doc update on message conf/areas --- docs/messageareas/configuring-a-message-area.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/messageareas/configuring-a-message-area.md b/docs/messageareas/configuring-a-message-area.md index 011e9497..444cb091 100644 --- a/docs/messageareas/configuring-a-message-area.md +++ b/docs/messageareas/configuring-a-message-area.md @@ -1,15 +1,17 @@ --- layout: page -title: Configuring a Message Area +title: Message Base --- -## Message Conferences -**Message Conferences** and **Areas** allow for grouping of message base topics. +## General Information +In ENiGMA½, a message base is divided into two logical grouping components: **Message Conferences** and **Areas**. Message conferences are top level containers while areas are for a specific topic. Messages are always stored internally with a area tag. ## Conferences Message Conferences are the top level container for *1:n* Message *Areas* via the `messageConferences` block in `config.hjson`. A common setup may include a local conference and one or more conferences each dedicated to a particular message network such as fsxNet, ArakNet, etc. Each conference is represented by a entry under `messageConferences`. Each entries top level key is it's *conference tag*. +:information_source: It is **highly** recommended to use snake_case style message *conference tags* and *area tags*! + | Config Item | Required | Description | |-------------|----------|-------------| | `name` | :+1: | Friendly conference name | From 33a1d1b8127bde81b0dcf56c26892cc5845b9a81 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Sun, 12 Jul 2020 16:12:26 -0600 Subject: [PATCH 3/3] Idle timeout kicks user when on a telnet bridge downloading files #262 --- core/telnet_bridge.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js index 0c17715f..20397cd3 100644 --- a/core/telnet_bridge.js +++ b/core/telnet_bridge.js @@ -51,14 +51,22 @@ class TelnetClientConnection extends EventEmitter { constructor(client) { super(); - this.client = client; + this.client = client; + + this.dataHits = 0; } + updateActivity() { + if (0 === (this.dataHits++ % 4)) { + this.client.explicitActivityTimeUpdate(); + } + } restorePipe() { if(!this.pipeRestored) { this.pipeRestored = true; - this.client.dataPassthrough = false; + + this.client.restoreDataHandler(); // client may have bailed if(null !== _.get(this, 'client.term.output', null)) { @@ -75,11 +83,15 @@ class TelnetClientConnection extends EventEmitter { this.emit('connected'); this.pipeRestored = false; - this.client.dataPassthrough = true; - this.client.term.output.pipe(this.bridgeConnection); + this.client.setTemporaryDirectDataHandler(data => { + this.updateActivity(); + this.bridgeConnection.write(data); + }); }); this.bridgeConnection.on('data', data => { + this.updateActivity(); + this.client.term.rawWrite(data); //