@elf5/periscope 1.0.65 → 1.0.70
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/dist/cli.js +34 -40
- package/dist/cli.js.map +2 -2
- package/dist/commands/base-command.d.ts.map +1 -1
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/index.js +34 -40
- package/dist/index.js.map +2 -2
- package/dist/lib/config-manager.d.ts +1 -0
- package/dist/lib/config-manager.d.ts.map +1 -1
- package/package.json +9 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAWnD,8BAAsB,WAAW;IAC/B;;;;;OAKG;IACH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK;IA0BnE;;OAEG;IACH,SAAS,CAAC,MAAM,CAAC,mBAAmB,IAAI,IAAI;IAM5C;;;;OAIG;WACU,sBAAsB,CACjC,MAAM,EAAE,eAAe,EACvB,MAAM,GAAE,WAA8B,GACrC,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAWnD,8BAAsB,WAAW;IAC/B;;;;;OAKG;IACH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK;IA0BnE;;OAEG;IACH,SAAS,CAAC,MAAM,CAAC,mBAAmB,IAAI,IAAI;IAM5C;;;;OAIG;WACU,sBAAsB,CACjC,MAAM,EAAE,eAAe,EACvB,MAAM,GAAE,WAA8B,GACrC,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAqDrD;;;;OAIG;qBACoB,UAAU,CAC/B,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,IAAI,CAAC,GACrD,OAAO,CAAC;QACT,MAAM,EAAE,eAAe,CAAC;QACxB,MAAM,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;KAC/C,CAAC;IAMF;;;OAGG;mBACkB,yBAAyB;IA6D9C;;OAEG;WACU,WAAW,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAC5D,MAAM,EAAE,eAAe,CAAC;QACxB,MAAM,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;KAC/C,CAAC;IAiEF;;;OAGG;mBACkB,mBAAmB;IAgDxC;;OAEG;mBACkB,qBAAqB;CAQ3C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBAAa,aAAc,SAAQ,WAAW;IAC5C,oDAAoD;IACpD,MAAM,CAAC,QAAQ,CAAC,MAAM;;;MAGX;WAEE,GAAG,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;WAkDrD,IAAI;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBAAa,aAAc,SAAQ,WAAW;IAC5C,oDAAoD;IACpD,MAAM,CAAC,QAAQ,CAAC,MAAM;;;MAGX;WAEE,GAAG,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;WAkDrD,IAAI;IA2BjB,OAAO,CAAC,MAAM,CAAC,eAAe;CAc/B"}
|
package/dist/index.js
CHANGED
|
@@ -174,7 +174,7 @@ var init_package = __esm({
|
|
|
174
174
|
"package.json"() {
|
|
175
175
|
package_default = {
|
|
176
176
|
name: "@elf5/periscope",
|
|
177
|
-
version: "1.0.
|
|
177
|
+
version: "1.0.70",
|
|
178
178
|
description: "CLI client for Periscope SSH tunnel server",
|
|
179
179
|
main: "dist/index.js",
|
|
180
180
|
types: "dist/index.d.ts",
|
|
@@ -229,7 +229,13 @@ var init_package = __esm({
|
|
|
229
229
|
glob: "^11.0.0",
|
|
230
230
|
uuid: "^10.0.0"
|
|
231
231
|
},
|
|
232
|
-
|
|
232
|
+
"lint-staged": {
|
|
233
|
+
"*.ts": [
|
|
234
|
+
"prettier --write",
|
|
235
|
+
"eslint --fix"
|
|
236
|
+
]
|
|
237
|
+
},
|
|
238
|
+
devDependencies: {
|
|
233
239
|
"@azure/msal-node": "^2.6.6",
|
|
234
240
|
"@microsoft/dev-tunnels-connections": "^1.2.1",
|
|
235
241
|
"@microsoft/dev-tunnels-contracts": "^1.2.1",
|
|
@@ -243,15 +249,7 @@ var init_package = __esm({
|
|
|
243
249
|
commander: "^12.0.0",
|
|
244
250
|
dotenv: "^16.4.5",
|
|
245
251
|
open: "^10.0.3",
|
|
246
|
-
"openid-client": "^6.8.2"
|
|
247
|
-
},
|
|
248
|
-
"lint-staged": {
|
|
249
|
-
"*.ts": [
|
|
250
|
-
"prettier --write",
|
|
251
|
-
"eslint --fix"
|
|
252
|
-
]
|
|
253
|
-
},
|
|
254
|
-
devDependencies: {
|
|
252
|
+
"openid-client": "^6.8.2",
|
|
255
253
|
"@elf-5/periscope-api-client": "^1.0.129",
|
|
256
254
|
"@types/node": "^20.14.0",
|
|
257
255
|
"@typescript-eslint/eslint-plugin": "^8.41.0",
|
|
@@ -3124,7 +3122,8 @@ import * as fs8 from "fs";
|
|
|
3124
3122
|
import * as path7 from "path";
|
|
3125
3123
|
import * as os4 from "os";
|
|
3126
3124
|
import * as dotenv from "dotenv";
|
|
3127
|
-
var ConfigManager = class {
|
|
3125
|
+
var ConfigManager = class _ConfigManager {
|
|
3126
|
+
static DEFAULT_SERVER_URL = "https://periscope.elf5.com";
|
|
3128
3127
|
static CONFIG_DIR = path7.join(os4.homedir(), ".periscope");
|
|
3129
3128
|
static CONFIG_FILE = "config.json";
|
|
3130
3129
|
static testConfig = null;
|
|
@@ -3162,6 +3161,9 @@ var ConfigManager = class {
|
|
|
3162
3161
|
}
|
|
3163
3162
|
}
|
|
3164
3163
|
config2 = this.mergeEnvironmentVariables(config2);
|
|
3164
|
+
if (!config2.serverUrl) {
|
|
3165
|
+
config2.serverUrl = _ConfigManager.DEFAULT_SERVER_URL;
|
|
3166
|
+
}
|
|
3165
3167
|
return config2;
|
|
3166
3168
|
}
|
|
3167
3169
|
/**
|
|
@@ -4001,25 +4003,21 @@ var BaseCommand = class {
|
|
|
4001
4003
|
*/
|
|
4002
4004
|
static async authenticateWithChoice(client3, prompt = "select_account") {
|
|
4003
4005
|
log.info("Authentication required...");
|
|
4004
|
-
const
|
|
4005
|
-
|
|
4006
|
-
|
|
4007
|
-
|
|
4008
|
-
|
|
4009
|
-
|
|
4010
|
-
|
|
4011
|
-
|
|
4012
|
-
|
|
4013
|
-
|
|
4014
|
-
|
|
4015
|
-
|
|
4016
|
-
|
|
4017
|
-
|
|
4018
|
-
|
|
4019
|
-
reject(error);
|
|
4020
|
-
}
|
|
4021
|
-
});
|
|
4022
|
-
}
|
|
4006
|
+
const rl = getReadlineInterface();
|
|
4007
|
+
const useBrowser = await new Promise((resolve, reject) => {
|
|
4008
|
+
log.blank();
|
|
4009
|
+
log.info("Choose authentication method:");
|
|
4010
|
+
log.info("1. Browser (recommended)");
|
|
4011
|
+
log.info("2. Device code (for WSL or headless environments)");
|
|
4012
|
+
try {
|
|
4013
|
+
rl.question(
|
|
4014
|
+
"Enter your choice (1 or 2) [default: 1]: ",
|
|
4015
|
+
(answer) => resolve((answer.trim() || "1") === "1")
|
|
4016
|
+
);
|
|
4017
|
+
} catch (error) {
|
|
4018
|
+
reject(error);
|
|
4019
|
+
}
|
|
4020
|
+
});
|
|
4023
4021
|
log.info(
|
|
4024
4022
|
useBrowser ? `Starting browser authentication (${prompt})...` : "Starting device code authentication..."
|
|
4025
4023
|
);
|
|
@@ -4050,12 +4048,6 @@ var BaseCommand = class {
|
|
|
4050
4048
|
*/
|
|
4051
4049
|
static async initClient(existingConfig) {
|
|
4052
4050
|
const config2 = existingConfig ?? ConfigManager.load();
|
|
4053
|
-
if (!config2.serverUrl) {
|
|
4054
|
-
log.error(
|
|
4055
|
-
"Server URL not configured. Run: periscope config set --server <url>"
|
|
4056
|
-
);
|
|
4057
|
-
exitOrThrow(1);
|
|
4058
|
-
}
|
|
4059
4051
|
return { client: new PeriscopeClient(config2), config: config2 };
|
|
4060
4052
|
}
|
|
4061
4053
|
/**
|
|
@@ -4477,7 +4469,8 @@ var ConfigCommand = class _ConfigCommand extends BaseCommand {
|
|
|
4477
4469
|
_ConfigCommand.showConfigValue(
|
|
4478
4470
|
"Server URL ",
|
|
4479
4471
|
config2.serverUrl,
|
|
4480
|
-
"PERISCOPE_SERVER_URL"
|
|
4472
|
+
"PERISCOPE_SERVER_URL",
|
|
4473
|
+
ConfigManager.DEFAULT_SERVER_URL
|
|
4481
4474
|
);
|
|
4482
4475
|
_ConfigCommand.showConfigValue(
|
|
4483
4476
|
"Request Log ",
|
|
@@ -4490,11 +4483,12 @@ var ConfigCommand = class _ConfigCommand extends BaseCommand {
|
|
|
4490
4483
|
this.handleError(_ConfigCommand.Action.SHOW, error);
|
|
4491
4484
|
}
|
|
4492
4485
|
}
|
|
4493
|
-
static showConfigValue(label, value, envVar) {
|
|
4486
|
+
static showConfigValue(label, value, envVar, defaultValue) {
|
|
4494
4487
|
const envValue = process.env[envVar];
|
|
4495
4488
|
const isFromEnv = envValue !== void 0 && envValue !== "";
|
|
4489
|
+
const isDefault = !isFromEnv && value === defaultValue;
|
|
4496
4490
|
const displayValue = value || "Not configured";
|
|
4497
|
-
const source = isFromEnv ? " (from env)" : "";
|
|
4491
|
+
const source = isFromEnv ? " (from env)" : isDefault ? " (default)" : "";
|
|
4498
4492
|
log.info(`${label}: ${displayValue}${source}`);
|
|
4499
4493
|
}
|
|
4500
4494
|
};
|