@synteq/cli 0.1.2 → 0.1.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/dist/api/client.d.ts +9 -9
- package/dist/api/client.js +200 -32
- package/dist/api/client.js.map +1 -1
- package/dist/api/types.d.ts +40 -43
- package/dist/commands/api.js +1 -1
- package/dist/commands/api.js.map +1 -1
- package/dist/commands/catalog.js +1 -1
- package/dist/commands/catalog.js.map +1 -1
- package/dist/commands/gpu/activity.d.ts +2 -2
- package/dist/commands/gpu/activity.js +5 -5
- package/dist/commands/gpu/activity.js.map +1 -1
- package/dist/commands/gpu/bandwidth.d.ts +2 -2
- package/dist/commands/gpu/bandwidth.js +5 -5
- package/dist/commands/gpu/bandwidth.js.map +1 -1
- package/dist/commands/gpu/boot-order.d.ts +2 -2
- package/dist/commands/gpu/boot-order.js +5 -5
- package/dist/commands/gpu/boot-order.js.map +1 -1
- package/dist/commands/gpu/console.d.ts +2 -2
- package/dist/commands/gpu/console.js +5 -5
- package/dist/commands/gpu/console.js.map +1 -1
- package/dist/commands/gpu/details.d.ts +3 -2
- package/dist/commands/gpu/details.js +6 -5
- package/dist/commands/gpu/details.js.map +1 -1
- package/dist/commands/gpu/ip/add.d.ts +2 -2
- package/dist/commands/gpu/ip/add.js +5 -5
- package/dist/commands/gpu/ip/add.js.map +1 -1
- package/dist/commands/gpu/ip/list.d.ts +2 -2
- package/dist/commands/gpu/ip/list.js +5 -5
- package/dist/commands/gpu/ip/list.js.map +1 -1
- package/dist/commands/gpu/list.d.ts +2 -2
- package/dist/commands/gpu/list.js +2 -2
- package/dist/commands/gpu/list.js.map +1 -1
- package/dist/commands/gpu/order.d.ts +2 -2
- package/dist/commands/gpu/order.js +2 -2
- package/dist/commands/gpu/order.js.map +1 -1
- package/dist/commands/gpu/power.d.ts +2 -2
- package/dist/commands/gpu/power.js +5 -5
- package/dist/commands/gpu/power.js.map +1 -1
- package/dist/commands/gpu/reinstall.d.ts +2 -2
- package/dist/commands/gpu/reinstall.js +5 -5
- package/dist/commands/gpu/reinstall.js.map +1 -1
- package/dist/commands/gpu/resize.d.ts +2 -2
- package/dist/commands/gpu/resize.js +5 -5
- package/dist/commands/gpu/resize.js.map +1 -1
- package/dist/commands/gpu/stats.d.ts +2 -2
- package/dist/commands/gpu/stats.js +5 -5
- package/dist/commands/gpu/stats.js.map +1 -1
- package/dist/commands/instant-metal/activity.d.ts +2 -2
- package/dist/commands/instant-metal/activity.js +5 -5
- package/dist/commands/instant-metal/activity.js.map +1 -1
- package/dist/commands/instant-metal/bandwidth.d.ts +2 -2
- package/dist/commands/instant-metal/bandwidth.js +5 -5
- package/dist/commands/instant-metal/bandwidth.js.map +1 -1
- package/dist/commands/instant-metal/boot-order.d.ts +2 -2
- package/dist/commands/instant-metal/boot-order.js +5 -5
- package/dist/commands/instant-metal/boot-order.js.map +1 -1
- package/dist/commands/instant-metal/console.d.ts +2 -2
- package/dist/commands/instant-metal/console.js +5 -5
- package/dist/commands/instant-metal/console.js.map +1 -1
- package/dist/commands/instant-metal/details.d.ts +3 -2
- package/dist/commands/instant-metal/details.js +6 -5
- package/dist/commands/instant-metal/details.js.map +1 -1
- package/dist/commands/instant-metal/ip/add.d.ts +2 -2
- package/dist/commands/instant-metal/ip/add.js +5 -5
- package/dist/commands/instant-metal/ip/add.js.map +1 -1
- package/dist/commands/instant-metal/ip/list.d.ts +2 -2
- package/dist/commands/instant-metal/ip/list.js +5 -5
- package/dist/commands/instant-metal/ip/list.js.map +1 -1
- package/dist/commands/instant-metal/list.d.ts +2 -2
- package/dist/commands/instant-metal/list.js +2 -2
- package/dist/commands/instant-metal/list.js.map +1 -1
- package/dist/commands/instant-metal/order.d.ts +2 -2
- package/dist/commands/instant-metal/order.js +2 -2
- package/dist/commands/instant-metal/order.js.map +1 -1
- package/dist/commands/instant-metal/power.d.ts +2 -2
- package/dist/commands/instant-metal/power.js +5 -5
- package/dist/commands/instant-metal/power.js.map +1 -1
- package/dist/commands/instant-metal/reinstall.d.ts +2 -2
- package/dist/commands/instant-metal/reinstall.js +5 -5
- package/dist/commands/instant-metal/reinstall.js.map +1 -1
- package/dist/commands/instant-metal/resize.d.ts +2 -2
- package/dist/commands/instant-metal/resize.js +5 -5
- package/dist/commands/instant-metal/resize.js.map +1 -1
- package/dist/commands/instant-metal/stats.d.ts +2 -2
- package/dist/commands/instant-metal/stats.js +5 -5
- package/dist/commands/instant-metal/stats.js.map +1 -1
- package/dist/commands/order/gpu.d.ts +2 -2
- package/dist/commands/order/gpu.js +2 -2
- package/dist/commands/order/gpu.js.map +1 -1
- package/dist/commands/order/instant-metal.d.ts +2 -2
- package/dist/commands/order/instant-metal.js +2 -2
- package/dist/commands/order/instant-metal.js.map +1 -1
- package/dist/commands/order/vps.d.ts +2 -2
- package/dist/commands/order/vps.js +2 -2
- package/dist/commands/order/vps.js.map +1 -1
- package/dist/commands/order.js +4 -4
- package/dist/commands/order.js.map +1 -1
- package/dist/commands/os-images.d.ts +10 -0
- package/dist/commands/os-images.js +40 -0
- package/dist/commands/os-images.js.map +1 -0
- package/dist/commands/resources.js +5 -1
- package/dist/commands/resources.js.map +1 -1
- package/dist/commands/storage/attach.js +1 -1
- package/dist/commands/storage/attach.js.map +1 -1
- package/dist/commands/storage/order.js +6 -2
- package/dist/commands/storage/order.js.map +1 -1
- package/dist/commands/tickets/list.js +1 -1
- package/dist/commands/tickets/list.js.map +1 -1
- package/dist/commands/tickets/open.js +1 -1
- package/dist/commands/tickets/open.js.map +1 -1
- package/dist/commands/vds/activity.d.ts +2 -2
- package/dist/commands/vds/activity.js +5 -5
- package/dist/commands/vds/activity.js.map +1 -1
- package/dist/commands/vds/bandwidth.d.ts +2 -2
- package/dist/commands/vds/bandwidth.js +5 -5
- package/dist/commands/vds/bandwidth.js.map +1 -1
- package/dist/commands/vds/boot-order.d.ts +2 -2
- package/dist/commands/vds/boot-order.js +5 -5
- package/dist/commands/vds/boot-order.js.map +1 -1
- package/dist/commands/vds/console.d.ts +2 -2
- package/dist/commands/vds/console.js +5 -5
- package/dist/commands/vds/console.js.map +1 -1
- package/dist/commands/vds/details.d.ts +3 -2
- package/dist/commands/vds/details.js +6 -5
- package/dist/commands/vds/details.js.map +1 -1
- package/dist/commands/vds/ip/add.d.ts +2 -2
- package/dist/commands/vds/ip/add.js +5 -5
- package/dist/commands/vds/ip/add.js.map +1 -1
- package/dist/commands/vds/ip/list.d.ts +2 -2
- package/dist/commands/vds/ip/list.js +5 -5
- package/dist/commands/vds/ip/list.js.map +1 -1
- package/dist/commands/vds/list.d.ts +2 -2
- package/dist/commands/vds/list.js +2 -2
- package/dist/commands/vds/list.js.map +1 -1
- package/dist/commands/vds/order.d.ts +2 -2
- package/dist/commands/vds/order.js +2 -2
- package/dist/commands/vds/order.js.map +1 -1
- package/dist/commands/vds/power.d.ts +2 -2
- package/dist/commands/vds/power.js +5 -5
- package/dist/commands/vds/power.js.map +1 -1
- package/dist/commands/vds/reinstall.d.ts +2 -2
- package/dist/commands/vds/reinstall.js +5 -5
- package/dist/commands/vds/reinstall.js.map +1 -1
- package/dist/commands/vds/resize.d.ts +2 -2
- package/dist/commands/vds/resize.js +5 -5
- package/dist/commands/vds/resize.js.map +1 -1
- package/dist/commands/vds/stats.d.ts +2 -2
- package/dist/commands/vds/stats.js +5 -5
- package/dist/commands/vds/stats.js.map +1 -1
- package/dist/commands/vps/activity.d.ts +1 -1
- package/dist/commands/vps/activity.js +1 -1
- package/dist/commands/vps/activity.js.map +1 -1
- package/dist/commands/vps/bandwidth.d.ts +1 -1
- package/dist/commands/vps/bandwidth.js +1 -1
- package/dist/commands/vps/bandwidth.js.map +1 -1
- package/dist/commands/vps/boot-order.d.ts +1 -1
- package/dist/commands/vps/boot-order.js +1 -1
- package/dist/commands/vps/boot-order.js.map +1 -1
- package/dist/commands/vps/console.d.ts +1 -1
- package/dist/commands/vps/console.js +3 -3
- package/dist/commands/vps/console.js.map +1 -1
- package/dist/commands/vps/details.d.ts +1 -1
- package/dist/commands/vps/details.js +8 -8
- package/dist/commands/vps/details.js.map +1 -1
- package/dist/commands/vps/ip/add.d.ts +1 -1
- package/dist/commands/vps/ip/add.js +8 -8
- package/dist/commands/vps/ip/add.js.map +1 -1
- package/dist/commands/vps/ip/list.d.ts +1 -1
- package/dist/commands/vps/ip/list.js +4 -4
- package/dist/commands/vps/ip/list.js.map +1 -1
- package/dist/commands/vps/list.d.ts +1 -1
- package/dist/commands/vps/list.js +1 -1
- package/dist/commands/vps/list.js.map +1 -1
- package/dist/commands/vps/order.d.ts +7 -1
- package/dist/commands/vps/order.js +16 -9
- package/dist/commands/vps/order.js.map +1 -1
- package/dist/commands/vps/power.d.ts +1 -1
- package/dist/commands/vps/power.js +1 -1
- package/dist/commands/vps/power.js.map +1 -1
- package/dist/commands/vps/reinstall.d.ts +1 -1
- package/dist/commands/vps/reinstall.js +1 -1
- package/dist/commands/vps/reinstall.js.map +1 -1
- package/dist/commands/vps/resize.d.ts +7 -1
- package/dist/commands/vps/resize.js +52 -25
- package/dist/commands/vps/resize.js.map +1 -1
- package/dist/commands/vps/stats.d.ts +1 -1
- package/dist/commands/vps/stats.js +2 -2
- package/dist/commands/vps/stats.js.map +1 -1
- package/dist/tui/screens/Order.js +12 -14
- package/dist/tui/screens/Order.js.map +1 -1
- package/dist/tui/screens/Resources.js +7 -7
- package/dist/tui/screens/Resources.js.map +1 -1
- package/dist/ui/vps-detail.d.ts +3 -3
- package/dist/ui/vps-detail.js +1 -1
- package/dist/ui/vps-detail.js.map +1 -1
- package/dist/ui/vps-resolve.d.ts +2 -2
- package/dist/ui/vps-resolve.js +1 -1
- package/dist/ui/vps-resolve.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../../src/commands/vds/resize.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../../src/commands/vds/resize.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,cAAc;IACnD,MAAM,CAAC,WAAW,GAAG,uEAAuE,CAAC;IAC7F,MAAM,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;IAClC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IACpC,MAAM,CAAC,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
export default class VdsStats extends
|
|
1
|
+
import ResourceStats from "../vps/stats.js";
|
|
2
|
+
export default class VdsStats extends ResourceStats {
|
|
3
3
|
static description: string;
|
|
4
4
|
static args: {
|
|
5
5
|
id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import
|
|
2
|
-
export default class VdsStats extends
|
|
1
|
+
import ResourceStats from "../vps/stats.js";
|
|
2
|
+
export default class VdsStats extends ResourceStats {
|
|
3
3
|
static description = "Show live CPU / memory / disk / uptime + network I/O for a VDS instance.";
|
|
4
|
-
static args =
|
|
5
|
-
static flags =
|
|
6
|
-
static baseFlags =
|
|
4
|
+
static args = ResourceStats.args;
|
|
5
|
+
static flags = ResourceStats.flags;
|
|
6
|
+
static baseFlags = ResourceStats.baseFlags;
|
|
7
7
|
}
|
|
8
8
|
//# sourceMappingURL=stats.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../src/commands/vds/stats.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../src/commands/vds/stats.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,aAAa;IACjD,MAAM,CAAC,WAAW,GAAG,0EAA0E,CAAC;IAChG,MAAM,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IACjC,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { BaseCommand } from "../../base/command.js";
|
|
|
3
3
|
import { resolveVpsId } from "../../ui/vps-resolve.js";
|
|
4
4
|
import { renderTable } from "../../ui/table.js";
|
|
5
5
|
import { dim } from "../../ui/glyphs.js";
|
|
6
|
-
export default class
|
|
6
|
+
export default class ResourceActivity extends BaseCommand {
|
|
7
7
|
static description = "Show recent activity for a VPS.";
|
|
8
8
|
static examples = [
|
|
9
9
|
"<%= config.bin %> vps activity 019e...",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../src/commands/vps/activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../src/commands/vps/activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,WAAW;IACvD,MAAM,CAAC,WAAW,GAAG,iCAAiC,CAAC;IACvD,MAAM,CAAC,QAAQ,GAAG;QAChB,wCAAwC;QACxC,mDAAmD;QACnD,+DAA+D;QAC/D,gDAAgD;KACjD,CAAC;IACF,MAAM,CAAC,IAAI,GAAG;QACZ,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,iEAAiE;YAC9E,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IACF,MAAM,CAAC,KAAK,GAAG;QACb,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QACxE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;KACzE,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAA+B,CAAC,CAAC;QAC/E,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC5D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CACpD,KAAK,EACL,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,CACb,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE;gBAClB,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;oBACjC,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,GAAG,CACN,WAAW,CACT,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACrC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;oBACnB,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;oBAC3C,CAAC,CAAC,KAAK,EAAE,KAAK,IAAI,QAAQ;oBAC1B,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,MAAM,IAAI,EAAE;iBACf,CAAC,CACH,CACF,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACb,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,KAAK,CAAC,MAAM,OAAO,GAAG,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC;IACH,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { resolveVpsId } from "../../ui/vps-resolve.js";
|
|
|
4
4
|
import { panel } from "../../ui/wizard.js";
|
|
5
5
|
import { renderTable } from "../../ui/table.js";
|
|
6
6
|
import { statusColor } from "../../ui/glyphs.js";
|
|
7
|
-
export default class
|
|
7
|
+
export default class ResourceBandwidth extends BaseCommand {
|
|
8
8
|
static description = [
|
|
9
9
|
"Show a VPS's bandwidth usage: current month-to-date, plan allowance, and overage.",
|
|
10
10
|
"",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bandwidth.js","sourceRoot":"","sources":["../../../src/commands/vps/bandwidth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"bandwidth.js","sourceRoot":"","sources":["../../../src/commands/vps/bandwidth.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { BaseCommand } from "../../base/command.js";
|
|
|
3
3
|
import { resolveVpsId } from "../../ui/vps-resolve.js";
|
|
4
4
|
import { panel } from "../../ui/wizard.js";
|
|
5
5
|
const VALID = new Set(["disk_first", "cdrom_first"]);
|
|
6
|
-
export default class
|
|
6
|
+
export default class ResourceBootOrder extends BaseCommand {
|
|
7
7
|
static description = "View or set a VPS's boot order.";
|
|
8
8
|
static examples = [
|
|
9
9
|
"<%= config.bin %> vps boot-order 019e... # read current",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boot-order.js","sourceRoot":"","sources":["../../../src/commands/vps/boot-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;AAErD,MAAM,CAAC,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"boot-order.js","sourceRoot":"","sources":["../../../src/commands/vps/boot-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;AAErD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,WAAW;IACxD,MAAM,CAAC,WAAW,GAAG,iCAAiC,CAAC;IACvD,MAAM,CAAC,QAAQ,GAAG;QAChB,uFAAuF;QACvF,qDAAqD;QACrD,sDAAsD;KACvD,CAAC;IACF,MAAM,CAAC,IAAI,GAAG;QACZ,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,iEAAiE;YAC9E,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,kEAAkE;YAC/E,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAgC,CAAC,CAAC;QAEzE,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC5D,IAAI,MAAM,CAAC;YACX,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,KAAK,CACR,uBAAuB,IAAI,CAAC,KAAK,mCAAmC,EACpE,EAAE,IAAI,EAAE,CAAC,EAAE,CACZ,CAAC;gBACJ,CAAC;gBACD,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAChD,KAAK,EACL,IAAI,CAAC,KAAqC,CAC3C,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;gBACrB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE;oBAC3B,CAAC,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC;oBACjC,CAAC,iBAAiB,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC1D,CAAC,cAAc,EAAE,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;iBAClD,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC;IACH,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { panel } from "../../ui/wizard.js";
|
|
|
4
4
|
import { portalUrl } from "../../ui/portal.js";
|
|
5
5
|
import { resolveVpsId } from "../../ui/vps-resolve.js";
|
|
6
6
|
import { ok, dim } from "../../ui/glyphs.js";
|
|
7
|
-
export default class
|
|
7
|
+
export default class ResourceConsole extends BaseCommand {
|
|
8
8
|
static description = [
|
|
9
9
|
"Open a VPS console (interactive serial, or a browser URL for graphical).",
|
|
10
10
|
"",
|
|
@@ -44,7 +44,7 @@ export default class VpsConsole extends BaseCommand {
|
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
46
|
const apiBase = this.clients.config.get().api_base_url;
|
|
47
|
-
const browserUrl = portalUrl(apiBase, `/console/
|
|
47
|
+
const browserUrl = portalUrl(apiBase, `/console/resources/${vpsId}`);
|
|
48
48
|
const wantAttach = vend.console_type === "serial" &&
|
|
49
49
|
!flags["print-url"] &&
|
|
50
50
|
Boolean(process.stdin.isTTY) &&
|
|
@@ -72,7 +72,7 @@ export default class VpsConsole extends BaseCommand {
|
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
async attachSerial(vpsId, token, apiBase, insecure) {
|
|
75
|
-
const wsUrl = this.wsUrl(apiBase, `/
|
|
75
|
+
const wsUrl = this.wsUrl(apiBase, `/virtualized/${vpsId}/term-ws`, token);
|
|
76
76
|
const prevReject = process.env.NODE_TLS_REJECT_UNAUTHORIZED;
|
|
77
77
|
if (insecure)
|
|
78
78
|
process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/commands/vps/console.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,CAAC,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/commands/vps/console.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,9 @@ import { BaseCommand } from "../../base/command.js";
|
|
|
4
4
|
import { formatVpsDetail, resolveVps } from "../../ui/vps-detail.js";
|
|
5
5
|
import { shortId } from "../../ui/table.js";
|
|
6
6
|
import { statusColor } from "../../ui/glyphs.js";
|
|
7
|
-
export default class
|
|
7
|
+
export default class ResourceDetails extends BaseCommand {
|
|
8
8
|
static aliases = ["vps:show"];
|
|
9
|
-
static description = "Show full details for one
|
|
9
|
+
static description = "Show full details for one Resource. With no id, pick from a list.";
|
|
10
10
|
static examples = [
|
|
11
11
|
"<%= config.bin %> vps details # pick from a list (TTY)",
|
|
12
12
|
"<%= config.bin %> vps details web-01 # by hostname",
|
|
@@ -15,12 +15,12 @@ export default class VpsDetails extends BaseCommand {
|
|
|
15
15
|
];
|
|
16
16
|
static args = {
|
|
17
17
|
id: Args.string({
|
|
18
|
-
description: "
|
|
18
|
+
description: "Resource — short id, full UUID, hostname, or IP. Omit on a TTY to pick from a list.",
|
|
19
19
|
}),
|
|
20
20
|
};
|
|
21
21
|
static flags = {
|
|
22
22
|
project: Flags.string({ description: "Scope to a project id when searching." }),
|
|
23
|
-
refresh: Flags.boolean({ description: "Re-fetch the matched
|
|
23
|
+
refresh: Flags.boolean({ description: "Re-fetch the matched Resource via GET /vps/{id}." }),
|
|
24
24
|
};
|
|
25
25
|
async run() {
|
|
26
26
|
await this.initClients();
|
|
@@ -29,19 +29,19 @@ export default class VpsDetails extends BaseCommand {
|
|
|
29
29
|
try {
|
|
30
30
|
const all = await this.clients.api.vps.list(flags.project);
|
|
31
31
|
if (all.length === 0) {
|
|
32
|
-
this.error("No
|
|
32
|
+
this.error("No Resource resources on this team.", { exit: 1 });
|
|
33
33
|
}
|
|
34
34
|
let chosen;
|
|
35
35
|
if (!args.id) {
|
|
36
36
|
if (!isTty || this.outputFormat === "json") {
|
|
37
|
-
this.error("Provide a
|
|
37
|
+
this.error("Provide a Resource id / hostname / IP (a picker only runs on an interactive terminal).", { exit: 1 });
|
|
38
38
|
}
|
|
39
|
-
chosen = await this.pickFrom(all, "Pick a
|
|
39
|
+
chosen = await this.pickFrom(all, "Pick a Resource");
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
42
|
const matches = resolveVps(all, args.id);
|
|
43
43
|
if (matches.length === 0) {
|
|
44
|
-
this.error(`No
|
|
44
|
+
this.error(`No Resource matches "${args.id}". Run \`synteq vps list\`.`, { exit: 1 });
|
|
45
45
|
}
|
|
46
46
|
if (matches.length === 1) {
|
|
47
47
|
chosen = matches[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"details.js","sourceRoot":"","sources":["../../../src/commands/vps/details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"details.js","sourceRoot":"","sources":["../../../src/commands/vps/details.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,9 @@ import { confirmDestructive, yesRequiredMessage } from "../../../ui/confirm.js";
|
|
|
6
6
|
import { isInteractive, panel, summary } from "../../../ui/wizard.js";
|
|
7
7
|
import { pickPayment } from "../../../ui/payment.js";
|
|
8
8
|
import { ok, statusColor } from "../../../ui/glyphs.js";
|
|
9
|
-
export default class
|
|
9
|
+
export default class ResourceIpAdd extends BaseCommand {
|
|
10
10
|
static description = [
|
|
11
|
-
"Buy extra IPv4 addresses for a
|
|
11
|
+
"Buy extra IPv4 addresses for a Resource (charges your payment method immediately).",
|
|
12
12
|
"",
|
|
13
13
|
"Shows the monthly price and the amount charged today, then asks for",
|
|
14
14
|
"confirmation on a TTY (default No). When stdout is piped, pass --yes",
|
|
@@ -22,13 +22,13 @@ export default class VpsIpAdd extends BaseCommand {
|
|
|
22
22
|
];
|
|
23
23
|
static args = {
|
|
24
24
|
id: Args.string({
|
|
25
|
-
description: "
|
|
25
|
+
description: "Resource id (full or the short id from `vps list`), hostname, or IP.",
|
|
26
26
|
required: true,
|
|
27
27
|
}),
|
|
28
28
|
};
|
|
29
29
|
static flags = {
|
|
30
30
|
quantity: Flags.integer({
|
|
31
|
-
description: "How many IPv4 addresses to add (1..10 per request; per-
|
|
31
|
+
description: "How many IPv4 addresses to add (1..10 per request; per-Resource cap may be lower).",
|
|
32
32
|
default: 1,
|
|
33
33
|
min: 1,
|
|
34
34
|
max: 10,
|
|
@@ -41,7 +41,7 @@ export default class VpsIpAdd extends BaseCommand {
|
|
|
41
41
|
}),
|
|
42
42
|
"billing-mode": Flags.string({
|
|
43
43
|
options: ["prorate", "new_cycle"],
|
|
44
|
-
description: "prorate = charge only the remainder of the
|
|
44
|
+
description: "prorate = charge only the remainder of the Resource's current cycle and renew with it; new_cycle = full month now on its own anniversary. Defaults to the catalog's policy; admin policy may lock one mode.",
|
|
45
45
|
}),
|
|
46
46
|
yes: Flags.boolean({
|
|
47
47
|
char: "y",
|
|
@@ -72,7 +72,7 @@ export default class VpsIpAdd extends BaseCommand {
|
|
|
72
72
|
const billingMode = this.resolveBillingMode(settings, flags["billing-mode"]);
|
|
73
73
|
const existing = addons.filter((a) => a.addon_type === "extra_ip").length;
|
|
74
74
|
if (settings.max_per_resource != null && existing + flags.quantity > settings.max_per_resource) {
|
|
75
|
-
this.error(`Cap exceeded: this
|
|
75
|
+
this.error(`Cap exceeded: this Resource has ${existing} extra IP${existing === 1 ? "" : "s"} and the limit is ${settings.max_per_resource} — you can add at most ${Math.max(0, settings.max_per_resource - existing)} more.`, { exit: 1 });
|
|
76
76
|
}
|
|
77
77
|
const unit = settings.monthly_price ?? 0;
|
|
78
78
|
const monthly = round2(unit * flags.quantity);
|
|
@@ -81,12 +81,12 @@ export default class VpsIpAdd extends BaseCommand {
|
|
|
81
81
|
: round2(unit * flags.quantity * (daysRemainingInCycle(vps.billing_anchor_at ?? null) / 30));
|
|
82
82
|
if (!flags.yes && this.outputFormat === "table") {
|
|
83
83
|
this.log(summary("Add IPv4", [
|
|
84
|
-
["
|
|
84
|
+
["Resource", `${vps.hostname} (${shortIdOf(vps)})`],
|
|
85
85
|
["Add", `${flags.quantity} × extra IPv4`],
|
|
86
86
|
[
|
|
87
87
|
"Billing",
|
|
88
88
|
billingMode === "prorate"
|
|
89
|
-
? `prorated to the
|
|
89
|
+
? `prorated to the Resource cycle (~$${chargedToday.toFixed(2)} today)`
|
|
90
90
|
: `new monthly cycle ($${chargedToday.toFixed(2)} today)`,
|
|
91
91
|
],
|
|
92
92
|
["Recurring", `+$${monthly.toFixed(2)}/mo`],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/commands/vps/ip/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,CAAC,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/commands/vps/ip/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,15 @@ import { BaseCommand } from "../../../base/command.js";
|
|
|
3
3
|
import { resolveVpsId } from "../../../ui/vps-resolve.js";
|
|
4
4
|
import { renderTable, shortId } from "../../../ui/table.js";
|
|
5
5
|
import { ApiError } from "../../../api/errors.js";
|
|
6
|
-
export default class
|
|
7
|
-
static description = "List a
|
|
6
|
+
export default class ResourceIpList extends BaseCommand {
|
|
7
|
+
static description = "List a Resource's IP addresses, extra-IP add-ons, and add-ons awaiting payment.";
|
|
8
8
|
static examples = [
|
|
9
9
|
"<%= config.bin %> vps ip list 019e...",
|
|
10
10
|
"<%= config.bin %> vps ip list 019e... -o json # {ips, addons, pending_addons}",
|
|
11
11
|
];
|
|
12
12
|
static args = {
|
|
13
13
|
id: Args.string({
|
|
14
|
-
description: "
|
|
14
|
+
description: "Resource id (full or the short id from `vps list`), hostname, or IP.",
|
|
15
15
|
required: true,
|
|
16
16
|
}),
|
|
17
17
|
};
|
|
@@ -66,7 +66,7 @@ export default class VpsIpList extends BaseCommand {
|
|
|
66
66
|
const unbound = addons.filter((a) => !a.ip_address || !boundIps.has(a.ip_address));
|
|
67
67
|
if (unbound.length > 0) {
|
|
68
68
|
this.log("");
|
|
69
|
-
this.log("Extra-IP add-ons not yet visible on the
|
|
69
|
+
this.log("Extra-IP add-ons not yet visible on the Resource:");
|
|
70
70
|
this.log(renderTable(["ADDON ID", "IP", "MONTHLY", "ADDED"], unbound.map((a) => [
|
|
71
71
|
shortId(a.id),
|
|
72
72
|
a.ip_address ?? "(allocating)",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/vps/ip/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGlD,MAAM,CAAC,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/vps/ip/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Flags } from "@oclif/core";
|
|
|
2
2
|
import { BaseCommand } from "../../base/command.js";
|
|
3
3
|
import { renderTable, shortId } from "../../ui/table.js";
|
|
4
4
|
import { statusColor } from "../../ui/glyphs.js";
|
|
5
|
-
export default class
|
|
5
|
+
export default class ResourceList extends BaseCommand {
|
|
6
6
|
static description = "List VPS resources. For one VPS's details use `synteq vps details`.";
|
|
7
7
|
static examples = [
|
|
8
8
|
"<%= config.bin %> vps list",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/vps/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/vps/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { BaseCommand } from "../../base/command.js";
|
|
2
|
-
|
|
2
|
+
import type { CustomVPSConfig, VPSCustomSpec } from "../../api/types.js";
|
|
3
|
+
export default class ResourceOrder extends BaseCommand {
|
|
3
4
|
static description: string;
|
|
4
5
|
static examples: string[];
|
|
5
6
|
static flags: {
|
|
@@ -28,3 +29,8 @@ export default class VpsOrder extends BaseCommand {
|
|
|
28
29
|
private runWizard;
|
|
29
30
|
private runCustomVpsWizard;
|
|
30
31
|
}
|
|
32
|
+
/** GB-native custom-spec pricing — `spec.ram_gb` rides straight through (no
|
|
33
|
+
* MB division) into `price_per_ram_gb`. Exported for direct test coverage:
|
|
34
|
+
* a regression here (a reintroduced `/ 1024`) would silently under-price
|
|
35
|
+
* every custom VPS order by 1024x. */
|
|
36
|
+
export declare function priceCustomSpec(spec: VPSCustomSpec, cfg: CustomVPSConfig): number;
|
|
@@ -5,7 +5,7 @@ import { confirmAction, isInteractive, panel, pickFromCatalog, promptNumber, pro
|
|
|
5
5
|
import { ok, statusColor } from "../../ui/glyphs.js";
|
|
6
6
|
import { pickPayment } from "../../ui/payment.js";
|
|
7
7
|
import { waitFor, vpsStatusClassifier } from "../../ui/wait.js";
|
|
8
|
-
export default class
|
|
8
|
+
export default class ResourceOrder extends BaseCommand {
|
|
9
9
|
static description = "Order a new VPS (or GPU instance — same catalog).";
|
|
10
10
|
static examples = [
|
|
11
11
|
"<%= config.bin %> vps order # interactive wizard; defaults to active project",
|
|
@@ -52,7 +52,7 @@ export default class VpsOrder extends BaseCommand {
|
|
|
52
52
|
};
|
|
53
53
|
async run() {
|
|
54
54
|
await this.initClients();
|
|
55
|
-
const { flags } = await this.parse(
|
|
55
|
+
const { flags } = await this.parse(ResourceOrder);
|
|
56
56
|
const wantInteractive = isInteractive() && this.outputFormat === "table" && !flags["no-interactive"];
|
|
57
57
|
try {
|
|
58
58
|
const missingCore = !flags.project || !flags.plan || !flags.location || !flags.image;
|
|
@@ -142,7 +142,7 @@ export default class VpsOrder extends BaseCommand {
|
|
|
142
142
|
]));
|
|
143
143
|
}
|
|
144
144
|
if (result.checkout_url) {
|
|
145
|
-
this.error(`Cannot --wait: this order awaits hosted-checkout payment. Pay at ${result.checkout_url}, then poll \`synteq api GET /
|
|
145
|
+
this.error(`Cannot --wait: this order awaits hosted-checkout payment. Pay at ${result.checkout_url}, then poll \`synteq api GET /orders/${result.order_id}\`.`, { exit: 1 });
|
|
146
146
|
}
|
|
147
147
|
if (result.status === "failed") {
|
|
148
148
|
this.error(`Order failed: ${result.failure_reason ?? "unknown reason"}`, { exit: 3 });
|
|
@@ -158,8 +158,11 @@ export default class VpsOrder extends BaseCommand {
|
|
|
158
158
|
poll: () => this.clients.api.vpsOrders.status(result.order_id),
|
|
159
159
|
classify: (o) => {
|
|
160
160
|
const s = (o.status ?? "").toLowerCase();
|
|
161
|
-
|
|
161
|
+
// New unified /orders/{id} emits "complete" (not "provisioned")
|
|
162
|
+
// for terminal success — see order-wire-shape-fix memo §7.
|
|
163
|
+
if (s === "provisioned" || s === "complete") {
|
|
162
164
|
return { state: "success", label: `order ${s}` };
|
|
165
|
+
}
|
|
163
166
|
if (s === "failed" || s === "cancelled") {
|
|
164
167
|
return {
|
|
165
168
|
state: "failure",
|
|
@@ -292,7 +295,7 @@ export default class VpsOrder extends BaseCommand {
|
|
|
292
295
|
}
|
|
293
296
|
plan = await pickFromCatalog("Pick a plan", filteredPlans.map((p) => ({
|
|
294
297
|
value: p,
|
|
295
|
-
name: `${p.name.padEnd(24)} $${p.monthly_price}/mo ${p.cpu_cores}c ${
|
|
298
|
+
name: `${p.name.padEnd(24)} $${p.monthly_price}/mo ${p.cpu_cores}c ${p.ram_gb}G ${p.disk_gb}G${p.gpu_model ? ` · ${p.gpu_model}` : ""}${p.in_stock ? "" : " (out of stock)"}`,
|
|
296
299
|
description: `${p.category}${p.bandwidth_mbps ? ` · ${p.bandwidth_mbps} Mbps` : ""}${p.included_tb ? ` · ${p.included_tb} TB` : ""}`,
|
|
297
300
|
disabled: allOut || p.in_stock ? undefined : "out of stock",
|
|
298
301
|
})));
|
|
@@ -400,7 +403,7 @@ export default class VpsOrder extends BaseCommand {
|
|
|
400
403
|
[
|
|
401
404
|
"Spec",
|
|
402
405
|
customSpec
|
|
403
|
-
? `${customSpec.cpu_cores} vCPU · ${customSpec.
|
|
406
|
+
? `${customSpec.cpu_cores} vCPU · ${customSpec.ram_gb} GB RAM · ${customSpec.disk_gb} GB disk${customSpec.bandwidth_tb ? ` · ${customSpec.bandwidth_tb} TB BW` : ""}${customSpec.dedicated ? " · dedicated" : ""}`
|
|
404
407
|
: undefined,
|
|
405
408
|
],
|
|
406
409
|
["Location", catalog.locations.find((l) => l.id === locationId)?.city ?? locationId],
|
|
@@ -477,16 +480,20 @@ export default class VpsOrder extends BaseCommand {
|
|
|
477
480
|
});
|
|
478
481
|
return {
|
|
479
482
|
cpu_cores: cpu,
|
|
480
|
-
|
|
483
|
+
ram_gb: ramGb,
|
|
481
484
|
disk_gb: diskGb,
|
|
482
485
|
bandwidth_tb: bwTb,
|
|
483
486
|
dedicated,
|
|
484
487
|
};
|
|
485
488
|
}
|
|
486
489
|
}
|
|
487
|
-
|
|
490
|
+
/** GB-native custom-spec pricing — `spec.ram_gb` rides straight through (no
|
|
491
|
+
* MB division) into `price_per_ram_gb`. Exported for direct test coverage:
|
|
492
|
+
* a regression here (a reintroduced `/ 1024`) would silently under-price
|
|
493
|
+
* every custom VPS order by 1024x. */
|
|
494
|
+
export function priceCustomSpec(spec, cfg) {
|
|
488
495
|
const baseCfg = spec.dedicated ? cfg.dedicated : cfg;
|
|
489
|
-
const ramGb = spec.
|
|
496
|
+
const ramGb = spec.ram_gb;
|
|
490
497
|
const extraTb = Math.max(0, (spec.bandwidth_tb ?? cfg.bandwidth_included_tb) - cfg.bandwidth_included_tb);
|
|
491
498
|
return (baseCfg.base_price +
|
|
492
499
|
spec.cpu_cores * baseCfg.price_per_cpu +
|