apify-cli 0.21.8-beta.13 → 0.21.8-beta.15
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/CHANGELOG.md +4 -0
- package/dist/.tsbuildinfo +1 -1
- package/dist/commands/_register.js +2 -2
- package/dist/commands/_register.js.map +1 -1
- package/dist/commands/upgrade.js +74 -0
- package/dist/commands/upgrade.js.map +1 -0
- package/dist/entrypoints/_shared.js +27 -5
- package/dist/entrypoints/_shared.js.map +1 -1
- package/dist/entrypoints/apify.js +0 -14
- package/dist/entrypoints/apify.js.map +1 -1
- package/dist/lib/command-framework/help.js +4 -3
- package/dist/lib/command-framework/help.js.map +1 -1
- package/dist/lib/commands/read-stdin.js +8 -51
- package/dist/lib/commands/read-stdin.js.map +1 -1
- package/dist/lib/consts.js +1 -23
- package/dist/lib/consts.js.map +1 -1
- package/dist/lib/hooks/useCLIMetadata.js +73 -0
- package/dist/lib/hooks/useCLIMetadata.js.map +1 -0
- package/dist/lib/hooks/useCLIVersionCheck.js +91 -0
- package/dist/lib/hooks/useCLIVersionCheck.js.map +1 -0
- package/dist/lib/hooks/useLocalState.js +56 -0
- package/dist/lib/hooks/useLocalState.js.map +1 -0
- package/dist/lib/hooks/useStdin.js +65 -0
- package/dist/lib/hooks/useStdin.js.map +1 -0
- package/dist/lib/utils.js.map +1 -1
- package/dist/typechecking.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/dist/commands/check-version.js +0 -20
- package/dist/commands/check-version.js.map +0 -1
- package/dist/lib/community.js +0 -4
- package/dist/lib/community.js.map +0 -1
- package/dist/lib/local_state.js +0 -25
- package/dist/lib/local_state.js.map +0 -1
- package/dist/lib/version_check.js +0 -99
- package/dist/lib/version_check.js.map +0 -1
|
@@ -8,7 +8,6 @@ import { ActorSetValueCommand } from './actor/set-value.js';
|
|
|
8
8
|
import { ActorsIndexCommand } from './actors/_index.js';
|
|
9
9
|
import { BuildsIndexCommand } from './builds/_index.js';
|
|
10
10
|
import { TopLevelCallCommand } from './call.js';
|
|
11
|
-
import { CheckVersionCommand } from './check-version.js';
|
|
12
11
|
import { CreateCommand } from './create.js';
|
|
13
12
|
import { DatasetsIndexCommand } from './datasets/_index.js';
|
|
14
13
|
import { EditInputSchemaCommand } from './edit-input-schema.js';
|
|
@@ -26,6 +25,7 @@ import { RunCommand } from './run.js';
|
|
|
26
25
|
import { RunsIndexCommand } from './runs/_index.js';
|
|
27
26
|
import { SecretsIndexCommand } from './secrets/_index.js';
|
|
28
27
|
import { TasksIndexCommand } from './task/_index.js';
|
|
28
|
+
import { UpgradeCommand } from './upgrade.js';
|
|
29
29
|
import { ValidateInputSchemaCommand } from './validate-schema.js';
|
|
30
30
|
export const apifyCommands = [
|
|
31
31
|
// namespaces
|
|
@@ -40,7 +40,7 @@ export const apifyCommands = [
|
|
|
40
40
|
TasksIndexCommand,
|
|
41
41
|
// top-level
|
|
42
42
|
TopLevelCallCommand,
|
|
43
|
-
|
|
43
|
+
UpgradeCommand,
|
|
44
44
|
CreateCommand,
|
|
45
45
|
EditInputSchemaCommand,
|
|
46
46
|
InfoCommand,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_register.js","sourceRoot":"","sources":["../../src/commands/_register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"_register.js","sourceRoot":"","sources":["../../src/commands/_register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElE,MAAM,CAAC,MAAM,aAAa,GAAG;IAC5B,aAAa;IACb,iBAAiB;IACjB,kBAAkB;IAClB,kBAAkB;IAClB,oBAAoB;IACpB,0BAA0B;IAC1B,yBAAyB;IACzB,gBAAgB;IAChB,mBAAmB;IACnB,iBAAiB;IACjB,YAAY;IACZ,mBAAmB;IACnB,cAAc;IACd,aAAa;IACb,sBAAsB;IACtB,WAAW;IACX,iBAAiB;IACjB,WAAW;IACX,YAAY;IACZ,aAAa;IACb,mBAAmB;IACnB,mBAAmB;IACnB,UAAU;IACV,0BAA0B;IAC1B,WAAW;CACqC,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GAAG;IAC5B,EAAE;IACF,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,wBAAwB;IACxB,oBAAoB;IACpB,kBAAkB;IAClB,WAAW;CACqC,CAAC"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import { gte } from 'semver';
|
|
3
|
+
import { ApifyCommand } from '../lib/command-framework/apify-command.js';
|
|
4
|
+
import { Flags } from '../lib/command-framework/flags.js';
|
|
5
|
+
import { DEVELOPMENT_VERSION_MARKER, useCLIMetadata } from '../lib/hooks/useCLIMetadata.js';
|
|
6
|
+
import { useCLIVersionCheck } from '../lib/hooks/useCLIVersionCheck.js';
|
|
7
|
+
import { error, info, simpleLog, warning } from '../lib/outputs.js';
|
|
8
|
+
const UPDATE_COMMANDS = {
|
|
9
|
+
npm: (version) => `npm install -g apify-cli@${version}`,
|
|
10
|
+
// TODO: homebrew will move to bundles instead of node+npm, this might break resolving the version, tbd
|
|
11
|
+
homebrew: () => `brew upgrade apify-cli`,
|
|
12
|
+
volta: (version) => `volta install apify-cli@${version}`,
|
|
13
|
+
};
|
|
14
|
+
const MINIMUM_VERSION_FOR_UPGRADE_COMMAND = '0.28.0';
|
|
15
|
+
export class UpgradeCommand extends ApifyCommand {
|
|
16
|
+
static name = 'upgrade';
|
|
17
|
+
static description = 'Checks that installed Apify CLI version is up to date.';
|
|
18
|
+
static hidden = true;
|
|
19
|
+
static aliases = ['cv', 'check-version'];
|
|
20
|
+
static flags = {
|
|
21
|
+
force: Flags.boolean({
|
|
22
|
+
description: 'Whether to skip checking the locally cached latest version of the CLI and fetch it from the internet instead.',
|
|
23
|
+
required: false,
|
|
24
|
+
char: 'f',
|
|
25
|
+
}),
|
|
26
|
+
yes: Flags.boolean({
|
|
27
|
+
description: 'Whether to automatically run the command required to update the CLI.',
|
|
28
|
+
required: false,
|
|
29
|
+
char: 'y',
|
|
30
|
+
}),
|
|
31
|
+
version: Flags.string({
|
|
32
|
+
description: 'The version of the CLI to upgrade to. If not provided, the latest version will be used.',
|
|
33
|
+
required: false,
|
|
34
|
+
}),
|
|
35
|
+
};
|
|
36
|
+
async run() {
|
|
37
|
+
if (this.flags.version) {
|
|
38
|
+
await this.handleInstallSpecificVersion(this.flags.version);
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const result = await useCLIVersionCheck(this.flags.force);
|
|
42
|
+
const { installMethod } = useCLIMetadata();
|
|
43
|
+
if (!result.shouldUpdate || result.currentVersion === DEVELOPMENT_VERSION_MARKER) {
|
|
44
|
+
if (!result.cacheHit) {
|
|
45
|
+
info({ message: 'Apify CLI is up to date 👍 \n' });
|
|
46
|
+
}
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
if (installMethod === 'bundle') {
|
|
50
|
+
await this.handleBundleUpgrade();
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const updateCommand = UPDATE_COMMANDS[installMethod](this.flags.version ?? 'latest');
|
|
54
|
+
simpleLog({ message: '' });
|
|
55
|
+
const message = [
|
|
56
|
+
'You are using an old version of Apify CLI. We strongly recommend you always use the latest available version.',
|
|
57
|
+
` ↪ Run ${chalk.bgWhite(chalk.black(updateCommand))} to update! 👍 \n`,
|
|
58
|
+
].join('\n');
|
|
59
|
+
warning({ message });
|
|
60
|
+
// TODO: prompt for confirmation and auto-run command if --yes is passed / confirmed by the user
|
|
61
|
+
}
|
|
62
|
+
async handleInstallSpecificVersion(version) {
|
|
63
|
+
// Technically, we could allow downgrades to older versions, but then users would lose the upgrade command 🤷
|
|
64
|
+
if (!gte(version, MINIMUM_VERSION_FOR_UPGRADE_COMMAND)) {
|
|
65
|
+
error({ message: 'The minimum version of the CLI you can manually downgrade/upgrade to is 0.28.0.' });
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
throw new Error('Not implemented');
|
|
69
|
+
}
|
|
70
|
+
async handleBundleUpgrade() {
|
|
71
|
+
throw new Error('Bundles do not support automatic upgrades yet.');
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=upgrade.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,11 @@ import chalk from 'chalk';
|
|
|
3
3
|
import yargonaut from 'yargonaut';
|
|
4
4
|
// eslint-disable-next-line import/extensions
|
|
5
5
|
import yargs from 'yargs/yargs';
|
|
6
|
-
import { camelCaseToKebabCase, commandRegistry, kebabCaseString } from '../lib/command-framework/apify-command.js';
|
|
6
|
+
import { camelCaseToKebabCase, commandRegistry, kebabCaseString, runCommand, } from '../lib/command-framework/apify-command.js';
|
|
7
7
|
import { renderMainHelpMenu, selectiveRenderHelpForCommand } from '../lib/command-framework/help.js';
|
|
8
8
|
import { readStdin } from '../lib/commands/read-stdin.js';
|
|
9
|
-
import {
|
|
9
|
+
import { useCLIMetadata } from '../lib/hooks/useCLIMetadata.js';
|
|
10
|
+
import { shouldSkipVersionCheck } from '../lib/hooks/useCLIVersionCheck.js';
|
|
10
11
|
import { error } from '../lib/outputs.js';
|
|
11
12
|
import { cliDebugPrint } from '../lib/utils/cliDebugPrint.js';
|
|
12
13
|
export const cachedStdinInput = await readStdin();
|
|
@@ -54,9 +55,23 @@ export const cli = yargs()
|
|
|
54
55
|
});
|
|
55
56
|
// @ts-expect-error @types/yargs is outdated -.-
|
|
56
57
|
cli.usageConfiguration({ 'hide-types': true });
|
|
58
|
+
cli.middleware(async (argv) => {
|
|
59
|
+
const UpgradeCommand = commandRegistry.get('upgrade');
|
|
60
|
+
const checkVersionsCommandIds = [UpgradeCommand.name, ...(UpgradeCommand.aliases ?? [])];
|
|
61
|
+
if (checkVersionsCommandIds.some((id) => argv._[0] === id)) {
|
|
62
|
+
// Skip running the middleware
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
// If the user has configured the `APIFY_CLI_SKIP_UPDATE_CHECK` env variable then skip the check.
|
|
66
|
+
if (shouldSkipVersionCheck()) {
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
await runCommand(UpgradeCommand, {});
|
|
70
|
+
});
|
|
71
|
+
const cliMetadata = useCLIMetadata();
|
|
57
72
|
export function printCLIVersionAndExitIfFlagUsed(parsed) {
|
|
58
73
|
if (parsed.v === true || parsed.version === true) {
|
|
59
|
-
console.log(
|
|
74
|
+
console.log(cliMetadata.fullVersionString);
|
|
60
75
|
process.exit(0);
|
|
61
76
|
}
|
|
62
77
|
}
|
|
@@ -67,8 +82,15 @@ export function printHelpAndExitIfFlagUsedOrNoCommandPassed(parsed, entrypoint)
|
|
|
67
82
|
}
|
|
68
83
|
}
|
|
69
84
|
export async function runCLI(entrypoint) {
|
|
85
|
+
cliDebugPrint('CLIMetadata', {
|
|
86
|
+
...cliMetadata,
|
|
87
|
+
fullVersionString: cliMetadata.fullVersionString,
|
|
88
|
+
argv: process.argv,
|
|
89
|
+
cwd: process.cwd(),
|
|
90
|
+
execPath: process.execPath,
|
|
91
|
+
});
|
|
70
92
|
await cli.parse(process.argv.slice(2), {}, (rawError, parsed) => {
|
|
71
|
-
if (rawError) {
|
|
93
|
+
if (rawError && parsed._.length > 0) {
|
|
72
94
|
cliDebugPrint('RunCLIError', { type: 'parsed', error: rawError?.message, parsed });
|
|
73
95
|
const errorMessageSplit = rawError.message.split(' ').map((part) => part.trim());
|
|
74
96
|
const possibleCommands = [
|
|
@@ -204,7 +226,7 @@ export async function runCLI(entrypoint) {
|
|
|
204
226
|
'- Arguments (!!!only provide these as is if there is no sensitive information!!!):',
|
|
205
227
|
` ${JSON.stringify(process.argv.slice(2))}`,
|
|
206
228
|
'',
|
|
207
|
-
`- CLI version: \`${
|
|
229
|
+
`- CLI version: \`${cliMetadata.fullVersionString}\``,
|
|
208
230
|
`- CLI debug logs (process.env.APIFY_CLI_DEBUG): ${process.env.APIFY_CLI_DEBUG ? 'Enabled' : 'Disabled'}`,
|
|
209
231
|
`- Stdin data? ${cachedStdinInput ? 'Yes' : 'No'}`,
|
|
210
232
|
].join('\n'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_shared.js","sourceRoot":"","sources":["../../src/entrypoints/_shared.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,6CAA6C;AAC7C,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,OAAO,
|
|
1
|
+
{"version":3,"file":"_shared.js","sourceRoot":"","sources":["../../src/entrypoints/_shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { satisfies } from 'semver';
|
|
3
3
|
import { apifyCommands } from '../commands/_register.js';
|
|
4
|
-
import { CheckVersionCommand } from '../commands/check-version.js';
|
|
5
4
|
import { SUPPORTED_NODEJS_VERSION } from '../lib/consts.js';
|
|
6
5
|
import { error } from '../lib/outputs.js';
|
|
7
|
-
import { checkLatestVersion, SKIP_UPDATE_CHECK } from '../lib/version_check.js';
|
|
8
6
|
import { cli, runCLI } from './_shared.js';
|
|
9
7
|
if (!satisfies(process.version, SUPPORTED_NODEJS_VERSION)) {
|
|
10
8
|
error({
|
|
@@ -12,18 +10,6 @@ if (!satisfies(process.version, SUPPORTED_NODEJS_VERSION)) {
|
|
|
12
10
|
});
|
|
13
11
|
process.exit(1);
|
|
14
12
|
}
|
|
15
|
-
cli.middleware(async (argv) => {
|
|
16
|
-
const checkVersionsCommandIds = [CheckVersionCommand.name, ...CheckVersionCommand.aliases];
|
|
17
|
-
if (checkVersionsCommandIds.some((id) => argv._[0] === id)) {
|
|
18
|
-
// Skip running the middleware
|
|
19
|
-
return;
|
|
20
|
-
}
|
|
21
|
-
// If the user has configured the `APIFY_CLI_SKIP_UPDATE_CHECK` env variable then skip the check.
|
|
22
|
-
if (SKIP_UPDATE_CHECK) {
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
|
-
await checkLatestVersion();
|
|
26
|
-
});
|
|
27
13
|
// Register all commands
|
|
28
14
|
for (const CommandClass of apifyCommands) {
|
|
29
15
|
CommandClass.registerCommand('apify', cli);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apify.js","sourceRoot":"","sources":["../../src/entrypoints/apify.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"apify.js","sourceRoot":"","sources":["../../src/entrypoints/apify.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,wBAAwB,CAAC,EAAE,CAAC;IAC3D,KAAK,CAAC;QACL,OAAO,EAAE,sCAAsC,wBAAwB,6BAA6B,OAAO,CAAC,OAAO,GAAG;KACtH,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC;AAED,wBAAwB;AACxB,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;IAC1C,YAAY,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import chalk from 'chalk';
|
|
|
2
2
|
import indentString from 'indent-string';
|
|
3
3
|
import widestLine from 'widest-line';
|
|
4
4
|
import wrapAnsi from 'wrap-ansi';
|
|
5
|
-
import {
|
|
5
|
+
import { useCLIMetadata } from '../hooks/useCLIMetadata.js';
|
|
6
6
|
import { error } from '../outputs.js';
|
|
7
7
|
import { mapGroupBy } from '../utils.js';
|
|
8
8
|
import { CommandHelp } from './help/CommandHelp.js';
|
|
@@ -44,10 +44,11 @@ function sortByName(itemA, itemB) {
|
|
|
44
44
|
return itemA[0].name.localeCompare(itemB[0].name);
|
|
45
45
|
}
|
|
46
46
|
export function renderMainHelpMenu(entrypoint) {
|
|
47
|
+
const cliMetadata = useCLIMetadata();
|
|
47
48
|
const result = [];
|
|
48
|
-
result.push(
|
|
49
|
+
result.push('Apify command-line interface (CLI) helps you manage the Apify cloud platform and develop, build, and deploy Apify Actors.', '');
|
|
49
50
|
result.push(chalk.bold('VERSION'));
|
|
50
|
-
result.push(` ${
|
|
51
|
+
result.push(` ${cliMetadata.fullVersionString}`);
|
|
51
52
|
result.push('');
|
|
52
53
|
result.push(chalk.bold('USAGE'));
|
|
53
54
|
result.push(` $ ${entrypoint} <command> [options]`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/lib/command-framework/help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/lib/command-framework/help.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,62 +1,19 @@
|
|
|
1
1
|
import { once } from 'node:events';
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export async function readStdin(stdinStream = process.stdin) {
|
|
7
|
-
// The best showcase of what this does: https://stackoverflow.com/a/59024214
|
|
8
|
-
const pipedIn = await fstat(0)
|
|
9
|
-
.then((stat) => {
|
|
10
|
-
if (process.env.STDIN_DEBUG) {
|
|
11
|
-
console.error({
|
|
12
|
-
stat,
|
|
13
|
-
isRegularFile: stat.isFile(),
|
|
14
|
-
isDirectory: stat.isDirectory(),
|
|
15
|
-
isBlockDevice: stat.isBlockDevice(),
|
|
16
|
-
isCharDevice: stat.isCharacterDevice(),
|
|
17
|
-
isSymbolicLink: stat.isSymbolicLink(),
|
|
18
|
-
isFIFO: stat.isFIFO(),
|
|
19
|
-
isSocket: stat.isSocket(),
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
// Right now, Windows always returns false for isFIFO, so we have to check for that manually
|
|
23
|
-
// Windows might also wrongly return the mode for this, who knows!
|
|
24
|
-
// TODO: https://github.com/nodejs/node/issues/57603
|
|
25
|
-
if (process.platform === 'win32') {
|
|
26
|
-
// eslint-disable-next-line no-bitwise
|
|
27
|
-
if ((stat.mode & constants.S_IFIFO) === constants.S_IFIFO) {
|
|
28
|
-
return 100;
|
|
29
|
-
}
|
|
30
|
-
// In node 18, for some reason this returns true for vitest, and thus always hangs.
|
|
31
|
-
if (stat.isFile()) {
|
|
32
|
-
return 50;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
// isFIFO -> `node a | node b`
|
|
36
|
-
// isFile -> `node a < file`
|
|
37
|
-
// isSocket -> child processes (I think) [but we set a timeout of 50ms to avoid hanging]
|
|
38
|
-
return stat.isFIFO() || stat.isFile() || (stat.isSocket() ? 50 : false);
|
|
39
|
-
})
|
|
40
|
-
.catch(() => false);
|
|
41
|
-
if (process.env.STDIN_DEBUG) {
|
|
42
|
-
console.error({ isTTY: stdinStream.isTTY, pipedIn, readableEnd: stdinStream.readableEnded });
|
|
43
|
-
}
|
|
44
|
-
// The isTTY params will be true if there is no piping into stdin
|
|
45
|
-
// pipedIn is set if someone either runs `node a | node b`, or `node a < file`
|
|
46
|
-
// if that is the case, isTTY will be undefined (???)
|
|
47
|
-
// readableEnded is a catch all for when the stream is closed
|
|
48
|
-
if (stdinStream.isTTY || (!pipedIn && (stdinStream.isTTY === undefined || stdinStream.readableEnded))) {
|
|
2
|
+
import { useStdin } from '../hooks/useStdin.js';
|
|
3
|
+
export async function readStdin() {
|
|
4
|
+
const { hasData, waitDelay, stream } = await useStdin();
|
|
5
|
+
if (!hasData) {
|
|
49
6
|
return;
|
|
50
7
|
}
|
|
51
8
|
const bufferChunks = [];
|
|
52
9
|
const controller = new AbortController();
|
|
53
10
|
let timeout = null;
|
|
54
|
-
if (
|
|
11
|
+
if (waitDelay) {
|
|
55
12
|
timeout = setTimeout(() => {
|
|
56
13
|
controller.abort();
|
|
57
|
-
},
|
|
14
|
+
}, waitDelay).unref();
|
|
58
15
|
}
|
|
59
|
-
|
|
16
|
+
stream.on('data', (chunk) => {
|
|
60
17
|
bufferChunks.push(chunk);
|
|
61
18
|
// If we got some data already, we can clear the timeout, as we will get more
|
|
62
19
|
if (timeout) {
|
|
@@ -65,7 +22,7 @@ export async function readStdin(stdinStream = process.stdin) {
|
|
|
65
22
|
}
|
|
66
23
|
});
|
|
67
24
|
try {
|
|
68
|
-
await once(
|
|
25
|
+
await once(stream, 'end', { signal: controller.signal });
|
|
69
26
|
}
|
|
70
27
|
catch (error) {
|
|
71
28
|
const casted = error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-stdin.js","sourceRoot":"","sources":["../../../src/lib/commands/read-stdin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"read-stdin.js","sourceRoot":"","sources":["../../../src/lib/commands/read-stdin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,SAAS;IAC9B,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;IAExD,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO;IACR,CAAC;IAED,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IAEzC,IAAI,OAAO,GAA0B,IAAI,CAAC;IAE1C,IAAI,SAAS,EAAE,CAAC;QACf,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YACzB,UAAU,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEzB,6EAA6E;QAC7E,IAAI,OAAO,EAAE,CAAC;YACb,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,OAAO,GAAG,IAAI,CAAC;QAChB,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACJ,MAAM,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,KAAc,CAAC;QAE9B,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAClC,OAAO;QACR,CAAC;IACF,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACb,YAAY,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAE3C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IACf,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC"}
|
package/dist/lib/consts.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-duplicate-enum-values */
|
|
2
|
-
import {
|
|
2
|
+
import { homedir } from 'node:os';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { KEY_VALUE_STORE_KEYS, META_ORIGINS } from '@apify/consts';
|
|
5
5
|
import pkg from '../../package.json' with { type: 'json' };
|
|
@@ -13,11 +13,6 @@ export const EMPTY_LOCAL_CONFIG = {
|
|
|
13
13
|
buildTag: 'latest',
|
|
14
14
|
environmentVariables: {},
|
|
15
15
|
};
|
|
16
|
-
export const LANGUAGE = {
|
|
17
|
-
NODEJS: 'nodejs',
|
|
18
|
-
PYTHON: 'python',
|
|
19
|
-
UNKNOWN: 'n/a',
|
|
20
|
-
};
|
|
21
16
|
export const PROJECT_TYPES = {
|
|
22
17
|
SCRAPY: 'scrapy',
|
|
23
18
|
CRAWLEE: 'crawlee',
|
|
@@ -52,7 +47,6 @@ export const ACTOR_SPECIFICATION_FOLDER = '.actor';
|
|
|
52
47
|
export const LOCAL_CONFIG_NAME = 'actor.json';
|
|
53
48
|
export const LOCAL_CONFIG_PATH = join(ACTOR_SPECIFICATION_FOLDER, LOCAL_CONFIG_NAME);
|
|
54
49
|
export const INPUT_FILE_REG_EXP = new RegExp(`^${KEY_VALUE_STORE_KEYS.INPUT}\\..*`);
|
|
55
|
-
export const MAIN_FILE = 'main.js';
|
|
56
50
|
export const SUPPORTED_NODEJS_VERSION = pkg.engines.node;
|
|
57
51
|
export const CURRENT_APIFY_CLI_VERSION = pkg.version;
|
|
58
52
|
export const APIFY_CLIENT_DEFAULT_HEADERS = { 'X-Apify-Request-Origin': META_ORIGINS.CLI };
|
|
@@ -72,20 +66,4 @@ export var CommandExitCodes;
|
|
|
72
66
|
CommandExitCodes[CommandExitCodes["NotFound"] = 250] = "NotFound";
|
|
73
67
|
CommandExitCodes[CommandExitCodes["NotImplemented"] = 255] = "NotImplemented";
|
|
74
68
|
})(CommandExitCodes || (CommandExitCodes = {}));
|
|
75
|
-
// Yargs
|
|
76
|
-
const runtimeName = (() => {
|
|
77
|
-
if (process.versions.bun) {
|
|
78
|
-
return 'bun';
|
|
79
|
-
}
|
|
80
|
-
if (process.versions.deno) {
|
|
81
|
-
return 'deno';
|
|
82
|
-
}
|
|
83
|
-
return 'node';
|
|
84
|
-
})();
|
|
85
|
-
const runtimeVersion = process.versions[runtimeName] || process.version;
|
|
86
|
-
const nodeVersion = process.versions.node;
|
|
87
|
-
const extraRuntimeData = runtimeName === 'node' ? '' : ` (emulating node ${nodeVersion})`;
|
|
88
|
-
// apify-cli/0.21.2 darwin-arm64 node-v22.14.0
|
|
89
|
-
export const cliVersion = `${pkg.name}/${pkg.version} ${platform()}-${arch()} ${runtimeName}-${runtimeVersion}${extraRuntimeData}`;
|
|
90
|
-
export const cliDescription = pkg.description;
|
|
91
69
|
//# sourceMappingURL=consts.js.map
|
package/dist/lib/consts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/lib/consts.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/lib/consts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { realpathSync } from 'node:fs';
|
|
2
|
+
import { dirname } from 'node:path';
|
|
3
|
+
import { warning } from '../outputs.js';
|
|
4
|
+
export const DEVELOPMENT_VERSION_MARKER = '0.0.0';
|
|
5
|
+
export const DEVELOPMENT_HASH_MARKER = '0000000';
|
|
6
|
+
// These values are replaced with the actual values when building the CLI
|
|
7
|
+
const CLI_VERSION = "0.21.8-beta.15";
|
|
8
|
+
const CLI_HASH = "9ae6f99e6474083cea2c0f5163fc0fa2d0440aaf";
|
|
9
|
+
function detectInstallMethod() {
|
|
10
|
+
// This if check is special, and gets replaced with an always-true branch when running from bun bundles
|
|
11
|
+
if (process.env.APIFY_CLI_BUNDLE) {
|
|
12
|
+
return 'bundle';
|
|
13
|
+
}
|
|
14
|
+
const entrypointFilePathRaw = process.argv[1];
|
|
15
|
+
// Should be impossible, but if it is
|
|
16
|
+
if (!entrypointFilePathRaw) {
|
|
17
|
+
warning({ message: `Failed to detect install method of CLI, assuming npm` });
|
|
18
|
+
return 'npm';
|
|
19
|
+
}
|
|
20
|
+
const entrypointFilePath = realpathSync(entrypointFilePathRaw);
|
|
21
|
+
if (process.env.VOLTA_HOME && entrypointFilePath.includes(process.env.VOLTA_HOME)) {
|
|
22
|
+
return 'volta';
|
|
23
|
+
}
|
|
24
|
+
if (entrypointFilePath.includes('homebrew/Cellar') || entrypointFilePath.includes('linuxbrew/Cellar')) {
|
|
25
|
+
return 'homebrew';
|
|
26
|
+
}
|
|
27
|
+
return 'npm';
|
|
28
|
+
}
|
|
29
|
+
function getRuntimeInfo() {
|
|
30
|
+
if (process.versions.bun) {
|
|
31
|
+
return {
|
|
32
|
+
runtime: 'bun',
|
|
33
|
+
version: process.versions.bun,
|
|
34
|
+
nodeVersion: process.versions.node,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
if (process.versions.deno) {
|
|
38
|
+
return {
|
|
39
|
+
runtime: 'deno',
|
|
40
|
+
version: process.versions.deno,
|
|
41
|
+
nodeVersion: process.versions.node,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
return {
|
|
45
|
+
runtime: 'node',
|
|
46
|
+
version: process.versions.node,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
let cachedMetadata = null;
|
|
50
|
+
export function useCLIMetadata() {
|
|
51
|
+
if (cachedMetadata) {
|
|
52
|
+
return cachedMetadata;
|
|
53
|
+
}
|
|
54
|
+
const installMethod = detectInstallMethod();
|
|
55
|
+
const runtime = getRuntimeInfo();
|
|
56
|
+
cachedMetadata = {
|
|
57
|
+
version: CLI_VERSION,
|
|
58
|
+
hash: CLI_HASH,
|
|
59
|
+
arch: process.arch,
|
|
60
|
+
platform: process.platform,
|
|
61
|
+
runtime: runtime.runtime,
|
|
62
|
+
extraRuntimeData: runtime.nodeVersion ? `(emulating node ${runtime.nodeVersion})` : '',
|
|
63
|
+
installMethod,
|
|
64
|
+
get fullVersionString() {
|
|
65
|
+
return `apify-cli/${this.version} (${this.hash.slice(0, 7)}) running on ${this.platform}-${this.arch} with ${this.runtime}-${runtime.version}${this.extraRuntimeData ? ` ${this.extraRuntimeData}` : ''}, installed via ${this.installMethod}`;
|
|
66
|
+
},
|
|
67
|
+
};
|
|
68
|
+
if (installMethod === 'bundle') {
|
|
69
|
+
cachedMetadata.installPath = dirname(process.execPath);
|
|
70
|
+
}
|
|
71
|
+
return cachedMetadata;
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=useCLIMetadata.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useCLIMetadata.js","sourceRoot":"","sources":["../../../src/lib/hooks/useCLIMetadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { gt } from 'semver';
|
|
2
|
+
import { CHECK_VERSION_EVERY_MILLIS } from '../consts.js';
|
|
3
|
+
import { warning } from '../outputs.js';
|
|
4
|
+
import { cliDebugPrint } from '../utils/cliDebugPrint.js';
|
|
5
|
+
import { useCLIMetadata } from './useCLIMetadata.js';
|
|
6
|
+
import { updateLocalState, useLocalState } from './useLocalState.js';
|
|
7
|
+
const metadata = useCLIMetadata();
|
|
8
|
+
const USER_AGENT = `Apify CLI/${metadata.version} (https://github.com/apify/apify-cli)`;
|
|
9
|
+
const sitesToCheck = ['https://1.1.1.1', 'https://8.8.8.8'];
|
|
10
|
+
async function isOnline(timeout = 500) {
|
|
11
|
+
const controller = new AbortController();
|
|
12
|
+
const timeoutId = setTimeout(() => {
|
|
13
|
+
controller.abort();
|
|
14
|
+
}, timeout);
|
|
15
|
+
const res = await Promise.any(sitesToCheck.map(async (site) => fetch(site, {
|
|
16
|
+
signal: controller.signal,
|
|
17
|
+
headers: {
|
|
18
|
+
'User-Agent': USER_AGENT,
|
|
19
|
+
},
|
|
20
|
+
keepalive: false,
|
|
21
|
+
}))).catch(() => null);
|
|
22
|
+
if (!res) {
|
|
23
|
+
cliDebugPrint('isOnline', { state: 'timeout' });
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
if (res.ok) {
|
|
27
|
+
clearTimeout(timeoutId);
|
|
28
|
+
cliDebugPrint('isOnline', {
|
|
29
|
+
state: 'online',
|
|
30
|
+
site: res.url,
|
|
31
|
+
});
|
|
32
|
+
return true;
|
|
33
|
+
}
|
|
34
|
+
cliDebugPrint('isOnline', { state: 'offline' });
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
async function getLatestVersion(state) {
|
|
38
|
+
const res = await fetch('https://api.github.com/repos/apify/apify-cli/releases/latest', {
|
|
39
|
+
headers: {
|
|
40
|
+
'User-Agent': USER_AGENT,
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
if (!res.ok) {
|
|
44
|
+
cliDebugPrint('useCLIVersionCheck', 'Failed to fetch latest version', {
|
|
45
|
+
statusCode: res.status,
|
|
46
|
+
body: await res.text(),
|
|
47
|
+
});
|
|
48
|
+
warning({ message: 'Failed to fetch latest version of Apify CLI, using the cached version instead.' });
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
const body = (await res.json());
|
|
52
|
+
const version = body.tag_name.replace(/^v/, '');
|
|
53
|
+
cliDebugPrint('useCLIVersionCheck', 'Fetched latest version', { version });
|
|
54
|
+
updateLocalState(state, (stateToUpdate) => {
|
|
55
|
+
stateToUpdate.versionCheck = {
|
|
56
|
+
lastChecked: Date.now(),
|
|
57
|
+
lastVersion: version,
|
|
58
|
+
};
|
|
59
|
+
});
|
|
60
|
+
return version;
|
|
61
|
+
}
|
|
62
|
+
export function shouldSkipVersionCheck() {
|
|
63
|
+
if (process.env.APIFY_CLI_SKIP_UPDATE_CHECK && !['0', 'false'].includes(process.env.APIFY_CLI_SKIP_UPDATE_CHECK)) {
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
export async function useCLIVersionCheck(force = false) {
|
|
69
|
+
const localState = useLocalState();
|
|
70
|
+
const stateIsOutdated = !localState.versionCheck || Date.now() - localState.versionCheck.lastChecked > CHECK_VERSION_EVERY_MILLIS;
|
|
71
|
+
const shouldFetchFromApi = force || (stateIsOutdated && (await isOnline()));
|
|
72
|
+
const latestVersion = shouldFetchFromApi
|
|
73
|
+
? await getLatestVersion(localState)
|
|
74
|
+
: localState.versionCheck?.lastVersion;
|
|
75
|
+
if (!latestVersion) {
|
|
76
|
+
return {
|
|
77
|
+
currentVersion: metadata.version,
|
|
78
|
+
latestVersion: 'unknown',
|
|
79
|
+
shouldUpdate: false,
|
|
80
|
+
cacheHit: false,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
const shouldUpdate = gt(latestVersion, metadata.version);
|
|
84
|
+
return {
|
|
85
|
+
currentVersion: metadata.version,
|
|
86
|
+
latestVersion,
|
|
87
|
+
shouldUpdate,
|
|
88
|
+
cacheHit: !shouldFetchFromApi,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=useCLIVersionCheck.js.map
|