apify-cli 1.0.0-beta.11 → 1.0.0-beta.111
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 +200 -0
- package/README.md +124 -76
- package/bin/dev.js +7 -2
- package/bin/dev.sh +4 -0
- package/bin/run.js +7 -0
- package/dist/.tsbuildinfo +1 -1
- package/dist/commands/actor/get-value.d.ts +1 -1
- package/dist/commands/actor/push-data.d.ts +1 -1
- package/dist/commands/actor/push-data.js +2 -2
- package/dist/commands/actor/set-value.d.ts +3 -3
- package/dist/commands/actor/set-value.js +3 -3
- package/dist/commands/actor/set-value.js.map +1 -1
- package/dist/commands/call.d.ts +7 -6
- package/dist/commands/call.d.ts.map +1 -1
- package/dist/commands/call.js +56 -90
- package/dist/commands/call.js.map +1 -1
- package/dist/commands/check-version.d.ts +1 -1
- package/dist/commands/create.d.ts +5 -4
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/create.js +33 -18
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/edit-input-schema.d.ts +1 -1
- package/dist/commands/edit-input-schema.js +15 -15
- package/dist/commands/edit-input-schema.js.map +1 -1
- package/dist/commands/init-wrap-scrapy.d.ts +1 -1
- package/dist/commands/init-wrap-scrapy.js +1 -1
- package/dist/commands/init-wrap-scrapy.js.map +1 -1
- package/dist/commands/init.d.ts +2 -2
- package/dist/commands/init.js +5 -5
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/login.d.ts +2 -1
- package/dist/commands/login.d.ts.map +1 -1
- package/dist/commands/login.js +144 -13
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +1 -1
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/pull.d.ts +2 -2
- package/dist/commands/pull.js +2 -2
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.d.ts +7 -7
- package/dist/commands/push.d.ts.map +1 -1
- package/dist/commands/push.js +51 -22
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/run.d.ts +5 -4
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +101 -35
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/secrets/add.d.ts +2 -2
- package/dist/commands/secrets/index.js +1 -1
- package/dist/commands/secrets/rm.d.ts +1 -1
- package/dist/commands/task/index.d.ts +6 -0
- package/dist/commands/task/index.d.ts.map +1 -0
- package/dist/commands/task/index.js +13 -0
- package/dist/commands/task/index.js.map +1 -0
- package/dist/commands/task/run.d.ts +16 -0
- package/dist/commands/task/run.d.ts.map +1 -0
- package/dist/commands/task/run.js +91 -0
- package/dist/commands/task/run.js.map +1 -0
- package/dist/commands/{vis.d.ts → validate-schema.d.ts} +3 -2
- package/dist/commands/validate-schema.d.ts.map +1 -0
- package/dist/commands/{vis.js → validate-schema.js} +10 -4
- package/dist/commands/validate-schema.js.map +1 -0
- package/dist/hooks/deprecations.d.ts +4 -0
- package/dist/hooks/deprecations.d.ts.map +1 -0
- package/dist/hooks/deprecations.js +18 -0
- package/dist/hooks/deprecations.js.map +1 -0
- package/dist/lib/actor.d.ts +1 -1
- package/dist/lib/actor.d.ts.map +1 -1
- package/dist/lib/actor.js +2 -2
- package/dist/lib/actor.js.map +1 -1
- package/dist/lib/apify_command.d.ts +0 -1
- package/dist/lib/apify_command.d.ts.map +1 -1
- package/dist/lib/commands/run-on-cloud.d.ts +19 -0
- package/dist/lib/commands/run-on-cloud.d.ts.map +1 -0
- package/dist/lib/commands/run-on-cloud.js +90 -0
- package/dist/lib/commands/run-on-cloud.js.map +1 -0
- package/dist/lib/consts.d.ts +8 -0
- package/dist/lib/consts.d.ts.map +1 -1
- package/dist/lib/consts.js +10 -0
- package/dist/lib/consts.js.map +1 -1
- package/dist/lib/create-utils.d.ts.map +1 -1
- package/dist/lib/create-utils.js +1 -1
- package/dist/lib/create-utils.js.map +1 -1
- package/dist/lib/exec.d.ts +0 -1
- package/dist/lib/exec.d.ts.map +1 -1
- package/dist/lib/exec.js +6 -1
- package/dist/lib/exec.js.map +1 -1
- package/dist/lib/files.d.ts.map +1 -1
- package/dist/lib/input_schema.d.ts +1 -1
- package/dist/lib/input_schema.d.ts.map +1 -1
- package/dist/lib/input_schema.js +1 -1
- package/dist/lib/input_schema.js.map +1 -1
- package/dist/lib/local_state.d.ts.map +1 -1
- package/dist/lib/outputs.d.ts +18 -6
- package/dist/lib/outputs.d.ts.map +1 -1
- package/dist/lib/outputs.js +43 -18
- package/dist/lib/outputs.js.map +1 -1
- package/dist/lib/projects/scrapy/wrapScrapyProject.js +3 -3
- package/dist/lib/projects/scrapy/wrapScrapyProject.js.map +1 -1
- package/dist/lib/secrets.d.ts.map +1 -1
- package/dist/lib/secrets.js +3 -3
- package/dist/lib/secrets.js.map +1 -1
- package/dist/lib/telemetry.d.ts.map +1 -1
- package/dist/lib/telemetry.js +1 -1
- package/dist/lib/telemetry.js.map +1 -1
- package/dist/lib/utils.d.ts +6 -10
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +36 -44
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/version_check.js +7 -7
- package/dist/lib/version_check.js.map +1 -1
- package/oclif.manifest.json +123 -37
- package/package.json +148 -141
- package/dist/commands/login-new.d.ts +0 -10
- package/dist/commands/login-new.d.ts.map +0 -1
- package/dist/commands/login-new.js +0 -166
- package/dist/commands/login-new.js.map +0 -1
- package/dist/commands/vis.d.ts.map +0 -1
- package/dist/commands/vis.js.map +0 -1
package/dist/commands/push.js
CHANGED
|
@@ -8,7 +8,7 @@ import inquirer from 'inquirer';
|
|
|
8
8
|
import isCI from 'is-ci';
|
|
9
9
|
import open from 'open';
|
|
10
10
|
import { ApifyCommand } from '../lib/apify_command.js';
|
|
11
|
-
import { LOCAL_CONFIG_PATH, UPLOADS_STORE_NAME } from '../lib/consts.js';
|
|
11
|
+
import { CommandExitCodes, DEPRECATED_LOCAL_CONFIG_NAME, LOCAL_CONFIG_PATH, UPLOADS_STORE_NAME } from '../lib/consts.js';
|
|
12
12
|
import { sumFilesSizeInBytes } from '../lib/files.js';
|
|
13
13
|
import { error, info, link, run, success, warning } from '../lib/outputs.js';
|
|
14
14
|
import { transformEnvToEnvVars } from '../lib/secrets.js';
|
|
@@ -22,7 +22,7 @@ const DEFAULT_RUN_OPTIONS = {
|
|
|
22
22
|
const DEFAULT_ACTOR_VERSION_NUMBER = '0.0';
|
|
23
23
|
// It would be better to use `version-0.0` or similar,
|
|
24
24
|
// or even have no default tag, but the platform complains when
|
|
25
|
-
//
|
|
25
|
+
// Actor does not have a build with a `latest` tag, so until
|
|
26
26
|
// that changes, we have to add it.
|
|
27
27
|
const DEFAULT_BUILD_TAG = 'latest';
|
|
28
28
|
export class PushCommand extends ApifyCommand {
|
|
@@ -32,6 +32,33 @@ export class PushCommand extends ApifyCommand {
|
|
|
32
32
|
}
|
|
33
33
|
async run() {
|
|
34
34
|
const cwd = process.cwd();
|
|
35
|
+
// Validate there are files before rest of the logic
|
|
36
|
+
const filePathsToPush = await getActorLocalFilePaths(cwd);
|
|
37
|
+
if (!filePathsToPush.length) {
|
|
38
|
+
error({ message: 'You need to call this command from a folder that has an Actor in it!' });
|
|
39
|
+
process.exitCode = CommandExitCodes.NoFilesToPush;
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
if (
|
|
43
|
+
// Check that some of these files exist, cuz otherwise we cannot do much
|
|
44
|
+
![
|
|
45
|
+
// old apify project
|
|
46
|
+
DEPRECATED_LOCAL_CONFIG_NAME,
|
|
47
|
+
// new apify project
|
|
48
|
+
'actor.json',
|
|
49
|
+
'.actor/actor.json',
|
|
50
|
+
// The .actor folder existing in general
|
|
51
|
+
'.actor',
|
|
52
|
+
].some((filePath) => filePathsToPush.some((fp) => fp === filePath || fp.startsWith(filePath)))) {
|
|
53
|
+
error({
|
|
54
|
+
message: [
|
|
55
|
+
'A valid Actor could not be found in the current directory. Please make sure you are in the correct directory.',
|
|
56
|
+
'You can also turn this directory into an Actor by running `apify init`.',
|
|
57
|
+
].join('\n'),
|
|
58
|
+
});
|
|
59
|
+
process.exitCode = CommandExitCodes.NoFilesToPush;
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
35
62
|
const apifyClient = await getLoggedClientOrThrow();
|
|
36
63
|
const localConfig = await getLocalConfigOrThrow(cwd);
|
|
37
64
|
const userInfo = await getLocalUserInfo();
|
|
@@ -40,7 +67,7 @@ export class PushCommand extends ApifyCommand {
|
|
|
40
67
|
let actorId;
|
|
41
68
|
let actor;
|
|
42
69
|
let isActorCreatedNow = false;
|
|
43
|
-
// User can override
|
|
70
|
+
// User can override Actor version and build tag, attributes in localConfig will remain same.
|
|
44
71
|
const version = this.flags.version || this.flags.versionNumber || localConfig?.version || DEFAULT_ACTOR_VERSION_NUMBER;
|
|
45
72
|
let buildTag = this.flags.buildTag || localConfig.buildTag;
|
|
46
73
|
// We can't add the default build tag to everything. If a user creates a new
|
|
@@ -53,8 +80,8 @@ export class PushCommand extends ApifyCommand {
|
|
|
53
80
|
const waitForFinishMillis = Number.isNaN(this.flags.waitForFinish)
|
|
54
81
|
? undefined
|
|
55
82
|
: Number.parseInt(this.flags.waitForFinish, 10) * 1000;
|
|
56
|
-
// User can override actorId of pushing
|
|
57
|
-
// It causes that we push
|
|
83
|
+
// User can override actorId of pushing Actor.
|
|
84
|
+
// It causes that we push Actor to this id but attributes in localConfig will remain same.
|
|
58
85
|
const forceActorId = this.args.actorId;
|
|
59
86
|
if (forceActorId) {
|
|
60
87
|
actor = (await apifyClient.actor(forceActorId).get());
|
|
@@ -86,11 +113,10 @@ export class PushCommand extends ApifyCommand {
|
|
|
86
113
|
actor = await apifyClient.actors().create(newActor);
|
|
87
114
|
actorId = actor.id;
|
|
88
115
|
isActorCreatedNow = true;
|
|
89
|
-
info(`Created Actor with name ${localConfig.name} on Apify.`);
|
|
116
|
+
info({ message: `Created Actor with name ${localConfig.name} on Apify.` });
|
|
90
117
|
}
|
|
91
118
|
}
|
|
92
|
-
info(`Deploying Actor '${localConfig.name}' to Apify.`);
|
|
93
|
-
const filePathsToPush = await getActorLocalFilePaths(cwd);
|
|
119
|
+
info({ message: `Deploying Actor '${localConfig.name}' to Apify.` });
|
|
94
120
|
const filesSize = await sumFilesSizeInBytes(filePathsToPush, cwd);
|
|
95
121
|
const actorClient = apifyClient.actor(actorId);
|
|
96
122
|
let sourceType;
|
|
@@ -117,7 +143,7 @@ Skipping push. Use --force to override.`);
|
|
|
117
143
|
}
|
|
118
144
|
else {
|
|
119
145
|
// Create zip
|
|
120
|
-
run('Zipping Actor files');
|
|
146
|
+
run({ message: 'Zipping Actor files' });
|
|
121
147
|
await createActZip(TEMP_ZIP_FILE_NAME, filePathsToPush, cwd);
|
|
122
148
|
// Upload it to Apify.keyValueStores
|
|
123
149
|
const store = await apifyClient.keyValueStores().getOrCreate(UPLOADS_STORE_NAME);
|
|
@@ -133,7 +159,7 @@ Skipping push. Use --force to override.`);
|
|
|
133
159
|
tarballUrl = `${apifyClient.baseUrl}/key-value-stores/${store.id}/records/${key}?disableRedirect=true`;
|
|
134
160
|
sourceType = ACTOR_SOURCE_TYPES.TARBALL;
|
|
135
161
|
}
|
|
136
|
-
// Update
|
|
162
|
+
// Update Actor version
|
|
137
163
|
const actorCurrentVersion = await actorClient.version(version).get();
|
|
138
164
|
const envVars = localConfig.environmentVariables
|
|
139
165
|
? transformEnvToEnvVars(localConfig.environmentVariables)
|
|
@@ -142,7 +168,7 @@ Skipping push. Use --force to override.`);
|
|
|
142
168
|
const actorVersionModifier = { tarballUrl, sourceFiles, buildTag, sourceType, envVars };
|
|
143
169
|
// TODO: fix this type too -.-
|
|
144
170
|
await actorClient.version(version).update(actorVersionModifier);
|
|
145
|
-
run(`Updated version ${version} for Actor ${actor.name}.`);
|
|
171
|
+
run({ message: `Updated version ${version} for Actor ${actor.name}.` });
|
|
146
172
|
}
|
|
147
173
|
else {
|
|
148
174
|
const actorNewVersion = {
|
|
@@ -156,10 +182,10 @@ Skipping push. Use --force to override.`);
|
|
|
156
182
|
await actorClient.versions().create({
|
|
157
183
|
...actorNewVersion,
|
|
158
184
|
});
|
|
159
|
-
run(`Created version ${version} for Actor ${actor.name}.`);
|
|
185
|
+
run({ message: `Created version ${version} for Actor ${actor.name}.` });
|
|
160
186
|
}
|
|
161
|
-
// Build
|
|
162
|
-
run(`Building Actor ${actor.name}`);
|
|
187
|
+
// Build Actor on Apify and wait for build to finish
|
|
188
|
+
run({ message: `Building Actor ${actor.name}` });
|
|
163
189
|
let build = await actorClient.build(version, {
|
|
164
190
|
useCache: true,
|
|
165
191
|
waitForFinish: 2, // NOTE: We need to wait some time to Apify open stream and we can create connection
|
|
@@ -168,11 +194,11 @@ Skipping push. Use --force to override.`);
|
|
|
168
194
|
await outputJobLog(build, waitForFinishMillis);
|
|
169
195
|
}
|
|
170
196
|
catch (err) {
|
|
171
|
-
warning('Can not get log:');
|
|
197
|
+
warning({ message: 'Can not get log:' });
|
|
172
198
|
console.error(err);
|
|
173
199
|
}
|
|
174
200
|
build = (await apifyClient.build(build.id).get());
|
|
175
|
-
link('Actor build detail', `https://console.apify.com${redirectUrlPart}/actors/${build.actId}#/builds/${build.buildNumber}`);
|
|
201
|
+
link({ message: 'Actor build detail', url: `https://console.apify.com${redirectUrlPart}/actors/${build.actId}#/builds/${build.buildNumber}` });
|
|
176
202
|
// Disable open browser on CI, or if user passed --no-prompt flag
|
|
177
203
|
if (!isCI && !this.flags.noPrompt) {
|
|
178
204
|
const shouldOpenBrowser = await inquirer.prompt([
|
|
@@ -183,26 +209,29 @@ Skipping push. Use --force to override.`);
|
|
|
183
209
|
}
|
|
184
210
|
}
|
|
185
211
|
if (build.status === ACTOR_JOB_STATUSES.SUCCEEDED) {
|
|
186
|
-
success('Actor was deployed to Apify cloud and built there.');
|
|
212
|
+
success({ message: 'Actor was deployed to Apify cloud and built there.' });
|
|
187
213
|
// @ts-expect-error FIX THESE TYPES 😢
|
|
188
214
|
}
|
|
189
215
|
else if (build.status === ACTOR_JOB_STATUSES.READY) {
|
|
190
|
-
warning('Build is waiting for allocation.');
|
|
216
|
+
warning({ message: 'Build is waiting for allocation.' });
|
|
191
217
|
// @ts-expect-error FIX THESE TYPES 😢
|
|
192
218
|
}
|
|
193
219
|
else if (build.status === ACTOR_JOB_STATUSES.RUNNING) {
|
|
194
|
-
warning('Build is still running.');
|
|
220
|
+
warning({ message: 'Build is still running.' });
|
|
195
221
|
// @ts-expect-error FIX THESE TYPES 😢
|
|
196
222
|
}
|
|
197
223
|
else if (build.status === ACTOR_JOB_STATUSES.ABORTED || build.status === ACTOR_JOB_STATUSES.ABORTING) {
|
|
198
|
-
warning('Build was aborted!');
|
|
224
|
+
warning({ message: 'Build was aborted!' });
|
|
225
|
+
process.exitCode = CommandExitCodes.BuildAborted;
|
|
199
226
|
// @ts-expect-error FIX THESE TYPES 😢
|
|
200
227
|
}
|
|
201
228
|
else if (build.status === ACTOR_JOB_STATUSES.TIMED_OUT || build.status === ACTOR_JOB_STATUSES.TIMING_OUT) {
|
|
202
|
-
warning('Build timed out!');
|
|
229
|
+
warning({ message: 'Build timed out!' });
|
|
230
|
+
process.exitCode = CommandExitCodes.BuildTimedOut;
|
|
203
231
|
}
|
|
204
232
|
else {
|
|
205
|
-
error('Build failed!');
|
|
233
|
+
error({ message: 'Build failed!' });
|
|
234
|
+
process.exitCode = CommandExitCodes.BuildFailed;
|
|
206
235
|
}
|
|
207
236
|
}
|
|
208
237
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,IAAI,MAAM,OAAO,CAAC;AACzB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/run.d.ts
CHANGED
|
@@ -2,10 +2,11 @@ import { ApifyCommand } from '../lib/apify_command.js';
|
|
|
2
2
|
export declare class RunCommand extends ApifyCommand<typeof RunCommand> {
|
|
3
3
|
static description: string;
|
|
4
4
|
static flags: {
|
|
5
|
-
purge: import("@oclif/core/
|
|
6
|
-
'purge-queue': import("@oclif/core/
|
|
7
|
-
'purge-dataset': import("@oclif/core/
|
|
8
|
-
'purge-key-value-store': import("@oclif/core/
|
|
5
|
+
purge: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
6
|
+
'purge-queue': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
7
|
+
'purge-dataset': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
8
|
+
'purge-key-value-store': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
9
|
+
entrypoint: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
9
10
|
};
|
|
10
11
|
run(): Promise<void>;
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAsBvD,qBAAa,UAAW,SAAQ,YAAY,CAAC,OAAO,UAAU,CAAC;IAC3D,OAAgB,WAAW,SAOwD;IAEnF,OAAgB,KAAK;;;;;;MA6BnB;IAEI,GAAG;CAyMZ"}
|
package/dist/commands/run.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { existsSync, renameSync } from 'node:fs';
|
|
2
|
+
import { stat } from 'node:fs/promises';
|
|
2
3
|
import { join } from 'node:path';
|
|
3
4
|
import process from 'node:process';
|
|
4
5
|
import { APIFY_ENV_VARS } from '@apify/consts';
|
|
@@ -25,51 +26,78 @@ export class RunCommand extends ApifyCommand {
|
|
|
25
26
|
const packageJsonExists = existsSync(packageJsonPath);
|
|
26
27
|
const mainPyExists = existsSync(mainPyPath);
|
|
27
28
|
const isScrapyProject = projectType === PROJECT_TYPES.SCRAPY;
|
|
29
|
+
const { language, languageVersion } = detectLocalActorLanguage(cwd);
|
|
28
30
|
if (!packageJsonExists && !mainPyExists && !isScrapyProject) {
|
|
29
31
|
throw new Error('Actor is of an unknown format.'
|
|
30
32
|
+ ` Make sure either the 'package.json' file or 'src/__main__.py' file exists or you are in a migrated Scrapy project.`);
|
|
31
33
|
}
|
|
34
|
+
// Defaults (for node, the start script, for python, the src module)
|
|
35
|
+
let runType = language === LANGUAGE.NODEJS ? RunType.Script : RunType.Module;
|
|
36
|
+
let entrypoint = language === LANGUAGE.NODEJS ? 'start' : 'src';
|
|
37
|
+
if (this.flags.entrypoint) {
|
|
38
|
+
entrypoint = this.flags.entrypoint;
|
|
39
|
+
const entrypointPath = join(cwd, this.flags.entrypoint);
|
|
40
|
+
const entrypointStat = await stat(entrypointPath).catch(() => null);
|
|
41
|
+
// Directory -> We just try to run it as a module (in python, it needs to have a main.py file, in node.js, an index.(m)js file)
|
|
42
|
+
if (entrypointStat?.isDirectory()) {
|
|
43
|
+
runType = RunType.Module;
|
|
44
|
+
// entrypoint -> ./src/file for example (running custom scripts)
|
|
45
|
+
}
|
|
46
|
+
else if (entrypointStat?.isFile()) {
|
|
47
|
+
runType = RunType.DirectFile;
|
|
48
|
+
// If it's not a file, or a directory, we just let it be a script
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
runType = RunType.Script;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
32
54
|
if (existsSync(LEGACY_LOCAL_STORAGE_DIR) && !existsSync(actualStoragePath)) {
|
|
33
55
|
renameSync(LEGACY_LOCAL_STORAGE_DIR, actualStoragePath);
|
|
34
|
-
warning(
|
|
35
|
-
|
|
56
|
+
warning({
|
|
57
|
+
message: `The legacy 'apify_storage' directory was renamed to '${actualStoragePath}' to align it with Apify SDK v3.`
|
|
58
|
+
+ ' Contents were left intact.',
|
|
59
|
+
});
|
|
36
60
|
}
|
|
37
61
|
let CRAWLEE_PURGE_ON_START = '0';
|
|
38
62
|
// Purge stores
|
|
63
|
+
// TODO: this needs to be cleaned up heavily - ideally logic should be in the project analyzers
|
|
39
64
|
if (this.flags.purge) {
|
|
40
65
|
switch (projectType) {
|
|
41
|
-
case PROJECT_TYPES.CRAWLEE: {
|
|
42
|
-
CRAWLEE_PURGE_ON_START = '1';
|
|
43
|
-
break;
|
|
44
|
-
}
|
|
45
66
|
case PROJECT_TYPES.PRE_CRAWLEE_APIFY_SDK: {
|
|
46
67
|
await Promise.all([purgeDefaultQueue(), purgeDefaultKeyValueStore(), purgeDefaultDataset()]);
|
|
47
|
-
info('All default local stores were purged.');
|
|
68
|
+
info({ message: 'All default local stores were purged.' });
|
|
48
69
|
break;
|
|
49
70
|
}
|
|
71
|
+
case PROJECT_TYPES.CRAWLEE:
|
|
50
72
|
default: {
|
|
51
|
-
|
|
73
|
+
CRAWLEE_PURGE_ON_START = '1';
|
|
52
74
|
}
|
|
53
75
|
}
|
|
76
|
+
if (language === LANGUAGE.PYTHON) {
|
|
77
|
+
await Promise.all([purgeDefaultQueue(), purgeDefaultKeyValueStore(), purgeDefaultDataset()]);
|
|
78
|
+
info({ message: 'All default local stores were purged.' });
|
|
79
|
+
}
|
|
54
80
|
}
|
|
55
81
|
// TODO: deprecate these flags
|
|
56
|
-
if (this.flags.purgeQueue) {
|
|
82
|
+
if (this.flags.purgeQueue && !this.flags.purge) {
|
|
57
83
|
await purgeDefaultQueue();
|
|
58
|
-
info('Default local request queue was purged.');
|
|
84
|
+
info({ message: 'Default local request queue was purged.' });
|
|
59
85
|
}
|
|
60
|
-
if (this.flags.purgeDataset) {
|
|
86
|
+
if (this.flags.purgeDataset && !this.flags.purge) {
|
|
61
87
|
await purgeDefaultDataset();
|
|
62
|
-
info('Default local dataset was purged.');
|
|
88
|
+
info({ message: 'Default local dataset was purged.' });
|
|
63
89
|
}
|
|
64
|
-
if (this.flags.purgeKeyValueStore) {
|
|
90
|
+
if (this.flags.purgeKeyValueStore && !this.flags.purge) {
|
|
65
91
|
await purgeDefaultKeyValueStore();
|
|
66
|
-
info('Default local key-value store was purged.');
|
|
92
|
+
info({ message: 'Default local key-value store was purged.' });
|
|
67
93
|
}
|
|
68
94
|
if (!this.flags.purge) {
|
|
69
95
|
const isStorageEmpty = await checkIfStorageIsEmpty();
|
|
70
96
|
if (!isStorageEmpty) {
|
|
71
|
-
warning(
|
|
72
|
-
|
|
97
|
+
warning({
|
|
98
|
+
message: 'The storage directory contains a previous state, the Actor will continue where it left off. '
|
|
99
|
+
+ 'To start from the initial state, use --purge parameter to clean the storage directory.',
|
|
100
|
+
});
|
|
73
101
|
}
|
|
74
102
|
}
|
|
75
103
|
// Attach env vars from local config files
|
|
@@ -91,19 +119,14 @@ export class RunCommand extends ApifyCommand {
|
|
|
91
119
|
// NOTE: User can overwrite env vars
|
|
92
120
|
const env = Object.assign(localEnvVars, process.env);
|
|
93
121
|
if (!userId) {
|
|
94
|
-
warning(
|
|
122
|
+
warning({
|
|
123
|
+
message: 'You are not logged in with your Apify Account. Some features like Apify Proxy will not work. Call "apify login" to fix that.',
|
|
124
|
+
});
|
|
95
125
|
}
|
|
96
|
-
const { language, languageVersion } = detectLocalActorLanguage(cwd);
|
|
97
126
|
if (language === LANGUAGE.NODEJS) { // Actor is written in Node.js
|
|
98
127
|
const currentNodeVersion = languageVersion;
|
|
99
128
|
const minimumSupportedNodeVersion = minVersion(SUPPORTED_NODEJS_VERSION);
|
|
100
129
|
if (currentNodeVersion) {
|
|
101
|
-
const serverJsFile = join(cwd, 'server.js');
|
|
102
|
-
const packageJson = await loadJsonFile(packageJsonPath);
|
|
103
|
-
if ((!packageJson.scripts || !packageJson.scripts.start) && !existsSync(serverJsFile)) {
|
|
104
|
-
throw new Error('The "npm start" script was not found in package.json. Please set it up for your project. '
|
|
105
|
-
+ 'For more information about that call "apify help run".');
|
|
106
|
-
}
|
|
107
130
|
// --max-http-header-size=80000
|
|
108
131
|
// Increases default size of headers. The original limit was 80kb, but from node 10+ they decided to lower it to 8kb.
|
|
109
132
|
// However they did not think about all the sites there with large headers,
|
|
@@ -112,15 +135,37 @@ export class RunCommand extends ApifyCommand {
|
|
|
112
135
|
env.NODE_OPTIONS = env.NODE_OPTIONS ? `${env.NODE_OPTIONS} --max-http-header-size=80000` : '--max-http-header-size=80000';
|
|
113
136
|
}
|
|
114
137
|
else {
|
|
115
|
-
warning(
|
|
116
|
-
|
|
138
|
+
warning({
|
|
139
|
+
message: `You are running Node.js version ${currentNodeVersion}, which is no longer supported. `
|
|
140
|
+
+ `Please upgrade to Node.js version ${minimumSupportedNodeVersion} or later.`,
|
|
141
|
+
});
|
|
117
142
|
}
|
|
118
143
|
this.telemetryData.actorNodejsVersion = currentNodeVersion;
|
|
119
144
|
this.telemetryData.actorLanguage = LANGUAGE.NODEJS;
|
|
120
|
-
|
|
145
|
+
// We allow "module" type directly in node too (it will work for a folder that has an `index.js` file)
|
|
146
|
+
if (runType === RunType.DirectFile || runType === RunType.Module) {
|
|
147
|
+
await execWithLog('node', [entrypoint], { env, cwd });
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
// TODO(vladfrangu): what is this for? Some old template maybe?
|
|
151
|
+
// && !existsSync(serverJsFile)
|
|
152
|
+
// const serverJsFile = join(cwd, 'server.js');
|
|
153
|
+
const packageJson = await loadJsonFile(packageJsonPath);
|
|
154
|
+
if (!packageJson.scripts) {
|
|
155
|
+
throw new Error('No scripts were found in package.json. Please set it up for your project. '
|
|
156
|
+
+ 'For more information about that call "apify help run".');
|
|
157
|
+
}
|
|
158
|
+
if (!packageJson.scripts[entrypoint]) {
|
|
159
|
+
throw new Error(`The script "${entrypoint}" was not found in package.json. Please set it up for your project. `
|
|
160
|
+
+ 'For more information about that call "apify help run".');
|
|
161
|
+
}
|
|
162
|
+
await execWithLog(getNpmCmd(), ['run', entrypoint], { env, cwd });
|
|
163
|
+
}
|
|
121
164
|
}
|
|
122
165
|
else {
|
|
123
|
-
error(
|
|
166
|
+
error({
|
|
167
|
+
message: `No Node.js detected! Please install Node.js ${minimumSupportedNodeVersion} or higher to be able to run Node.js Actors locally.`,
|
|
168
|
+
});
|
|
124
169
|
}
|
|
125
170
|
}
|
|
126
171
|
else if (language === LANGUAGE.PYTHON) {
|
|
@@ -130,23 +175,27 @@ export class RunCommand extends ApifyCommand {
|
|
|
130
175
|
if (pythonVersion) {
|
|
131
176
|
if (isPythonVersionSupported(pythonVersion)) {
|
|
132
177
|
const pythonCommand = getPythonCommand(cwd);
|
|
133
|
-
|
|
134
|
-
if (isScrapyProject) {
|
|
178
|
+
if (isScrapyProject && !this.flags.entrypoint) {
|
|
135
179
|
const project = new ScrapyProjectAnalyzer(cwd);
|
|
136
180
|
project.loadScrapyCfg();
|
|
137
181
|
if (project.configuration.hasKey('apify', 'mainpy_location')) {
|
|
138
|
-
|
|
182
|
+
entrypoint = project.configuration.get('apify', 'mainpy_location');
|
|
139
183
|
}
|
|
140
184
|
}
|
|
141
|
-
|
|
185
|
+
if (runType === RunType.Module) {
|
|
186
|
+
await execWithLog(pythonCommand, ['-m', entrypoint], { env, cwd });
|
|
187
|
+
}
|
|
188
|
+
else {
|
|
189
|
+
await execWithLog(pythonCommand, [entrypoint], { env, cwd });
|
|
190
|
+
}
|
|
142
191
|
}
|
|
143
192
|
else {
|
|
144
|
-
error(`Python Actors require Python 3.8 or higher, but you have Python ${pythonVersion}!`);
|
|
145
|
-
error('Please install Python 3.8 or higher to be able to run Python Actors locally.');
|
|
193
|
+
error({ message: `Python Actors require Python 3.8 or higher, but you have Python ${pythonVersion}!` });
|
|
194
|
+
error({ message: 'Please install Python 3.8 or higher to be able to run Python Actors locally.' });
|
|
146
195
|
}
|
|
147
196
|
}
|
|
148
197
|
else {
|
|
149
|
-
error('No Python detected! Please install Python 3.8 or higher to be able to run Python Actors locally.');
|
|
198
|
+
error({ message: 'No Python detected! Please install Python 3.8 or higher to be able to run Python Actors locally.' });
|
|
150
199
|
}
|
|
151
200
|
}
|
|
152
201
|
}
|
|
@@ -186,6 +235,23 @@ Object.defineProperty(RunCommand, "flags", {
|
|
|
186
235
|
description: 'Deletes all records from the default key-value store in the local directory before the run starts, except for the "INPUT" key.',
|
|
187
236
|
required: false,
|
|
188
237
|
}),
|
|
238
|
+
entrypoint: Flags.string({
|
|
239
|
+
description: [
|
|
240
|
+
'Optional entrypoint for running with injected environment variables.',
|
|
241
|
+
'\n',
|
|
242
|
+
'For Python, it is the module name, or a path to a file.',
|
|
243
|
+
'\n',
|
|
244
|
+
'For node.js, it is the npm script name, or a path to a JS/MJS file.',
|
|
245
|
+
'You can also pass in a directory name, provided that directory contains an "index.js" file.',
|
|
246
|
+
].join(' '),
|
|
247
|
+
required: false,
|
|
248
|
+
}),
|
|
189
249
|
}
|
|
190
250
|
});
|
|
251
|
+
var RunType;
|
|
252
|
+
(function (RunType) {
|
|
253
|
+
RunType[RunType["DirectFile"] = 0] = "DirectFile";
|
|
254
|
+
RunType[RunType["Module"] = 1] = "Module";
|
|
255
|
+
RunType[RunType["Script"] = 2] = "Script";
|
|
256
|
+
})(RunType || (RunType = {}));
|
|
191
257
|
//# sourceMappingURL=run.js.map
|
package/dist/commands/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC1I,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EACH,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EAClB,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,GACpB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,OAAO,UAAW,SAAQ,YAA+B;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@ import { ApifyCommand } from '../../lib/apify_command.js';
|
|
|
2
2
|
export declare class SecretsAddCommand extends ApifyCommand<typeof SecretsAddCommand> {
|
|
3
3
|
static description: string;
|
|
4
4
|
static args: {
|
|
5
|
-
name: import("@oclif/core/
|
|
6
|
-
value: import("@oclif/core/
|
|
5
|
+
name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
6
|
+
value: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
7
7
|
};
|
|
8
8
|
run(): Promise<void>;
|
|
9
9
|
}
|
|
@@ -11,7 +11,7 @@ Object.defineProperty(SecretsIndexCommand, "description", {
|
|
|
11
11
|
writable: true,
|
|
12
12
|
value: 'Manages secret values for Actor environment variables.\n\n'
|
|
13
13
|
+ 'Example:\n'
|
|
14
|
-
+ '$ apify secrets
|
|
14
|
+
+ '$ apify secrets add mySecret TopSecretValue123\n\n'
|
|
15
15
|
+ `Now the "mySecret" value can be used in an environment variable defined in "${LOCAL_CONFIG_PATH}" file by adding the "@" prefix:\n\n`
|
|
16
16
|
+ '{\n'
|
|
17
17
|
+ ' "actorSpecification": 1,\n'
|
|
@@ -2,7 +2,7 @@ import { ApifyCommand } from '../../lib/apify_command.js';
|
|
|
2
2
|
export declare class SecretRmCommand extends ApifyCommand<typeof SecretRmCommand> {
|
|
3
3
|
static description: string;
|
|
4
4
|
static args: {
|
|
5
|
-
name: import("@oclif/core/
|
|
5
|
+
name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
6
6
|
};
|
|
7
7
|
run(): Promise<void>;
|
|
8
8
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/task/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,OAAO,iBAAiB,CAAC;IACzE,OAAgB,WAAW,SAA8D;IACnF,GAAG;CAGZ"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ApifyCommand } from '../../lib/apify_command.js';
|
|
2
|
+
export class TasksIndexCommand extends ApifyCommand {
|
|
3
|
+
async run() {
|
|
4
|
+
await this.printHelp();
|
|
5
|
+
}
|
|
6
|
+
}
|
|
7
|
+
Object.defineProperty(TasksIndexCommand, "description", {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
configurable: true,
|
|
10
|
+
writable: true,
|
|
11
|
+
value: 'Commands are designed to be used to interact with Tasks.'
|
|
12
|
+
});
|
|
13
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/task/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,OAAO,iBAAkB,SAAQ,YAAsC;IAEzE,KAAK,CAAC,GAAG;QACL,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;IAC3B,CAAC;;AAHe;;;;WAAc,0DAA0D;GAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ApifyCommand } from '../../lib/apify_command.js';
|
|
2
|
+
export declare class TaskRunCommand extends ApifyCommand<typeof TaskRunCommand> {
|
|
3
|
+
static description: string;
|
|
4
|
+
static flags: {
|
|
5
|
+
build: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
6
|
+
timeout: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
7
|
+
memory: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
8
|
+
'wait-for-finish': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
9
|
+
};
|
|
10
|
+
static args: {
|
|
11
|
+
taskId: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
12
|
+
};
|
|
13
|
+
run(): Promise<void>;
|
|
14
|
+
private resolveTaskId;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=run.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/task/run.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1D,qBAAa,cAAe,SAAQ,YAAY,CAAC,OAAO,cAAc,CAAC;IACnE,OAAgB,WAAW,SAEyD;IAEpF,OAAgB,KAAK;;;;;MAAiC;IAEtD,OAAgB,IAAI;;MAKlB;IAEI,GAAG;YAuCK,aAAa;CAkC9B"}
|