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.
Files changed (119) hide show
  1. package/CHANGELOG.md +200 -0
  2. package/README.md +124 -76
  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/get-value.d.ts +1 -1
  8. package/dist/commands/actor/push-data.d.ts +1 -1
  9. package/dist/commands/actor/push-data.js +2 -2
  10. package/dist/commands/actor/set-value.d.ts +3 -3
  11. package/dist/commands/actor/set-value.js +3 -3
  12. package/dist/commands/actor/set-value.js.map +1 -1
  13. package/dist/commands/call.d.ts +7 -6
  14. package/dist/commands/call.d.ts.map +1 -1
  15. package/dist/commands/call.js +56 -90
  16. package/dist/commands/call.js.map +1 -1
  17. package/dist/commands/check-version.d.ts +1 -1
  18. package/dist/commands/create.d.ts +5 -4
  19. package/dist/commands/create.d.ts.map +1 -1
  20. package/dist/commands/create.js +33 -18
  21. package/dist/commands/create.js.map +1 -1
  22. package/dist/commands/edit-input-schema.d.ts +1 -1
  23. package/dist/commands/edit-input-schema.js +15 -15
  24. package/dist/commands/edit-input-schema.js.map +1 -1
  25. package/dist/commands/init-wrap-scrapy.d.ts +1 -1
  26. package/dist/commands/init-wrap-scrapy.js +1 -1
  27. package/dist/commands/init-wrap-scrapy.js.map +1 -1
  28. package/dist/commands/init.d.ts +2 -2
  29. package/dist/commands/init.js +5 -5
  30. package/dist/commands/init.js.map +1 -1
  31. package/dist/commands/login.d.ts +2 -1
  32. package/dist/commands/login.d.ts.map +1 -1
  33. package/dist/commands/login.js +144 -13
  34. package/dist/commands/login.js.map +1 -1
  35. package/dist/commands/logout.js +1 -1
  36. package/dist/commands/logout.js.map +1 -1
  37. package/dist/commands/pull.d.ts +2 -2
  38. package/dist/commands/pull.js +2 -2
  39. package/dist/commands/pull.js.map +1 -1
  40. package/dist/commands/push.d.ts +7 -7
  41. package/dist/commands/push.d.ts.map +1 -1
  42. package/dist/commands/push.js +51 -22
  43. package/dist/commands/push.js.map +1 -1
  44. package/dist/commands/run.d.ts +5 -4
  45. package/dist/commands/run.d.ts.map +1 -1
  46. package/dist/commands/run.js +101 -35
  47. package/dist/commands/run.js.map +1 -1
  48. package/dist/commands/secrets/add.d.ts +2 -2
  49. package/dist/commands/secrets/index.js +1 -1
  50. package/dist/commands/secrets/rm.d.ts +1 -1
  51. package/dist/commands/task/index.d.ts +6 -0
  52. package/dist/commands/task/index.d.ts.map +1 -0
  53. package/dist/commands/task/index.js +13 -0
  54. package/dist/commands/task/index.js.map +1 -0
  55. package/dist/commands/task/run.d.ts +16 -0
  56. package/dist/commands/task/run.d.ts.map +1 -0
  57. package/dist/commands/task/run.js +91 -0
  58. package/dist/commands/task/run.js.map +1 -0
  59. package/dist/commands/{vis.d.ts → validate-schema.d.ts} +3 -2
  60. package/dist/commands/validate-schema.d.ts.map +1 -0
  61. package/dist/commands/{vis.js → validate-schema.js} +10 -4
  62. package/dist/commands/validate-schema.js.map +1 -0
  63. package/dist/hooks/deprecations.d.ts +4 -0
  64. package/dist/hooks/deprecations.d.ts.map +1 -0
  65. package/dist/hooks/deprecations.js +18 -0
  66. package/dist/hooks/deprecations.js.map +1 -0
  67. package/dist/lib/actor.d.ts +1 -1
  68. package/dist/lib/actor.d.ts.map +1 -1
  69. package/dist/lib/actor.js +2 -2
  70. package/dist/lib/actor.js.map +1 -1
  71. package/dist/lib/apify_command.d.ts +0 -1
  72. package/dist/lib/apify_command.d.ts.map +1 -1
  73. package/dist/lib/commands/run-on-cloud.d.ts +19 -0
  74. package/dist/lib/commands/run-on-cloud.d.ts.map +1 -0
  75. package/dist/lib/commands/run-on-cloud.js +90 -0
  76. package/dist/lib/commands/run-on-cloud.js.map +1 -0
  77. package/dist/lib/consts.d.ts +8 -0
  78. package/dist/lib/consts.d.ts.map +1 -1
  79. package/dist/lib/consts.js +10 -0
  80. package/dist/lib/consts.js.map +1 -1
  81. package/dist/lib/create-utils.d.ts.map +1 -1
  82. package/dist/lib/create-utils.js +1 -1
  83. package/dist/lib/create-utils.js.map +1 -1
  84. package/dist/lib/exec.d.ts +0 -1
  85. package/dist/lib/exec.d.ts.map +1 -1
  86. package/dist/lib/exec.js +6 -1
  87. package/dist/lib/exec.js.map +1 -1
  88. package/dist/lib/files.d.ts.map +1 -1
  89. package/dist/lib/input_schema.d.ts +1 -1
  90. package/dist/lib/input_schema.d.ts.map +1 -1
  91. package/dist/lib/input_schema.js +1 -1
  92. package/dist/lib/input_schema.js.map +1 -1
  93. package/dist/lib/local_state.d.ts.map +1 -1
  94. package/dist/lib/outputs.d.ts +18 -6
  95. package/dist/lib/outputs.d.ts.map +1 -1
  96. package/dist/lib/outputs.js +43 -18
  97. package/dist/lib/outputs.js.map +1 -1
  98. package/dist/lib/projects/scrapy/wrapScrapyProject.js +3 -3
  99. package/dist/lib/projects/scrapy/wrapScrapyProject.js.map +1 -1
  100. package/dist/lib/secrets.d.ts.map +1 -1
  101. package/dist/lib/secrets.js +3 -3
  102. package/dist/lib/secrets.js.map +1 -1
  103. package/dist/lib/telemetry.d.ts.map +1 -1
  104. package/dist/lib/telemetry.js +1 -1
  105. package/dist/lib/telemetry.js.map +1 -1
  106. package/dist/lib/utils.d.ts +6 -10
  107. package/dist/lib/utils.d.ts.map +1 -1
  108. package/dist/lib/utils.js +36 -44
  109. package/dist/lib/utils.js.map +1 -1
  110. package/dist/lib/version_check.js +7 -7
  111. package/dist/lib/version_check.js.map +1 -1
  112. package/oclif.manifest.json +123 -37
  113. package/package.json +148 -141
  114. package/dist/commands/login-new.d.ts +0 -10
  115. package/dist/commands/login-new.d.ts.map +0 -1
  116. package/dist/commands/login-new.js +0 -166
  117. package/dist/commands/login-new.js.map +0 -1
  118. package/dist/commands/vis.d.ts.map +0 -1
  119. package/dist/commands/vis.js.map +0 -1
package/dist/lib/outputs.js CHANGED
@@ -1,20 +1,45 @@
1
1
  import chalk from 'chalk';
2
- export const error = (message) => {
3
- console.log(`${chalk.red('Error:')} ${message}`);
4
- };
5
- export const warning = (message) => {
6
- console.log(`${chalk.rgb(254, 90, 29).bold('Warning:')} ${message}`);
7
- };
8
- export const success = (message) => {
9
- console.log(`${chalk.green('Success:')} ${message}`);
10
- };
11
- export const run = (message) => {
12
- console.log(`${chalk.gray('Run:')} ${message}`);
13
- };
14
- export const info = (message) => {
15
- console.log(`${chalk.white('Info:')} ${message}`);
16
- };
17
- export const link = (title, url) => {
18
- console.log(`${chalk.blue(title)} -> ${url}`);
19
- };
2
+ function internalLog(options) {
3
+ if (options.stdoutOutput) {
4
+ console.log(...options.stdoutOutput);
5
+ }
6
+ if (options.stderrOutput) {
7
+ console.error(...options.stderrOutput);
8
+ }
9
+ }
10
+ export function simpleLog(options) {
11
+ internalLog({
12
+ [options.stdout ? 'stdoutOutput' : 'stderrOutput']: [options.message],
13
+ });
14
+ }
15
+ export function error(options) {
16
+ internalLog({
17
+ [options.stdout ? 'stdoutOutput' : 'stderrOutput']: [chalk.red('Error:'), options.message],
18
+ });
19
+ }
20
+ export function warning(options) {
21
+ internalLog({
22
+ [options.stdout ? 'stdoutOutput' : 'stderrOutput']: [chalk.rgb(254, 90, 29).bold('Warning:'), options.message],
23
+ });
24
+ }
25
+ export function success(options) {
26
+ internalLog({
27
+ [options.stdout ? 'stdoutOutput' : 'stderrOutput']: [chalk.green('Success:'), options.message],
28
+ });
29
+ }
30
+ export function run(options) {
31
+ internalLog({
32
+ [options.stdout ? 'stdoutOutput' : 'stderrOutput']: [chalk.gray('Run:'), options.message],
33
+ });
34
+ }
35
+ export function info(options) {
36
+ internalLog({
37
+ [options.stdout ? 'stdoutOutput' : 'stderrOutput']: [chalk.white('Info:'), options.message],
38
+ });
39
+ }
40
+ export function link(options) {
41
+ internalLog({
42
+ [options.stdout ? 'stdoutOutput' : 'stderrOutput']: [chalk.blue(options.message), options.url],
43
+ });
44
+ }
20
45
  //# sourceMappingURL=outputs.js.map
package/dist/lib/outputs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"outputs.js","sourceRoot":"","sources":["../../src/lib/outputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,OAAe,EAAE,EAAE;IACrC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAe,EAAE,EAAE;IACvC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAe,EAAE,EAAE;IACvC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,OAAe,EAAE,EAAE;IACnC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,OAAe,EAAE,EAAE;IACpC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC"}
1
+ {"version":3,"file":"outputs.js","sourceRoot":"","sources":["../../src/lib/outputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,SAAS,WAAW,CAAC,OAAmB;IACpC,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;AACL,CAAC;AAOD,MAAM,UAAU,SAAS,CAAC,OAAyB;IAC/C,WAAW,CAAC;QACR,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;KACxE,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,OAAyB;IAC3C,WAAW,CAAC;QACR,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;KAC7F,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAyB;IAC7C,WAAW,CAAC;QACR,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;KACjH,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAyB;IAC7C,WAAW,CAAC;QACR,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;KACjG,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,OAAyB;IACzC,WAAW,CAAC;QACR,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;KAC5F,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,OAAyB;IAC1C,WAAW,CAAC;QACR,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;KAC9F,CAAC,CAAC;AACP,CAAC;AAMD,MAAM,UAAU,IAAI,CAAC,OAA0B;IAC3C,WAAW,CAAC;QACR,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC;KACjG,CAAC,CAAC;AACP,CAAC"}
package/dist/lib/projects/scrapy/wrapScrapyProject.js CHANGED
@@ -79,7 +79,7 @@ export async function wrapScrapyProject({ projectPath }) {
79
79
  projectFolder: analyzer.settings.BOT_NAME,
80
80
  };
81
81
  const manifest = await fetchManifest(wrapperManifestUrl);
82
- info('Downloading the latest Scrapy wrapper template...');
82
+ info({ message: 'Downloading the latest Scrapy wrapper template...' });
83
83
  const { archiveUrl } = manifest.templates.find(({ id }) => id === 'python-scrapy');
84
84
  const templatePath = join(__dirname, 'templates', 'python-scrapy');
85
85
  if (existsSync(templatePath))
@@ -88,7 +88,7 @@ export async function wrapScrapyProject({ projectPath }) {
88
88
  url: archiveUrl,
89
89
  pathTo: templatePath,
90
90
  });
91
- info('Wrapping the Scrapy project...');
91
+ info({ message: 'Wrapping the Scrapy project...' });
92
92
  await merge(join(__dirname, 'templates', 'python-scrapy'), projectPath, {
93
93
  bindings: templateBindings,
94
94
  });
@@ -104,6 +104,6 @@ export async function wrapScrapyProject({ projectPath }) {
104
104
  });
105
105
  });
106
106
  });
107
- success('The Scrapy project has been wrapped successfully.');
107
+ success({ message: 'The Scrapy project has been wrapped successfully.' });
108
108
  }
109
109
  //# sourceMappingURL=wrapScrapyProject.js.map
package/dist/lib/projects/scrapy/wrapScrapyProject.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"wrapScrapyProject.js","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/wrapScrapyProject.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wrapScrapyProject.js","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/wrapScrapyProject.ts"],"names":[],"mappings":"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"}
package/dist/lib/secrets.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/lib/secrets.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,cAAc,8BAM1B,CAAC;AAQF,eAAO,MAAM,SAAS,SAAU,MAAM,SAAS,MAAM,2BAapD,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,MAAM,SAKxC,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,QAAS,OAAO,MAAM,EAAE,MAAM,CAAC,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC,OAkBhG,CAAC;AAEF,UAAU,MAAM;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;EAIE;AACF,eAAO,MAAM,qBAAqB,QAAS,OAAO,MAAM,EAAE,MAAM,CAAC,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC,aAuBlG,CAAC"}
1
+ {"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/lib/secrets.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,cAAc,8BAM1B,CAAC;AAQF,eAAO,MAAM,SAAS,SAAU,MAAM,SAAS,MAAM,2BAapD,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,MAAM,SAKxC,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,QAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAkBhG,CAAC;AAEF,UAAU,MAAM;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;EAIE;AACF,eAAO,MAAM,qBAAqB,QAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,aAuBlG,CAAC"}
package/dist/lib/secrets.js CHANGED
@@ -24,7 +24,7 @@ const writeSecretsFile = (secrets) => {
24
24
  export const addSecret = (name, value) => {
25
25
  const secrets = getSecretsFile();
26
26
  if (secrets[name])
27
- throw new Error(`Secret with name ${name} already exists. Call "apify secrets:rm ${name}" to remove it.`);
27
+ throw new Error(`Secret with name ${name} already exists. Call "apify secrets rm ${name}" to remove it.`);
28
28
  if (!_.isString(name) || name.length > MAX_ENV_VAR_NAME_LENGTH) {
29
29
  throw new Error(`Secret name has to be string with maximum length ${MAX_ENV_VAR_NAME_LENGTH}.`);
30
30
  }
@@ -60,7 +60,7 @@ export const replaceSecretsValue = (env, secrets) => {
60
60
  updatedEnv[key] = secrets[secretKey];
61
61
  }
62
62
  else {
63
- warning(`Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets:add ${secretKey} [SECRET_VALUE]"`);
63
+ warning({ message: `Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets add ${secretKey} [SECRET_VALUE]"` });
64
64
  }
65
65
  }
66
66
  else {
@@ -89,7 +89,7 @@ export const transformEnvToEnvVars = (env, secrets) => {
89
89
  });
90
90
  }
91
91
  else {
92
- warning(`Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets:add ${secretKey} [SECRET_VALUE]"`);
92
+ warning({ message: `Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets add ${secretKey} [SECRET_VALUE]"` });
93
93
  }
94
94
  }
95
95
  else {
package/dist/lib/secrets.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"secrets.js","sourceRoot":"","sources":["../../src/lib/secrets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"secrets.js","sourceRoot":"","sources":["../../src/lib/secrets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,CAAC,MAAM,YAAY,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,wBAAwB;AACxB,MAAM,uBAAuB,GAAG,GAAG,CAAC;AACpC,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAEvC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IAC/B,IAAI,CAAC;QACD,OAAO,gBAAgB,CAAyB,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC;IAC/E,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAA+B,EAAE,EAAE;IACzD,oBAAoB,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC1C,iBAAiB,CAAC,iBAAiB,EAAE,EAAE,OAAO,CAAC,CAAC;IAChD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE;IACrD,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IAEjC,IAAI,OAAO,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,2CAA2C,IAAI,iBAAiB,CAAC,CAAC;IAC7H,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,uBAAuB,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,oDAAoD,uBAAuB,GAAG,CAAC,CAAC;IACpG,CAAC;IACD,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,wBAAwB,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,qDAAqD,wBAAwB,GAAG,CAAC,CAAC;IACtG,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IACtB,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE;IACzC,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,iBAAiB,CAAC,CAAC;IAC/E,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;IACrC,OAAO,IAAI,MAAM,CAAC,IAAI,iBAAiB,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAA2B,EAAE,OAAgC,EAAE,EAAE;IACjG,OAAO,GAAG,OAAO,IAAI,cAAc,EAAE,CAAC;IACtC,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7B,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACxB,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,iBAAiB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5E,IAAI,OAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACtB,gDAAgD;gBAChD,UAAU,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,EAAE,OAAO,EAAE,aAAa,SAAS,qEAAqE,SAAS,kBAAkB,EAAE,CAAC,CAAC;YACjJ,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,gDAAgD;YAChD,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAQF;;;;EAIE;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAA2B,EAAE,OAAgC,EAAE,EAAE;IACnG,OAAO,GAAG,OAAO,IAAI,cAAc,EAAE,CAAC;IACtC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7B,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACxB,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,iBAAiB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5E,IAAI,OAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC;oBACT,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,OAAQ,CAAC,SAAS,CAAC;oBAC1B,QAAQ,EAAE,IAAI;iBACjB,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,EAAE,OAAO,EAAE,aAAa,SAAS,qEAAqE,SAAS,kBAAkB,EAAE,CAAC,CAAC;YACjJ,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,GAAG;gBACT,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC;aAClB,CAAC,CAAC;QACP,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
package/dist/lib/telemetry.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/lib/telemetry.ts"],"names":[],"mappings":"AAIA,OAAO,QAA0B,MAAM,UAAU,CAAC;AAOlD,eAAO,MAAM,QAAQ,mBAAsD,CAAC;AAa5E;;;GAGG;AACH,eAAO,MAAM,0BAA0B,uBAgBtC,CAAC;AAEF,eAAO,MAAM,yBAAyB,YAOrC,CAAC;AAEF,eAAO,MAAM,kBAAkB,SACwC,CAAC;AAExE;;GAEG;AACH,eAAO,MAAM,mBAAmB;eAAiD,MAAM;eAAa,OAAO,MAAM,EAAE,OAAO,CAAC;mBAY1H,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,WAAkB,MAAM,kBAgBpD,CAAC"}
1
+ {"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/lib/telemetry.ts"],"names":[],"mappings":"AAIA,OAAO,QAA0B,MAAM,UAAU,CAAC;AAOlD,eAAO,MAAM,QAAQ,mBAAsD,CAAC;AAa5E;;;GAGG;AACH,eAAO,MAAM,0BAA0B,uBAgBtC,CAAC;AAEF,eAAO,MAAM,yBAAyB,YAOrC,CAAC;AAEF,eAAO,MAAM,kBAAkB,SACwC,CAAC;AAExE;;GAEG;AACH,eAAO,MAAM,mBAAmB,6BAAoC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,kBAY5H,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,WAAkB,MAAM,kBAgBpD,CAAC"}
package/dist/lib/telemetry.js CHANGED
@@ -29,7 +29,7 @@ export const getOrCreateLocalDistinctId = async () => {
29
29
  const userInfo = await getLocalUserInfo();
30
30
  const distinctId = userInfo.id || createLocalDistinctId();
31
31
  // This first time we are tracking telemetry, so we want to notify user about it.
32
- info(TELEMETRY_WARNING_TEXT);
32
+ info({ message: TELEMETRY_WARNING_TEXT });
33
33
  ensureApifyDirectory(TELEMETRY_FILE_PATH());
34
34
  await writeJsonFile(TELEMETRY_FILE_PATH(), { distinctId });
35
35
  return distinctId;
package/dist/lib/telemetry.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/lib/telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,QAA0B,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEpE,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;AAC5E,MAAM,sBAAsB,GAAG,iGAAiG;MAC1H,uIAAuI;MACvI,iGAAiG,CAAC;AAExG,MAAM,gBAAgB,GAAG,SAAS,CAA6B,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE9F;;;GAGG;AACH,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,OAAO,oBAAoB,EAAE,EAAE,CAAC;AAEpE;;;GAGG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,IAAI,EAAE;IACjD,IAAI,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAyB,mBAAmB,EAAE,CAAC,CAAC;QACpF,OAAO,SAAS,CAAC,UAAU,CAAC;IAChC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,IAAI,qBAAqB,EAAE,CAAC;QAE1D,iFAAiF;QACjF,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAE7B,oBAAoB,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAC5C,MAAM,aAAa,CAAC,mBAAmB,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAE3D,OAAO,UAAU,CAAC;IACtB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,EAAE;IAC1C,IAAI,CAAC;QACD,oBAAoB,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAC5C,iBAAiB,CAAC,mBAAmB,EAAE,EAAE,EAAE,UAAU,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;IACtF,CAAC;IAAC,MAAM,CAAC;QACL,gBAAgB;IACpB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B;OACnE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;AAExE;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAA6D,EAAE,EAAE;IAC7H,IAAI,CAAC,kBAAkB;QAAE,OAAO;IAEhC,IAAI,CAAC;QACD,MAAM,UAAU,GAAG,0BAA0B,EAAE,CAAC;QAChD,MAAM,gBAAgB,CAAC,SAAS,EAAE;YAC9B,WAAW,EAAE,UAAU;YACvB,GAAG,SAAS;SACf,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,gBAAgB;IACpB,CAAC;AACL,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IACrD,IAAI,CAAC,kBAAkB;QAAE,OAAO;IAEhC,IAAI,CAAC;QACD,MAAM,UAAU,GAAG,0BAA0B,EAAE,CAAC;QAChD,oBAAoB,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAC5C,MAAM,aAAa,CAAC,mBAAmB,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QACnE,MAAM,mBAAmB,CAAC;YACtB,SAAS,EAAE,eAAe;YAC1B,SAAS,EAAE;gBACP,KAAK,EAAE,UAAU;aACpB;SACJ,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,gBAAgB;IACpB,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/lib/telemetry.ts"],"names":[],"mappings":"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"}
package/dist/lib/utils.d.ts CHANGED
@@ -1,11 +1,8 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- /// <reference types="node" resolution-mode="require"/>
3
1
  import { IncomingMessage } from 'node:http';
4
- import _Ajv from 'ajv';
5
2
  import { ActorRun, ApifyClient, ApifyClientOptions, Build } from 'apify-client';
6
3
  import { Language } from './consts.js';
7
4
  import { AuthJSON } from './types.js';
8
- export declare const Ajv: typeof _Ajv.default;
5
+ export declare const Ajv: typeof import("ajv").default;
9
6
  export declare const httpsGet: (url: string) => Promise<IncomingMessage>;
10
7
  export declare const getLocalStorageDir: () => string;
11
8
  export declare const getLocalKeyValueStorePath: (storeId?: string) => string;
@@ -48,16 +45,16 @@ export declare const createSourceFiles: (paths: string[], cwd: string) => Promis
48
45
  content: string;
49
46
  }[]>;
50
47
  /**
51
- * Get actor local files, omit files defined in .gitignore and .git folder
48
+ * Get Actor local files, omit files defined in .gitignore and .git folder
52
49
  * All dot files(.file) and folders(.folder/) are included.
53
50
  */
54
51
  export declare const getActorLocalFilePaths: (cwd?: string) => Promise<string[]>;
55
52
  /**
56
- * Create zip file with all actor files specified with pathsToZip
53
+ * Create zip file with all Actor files specified with pathsToZip
57
54
  */
58
55
  export declare const createActZip: (zipName: string, pathsToZip: string[], cwd: string) => Promise<void>;
59
56
  /**
60
- * Get actor input from local store
57
+ * Get Actor input from local store
61
58
  */
62
59
  export declare const getLocalInput: (cwd: string) => {
63
60
  body: Buffer;
@@ -70,15 +67,14 @@ export declare const outputJobLog: (job: ActorRun | Build, timeout?: number) =>
70
67
  /**
71
68
  * Returns npm command for current os
72
69
  * NOTE: For window we have to returns npm.cmd instead of npm, otherwise it doesn't work
73
- * @return {string}
74
70
  */
75
- export declare const getNpmCmd: () => "npm.cmd" | "npm";
71
+ export declare const getNpmCmd: () => string;
76
72
  /**
77
73
  * Returns true if apify storage is empty (expect INPUT.*)
78
74
  */
79
75
  export declare const checkIfStorageIsEmpty: () => Promise<boolean>;
80
76
  /**
81
- * Validates actor name, if finds issue throws error.
77
+ * Validates Actor name, if finds issue throws error.
82
78
  * @param actorName
83
79
  */
84
80
  export declare const validateActorName: (actorName: string) => void;
package/dist/lib/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAiB5C,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAehF,OAAO,EAUH,QAAQ,EAIX,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,eAAO,MAAM,GAAG,qBAAkD,CAAC;AAEnE,eAAO,MAAM,QAAQ,QAAe,MAAM,6BAazC,CAAC;AAKF,eAAO,MAAM,kBAAkB,cAI9B,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,MAAM,WAKzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,aAAc,MAAM,WAKnD,CAAC;AAEF,eAAO,MAAM,wBAAwB,aAAc,MAAM,WAKxD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAa,QAAQ,QAAQ,CAOzD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,4BAQlC,CAAC;AAUF;;GAEG;AACH,eAAO,MAAM,qBAAqB,WAAY,MAAM,eAAe,MAAM,KAAG,kBAiB3E,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAAkB,MAAM,eAAe,MAAM,gCAkBxE,CAAC;AASF,eAAO,MAAM,kBAAkB,0CAA2C,MAAM,kBAM/E,CAAC;AAEF,eAAO,MAAM,cAAc,QAAS,MAAM,wCAAgD,CAAC;AAO3F,eAAO,MAAM,qBAAqB,QAAe,MAAM,iDA6DtD,CAAC;AAEF,eAAO,MAAM,cAAc,gBAAuB,OAAO,MAAM,EAAE,OAAO,CAAC,WAAW,MAAM,kBAGzF,CAAC;AAIF,eAAO,MAAM,WAAW,WAAkB,MAAM,kBA6B/C,CAAC;AAGF,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,IAAI,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,GAAG,MAAM,EAAE,IAAI,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GACpH,GAAG,SAAS,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,GAC/D,CAAC,CAAC;AAEJ,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,MAAM,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC9C,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,qDAU3B,CAAC;AAkCF,eAAO,MAAM,iBAAiB,UAAiB,MAAM,EAAE,OAAO,MAAM;;;;IAYnE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,SAAgB,MAAM,sBAKvD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,YAAY,YAAmB,MAAM,cAAc,MAAM,EAAE,OAAO,MAAM,kBAapF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,QAAS,MAAM;;;aAWxC,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBAK7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,qBAK/B,CAAC;AAEF,eAAO,MAAM,yBAAyB,qBAerC,CAAC;AAEF,eAAO,MAAM,YAAY,QAAe,QAAQ,GAAG,KAAK,YAAY,MAAM,qBA8EzE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,yBAErB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,wBAQjC,CAAC;AA0BF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,cAAe,MAAM,SAUlD,CAAC;AAEF,eAAO,MAAM,iBAAiB,cAAe,MAAM,WAWlD,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAAe,MAAM,WAmBjD,CAAC;AAEF,eAAO,MAAM,mBAAmB,cAAe,MAAM,uBAYpD,CAAC;AAEF,eAAO,MAAM,wBAAwB,2BAA4B,MAAM,YAEtE,CAAC;AAEF,eAAO,MAAM,iBAAiB,0BAW7B,CAAC;AAEF,eAAO,MAAM,sBAAsB,yBAA0B,MAAM,YAKlE,CAAC;AAEF,eAAO,MAAM,gBAAgB,0BAY5B,CAAC;AAEF,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,eAAO,MAAM,wBAAwB,QAAS,MAAM,kBAgBnD,CAAC;AAEF,eAAO,MAAM,gBAAgB;SAAkC,MAAM;YAAU,MAAM;mBAOpF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,SAAU,MAAM,SAIhD,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"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"}
package/dist/lib/utils.js CHANGED
@@ -43,7 +43,7 @@ export const httpsGet = async (url) => {
43
43
  }).on('error', reject);
44
44
  });
45
45
  };
46
- // Properties from apify.json file that will me migrated to actor specs in .actor/actor.json
46
+ // Properties from apify.json file that will me migrated to Actor specs in .actor/actor.json
47
47
  const MIGRATED_APIFY_JSON_PROPERTIES = ['name', 'version', 'buildTag'];
48
48
  export const getLocalStorageDir = () => {
49
49
  const envVar = APIFY_ENV_VARS.LOCAL_STORAGE_DIR;
@@ -68,13 +68,17 @@ export const getLocalRequestQueuePath = (storeId) => {
68
68
  * Returns object from auth file or empty object.
69
69
  */
70
70
  export const getLocalUserInfo = async () => {
71
+ let result = {};
71
72
  try {
72
- const result = await loadJsonFile(AUTH_FILE_PATH());
73
- return (result || {});
73
+ result = await loadJsonFile(AUTH_FILE_PATH());
74
74
  }
75
75
  catch {
76
76
  return {};
77
77
  }
78
+ if (!result.username && !result.id) {
79
+ throw new Error('Corrupted local user info was found. Please run "apify login" to fix it.');
80
+ }
81
+ return result;
78
82
  };
79
83
  /**
80
84
  * Gets instance of ApifyClient for user otherwise throws error
@@ -161,7 +165,7 @@ export const getLocalConfigOrThrow = async (cwd) => {
161
165
  try {
162
166
  renameSync(getDeprecatedLocalConfigPath(cwd), `${getDeprecatedLocalConfigPath(cwd)}.deprecated`);
163
167
  // eslint-disable-next-line max-len
164
- info(`The "apify.json" file has been renamed to "apify.json.deprecated". The deprecated file is no longer used by the CLI or Apify Console. If you do not need it for some specific purpose, it can be safely deleted.`);
168
+ info({ message: `The "apify.json" file has been renamed to "apify.json.deprecated". The deprecated file is no longer used by the CLI or Apify Console. If you do not need it for some specific purpose, it can be safely deleted.` });
165
169
  }
166
170
  catch (e) {
167
171
  throw new Error('Failed to rename deprecated "apify.json".');
@@ -194,7 +198,7 @@ export const getLocalConfigOrThrow = async (cwd) => {
194
198
  await writeJsonFile(getLocalConfigPath(cwd), localConfig);
195
199
  renameSync(getDeprecatedLocalConfigPath(cwd), `${getDeprecatedLocalConfigPath(cwd)}.deprecated`);
196
200
  // eslint-disable-next-line max-len
197
- info(`The "apify.json" file has been migrated to "${LOCAL_CONFIG_PATH}" and the original file renamed to "apify.json.deprecated". The deprecated file is no longer used by the CLI or Apify Console. If you do not need it for some specific purpose, it can be safely deleted. Do not forget to commit the new file to your Git repository.`);
201
+ info({ message: `The "apify.json" file has been migrated to "${LOCAL_CONFIG_PATH}" and the original file renamed to "apify.json.deprecated". The deprecated file is no longer used by the CLI or Apify Console. If you do not need it for some specific purpose, it can be safely deleted. Do not forget to commit the new file to your Git repository.` });
198
202
  }
199
203
  catch (e) {
200
204
  throw new Error(`Can not update "${LOCAL_CONFIG_PATH}" structure. Follow guide on https://github.com/apify/apify-cli/blob/master/MIGRATIONS.md and update it manually.`);
@@ -288,7 +292,7 @@ export const createSourceFiles = async (paths, cwd) => {
288
292
  });
289
293
  };
290
294
  /**
291
- * Get actor local files, omit files defined in .gitignore and .git folder
295
+ * Get Actor local files, omit files defined in .gitignore and .git folder
292
296
  * All dot files(.file) and folders(.folder/) are included.
293
297
  */
294
298
  export const getActorLocalFilePaths = async (cwd) => globby(['*', '**/**'], {
@@ -298,7 +302,7 @@ export const getActorLocalFilePaths = async (cwd) => globby(['*', '**/**'], {
298
302
  cwd,
299
303
  });
300
304
  /**
301
- * Create zip file with all actor files specified with pathsToZip
305
+ * Create zip file with all Actor files specified with pathsToZip
302
306
  */
303
307
  export const createActZip = async (zipName, pathsToZip, cwd) => {
304
308
  // NOTE: There can be a zip from a previous unfinished operation.
@@ -312,10 +316,13 @@ export const createActZip = async (zipName, pathsToZip, cwd) => {
312
316
  await archive.finalize();
313
317
  };
314
318
  /**
315
- * Get actor input from local store
319
+ * Get Actor input from local store
316
320
  */
317
321
  export const getLocalInput = (cwd) => {
318
322
  const defaultLocalStorePath = getLocalKeyValueStorePath();
323
+ const folderExists = existsSync(join(cwd, defaultLocalStorePath));
324
+ if (!folderExists)
325
+ return;
319
326
  const files = readdirSync(join(cwd, defaultLocalStorePath));
320
327
  const inputName = files.find((file) => !!file.match(INPUT_FILE_REG_EXP));
321
328
  // No input file
@@ -356,11 +363,14 @@ export const outputJobLog = async (job, timeout) => {
356
363
  const apifyClient = new ApifyClient({ baseUrl: process.env.APIFY_CLIENT_BASE_URL });
357
364
  // In case job was already done just output log
358
365
  if (ACTOR_JOB_TERMINAL_STATUSES.includes(status)) {
366
+ if (process.env.APIFY_NO_LOGS_IN_TESTS) {
367
+ return;
368
+ }
359
369
  const log = await apifyClient.log(logId).get();
360
- process.stdout.write(log);
370
+ process.stderr.write(log);
361
371
  return;
362
372
  }
363
- // In other case stream it to stdout
373
+ // In other case stream it to stderr
364
374
  // eslint-disable-next-line no-async-promise-executor
365
375
  return new Promise(async (resolve) => {
366
376
  const stream = await apifyClient.log(logId).stream();
@@ -370,12 +380,12 @@ export const outputJobLog = async (job, timeout) => {
370
380
  }
371
381
  let nodeTimeout = null;
372
382
  stream.on('data', (chunk) => {
373
- // In tests, writing to process.stdout directly messes with vitest's output
383
+ // In tests, writing to process.stderr directly messes with vitest's output
374
384
  // With that said, we still NEED to wait for this stream to end, as otherwise tests become flaky.
375
385
  if (process.env.APIFY_NO_LOGS_IN_TESTS) {
376
386
  return;
377
387
  }
378
- process.stdout.write(chunk.toString());
388
+ process.stderr.write(chunk.toString());
379
389
  });
380
390
  stream.once('end', () => {
381
391
  resolve('finished');
@@ -390,38 +400,10 @@ export const outputJobLog = async (job, timeout) => {
390
400
  }, timeout);
391
401
  }
392
402
  });
393
- // return new Promise((resolve, reject) => {
394
- // const req = get(`https://api.apify.com/v2/logs/${logId}?stream=1`);
395
- // let res: IncomingMessage;
396
- // req.on('response', (response) => {
397
- // res = response;
398
- // response.on('data', (chunk) => process.stdout.write(chunk.toString()));
399
- // response.on('error', (err) => {
400
- // reject(err);
401
- // });
402
- // });
403
- // req.on('error', (err) => {
404
- // reject(err);
405
- // });
406
- // req.on('close', () => {
407
- // resolve('finished');
408
- // });
409
- // if (timeout) {
410
- // setTimeout(() => {
411
- // if (res) res.removeAllListeners();
412
- // if (req) {
413
- // req.removeAllListeners();
414
- // req.destroy();
415
- // }
416
- // resolve('timeouts');
417
- // }, timeout);
418
- // }
419
- // });
420
403
  };
421
404
  /**
422
405
  * Returns npm command for current os
423
406
  * NOTE: For window we have to returns npm.cmd instead of npm, otherwise it doesn't work
424
- * @return {string}
425
407
  */
426
408
  export const getNpmCmd = () => {
427
409
  return /^win/.test(process.platform) ? 'npm.cmd' : 'npm';
@@ -460,7 +442,7 @@ const updateLocalConfigStructure = (localConfig) => {
460
442
  return updatedLocalConfig;
461
443
  };
462
444
  /**
463
- * Validates actor name, if finds issue throws error.
445
+ * Validates Actor name, if finds issue throws error.
464
446
  * @param actorName
465
447
  */
466
448
  export const validateActorName = (actorName) => {
@@ -501,10 +483,14 @@ export const getPythonCommand = (directory) => {
501
483
  ? 'python'
502
484
  : 'python3';
503
485
  };
486
+ const spawnOptions = { shell: true, windowsHide: true };
504
487
  export const detectPythonVersion = (directory) => {
505
488
  const pythonCommand = getPythonCommand(directory);
506
489
  try {
507
- const spawnResult = spawnSync(pythonCommand, ['-c', 'import platform; print(platform.python_version())'], { encoding: 'utf-8' });
490
+ const spawnResult = spawnSync(pythonCommand, ['-c', '"import platform; print(platform.python_version())"'], {
491
+ ...spawnOptions,
492
+ encoding: 'utf-8',
493
+ });
508
494
  if (!spawnResult.error && spawnResult.stdout) {
509
495
  return spawnResult.stdout.trim();
510
496
  }
@@ -519,7 +505,10 @@ export const isPythonVersionSupported = (installedPythonVersion) => {
519
505
  };
520
506
  export const detectNodeVersion = () => {
521
507
  try {
522
- const spawnResult = spawnSync('node', ['--version'], { encoding: 'utf-8' });
508
+ const spawnResult = spawnSync('node', ['--version'], {
509
+ ...spawnOptions,
510
+ encoding: 'utf-8',
511
+ });
523
512
  if (!spawnResult.error && spawnResult.stdout) {
524
513
  return spawnResult.stdout.trim().replace(/^v/, '');
525
514
  }
@@ -538,7 +527,10 @@ export const isNodeVersionSupported = (installedNodeVersion) => {
538
527
  export const detectNpmVersion = () => {
539
528
  const npmCommand = getNpmCmd();
540
529
  try {
541
- const spawnResult = spawnSync(npmCommand, ['--version'], { encoding: 'utf-8' });
530
+ const spawnResult = spawnSync(npmCommand, ['--version'], {
531
+ ...spawnOptions,
532
+ encoding: 'utf-8',
533
+ });
542
534
  if (!spawnResult.error && spawnResult.stdout) {
543
535
  return spawnResult.stdout.trim().replace(/^v/, '');
544
536
  }
package/dist/lib/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"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"}
package/dist/lib/version_check.js CHANGED
@@ -4,7 +4,7 @@ import chalk from 'chalk';
4
4
  import { gt } from 'semver';
5
5
  import { CHECK_VERSION_EVERY_MILLIS, CURRENT_APIFY_CLI_VERSION } from './consts.js';
6
6
  import { extendLocalState, getLocalState } from './local_state.js';
7
- import { info, warning } from './outputs.js';
7
+ import { info, simpleLog, warning } from './outputs.js';
8
8
  const INSTALLATION_TYPE = {
9
9
  HOMEBREW: 'HOMEBREW',
10
10
  NPM: 'NPM',
@@ -46,7 +46,7 @@ export const getLatestNpmVersion = async () => {
46
46
  */
47
47
  const getAndCacheLatestNpmVersion = async () => {
48
48
  try {
49
- info('Making sure that Apify CLI is up to date...');
49
+ info({ message: 'Making sure that Apify CLI is up to date...' });
50
50
  const latestNpmVersion = await getLatestNpmVersion();
51
51
  extendLocalState({
52
52
  latestNpmVersion,
@@ -56,7 +56,7 @@ const getAndCacheLatestNpmVersion = async () => {
56
56
  }
57
57
  catch (err) {
58
58
  console.error(err);
59
- warning('Cannot fetch the latest Apify CLI version from NPM, using the cached version instead.');
59
+ warning({ message: 'Cannot fetch the latest Apify CLI version from NPM, using the cached version instead.' });
60
60
  return undefined;
61
61
  }
62
62
  };
@@ -77,14 +77,14 @@ export const checkLatestVersion = async (enforceUpdate = false) => {
77
77
  if (latestNpmVersion && gt(latestNpmVersion, CURRENT_APIFY_CLI_VERSION)) {
78
78
  const installationType = detectInstallationType();
79
79
  const updateCommand = `' ${UPDATE_COMMAND[installationType]} '`;
80
- console.log('');
81
- warning('You are using an old version of Apify CLI. We strongly recommend you always use the latest available version.');
82
- console.log(` ↪ Run ${chalk.bgWhite(chalk.black(updateCommand))} to update! 👍 \n`);
80
+ simpleLog({ message: '' });
81
+ warning({ message: 'You are using an old version of Apify CLI. We strongly recommend you always use the latest available version.' });
82
+ simpleLog({ message: ` ↪ Run ${chalk.bgWhite(chalk.black(updateCommand))} to update! 👍 \n` });
83
83
  }
84
84
  else if (shouldGetCurrentVersion) {
85
85
  // In this case the version was refreshed from the NPM which took a while and "Info: Making sure that Apify ..." was printed
86
86
  // so also print the state.
87
- info('Apify CLI is up to date 👍 \n');
87
+ info({ message: 'Apify CLI is up to date 👍 \n' });
88
88
  }
89
89
  };
90
90
  //# sourceMappingURL=version_check.js.map