@maka/maka-cli 5.70.0 → 5.71.0
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/bundle/typescript/package.json +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/backlog.d.ts +1 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/backlog.js +3 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/backlog.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/command-registry.js +24 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/command-registry.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/command.d.ts +18 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/command.js +20 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/command.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/roles.d.ts +1 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/roles.js +3 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/roles.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-dump.d.ts +10 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-dump.js +91 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-dump.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog.d.ts +41 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog.js +63 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/detach-args.d.ts +66 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/detach-args.js +75 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/detach-args.js.map +1 -0
- package/bundle/typescript/src/commands/game/sideQuest-backlog.sub.cmd.js +16 -0
- package/bundle/typescript/src/commands/game/sideQuest-backlog.sub.cmd.js.map +1 -1
- package/bundle/typescript/src/commands/login.js +38 -20
- package/bundle/typescript/src/commands/login.js.map +1 -1
- package/bundle/typescript/src/commands/logout.js +36 -17
- package/bundle/typescript/src/commands/logout.js.map +1 -1
- package/bundle/typescript/src/commands/register.js +24 -10
- package/bundle/typescript/src/commands/register.js.map +1 -1
- package/bundle/typescript/src/tools/ai/ai.class.d.ts +18 -0
- package/bundle/typescript/src/tools/ai/ai.class.js +57 -7
- package/bundle/typescript/src/tools/ai/ai.class.js.map +1 -1
- package/bundle/typescript/src/tools/https/connection-error.d.ts +79 -0
- package/bundle/typescript/src/tools/https/connection-error.js +134 -0
- package/bundle/typescript/src/tools/https/connection-error.js.map +1 -0
- package/bundle/typescript/src/tools/https/https.class.js +35 -10
- package/bundle/typescript/src/tools/https/https.class.js.map +1 -1
- package/bundle/typescript/src/tools/https/maka-host.d.ts +43 -0
- package/bundle/typescript/src/tools/https/maka-host.js +8 -0
- package/bundle/typescript/src/tools/https/maka-host.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backlog.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/backlog.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"backlog.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/backlog.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* THE ARGUMENT SIDE OF `--detach` (board item N7iseYu6iignwwnuf), kept
|
|
3
|
+
* pure so it can be tested without a network, a login or a screen.
|
|
4
|
+
*
|
|
5
|
+
* The prose lives at the edge in backlog-dump.ts; what is decided here
|
|
6
|
+
* is only WHICH refusal applies, because that is the part with real
|
|
7
|
+
* cases in it and the part that would otherwise sit unreachable inside
|
|
8
|
+
* a command handler.
|
|
9
|
+
*/
|
|
10
|
+
/** Everything minimist can hand back for a flag that is not in its
|
|
11
|
+
* boolean set: absent, bare (`true`), one value, or repeated. */
|
|
12
|
+
export type RawFlag = boolean | string | string[] | undefined;
|
|
13
|
+
/**
|
|
14
|
+
* The shas an operator actually named.
|
|
15
|
+
*
|
|
16
|
+
* Accepts the three spellings that mean the same thing -- one value,
|
|
17
|
+
* the flag repeated, and one value with commas in it -- because an
|
|
18
|
+
* operator correcting a mistake should not also have to remember which
|
|
19
|
+
* of those this command wanted. `true` (the bare flag) yields NOTHING
|
|
20
|
+
* on purpose: it is the operator forgetting the sha, and reading it as
|
|
21
|
+
* "all of them" would be the most destructive possible guess at a
|
|
22
|
+
* missing argument.
|
|
23
|
+
*/
|
|
24
|
+
export declare function parseDetachShas(raw: RawFlag): string[];
|
|
25
|
+
/** Was the flag given at all, in any spelling? Deliberately separate
|
|
26
|
+
* from the sha list: `--detach` with nothing after it has to be
|
|
27
|
+
* answerable as a usage slip, and an empty list alone cannot tell the
|
|
28
|
+
* difference between that and never asking. */
|
|
29
|
+
export declare function detachAsked(raw: RawFlag): boolean;
|
|
30
|
+
/**
|
|
31
|
+
* Was this refusal the completed-item gate -- the one an operator can
|
|
32
|
+
* actually get past, by moving the item off `complete` first?
|
|
33
|
+
*
|
|
34
|
+
* PREFERS THE SERVER'S OWN ANSWER. `code` is the server saying which
|
|
35
|
+
* refusal it was; the fallback re-derives the gate from a board fetched
|
|
36
|
+
* BEFORE the call, which is a second opinion about somebody else's state
|
|
37
|
+
* and can be stale by the time the answer comes back. Deciding from
|
|
38
|
+
* `code` when it exists is the difference between knowing and inferring.
|
|
39
|
+
*
|
|
40
|
+
* `undefined` means the server did not say -- an older build, not "some
|
|
41
|
+
* other refusal" -- so the fallback runs. Once it does say, its word is
|
|
42
|
+
* taken even when the local guess disagrees: a disagreement means the
|
|
43
|
+
* local board was stale, which is exactly the case the fallback is worst
|
|
44
|
+
* at and the reason to prefer `code` in the first place.
|
|
45
|
+
*/
|
|
46
|
+
export declare function wantsEvidenceHint(input: {
|
|
47
|
+
code?: string;
|
|
48
|
+
status?: string;
|
|
49
|
+
attached: number;
|
|
50
|
+
detaching: number;
|
|
51
|
+
}): boolean;
|
|
52
|
+
export type DetachRefusal = 'needs-id' | 'no-sha' | 'one-verb-at-a-time';
|
|
53
|
+
/**
|
|
54
|
+
* Why this invocation cannot proceed, or undefined if it can.
|
|
55
|
+
*
|
|
56
|
+
* Checked BEFORE the network, because every one of these is a mistake
|
|
57
|
+
* the operator can see and fix, and a round trip would only delay the
|
|
58
|
+
* answer. Ordered most-fundamental first: without an item id the other
|
|
59
|
+
* two questions do not arise.
|
|
60
|
+
*/
|
|
61
|
+
export declare function detachRefusal(input: {
|
|
62
|
+
id?: string;
|
|
63
|
+
close?: boolean;
|
|
64
|
+
asked: boolean;
|
|
65
|
+
shas: string[];
|
|
66
|
+
}): DetachRefusal | undefined;
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* THE ARGUMENT SIDE OF `--detach` (board item N7iseYu6iignwwnuf), kept
|
|
3
|
+
* pure so it can be tested without a network, a login or a screen.
|
|
4
|
+
*
|
|
5
|
+
* The prose lives at the edge in backlog-dump.ts; what is decided here
|
|
6
|
+
* is only WHICH refusal applies, because that is the part with real
|
|
7
|
+
* cases in it and the part that would otherwise sit unreachable inside
|
|
8
|
+
* a command handler.
|
|
9
|
+
*/
|
|
10
|
+
/**
|
|
11
|
+
* The shas an operator actually named.
|
|
12
|
+
*
|
|
13
|
+
* Accepts the three spellings that mean the same thing -- one value,
|
|
14
|
+
* the flag repeated, and one value with commas in it -- because an
|
|
15
|
+
* operator correcting a mistake should not also have to remember which
|
|
16
|
+
* of those this command wanted. `true` (the bare flag) yields NOTHING
|
|
17
|
+
* on purpose: it is the operator forgetting the sha, and reading it as
|
|
18
|
+
* "all of them" would be the most destructive possible guess at a
|
|
19
|
+
* missing argument.
|
|
20
|
+
*/
|
|
21
|
+
export function parseDetachShas(raw) {
|
|
22
|
+
const given = Array.isArray(raw) ? raw : typeof raw === 'string' ? [raw] : [];
|
|
23
|
+
return given
|
|
24
|
+
.flatMap(v => v.split(','))
|
|
25
|
+
.map(v => v.trim())
|
|
26
|
+
.filter(Boolean);
|
|
27
|
+
}
|
|
28
|
+
/** Was the flag given at all, in any spelling? Deliberately separate
|
|
29
|
+
* from the sha list: `--detach` with nothing after it has to be
|
|
30
|
+
* answerable as a usage slip, and an empty list alone cannot tell the
|
|
31
|
+
* difference between that and never asking. */
|
|
32
|
+
export function detachAsked(raw) {
|
|
33
|
+
return raw !== undefined && raw !== false;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Was this refusal the completed-item gate -- the one an operator can
|
|
37
|
+
* actually get past, by moving the item off `complete` first?
|
|
38
|
+
*
|
|
39
|
+
* PREFERS THE SERVER'S OWN ANSWER. `code` is the server saying which
|
|
40
|
+
* refusal it was; the fallback re-derives the gate from a board fetched
|
|
41
|
+
* BEFORE the call, which is a second opinion about somebody else's state
|
|
42
|
+
* and can be stale by the time the answer comes back. Deciding from
|
|
43
|
+
* `code` when it exists is the difference between knowing and inferring.
|
|
44
|
+
*
|
|
45
|
+
* `undefined` means the server did not say -- an older build, not "some
|
|
46
|
+
* other refusal" -- so the fallback runs. Once it does say, its word is
|
|
47
|
+
* taken even when the local guess disagrees: a disagreement means the
|
|
48
|
+
* local board was stale, which is exactly the case the fallback is worst
|
|
49
|
+
* at and the reason to prefer `code` in the first place.
|
|
50
|
+
*/
|
|
51
|
+
export function wantsEvidenceHint(input) {
|
|
52
|
+
if (input.code !== undefined)
|
|
53
|
+
return input.code === 'evidence-required';
|
|
54
|
+
return input.status === 'complete' && input.attached === input.detaching;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Why this invocation cannot proceed, or undefined if it can.
|
|
58
|
+
*
|
|
59
|
+
* Checked BEFORE the network, because every one of these is a mistake
|
|
60
|
+
* the operator can see and fix, and a round trip would only delay the
|
|
61
|
+
* answer. Ordered most-fundamental first: without an item id the other
|
|
62
|
+
* two questions do not arise.
|
|
63
|
+
*/
|
|
64
|
+
export function detachRefusal(input) {
|
|
65
|
+
if (!input.asked)
|
|
66
|
+
return undefined;
|
|
67
|
+
if (!input.id)
|
|
68
|
+
return 'needs-id';
|
|
69
|
+
if (input.close)
|
|
70
|
+
return 'one-verb-at-a-time';
|
|
71
|
+
if (input.shas.length === 0)
|
|
72
|
+
return 'no-sha';
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=detach-args.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detach-args.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/detach-args.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAAC,GAAY;IAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,OAAO,KAAK;SACT,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SAClB,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAED;;;gDAGgD;AAChD,MAAM,UAAU,WAAW,CAAC,GAAY;IACtC,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,KAAK,CAAC;AAC5C,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAKjC;IACC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC,IAAI,KAAK,mBAAmB,CAAC;IACxE,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,SAAS,CAAC;AAC3E,CAAC;AAID;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,KAK7B;IACC,IAAI,CAAC,KAAK,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IACnC,IAAI,CAAC,KAAK,CAAC,EAAE;QAAE,OAAO,UAAU,CAAC;IACjC,IAAI,KAAK,CAAC,KAAK;QAAE,OAAO,oBAAoB,CAAC;IAC7C,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC7C,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -16,6 +16,7 @@ Command.create({
|
|
|
16
16
|
{ name: 'commit', description: 'Only the items this commit closed (a sha, abbreviated as git allows).' },
|
|
17
17
|
{ name: 'all', boolFlag: true, description: 'Include closed items, which are hidden by default.' },
|
|
18
18
|
{ name: 'close', boolFlag: true, description: 'With an item id: close it outright -- filed in error, duplicate, no longer real. Remaining words are the reason.' },
|
|
19
|
+
{ name: 'detach', description: 'With an item id: take a wrongly attached commit back off it (a full sha, or several separated by commas). Admin only. Remaining words say why.' },
|
|
19
20
|
],
|
|
20
21
|
examples: [
|
|
21
22
|
'maka play:shadowrun:backlog',
|
|
@@ -23,6 +24,7 @@ Command.create({
|
|
|
23
24
|
'maka play:shadowrun:backlog --commit 359ad1fe',
|
|
24
25
|
'maka play:shadowrun:backlog b9YeNqTNBJuk9dbrk',
|
|
25
26
|
'maka play:shadowrun:backlog 4svHkpnDhWcXDzPsX --close filed by mistake',
|
|
27
|
+
'maka play:shadowrun:backlog b9YeNqTNBJuk9dbrk --detach 7ed04359 attached to the wrong row',
|
|
26
28
|
],
|
|
27
29
|
}, async function (args, opts) {
|
|
28
30
|
const { dumpBacklog } = await import('./sideQuest/utilities/backlog-dump.js');
|
|
@@ -32,6 +34,18 @@ Command.create({
|
|
|
32
34
|
// flag's own value is the first word of the reason and the rest are
|
|
33
35
|
// ordinary arguments. Its PRESENCE in any form means close.
|
|
34
36
|
const close = opts.close !== undefined && opts.close !== false;
|
|
37
|
+
// `--detach` TAKES ITS SHAS AS ITS OWN VALUE, unlike --close above:
|
|
38
|
+
// this flag is not in minimist's boolean set either, but here that
|
|
39
|
+
// works FOR us -- the sha is exactly what should bind to it. Repeated
|
|
40
|
+
// flags arrive as an array, commas split one value into several, and
|
|
41
|
+
// the bare flag arrives as `true`, which is the operator forgetting to
|
|
42
|
+
// say which sha rather than an instruction to strip them all.
|
|
43
|
+
const { parseDetachShas, detachAsked: wasAsked } = await import('./sideQuest/utilities/detach-args.js');
|
|
44
|
+
const detach = parseDetachShas(opts.detach);
|
|
45
|
+
const detachAsked = wasAsked(opts.detach);
|
|
46
|
+
// The trailing words are the reason either way, and only one of the
|
|
47
|
+
// two verbs can own them -- `--close` consumes its own first word, and
|
|
48
|
+
// `--detach` does not, because its value is the sha.
|
|
35
49
|
const reason = [typeof opts.close === 'string' ? opts.close : '', ...args.slice(1)]
|
|
36
50
|
.filter(Boolean).join(' ');
|
|
37
51
|
await dumpBacklog({
|
|
@@ -41,6 +55,8 @@ Command.create({
|
|
|
41
55
|
all: opts.all === true,
|
|
42
56
|
close,
|
|
43
57
|
reason,
|
|
58
|
+
detach,
|
|
59
|
+
detachAsked,
|
|
44
60
|
});
|
|
45
61
|
}, ShadowrunCommand);
|
|
46
62
|
//# sourceMappingURL=sideQuest-backlog.sub.cmd.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sideQuest-backlog.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/game/sideQuest-backlog.sub.cmd.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"sideQuest-backlog.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/game/sideQuest-backlog.sub.cmd.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAwC3C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,yCAAyC;IAChD,SAAS,EAAE,qDAAqD;IAChE,WAAW,EAAE;;mEAEoD;IACjE,SAAS,EAAE;QACT,oEAAoE;QACpE,gEAAgE;QAChE,iEAAiE;QACjE,gDAAgD;QAChD,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,WAAW,EAAE,iCAAiC,EAAE;QACxI,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,uEAAuE,EAAE;QACxG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,oDAAoD,EAAE;QAClG,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,kHAAkH,EAAE;QAClK,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,gJAAgJ,EAAE;KAClL;IACD,QAAQ,EAAE;QACR,6BAA6B;QAC7B,gDAAgD;QAChD,+CAA+C;QAC/C,+CAA+C;QAC/C,wEAAwE;QACxE,2FAA2F;KAC5F;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAqB;IACtD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,uCAAuC,CAAC,CAAC;IAE9E,qEAAqE;IACrE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,4DAA4D;IAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC;IAE/D,oEAAoE;IACpE,mEAAmE;IACnE,sEAAsE;IACtE,qEAAqE;IACrE,uEAAuE;IACvE,8DAA8D;IAC9D,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;IACxG,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE1C,oEAAoE;IACpE,uEAAuE;IACvE,qDAAqD;IACrD,MAAM,MAAM,GAAG,CAAC,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAChF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,WAAW,CAAC;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACX,GAAG,EAAE,IAAI,CAAC,GAAG,KAAK,IAAI;QACtB,KAAK;QACL,MAAM;QACN,MAAM;QACN,WAAW;KACZ,CAAC,CAAC;AACL,CAAC,EAAE,gBAAgB,CAAC,CAAC"}
|
|
@@ -3,11 +3,12 @@ import { Command } from '../command.js';
|
|
|
3
3
|
import { Log } from '../tools/log/log.class.js';
|
|
4
4
|
import { Actions } from '../tools/actions/actions.class.js';
|
|
5
5
|
import { HTTPS } from '../tools/https/https.class.js';
|
|
6
|
+
import { makaHost } from '../tools/https/maka-host.js';
|
|
7
|
+
import { failureReport } from '../tools/https/connection-error.js';
|
|
6
8
|
function validateEmail(email) {
|
|
7
9
|
const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
|
|
8
10
|
return re.test(String(email).toLowerCase());
|
|
9
11
|
}
|
|
10
|
-
const hostname = process.env.MAKA_DEV === 'True' ? 'localhost' : 'www.maka-cli.com';
|
|
11
12
|
Command.create({
|
|
12
13
|
name: 'login',
|
|
13
14
|
validOpts: [
|
|
@@ -31,6 +32,15 @@ Command.create({
|
|
|
31
32
|
]
|
|
32
33
|
}, async function (args, opts) {
|
|
33
34
|
const spinHandle = Log.withSpinner();
|
|
35
|
+
// The target is resolved ONCE per run, and every request, message and
|
|
36
|
+
// failure line below names that same origin. A printed url that does
|
|
37
|
+
// not match the dialled one is how a failed dev login gets diagnosed
|
|
38
|
+
// as a network problem instead of a config one.
|
|
39
|
+
//
|
|
40
|
+
// RESOLVED OUTSIDE THE TRY so the catch can name it too. It used to
|
|
41
|
+
// live inside, which left the failure path -- the one place a person
|
|
42
|
+
// most needs to know which site was dialled -- unable to say.
|
|
43
|
+
const target = makaHost();
|
|
34
44
|
try {
|
|
35
45
|
let caCertPath = '';
|
|
36
46
|
if (opts.cacert) {
|
|
@@ -52,9 +62,9 @@ Command.create({
|
|
|
52
62
|
return;
|
|
53
63
|
}
|
|
54
64
|
}
|
|
55
|
-
// Preflight check
|
|
56
|
-
Log.header(`Securing connection to
|
|
57
|
-
const preflightGet = { url:
|
|
65
|
+
// Preflight check.
|
|
66
|
+
Log.header(`Securing connection to ${target.origin}`);
|
|
67
|
+
const preflightGet = { url: `${target.origin}/api/v1/status` };
|
|
58
68
|
if (opts.cacert) {
|
|
59
69
|
Object.assign(preflightGet, { cert: caCertPath });
|
|
60
70
|
}
|
|
@@ -62,18 +72,18 @@ Command.create({
|
|
|
62
72
|
const { statusCode: preflightSC } = await HTTPS.get(preflightGet);
|
|
63
73
|
if (preflightSC === 408) {
|
|
64
74
|
spinHandle.failure();
|
|
65
|
-
throw new Error(
|
|
75
|
+
throw new Error(`Could not make a secure connection.\nPlease ensure you are able to access ${target.origin}`);
|
|
66
76
|
}
|
|
67
77
|
if (preflightSC !== 200) {
|
|
68
78
|
spinHandle.failure();
|
|
69
|
-
throw new Error(
|
|
79
|
+
throw new Error(`${target.origin} seems to be having a problem. Please report a bug at: https://github.com/maka-io/maka-cli`);
|
|
70
80
|
}
|
|
71
81
|
spinHandle.success();
|
|
72
82
|
if (opts.reset) {
|
|
73
83
|
Log.notice('Please enter your email address to receive a password reset link.');
|
|
74
84
|
const email = await Actions.ask('Email:');
|
|
75
85
|
const postForgotPayload = {
|
|
76
|
-
|
|
86
|
+
...target,
|
|
77
87
|
path: '/api/v1/forgotPassword',
|
|
78
88
|
data: {
|
|
79
89
|
email
|
|
@@ -89,7 +99,7 @@ Command.create({
|
|
|
89
99
|
const { data: forgotData, statusCode: forgotSC } = await HTTPS.post(postForgotPayload);
|
|
90
100
|
if (forgotSC === 408) {
|
|
91
101
|
spinHandle.failure('\n');
|
|
92
|
-
throw new Error(`Could not make a secure connection.\n[-] Please ensure you are able to access
|
|
102
|
+
throw new Error(`Could not make a secure connection.\n[-] Please ensure you are able to access ${target.origin}`);
|
|
93
103
|
}
|
|
94
104
|
const forgotJson = JSON.parse(forgotData);
|
|
95
105
|
if (forgotSC === 200) {
|
|
@@ -110,7 +120,7 @@ Command.create({
|
|
|
110
120
|
md.update(password);
|
|
111
121
|
const shaPass = md.digest().toHex();
|
|
112
122
|
const postLoginPayload = {
|
|
113
|
-
|
|
123
|
+
...target,
|
|
114
124
|
path: '/api/login',
|
|
115
125
|
data: {
|
|
116
126
|
email,
|
|
@@ -130,7 +140,7 @@ Command.create({
|
|
|
130
140
|
}
|
|
131
141
|
if (loginJson.authToken) {
|
|
132
142
|
const postJwtPayload = {
|
|
133
|
-
|
|
143
|
+
...target,
|
|
134
144
|
path: '/api/v1/encodeJwt',
|
|
135
145
|
headers: {
|
|
136
146
|
'x-auth-token': loginJson.authToken
|
|
@@ -142,7 +152,7 @@ Command.create({
|
|
|
142
152
|
}
|
|
143
153
|
const { statusCode: jwtSC } = await HTTPS.post(postJwtPayload);
|
|
144
154
|
if (jwtSC === 408) {
|
|
145
|
-
throw new Error(`Could not make a secure connection.\n[-] Please ensure you are able to access
|
|
155
|
+
throw new Error(`Could not make a secure connection.\n[-] Please ensure you are able to access ${target.origin}`);
|
|
146
156
|
}
|
|
147
157
|
const globalConfig = { token: loginJson };
|
|
148
158
|
await this.cfg.setGlobalConfig(globalConfig);
|
|
@@ -154,15 +164,23 @@ Command.create({
|
|
|
154
164
|
spinHandle.success();
|
|
155
165
|
}
|
|
156
166
|
catch (e) {
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
167
|
+
// ONE SENTENCE, NAMING THE ORIGIN ACTUALLY DIALLED
|
|
168
|
+
// (KYaqmxeW343owAnsn). This used to `console.log(e)` the raw error,
|
|
169
|
+
// which for a refused connection is a wall of node:net stack listing
|
|
170
|
+
// ::1 and 127.0.0.1 and naming neither the site nor the problem.
|
|
171
|
+
// THE RESET HINT IS ADVICE ABOUT A PASSWORD, so failureReport drops
|
|
172
|
+
// it when the request never arrived: printed unconditionally it told
|
|
173
|
+
// people to reset credentials that were never sent anywhere, which
|
|
174
|
+
// points the diagnosis away from the server being down.
|
|
175
|
+
const report = failureReport(e, target.origin, 'If you need to reset your password, run `maka login --reset`');
|
|
176
|
+
Log.error(report.message);
|
|
177
|
+
if (report.hint)
|
|
178
|
+
Log.notice(report.hint);
|
|
179
|
+
// EXIT 1, NOT 0. This said 0 for every failure, so `maka login &&
|
|
180
|
+
// <next step>` ran the next step after a login that never happened,
|
|
181
|
+
// and no script could gate on it -- a lie an automation can act on,
|
|
182
|
+
// which is the load-bearing half of this item.
|
|
183
|
+
process.exit(report.exitCode);
|
|
166
184
|
}
|
|
167
185
|
});
|
|
168
186
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Command } from '../command.js';
|
|
2
2
|
import { Log } from '../tools/log/log.class.js';
|
|
3
3
|
import { HTTPS } from '../tools/https/https.class.js';
|
|
4
|
-
|
|
4
|
+
import { makaHost } from '../tools/https/maka-host.js';
|
|
5
|
+
import { failureReport } from '../tools/https/connection-error.js';
|
|
5
6
|
Command.create({
|
|
6
7
|
name: 'logout',
|
|
7
8
|
validOpts: [
|
|
@@ -16,6 +17,12 @@ Command.create({
|
|
|
16
17
|
]
|
|
17
18
|
}, async function (args, opts) {
|
|
18
19
|
const spinHandle = Log.withSpinner();
|
|
20
|
+
// The target is resolved ONCE per run, and every request, message
|
|
21
|
+
// and failure line below names that same origin. RESOLVED OUTSIDE THE
|
|
22
|
+
// TRY so the catch can name it too (KYaqmxeW343owAnsn): it used to
|
|
23
|
+
// live inside, which left the failure path -- the one place a person
|
|
24
|
+
// most needs to know which site was dialled -- unable to say.
|
|
25
|
+
const target = makaHost();
|
|
19
26
|
try {
|
|
20
27
|
let caCertPath = '';
|
|
21
28
|
if (opts.cacert) {
|
|
@@ -37,9 +44,9 @@ Command.create({
|
|
|
37
44
|
throw new Error(`CA Cert is configured in ~/.maka/global-config.json, but cert file cannot be located ${caCertPath}`);
|
|
38
45
|
}
|
|
39
46
|
}
|
|
40
|
-
// Preflight check
|
|
41
|
-
Log.header(`Securing connection to
|
|
42
|
-
const preflightGet = { url:
|
|
47
|
+
// Preflight check.
|
|
48
|
+
Log.header(`Securing connection to ${target.origin}`);
|
|
49
|
+
const preflightGet = { url: `${target.origin}/api/v1/status` };
|
|
43
50
|
if (opts.cacert) {
|
|
44
51
|
Object.assign(preflightGet, { cert: caCertPath });
|
|
45
52
|
}
|
|
@@ -47,19 +54,19 @@ Command.create({
|
|
|
47
54
|
const { statusCode: preflightSC } = await HTTPS.get(preflightGet);
|
|
48
55
|
if (preflightSC === 408) {
|
|
49
56
|
spinHandle.failure();
|
|
50
|
-
throw new Error(
|
|
57
|
+
throw new Error(`Could not make a secure connection.\nPlease ensure you are able to access ${target.origin}`);
|
|
51
58
|
}
|
|
52
59
|
spinHandle.success();
|
|
53
60
|
if (preflightSC !== 200) {
|
|
54
61
|
spinHandle.failure();
|
|
55
|
-
throw new Error(
|
|
62
|
+
throw new Error(`${target.origin} seems to be having a problem. Please report a bug at: https://github.com/maka-io/maka-cli`);
|
|
56
63
|
}
|
|
57
64
|
if (!globalConfig?.token?.authToken) {
|
|
58
65
|
throw new Error('Cannot find login token, are you sure you are logged in?');
|
|
59
66
|
}
|
|
60
67
|
spinHandle.start('Logging out');
|
|
61
68
|
const postPayload = {
|
|
62
|
-
|
|
69
|
+
...target,
|
|
63
70
|
path: '/api/logoutAll',
|
|
64
71
|
data: {},
|
|
65
72
|
headers: {
|
|
@@ -80,16 +87,28 @@ Command.create({
|
|
|
80
87
|
}
|
|
81
88
|
catch (e) {
|
|
82
89
|
spinHandle.failure('\n');
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
90
|
+
// ONE SENTENCE NAMING THE ORIGIN (KYaqmxeW343owAnsn). `Log.error(e)`
|
|
91
|
+
// stringified an AggregateError to the bare word "AggregateError" --
|
|
92
|
+
// no site, no cause, nothing to act on.
|
|
93
|
+
//
|
|
94
|
+
// "You may not be logged in" is a guess about SESSION STATE, and only
|
|
95
|
+
// a sensible one if the server was reached and disagreed. When
|
|
96
|
+
// nothing answered, the local session is exactly as valid as it was a
|
|
97
|
+
// moment ago -- so failureReport withholds the note rather than
|
|
98
|
+
// sending people to re-authenticate over a problem that is not
|
|
99
|
+
// theirs.
|
|
100
|
+
//
|
|
101
|
+
// THE `if (e)` GUARD IS GONE. A falsy throw fell straight past every
|
|
102
|
+
// branch and printed NOTHING before exiting, so the one case with no
|
|
103
|
+
// explanation at all was the one nobody could see. failureReport
|
|
104
|
+
// answers for undefined and null too, which is why it can go.
|
|
105
|
+
const report = failureReport(e, target.origin, 'You may not be logged in...');
|
|
106
|
+
Log.error(report.message);
|
|
107
|
+
if (report.hint)
|
|
108
|
+
Log.notice(report.hint);
|
|
109
|
+
// EXIT 1, NOT 0 -- same lie as login's: a logout that never reached
|
|
110
|
+
// the server reported success, so nothing scripted could tell.
|
|
111
|
+
process.exit(report.exitCode);
|
|
93
112
|
}
|
|
94
113
|
});
|
|
95
114
|
//# sourceMappingURL=logout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../../src/commands/logout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../../src/commands/logout.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,13 @@ import { Command } from '../command.js';
|
|
|
2
2
|
import { Log } from '../tools/log/log.class.js';
|
|
3
3
|
import { Actions } from '../tools/actions/actions.class.js';
|
|
4
4
|
import { HTTPS } from '../tools/https/https.class.js';
|
|
5
|
+
import { makaHost } from '../tools/https/maka-host.js';
|
|
6
|
+
import { failureReport } from '../tools/https/connection-error.js';
|
|
5
7
|
import MakaCmd from './maka.cmd.js';
|
|
6
8
|
function validateEmail(email) {
|
|
7
9
|
const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
|
|
8
10
|
return re.test(String(email).toLowerCase());
|
|
9
11
|
}
|
|
10
|
-
const hostname = process.env.MAKA_DEV === 'True' ? 'localhost' : 'www.maka-cli.com';
|
|
11
12
|
Command.create({
|
|
12
13
|
name: 'register',
|
|
13
14
|
validOpts: [
|
|
@@ -25,6 +26,12 @@ Command.create({
|
|
|
25
26
|
]
|
|
26
27
|
}, async function (args, opts) {
|
|
27
28
|
const spinHandle = Log.withSpinner();
|
|
29
|
+
// The target is resolved ONCE per run, and every request, message
|
|
30
|
+
// and failure line below names that same origin. RESOLVED OUTSIDE THE
|
|
31
|
+
// TRY so the catch can name it too (KYaqmxeW343owAnsn): it used to
|
|
32
|
+
// live inside, which left the failure path -- the one place a person
|
|
33
|
+
// most needs to know which site was dialled -- unable to say.
|
|
34
|
+
const target = makaHost();
|
|
28
35
|
try {
|
|
29
36
|
let caCertPath = '';
|
|
30
37
|
if (opts.cacert) {
|
|
@@ -46,9 +53,9 @@ Command.create({
|
|
|
46
53
|
return;
|
|
47
54
|
}
|
|
48
55
|
}
|
|
49
|
-
// Preflight check
|
|
50
|
-
Log.header(`Securing connection to
|
|
51
|
-
const preflightGet = { url:
|
|
56
|
+
// Preflight check.
|
|
57
|
+
Log.header(`Securing connection to ${target.origin}`);
|
|
58
|
+
const preflightGet = { url: `${target.origin}/api/v1/status` };
|
|
52
59
|
if (opts.cacert) {
|
|
53
60
|
Object.assign(preflightGet, { cert: caCertPath });
|
|
54
61
|
}
|
|
@@ -56,11 +63,11 @@ Command.create({
|
|
|
56
63
|
const { statusCode: preflightSC } = await HTTPS.get(preflightGet);
|
|
57
64
|
if (preflightSC === 408) {
|
|
58
65
|
spinHandle.failure();
|
|
59
|
-
throw new Error(
|
|
66
|
+
throw new Error(`Could not make a secure connection.\nPlease ensure you are able to access ${target.origin}`);
|
|
60
67
|
}
|
|
61
68
|
if (preflightSC !== 200) {
|
|
62
69
|
spinHandle.failure();
|
|
63
|
-
throw new Error(
|
|
70
|
+
throw new Error(`${target.origin} seems to be having a problem. Please report a bug at: https://github.com/maka-io/maka-cli`);
|
|
64
71
|
}
|
|
65
72
|
spinHandle.success();
|
|
66
73
|
// --resend-verification: no new account, just another copy of the
|
|
@@ -72,7 +79,7 @@ Command.create({
|
|
|
72
79
|
process.exit(1);
|
|
73
80
|
}
|
|
74
81
|
const resendPayload = {
|
|
75
|
-
|
|
82
|
+
...target,
|
|
76
83
|
path: '/api/v1/resendVerification',
|
|
77
84
|
data: { email: resendEmail },
|
|
78
85
|
};
|
|
@@ -102,7 +109,7 @@ Command.create({
|
|
|
102
109
|
process.exit(1);
|
|
103
110
|
}
|
|
104
111
|
const postRegisterBody = {
|
|
105
|
-
|
|
112
|
+
...target,
|
|
106
113
|
path: '/api/v1/register',
|
|
107
114
|
data: {
|
|
108
115
|
email,
|
|
@@ -127,8 +134,15 @@ Command.create({
|
|
|
127
134
|
if (err === 'Too many requests') {
|
|
128
135
|
Log.majestic('Bruv... Too many requests, register slower...');
|
|
129
136
|
}
|
|
130
|
-
|
|
131
|
-
|
|
137
|
+
// `err.message` WAS THE WHOLE BUG HERE (KYaqmxeW343owAnsn). This
|
|
138
|
+
// command already exited 1, honestly -- but on a refused connection
|
|
139
|
+
// Node raises an AggregateError whose `.message` is the EMPTY
|
|
140
|
+
// STRING, so it announced a dead server by printing a blank line and
|
|
141
|
+
// stopping. The exit code was right and there was nothing on screen
|
|
142
|
+
// to explain it, which is the hardest of the three to diagnose.
|
|
143
|
+
const report = failureReport(err, target.origin);
|
|
144
|
+
Log.error(report.message);
|
|
145
|
+
process.exit(report.exitCode);
|
|
132
146
|
}
|
|
133
147
|
});
|
|
134
148
|
//# sourceMappingURL=register.js.map
|