stagelinq 3.0.4 → 3.1.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 +2 -1
- package/dist/Databases/Databases.d.ts +3 -1
- package/dist/Databases/Databases.js +9 -8
- package/dist/Databases/Databases.js.map +1 -1
- package/dist/Databases/DbConnection.d.ts +3 -1
- package/dist/Databases/DbConnection.js +6 -4
- package/dist/Databases/DbConnection.js.map +1 -1
- package/dist/StageLinq/index.d.ts +1 -1
- package/dist/StageLinq/index.js +8 -8
- package/dist/StageLinq/index.js.map +1 -1
- package/dist/devices/Player.d.ts +3 -0
- package/dist/devices/Player.js +15 -6
- package/dist/devices/Player.js.map +1 -1
- package/dist/eaas/beacon.d.ts +3 -1
- package/dist/eaas/beacon.js +10 -9
- package/dist/eaas/beacon.js.map +1 -1
- package/dist/eaas/discoverer.d.ts +3 -1
- package/dist/eaas/discoverer.js +16 -12
- package/dist/eaas/discoverer.js.map +1 -1
- package/dist/eaas/engine-library-client.d.ts +3 -1
- package/dist/eaas/engine-library-client.js +7 -6
- package/dist/eaas/engine-library-client.js.map +1 -1
- package/dist/eaas/http-client.d.ts +3 -1
- package/dist/eaas/http-client.js +5 -4
- package/dist/eaas/http-client.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/metadata/index.d.ts +26 -0
- package/dist/metadata/index.js +53 -0
- package/dist/metadata/index.js.map +1 -0
- package/dist/metadata/reader.d.ts +11 -0
- package/dist/metadata/reader.js +20 -0
- package/dist/metadata/reader.js.map +1 -0
- package/dist/network/ConnectionHealth.d.ts +3 -1
- package/dist/network/ConnectionHealth.js +13 -12
- package/dist/network/ConnectionHealth.js.map +1 -1
- package/dist/network/NetworkDevice.d.ts +4 -2
- package/dist/network/NetworkDevice.js +9 -8
- package/dist/network/NetworkDevice.js.map +1 -1
- package/dist/network/StageLinqDevices.d.ts +12 -2
- package/dist/network/StageLinqDevices.js +59 -25
- package/dist/network/StageLinqDevices.js.map +1 -1
- package/dist/network/announce.d.ts +3 -2
- package/dist/network/announce.js +40 -15
- package/dist/network/announce.js.map +1 -1
- package/dist/services/FileTransfer.d.ts +14 -0
- package/dist/services/FileTransfer.js +86 -6
- package/dist/services/FileTransfer.js.map +1 -1
- package/dist/services/Service.d.ts +3 -1
- package/dist/services/Service.js +7 -6
- package/dist/services/Service.js.map +1 -1
- package/dist/services/StateMap.js +0 -1
- package/dist/services/StateMap.js.map +1 -1
- package/dist/services/TimeSync.js +2 -3
- package/dist/services/TimeSync.js.map +1 -1
- package/dist/types/index.d.ts +4 -0
- package/dist/types/index.js +1 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/logger.d.ts +13 -0
- package/dist/types/logger.js +11 -0
- package/dist/types/logger.js.map +1 -0
- package/dist/utils/tcp.d.ts +2 -1
- package/dist/utils/tcp.js +3 -3
- package/dist/utils/tcp.js.map +1 -1
- package/package.json +5 -1
- package/dist/LogEmitter/index.d.ts +0 -20
- package/dist/LogEmitter/index.js +0 -35
- package/dist/LogEmitter/index.js.map +0 -1
|
@@ -20,6 +20,20 @@ export declare class FileTransfer extends Service<FileTransferData> {
|
|
|
20
20
|
protected messageHandler(p_data: ServiceMessage<FileTransferData>): void;
|
|
21
21
|
getFile(p_location: string): Promise<Uint8Array>;
|
|
22
22
|
getSources(): Promise<Source[]>;
|
|
23
|
+
/**
|
|
24
|
+
* Get the size of a file without downloading it
|
|
25
|
+
*/
|
|
26
|
+
getFileSize(p_location: string): Promise<number>;
|
|
27
|
+
/**
|
|
28
|
+
* Read a specific byte range from a file
|
|
29
|
+
* This only downloads the chunks needed for the requested range
|
|
30
|
+
*
|
|
31
|
+
* @param p_location - File path on the device
|
|
32
|
+
* @param offset - Starting byte offset
|
|
33
|
+
* @param length - Number of bytes to read
|
|
34
|
+
* @returns Buffer containing the requested bytes
|
|
35
|
+
*/
|
|
36
|
+
getFileRange(p_location: string, offset: number, length: number): Promise<Buffer>;
|
|
23
37
|
private requestStat;
|
|
24
38
|
private requestSources;
|
|
25
39
|
private requestFileTransferId;
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FileTransfer = exports.CHUNK_SIZE = void 0;
|
|
4
4
|
const types_1 = require("../types");
|
|
5
|
-
const LogEmitter_1 = require("../LogEmitter");
|
|
6
5
|
const Service_1 = require("./Service");
|
|
7
6
|
const sleep_1 = require("../utils/sleep");
|
|
8
7
|
const assert_1 = require("assert");
|
|
@@ -156,7 +155,7 @@ class FileTransfer extends Service_1.Service {
|
|
|
156
155
|
const totalChunks = Math.ceil(txinfo.size / exports.CHUNK_SIZE);
|
|
157
156
|
const total = parseInt(txinfo.size);
|
|
158
157
|
if (total === 0) {
|
|
159
|
-
|
|
158
|
+
this.logger.warn(`${p_location} doesn't exist or is a streaming file`);
|
|
160
159
|
return new Uint8Array(0);
|
|
161
160
|
}
|
|
162
161
|
await this.requestChunkRange(txinfo.txid, 0, totalChunks - 1);
|
|
@@ -174,20 +173,20 @@ class FileTransfer extends Service_1.Service {
|
|
|
174
173
|
bytesDownloaded: bytesDownloaded,
|
|
175
174
|
percentComplete: percentComplete
|
|
176
175
|
});
|
|
177
|
-
|
|
176
|
+
this.logger.debug(`Reading ${p_location} progressComplete=${Math.ceil(percentComplete)}% ${bytesDownloaded}/${total}`);
|
|
178
177
|
await (0, sleep_1.sleep)(200);
|
|
179
178
|
}
|
|
180
|
-
|
|
179
|
+
this.logger.debug(`Download complete.`);
|
|
181
180
|
resolve(true);
|
|
182
181
|
});
|
|
183
182
|
}
|
|
184
183
|
catch (err) {
|
|
185
184
|
const msg = `Could not read database from ${p_location}: ${err instanceof Error ? err.message : err}`;
|
|
186
|
-
|
|
185
|
+
this.logger.error(msg);
|
|
187
186
|
this._available = true;
|
|
188
187
|
throw new Error(msg);
|
|
189
188
|
}
|
|
190
|
-
|
|
189
|
+
this.logger.debug(`Signaling transfer complete.`);
|
|
191
190
|
await this.signalTransferComplete();
|
|
192
191
|
this._available = true;
|
|
193
192
|
}
|
|
@@ -221,6 +220,87 @@ class FileTransfer extends Service_1.Service {
|
|
|
221
220
|
}
|
|
222
221
|
return result;
|
|
223
222
|
}
|
|
223
|
+
/**
|
|
224
|
+
* Get the size of a file without downloading it
|
|
225
|
+
*/
|
|
226
|
+
async getFileSize(p_location) {
|
|
227
|
+
await this.requestStat(p_location);
|
|
228
|
+
const fstatMessage = await this.waitForMessage(MessageId.FileStat);
|
|
229
|
+
return fstatMessage.size;
|
|
230
|
+
}
|
|
231
|
+
/**
|
|
232
|
+
* Read a specific byte range from a file
|
|
233
|
+
* This only downloads the chunks needed for the requested range
|
|
234
|
+
*
|
|
235
|
+
* @param p_location - File path on the device
|
|
236
|
+
* @param offset - Starting byte offset
|
|
237
|
+
* @param length - Number of bytes to read
|
|
238
|
+
* @returns Buffer containing the requested bytes
|
|
239
|
+
*/
|
|
240
|
+
async getFileRange(p_location, offset, length) {
|
|
241
|
+
await this.waitTillAvailable();
|
|
242
|
+
this._available = false;
|
|
243
|
+
try {
|
|
244
|
+
// Request file transfer ID to get file size and txid
|
|
245
|
+
await this.requestFileTransferId(p_location);
|
|
246
|
+
const txinfo = await this.waitForMessage(MessageId.FileTransferId);
|
|
247
|
+
if (!txinfo || txinfo.size === 0) {
|
|
248
|
+
this.logger.warn(`${p_location} doesn't exist or is a streaming file`);
|
|
249
|
+
return Buffer.alloc(0);
|
|
250
|
+
}
|
|
251
|
+
// Clamp the requested range to file size
|
|
252
|
+
const fileSize = txinfo.size;
|
|
253
|
+
const endOffset = Math.min(offset + length, fileSize);
|
|
254
|
+
const actualLength = Math.max(0, endOffset - offset);
|
|
255
|
+
if (actualLength === 0 || offset >= fileSize) {
|
|
256
|
+
await this.signalTransferComplete();
|
|
257
|
+
return Buffer.alloc(0);
|
|
258
|
+
}
|
|
259
|
+
// Calculate which chunks we need
|
|
260
|
+
const startChunk = Math.floor(offset / exports.CHUNK_SIZE);
|
|
261
|
+
const endChunk = Math.floor((endOffset - 1) / exports.CHUNK_SIZE);
|
|
262
|
+
const totalChunks = endChunk - startChunk + 1;
|
|
263
|
+
// Create buffer for the chunks we need
|
|
264
|
+
const chunkBuffer = Buffer.alloc(totalChunks * exports.CHUNK_SIZE);
|
|
265
|
+
let chunksReceived = 0;
|
|
266
|
+
// Set up chunk listener
|
|
267
|
+
const chunkPromise = new Promise((resolve, reject) => {
|
|
268
|
+
const timeout = setTimeout(() => {
|
|
269
|
+
this.removeListener('message', chunkListener);
|
|
270
|
+
reject(new Error(`Timeout reading range from '${p_location}'`));
|
|
271
|
+
}, types_1.DOWNLOAD_TIMEOUT);
|
|
272
|
+
const chunkListener = (p_message) => {
|
|
273
|
+
if (p_message.id === MessageId.FileTransferChunk) {
|
|
274
|
+
const chunkOffset = p_message.message.offset;
|
|
275
|
+
const chunkIndex = Math.floor(chunkOffset / exports.CHUNK_SIZE) - startChunk;
|
|
276
|
+
if (chunkIndex >= 0 && chunkIndex < totalChunks) {
|
|
277
|
+
const bufferOffset = chunkIndex * exports.CHUNK_SIZE;
|
|
278
|
+
p_message.message.data.copy(chunkBuffer, bufferOffset);
|
|
279
|
+
chunksReceived++;
|
|
280
|
+
if (chunksReceived >= totalChunks) {
|
|
281
|
+
clearTimeout(timeout);
|
|
282
|
+
this.removeListener('message', chunkListener);
|
|
283
|
+
resolve();
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
};
|
|
288
|
+
this.addListener('message', chunkListener);
|
|
289
|
+
});
|
|
290
|
+
// Request the specific chunk range
|
|
291
|
+
await this.requestChunkRange(txinfo.txid, startChunk, endChunk);
|
|
292
|
+
// Wait for all chunks
|
|
293
|
+
await chunkPromise;
|
|
294
|
+
// Signal transfer complete
|
|
295
|
+
await this.signalTransferComplete();
|
|
296
|
+
// Extract the exact bytes requested
|
|
297
|
+
const startInBuffer = offset - (startChunk * exports.CHUNK_SIZE);
|
|
298
|
+
return chunkBuffer.subarray(startInBuffer, startInBuffer + actualLength);
|
|
299
|
+
}
|
|
300
|
+
finally {
|
|
301
|
+
this._available = true;
|
|
302
|
+
}
|
|
303
|
+
}
|
|
224
304
|
///////////////////////////////////////////////////////////////////////////
|
|
225
305
|
// Private methods
|
|
226
306
|
async requestStat(p_filepath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileTransfer.js","sourceRoot":"","sources":["../../services/FileTransfer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FileTransfer.js","sourceRoot":"","sources":["../../services/FileTransfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
+
import type { Logger } from '../types/logger';
|
|
2
3
|
import { NetworkDevice } from '../network/NetworkDevice';
|
|
3
4
|
import { ReadContext } from '../utils/ReadContext';
|
|
4
5
|
import { WriteContext } from '../utils/WriteContext';
|
|
@@ -10,7 +11,8 @@ export declare abstract class Service<T> extends EventEmitter {
|
|
|
10
11
|
readonly name: string;
|
|
11
12
|
protected controller: NetworkDevice;
|
|
12
13
|
protected connection: tcp.Connection | null;
|
|
13
|
-
|
|
14
|
+
protected logger: Logger;
|
|
15
|
+
constructor(p_address: string, p_port: number, p_controller: NetworkDevice, logger?: Logger);
|
|
14
16
|
connect(): Promise<void>;
|
|
15
17
|
disconnect(): void;
|
|
16
18
|
waitForMessage(p_messageId: number): Promise<T>;
|
package/dist/services/Service.js
CHANGED
|
@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.Service = void 0;
|
|
37
37
|
const events_1 = require("events");
|
|
38
|
-
const
|
|
38
|
+
const logger_1 = require("../types/logger");
|
|
39
39
|
const types_1 = require("../types");
|
|
40
40
|
const ReadContext_1 = require("../utils/ReadContext");
|
|
41
41
|
const assert_1 = require("assert");
|
|
@@ -43,13 +43,14 @@ const WriteContext_1 = require("../utils/WriteContext");
|
|
|
43
43
|
const tcp = __importStar(require("../utils/tcp"));
|
|
44
44
|
const config_1 = require("../config");
|
|
45
45
|
class Service extends events_1.EventEmitter {
|
|
46
|
-
constructor(p_address, p_port, p_controller) {
|
|
46
|
+
constructor(p_address, p_port, p_controller, logger = logger_1.noopLogger) {
|
|
47
47
|
super();
|
|
48
48
|
this.connection = null;
|
|
49
49
|
this.address = p_address;
|
|
50
50
|
this.port = p_port;
|
|
51
51
|
this.name = this.constructor.name;
|
|
52
52
|
this.controller = p_controller;
|
|
53
|
+
this.logger = logger;
|
|
53
54
|
}
|
|
54
55
|
async connect() {
|
|
55
56
|
(0, assert_1.strict)(!this.connection);
|
|
@@ -104,7 +105,7 @@ class Service extends events_1.EventEmitter {
|
|
|
104
105
|
}
|
|
105
106
|
catch (err) {
|
|
106
107
|
// FIXME: Rethrow based on the severity?
|
|
107
|
-
|
|
108
|
+
this.logger.error(err instanceof Error ? err.message : String(err));
|
|
108
109
|
}
|
|
109
110
|
});
|
|
110
111
|
// FIXME: Is this required for all Services?
|
|
@@ -115,16 +116,16 @@ class Service extends events_1.EventEmitter {
|
|
|
115
116
|
ctx.writeUInt16(this.connection.socket.localPort ?? 0); // FIXME: In the Go code this is the local TCP port, but 0 or any other 16 bit value seems to work fine as well
|
|
116
117
|
await this.write(ctx);
|
|
117
118
|
await this.init();
|
|
118
|
-
|
|
119
|
+
this.logger.debug(`Connected to service '${this.name}' at port ${this.port}`);
|
|
119
120
|
}
|
|
120
121
|
disconnect() {
|
|
121
122
|
(0, assert_1.strict)(this.connection);
|
|
122
123
|
try {
|
|
123
|
-
|
|
124
|
+
this.logger.debug(`Disconnecting ${this.name} Service on ${this.address}`);
|
|
124
125
|
this.connection.destroy();
|
|
125
126
|
}
|
|
126
127
|
catch (e) {
|
|
127
|
-
|
|
128
|
+
this.logger.error('Error disconnecting', e);
|
|
128
129
|
}
|
|
129
130
|
finally {
|
|
130
131
|
this.connection = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../services/Service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAsC;
|
|
1
|
+
{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../services/Service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ const assert_1 = require("assert");
|
|
|
5
5
|
const types_1 = require("../types");
|
|
6
6
|
const WriteContext_1 = require("../utils/WriteContext");
|
|
7
7
|
const Service_1 = require("./Service");
|
|
8
|
-
// import { Logger } from '../LogEmitter';
|
|
9
8
|
exports.States = [
|
|
10
9
|
// Mixer - all 4 channel faders and crossfader
|
|
11
10
|
types_1.StageLinqValue.MixerCH1faderPosition,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StateMap.js","sourceRoot":"","sources":["../../services/StateMap.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAC1C,oCAA0C;AAE1C,wDAAqD;AACrD,uCAAoC;
|
|
1
|
+
{"version":3,"file":"StateMap.js","sourceRoot":"","sources":["../../services/StateMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.TimeSync = void 0;
|
|
13
13
|
const WriteContext_1 = require("../utils/WriteContext");
|
|
14
14
|
const Service_1 = require("./Service");
|
|
15
|
-
const LogEmitter_1 = require("../LogEmitter");
|
|
16
15
|
const perf_hooks_1 = require("perf_hooks");
|
|
17
16
|
class TimeSync extends Service_1.Service {
|
|
18
17
|
constructor(address, port, controller) {
|
|
@@ -102,7 +101,7 @@ class TimeSync extends Service_1.Service {
|
|
|
102
101
|
}
|
|
103
102
|
break;
|
|
104
103
|
default:
|
|
105
|
-
|
|
104
|
+
this.logger.debug(`TimeSync: Unknown message id ${msg.id}`);
|
|
106
105
|
break;
|
|
107
106
|
}
|
|
108
107
|
}
|
|
@@ -118,7 +117,7 @@ class TimeSync extends Service_1.Service {
|
|
|
118
117
|
if (this.avgTimeArray.length >= MAX_SAMPLES) {
|
|
119
118
|
const sum = this.avgTimeArray.reduce((a, b) => a + b, 0n);
|
|
120
119
|
const avg = sum / BigInt(this.avgTimeArray.length);
|
|
121
|
-
|
|
120
|
+
this.logger.trace(`TimeSync: Average time offset ${avg}ms`);
|
|
122
121
|
}
|
|
123
122
|
}
|
|
124
123
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimeSync.js","sourceRoot":"","sources":["../../services/TimeSync.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAGH,wDAAqD;AACrD,uCAAoC;AAGpC,
|
|
1
|
+
{"version":3,"file":"TimeSync.js","sourceRoot":"","sources":["../../services/TimeSync.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { DiscoveryMessageOptions } from '../network';
|
|
2
2
|
import type { NetworkTapCallback } from '../config';
|
|
3
|
+
import type { Logger } from './logger';
|
|
3
4
|
export * from './common';
|
|
5
|
+
export * from './logger';
|
|
4
6
|
export * from './player';
|
|
5
7
|
export * from './tokens';
|
|
6
8
|
export * from './models';
|
|
@@ -43,4 +45,6 @@ export interface StageLinqOptions {
|
|
|
43
45
|
enableFileTranfer?: boolean;
|
|
44
46
|
/** Callback invoked for every packet sent/received. Use for debugging/logging. */
|
|
45
47
|
networkTap?: NetworkTapCallback;
|
|
48
|
+
/** Logger implementation. If not provided, a no-op logger is used (silent). */
|
|
49
|
+
logger?: Logger;
|
|
46
50
|
}
|
package/dist/types/index.js
CHANGED
|
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./common"), exports);
|
|
18
|
+
__exportStar(require("./logger"), exports);
|
|
18
19
|
__exportStar(require("./player"), exports);
|
|
19
20
|
__exportStar(require("./tokens"), exports);
|
|
20
21
|
__exportStar(require("./models"), exports);
|
package/dist/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAIA,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Logger interface for stagelinq package.
|
|
3
|
+
* Consumers can supply their own logger implementation.
|
|
4
|
+
* If no logger is provided, a no-op logger is used (silent).
|
|
5
|
+
*/
|
|
6
|
+
export interface Logger {
|
|
7
|
+
trace(msg: string, ...args: unknown[]): void;
|
|
8
|
+
debug(msg: string, ...args: unknown[]): void;
|
|
9
|
+
info(msg: string, ...args: unknown[]): void;
|
|
10
|
+
warn(msg: string, ...args: unknown[]): void;
|
|
11
|
+
error(msg: string, ...args: unknown[]): void;
|
|
12
|
+
}
|
|
13
|
+
export declare const noopLogger: Logger;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../types/logger.ts"],"names":[],"mappings":";;;AAaa,QAAA,UAAU,GAAW;IAChC,KAAK,KAAI,CAAC;IACV,KAAK,KAAI,CAAC;IACV,IAAI,KAAI,CAAC;IACT,IAAI,KAAI,CAAC;IACT,KAAK,KAAI,CAAC;CACX,CAAC"}
|
package/dist/utils/tcp.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Socket as TCPSocket } from 'net';
|
|
2
2
|
import { PromiseSocket } from 'promise-socket';
|
|
3
|
+
import type { Logger } from '../types/logger';
|
|
3
4
|
export type Connection = PromiseSocket<TCPSocket>;
|
|
4
|
-
export declare function connect(p_ip: string, p_port: number): Promise<Connection>;
|
|
5
|
+
export declare function connect(p_ip: string, p_port: number, logger?: Logger): Promise<Connection>;
|
package/dist/utils/tcp.js
CHANGED
|
@@ -4,15 +4,15 @@ exports.connect = connect;
|
|
|
4
4
|
const net_1 = require("net");
|
|
5
5
|
const promise_socket_1 = require("promise-socket");
|
|
6
6
|
const types_1 = require("../types");
|
|
7
|
-
const
|
|
8
|
-
async function connect(p_ip, p_port) {
|
|
7
|
+
const logger_1 = require("../types/logger");
|
|
8
|
+
async function connect(p_ip, p_port, logger = logger_1.noopLogger) {
|
|
9
9
|
const socket = new net_1.Socket();
|
|
10
10
|
socket.setTimeout(types_1.CONNECT_TIMEOUT);
|
|
11
11
|
const promiseSocket = new promise_socket_1.PromiseSocket(socket);
|
|
12
12
|
await promiseSocket.connect(p_port, p_ip).catch((e) => {
|
|
13
13
|
throw new Error(`Failed to connect to '${p_ip}:${p_port}': ${e}`);
|
|
14
14
|
});
|
|
15
|
-
|
|
15
|
+
logger.debug(`TCP connection to '${p_ip}:${p_port}' local port: ${promiseSocket.socket.localPort}`);
|
|
16
16
|
return promiseSocket;
|
|
17
17
|
}
|
|
18
18
|
//# sourceMappingURL=tcp.js.map
|
package/dist/utils/tcp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tcp.js","sourceRoot":"","sources":["../../utils/tcp.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"tcp.js","sourceRoot":"","sources":["../../utils/tcp.ts"],"names":[],"mappings":";;AAQA,0BASC;AAjBD,6BAA0C;AAC1C,mDAA+C;AAC/C,oCAA2C;AAE3C,4CAA6C;AAItC,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,MAAc,EAAE,SAAiB,mBAAU;IACtF,MAAM,MAAM,GAAG,IAAI,YAAS,EAAE,CAAC;IAC/B,MAAM,CAAC,UAAU,CAAC,uBAAe,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,IAAI,8BAAa,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACrD,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,IAAI,MAAM,MAAM,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,IAAI,MAAM,iBAAiB,aAAa,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IACpG,OAAO,aAAa,CAAC;AACtB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "stagelinq",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.1.2",
|
|
4
4
|
"description": "TypeScript library to connect to Denon StageLinq devices",
|
|
5
5
|
"homepage": "https://github.com/chrisle/StageLinq",
|
|
6
6
|
"repository": {
|
|
@@ -45,6 +45,7 @@
|
|
|
45
45
|
"console-stamp": "^3.0.3",
|
|
46
46
|
"file-type": "^16.5.3",
|
|
47
47
|
"ip": "^1.1.5",
|
|
48
|
+
"metadata-connect": "file:../metadata-connect",
|
|
48
49
|
"minimist": "^1.2.5",
|
|
49
50
|
"promise-socket": "^7.0.0"
|
|
50
51
|
},
|
|
@@ -58,5 +59,8 @@
|
|
|
58
59
|
"prettier": "^3.5.3",
|
|
59
60
|
"typescript": "^5.9.3",
|
|
60
61
|
"vitest": "^4.0.16"
|
|
62
|
+
},
|
|
63
|
+
"overrides": {
|
|
64
|
+
"rollup": ">=4.59.0"
|
|
61
65
|
}
|
|
62
66
|
}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { EventEmitter } from 'stream';
|
|
2
|
-
export declare interface Logger {
|
|
3
|
-
on(event: 'log', listener: (...args: any) => void): this;
|
|
4
|
-
on(event: 'error', listener: (...args: any) => void): this;
|
|
5
|
-
on(event: 'warn', listener: (...args: any) => void): this;
|
|
6
|
-
on(event: 'info', listener: (...args: any) => void): this;
|
|
7
|
-
on(event: 'debug', listener: (...args: any) => void): this;
|
|
8
|
-
on(event: 'silly', listener: (...args: any) => void): this;
|
|
9
|
-
on(event: 'any', listener: (...args: any) => void): this;
|
|
10
|
-
}
|
|
11
|
-
export declare class Logger extends EventEmitter {
|
|
12
|
-
private static _instance;
|
|
13
|
-
static get instance(): Logger;
|
|
14
|
-
static log(...args: any): void;
|
|
15
|
-
static error(...args: any): void;
|
|
16
|
-
static warn(...args: any): void;
|
|
17
|
-
static info(...args: any): void;
|
|
18
|
-
static debug(...args: any): void;
|
|
19
|
-
static silly(...args: any): void;
|
|
20
|
-
}
|
package/dist/LogEmitter/index.js
DELETED
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Logger = void 0;
|
|
4
|
-
const stream_1 = require("stream");
|
|
5
|
-
class Logger extends stream_1.EventEmitter {
|
|
6
|
-
static get instance() {
|
|
7
|
-
return this._instance || (this._instance = new this());
|
|
8
|
-
}
|
|
9
|
-
static log(...args) {
|
|
10
|
-
Logger.instance.emit('log', ...args);
|
|
11
|
-
Logger.instance.emit('any', ...args);
|
|
12
|
-
}
|
|
13
|
-
static error(...args) {
|
|
14
|
-
Logger.instance.emit('error', ...args);
|
|
15
|
-
Logger.instance.emit('any', ...args);
|
|
16
|
-
}
|
|
17
|
-
static warn(...args) {
|
|
18
|
-
Logger.instance.emit('warn', ...args);
|
|
19
|
-
Logger.instance.emit('any', ...args);
|
|
20
|
-
}
|
|
21
|
-
static info(...args) {
|
|
22
|
-
Logger.instance.emit('info', ...args);
|
|
23
|
-
Logger.instance.emit('any', ...args);
|
|
24
|
-
}
|
|
25
|
-
static debug(...args) {
|
|
26
|
-
Logger.instance.emit('debug', ...args);
|
|
27
|
-
Logger.instance.emit('any', ...args);
|
|
28
|
-
}
|
|
29
|
-
static silly(...args) {
|
|
30
|
-
Logger.instance.emit('silly', ...args);
|
|
31
|
-
Logger.instance.emit('any', ...args);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
exports.Logger = Logger;
|
|
35
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../LogEmitter/index.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAYtC,MAAa,MAAO,SAAQ,qBAAY;IAItC,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,GAAG,IAAS;QACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;QACrC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,IAAS;QACvB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,IAAS;QACtB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,IAAS;QACtB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,IAAS;QACvB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,IAAS;QACvB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;CAEF;AAtCD,wBAsCC"}
|