apify-cli 1.0.0-beta.1 → 1.0.0-beta.100

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.
Files changed (101) hide show
  1. package/CHANGELOG.md +200 -0
  2. package/README.md +128 -77
  3. package/bin/dev.js +7 -2
  4. package/bin/dev.sh +4 -0
  5. package/bin/run.js +7 -0
  6. package/dist/.tsbuildinfo +1 -1
  7. package/dist/commands/actor/push-data.js +2 -2
  8. package/dist/commands/actor/set-value.js +3 -3
  9. package/dist/commands/actor/set-value.js.map +1 -1
  10. package/dist/commands/call.d.ts +2 -1
  11. package/dist/commands/call.d.ts.map +1 -1
  12. package/dist/commands/call.js +56 -90
  13. package/dist/commands/call.js.map +1 -1
  14. package/dist/commands/create.d.ts +1 -0
  15. package/dist/commands/create.d.ts.map +1 -1
  16. package/dist/commands/create.js +49 -29
  17. package/dist/commands/create.js.map +1 -1
  18. package/dist/commands/edit-input-schema.js +15 -15
  19. package/dist/commands/edit-input-schema.js.map +1 -1
  20. package/dist/commands/init-wrap-scrapy.js +1 -1
  21. package/dist/commands/init-wrap-scrapy.js.map +1 -1
  22. package/dist/commands/init.js +5 -5
  23. package/dist/commands/init.js.map +1 -1
  24. package/dist/commands/login.d.ts +1 -0
  25. package/dist/commands/login.d.ts.map +1 -1
  26. package/dist/commands/login.js +143 -12
  27. package/dist/commands/login.js.map +1 -1
  28. package/dist/commands/logout.js +1 -1
  29. package/dist/commands/logout.js.map +1 -1
  30. package/dist/commands/pull.js +2 -2
  31. package/dist/commands/pull.js.map +1 -1
  32. package/dist/commands/push.d.ts +2 -0
  33. package/dist/commands/push.d.ts.map +1 -1
  34. package/dist/commands/push.js +80 -24
  35. package/dist/commands/push.js.map +1 -1
  36. package/dist/commands/run.d.ts +1 -0
  37. package/dist/commands/run.d.ts.map +1 -1
  38. package/dist/commands/run.js +101 -35
  39. package/dist/commands/run.js.map +1 -1
  40. package/dist/commands/secrets/index.js +1 -1
  41. package/dist/commands/task/index.d.ts +6 -0
  42. package/dist/commands/task/index.d.ts.map +1 -0
  43. package/dist/commands/task/index.js +13 -0
  44. package/dist/commands/task/index.js.map +1 -0
  45. package/dist/commands/task/run.d.ts +16 -0
  46. package/dist/commands/task/run.d.ts.map +1 -0
  47. package/dist/commands/task/run.js +91 -0
  48. package/dist/commands/task/run.js.map +1 -0
  49. package/dist/commands/{vis.d.ts → validate-schema.d.ts} +2 -1
  50. package/dist/commands/validate-schema.d.ts.map +1 -0
  51. package/dist/commands/{vis.js → validate-schema.js} +10 -4
  52. package/dist/commands/validate-schema.js.map +1 -0
  53. package/dist/hooks/deprecations.d.ts +4 -0
  54. package/dist/hooks/deprecations.d.ts.map +1 -0
  55. package/dist/hooks/deprecations.js +18 -0
  56. package/dist/hooks/deprecations.js.map +1 -0
  57. package/dist/lib/actor.d.ts +1 -1
  58. package/dist/lib/actor.js +2 -2
  59. package/dist/lib/actor.js.map +1 -1
  60. package/dist/lib/commands/run-on-cloud.d.ts +19 -0
  61. package/dist/lib/commands/run-on-cloud.d.ts.map +1 -0
  62. package/dist/lib/commands/run-on-cloud.js +90 -0
  63. package/dist/lib/commands/run-on-cloud.js.map +1 -0
  64. package/dist/lib/consts.d.ts +8 -0
  65. package/dist/lib/consts.d.ts.map +1 -1
  66. package/dist/lib/consts.js +10 -0
  67. package/dist/lib/consts.js.map +1 -1
  68. package/dist/lib/create-utils.js +1 -1
  69. package/dist/lib/create-utils.js.map +1 -1
  70. package/dist/lib/exec.d.ts.map +1 -1
  71. package/dist/lib/exec.js +7 -2
  72. package/dist/lib/exec.js.map +1 -1
  73. package/dist/lib/input_schema.d.ts +1 -1
  74. package/dist/lib/input_schema.d.ts.map +1 -1
  75. package/dist/lib/input_schema.js +1 -1
  76. package/dist/lib/input_schema.js.map +1 -1
  77. package/dist/lib/outputs.d.ts +18 -6
  78. package/dist/lib/outputs.d.ts.map +1 -1
  79. package/dist/lib/outputs.js +43 -18
  80. package/dist/lib/outputs.js.map +1 -1
  81. package/dist/lib/projects/scrapy/wrapScrapyProject.js +3 -3
  82. package/dist/lib/projects/scrapy/wrapScrapyProject.js.map +1 -1
  83. package/dist/lib/secrets.js +3 -3
  84. package/dist/lib/secrets.js.map +1 -1
  85. package/dist/lib/telemetry.d.ts.map +1 -1
  86. package/dist/lib/telemetry.js +1 -1
  87. package/dist/lib/telemetry.js.map +1 -1
  88. package/dist/lib/utils.d.ts +6 -7
  89. package/dist/lib/utils.d.ts.map +1 -1
  90. package/dist/lib/utils.js +40 -43
  91. package/dist/lib/utils.js.map +1 -1
  92. package/dist/lib/version_check.js +7 -7
  93. package/dist/lib/version_check.js.map +1 -1
  94. package/oclif.manifest.json +131 -38
  95. package/package.json +148 -141
  96. package/dist/commands/login-new.d.ts +0 -10
  97. package/dist/commands/login-new.d.ts.map +0 -1
  98. package/dist/commands/login-new.js +0 -166
  99. package/dist/commands/login-new.js.map +0 -1
  100. package/dist/commands/vis.d.ts.map +0 -1
  101. package/dist/commands/vis.js.map +0 -1
@@ -38,9 +38,9 @@ Object.defineProperty(PushDataCommand, "description", {
38
38
  value: 'Stores an object or an array of objects to the default dataset of the Actor run.\n'
39
39
  + 'It is possible to pass data using item argument or stdin.\n'
40
40
  + 'Passing data using argument:\n'
41
- + '$ apify actor:push-data {"foo": "bar"}\n'
41
+ + '$ apify actor push-data {"foo": "bar"}\n'
42
42
  + 'Passing data using stdin with pipe:\n'
43
- + '$ cat ./test.json | apify actor:push-data\n'
43
+ + '$ cat ./test.json | apify actor push-data\n'
44
44
  });
45
45
  Object.defineProperty(PushDataCommand, "args", {
46
46
  enumerable: true,
@@ -24,7 +24,7 @@ export class SetValueCommand extends ApifyCommand {
24
24
  const recordValue = value || stdin;
25
25
  const apifyClient = await getApifyStorageClient();
26
26
  const storeClient = apifyClient.keyValueStore(getDefaultStorageId(APIFY_STORAGE_TYPES.KEY_VALUE_STORE));
27
- if (recordValue === undefined || recordValue === null) {
27
+ if (recordValue === undefined || recordValue === null || recordValue === '' || recordValue === 'null' || recordValue === 'undefined') {
28
28
  await storeClient.deleteRecord(key);
29
29
  }
30
30
  else {
@@ -39,9 +39,9 @@ Object.defineProperty(SetValueCommand, "description", {
39
39
  value: 'Sets or removes record into the default KeyValueStore associated with the Actor run.\n'
40
40
  + 'It is possible to pass data using argument or stdin.\n'
41
41
  + 'Passing data using argument:\n'
42
- + '$ apify actor:set-value KEY my-value\n'
42
+ + '$ apify actor set-value KEY my-value\n'
43
43
  + 'Passing data using stdin with pipe:\n'
44
- + '$ cat ./my-text-file.txt | apify actor:set-value KEY --contentType text/plain\n'
44
+ + '$ cat ./my-text-file.txt | apify actor set-value KEY --contentType text/plain\n'
45
45
  });
46
46
  Object.defineProperty(SetValueCommand, "args", {
47
47
  enumerable: true,
@@ -1 +1 @@
1
- {"version":3,"file":"set-value.js","sourceRoot":"","sources":["../../../src/commands/actor/set-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,OAAO,eAAgB,SAAQ,YAAoC;IAAzE;;QA8BY;;;;;WAA6B;IAwBzC,CAAC;IAtBY,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,sCAAsC;QACtC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACjC,MAAM,EAAE,WAAW,GAAG,iCAAiC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEvE,oGAAoG;QACpG,MAAM,WAAW,GAAG,KAAK,IAAI,KAAK,CAAC;QACnC,MAAM,WAAW,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,WAAW,CAAC,aAAa,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;QAExG,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACpD,MAAM,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;;AApDe;;;;WAAc,wFAAwF;UAChH,wDAAwD;UACxD,gCAAgC;UAChC,wCAAwC;UACxC,uCAAuC;UACvC,iFAAiF;EAL5D,CAK6D;AAExE;;;;WAAO;QACnB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;YACb,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,uCAAuC;SACvD,CAAC;QACF,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,0DAA0D;kBACrE,6DAA6D;kBAC7D,2FAA2F;kBAC3F,wDAAwD;SAC7D,CAAC;KACL;EAZmB,CAYlB;AAEc;;;;WAAQ;QACpB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,4FAA4F;YACzG,QAAQ,EAAE,KAAK;SAClB,CAAC;KACL;EANoB,CAMnB"}
1
+ {"version":3,"file":"set-value.js","sourceRoot":"","sources":["../../../src/commands/actor/set-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,OAAO,eAAgB,SAAQ,YAAoC;IAAzE;;QA8BY;;;;;WAA6B;IAwBzC,CAAC;IAtBY,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,sCAAsC;QACtC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACjC,MAAM,EAAE,WAAW,GAAG,iCAAiC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEvE,oGAAoG;QACpG,MAAM,WAAW,GAAG,KAAK,IAAI,KAAK,CAAC;QACnC,MAAM,WAAW,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,WAAW,CAAC,aAAa,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;QAExG,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,EAAE,IAAI,WAAW,KAAK,MAAM,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;YACnI,MAAM,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;;AApDe;;;;WAAc,wFAAwF;UAChH,wDAAwD;UACxD,gCAAgC;UAChC,wCAAwC;UACxC,uCAAuC;UACvC,iFAAiF;EAL5D,CAK6D;AAExE;;;;WAAO;QACnB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;YACb,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,uCAAuC;SACvD,CAAC;QACF,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,0DAA0D;kBACrE,6DAA6D;kBAC7D,2FAA2F;kBAC3F,wDAAwD;SAC7D,CAAC;KACL;EAZmB,CAYlB;AAEc;;;;WAAQ;QACpB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,4FAA4F;YACzG,QAAQ,EAAE,KAAK;SAClB,CAAC;KACL;EANoB,CAMnB"}
@@ -1,5 +1,5 @@
1
1
  import { ApifyCommand } from '../lib/apify_command.js';
2
- export declare class CallCommand extends ApifyCommand<typeof CallCommand> {
2
+ export declare class ActorCallCommand extends ApifyCommand<typeof ActorCallCommand> {
3
3
  static description: string;
4
4
  static flags: {
5
5
  build: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
@@ -11,5 +11,6 @@ export declare class CallCommand extends ApifyCommand<typeof CallCommand> {
11
11
  actorId: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
12
12
  };
13
13
  run(): Promise<void>;
14
+ private static resolveActorId;
14
15
  }
15
16
  //# sourceMappingURL=call.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../src/commands/call.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,qBAAa,WAAY,SAAQ,YAAY,CAAC,OAAO,WAAW,CAAC;IAC7D,OAAgB,WAAW,SAEyD;IAEpF,OAAgB,KAAK;;;;;MAqBnB;IAEF,OAAgB,IAAI;;MAMlB;IAEI,GAAG;CAoFZ"}
1
+ {"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../src/commands/call.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,OAAO,gBAAgB,CAAC;IACvE,OAAgB,WAAW,SAE6D;IAExF,OAAgB,KAAK;;;;;MAAkC;IAEvD,OAAgB,IAAI;;MAMlB;IAEI,GAAG;mBA6CY,cAAc;CAiDtC"}
@@ -1,38 +1,22 @@
1
- // TODO: Show full error messages and HTTP codes, this is not great:
2
- // jan:testx$ apify call help
3
- // Run: Calling act help...
4
- // Error: [record-not-found]
5
1
  import process from 'node:process';
6
- import { ACTOR_JOB_STATUSES } from '@apify/consts';
7
- import { Args, Flags } from '@oclif/core';
8
- import mime from 'mime';
2
+ import { Args } from '@oclif/core';
9
3
  import { ApifyCommand } from '../lib/apify_command.js';
4
+ import { SharedRunOnCloudFlags, runActorOrTaskOnCloud } from '../lib/commands/run-on-cloud.js';
10
5
  import { LOCAL_CONFIG_PATH } from '../lib/consts.js';
11
- import { error, link, run as runLog, success, warning } from '../lib/outputs.js';
12
- import { getLocalConfig, getLocalInput, getLocalUserInfo, getLoggedClientOrThrow, outputJobLog } from '../lib/utils.js';
13
- export class CallCommand extends ApifyCommand {
6
+ import { getLocalConfig, getLocalUserInfo, getLoggedClientOrThrow } from '../lib/utils.js';
7
+ export class ActorCallCommand extends ApifyCommand {
14
8
  async run() {
15
9
  const cwd = process.cwd();
16
10
  const localConfig = getLocalConfig(cwd) || {};
17
11
  const apifyClient = await getLoggedClientOrThrow();
18
12
  const userInfo = await getLocalUserInfo();
19
13
  const usernameOrId = userInfo.username || userInfo.id;
20
- const forceActorId = this.args.actorId;
21
- let actorId;
22
- if (forceActorId) {
23
- const actor = await apifyClient.actor(forceActorId).get();
24
- if (!actor)
25
- throw new Error(`Cannot find Actor with ID '${forceActorId}' in your account.`);
26
- actorId = actor.username ? `${actor.username}/${actor.name}` : actor.id;
27
- }
28
- else {
29
- actorId = `${usernameOrId}/${localConfig.name}`;
30
- const actor = await apifyClient.actor(actorId).get();
31
- if (!actor) {
32
- throw new Error(`Cannot find Actor with ID '${actorId}' `
33
- + 'in your account. Call "apify push" to push this Actor to Apify platform.');
34
- }
35
- }
14
+ const { id: actorId, userFriendlyId } = await ActorCallCommand.resolveActorId({
15
+ client: apifyClient,
16
+ localActorName: localConfig.name,
17
+ usernameOrId,
18
+ actorId: this.args.actorId,
19
+ });
36
20
  const runOpts = {
37
21
  waitForFinish: 2, // NOTE: We need to wait some time to Apify open stream and we can create connection
38
22
  };
@@ -48,51 +32,54 @@ export class CallCommand extends ApifyCommand {
48
32
  if (this.flags.memory) {
49
33
  runOpts.memory = this.flags.memory;
50
34
  }
51
- // Get input for act
52
- const localInput = getLocalInput(cwd);
53
- runLog(`Calling Actor ${actorId}`);
54
- let run;
55
- try {
56
- if (localInput) {
57
- // TODO: For some reason we cannot pass json as buffer with right contentType into apify-client.
58
- // It will save malformed JSON which looks like buffer as INPUT.
59
- // We need to fix this in v1 during removing call under actor namespace.
60
- const input = mime.getExtension(localInput.contentType) === 'json' ? JSON.parse(localInput.body.toString('utf-8')) : localInput.body;
61
- run = await apifyClient.actor(actorId).start(input, { ...runOpts, contentType: localInput.contentType });
62
- }
63
- else {
64
- run = await apifyClient.actor(actorId).start(null, runOpts);
35
+ await runActorOrTaskOnCloud(apifyClient, {
36
+ actorOrTaskData: {
37
+ id: actorId,
38
+ userFriendlyId,
39
+ },
40
+ runOptions: runOpts,
41
+ type: 'Actor',
42
+ waitForFinishMillis,
43
+ });
44
+ }
45
+ static async resolveActorId({ client, localActorName, usernameOrId, actorId, }) {
46
+ // Full ID
47
+ if (actorId?.includes('/')) {
48
+ const actor = await client.actor(actorId).get();
49
+ if (!actor) {
50
+ throw new Error(`Cannot find Actor with ID '${actorId}' in your account.`);
65
51
  }
66
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
67
- }
68
- catch (err) {
69
- // TODO: Better error message in apify-client-js
70
- if (err.type === 'record-not-found')
71
- throw new Error(`Actor ${actorId} not found!`);
72
- else
73
- throw err;
74
- }
75
- try {
76
- await outputJobLog(run, waitForFinishMillis);
77
- }
78
- catch (err) {
79
- warning('Can not get log:');
80
- console.error(err);
52
+ return {
53
+ userFriendlyId: `${actor.username}/${actor.name}`,
54
+ id: actor.id,
55
+ };
81
56
  }
82
- run = (await apifyClient.run(run.id).get());
83
- link('Actor run detail', `https://console.apify.com/actors/${run.actId}#/runs/${run.id}`);
84
- if (run.status === ACTOR_JOB_STATUSES.SUCCEEDED) {
85
- success('Actor finished.');
86
- }
87
- else if (run.status === ACTOR_JOB_STATUSES.RUNNING) {
88
- warning('Actor is still running!');
57
+ // Try fetching Actor directly by name
58
+ if (actorId) {
59
+ const actor = await client.actor(`${usernameOrId}/${actorId.toLowerCase()}`).get();
60
+ if (!actor) {
61
+ throw new Error(`Cannot find Actor with name '${actorId}' in your account.`);
62
+ }
63
+ return {
64
+ userFriendlyId: `${actor.username}/${actor.name}`,
65
+ id: actor.id,
66
+ };
89
67
  }
90
- else {
91
- error('Actor failed!');
68
+ if (localActorName) {
69
+ const actor = await client.actor(`${usernameOrId}/${localActorName}`).get();
70
+ if (!actor) {
71
+ throw new Error(`Cannot find Actor with ID '${usernameOrId}/${localActorName}' `
72
+ + 'in your account. Call "apify push" to push this Actor to Apify platform.');
73
+ }
74
+ return {
75
+ userFriendlyId: `${actor.username}/${actor.name}`,
76
+ id: actor.id,
77
+ };
92
78
  }
79
+ throw new Error('Please provide an Actor ID or name, or run this command from a directory with a valid Apify Actor.');
93
80
  }
94
81
  }
95
- Object.defineProperty(CallCommand, "description", {
82
+ Object.defineProperty(ActorCallCommand, "description", {
96
83
  enumerable: true,
97
84
  configurable: true,
98
85
  writable: true,
@@ -100,41 +87,20 @@ Object.defineProperty(CallCommand, "description", {
100
87
  + 'The Actor is run under your current Apify account. Therefore you need to be logged in by calling "apify login". '
101
88
  + 'It takes input for the Actor from the default local key-value store by default.'
102
89
  });
103
- Object.defineProperty(CallCommand, "flags", {
90
+ Object.defineProperty(ActorCallCommand, "flags", {
104
91
  enumerable: true,
105
92
  configurable: true,
106
93
  writable: true,
107
- value: {
108
- build: Flags.string({
109
- char: 'b',
110
- description: 'Tag or number of the build to run (e.g. "latest" or "1.2.34").',
111
- required: false,
112
- }),
113
- timeout: Flags.integer({
114
- char: 't',
115
- description: 'Timeout for the Actor run in seconds. Zero value means there is no timeout.',
116
- required: false,
117
- }),
118
- memory: Flags.integer({
119
- char: 'm',
120
- description: 'Amount of memory allocated for the Actor run, in megabytes.',
121
- required: false,
122
- }),
123
- 'wait-for-finish': Flags.string({
124
- char: 'w',
125
- description: 'Seconds for waiting to run to finish, if no value passed, it waits forever.',
126
- required: false,
127
- }),
128
- }
94
+ value: SharedRunOnCloudFlags('Actor')
129
95
  });
130
- Object.defineProperty(CallCommand, "args", {
96
+ Object.defineProperty(ActorCallCommand, "args", {
131
97
  enumerable: true,
132
98
  configurable: true,
133
99
  writable: true,
134
100
  value: {
135
101
  actorId: Args.string({
136
102
  required: false,
137
- description: 'Name or ID of the Actor to run (e.g. "apify/hello-world" or "E2jjCZBezvAZnX8Rb"). '
103
+ description: 'Name or ID of the Actor to run (e.g. "my-actor", "apify/hello-world" or "E2jjCZBezvAZnX8Rb"). '
138
104
  + `If not provided, the command runs the remote Actor specified in the "${LOCAL_CONFIG_PATH}" file.`,
139
105
  }),
140
106
  }
@@ -1 +1 @@
1
- {"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/commands/call.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/commands/call.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ export declare class CreateCommand extends ApifyCommand<typeof CreateCommand> {
5
5
  template: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
6
6
  'skip-dependency-install': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
7
7
  'template-archive-url': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
8
+ 'omit-optional-deps': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
8
9
  };
9
10
  static args: {
10
11
  actorName: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
@@ -1 +1 @@
1
- {"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAqBvD,qBAAa,aAAc,SAAQ,YAAY,CAAC,OAAO,aAAa,CAAC;IACjE,OAAgB,WAAW,SAAiF;IAE5G,OAAgB,KAAK;;;;MAgBnB;IAEF,OAAgB,IAAI;;MAKlB;IAEI,GAAG;CAgJZ"}
1
+ {"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAqBvD,qBAAa,aAAc,SAAQ,YAAY,CAAC,OAAO,aAAa,CAAC;IACjE,OAAgB,WAAW,SAAiF;IAE5G,OAAgB,KAAK;;;;;MAqBnB;IAEF,OAAgB,IAAI;;MAKlB;IAEI,GAAG;CAqKZ"}
@@ -1,4 +1,5 @@
1
1
  import { existsSync, mkdirSync } from 'node:fs';
2
+ import { readdir, stat } from 'node:fs/promises';
2
3
  import { join } from 'node:path';
3
4
  import process from 'node:process';
4
5
  import { fetchManifest, manifestUrl } from '@apify/actor-templates';
@@ -26,6 +27,27 @@ export class CreateCommand extends ApifyCommand {
26
27
  return new Error(`Could not fetch template list from server. Cause: ${err?.message}`);
27
28
  });
28
29
  actorName = await ensureValidActorName(actorName);
30
+ const cwd = process.cwd();
31
+ let actFolderDir = join(cwd, actorName);
32
+ // eslint-disable-next-line no-constant-condition
33
+ while (true) {
34
+ const folderExists = await stat(actFolderDir).catch(() => null);
35
+ const folderHasFiles = folderExists && await readdir(actFolderDir).then((files) => files.length > 0).catch(() => false);
36
+ if (folderExists?.isDirectory() && folderHasFiles) {
37
+ error({
38
+ message: `Cannot create new Actor, directory '${actorName}' already exists. Please provide a different name.`
39
+ + ' You can use "apify init" to create a local Actor environment inside an existing directory.',
40
+ });
41
+ actorName = await ensureValidActorName();
42
+ actFolderDir = join(cwd, actorName);
43
+ continue;
44
+ }
45
+ // Create Actor directory structure
46
+ if (!folderExists) {
47
+ mkdirSync(actFolderDir);
48
+ }
49
+ break;
50
+ }
29
51
  let messages = null;
30
52
  this.telemetryData.fromArchiveUrl = !!templateArchiveUrl;
31
53
  if (!templateArchiveUrl) {
@@ -39,20 +61,9 @@ export class CreateCommand extends ApifyCommand {
39
61
  skipOptionalDeps = templateDefinition.skipOptionalDeps;
40
62
  }
41
63
  }
42
- const cwd = process.cwd();
43
- const actFolderDir = join(cwd, actorName);
44
- // Create actor directory structure
45
- try {
46
- mkdirSync(actFolderDir);
47
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
48
- }
49
- catch (err) {
50
- if (err?.code === 'EEXIST') {
51
- error(`Cannot create new Actor, directory '${actorName}' already exists. `
52
- + 'You can use "apify init" to create a local Actor environment inside an existing directory.');
53
- return;
54
- }
55
- throw err;
64
+ // Set this _after_ the template is resolved, so that the flag takes precedence
65
+ if (this.flags.omitOptionalDeps) {
66
+ skipOptionalDeps = true;
56
67
  }
57
68
  await downloadAndUnzip({ url: templateArchiveUrl, pathTo: actFolderDir });
58
69
  // There may be .actor/actor.json file in used template - let's try to load it and change the name prop value to actorName
@@ -74,12 +85,14 @@ export class CreateCommand extends ApifyCommand {
74
85
  const minimumSupportedNodeVersion = minVersion(SUPPORTED_NODEJS_VERSION);
75
86
  if (currentNodeVersion) {
76
87
  if (!isNodeVersionSupported(currentNodeVersion)) {
77
- warning(`You are running Node.js version ${currentNodeVersion}, which is no longer supported. `
78
- + `Please upgrade to Node.js version ${minimumSupportedNodeVersion} or later.`);
88
+ warning({
89
+ message: `You are running Node.js version ${currentNodeVersion}, which is no longer supported. `
90
+ + `Please upgrade to Node.js version ${minimumSupportedNodeVersion} or later.`,
91
+ });
79
92
  }
80
- // If the actor is a Node.js actor (has package.json), run `npm install`
93
+ // If the Actor is a Node.js Actor (has package.json), run `npm install`
81
94
  await updateLocalJson(packageJsonPath, { name: actorName });
82
- // Run npm install in actor dir.
95
+ // Run npm install in Actor dir.
83
96
  // For efficiency, don't install Puppeteer for templates that don't use it
84
97
  const cmdArgs = ['install'];
85
98
  if (skipOptionalDeps) {
@@ -95,8 +108,10 @@ export class CreateCommand extends ApifyCommand {
95
108
  dependenciesInstalled = true;
96
109
  }
97
110
  else {
98
- error(`No Node.js detected! Please install Node.js ${minimumSupportedNodeVersion} or higher`
99
- + ' to be able to run Node.js Actors locally.');
111
+ error({
112
+ message: `No Node.js detected! Please install Node.js ${minimumSupportedNodeVersion} or higher`
113
+ + ' to be able to run Node.js Actors locally.',
114
+ });
100
115
  }
101
116
  }
102
117
  else if (existsSync(requirementsTxtPath)) {
@@ -104,8 +119,8 @@ export class CreateCommand extends ApifyCommand {
104
119
  if (pythonVersion) {
105
120
  if (isPythonVersionSupported(pythonVersion)) {
106
121
  const venvPath = join(actFolderDir, '.venv');
107
- info(`Python version ${pythonVersion} detected.`);
108
- info(`Creating a virtual environment in "${venvPath}" and installing dependencies from "requirements.txt"...`);
122
+ info({ message: `Python version ${pythonVersion} detected.` });
123
+ info({ message: `Creating a virtual environment in "${venvPath}" and installing dependencies from "requirements.txt"...` });
109
124
  let pythonCommand = getPythonCommand(actFolderDir);
110
125
  if (!process.env.VIRTUAL_ENV) {
111
126
  // If Python is not running in a virtual environment, create a new one
@@ -118,24 +133,24 @@ export class CreateCommand extends ApifyCommand {
118
133
  dependenciesInstalled = true;
119
134
  }
120
135
  else {
121
- warning(`Python Actors require Python 3.8 or higher, but you have Python ${pythonVersion}!`);
122
- warning('Please install Python 3.8 or higher to be able to run Python Actors locally.');
136
+ warning({ message: `Python Actors require Python 3.8 or higher, but you have Python ${pythonVersion}!` });
137
+ warning({ message: 'Please install Python 3.8 or higher to be able to run Python Actors locally.' });
123
138
  }
124
139
  }
125
140
  else {
126
- warning('No Python detected! Please install Python 3.8 or higher to be able to run Python Actors locally.');
141
+ warning({ message: 'No Python detected! Please install Python 3.8 or higher to be able to run Python Actors locally.' });
127
142
  }
128
143
  }
129
144
  }
130
145
  if (dependenciesInstalled) {
131
- success(`Actor '${actorName}' was created. To run it, run "cd ${actorName}" and "apify run".`);
132
- success('To run your code in the cloud, run "apify push" and deploy your code to Apify Console.');
146
+ success({ message: `Actor '${actorName}' was created. To run it, run "cd ${actorName}" and "apify run".` });
147
+ info({ message: 'To run your code in the cloud, run "apify push" and deploy your code to Apify Console.' });
133
148
  if (messages?.postCreate) {
134
- info(messages?.postCreate);
149
+ info({ message: messages?.postCreate });
135
150
  }
136
151
  }
137
152
  else {
138
- success(`Actor '${actorName}' was created. Please install its dependencies to be able to run it using "apify run".`);
153
+ success({ message: `Actor '${actorName}' was created. Please install its dependencies to be able to run it using "apify run".` });
139
154
  }
140
155
  }
141
156
  }
@@ -165,6 +180,11 @@ Object.defineProperty(CreateCommand, "flags", {
165
180
  required: false,
166
181
  hidden: true,
167
182
  }),
183
+ 'omit-optional-deps': Flags.boolean({
184
+ aliases: ['no-optional'],
185
+ description: 'Skip installing optional dependencies.',
186
+ required: false,
187
+ }),
168
188
  }
169
189
  });
170
190
  Object.defineProperty(CreateCommand, "args", {
@@ -1 +1 @@
1
- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
@@ -23,8 +23,8 @@ export class EditInputSchemaCommand extends ApifyCommand {
23
23
  // TODO - allow editing input schema embedded in actor.json
24
24
  throw new Error(`Editing an input schema directly embedded in "${LOCAL_CONFIG_PATH}" is not yet supported.`);
25
25
  }
26
- warning('This command is still experimental and might break at any time. Use at your own risk.\n');
27
- info(`Editing input schema at "${inputSchemaPath}"...`);
26
+ warning({ message: 'This command is still experimental and might break at any time. Use at your own risk.\n' });
27
+ info({ message: `Editing input schema at "${inputSchemaPath}"...` });
28
28
  let server;
29
29
  const app = express();
30
30
  // To send requests from browser to localhost, CORS has to be configured properly
@@ -76,15 +76,15 @@ export class EditInputSchemaCommand extends ApifyCommand {
76
76
  appendFinalNewline = inputSchemaStr[inputSchemaStr.length - 1] === '\n';
77
77
  }
78
78
  if (existsSync(inputSchemaPath)) {
79
- info(`Input schema loaded from "${inputSchemaPath}"`);
79
+ info({ message: `Input schema loaded from "${inputSchemaPath}"` });
80
80
  }
81
81
  else {
82
- info(`Empty input schema initialized.`);
82
+ info({ message: `Empty input schema initialized.` });
83
83
  }
84
84
  }
85
85
  catch (err) {
86
86
  const errorMessage = `Reading input schema from disk failed with: ${err.message}`;
87
- error(errorMessage);
87
+ error({ message: errorMessage });
88
88
  res.status(500);
89
89
  res.send(errorMessage);
90
90
  return;
@@ -95,17 +95,17 @@ export class EditInputSchemaCommand extends ApifyCommand {
95
95
  }
96
96
  catch (err) {
97
97
  const errorMessage = `Parsing input schema failed with error: ${err.message}`;
98
- error(errorMessage);
98
+ error({ message: errorMessage });
99
99
  res.status(500);
100
100
  res.send(errorMessage);
101
101
  return;
102
102
  }
103
103
  res.send(inputSchemaObj);
104
- info('Input schema sent to editor.');
104
+ info({ message: 'Input schema sent to editor.' });
105
105
  });
106
106
  apiRouter.post('/input-schema', (req, res) => {
107
107
  try {
108
- info('Got input schema from editor...');
108
+ info({ message: 'Got input schema from editor...' });
109
109
  const inputSchemaObj = req.body;
110
110
  let inputSchemaStr = JSON.stringify(inputSchemaObj, null, jsonIndentation);
111
111
  if (appendFinalNewline)
@@ -116,31 +116,31 @@ export class EditInputSchemaCommand extends ApifyCommand {
116
116
  }
117
117
  writeFileSync(inputSchemaPath, inputSchemaStr, { encoding: 'utf-8', flag: 'w+' });
118
118
  res.end();
119
- info('Input schema saved to disk.');
119
+ info({ message: 'Input schema saved to disk.' });
120
120
  }
121
121
  catch (err) {
122
122
  const errorMessage = `Saving input schema failed with error: ${err.message}`;
123
- error(errorMessage);
123
+ error({ message: errorMessage });
124
124
  res.status(500);
125
125
  res.send(errorMessage);
126
126
  }
127
127
  });
128
128
  apiRouter.post('/exit', (req, res) => {
129
129
  if (req.body.isWindowClosed) {
130
- info('Editor closed, finishing...');
130
+ info({ message: 'Editor closed, finishing...' });
131
131
  }
132
132
  else {
133
- info('Editing finished, you can close the editor.');
133
+ info({ message: 'Editing finished, you can close the editor.' });
134
134
  }
135
135
  res.end();
136
- server.close(() => success('Done.'));
136
+ server.close(() => success({ message: 'Done.' }));
137
137
  });
138
138
  // Listening on port 0 will assign a random available port
139
139
  server = app.listen(0);
140
140
  const { port } = server.address();
141
- info(`Listening for messages from input schema editor on port ${port}...`);
141
+ info({ message: `Listening for messages from input schema editor on port ${port}...` });
142
142
  const editorUrl = `${INPUT_SCHEMA_EDITOR_BASE_URL}?localCliPort=${port}&localCliToken=${authToken}&localCliApiVersion=${API_VERSION}`;
143
- info(`Opening input schema editor at "${editorUrl}"...`);
143
+ info({ message: `Opening input schema editor at "${editorUrl}"...` });
144
144
  await open(editorUrl);
145
145
  }
146
146
  }
@@ -1 +1 @@
1
- {"version":3,"file":"edit-input-schema.js","sourceRoot":"","sources":["../../src/commands/edit-input-schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"edit-input-schema.js","sourceRoot":"","sources":["../../src/commands/edit-input-schema.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import { wrapScrapyProject } from '../lib/projects/scrapy/wrapScrapyProject.js';
5
5
  export class WrapScrapyCommand extends ApifyCommand {
6
6
  async run() {
7
7
  await wrapScrapyProject({ projectPath: this.args.path });
8
- info('Scrapy project wrapped successfully.');
8
+ info({ message: 'Scrapy project wrapped successfully.' });
9
9
  }
10
10
  }
11
11
  Object.defineProperty(WrapScrapyCommand, "description", {
@@ -1 +1 @@
1
- {"version":3,"file":"init-wrap-scrapy.js","sourceRoot":"","sources":["../../src/commands/init-wrap-scrapy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,MAAM,OAAO,iBAAkB,SAAQ,YAAsC;IAmBzE,KAAK,CAAC,GAAG;QACL,MAAM,iBAAiB,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,sCAAsC,CAAC,CAAC;IACjD,CAAC;;AAtBe;;;;WAAc;;;;;;;CAOjC;GAAC;AAEkB;;;;WAAO;QACnB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,uFAAuF;SACvG,CAAC;KACL;GAAC;AAEc;;;;WAAS,IAAI;GAAC"}
1
+ {"version":3,"file":"init-wrap-scrapy.js","sourceRoot":"","sources":["../../src/commands/init-wrap-scrapy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,MAAM,OAAO,iBAAkB,SAAQ,YAAsC;IAmBzE,KAAK,CAAC,GAAG;QACL,MAAM,iBAAiB,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,EAAE,OAAO,EAAE,sCAAsC,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAtBe;;;;WAAc;;;;;;;CAOjC;GAAC;AAEkB;;;;WAAO;QACnB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,uFAAuF;SACvG,CAAC;KACL;GAAC;AAEc;;;;WAAS,IAAI;GAAC"}