stagelinq 3.0.1 → 3.0.4
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 +9 -1
- package/dist/Databases/Databases.js +3 -2
- package/dist/Databases/Databases.js.map +1 -1
- package/dist/Databases/DbConnection.js +5 -2
- package/dist/Databases/DbConnection.js.map +1 -1
- package/dist/StageLinq/index.js +1 -0
- package/dist/StageLinq/index.js.map +1 -1
- package/dist/devices/Player.js +9 -4
- package/dist/devices/Player.js.map +1 -1
- package/dist/devices/PlayerMessageQueue.js +3 -1
- package/dist/devices/PlayerMessageQueue.js.map +1 -1
- package/dist/network/NetworkDevice.d.ts +1 -1
- package/dist/network/NetworkDevice.js +8 -4
- package/dist/network/NetworkDevice.js.map +1 -1
- package/dist/network/StageLinqDevices.js +7 -3
- package/dist/network/StageLinqDevices.js.map +1 -1
- package/dist/network/StageLinqListener.d.ts +5 -0
- package/dist/network/StageLinqListener.js +15 -1
- package/dist/network/StageLinqListener.js.map +1 -1
- package/dist/network/announce.js.map +1 -1
- package/dist/services/BeatInfo.d.ts +1 -1
- package/dist/services/Broadcast.d.ts +1 -1
- package/dist/services/FileTransfer.js +5 -5
- package/dist/services/FileTransfer.js.map +1 -1
- package/dist/services/Service.d.ts +2 -2
- package/dist/services/Service.js +6 -4
- package/dist/services/Service.js.map +1 -1
- package/dist/services/StateMap.d.ts +1 -1
- package/dist/services/StateMap.js.map +1 -1
- package/dist/services/TimeSync.d.ts +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/ReadContext.js +8 -8
- package/dist/utils/ReadContext.js.map +1 -1
- package/dist/utils/WriteContext.js +2 -1
- package/dist/utils/WriteContext.js.map +1 -1
- package/package.json +3 -3
- package/dist/cli/beatinfo.d.ts +0 -11
- package/dist/cli/beatinfo.js +0 -84
- package/dist/cli/beatinfo.js.map +0 -1
- package/dist/cli/discover.d.ts +0 -9
- package/dist/cli/discover.js +0 -97
- package/dist/cli/discover.js.map +0 -1
- package/dist/cli/index.d.ts +0 -1
- package/dist/cli/index.js +0 -197
- package/dist/cli/index.js.map +0 -1
- package/dist/utils/log.d.ts +0 -0
- package/dist/utils/log.js +0 -2
- package/dist/utils/log.js.map +0 -1
package/README.md
CHANGED
|
@@ -222,6 +222,14 @@ This library incorporates code and ideas from other StageLinq implementations:
|
|
|
222
222
|
- **[PyStageLinQ](https://github.com/Jaxc/PyStageLinQ)** by Jaxc - Wireshark dissector, protocol documentation
|
|
223
223
|
- **[kyleawayan/StageLinq](https://github.com/kyleawayan/StageLinq)** by Kyle Awayan - Track path resolution fixes
|
|
224
224
|
|
|
225
|
+
## Related Packages
|
|
226
|
+
|
|
227
|
+
- [alphatheta-connect](https://github.com/chrisle/alphatheta-connect) — Pioneer Pro DJ Link integration
|
|
228
|
+
- [rekordbox-connect](https://github.com/chrisle/rekordbox-connect) — Rekordbox database integration
|
|
229
|
+
- [serato-connect](https://github.com/chrisle/serato-connect) — Serato DJ integration
|
|
230
|
+
|
|
231
|
+
These libraries power [Now Playing](https://nowplayingapp.com) — a real-time track display app for DJs and streamers.
|
|
232
|
+
|
|
225
233
|
## License
|
|
226
234
|
|
|
227
|
-
|
|
235
|
+
MIT
|
|
@@ -49,8 +49,9 @@ class Databases extends stream_1.EventEmitter {
|
|
|
49
49
|
const sources = await service.getSources();
|
|
50
50
|
const output = [];
|
|
51
51
|
for (const source of sources) {
|
|
52
|
-
const
|
|
53
|
-
.exec(Buffer.from(connectionInfo.token).toString('hex'))
|
|
52
|
+
const match = /(\w{8})(\w{4})(\w{4})(\w{4})(\w{12})/i
|
|
53
|
+
.exec(Buffer.from(connectionInfo.token).toString('hex'));
|
|
54
|
+
const deviceId = match ? match.slice(1).join('-') : 'unknown';
|
|
54
55
|
const dbConnectionName = `net://${deviceId}/${source.name}`;
|
|
55
56
|
LogEmitter_1.Logger.debug(`DB network path: ${dbConnectionName}`);
|
|
56
57
|
if (this.sources.has(dbConnectionName)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Databases.js","sourceRoot":"","sources":["../../Databases/Databases.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAsC;AACtC,0CAA2C;AAC3C,oCAA2C;AAC3C,8CAAuC;AAEvC,uCAAyB;AAQzB,MAAa,SAAU,SAAQ,qBAAY;IAIzC;QACE,KAAK,EAAE,CAAC;QAHV,YAAO,GAAwB,IAAI,GAAG,EAAE,CAAC;IAIzC,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,cAA8B,EAAE,aAA4B;QAC1F,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,gBAAgB,CAAC,uBAAY,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,
|
|
1
|
+
{"version":3,"file":"Databases.js","sourceRoot":"","sources":["../../Databases/Databases.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.DbConnection = void 0;
|
|
4
|
-
const
|
|
7
|
+
const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
|
|
5
8
|
class DbConnection {
|
|
6
9
|
constructor(dbPath) {
|
|
7
10
|
this.dbPath = dbPath;
|
|
8
11
|
console.debug(`Opening ${this.dbPath}`);
|
|
9
|
-
this.db = new
|
|
12
|
+
this.db = new better_sqlite3_1.default(this.dbPath);
|
|
10
13
|
}
|
|
11
14
|
/**
|
|
12
15
|
* Execute a SQL query.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbConnection.js","sourceRoot":"","sources":["../../Databases/DbConnection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DbConnection.js","sourceRoot":"","sources":["../../Databases/DbConnection.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAsC;AAItC,MAAa,YAAY;IAKvB,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,EAAE,GAAG,IAAI,wBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACH,WAAW,CAAI,KAAa,EAAE,GAAG,MAAa;QAC5C,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,MAAM,KAAK,KAAK,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtC,aAAa;QACb,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,SAAiB;QAC5B,IAAI,MAAe,CAAC;QACpB,IAAI,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,6CAA6C,EAAE,SAAS,CAAC,CAAC;QACtF,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,8CAA8C,EAAE,SAAS,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,SAAS,eAAe,CAAC,CAAC;QAChF,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IAED,KAAK;QACH,OAAO,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC;CAEF;AA/CD,oCA+CC"}
|
package/dist/StageLinq/index.js
CHANGED
|
@@ -96,6 +96,7 @@ class StageLinqInstance extends events_1.EventEmitter {
|
|
|
96
96
|
}
|
|
97
97
|
try {
|
|
98
98
|
this.devices.disconnectAll();
|
|
99
|
+
this.listener?.stop();
|
|
99
100
|
const msg = (0, network_1.createDiscoveryMessage)(types_1.Action.Logout, this.instanceOptions.actingAs);
|
|
100
101
|
await (0, network_1.unannounce)(msg);
|
|
101
102
|
this._isConnected = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../StageLinq/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../StageLinq/index.ts"],"names":[],"mappings":"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"}
|
package/dist/devices/Player.js
CHANGED
|
@@ -29,6 +29,9 @@ class Player extends events_1.EventEmitter {
|
|
|
29
29
|
*/
|
|
30
30
|
constructor(options) {
|
|
31
31
|
super();
|
|
32
|
+
this.player = 0; // Player number as reported by the device.
|
|
33
|
+
this.masterTempo = 0; // Current master tempo BPM
|
|
34
|
+
this.masterStatus = false; // If this device has the master tempo
|
|
32
35
|
this.decks = new Map();
|
|
33
36
|
this.lastTrackNetworkPath = new Map();
|
|
34
37
|
this.queue = {};
|
|
@@ -88,7 +91,7 @@ class Player extends events_1.EventEmitter {
|
|
|
88
91
|
: (/Play$/.test(name)) ? { play: json.state }
|
|
89
92
|
: (/PlayerJogColor[A-D]$/.test(name)) ? { jogColor: json.color }
|
|
90
93
|
: null;
|
|
91
|
-
if (cueData) {
|
|
94
|
+
if (cueData && deck) {
|
|
92
95
|
this.queue[deck].push({ layer: deck, ...cueData });
|
|
93
96
|
}
|
|
94
97
|
}
|
|
@@ -108,7 +111,7 @@ class Player extends events_1.EventEmitter {
|
|
|
108
111
|
isNewTrack = false;
|
|
109
112
|
}
|
|
110
113
|
}
|
|
111
|
-
this.lastTrackNetworkPath.set(layer, data.trackNetworkPath);
|
|
114
|
+
this.lastTrackNetworkPath.set(layer, data.trackNetworkPath ?? '');
|
|
112
115
|
// This will be true once a song has been fully downloaded / loaded.
|
|
113
116
|
const isSongLoaded = data.hasOwnProperty('songLoaded');
|
|
114
117
|
// If a new song is loaded drop all the previous track data.
|
|
@@ -121,8 +124,11 @@ class Player extends events_1.EventEmitter {
|
|
|
121
124
|
this.decks.set(layer, { ...this.decks.get(layer), ...data });
|
|
122
125
|
}
|
|
123
126
|
const result = this.decks.get(layer);
|
|
127
|
+
if (!result)
|
|
128
|
+
return;
|
|
124
129
|
const deck = `${this.player}${result.layer}`;
|
|
125
130
|
const output = {
|
|
131
|
+
...result,
|
|
126
132
|
deck: deck,
|
|
127
133
|
player: this.player,
|
|
128
134
|
layer: layer,
|
|
@@ -131,7 +137,6 @@ class Player extends events_1.EventEmitter {
|
|
|
131
137
|
masterTempo: this.masterTempo,
|
|
132
138
|
masterStatus: this.masterStatus,
|
|
133
139
|
deviceId: `net://${this.deviceId}`,
|
|
134
|
-
...result
|
|
135
140
|
};
|
|
136
141
|
// We're casting here because we originally built it up piecemeal.
|
|
137
142
|
const currentState = output;
|
|
@@ -151,7 +156,7 @@ class Player extends events_1.EventEmitter {
|
|
|
151
156
|
if (isSongLoaded && currentState.trackNetworkPath)
|
|
152
157
|
this.emit('trackLoaded', currentState);
|
|
153
158
|
// If the song is actually playing emit the nowPlaying event.
|
|
154
|
-
if (result
|
|
159
|
+
if (result?.playState)
|
|
155
160
|
this.emit('nowPlaying', currentState);
|
|
156
161
|
// Emit that the state has changed.
|
|
157
162
|
this.emit('stateChanged', currentState);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.js","sourceRoot":"","sources":["../../devices/Player.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,6DAA0D;AAE1D,8CAAuC;AAuBvC;;;;;;;;;;;;;;;GAeG;AACH,MAAa,MAAO,SAAQ,qBAAY;IAYtC;;;;;OAKG;IACH,YAAY,OAAsB;QAChC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Player.js","sourceRoot":"","sources":["../../devices/Player.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ exports.UPDATE_RATE_MS = 1500;
|
|
|
17
17
|
*/
|
|
18
18
|
class PlayerMessageQueue {
|
|
19
19
|
constructor(layer) {
|
|
20
|
+
this.callback = () => { };
|
|
20
21
|
this.data = [];
|
|
21
22
|
this.timeout = null;
|
|
22
23
|
this.layer = layer;
|
|
@@ -38,7 +39,8 @@ class PlayerMessageQueue {
|
|
|
38
39
|
let output = { layer: this.layer };
|
|
39
40
|
this.data.map(d => { output = { ...output, ...d }; });
|
|
40
41
|
this.data = [];
|
|
41
|
-
|
|
42
|
+
if (this.timeout)
|
|
43
|
+
clearTimeout(this.timeout);
|
|
42
44
|
this.timeout = null;
|
|
43
45
|
this.callback(output);
|
|
44
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlayerMessageQueue.js","sourceRoot":"","sources":["../../devices/PlayerMessageQueue.ts"],"names":[],"mappings":";;;AAEA,+EAA+E;AAC/E,yDAAyD;AAC5C,QAAA,cAAc,GAAG,IAAI,CAAC;AAInC;;;;;;;;;;GAUG;AACH,MAAa,kBAAkB;IAO7B,YAAY,KAAa;
|
|
1
|
+
{"version":3,"file":"PlayerMessageQueue.js","sourceRoot":"","sources":["../../devices/PlayerMessageQueue.ts"],"names":[],"mappings":";;;AAEA,+EAA+E;AAC/E,yDAAyD;AAC5C,QAAA,cAAc,GAAG,IAAI,CAAC;AAInC;;;;;;;;;;GAUG;AACH,MAAa,kBAAkB;IAO7B,YAAY,KAAa;QALjB,aAAQ,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QACvC,SAAI,GAAuB,EAAE,CAAC;QAC9B,YAAO,GAAyC,IAAI,CAAC;QAI3D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,IAAsB;QACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,sBAAc,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,IAAI,MAAM,GAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,IAAI,CAAC,OAAO;YAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,MAA0B,CAAC,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,QAA2B;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA3CD,gDA2CC"}
|
|
@@ -22,7 +22,7 @@ export declare class NetworkDevice {
|
|
|
22
22
|
addSource(p_sourceName: string, p_localDbPath: string, p_localAlbumArtPath: string): Promise<void>;
|
|
23
23
|
dumpAlbumArt(p_sourceName: string): Promise<void>;
|
|
24
24
|
querySource(p_sourceName: string, p_query: string, ...p_params: any[]): any[];
|
|
25
|
-
getAlbumArtPath(p_networkPath: string): string;
|
|
25
|
+
getAlbumArtPath(p_networkPath: string): string | null;
|
|
26
26
|
/**
|
|
27
27
|
* Parse a network path into source and track path components.
|
|
28
28
|
*
|
|
@@ -32,6 +32,9 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
35
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
39
|
exports.NetworkDevice = void 0;
|
|
37
40
|
const LogEmitter_1 = require("../LogEmitter");
|
|
@@ -44,7 +47,7 @@ const WriteContext_1 = require("../utils/WriteContext");
|
|
|
44
47
|
const FileType = __importStar(require("file-type"));
|
|
45
48
|
const fs = __importStar(require("fs"));
|
|
46
49
|
const tcp = __importStar(require("../utils/tcp"));
|
|
47
|
-
const
|
|
50
|
+
const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
|
|
48
51
|
class NetworkDevice {
|
|
49
52
|
constructor(info) {
|
|
50
53
|
this.connection = null;
|
|
@@ -77,7 +80,7 @@ class NetworkDevice {
|
|
|
77
80
|
// Disconnect all services
|
|
78
81
|
for (const [key, service] of Object.entries(this.services)) {
|
|
79
82
|
service.disconnect();
|
|
80
|
-
this.services[key]
|
|
83
|
+
delete this.services[key];
|
|
81
84
|
}
|
|
82
85
|
(0, assert_1.strict)(this.connection);
|
|
83
86
|
this.connection.destroy();
|
|
@@ -144,7 +147,7 @@ class NetworkDevice {
|
|
|
144
147
|
if (this.connectedSources[p_sourceName]) {
|
|
145
148
|
return;
|
|
146
149
|
}
|
|
147
|
-
const db = new
|
|
150
|
+
const db = new better_sqlite3_1.default(p_localDbPath);
|
|
148
151
|
// Get all album art extensions
|
|
149
152
|
const stmt = db.prepare('SELECT * FROM AlbumArt WHERE albumArt NOT NULL');
|
|
150
153
|
const result = stmt.all();
|
|
@@ -153,7 +156,8 @@ class NetworkDevice {
|
|
|
153
156
|
// @ts-ignore
|
|
154
157
|
const filetype = await FileType.fromBuffer(entry.albumArt);
|
|
155
158
|
// @ts-ignore
|
|
156
|
-
|
|
159
|
+
if (filetype)
|
|
160
|
+
albumArtExtensions[entry.id] = filetype.ext;
|
|
157
161
|
}
|
|
158
162
|
this.connectedSources[p_sourceName] = {
|
|
159
163
|
db: db,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkDevice.js","sourceRoot":"","sources":["../../network/NetworkDevice.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NetworkDevice.js","sourceRoot":"","sources":["../../network/NetworkDevice.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuC;AACvC,sDAAmD;AACnD,oCAA2F;AAC3F,0CAAuC;AACvC,kDAAsD;AACtD,mCAA0C;AAC1C,wDAAqD;AACrD,oDAAsC;AACtC,uCAAyB;AAEzB,kDAAoC;AACpC,oEAAsC;AAQtC,MAAa,aAAa;IAqBxB,YAAY,IAAoB;QApBxB,eAAU,GAA0B,IAAI,CAAC;QACjD,gCAAgC;QACxB,0BAAqB,GAAG,KAAK,CAAC;QAC9B,iBAAY,GAAiB,EAAE,CAAC;QAChC,aAAQ,GAA0D,EAAE,CAAC;QACrE,cAAS,GAAW,CAAC,CAAC;QACtB,qBAAgB,GAUpB,EAAE,CAAC;QAKL,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,IAAY,OAAO;QACjB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;IACrC,CAAC;IAED,IAAY,IAAI;QACd,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;IAClC,CAAC;IAED,2EAA2E;IAC3E,uBAAuB;IAEvB,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC;QACjC,mBAAM,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QACrE,IAAI,CAAC,UAAU,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,SAAiB,EAAE,EAAE;YACtD,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACtC,CAAC;IAED,UAAU;QACR,0BAA0B;QAC1B,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3D,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;QAED,IAAA,eAAM,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,2EAA2E;IAC3E,kBAAkB;IAElB,cAAc,CAAC,SAAiB;QAC9B,MAAM,GAAG,GAAG,IAAI,yBAAW,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;YAC5B,oCAAoC;YACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACb,QAAQ,EAAE,EAAE,CAAC;gBACX,KAAK,iBAAS,CAAC,SAAS;oBACtB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACb,sDAAsD;oBACtD,yEAAyE;oBACzE,6CAA6C;oBAE7C,wDAAwD;oBACxD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC;oBACpE,0DAA0D;oBAC1D,MAAM;gBACR,KAAK,iBAAS,CAAC,oBAAoB;oBACjC,MAAM,OAAO,GAAG,GAAG,CAAC,sBAAsB,EAAE,CAAC;oBAC7C,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;oBAC9B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;oBAClC,MAAM;gBACR,KAAK,iBAAS,CAAC,eAAe;oBAC5B,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;oBAClC,MAAM;gBACR;oBACE,eAAM,CAAC,IAAI,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;IACH,CAAC;IAED,2EAA2E;IAC3E,iBAAiB;IAEjB,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IACD,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,mBAAmB;IACnB,KAAK,CAAC,gBAAgB,CAAkD,IAEvE;QACC,IAAA,eAAM,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,yEAAyE;QACzE,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAC;QAEjB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAM,CAAC;QACzC,CAAC;QAED,IAAA,eAAM,EAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;QACtD,IAAA,eAAM,EAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE5C,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEnD,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;QACrC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,mCAAmC;IACnC,KAAK,CAAC,SAAS,CAAC,YAAoB,EAAE,aAAqB,EAAE,mBAA2B;QACtF,IAAI,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC;YACxC,OAAO;QACT,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,wBAAQ,CAAC,aAAa,CAAC,CAAC;QAEvC,+BAA+B;QAC/B,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,gDAAgD,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,kBAAkB,GAA2B,EAAE,CAAC;QACtD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,aAAa;YACb,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC3D,aAAa;YACb,IAAI,QAAQ;gBAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG;YACpC,EAAE,EAAE,EAAE;YACN,QAAQ,EAAE;gBACR,IAAI,EAAE,mBAAmB;gBACzB,UAAU,EAAE,kBAAkB;aAC/B;SACF,CAAC;IACJ,CAAC;IAED,mCAAmC;IACnC,KAAK,CAAC,YAAY,CAAC,YAAoB;QACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC;YACzC,eAAM,CAAC,IAAI,CAAC,WAAW,YAAY,iBAAiB,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC/D,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC;YAClC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,gDAAgD,CAAC,CAAC;QACtG,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC3D,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAI,KAAK,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;YAC7C,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC;QACD,mBAAM,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,MAAM,oBAAoB,IAAI,GAAG,CAAC,CAAC;IAClE,CAAC;IAED,mBAAmB;IAEnB,WAAW,CAAC,YAAoB,EAAE,OAAe,EAAE,GAAG,QAAe;QACnE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC;YACzC,wDAAwD;YACxD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEjC,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC;IAED,eAAe,CAAC,aAAqB;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,gCAAgC,CAAC,aAAa,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,GAAG,GAAG,oCAAoC,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QACxE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAA,eAAM,EAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,6BAA6B;QAC5D,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;QAClC,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC;IAC7E,CAAC;IAED,2EAA2E;IAC3E,kBAAkB;IAElB;;;;;;;;;;;OAWG;IACK,gCAAgC,CAAC,MAAc;QACrD,MAAM,MAAM,GAAG,IAAA,4BAAgB,EAAC,MAAM,CAAC,CAAC;QAExC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,UAAU;YACzB,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,sBAAsB;QAClC,IAAA,eAAM,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAExB,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,UAAU,CAAC,GAAG,EAAE;gBACd,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC;oBAC/C,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG;oBAChC,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACnE,CAAC,EAAE,sBAAc,CAAC,CAAC;YAEnB,iCAAiC;YACjC,OAAO,IAAI,EAAE,CAAC;gBACZ,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;oBAC/B,MAAM;gBACR,CAAC;gBACD,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAC;YACnB,CAAC;YAED,mDAAmD;YACnD,MAAM,GAAG,GAAG,IAAI,2BAAY,EAAE,CAAC;YAC/B,GAAG,CAAC,WAAW,CAAC,iBAAS,CAAC,eAAe,CAAC,CAAC;YAC3C,GAAG,CAAC,KAAK,CAAC,cAAM,CAAC,WAAW,CAAC,CAAC;YAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YAC9D,IAAA,eAAM,EAAC,OAAO,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAE/B,OAAO,IAAI,EAAE,CAAC;gBACZ,iEAAiE;gBACjE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9C,mBAAM,CAAC,KAAK,CAAC,wCAAwC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAClF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;wBAC7D,mBAAM,CAAC,KAAK,CAAC,WAAW,IAAI,OAAO,IAAI,EAAE,CAAC,CAAC;oBAC7C,CAAC;oBACD,OAAO,EAAE,CAAC;oBACV,MAAM;gBACR,CAAC;gBACD,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAYF;AAhSD,sCAgSC"}
|
|
@@ -66,6 +66,9 @@ class StageLinqDevices extends events_1.EventEmitter {
|
|
|
66
66
|
async downloadFile(deviceId, path) {
|
|
67
67
|
if (this.options.enableFileTranfer) {
|
|
68
68
|
const device = this.devices.get(deviceId);
|
|
69
|
+
if (!device?.fileTransferService) {
|
|
70
|
+
throw new Error(`Device ${deviceId} not found or file transfer not available`);
|
|
71
|
+
}
|
|
69
72
|
// Wait until FileTransfer.getFile is free
|
|
70
73
|
await device.fileTransferService.waitTillAvailable();
|
|
71
74
|
const file = await device.fileTransferService.getFile(path);
|
|
@@ -113,7 +116,8 @@ class StageLinqDevices extends events_1.EventEmitter {
|
|
|
113
116
|
if (foundDevices && allConnected) {
|
|
114
117
|
LogEmitter_1.Logger.log('All devices found!');
|
|
115
118
|
LogEmitter_1.Logger.debug(`Devices found: ${values.length} ${JSON.stringify(entries)}`);
|
|
116
|
-
|
|
119
|
+
if (this.deviceWatchTimeout)
|
|
120
|
+
clearInterval(this.deviceWatchTimeout);
|
|
117
121
|
for (const cb of this.stateMapCallback) {
|
|
118
122
|
this.setupStateMap(cb.connectionInfo, cb.networkDevice);
|
|
119
123
|
}
|
|
@@ -134,7 +138,7 @@ class StageLinqDevices extends events_1.EventEmitter {
|
|
|
134
138
|
// Mark this device as connecting.
|
|
135
139
|
this.discoveryStatus.set(this.deviceId(connectionInfo), ConnectionStatus.CONNECTING);
|
|
136
140
|
let attempt = 1;
|
|
137
|
-
while (attempt < this.options.maxRetries) {
|
|
141
|
+
while (attempt < (this.options.maxRetries ?? 3)) {
|
|
138
142
|
try {
|
|
139
143
|
// Connect to the device.
|
|
140
144
|
LogEmitter_1.Logger.info(`Connecting to ${this.deviceId(connectionInfo)}. ` +
|
|
@@ -249,7 +253,7 @@ class StageLinqDevices extends events_1.EventEmitter {
|
|
|
249
253
|
=== ConnectionStatus.FAILED;
|
|
250
254
|
}
|
|
251
255
|
isIgnored(device) {
|
|
252
|
-
return (device.source === this.options.actingAs
|
|
256
|
+
return (device.source === this.options.actingAs?.source
|
|
253
257
|
|| device.software.name === 'OfflineAnalyzer'
|
|
254
258
|
|| /^SoundSwitch/i.test(device.software.name)
|
|
255
259
|
|| /^Resolume/i.test(device.software.name)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StageLinqDevices.js","sourceRoot":"","sources":["../../network/StageLinqDevices.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"StageLinqDevices.js","sourceRoot":"","sources":["../../network/StageLinqDevices.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,16 @@ type DeviceDiscoveryCallback = (info: ConnectionInfo) => void;
|
|
|
5
5
|
* execute a callback.
|
|
6
6
|
*/
|
|
7
7
|
export declare class StageLinqListener {
|
|
8
|
+
private socket;
|
|
8
9
|
/**
|
|
9
10
|
* Listen for new devices on the network and callback when a new one is found.
|
|
10
11
|
* @param callback Callback when new device is discovered.
|
|
11
12
|
*/
|
|
12
13
|
listenForDevices(callback: DeviceDiscoveryCallback): void;
|
|
14
|
+
/**
|
|
15
|
+
* Stop listening for devices and close the UDP socket.
|
|
16
|
+
*/
|
|
17
|
+
stop(): void;
|
|
13
18
|
private readConnectionInfo;
|
|
14
19
|
}
|
|
15
20
|
export {};
|
|
@@ -11,12 +11,16 @@ const config_1 = require("../config");
|
|
|
11
11
|
* execute a callback.
|
|
12
12
|
*/
|
|
13
13
|
class StageLinqListener {
|
|
14
|
+
constructor() {
|
|
15
|
+
this.socket = null;
|
|
16
|
+
}
|
|
14
17
|
/**
|
|
15
18
|
* Listen for new devices on the network and callback when a new one is found.
|
|
16
19
|
* @param callback Callback when new device is discovered.
|
|
17
20
|
*/
|
|
18
21
|
listenForDevices(callback) {
|
|
19
22
|
const client = (0, dgram_1.createSocket)({ type: 'udp4', reuseAddr: true });
|
|
23
|
+
this.socket = client;
|
|
20
24
|
client.on('message', (p_announcement, p_remote) => {
|
|
21
25
|
const networkTap = (0, config_1.getConfig)().networkTap;
|
|
22
26
|
if (networkTap) {
|
|
@@ -30,10 +34,20 @@ class StageLinqListener {
|
|
|
30
34
|
const ctx = new ReadContext_1.ReadContext(p_announcement.buffer, false);
|
|
31
35
|
const result = this.readConnectionInfo(ctx, p_remote.address);
|
|
32
36
|
(0, assert_1.strict)(ctx.tell() === p_remote.size);
|
|
33
|
-
|
|
37
|
+
if (result)
|
|
38
|
+
callback(result);
|
|
34
39
|
});
|
|
35
40
|
client.bind(common_1.LISTEN_PORT);
|
|
36
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* Stop listening for devices and close the UDP socket.
|
|
44
|
+
*/
|
|
45
|
+
stop() {
|
|
46
|
+
if (this.socket) {
|
|
47
|
+
this.socket.close();
|
|
48
|
+
this.socket = null;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
37
51
|
readConnectionInfo(p_ctx, p_address) {
|
|
38
52
|
const magic = p_ctx.getString(4);
|
|
39
53
|
if (magic !== common_1.DISCOVERY_MESSAGE_MARKER) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StageLinqListener.js","sourceRoot":"","sources":["../../network/StageLinqListener.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"StageLinqListener.js","sourceRoot":"","sources":["../../network/StageLinqListener.ts"],"names":[],"mappings":";;;AACA,iCAAyD;AACzD,4CAAwE;AACxE,sDAAmD;AACnD,mCAA0C;AAC1C,sCAAsC;AAItC;;;GAGG;AACH,MAAa,iBAAiB;IAA9B;QACU,WAAM,GAAkB,IAAI,CAAC;IA0DvC,CAAC;IAxDC;;;OAGG;IACH,gBAAgB,CAAC,QAAiC;QAEhD,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAC,EAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,cAA0B,EAAE,QAAoB,EAAE,EAAE;YACxE,MAAM,UAAU,GAAG,IAAA,kBAAS,GAAE,CAAC,UAAU,CAAC;YAC1C,IAAI,UAAU,EAAE,CAAC;gBACf,UAAU,CAAC;oBACT,SAAS,EAAE,WAAW;oBACtB,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,IAAI,EAAE,cAAc;iBACrB,CAAC,CAAC;YACL,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,yBAAW,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC9D,IAAA,eAAM,EAAC,GAAG,CAAC,IAAI,EAAE,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,MAAM;gBAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,oBAAW,CAAC,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACrB,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,KAAkB,EAAE,SAAiB;QAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,KAAK,KAAK,iCAAwB,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAmB;YAC7B,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,MAAM,EAAE,KAAK,CAAC,sBAAsB,EAAE;YACtC,MAAM,EAAE,KAAK,CAAC,sBAAsB,EAAE;YACtC,QAAQ,EAAE;gBACR,IAAI,EAAE,KAAK,CAAC,sBAAsB,EAAE;gBACpC,OAAO,EAAE,KAAK,CAAC,sBAAsB,EAAE;aACxC;YACD,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE;YACxB,OAAO,EAAE,SAAS;SACnB,CAAC;QACF,IAAA,eAAM,EAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QACtB,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA3DD,8CA2DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"announce.js","sourceRoot":"","sources":["../../network/announce.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"announce.js","sourceRoot":"","sources":["../../network/announce.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,7 +59,7 @@ export declare class BeatInfo extends Service<BeatData> {
|
|
|
59
59
|
/**
|
|
60
60
|
* Parse incoming beat data
|
|
61
61
|
*/
|
|
62
|
-
protected parseData(ctx: ReadContext): ServiceMessage<BeatData
|
|
62
|
+
protected parseData(ctx: ReadContext): ServiceMessage<BeatData> | null;
|
|
63
63
|
/**
|
|
64
64
|
* Handle parsed beat messages
|
|
65
65
|
*/
|
|
@@ -39,7 +39,7 @@ export declare class Broadcast extends Service<BroadcastData> {
|
|
|
39
39
|
/**
|
|
40
40
|
* Parse incoming broadcast data
|
|
41
41
|
*/
|
|
42
|
-
protected parseData(ctx: ReadContext): ServiceMessage<BroadcastData
|
|
42
|
+
protected parseData(ctx: ReadContext): ServiceMessage<BroadcastData> | null;
|
|
43
43
|
/**
|
|
44
44
|
* Handle parsed broadcast messages
|
|
45
45
|
*/
|
|
@@ -157,7 +157,7 @@ class FileTransfer extends Service_1.Service {
|
|
|
157
157
|
const total = parseInt(txinfo.size);
|
|
158
158
|
if (total === 0) {
|
|
159
159
|
LogEmitter_1.Logger.warn(`${p_location} doesn't exist or is a streaming file`);
|
|
160
|
-
return;
|
|
160
|
+
return new Uint8Array(0);
|
|
161
161
|
}
|
|
162
162
|
await this.requestChunkRange(txinfo.txid, 0, totalChunks - 1);
|
|
163
163
|
try {
|
|
@@ -165,11 +165,11 @@ class FileTransfer extends Service_1.Service {
|
|
|
165
165
|
setTimeout(() => {
|
|
166
166
|
reject(new Error(`Failed to download '${p_location}'`));
|
|
167
167
|
}, types_1.DOWNLOAD_TIMEOUT);
|
|
168
|
-
while (this.receivedFile.isEOF() === false) {
|
|
168
|
+
while (this.receivedFile && this.receivedFile.isEOF() === false) {
|
|
169
169
|
const bytesDownloaded = total - this.receivedFile.sizeLeft();
|
|
170
170
|
const percentComplete = (bytesDownloaded / total) * 100;
|
|
171
171
|
this.emit('fileTransferProgress', {
|
|
172
|
-
sizeLeft: this.receivedFile
|
|
172
|
+
sizeLeft: this.receivedFile?.sizeLeft() ?? 0,
|
|
173
173
|
total: txinfo.size,
|
|
174
174
|
bytesDownloaded: bytesDownloaded,
|
|
175
175
|
percentComplete: percentComplete
|
|
@@ -182,7 +182,7 @@ class FileTransfer extends Service_1.Service {
|
|
|
182
182
|
});
|
|
183
183
|
}
|
|
184
184
|
catch (err) {
|
|
185
|
-
const msg = `Could not read database from ${p_location}: ${err.message}`;
|
|
185
|
+
const msg = `Could not read database from ${p_location}: ${err instanceof Error ? err.message : err}`;
|
|
186
186
|
LogEmitter_1.Logger.error(msg);
|
|
187
187
|
this._available = true;
|
|
188
188
|
throw new Error(msg);
|
|
@@ -191,7 +191,7 @@ class FileTransfer extends Service_1.Service {
|
|
|
191
191
|
await this.signalTransferComplete();
|
|
192
192
|
this._available = true;
|
|
193
193
|
}
|
|
194
|
-
const buf = this.receivedFile ? this.receivedFile.getBuffer() :
|
|
194
|
+
const buf = this.receivedFile ? this.receivedFile.getBuffer() : new Uint8Array(0);
|
|
195
195
|
this.receivedFile = null;
|
|
196
196
|
return buf;
|
|
197
197
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileTransfer.js","sourceRoot":"","sources":["../../services/FileTransfer.ts"],"names":[],"mappings":";;;AAAA,oCAA4C;AAC5C,8CAAuC;AAEvC,uCAAoC;AACpC,0CAAuC;AACvC,mCAA0C;AAC1C,wDAAqD;AAGrD,MAAM,YAAY,GAAG,MAAM,CAAC;AACf,QAAA,UAAU,GAAG,IAAI,CAAC;AAK/B,IAAK,SASJ;AATD,WAAK,SAAS;IACZ,iDAAc,CAAA;IACd,iDAAc,CAAA;IACd,yDAAkB,CAAA;IAClB,+DAAqB,CAAA;IACrB,6DAAoB,CAAA;IACpB,mEAAuB,CAAA;IACvB,iDAAc,CAAA;IACd,mEAAuB,CAAA;AACzB,CAAC,EATI,SAAS,KAAT,SAAS,QASb;AAaD,MAAa,YAAa,SAAQ,iBAAyB;IAA3D;;QACU,iBAAY,
|
|
1
|
+
{"version":3,"file":"FileTransfer.js","sourceRoot":"","sources":["../../services/FileTransfer.ts"],"names":[],"mappings":"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"}
|