apify-cli 0.21.10-beta.1 → 0.21.10-beta.11
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 +2 -0
- package/dist/.tsbuildinfo +1 -1
- package/dist/actor.js +3 -0
- package/dist/actor.js.map +1 -0
- package/dist/apify.js +3 -0
- package/dist/apify.js.map +1 -0
- package/dist/chunk-BQP4A7WO.js +236 -0
- package/dist/chunk-BQP4A7WO.js.map +1 -0
- package/dist/index.js +2 -3
- package/package.json +15 -13
- package/dist/commands/_register.js +0 -68
- package/dist/commands/_register.js.map +0 -1
- package/dist/commands/actor/_index.js +0 -24
- package/dist/commands/actor/_index.js.map +0 -1
- package/dist/commands/actor/charge.js +0 -84
- package/dist/commands/actor/charge.js.map +0 -1
- package/dist/commands/actor/get-input.js +0 -10
- package/dist/commands/actor/get-input.js.map +0 -1
- package/dist/commands/actor/get-public-url.js +0 -52
- package/dist/commands/actor/get-public-url.js.map +0 -1
- package/dist/commands/actor/get-value.js +0 -18
- package/dist/commands/actor/get-value.js.map +0 -1
- package/dist/commands/actor/push-data.js +0 -38
- package/dist/commands/actor/push-data.js.map +0 -1
- package/dist/commands/actor/set-value.js +0 -52
- package/dist/commands/actor/set-value.js.map +0 -1
- package/dist/commands/actors/_index.js +0 -28
- package/dist/commands/actors/_index.js.map +0 -1
- package/dist/commands/actors/build.js +0 -6
- package/dist/commands/actors/build.js.map +0 -1
- package/dist/commands/actors/call.js +0 -224
- package/dist/commands/actors/call.js.map +0 -1
- package/dist/commands/actors/info.js +0 -203
- package/dist/commands/actors/info.js.map +0 -1
- package/dist/commands/actors/ls.js +0 -226
- package/dist/commands/actors/ls.js.map +0 -1
- package/dist/commands/actors/pull.js +0 -150
- package/dist/commands/actors/pull.js.map +0 -1
- package/dist/commands/actors/push.js +0 -300
- package/dist/commands/actors/push.js.map +0 -1
- package/dist/commands/actors/rm.js +0 -43
- package/dist/commands/actors/rm.js.map +0 -1
- package/dist/commands/actors/start.js +0 -125
- package/dist/commands/actors/start.js.map +0 -1
- package/dist/commands/builds/_index.js +0 -22
- package/dist/commands/builds/_index.js.map +0 -1
- package/dist/commands/builds/create.js +0 -130
- package/dist/commands/builds/create.js.map +0 -1
- package/dist/commands/builds/info.js +0 -78
- package/dist/commands/builds/info.js.map +0 -1
- package/dist/commands/builds/log.js +0 -35
- package/dist/commands/builds/log.js.map +0 -1
- package/dist/commands/builds/ls.js +0 -141
- package/dist/commands/builds/ls.js.map +0 -1
- package/dist/commands/builds/rm.js +0 -59
- package/dist/commands/builds/rm.js.map +0 -1
- package/dist/commands/call.js +0 -5
- package/dist/commands/call.js.map +0 -1
- package/dist/commands/create.js +0 -264
- package/dist/commands/create.js.map +0 -1
- package/dist/commands/datasets/_index.js +0 -25
- package/dist/commands/datasets/_index.js.map +0 -1
- package/dist/commands/datasets/create.js +0 -38
- package/dist/commands/datasets/create.js.map +0 -1
- package/dist/commands/datasets/get-items.js +0 -84
- package/dist/commands/datasets/get-items.js.map +0 -1
- package/dist/commands/datasets/info.js +0 -125
- package/dist/commands/datasets/info.js.map +0 -1
- package/dist/commands/datasets/ls.js +0 -73
- package/dist/commands/datasets/ls.js.map +0 -1
- package/dist/commands/datasets/push-items.js +0 -70
- package/dist/commands/datasets/push-items.js.map +0 -1
- package/dist/commands/datasets/rename.js +0 -71
- package/dist/commands/datasets/rename.js.map +0 -1
- package/dist/commands/datasets/rm.js +0 -48
- package/dist/commands/datasets/rm.js.map +0 -1
- package/dist/commands/edit-input-schema.js +0 -162
- package/dist/commands/edit-input-schema.js.map +0 -1
- package/dist/commands/help.js +0 -43
- package/dist/commands/help.js.map +0 -1
- package/dist/commands/info.js +0 -21
- package/dist/commands/info.js.map +0 -1
- package/dist/commands/init-wrap-scrapy.js +0 -27
- package/dist/commands/init-wrap-scrapy.js.map +0 -1
- package/dist/commands/init.js +0 -94
- package/dist/commands/init.js.map +0 -1
- package/dist/commands/key-value-stores/_index.js +0 -30
- package/dist/commands/key-value-stores/_index.js.map +0 -1
- package/dist/commands/key-value-stores/create.js +0 -38
- package/dist/commands/key-value-stores/create.js.map +0 -1
- package/dist/commands/key-value-stores/delete-value.js +0 -61
- package/dist/commands/key-value-stores/delete-value.js.map +0 -1
- package/dist/commands/key-value-stores/get-value.js +0 -70
- package/dist/commands/key-value-stores/get-value.js.map +0 -1
- package/dist/commands/key-value-stores/info.js +0 -127
- package/dist/commands/key-value-stores/info.js.map +0 -1
- package/dist/commands/key-value-stores/keys.js +0 -61
- package/dist/commands/key-value-stores/keys.js.map +0 -1
- package/dist/commands/key-value-stores/ls.js +0 -70
- package/dist/commands/key-value-stores/ls.js.map +0 -1
- package/dist/commands/key-value-stores/rename.js +0 -71
- package/dist/commands/key-value-stores/rename.js.map +0 -1
- package/dist/commands/key-value-stores/rm.js +0 -48
- package/dist/commands/key-value-stores/rm.js.map +0 -1
- package/dist/commands/key-value-stores/set-value.js +0 -57
- package/dist/commands/key-value-stores/set-value.js.map +0 -1
- package/dist/commands/login.js +0 -183
- package/dist/commands/login.js.map +0 -1
- package/dist/commands/logout.js +0 -16
- package/dist/commands/logout.js.map +0 -1
- package/dist/commands/pull.js +0 -5
- package/dist/commands/pull.js.map +0 -1
- package/dist/commands/push.js +0 -5
- package/dist/commands/push.js.map +0 -1
- package/dist/commands/request-queues/_index.js +0 -9
- package/dist/commands/request-queues/_index.js.map +0 -1
- package/dist/commands/run.js +0 -434
- package/dist/commands/run.js.map +0 -1
- package/dist/commands/runs/_index.js +0 -23
- package/dist/commands/runs/_index.js.map +0 -1
- package/dist/commands/runs/abort.js +0 -68
- package/dist/commands/runs/abort.js.map +0 -1
- package/dist/commands/runs/info.js +0 -238
- package/dist/commands/runs/info.js.map +0 -1
- package/dist/commands/runs/log.js +0 -32
- package/dist/commands/runs/log.js.map +0 -1
- package/dist/commands/runs/ls.js +0 -106
- package/dist/commands/runs/ls.js.map +0 -1
- package/dist/commands/runs/resurrect.js +0 -54
- package/dist/commands/runs/resurrect.js.map +0 -1
- package/dist/commands/runs/rm.js +0 -58
- package/dist/commands/runs/rm.js.map +0 -1
- package/dist/commands/secrets/_index.js +0 -25
- package/dist/commands/secrets/_index.js.map +0 -1
- package/dist/commands/secrets/add.js +0 -22
- package/dist/commands/secrets/add.js.map +0 -1
- package/dist/commands/secrets/rm.js +0 -18
- package/dist/commands/secrets/rm.js.map +0 -1
- package/dist/commands/task/_index.js +0 -11
- package/dist/commands/task/_index.js.map +0 -1
- package/dist/commands/task/run.js +0 -91
- package/dist/commands/task/run.js.map +0 -1
- package/dist/commands/upgrade.js +0 -74
- package/dist/commands/upgrade.js.map +0 -1
- package/dist/commands/validate-schema.js +0 -44
- package/dist/commands/validate-schema.js.map +0 -1
- package/dist/entrypoints/_shared.js +0 -256
- package/dist/entrypoints/_shared.js.map +0 -1
- package/dist/entrypoints/actor.js +0 -19
- package/dist/entrypoints/actor.js.map +0 -1
- package/dist/entrypoints/apify.js +0 -18
- package/dist/entrypoints/apify.js.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/lib/actor.js +0 -74
- package/dist/lib/actor.js.map +0 -1
- package/dist/lib/command-framework/apify-command.js +0 -426
- package/dist/lib/command-framework/apify-command.js.map +0 -1
- package/dist/lib/command-framework/args.js +0 -24
- package/dist/lib/command-framework/args.js.map +0 -1
- package/dist/lib/command-framework/flags.js +0 -99
- package/dist/lib/command-framework/flags.js.map +0 -1
- package/dist/lib/command-framework/help/CommandHelp.js +0 -228
- package/dist/lib/command-framework/help/CommandHelp.js.map +0 -1
- package/dist/lib/command-framework/help/CommandWithSubcommands.js +0 -75
- package/dist/lib/command-framework/help/CommandWithSubcommands.js.map +0 -1
- package/dist/lib/command-framework/help/_BaseCommandRenderer.js +0 -63
- package/dist/lib/command-framework/help/_BaseCommandRenderer.js.map +0 -1
- package/dist/lib/command-framework/help/consts.js +0 -27
- package/dist/lib/command-framework/help/consts.js.map +0 -1
- package/dist/lib/command-framework/help.js +0 -105
- package/dist/lib/command-framework/help.js.map +0 -1
- package/dist/lib/commands/pretty-print-bytes.js +0 -13
- package/dist/lib/commands/pretty-print-bytes.js.map +0 -1
- package/dist/lib/commands/pretty-print-status.js +0 -29
- package/dist/lib/commands/pretty-print-status.js.map +0 -1
- package/dist/lib/commands/read-stdin.js +0 -42
- package/dist/lib/commands/read-stdin.js.map +0 -1
- package/dist/lib/commands/resolve-actor-context.js +0 -70
- package/dist/lib/commands/resolve-actor-context.js.map +0 -1
- package/dist/lib/commands/resolve-input.js +0 -162
- package/dist/lib/commands/resolve-input.js.map +0 -1
- package/dist/lib/commands/responsive-table.js +0 -129
- package/dist/lib/commands/responsive-table.js.map +0 -1
- package/dist/lib/commands/run-on-cloud.js +0 -126
- package/dist/lib/commands/run-on-cloud.js.map +0 -1
- package/dist/lib/commands/storage-size.js +0 -8
- package/dist/lib/commands/storage-size.js.map +0 -1
- package/dist/lib/commands/storages.js +0 -30
- package/dist/lib/commands/storages.js.map +0 -1
- package/dist/lib/consts.js +0 -69
- package/dist/lib/consts.js.map +0 -1
- package/dist/lib/create-utils.js +0 -156
- package/dist/lib/create-utils.js.map +0 -1
- package/dist/lib/exec.js +0 -34
- package/dist/lib/exec.js.map +0 -1
- package/dist/lib/files.js +0 -54
- package/dist/lib/files.js.map +0 -1
- package/dist/lib/hooks/runtimes/javascript.js +0 -86
- package/dist/lib/hooks/runtimes/javascript.js.map +0 -1
- package/dist/lib/hooks/runtimes/python.js +0 -80
- package/dist/lib/hooks/runtimes/python.js.map +0 -1
- package/dist/lib/hooks/runtimes/utils.js +0 -16
- package/dist/lib/hooks/runtimes/utils.js.map +0 -1
- package/dist/lib/hooks/useActorConfig.js +0 -177
- package/dist/lib/hooks/useActorConfig.js.map +0 -1
- package/dist/lib/hooks/useCLIMetadata.js +0 -73
- package/dist/lib/hooks/useCLIMetadata.js.map +0 -1
- package/dist/lib/hooks/useCLIVersionCheck.js +0 -91
- package/dist/lib/hooks/useCLIVersionCheck.js.map +0 -1
- package/dist/lib/hooks/useCommandSuggestions.js +0 -37
- package/dist/lib/hooks/useCommandSuggestions.js.map +0 -1
- package/dist/lib/hooks/useCwdProject.js +0 -174
- package/dist/lib/hooks/useCwdProject.js.map +0 -1
- package/dist/lib/hooks/useLocalState.js +0 -56
- package/dist/lib/hooks/useLocalState.js.map +0 -1
- package/dist/lib/hooks/useModuleVersion.js +0 -103
- package/dist/lib/hooks/useModuleVersion.js.map +0 -1
- package/dist/lib/hooks/useStdin.js +0 -65
- package/dist/lib/hooks/useStdin.js.map +0 -1
- package/dist/lib/input_schema.js +0 -130
- package/dist/lib/input_schema.js.map +0 -1
- package/dist/lib/outputs.js +0 -45
- package/dist/lib/outputs.js.map +0 -1
- package/dist/lib/project_analyzer.js +0 -30
- package/dist/lib/project_analyzer.js.map +0 -1
- package/dist/lib/projects/CrawleeAnalyzer.js +0 -20
- package/dist/lib/projects/CrawleeAnalyzer.js.map +0 -1
- package/dist/lib/projects/OldApifySDKAnalyzer.js +0 -38
- package/dist/lib/projects/OldApifySDKAnalyzer.js.map +0 -1
- package/dist/lib/projects/scrapy/ScrapyProjectAnalyzer.js +0 -73
- package/dist/lib/projects/scrapy/ScrapyProjectAnalyzer.js.map +0 -1
- package/dist/lib/projects/scrapy/Spider.js +0 -13
- package/dist/lib/projects/scrapy/Spider.js.map +0 -1
- package/dist/lib/projects/scrapy/SpiderFileAnalyzer.js +0 -20
- package/dist/lib/projects/scrapy/SpiderFileAnalyzer.js.map +0 -1
- package/dist/lib/projects/scrapy/wrapScrapyProject.js +0 -113
- package/dist/lib/projects/scrapy/wrapScrapyProject.js.map +0 -1
- package/dist/lib/projects/shared.js +0 -13
- package/dist/lib/projects/shared.js.map +0 -1
- package/dist/lib/secrets.js +0 -106
- package/dist/lib/secrets.js.map +0 -1
- package/dist/lib/telemetry.js +0 -86
- package/dist/lib/telemetry.js.map +0 -1
- package/dist/lib/types.js +0 -4
- package/dist/lib/types.js.map +0 -1
- package/dist/lib/utils/cliDebugPrint.js +0 -7
- package/dist/lib/utils/cliDebugPrint.js.map +0 -1
- package/dist/lib/utils/confirm.js +0 -28
- package/dist/lib/utils/confirm.js.map +0 -1
- package/dist/lib/utils.js +0 -457
- package/dist/lib/utils.js.map +0 -1
|
@@ -1,91 +0,0 @@
|
|
|
1
|
-
import chalk from 'chalk';
|
|
2
|
-
import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
|
|
3
|
-
import { Args } from '../../lib/command-framework/args.js';
|
|
4
|
-
import { runActorOrTaskOnCloud, SharedRunOnCloudFlags } from '../../lib/commands/run-on-cloud.js';
|
|
5
|
-
import { simpleLog } from '../../lib/outputs.js';
|
|
6
|
-
import { getLocalUserInfo, getLoggedClientOrThrow } from '../../lib/utils.js';
|
|
7
|
-
export class TaskRunCommand extends ApifyCommand {
|
|
8
|
-
static name = 'run';
|
|
9
|
-
static description = 'Executes predefined Actor task remotely using local key-value store for input.\n' +
|
|
10
|
-
'Customize with --memory and --timeout flags.\n';
|
|
11
|
-
static flags = SharedRunOnCloudFlags('Task');
|
|
12
|
-
static args = {
|
|
13
|
-
taskId: Args.string({
|
|
14
|
-
required: true,
|
|
15
|
-
description: 'Name or ID of the Task to run (e.g. "my-task" or "E2jjCZBezvAZnX8Rb").',
|
|
16
|
-
}),
|
|
17
|
-
};
|
|
18
|
-
async run() {
|
|
19
|
-
const apifyClient = await getLoggedClientOrThrow();
|
|
20
|
-
const userInfo = await getLocalUserInfo();
|
|
21
|
-
const usernameOrId = userInfo.username || userInfo.id;
|
|
22
|
-
const { id: taskId, userFriendlyId, title } = await this.resolveTaskId(apifyClient, usernameOrId);
|
|
23
|
-
const runOpts = {
|
|
24
|
-
waitForFinish: 2, // NOTE: We need to wait some time to Apify open stream and we can create connection
|
|
25
|
-
};
|
|
26
|
-
if (this.flags.build) {
|
|
27
|
-
runOpts.build = this.flags.build;
|
|
28
|
-
}
|
|
29
|
-
if (this.flags.timeout) {
|
|
30
|
-
runOpts.timeout = this.flags.timeout;
|
|
31
|
-
}
|
|
32
|
-
if (this.flags.memory) {
|
|
33
|
-
runOpts.memory = this.flags.memory;
|
|
34
|
-
}
|
|
35
|
-
let url;
|
|
36
|
-
let datasetUrl;
|
|
37
|
-
const iterator = runActorOrTaskOnCloud(apifyClient, {
|
|
38
|
-
actorOrTaskData: {
|
|
39
|
-
id: taskId,
|
|
40
|
-
userFriendlyId,
|
|
41
|
-
title,
|
|
42
|
-
},
|
|
43
|
-
runOptions: runOpts,
|
|
44
|
-
type: 'Task',
|
|
45
|
-
printRunLogs: true,
|
|
46
|
-
});
|
|
47
|
-
for await (const yieldedRun of iterator) {
|
|
48
|
-
url = `https://console.apify.com/actors/${yieldedRun.actId}/runs/${yieldedRun.id}`;
|
|
49
|
-
datasetUrl = `https://console.apify.com/storage/datasets/${yieldedRun.defaultDatasetId}`;
|
|
50
|
-
}
|
|
51
|
-
simpleLog({
|
|
52
|
-
message: [
|
|
53
|
-
'',
|
|
54
|
-
`${chalk.blue('Export results')}: ${datasetUrl}`,
|
|
55
|
-
`${chalk.blue('View on Apify Console')}: ${url}`,
|
|
56
|
-
].join('\n'),
|
|
57
|
-
stdout: true,
|
|
58
|
-
});
|
|
59
|
-
}
|
|
60
|
-
async resolveTaskId(client, usernameOrId) {
|
|
61
|
-
const { taskId } = this.args;
|
|
62
|
-
// Full ID
|
|
63
|
-
if (taskId?.includes('/')) {
|
|
64
|
-
const task = await client.task(taskId).get();
|
|
65
|
-
if (!task) {
|
|
66
|
-
throw new Error(`Cannot find Task with ID '${taskId}' in your account.`);
|
|
67
|
-
}
|
|
68
|
-
return {
|
|
69
|
-
id: task.id,
|
|
70
|
-
userFriendlyId: `${usernameOrId}/${task.name}`,
|
|
71
|
-
title: task.title,
|
|
72
|
-
task,
|
|
73
|
-
};
|
|
74
|
-
}
|
|
75
|
-
// Try fetching task directly by name
|
|
76
|
-
if (taskId) {
|
|
77
|
-
const task = await client.task(`${usernameOrId}/${taskId.toLowerCase()}`).get();
|
|
78
|
-
if (!task) {
|
|
79
|
-
throw new Error(`Cannot find Task with name '${taskId}' in your account.`);
|
|
80
|
-
}
|
|
81
|
-
return {
|
|
82
|
-
id: task.id,
|
|
83
|
-
userFriendlyId: `${usernameOrId}/${task.name}`,
|
|
84
|
-
title: task.title,
|
|
85
|
-
task,
|
|
86
|
-
};
|
|
87
|
-
}
|
|
88
|
-
throw new Error('Please provide a valid Task ID or name.');
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
//# sourceMappingURL=run.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/task/run.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAClG,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,MAAM,OAAO,cAAe,SAAQ,YAAmC;IACtE,MAAM,CAAU,IAAI,GAAG,KAAc,CAAC;IAEtC,MAAM,CAAU,WAAW,GAC1B,kFAAkF;QAClF,gDAAgD,CAAC;IAElD,MAAM,CAAU,KAAK,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAEtD,MAAM,CAAU,IAAI,GAAG;QACtB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;YACnB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,wEAAwE;SACrF,CAAC;KACF,CAAC;IAEF,KAAK,CAAC,GAAG;QACR,MAAM,WAAW,GAAG,MAAM,sBAAsB,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC1C,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,IAAK,QAAQ,CAAC,EAAa,CAAC;QAElE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAElG,MAAM,OAAO,GAAqB;YACjC,aAAa,EAAE,CAAC,EAAE,oFAAoF;SACtG,CAAC;QAEF,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAClC,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QACtC,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QACpC,CAAC;QAED,IAAI,GAAW,CAAC;QAChB,IAAI,UAAkB,CAAC;QAEvB,MAAM,QAAQ,GAAG,qBAAqB,CAAC,WAAW,EAAE;YACnD,eAAe,EAAE;gBAChB,EAAE,EAAE,MAAM;gBACV,cAAc;gBACd,KAAK;aACL;YACD,UAAU,EAAE,OAAO;YACnB,IAAI,EAAE,MAAM;YACZ,YAAY,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,QAAQ,EAAE,CAAC;YACzC,GAAG,GAAG,oCAAoC,UAAU,CAAC,KAAK,SAAS,UAAU,CAAC,EAAE,EAAE,CAAC;YACnF,UAAU,GAAG,8CAA8C,UAAU,CAAC,gBAAgB,EAAE,CAAC;QAC1F,CAAC;QAED,SAAS,CAAC;YACT,OAAO,EAAE;gBACR,EAAE;gBACF,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,UAAW,EAAE;gBACjD,GAAG,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,KAAK,GAAI,EAAE;aACjD,CAAC,IAAI,CAAC,IAAI,CAAC;YACZ,MAAM,EAAE,IAAI;SACZ,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,MAAmB,EAAE,YAAoB;QACpE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAE7B,UAAU;QACV,IAAI,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC;YAC7C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,oBAAoB,CAAC,CAAC;YAC1E,CAAC;YAED,OAAO;gBACN,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,cAAc,EAAE,GAAG,YAAY,IAAI,IAAI,CAAC,IAAI,EAAE;gBAC9C,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI;aACJ,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,IAAI,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;YAEhF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,oBAAoB,CAAC,CAAC;YAC5E,CAAC;YAED,OAAO;gBACN,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,cAAc,EAAE,GAAG,YAAY,IAAI,IAAI,CAAC,IAAI,EAAE;gBAC9C,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI;aACJ,CAAC;QACH,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC5D,CAAC"}
|
package/dist/commands/upgrade.js
DELETED
|
@@ -1,74 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
import process from 'node:process';
|
|
2
|
-
import { validateInputSchema } from '@apify/input_schema';
|
|
3
|
-
import { ApifyCommand } from '../lib/command-framework/apify-command.js';
|
|
4
|
-
import { Args } from '../lib/command-framework/args.js';
|
|
5
|
-
import { LOCAL_CONFIG_PATH } from '../lib/consts.js';
|
|
6
|
-
import { readInputSchema } from '../lib/input_schema.js';
|
|
7
|
-
import { info, success } from '../lib/outputs.js';
|
|
8
|
-
import { Ajv2019 } from '../lib/utils.js';
|
|
9
|
-
export class ValidateInputSchemaCommand extends ApifyCommand {
|
|
10
|
-
static name = 'validate-schema';
|
|
11
|
-
static description = `Validates Actor input schema from one of these locations (in priority order):
|
|
12
|
-
1. Object in '${LOCAL_CONFIG_PATH}' under "input" key
|
|
13
|
-
2. JSON file path in '${LOCAL_CONFIG_PATH}' "input" key
|
|
14
|
-
3. .actor/INPUT_SCHEMA.json
|
|
15
|
-
4. INPUT_SCHEMA.json
|
|
16
|
-
|
|
17
|
-
Optionally specify custom schema path to validate.`;
|
|
18
|
-
static args = {
|
|
19
|
-
path: Args.string({
|
|
20
|
-
required: false,
|
|
21
|
-
description: 'Optional path to your INPUT_SCHEMA.json file. If not provided ./INPUT_SCHEMA.json is used.',
|
|
22
|
-
}),
|
|
23
|
-
};
|
|
24
|
-
static hiddenAliases = ['vis'];
|
|
25
|
-
async run() {
|
|
26
|
-
const { inputSchema, inputSchemaPath } = await readInputSchema({
|
|
27
|
-
forcePath: this.args.path,
|
|
28
|
-
cwd: process.cwd(),
|
|
29
|
-
});
|
|
30
|
-
if (!inputSchema) {
|
|
31
|
-
throw new Error(`Input schema has not been found at ${inputSchemaPath}.`);
|
|
32
|
-
}
|
|
33
|
-
if (inputSchemaPath) {
|
|
34
|
-
info({ message: `Validating input schema stored at ${inputSchemaPath}` });
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
info({ message: `Validating input schema embedded in '${LOCAL_CONFIG_PATH}'` });
|
|
38
|
-
}
|
|
39
|
-
const validator = new Ajv2019({ strict: false });
|
|
40
|
-
validateInputSchema(validator, inputSchema); // This one throws an error in a case of invalid schema.
|
|
41
|
-
success({ message: 'Input schema is valid.' });
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
//# sourceMappingURL=validate-schema.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"validate-schema.js","sourceRoot":"","sources":["../../src/commands/validate-schema.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,MAAM,OAAO,0BAA2B,SAAQ,YAA+C;IAC9F,MAAM,CAAU,IAAI,GAAG,iBAA0B,CAAC;IAElD,MAAM,CAAU,WAAW,GAAG;kBACb,iBAAiB;0BACT,iBAAiB;;;;qDAIU,CAAC;IAErD,MAAM,CAAU,IAAI,GAAG;QACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,4FAA4F;SACzG,CAAC;KACF,CAAC;IAEF,MAAM,CAAU,aAAa,GAAG,CAAC,KAAK,CAAC,CAAC;IAExC,KAAK,CAAC,GAAG;QACR,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,eAAe,CAAC;YAC9D,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACzB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,eAAe,GAAG,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YACrB,IAAI,CAAC,EAAE,OAAO,EAAE,qCAAqC,eAAe,EAAE,EAAE,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,EAAE,OAAO,EAAE,wCAAwC,iBAAiB,GAAG,EAAE,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACjD,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,wDAAwD;QACrG,OAAO,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAC;IAChD,CAAC"}
|
|
@@ -1,256 +0,0 @@
|
|
|
1
|
-
import process from 'node:process';
|
|
2
|
-
import chalk from 'chalk';
|
|
3
|
-
// eslint-disable-next-line import/extensions
|
|
4
|
-
import yargs from 'yargs/yargs';
|
|
5
|
-
import { camelCaseToKebabCase, commandRegistry, kebabCaseString, runCommand, } from '../lib/command-framework/apify-command.js';
|
|
6
|
-
import { renderMainHelpMenu, selectiveRenderHelpForCommand } from '../lib/command-framework/help.js';
|
|
7
|
-
import { readStdin } from '../lib/commands/read-stdin.js';
|
|
8
|
-
import { useCLIMetadata } from '../lib/hooks/useCLIMetadata.js';
|
|
9
|
-
import { shouldSkipVersionCheck } from '../lib/hooks/useCLIVersionCheck.js';
|
|
10
|
-
import { useCommandSuggestions } from '../lib/hooks/useCommandSuggestions.js';
|
|
11
|
-
import { error } from '../lib/outputs.js';
|
|
12
|
-
import { cliDebugPrint } from '../lib/utils/cliDebugPrint.js';
|
|
13
|
-
export const cachedStdinInput = await readStdin();
|
|
14
|
-
export const cli = yargs()
|
|
15
|
-
.version(false)
|
|
16
|
-
.help(false)
|
|
17
|
-
.parserConfiguration({
|
|
18
|
-
// Disables the automatic conversion of `--foo-bar` to `fooBar` (we handle it manually)
|
|
19
|
-
'camel-case-expansion': false,
|
|
20
|
-
// `--foo.bar` is not allowed
|
|
21
|
-
'dot-notation': false,
|
|
22
|
-
// We parse numbers manually
|
|
23
|
-
'parse-numbers': false,
|
|
24
|
-
'parse-positional-numbers': false,
|
|
25
|
-
'short-option-groups': false,
|
|
26
|
-
})
|
|
27
|
-
.strict()
|
|
28
|
-
.locale('en')
|
|
29
|
-
.updateStrings({
|
|
30
|
-
// Keys come from https://github.com/yargs/yargs/blob/main/locales/en.json
|
|
31
|
-
'Not enough arguments following: %s': 'MISSING_ARGUMENT_INPUT %s',
|
|
32
|
-
// @ts-expect-error @types/yargs is outdated -.-
|
|
33
|
-
'Unknown argument: %s': {
|
|
34
|
-
one: 'UNKNOWN_ARGUMENT_INPUT %s',
|
|
35
|
-
other: 'UNKNOWN_ARGUMENTS_INPUT %s',
|
|
36
|
-
},
|
|
37
|
-
// @ts-expect-error @types/yargs is outdated -.-
|
|
38
|
-
'Not enough non-option arguments: got %s, need at least %s': {
|
|
39
|
-
one: 'NOT_ENOUGH_NON_OPTION_ARGUMENTS_INPUT {"got":%s,"need":%s}',
|
|
40
|
-
other: 'NOT_ENOUGH_NON_OPTION_ARGUMENTS_INPUT {"got":%s,"need":%s}',
|
|
41
|
-
},
|
|
42
|
-
'Arguments %s and %s are mutually exclusive': 'ARGUMENTS_ARE_MUTUALLY_EXCLUSIVE_INPUT ["%s","%s"]',
|
|
43
|
-
'Invalid values:': 'INVALID_VALUES_INPUT',
|
|
44
|
-
'Argument: %s, Given: %s, Choices: %s': 'INVALID_ARGUMENT_OPTION {"argument":"%s","given":%s,"choices":[%s]}',
|
|
45
|
-
})
|
|
46
|
-
.option('help', {
|
|
47
|
-
boolean: true,
|
|
48
|
-
describe: 'Shows this help message.',
|
|
49
|
-
alias: 'h',
|
|
50
|
-
});
|
|
51
|
-
// @ts-expect-error @types/yargs is outdated -.-
|
|
52
|
-
cli.usageConfiguration({ 'hide-types': true });
|
|
53
|
-
cli.middleware(async (argv) => {
|
|
54
|
-
const UpgradeCommand = commandRegistry.get('upgrade');
|
|
55
|
-
const checkVersionsCommandIds = [UpgradeCommand.name, ...(UpgradeCommand.aliases ?? [])];
|
|
56
|
-
if (checkVersionsCommandIds.some((id) => argv._[0] === id)) {
|
|
57
|
-
// Skip running the middleware
|
|
58
|
-
return;
|
|
59
|
-
}
|
|
60
|
-
// If the user has configured the `APIFY_CLI_SKIP_UPDATE_CHECK` env variable then skip the check.
|
|
61
|
-
if (shouldSkipVersionCheck()) {
|
|
62
|
-
return;
|
|
63
|
-
}
|
|
64
|
-
await runCommand(UpgradeCommand, {});
|
|
65
|
-
});
|
|
66
|
-
const cliMetadata = useCLIMetadata();
|
|
67
|
-
export function printCLIVersionAndExitIfFlagUsed(parsed) {
|
|
68
|
-
if (parsed.v === true || parsed.version === true) {
|
|
69
|
-
console.log(cliMetadata.fullVersionString);
|
|
70
|
-
process.exit(0);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
export function printHelpAndExitIfFlagUsedOrNoCommandPassed(parsed, entrypoint) {
|
|
74
|
-
if (parsed.help === true || parsed.h === true || parsed._.length === 0) {
|
|
75
|
-
console.log(renderMainHelpMenu(entrypoint));
|
|
76
|
-
process.exit(0);
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
export async function runCLI(entrypoint) {
|
|
80
|
-
cliDebugPrint('CLIMetadata', {
|
|
81
|
-
...cliMetadata,
|
|
82
|
-
fullVersionString: cliMetadata.fullVersionString,
|
|
83
|
-
argv: process.argv,
|
|
84
|
-
cwd: process.cwd(),
|
|
85
|
-
execPath: process.execPath,
|
|
86
|
-
});
|
|
87
|
-
await cli.parse(process.argv.slice(2), {}, (rawError, parsed) => {
|
|
88
|
-
if (rawError && parsed._.length > 0) {
|
|
89
|
-
cliDebugPrint('RunCLIError', { type: 'parsed', error: rawError?.message, parsed });
|
|
90
|
-
const errorMessageSplit = rawError.message.split(' ').map((part) => part.trim());
|
|
91
|
-
const possibleCommands = [
|
|
92
|
-
//
|
|
93
|
-
`${parsed._[0]} ${parsed._[1]}`,
|
|
94
|
-
`${parsed._[0]}`,
|
|
95
|
-
];
|
|
96
|
-
const command = commandRegistry.get(possibleCommands.find((cmd) => commandRegistry.has(cmd)) ?? '');
|
|
97
|
-
if (!command) {
|
|
98
|
-
const closestMatches = useCommandSuggestions(String(parsed._[0]));
|
|
99
|
-
let message = chalk.gray(`Command ${chalk.whiteBright(parsed._[0])} not found`);
|
|
100
|
-
if (closestMatches.length) {
|
|
101
|
-
message += '\n ';
|
|
102
|
-
message += chalk.gray(`Did you mean: ${closestMatches.map((cmd) => chalk.whiteBright(cmd)).join(', ')}?`);
|
|
103
|
-
}
|
|
104
|
-
error({ message });
|
|
105
|
-
return;
|
|
106
|
-
}
|
|
107
|
-
const commandFlags = Object.entries(command.flags ?? {})
|
|
108
|
-
.filter(([, flag]) => typeof flag !== 'string')
|
|
109
|
-
.map(([flagName, flag]) => {
|
|
110
|
-
const castedFlag = flag;
|
|
111
|
-
const flagKey = kebabCaseString(camelCaseToKebabCase(flagName)).toLowerCase();
|
|
112
|
-
return {
|
|
113
|
-
flagKey,
|
|
114
|
-
char: castedFlag.char,
|
|
115
|
-
aliases: castedFlag.aliases?.map((alias) => kebabCaseString(camelCaseToKebabCase(alias)).toLowerCase()),
|
|
116
|
-
matches(otherFlagKey) {
|
|
117
|
-
return (this.flagKey === otherFlagKey ||
|
|
118
|
-
this.char === otherFlagKey ||
|
|
119
|
-
this.aliases?.some((aliasedFlag) => aliasedFlag === otherFlagKey));
|
|
120
|
-
},
|
|
121
|
-
};
|
|
122
|
-
});
|
|
123
|
-
switch (errorMessageSplit[0]) {
|
|
124
|
-
case 'MISSING_ARGUMENT_INPUT': {
|
|
125
|
-
for (const flag of commandFlags) {
|
|
126
|
-
if (flag.matches(errorMessageSplit[1])) {
|
|
127
|
-
error({
|
|
128
|
-
message: `Flag --${flag.flagKey} expects a value`,
|
|
129
|
-
});
|
|
130
|
-
return;
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
break;
|
|
134
|
-
}
|
|
135
|
-
case 'ARGUMENTS_ARE_MUTUALLY_EXCLUSIVE_INPUT': {
|
|
136
|
-
const args = JSON.parse(errorMessageSplit[1]);
|
|
137
|
-
error({
|
|
138
|
-
message: [
|
|
139
|
-
`The following errors occurred:`,
|
|
140
|
-
...args
|
|
141
|
-
.sort((a, b) => a.localeCompare(b))
|
|
142
|
-
.map((arg) => {
|
|
143
|
-
const value = parsed[arg];
|
|
144
|
-
const isBoolean = typeof value === 'boolean';
|
|
145
|
-
const argRepresentation = isBoolean ? `--${arg}` : `--${arg}=${value}`;
|
|
146
|
-
return ` ${chalk.red('>')} ${chalk.gray(`${argRepresentation} cannot also be provided when using ${args
|
|
147
|
-
.filter((a) => a !== arg)
|
|
148
|
-
.map((a) => `--${a}`)
|
|
149
|
-
.join(', ')}`)}`;
|
|
150
|
-
}),
|
|
151
|
-
` ${chalk.red('>')} See more help with --help`,
|
|
152
|
-
].join('\n'),
|
|
153
|
-
});
|
|
154
|
-
break;
|
|
155
|
-
}
|
|
156
|
-
case 'UNKNOWN_ARGUMENT_INPUT':
|
|
157
|
-
case 'UNKNOWN_ARGUMENTS_INPUT': {
|
|
158
|
-
const nonexistentType = (() => {
|
|
159
|
-
if (commandFlags.length) {
|
|
160
|
-
return 'flag';
|
|
161
|
-
}
|
|
162
|
-
if (command.subcommands?.length) {
|
|
163
|
-
return 'subcommand';
|
|
164
|
-
}
|
|
165
|
-
return 'argument';
|
|
166
|
-
})();
|
|
167
|
-
const nonexistentRepresentation = (() => {
|
|
168
|
-
// Rudimentary as heck, we cannot infer if the flag is provided as `-f` or `-ff` or `--flag`, etc.
|
|
169
|
-
if (nonexistentType === 'flag') {
|
|
170
|
-
return errorMessageSplit[1].length === 1
|
|
171
|
-
? `-${errorMessageSplit[1]}`
|
|
172
|
-
: `--${errorMessageSplit[1]}`;
|
|
173
|
-
}
|
|
174
|
-
return errorMessageSplit[1];
|
|
175
|
-
})();
|
|
176
|
-
const closestMatches = nonexistentType === 'subcommand'
|
|
177
|
-
? useCommandSuggestions(`${parsed._[0]} ${errorMessageSplit[1]}`)
|
|
178
|
-
: [];
|
|
179
|
-
const messageParts = [
|
|
180
|
-
chalk.gray(`Nonexistent ${nonexistentType}: ${chalk.whiteBright(nonexistentRepresentation)}`),
|
|
181
|
-
];
|
|
182
|
-
if (closestMatches.length) {
|
|
183
|
-
messageParts.push(chalk.gray(` Did you mean: ${closestMatches.map((cmd) => chalk.whiteBright(cmd)).join(', ')}?`));
|
|
184
|
-
}
|
|
185
|
-
error({
|
|
186
|
-
message: [
|
|
187
|
-
...messageParts,
|
|
188
|
-
'',
|
|
189
|
-
selectiveRenderHelpForCommand(command, {
|
|
190
|
-
showUsageString: true,
|
|
191
|
-
showSubcommands: true,
|
|
192
|
-
}),
|
|
193
|
-
].join('\n'),
|
|
194
|
-
});
|
|
195
|
-
break;
|
|
196
|
-
}
|
|
197
|
-
// @ts-expect-error Intentional fallthrough
|
|
198
|
-
case 'INVALID_VALUES_INPUT': {
|
|
199
|
-
if (errorMessageSplit[2] === 'INVALID_ARGUMENT_OPTION') {
|
|
200
|
-
const jsonPart = errorMessageSplit.slice(3).join(' ');
|
|
201
|
-
try {
|
|
202
|
-
const json = JSON.parse(jsonPart);
|
|
203
|
-
const type = commandFlags.some((flag) => flag.matches(json.argument)) ? 'flag' : 'argument';
|
|
204
|
-
const representation = type === 'flag' ? `--${json.argument}` : json.argument;
|
|
205
|
-
error({
|
|
206
|
-
message: [
|
|
207
|
-
`Expected ${representation} to have one of the following values: ${json.choices.join(', ')}`,
|
|
208
|
-
` ${chalk.red('>')} See more help with --help`,
|
|
209
|
-
].join('\n'),
|
|
210
|
-
});
|
|
211
|
-
break;
|
|
212
|
-
}
|
|
213
|
-
catch {
|
|
214
|
-
cliDebugPrint('RunCLIError', {
|
|
215
|
-
type: 'parse_error_invalid_choices',
|
|
216
|
-
error: rawError.message,
|
|
217
|
-
parsed,
|
|
218
|
-
jsonPart,
|
|
219
|
-
});
|
|
220
|
-
// fallthrough
|
|
221
|
-
}
|
|
222
|
-
}
|
|
223
|
-
// fallthrough
|
|
224
|
-
}
|
|
225
|
-
default: {
|
|
226
|
-
cliDebugPrint('RunCLIError', { type: 'unhandled', error: rawError.message, parsed });
|
|
227
|
-
console.error([
|
|
228
|
-
'The CLI encountered an unhandled argument parsing error!',
|
|
229
|
-
`Please report this issue at https://github.com/apify/apify-cli/issues, and provide the following information:`,
|
|
230
|
-
'',
|
|
231
|
-
`- Stack:\n${rawError.stack}`,
|
|
232
|
-
'',
|
|
233
|
-
'- Arguments (!!!only provide these as is if there is no sensitive information!!!):',
|
|
234
|
-
` ${JSON.stringify(process.argv.slice(2))}`,
|
|
235
|
-
'',
|
|
236
|
-
`- CLI version: \`${cliMetadata.fullVersionString}\``,
|
|
237
|
-
`- CLI debug logs (process.env.APIFY_CLI_DEBUG): ${process.env.APIFY_CLI_DEBUG ? 'Enabled' : 'Disabled'}`,
|
|
238
|
-
`- Stdin data? ${cachedStdinInput ? 'Yes' : 'No'}`,
|
|
239
|
-
].join('\n'));
|
|
240
|
-
process.exit(1);
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
|
-
}
|
|
244
|
-
else {
|
|
245
|
-
handleParseResults(parsed, entrypoint);
|
|
246
|
-
}
|
|
247
|
-
});
|
|
248
|
-
}
|
|
249
|
-
export function handleParseResults(parsed, entrypoint) {
|
|
250
|
-
if (parsed._.length === 0) {
|
|
251
|
-
printCLIVersionAndExitIfFlagUsed(parsed);
|
|
252
|
-
printHelpAndExitIfFlagUsedOrNoCommandPassed(parsed, entrypoint);
|
|
253
|
-
}
|
|
254
|
-
// console.log({ unhandledArgs: parsed });
|
|
255
|
-
}
|
|
256
|
-
//# sourceMappingURL=_shared.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"_shared.js","sourceRoot":"","sources":["../../src/entrypoints/_shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env node
|
|
2
|
-
import { satisfies } from 'semver';
|
|
3
|
-
import { actorCommands } from '../commands/_register.js';
|
|
4
|
-
import { SUPPORTED_NODEJS_VERSION } from '../lib/consts.js';
|
|
5
|
-
import { error } from '../lib/outputs.js';
|
|
6
|
-
import { cli, runCLI } from './_shared.js';
|
|
7
|
-
cli.scriptName('actor');
|
|
8
|
-
if (!satisfies(process.version, SUPPORTED_NODEJS_VERSION)) {
|
|
9
|
-
error({
|
|
10
|
-
message: `Actor CLI requires Node.js version ${SUPPORTED_NODEJS_VERSION}. Your current version is ${process.version}.`,
|
|
11
|
-
});
|
|
12
|
-
process.exit(1);
|
|
13
|
-
}
|
|
14
|
-
// Register all commands
|
|
15
|
-
for (const CommandClass of actorCommands) {
|
|
16
|
-
CommandClass.registerCommand('actor', cli);
|
|
17
|
-
}
|
|
18
|
-
await runCLI('actor');
|
|
19
|
-
//# sourceMappingURL=actor.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"actor.js","sourceRoot":"","sources":["../../src/entrypoints/actor.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,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAExB,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"}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env node
|
|
2
|
-
import { satisfies } from 'semver';
|
|
3
|
-
import { apifyCommands } from '../commands/_register.js';
|
|
4
|
-
import { SUPPORTED_NODEJS_VERSION } from '../lib/consts.js';
|
|
5
|
-
import { error } from '../lib/outputs.js';
|
|
6
|
-
import { cli, runCLI } from './_shared.js';
|
|
7
|
-
if (!satisfies(process.version, SUPPORTED_NODEJS_VERSION)) {
|
|
8
|
-
error({
|
|
9
|
-
message: `Apify CLI requires Node.js version ${SUPPORTED_NODEJS_VERSION}. Your current version is ${process.version}.`,
|
|
10
|
-
});
|
|
11
|
-
process.exit(1);
|
|
12
|
-
}
|
|
13
|
-
// Register all commands
|
|
14
|
-
for (const CommandClass of apifyCommands) {
|
|
15
|
-
CommandClass.registerCommand('apify', cli);
|
|
16
|
-
}
|
|
17
|
-
await runCLI('apify');
|
|
18
|
-
//# sourceMappingURL=apify.js.map
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
package/dist/index.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC"}
|
package/dist/lib/actor.js
DELETED
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
import process from 'node:process';
|
|
2
|
-
import { pipeline } from 'node:stream/promises';
|
|
3
|
-
import { MemoryStorage } from '@crawlee/memory-storage';
|
|
4
|
-
import { ApifyClient } from 'apify-client';
|
|
5
|
-
// Will this work, who knows
|
|
6
|
-
import ow from 'ow';
|
|
7
|
-
import { ACTOR_ENV_VARS, APIFY_ENV_VARS, KEY_VALUE_STORE_KEYS, LOCAL_ACTOR_ENV_VARS } from '@apify/consts';
|
|
8
|
-
import { getApifyClientOptions, getLocalStorageDir, getLocalUserInfo } from './utils.js';
|
|
9
|
-
export const APIFY_STORAGE_TYPES = {
|
|
10
|
-
KEY_VALUE_STORE: 'KEY_VALUE_STORE',
|
|
11
|
-
DATASET: 'DATASET',
|
|
12
|
-
REQUEST_QUEUE: 'REQUEST_QUEUE',
|
|
13
|
-
};
|
|
14
|
-
/**
|
|
15
|
-
* Returns Apify token from environment variable or local auth file.
|
|
16
|
-
* @returns Apify token
|
|
17
|
-
*/
|
|
18
|
-
export const getApifyTokenFromEnvOrAuthFile = async () => {
|
|
19
|
-
const apifyToken = process.env[APIFY_ENV_VARS.TOKEN];
|
|
20
|
-
if (apifyToken) {
|
|
21
|
-
return apifyToken;
|
|
22
|
-
}
|
|
23
|
-
const localUserInfo = await getLocalUserInfo();
|
|
24
|
-
if (!localUserInfo || !localUserInfo.token) {
|
|
25
|
-
throw new Error('Apify token is not set. Please set it using the environment variable APIFY_TOKEN or apify login command.');
|
|
26
|
-
}
|
|
27
|
-
return localUserInfo.token;
|
|
28
|
-
};
|
|
29
|
-
/**
|
|
30
|
-
* Returns instance of ApifyClient or ApifyStorageLocal based on environment variables.
|
|
31
|
-
* @param options - ApifyClient options
|
|
32
|
-
* @param forceCloud - If true then ApifyClient will be returned.
|
|
33
|
-
*/
|
|
34
|
-
export const getApifyStorageClient = async (options = {}, forceCloud = Reflect.has(process.env, APIFY_ENV_VARS.IS_AT_HOME)) => {
|
|
35
|
-
const storageDir = getLocalStorageDir();
|
|
36
|
-
if (storageDir && !forceCloud) {
|
|
37
|
-
return new MemoryStorage({
|
|
38
|
-
localDataDirectory: storageDir,
|
|
39
|
-
...options,
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
const apifyToken = await getApifyTokenFromEnvOrAuthFile();
|
|
43
|
-
return new ApifyClient({
|
|
44
|
-
...getApifyClientOptions(apifyToken),
|
|
45
|
-
...options,
|
|
46
|
-
});
|
|
47
|
-
};
|
|
48
|
-
/**
|
|
49
|
-
* Returns default storage id based on environment variables.
|
|
50
|
-
* Throws error if not set and Actor running on platform.
|
|
51
|
-
* @param storeType
|
|
52
|
-
*/
|
|
53
|
-
export const getDefaultStorageId = (storeType) => {
|
|
54
|
-
const envVarName = ACTOR_ENV_VARS[`DEFAULT_${storeType}_ID`];
|
|
55
|
-
return process.env[envVarName] || LOCAL_ACTOR_ENV_VARS[envVarName];
|
|
56
|
-
};
|
|
57
|
-
/**
|
|
58
|
-
* Outputs value of record into standard output of the command.
|
|
59
|
-
* @param key - Record key
|
|
60
|
-
*/
|
|
61
|
-
export const outputRecordFromDefaultStore = async (key) => {
|
|
62
|
-
ow(key, ow.string);
|
|
63
|
-
const apifyClient = await getApifyStorageClient();
|
|
64
|
-
const defaultStoreId = getDefaultStorageId(APIFY_STORAGE_TYPES.KEY_VALUE_STORE);
|
|
65
|
-
const record = await apifyClient.keyValueStore(defaultStoreId).getRecord(key, { stream: true });
|
|
66
|
-
// If record does not exist return empty string.
|
|
67
|
-
if (!record)
|
|
68
|
-
return;
|
|
69
|
-
await pipeline(record.value, process.stdout, { end: false });
|
|
70
|
-
};
|
|
71
|
-
export const outputInputFromDefaultStore = async () => {
|
|
72
|
-
return outputRecordFromDefaultStore(process.env[ACTOR_ENV_VARS.INPUT_KEY] || KEY_VALUE_STORE_KEYS.INPUT);
|
|
73
|
-
};
|
|
74
|
-
//# sourceMappingURL=actor.js.map
|
package/dist/lib/actor.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"actor.js","sourceRoot":"","sources":["../../src/lib/actor.ts"],"names":[],"mappings":"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"}
|