@p0security/cli 0.20.3 → 0.20.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/build/dist/commands/index.js +1 -2
- package/build/dist/commands/index.js.map +1 -1
- package/build/dist/middlewares/version.js +1 -2
- package/build/dist/middlewares/version.js.map +1 -1
- package/build/dist/version.d.ts +11 -1
- package/build/dist/version.js +32 -5
- package/build/dist/version.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -61,8 +61,7 @@ const commands = [
|
|
|
61
61
|
print_bearer_token_1.printBearerTokenCommand,
|
|
62
62
|
];
|
|
63
63
|
const buildArgv = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
64
|
-
const
|
|
65
|
-
const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).version(version);
|
|
64
|
+
const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).version((0, version_2.stringifyVersionInfo)(version_2.p0VersionInfo));
|
|
66
65
|
// Override the default yargs showHelp() function to include a custom help message at the end
|
|
67
66
|
const originalShowHelp = argv.showHelp.bind(argv);
|
|
68
67
|
argv.showHelp = (arg) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,8CAAmD;AACnD,4CAAkD;AAClD,oDAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,6 @@ const util_1 = require("../util");
|
|
|
29
29
|
const version_1 = require("../version");
|
|
30
30
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
31
31
|
const node_path_1 = __importDefault(require("node:path"));
|
|
32
|
-
const node_sea_1 = require("node:sea");
|
|
33
32
|
const semver_1 = __importDefault(require("semver"));
|
|
34
33
|
const LATEST_VERSION_FILE = "last-version-check";
|
|
35
34
|
// We don't want to add any significant overhead to p0 commands with the version check,
|
|
@@ -106,7 +105,7 @@ const checkVersion = (yargs) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
106
105
|
(0, stdio_1.print2)("Your version: " + current.padStart(15));
|
|
107
106
|
}
|
|
108
107
|
if (semver_1.default.lt(current, latest)) {
|
|
109
|
-
if (
|
|
108
|
+
if (version_1.p0VersionInfo.build.standalone) {
|
|
110
109
|
(0, stdio_1.print2)(`╔═══════════════════════════════════════════════╗
|
|
111
110
|
║ A new version is available ║
|
|
112
111
|
║ ║
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/middlewares/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,8CAA2D;AAC3D,4CAA0C;AAC1C,kCAAgE;AAChE,wCAA2C;AAC3C,gEAAkC;AAClC,0DAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/middlewares/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,8CAA2D;AAC3D,4CAA0C;AAC1C,kCAAgE;AAChE,wCAA2C;AAC3C,gEAAkC;AAClC,0DAA6B;AAC7B,oDAA4B;AAG5B,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAEjD,uFAAuF;AACvF,wCAAwC;AACxC,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAEzC,MAAM,6BAA6B,GAAG,OAAO,CAAC,CAAC,QAAQ;AAQvD;;;;;GAKG;AACI,MAAM,YAAY,GAAG,CAAO,KAA+B,EAAE,EAAE;IACpE,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACxC,IAAI,IAAA,+BAAsB,GAAE,EAAE;QAC5B,IAAI,OAAO,EAAE;YACX,IAAA,cAAM,EAAC,wBAAwB,CAAC,CAAC;SAClC;QACD,OAAO;KACR;IACD,IAAI;QACF,MAAM,UAAU,GAAG,mBAAI,CAAC,IAAI,CAAC,cAAO,EAAE,mBAAmB,CAAC,CAAC;QAC3D,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,kBAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACvC,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAC3D,IAAI,gBAAgB,IAAI,6BAA6B,EAAE;gBACrD,IAAI,OAAO,EAAE;oBACX,IAAA,cAAM,EACJ,uCAAuC;wBACrC,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;wBAC1C,eAAe,CAClB,CAAC;iBACH;gBACD,OAAO;aACR;SACF;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;SAC1C;QAED,8DAA8D;QAC9D,8CAA8C;QAC9C,MAAM,OAAO,GAAG,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,kBAAE,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,MAAM,kBAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAEnC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAa,CAAC;QAEjD,IAAI,OAAO,EAAE;YACX,IAAA,cAAM,EAAC,iEAAiE,CAAC,CAAC;SAC3E;QAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAA,oBAAa,EAAC,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEzE,wEAAwE;QACxE,MAAM,aAAa,GAAG,GAAS,EAAE;YAC/B,IAAI;gBACF,OAAO,MAAM,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;aACnD;YAAC,OAAO,KAAU,EAAE;gBACnB,IAAI,YAAY,GAAW,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,eAAe,CAAC;gBAC7D,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,IAAI,EAAE;oBACvB,YAAY,IAAI,iBAAiB,KAAK,CAAC,IAAI,EAAE,CAAC;iBAC/C;gBAED,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAE;oBACjB,YAAY,IAAI,aAAa,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;iBACpD;gBAED,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAE;oBACjB,YAAY,IAAI,aAAa,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;iBACpD;gBAED,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;aAC/B;QACH,CAAC,CAAA,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAA,cAAO,EACjC,aAAa,EAAE,EACf,4BAA4B,CAC7B,CAAC;QAEF,MAAM,UAAU,GAAqB,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACtE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QAE3C,IAAI,OAAO,EAAE;YACX,IAAA,cAAM,EAAC,sCAAsC,CAAC,CAAC;YAC/C,IAAA,cAAM,EAAC,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;YACjD,IAAA,cAAM,EAAC,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;SACnD;QAED,IAAI,gBAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;YAC9B,IAAI,uBAAa,CAAC,KAAK,CAAC,UAAU,EAAE;gBAClC,IAAA,cAAM,EACJ;;;;;;;CAOT,CACQ,CAAC;aACH;iBAAM;gBACL,IAAA,cAAM,EACJ;;;;oBAIU,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;;CAElC,CACQ,CAAC;aACH;SACF;aAAM,IAAI,OAAO,EAAE;YAClB,IAAA,cAAM,EAAC,wCAAwC,CAAC,CAAC;SAClD;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,OAAO,EAAE;YACX,IAAA,cAAM,EAAC,yBAAyB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACjD,IAAA,cAAM,EAAC,uCAAuC,CAAC,CAAC;SACjD;QAED,uBAAuB;QACvB,qBAAqB;KACtB;AACH,CAAC,CAAA,CAAC;AAhHW,QAAA,YAAY,gBAgHvB"}
|
package/build/dist/version.d.ts
CHANGED
|
@@ -1,4 +1,14 @@
|
|
|
1
|
-
|
|
1
|
+
type VersionInfo = {
|
|
2
2
|
name: string;
|
|
3
3
|
version: string;
|
|
4
|
+
build: {
|
|
5
|
+
standalone: false;
|
|
6
|
+
} | {
|
|
7
|
+
standalone: true;
|
|
8
|
+
os: string;
|
|
9
|
+
arch: string;
|
|
10
|
+
};
|
|
4
11
|
};
|
|
12
|
+
export declare const stringifyVersionInfo: (info: VersionInfo) => string;
|
|
13
|
+
export declare const p0VersionInfo: VersionInfo;
|
|
14
|
+
export {};
|
package/build/dist/version.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.p0VersionInfo = void 0;
|
|
6
|
+
exports.p0VersionInfo = exports.stringifyVersionInfo = void 0;
|
|
7
7
|
/** Copyright © 2024-present P0 Security
|
|
8
8
|
|
|
9
9
|
This file is part of @p0security/cli
|
|
@@ -15,6 +15,7 @@ This file is part of @p0security/cli
|
|
|
15
15
|
You should have received a copy of the GNU General Public License along with @p0security/cli. If not, see <https://www.gnu.org/licenses/>.
|
|
16
16
|
**/
|
|
17
17
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
18
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
18
19
|
const node_sea_1 = require("node:sea");
|
|
19
20
|
const loadCurrentVersion = () => {
|
|
20
21
|
try {
|
|
@@ -23,8 +24,16 @@ const loadCurrentVersion = () => {
|
|
|
23
24
|
// static asset in sea-config.json, as it is not included in the build by default.
|
|
24
25
|
const packageJsonText = (0, node_sea_1.getAsset)("package.json", "utf-8");
|
|
25
26
|
const json = JSON.parse(packageJsonText);
|
|
26
|
-
const { name, version } = json;
|
|
27
|
-
return {
|
|
27
|
+
const { name, version, $build } = json;
|
|
28
|
+
return {
|
|
29
|
+
name,
|
|
30
|
+
version,
|
|
31
|
+
build: {
|
|
32
|
+
standalone: true,
|
|
33
|
+
os: ($build === null || $build === void 0 ? void 0 : $build.os) || node_os_1.default.platform(),
|
|
34
|
+
arch: ($build === null || $build === void 0 ? void 0 : $build.arch) || node_os_1.default.arch(),
|
|
35
|
+
},
|
|
36
|
+
};
|
|
28
37
|
}
|
|
29
38
|
// Note that package.json is installed at <root>/package.json,
|
|
30
39
|
// whereas this gets compiled to <root>/build/dist/version.js
|
|
@@ -33,12 +42,30 @@ const loadCurrentVersion = () => {
|
|
|
33
42
|
? `${__dirname}/../package.json`
|
|
34
43
|
: `${__dirname}/../../package.json`;
|
|
35
44
|
const { name, version } = JSON.parse(node_fs_1.default.readFileSync(packageJsonPath).toString("utf-8"));
|
|
36
|
-
return {
|
|
45
|
+
return {
|
|
46
|
+
name,
|
|
47
|
+
version,
|
|
48
|
+
build: { standalone: false },
|
|
49
|
+
};
|
|
37
50
|
}
|
|
38
51
|
catch (_a) {
|
|
39
|
-
return {
|
|
52
|
+
return {
|
|
53
|
+
name: "@p0security/cli",
|
|
54
|
+
version: "unknown",
|
|
55
|
+
build: { standalone: false },
|
|
56
|
+
};
|
|
40
57
|
}
|
|
41
58
|
};
|
|
59
|
+
const stringifyVersionInfo = (info) => {
|
|
60
|
+
const { version, build } = info;
|
|
61
|
+
if (build.standalone) {
|
|
62
|
+
return `P0 Security CLI ${version} (built for ${build.os}/${build.arch})`;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
return `P0 Security CLI ${version}`;
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
exports.stringifyVersionInfo = stringifyVersionInfo;
|
|
42
69
|
// p0VersionInfo is a promise that resolves to the current version info
|
|
43
70
|
// The importer needs to await this promise to actually read the version number
|
|
44
71
|
// e.g. `const { name, version } = await p0VersionInfo;`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;;;;AAAA;;;;;;;;;GASG;AACH,sDAAyB;AACzB,uCAA2C;
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;;;;AAAA;;;;;;;;;GASG;AACH,sDAAyB;AACzB,sDAAyB;AACzB,uCAA2C;AAQ3C,MAAM,kBAAkB,GAAG,GAAgB,EAAE;IAC3C,IAAI;QACF,IAAI,IAAA,gBAAK,GAAE,EAAE;YACX,2FAA2F;YAC3F,kFAAkF;YAClF,MAAM,eAAe,GAAG,IAAA,mBAAQ,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACzC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YAEvC,OAAO;gBACL,IAAI;gBACJ,OAAO;gBACP,KAAK,EAAE;oBACL,UAAU,EAAE,IAAI;oBAChB,EAAE,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,KAAI,iBAAE,CAAC,QAAQ,EAAE;oBAC/B,IAAI,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,iBAAE,CAAC,IAAI,EAAE;iBAChC;aACF,CAAC;SACH;QAED,8DAA8D;QAC9D,6DAA6D;QAC7D,mEAAmE;QACnE,MAAM,eAAe,GACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;YAC7B,CAAC,CAAC,GAAG,SAAS,kBAAkB;YAChC,CAAC,CAAC,GAAG,SAAS,qBAAqB,CAAC;QACxC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAClC,iBAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACnD,CAAC;QAEF,OAAO;YACL,IAAI;YACJ,OAAO;YACP,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;SAC7B,CAAC;KACH;IAAC,WAAM;QACN,OAAO;YACL,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,SAAS;YAClB,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;SAC7B,CAAC;KACH;AACH,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,CAAC,IAAiB,EAAU,EAAE;IAChE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAChC,IAAI,KAAK,CAAC,UAAU,EAAE;QACpB,OAAO,mBAAmB,OAAO,eAAe,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC;KAC3E;SAAM;QACL,OAAO,mBAAmB,OAAO,EAAE,CAAC;KACrC;AACH,CAAC,CAAC;AAPW,QAAA,oBAAoB,wBAO/B;AAEF,uEAAuE;AACvE,+EAA+E;AAC/E,wDAAwD;AACxD,EAAE;AACF,mEAAmE;AACnE,oCAAoC;AACvB,QAAA,aAAa,GAAG,kBAAkB,EAAE,CAAC"}
|