@maka/maka-cli 5.34.0 → 5.35.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/utilities/session-telemetry.d.ts +10 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/session-telemetry.js +68 -5
- package/bundle/typescript/src/commands/game/sideQuest/utilities/session-telemetry.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest.sub.cmd.js +39 -4
- package/bundle/typescript/src/commands/game/sideQuest.sub.cmd.js.map +1 -1
- package/bundle/typescript/src/commands/register.js +31 -1
- package/bundle/typescript/src/commands/register.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.35.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
|
|
6
6
|
"description": "A command line tool for scaffolding Meteor 2.x applications using React.",
|
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
export type TelemetryConsent = 'accepted' | 'declined' | null;
|
|
2
|
+
/**
|
|
3
|
+
* The account's recorded choice: 'accepted'/'declined', null when the
|
|
4
|
+
* banner was never answered (prompt), undefined when it can't be known
|
|
5
|
+
* right now (offline, logged out, killed) -- don't prompt, don't upload.
|
|
6
|
+
*/
|
|
7
|
+
export declare function fetchConsent(): Promise<TelemetryConsent | undefined>;
|
|
8
|
+
/** Writes the banner answer to the account (server stamps the date).
|
|
9
|
+
* True on success; false means ask again next launch. */
|
|
10
|
+
export declare function recordConsent(choice: 'accepted' | 'declined'): Promise<boolean>;
|
|
1
11
|
export interface ISessionMeta {
|
|
2
12
|
cliVersion?: string;
|
|
3
13
|
exitCode?: number | null;
|
|
@@ -15,6 +15,10 @@ import { authToken } from './cloud-saves.js';
|
|
|
15
15
|
*
|
|
16
16
|
* MAKA_NO_TELEMETRY=1 kills everything here (harnesses).
|
|
17
17
|
*
|
|
18
|
+
* OPT-IN (ruling 2026-08-24): nothing uploads unless the ACCOUNT has
|
|
19
|
+
* explicitly accepted the launch banner -- see the consent section
|
|
20
|
+
* below. The server enforces the same rule at the upload route.
|
|
21
|
+
*
|
|
18
22
|
* REDACTION (security ruling): before gzip, full email addresses and
|
|
19
23
|
* long token-shaped strings are masked in every file -- logs are
|
|
20
24
|
* readable by all logged-in players, so nothing credential-shaped may
|
|
@@ -46,20 +50,20 @@ function redact(text) {
|
|
|
46
50
|
.replace(/[A-Za-z0-9._%+-]{1,64}@[A-Za-z0-9.-]{1,255}\.[A-Za-z]{2,24}/g, '[email-redacted]')
|
|
47
51
|
.replace(/[A-Za-z0-9_-]{40,}/g, '[token-redacted]');
|
|
48
52
|
}
|
|
49
|
-
function
|
|
53
|
+
function request(method, apiPath, token, body) {
|
|
50
54
|
return new Promise((resolve, reject) => {
|
|
51
|
-
const payload = JSON.stringify(body);
|
|
55
|
+
const payload = body === undefined ? undefined : JSON.stringify(body);
|
|
52
56
|
const mod = DEV ? http : https;
|
|
53
57
|
const req = mod.request({
|
|
54
58
|
hostname: HOSTNAME,
|
|
55
59
|
port: PORT,
|
|
56
60
|
path: apiPath,
|
|
57
|
-
method
|
|
61
|
+
method,
|
|
58
62
|
timeout: TIMEOUT_MS,
|
|
59
63
|
headers: {
|
|
60
64
|
'x-auth-token': token,
|
|
61
65
|
'Content-Type': 'application/json',
|
|
62
|
-
'Content-Length': Buffer.byteLength(payload),
|
|
66
|
+
...(payload !== undefined ? { 'Content-Length': Buffer.byteLength(payload) } : {}),
|
|
63
67
|
},
|
|
64
68
|
}, res => {
|
|
65
69
|
let data = '';
|
|
@@ -68,10 +72,60 @@ function post(apiPath, token, body) {
|
|
|
68
72
|
});
|
|
69
73
|
req.on('timeout', () => req.destroy(new Error('Request timeout')));
|
|
70
74
|
req.on('error', reject);
|
|
71
|
-
|
|
75
|
+
if (payload !== undefined)
|
|
76
|
+
req.write(payload);
|
|
72
77
|
req.end();
|
|
73
78
|
});
|
|
74
79
|
}
|
|
80
|
+
function post(apiPath, token, body) {
|
|
81
|
+
return request('POST', apiPath, token, body);
|
|
82
|
+
}
|
|
83
|
+
let consentCache = 'unfetched';
|
|
84
|
+
/**
|
|
85
|
+
* The account's recorded choice: 'accepted'/'declined', null when the
|
|
86
|
+
* banner was never answered (prompt), undefined when it can't be known
|
|
87
|
+
* right now (offline, logged out, killed) -- don't prompt, don't upload.
|
|
88
|
+
*/
|
|
89
|
+
export async function fetchConsent() {
|
|
90
|
+
if (killed())
|
|
91
|
+
return undefined;
|
|
92
|
+
const token = authToken();
|
|
93
|
+
if (!token)
|
|
94
|
+
return undefined;
|
|
95
|
+
if (consentCache !== 'unfetched')
|
|
96
|
+
return consentCache;
|
|
97
|
+
try {
|
|
98
|
+
const res = await request('GET', `/${API_BASE}/consent`, token);
|
|
99
|
+
if (res.statusCode !== 200)
|
|
100
|
+
return undefined; // transient -- stay unfetched
|
|
101
|
+
const parsed = JSON.parse(res.data);
|
|
102
|
+
const body = parsed?.data ?? parsed;
|
|
103
|
+
const resolved = body?.choice === 'accepted' || body?.choice === 'declined' ? body.choice : null;
|
|
104
|
+
consentCache = resolved;
|
|
105
|
+
return resolved;
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
/** Writes the banner answer to the account (server stamps the date).
|
|
112
|
+
* True on success; false means ask again next launch. */
|
|
113
|
+
export async function recordConsent(choice) {
|
|
114
|
+
const token = authToken();
|
|
115
|
+
if (!token)
|
|
116
|
+
return false;
|
|
117
|
+
try {
|
|
118
|
+
const res = await post(`/${API_BASE}/consent`, token, { choice });
|
|
119
|
+
if (res.statusCode === 200) {
|
|
120
|
+
consentCache = choice;
|
|
121
|
+
return true;
|
|
122
|
+
}
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
75
129
|
/** The uploadable files of a session dir: the two logs, the launch
|
|
76
130
|
* config, and any generated scene seeds. */
|
|
77
131
|
function collectFiles(sessionDir) {
|
|
@@ -120,6 +174,15 @@ export async function uploadSession(sessionDir, meta) {
|
|
|
120
174
|
const token = authToken();
|
|
121
175
|
if (!token)
|
|
122
176
|
return 'offline';
|
|
177
|
+
// OPT-IN GATE (the server enforces this too): 'declined' is final for
|
|
178
|
+
// the sweep ('nothing' -- don't retry these dirs against a standing
|
|
179
|
+
// no); unknown/unanswered reads as 'offline' (retry when it can be
|
|
180
|
+
// known).
|
|
181
|
+
const consent = await fetchConsent();
|
|
182
|
+
if (consent === 'declined')
|
|
183
|
+
return 'nothing';
|
|
184
|
+
if (consent !== 'accepted')
|
|
185
|
+
return 'offline';
|
|
123
186
|
// An ANONYMOUS runner's session never uploads (binding ruling: their
|
|
124
187
|
// life stays on this machine) -- covers the sweep path too, since the
|
|
125
188
|
// launch config rides in every session dir.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-telemetry.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/session-telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C
|
|
1
|
+
{"version":3,"file":"session-telemetry.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/session-telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ Command.create({
|
|
|
19
19
|
description: `Just a little pet project... I really liked the Dunnet game that
|
|
20
20
|
came with MacOS but has been removed. I really like the Shadowrun world, and
|
|
21
21
|
thought I'd mess around with a little text-based version of it.`,
|
|
22
|
-
validOpts: ['player']
|
|
22
|
+
validOpts: ['player', 'telemetry']
|
|
23
23
|
}, async function (args, opts) {
|
|
24
24
|
// Lazy game-graph load (see the comment at the imports above). One
|
|
25
25
|
// parallel block so the handler body below is otherwise untouched.
|
|
@@ -45,12 +45,47 @@ Command.create({
|
|
|
45
45
|
const sessionId = new Date().toISOString().replace(/[:.]/g, '-');
|
|
46
46
|
const sessionDir = path.join(makaDir, 'side-quest-sessions', sessionId);
|
|
47
47
|
const logFilePath = path.join(sessionDir, 'game.log');
|
|
48
|
+
// PLAY-SESSION RECORDING CONSENT (opt-in ruling 2026-08-24): the
|
|
49
|
+
// banner shows once per ACCOUNT -- the answer, with its date, lives
|
|
50
|
+
// on the maka-cli.com profile and follows the player across
|
|
51
|
+
// machines. Explicit accept/deny; nothing records without an
|
|
52
|
+
// accept, and the server enforces the same rule at the upload
|
|
53
|
+
// route. Logged-out/offline launches skip the banner (nothing could
|
|
54
|
+
// upload anyway). `--telemetry` re-asks to change a standing answer.
|
|
55
|
+
const telemetry = await import('./sideQuest/utilities/session-telemetry.js');
|
|
56
|
+
if (process.env.MAKA_NO_TELEMETRY !== '1' && authToken()) {
|
|
57
|
+
const standing = await telemetry.fetchConsent();
|
|
58
|
+
if (standing === null || (opts.telemetry === true && standing !== undefined)) {
|
|
59
|
+
Log.notice('\n-- PLAYTEST RECORDING --------------------------------------------\n'
|
|
60
|
+
+ 'Recording play sessions helps tune the game. If you accept, each\n'
|
|
61
|
+
+ 'session\'s logs -- the commands you type in-game, game events, and\n'
|
|
62
|
+
+ 'generated scenes -- upload to your maka-cli.com account when the\n'
|
|
63
|
+
+ 'session ends. Emails and token-shaped strings are redacted first;\n'
|
|
64
|
+
+ 'logged-in players can review uploaded sessions. Anonymous runners\n'
|
|
65
|
+
+ 'are never recorded either way.\n'
|
|
66
|
+
+ '------------------------------------------------------------------');
|
|
67
|
+
const choice = await Actions.select({
|
|
68
|
+
message: standing === null ? 'Record your play sessions?' : `Recording is currently ${standing} -- change it?`,
|
|
69
|
+
name: 'telemetryConsent',
|
|
70
|
+
choices: [
|
|
71
|
+
{ name: 'Accept -- record and upload my sessions', value: 'accepted' },
|
|
72
|
+
{ name: 'Decline -- my sessions stay on this machine', value: 'declined' },
|
|
73
|
+
],
|
|
74
|
+
});
|
|
75
|
+
const saved = await telemetry.recordConsent(choice);
|
|
76
|
+
Log.notice(saved
|
|
77
|
+
? (choice === 'accepted'
|
|
78
|
+
? 'Recording is ON for this account. (Change anytime: relaunch with --telemetry.)'
|
|
79
|
+
: 'Recording is OFF for this account -- logs stay local. (Change anytime: relaunch with --telemetry.)')
|
|
80
|
+
: 'Couldn\'t reach maka-cli.com to save your answer -- nothing records; you\'ll be asked again next launch.');
|
|
81
|
+
}
|
|
82
|
+
}
|
|
48
83
|
// SESSION TELEMETRY sweep (M4.6, fire-and-forget): past sessions
|
|
49
84
|
// that never made it to the mirror (crash, offline play) upload
|
|
50
85
|
// now, oldest first, capped -- the live session is excluded and
|
|
51
|
-
// uploads itself after the child exits.
|
|
52
|
-
|
|
53
|
-
|
|
86
|
+
// uploads itself after the child exits. Consent-gated inside
|
|
87
|
+
// uploadSession (and again server-side).
|
|
88
|
+
void telemetry.sweepUnsynced(path.join(makaDir, 'side-quest-sessions'), sessionId)
|
|
54
89
|
.catch(() => undefined);
|
|
55
90
|
// PREFLIGHT VERSION CHECK (player ruling 2026-08-23): ask what
|
|
56
91
|
// engine the street runs BEFORE the session starts -- a mismatch
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sideQuest.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/game/sideQuest.sub.cmd.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sideQuest.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/game/sideQuest.sub.cmd.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,8 @@ Command.create({
|
|
|
12
12
|
name: 'register',
|
|
13
13
|
validOpts: [
|
|
14
14
|
{ name: 'help', boolFlag: true, description: 'Display help information for the register command' },
|
|
15
|
-
{ name: 'cacert', description: 'Path to custom CA certificate file for HTTPS connections' }
|
|
15
|
+
{ name: 'cacert', description: 'Path to custom CA certificate file for HTTPS connections' },
|
|
16
|
+
{ name: 'resendVerification', boolFlag: true, description: 'Re-send the account verification email' }
|
|
16
17
|
],
|
|
17
18
|
usage: 'maka register',
|
|
18
19
|
maxArgLength: 3,
|
|
@@ -20,6 +21,7 @@ Command.create({
|
|
|
20
21
|
shortDesc: 'Registers a new user on www.maka-cli.com',
|
|
21
22
|
examples: [
|
|
22
23
|
'maka register',
|
|
24
|
+
'maka register --resend-verification',
|
|
23
25
|
]
|
|
24
26
|
}, async function (args, opts) {
|
|
25
27
|
const spinHandle = Log.withSpinner();
|
|
@@ -61,6 +63,33 @@ Command.create({
|
|
|
61
63
|
throw new Error(`https://${hostname} seems to be having a problem. Please report a bug at: https://github.com/maka-io/maka-cli`);
|
|
62
64
|
}
|
|
63
65
|
spinHandle.success();
|
|
66
|
+
// --resend-verification: no new account, just another copy of the
|
|
67
|
+
// verification link (verified email gates server-side AI).
|
|
68
|
+
if (opts.resendVerification) {
|
|
69
|
+
const resendEmail = await Actions.ask('Email:');
|
|
70
|
+
if (!validateEmail(resendEmail)) {
|
|
71
|
+
Log.error('Invalid email address');
|
|
72
|
+
process.exit(1);
|
|
73
|
+
}
|
|
74
|
+
const resendPayload = {
|
|
75
|
+
hostname,
|
|
76
|
+
path: '/api/v1/resendVerification',
|
|
77
|
+
data: { email: resendEmail },
|
|
78
|
+
};
|
|
79
|
+
if (opts.cacert) {
|
|
80
|
+
Object.assign(resendPayload, { cert: caCertPath });
|
|
81
|
+
}
|
|
82
|
+
spinHandle.start('Requesting verification email');
|
|
83
|
+
const { statusCode: resendSC, data: resendBody } = await HTTPS.post(resendPayload);
|
|
84
|
+
if (resendSC !== 200) {
|
|
85
|
+
spinHandle.failure();
|
|
86
|
+
throw JSON.parse(resendBody);
|
|
87
|
+
}
|
|
88
|
+
spinHandle.success();
|
|
89
|
+
const parsed = JSON.parse(resendBody);
|
|
90
|
+
Log.notice((parsed?.data ?? parsed)?.message ?? 'Verification email sent -- check your inbox and click the link.');
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
64
93
|
const email = await Actions.ask('Email:');
|
|
65
94
|
if (!validateEmail(email)) {
|
|
66
95
|
Log.error('Invalid email address');
|
|
@@ -91,6 +120,7 @@ Command.create({
|
|
|
91
120
|
}
|
|
92
121
|
spinHandle.success();
|
|
93
122
|
Log.notice('Registration successful');
|
|
123
|
+
Log.notice('Check your email for a verification link. (Lost it? maka register --resend-verification)');
|
|
94
124
|
await MakaCmd.processAndRunCommand('login', [], { email, password });
|
|
95
125
|
}
|
|
96
126
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/commands/register.ts"],"names":[],"mappings":"AAAA,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;AACtD,OAAO,OAAO,MAAM,eAAe,CAAC;AAEpC,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,EAAE,GAAG,uJAAuJ,CAAC;IACnK,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC;AAEpF,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,EAAE,UAAU;IAChB,SAAS,EAAE;QACT,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,mDAAmD,EAAE;QAClG,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,0DAA0D,EAAE;
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/commands/register.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.35.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
|
|
6
6
|
"description": "A command line tool for scaffolding Meteor 2.x applications using React.",
|