apify-cli 0.21.0-beta.8 → 0.21.0-beta.80
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 +40 -1
- package/README.md +589 -74
- package/dist/.tsbuildinfo +1 -1
- package/dist/commands/actor/get-input.js +1 -6
- package/dist/commands/actor/get-input.js.map +1 -1
- package/dist/commands/actor/get-value.js +7 -17
- package/dist/commands/actor/get-value.js.map +1 -1
- package/dist/commands/actor/index.js +1 -6
- package/dist/commands/actor/index.js.map +1 -1
- package/dist/commands/actor/push-data.d.ts.map +1 -1
- package/dist/commands/actor/push-data.js +20 -24
- package/dist/commands/actor/push-data.js.map +1 -1
- package/dist/commands/actor/set-value.js +27 -50
- package/dist/commands/actor/set-value.js.map +1 -1
- package/dist/commands/actors/build.d.ts +4 -0
- package/dist/commands/actors/build.d.ts.map +1 -0
- package/dist/commands/actors/build.js +4 -0
- package/dist/commands/actors/build.js.map +1 -0
- package/dist/commands/actors/call.d.ts +30 -0
- package/dist/commands/actors/call.d.ts.map +1 -0
- package/dist/commands/actors/call.js +221 -0
- package/dist/commands/actors/call.js.map +1 -0
- package/dist/commands/actors/index.js +1 -6
- package/dist/commands/actors/index.js.map +1 -1
- package/dist/commands/actors/info.d.ts +22 -0
- package/dist/commands/actors/info.d.ts.map +1 -0
- package/dist/commands/actors/info.js +201 -0
- package/dist/commands/actors/info.js.map +1 -0
- package/dist/commands/actors/ls.d.ts +15 -0
- package/dist/commands/actors/ls.d.ts.map +1 -0
- package/dist/commands/actors/ls.js +168 -0
- package/dist/commands/actors/ls.js.map +1 -0
- package/dist/commands/actors/pull.d.ts +13 -0
- package/dist/commands/actors/pull.d.ts.map +1 -0
- package/dist/commands/actors/pull.js +151 -0
- package/dist/commands/actors/pull.js.map +1 -0
- package/dist/commands/actors/push.d.ts +18 -0
- package/dist/commands/actors/push.d.ts.map +1 -0
- package/dist/commands/actors/push.js +306 -0
- package/dist/commands/actors/push.js.map +1 -0
- package/dist/commands/actors/rm.js +7 -17
- package/dist/commands/actors/rm.js.map +1 -1
- package/dist/commands/actors/start.d.ts +18 -0
- package/dist/commands/actors/start.d.ts.map +1 -0
- package/dist/commands/actors/start.js +124 -0
- package/dist/commands/actors/start.js.map +1 -0
- package/dist/commands/builds/create.d.ts +3 -1
- package/dist/commands/builds/create.d.ts.map +1 -1
- package/dist/commands/builds/create.js +35 -37
- package/dist/commands/builds/create.js.map +1 -1
- package/dist/commands/builds/index.js +1 -6
- package/dist/commands/builds/index.js.map +1 -1
- package/dist/commands/builds/info.js +11 -26
- package/dist/commands/builds/info.js.map +1 -1
- package/dist/commands/builds/log.d.ts.map +1 -1
- package/dist/commands/builds/log.js +12 -19
- package/dist/commands/builds/log.js.map +1 -1
- package/dist/commands/builds/ls.d.ts +3 -1
- package/dist/commands/builds/ls.d.ts.map +1 -1
- package/dist/commands/builds/ls.js +40 -45
- package/dist/commands/builds/ls.js.map +1 -1
- package/dist/commands/builds/rm.d.ts.map +1 -1
- package/dist/commands/builds/rm.js +11 -19
- package/dist/commands/builds/rm.js.map +1 -1
- package/dist/commands/call.d.ts +2 -18
- package/dist/commands/call.d.ts.map +1 -1
- package/dist/commands/call.js +2 -181
- package/dist/commands/call.js.map +1 -1
- package/dist/commands/check-version.js +8 -28
- package/dist/commands/check-version.js.map +1 -1
- package/dist/commands/create.js +29 -44
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/datasets/create.d.ts +10 -0
- package/dist/commands/datasets/create.d.ts.map +1 -0
- package/dist/commands/datasets/create.js +37 -0
- package/dist/commands/datasets/create.js.map +1 -0
- package/dist/commands/datasets/get-items.d.ts +17 -0
- package/dist/commands/datasets/get-items.d.ts.map +1 -0
- package/dist/commands/datasets/get-items.js +85 -0
- package/dist/commands/datasets/get-items.js.map +1 -0
- package/dist/commands/datasets/index.js +1 -6
- package/dist/commands/datasets/index.js.map +1 -1
- package/dist/commands/datasets/ls.d.ts +13 -0
- package/dist/commands/datasets/ls.d.ts.map +1 -0
- package/dist/commands/datasets/ls.js +72 -0
- package/dist/commands/datasets/ls.js.map +1 -0
- package/dist/commands/datasets/push-items.d.ts +10 -0
- package/dist/commands/datasets/push-items.d.ts.map +1 -0
- package/dist/commands/datasets/push-items.js +69 -0
- package/dist/commands/datasets/push-items.js.map +1 -0
- package/dist/commands/datasets/rename.d.ts +13 -0
- package/dist/commands/datasets/rename.d.ts.map +1 -0
- package/dist/commands/datasets/rename.js +69 -0
- package/dist/commands/datasets/rename.js.map +1 -0
- package/dist/commands/datasets/rm.d.ts +9 -0
- package/dist/commands/datasets/rm.d.ts.map +1 -0
- package/dist/commands/datasets/rm.js +47 -0
- package/dist/commands/datasets/rm.js.map +1 -0
- package/dist/commands/edit-input-schema.js +9 -29
- package/dist/commands/edit-input-schema.js.map +1 -1
- package/dist/commands/info.js +2 -7
- package/dist/commands/info.js.map +1 -1
- package/dist/commands/init-wrap-scrapy.js +9 -24
- package/dist/commands/init-wrap-scrapy.js.map +1 -1
- package/dist/commands/init.js +19 -34
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/key-value-stores/create.d.ts +11 -0
- package/dist/commands/key-value-stores/create.d.ts.map +1 -0
- package/dist/commands/key-value-stores/create.js +38 -0
- package/dist/commands/key-value-stores/create.js.map +1 -0
- package/dist/commands/key-value-stores/delete-value.d.ts +11 -0
- package/dist/commands/key-value-stores/delete-value.d.ts.map +1 -0
- package/dist/commands/key-value-stores/delete-value.js +61 -0
- package/dist/commands/key-value-stores/delete-value.js.map +1 -0
- package/dist/commands/key-value-stores/get-value.d.ts +14 -0
- package/dist/commands/key-value-stores/get-value.d.ts.map +1 -0
- package/dist/commands/key-value-stores/get-value.js +69 -0
- package/dist/commands/key-value-stores/get-value.js.map +1 -0
- package/dist/commands/key-value-stores/index.d.ts +1 -0
- package/dist/commands/key-value-stores/index.d.ts.map +1 -1
- package/dist/commands/key-value-stores/index.js +2 -6
- package/dist/commands/key-value-stores/index.js.map +1 -1
- package/dist/commands/key-value-stores/keys.d.ts +15 -0
- package/dist/commands/key-value-stores/keys.d.ts.map +1 -0
- package/dist/commands/key-value-stores/keys.js +60 -0
- package/dist/commands/key-value-stores/keys.js.map +1 -0
- package/dist/commands/key-value-stores/ls.d.ts +14 -0
- package/dist/commands/key-value-stores/ls.d.ts.map +1 -0
- package/dist/commands/key-value-stores/ls.js +71 -0
- package/dist/commands/key-value-stores/ls.js.map +1 -0
- package/dist/commands/key-value-stores/rename.d.ts +14 -0
- package/dist/commands/key-value-stores/rename.d.ts.map +1 -0
- package/dist/commands/key-value-stores/rename.js +70 -0
- package/dist/commands/key-value-stores/rename.js.map +1 -0
- package/dist/commands/key-value-stores/rm.d.ts +10 -0
- package/dist/commands/key-value-stores/rm.d.ts.map +1 -0
- package/dist/commands/key-value-stores/rm.js +48 -0
- package/dist/commands/key-value-stores/rm.js.map +1 -0
- package/dist/commands/key-value-stores/set-value.d.ts +15 -0
- package/dist/commands/key-value-stores/set-value.d.ts.map +1 -0
- package/dist/commands/key-value-stores/set-value.js +59 -0
- package/dist/commands/key-value-stores/set-value.js.map +1 -0
- package/dist/commands/login.js +16 -26
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +2 -7
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/pull.d.ts +2 -10
- package/dist/commands/pull.d.ts.map +1 -1
- package/dist/commands/pull.js +2 -160
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.d.ts +2 -16
- package/dist/commands/push.d.ts.map +1 -1
- package/dist/commands/push.js +2 -323
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/request-queues/index.js +1 -6
- package/dist/commands/request-queues/index.js.map +1 -1
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +67 -62
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/runs/abort.d.ts.map +1 -1
- package/dist/commands/runs/abort.js +21 -39
- package/dist/commands/runs/abort.js.map +1 -1
- package/dist/commands/runs/index.js +1 -6
- package/dist/commands/runs/index.js.map +1 -1
- package/dist/commands/runs/info.js +21 -41
- package/dist/commands/runs/info.js.map +1 -1
- package/dist/commands/runs/log.js +9 -19
- package/dist/commands/runs/log.js.map +1 -1
- package/dist/commands/runs/ls.d.ts +3 -1
- package/dist/commands/runs/ls.d.ts.map +1 -1
- package/dist/commands/runs/ls.js +34 -45
- package/dist/commands/runs/ls.js.map +1 -1
- package/dist/commands/runs/resurrect.d.ts.map +1 -1
- package/dist/commands/runs/resurrect.js +12 -25
- package/dist/commands/runs/resurrect.js.map +1 -1
- package/dist/commands/runs/rm.js +7 -17
- package/dist/commands/runs/rm.js.map +1 -1
- package/dist/commands/secrets/add.js +7 -17
- package/dist/commands/secrets/add.js.map +1 -1
- package/dist/commands/secrets/index.js +6 -11
- package/dist/commands/secrets/index.js.map +1 -1
- package/dist/commands/secrets/rm.js +7 -17
- package/dist/commands/secrets/rm.js.map +1 -1
- package/dist/commands/task/index.js +1 -6
- package/dist/commands/task/index.js.map +1 -1
- package/dist/commands/task/run.d.ts +0 -1
- package/dist/commands/task/run.d.ts.map +1 -1
- package/dist/commands/task/run.js +30 -30
- package/dist/commands/task/run.js.map +1 -1
- package/dist/commands/validate-schema.js +17 -32
- package/dist/commands/validate-schema.js.map +1 -1
- package/dist/lib/apify_command.d.ts.map +1 -1
- package/dist/lib/apify_command.js +3 -21
- package/dist/lib/apify_command.js.map +1 -1
- package/dist/lib/commands/confirm.d.ts +2 -2
- package/dist/lib/commands/confirm.d.ts.map +1 -1
- package/dist/lib/commands/confirm.js +1 -1
- package/dist/lib/commands/confirm.js.map +1 -1
- package/dist/lib/commands/pretty-print-bytes.d.ts +6 -1
- package/dist/lib/commands/pretty-print-bytes.d.ts.map +1 -1
- package/dist/lib/commands/pretty-print-bytes.js +5 -4
- package/dist/lib/commands/pretty-print-bytes.js.map +1 -1
- package/dist/lib/commands/read-stdin.d.ts +1 -1
- package/dist/lib/commands/read-stdin.d.ts.map +1 -1
- package/dist/lib/commands/read-stdin.js +13 -1
- package/dist/lib/commands/read-stdin.js.map +1 -1
- package/dist/lib/commands/resolve-input.js +1 -1
- package/dist/lib/commands/resolve-input.js.map +1 -1
- package/dist/lib/commands/responsive-table.d.ts +15 -1
- package/dist/lib/commands/responsive-table.d.ts.map +1 -1
- package/dist/lib/commands/responsive-table.js +36 -14
- package/dist/lib/commands/responsive-table.js.map +1 -1
- package/dist/lib/commands/run-on-cloud.d.ts +3 -2
- package/dist/lib/commands/run-on-cloud.d.ts.map +1 -1
- package/dist/lib/commands/run-on-cloud.js +42 -18
- package/dist/lib/commands/run-on-cloud.js.map +1 -1
- package/dist/lib/commands/storages.d.ts +10 -0
- package/dist/lib/commands/storages.d.ts.map +1 -0
- package/dist/lib/commands/storages.js +30 -0
- package/dist/lib/commands/storages.js.map +1 -0
- package/dist/lib/consts.d.ts.map +1 -1
- package/dist/lib/consts.js +11 -1
- package/dist/lib/consts.js.map +1 -1
- package/dist/lib/create-utils.d.ts +1 -1
- package/dist/lib/create-utils.d.ts.map +1 -1
- package/dist/lib/create-utils.js +1 -2
- package/dist/lib/create-utils.js.map +1 -1
- package/dist/lib/exec.d.ts.map +1 -1
- package/dist/lib/exec.js +3 -1
- package/dist/lib/exec.js.map +1 -1
- package/dist/lib/projects/scrapy/ScrapyProjectAnalyzer.d.ts.map +1 -1
- package/dist/lib/projects/scrapy/ScrapyProjectAnalyzer.js +8 -22
- package/dist/lib/projects/scrapy/ScrapyProjectAnalyzer.js.map +1 -1
- package/dist/lib/projects/scrapy/Spider.js +4 -24
- package/dist/lib/projects/scrapy/Spider.js.map +1 -1
- package/dist/lib/projects/scrapy/SpiderFileAnalyzer.js +1 -6
- package/dist/lib/projects/scrapy/SpiderFileAnalyzer.js.map +1 -1
- package/dist/lib/projects/scrapy/wrapScrapyProject.d.ts.map +1 -1
- package/dist/lib/projects/scrapy/wrapScrapyProject.js +3 -2
- package/dist/lib/projects/scrapy/wrapScrapyProject.js.map +1 -1
- package/dist/lib/telemetry.d.ts.map +1 -1
- package/dist/lib/telemetry.js +1 -0
- package/dist/lib/telemetry.js.map +1 -1
- package/dist/lib/utils.d.ts +2 -2
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +1 -2
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/version_check.d.ts +1 -1
- package/dist/lib/version_check.d.ts.map +1 -1
- package/dist/lib/version_check.js +6 -0
- package/dist/lib/version_check.js.map +1 -1
- package/dist/typechecking.tsbuildinfo +1 -1
- package/oclif.manifest.json +1206 -166
- package/package.json +19 -18
|
@@ -8,33 +8,55 @@ const compactModeChars = {
|
|
|
8
8
|
'top-mid': '─',
|
|
9
9
|
'bottom-mid': '─',
|
|
10
10
|
};
|
|
11
|
+
const compactModeCharsWithLineSeparator = {
|
|
12
|
+
middle: ' ',
|
|
13
|
+
'top-mid': '─',
|
|
14
|
+
'bottom-mid': '─',
|
|
15
|
+
top: '─',
|
|
16
|
+
bottom: '─',
|
|
17
|
+
'left-mid': '├',
|
|
18
|
+
mid: '─',
|
|
19
|
+
'mid-mid': '─',
|
|
20
|
+
'right-mid': '┤',
|
|
21
|
+
};
|
|
22
|
+
export var CompactMode;
|
|
23
|
+
(function (CompactMode) {
|
|
24
|
+
/**
|
|
25
|
+
* Print the table as is
|
|
26
|
+
*/
|
|
27
|
+
CompactMode[CompactMode["None"] = -1] = "None";
|
|
28
|
+
/**
|
|
29
|
+
* Minimized version of the table, with no separators between rows
|
|
30
|
+
*/
|
|
31
|
+
CompactMode[CompactMode["VeryCompact"] = 0] = "VeryCompact";
|
|
32
|
+
/**
|
|
33
|
+
* A version of the compact table that looks akin to the web console (fewer separators, but with lines between rows)
|
|
34
|
+
*/
|
|
35
|
+
CompactMode[CompactMode["WebLikeCompact"] = 1] = "WebLikeCompact";
|
|
36
|
+
})(CompactMode || (CompactMode = {}));
|
|
37
|
+
const charMap = {
|
|
38
|
+
[CompactMode.None]: undefined,
|
|
39
|
+
[CompactMode.VeryCompact]: compactModeChars,
|
|
40
|
+
[CompactMode.WebLikeCompact]: compactModeCharsWithLineSeparator,
|
|
41
|
+
};
|
|
11
42
|
function generateHeaderColors(length) {
|
|
12
43
|
return Array.from({ length }, () => 'cyan');
|
|
13
44
|
}
|
|
14
45
|
const terminalColumns = process.stdout.columns ?? 100;
|
|
15
46
|
export class ResponsiveTable {
|
|
47
|
+
options;
|
|
48
|
+
rows = [];
|
|
16
49
|
constructor(options) {
|
|
17
|
-
Object.defineProperty(this, "options", {
|
|
18
|
-
enumerable: true,
|
|
19
|
-
configurable: true,
|
|
20
|
-
writable: true,
|
|
21
|
-
value: void 0
|
|
22
|
-
});
|
|
23
|
-
Object.defineProperty(this, "rows", {
|
|
24
|
-
enumerable: true,
|
|
25
|
-
configurable: true,
|
|
26
|
-
writable: true,
|
|
27
|
-
value: []
|
|
28
|
-
});
|
|
29
50
|
this.options = options;
|
|
30
51
|
}
|
|
31
52
|
pushRow(item) {
|
|
32
53
|
this.rows.push(item);
|
|
33
54
|
}
|
|
34
|
-
render(
|
|
55
|
+
render(compactMode) {
|
|
35
56
|
const head = terminalColumns < 100 ? this.options.mandatoryColumns : this.options.allColumns;
|
|
36
57
|
const headColors = generateHeaderColors(head.length);
|
|
37
|
-
const
|
|
58
|
+
const compact = compactMode === CompactMode.VeryCompact;
|
|
59
|
+
const chars = charMap[compactMode];
|
|
38
60
|
const colAligns = [];
|
|
39
61
|
for (const column of head) {
|
|
40
62
|
colAligns.push(this.options.columnAlignments?.[column] || 'left');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responsive-table.js","sourceRoot":"","sources":["../../../src/lib/commands/responsive-table.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"responsive-table.js","sourceRoot":"","sources":["../../../src/lib/commands/responsive-table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,YAAY,CAAC;AAElD,MAAM,gBAAgB,GAAsC;IAC3D,KAAK,EAAE,EAAE;IACT,UAAU,EAAE,EAAE;IACd,SAAS,EAAE,EAAE;IACb,WAAW,EAAE,EAAE;IACf,MAAM,EAAE,GAAG;IACX,SAAS,EAAE,GAAG;IACd,YAAY,EAAE,GAAG;CACjB,CAAC;AAEF,MAAM,iCAAiC,GAAsC;IAC5E,MAAM,EAAE,GAAG;IACX,SAAS,EAAE,GAAG;IACd,YAAY,EAAE,GAAG;IACjB,GAAG,EAAE,GAAG;IACR,MAAM,EAAE,GAAG;IAEX,UAAU,EAAE,GAAG;IACf,GAAG,EAAE,GAAG;IACR,SAAS,EAAE,GAAG;IACd,WAAW,EAAE,GAAG;CAChB,CAAC;AAEF,MAAM,CAAN,IAAY,WAaX;AAbD,WAAY,WAAW;IACtB;;OAEG;IACH,8CAAS,CAAA;IACT;;OAEG;IACH,2DAAe,CAAA;IACf;;OAEG;IACH,iEAAkB,CAAA;AACnB,CAAC,EAbW,WAAW,KAAX,WAAW,QAatB;AAED,MAAM,OAAO,GAAG;IACf,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,SAAS;IAC7B,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,gBAAgB;IAC3C,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,iCAAiC;CACc,CAAC;AAE/E,SAAS,oBAAoB,CAAC,MAAc;IAC3C,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC;AAqBtD,MAAM,OAAO,eAAe;IACnB,OAAO,CAAuD;IAE9D,IAAI,GAAiC,EAAE,CAAC;IAEhD,YAAY,OAA6D;QACxE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,IAAgC;QACvC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,WAAwB;QAC9B,MAAM,IAAI,GAAG,eAAe,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC7F,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,WAAW,KAAK,WAAW,CAAC,WAAW,CAAC;QACxD,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAEnC,MAAM,SAAS,GAAoC,EAAE,CAAC;QAEtD,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;YAC3B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,IAAI;YACJ,KAAK,EAAE;gBACN,IAAI,EAAE,UAAU;gBAChB,OAAO;aACP;YACD,SAAS;YACT,KAAK;SACL,CAAC,CAAC;QAEH,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC;QAED,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;CACD"}
|
|
@@ -10,12 +10,13 @@ export interface RunOnCloudOptions {
|
|
|
10
10
|
waitForFinishMillis?: number;
|
|
11
11
|
inputOverride?: Record<string, unknown>;
|
|
12
12
|
silent?: boolean;
|
|
13
|
+
waitForRunToFinish?: boolean;
|
|
14
|
+
printRunLogs?: boolean;
|
|
13
15
|
}
|
|
14
|
-
export declare function runActorOrTaskOnCloud(apifyClient: ApifyClient, options: RunOnCloudOptions):
|
|
16
|
+
export declare function runActorOrTaskOnCloud(apifyClient: ApifyClient, options: RunOnCloudOptions): AsyncGenerator<ActorRun, void, unknown>;
|
|
15
17
|
export declare const SharedRunOnCloudFlags: (type: "Actor" | "Task") => {
|
|
16
18
|
build: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
17
19
|
timeout: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
18
20
|
memory: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
19
|
-
'wait-for-finish': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
20
21
|
};
|
|
21
22
|
//# sourceMappingURL=run-on-cloud.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-on-cloud.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/run-on-cloud.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"run-on-cloud.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/run-on-cloud.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAe5E,MAAM,WAAW,iBAAiB;IACjC,eAAe,EAAE;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,cAAc,EAAE,MAAM,CAAC;QACvB,KAAK,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,UAAU,EAAE,gBAAgB,CAAC;IAC7B,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAuB,qBAAqB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,2CA2GhG;AAED,eAAO,MAAM,qBAAqB,SAAU,OAAO,GAAG,MAAM;;;;CAgB1D,CAAC"}
|
|
@@ -1,27 +1,38 @@
|
|
|
1
1
|
import process from 'node:process';
|
|
2
2
|
import { ACTOR_JOB_STATUSES } from '@apify/consts';
|
|
3
3
|
import { Flags } from '@oclif/core';
|
|
4
|
+
import chalk from 'chalk';
|
|
4
5
|
import { resolveInput } from './resolve-input.js';
|
|
5
6
|
import { CommandExitCodes } from '../consts.js';
|
|
6
|
-
import { error,
|
|
7
|
+
import { error, run as runLog, success, warning } from '../outputs.js';
|
|
7
8
|
import { outputJobLog } from '../utils.js';
|
|
8
|
-
|
|
9
|
+
const TerminalStatuses = [
|
|
10
|
+
ACTOR_JOB_STATUSES.SUCCEEDED,
|
|
11
|
+
ACTOR_JOB_STATUSES.ABORTED,
|
|
12
|
+
ACTOR_JOB_STATUSES.FAILED,
|
|
13
|
+
ACTOR_JOB_STATUSES.TIMED_OUT,
|
|
14
|
+
];
|
|
15
|
+
export async function* runActorOrTaskOnCloud(apifyClient, options) {
|
|
9
16
|
const cwd = process.cwd();
|
|
10
|
-
const { actorOrTaskData, runOptions, type, waitForFinishMillis, inputOverride, silent } = options;
|
|
17
|
+
const { actorOrTaskData, runOptions, type, waitForFinishMillis, inputOverride, silent, waitForRunToFinish, printRunLogs, } = options;
|
|
11
18
|
const clientMethod = type === 'Actor' ? 'actor' : 'task';
|
|
12
19
|
// Get input for actor
|
|
13
20
|
const actorInput = resolveInput(cwd, inputOverride);
|
|
14
21
|
if (!silent) {
|
|
15
22
|
if (type === 'Actor') {
|
|
16
|
-
runLog({
|
|
23
|
+
runLog({
|
|
24
|
+
message: `Calling ${type} ${actorOrTaskData.userFriendlyId} (${chalk.gray(actorOrTaskData.id)})\n`,
|
|
25
|
+
});
|
|
17
26
|
}
|
|
18
27
|
else if (actorOrTaskData.title) {
|
|
19
28
|
runLog({
|
|
20
|
-
message: `Calling ${type} ${actorOrTaskData.title} (${actorOrTaskData.userFriendlyId}, ${actorOrTaskData.id})`,
|
|
29
|
+
message: `Calling ${type} ${actorOrTaskData.title} (${actorOrTaskData.userFriendlyId}, ${chalk.gray(actorOrTaskData.id)})\n`,
|
|
21
30
|
});
|
|
22
31
|
}
|
|
23
32
|
else {
|
|
24
|
-
runLog({
|
|
33
|
+
runLog({
|
|
34
|
+
message: `Calling ${type} ${actorOrTaskData.userFriendlyId} (${chalk.gray(actorOrTaskData.id)})\n`,
|
|
35
|
+
});
|
|
25
36
|
}
|
|
26
37
|
}
|
|
27
38
|
let run;
|
|
@@ -42,14 +53,22 @@ export async function runActorOrTaskOnCloud(apifyClient, options) {
|
|
|
42
53
|
}
|
|
43
54
|
catch (err) {
|
|
44
55
|
// TODO: Better error message in apify-client-js
|
|
45
|
-
if (err.type === 'record-not-found')
|
|
56
|
+
if (err.type === 'record-not-found') {
|
|
46
57
|
throw new Error(`${type} ${actorOrTaskData.userFriendlyId} (${actorOrTaskData.id}) not found!`);
|
|
47
|
-
|
|
48
|
-
|
|
58
|
+
}
|
|
59
|
+
throw err;
|
|
49
60
|
}
|
|
50
|
-
|
|
61
|
+
// Return the started run right away
|
|
62
|
+
yield run;
|
|
63
|
+
if (!silent && printRunLogs) {
|
|
51
64
|
try {
|
|
52
|
-
await outputJobLog(run, waitForFinishMillis);
|
|
65
|
+
const res = await outputJobLog(run, waitForFinishMillis);
|
|
66
|
+
if (res === 'timeouts') {
|
|
67
|
+
console.error(`\n${chalk.gray('Timeout for printing logs was hit, there may be future logs.')}\n`);
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
console.error();
|
|
71
|
+
}
|
|
53
72
|
}
|
|
54
73
|
catch (err) {
|
|
55
74
|
warning({ message: 'Can not get log:' });
|
|
@@ -57,8 +76,17 @@ export async function runActorOrTaskOnCloud(apifyClient, options) {
|
|
|
57
76
|
}
|
|
58
77
|
}
|
|
59
78
|
run = (await apifyClient.run(run.id).get());
|
|
79
|
+
if (waitForRunToFinish) {
|
|
80
|
+
while (!TerminalStatuses.includes(run.status)) {
|
|
81
|
+
run = (await apifyClient.run(run.id).get());
|
|
82
|
+
if (TerminalStatuses.includes(run.status)) {
|
|
83
|
+
break;
|
|
84
|
+
}
|
|
85
|
+
// Wait a second before checking again
|
|
86
|
+
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
87
|
+
}
|
|
88
|
+
}
|
|
60
89
|
if (!silent) {
|
|
61
|
-
link({ message: `${type} run detail`, url: `https://console.apify.com/actors/${run.actId}#/runs/${run.id}` });
|
|
62
90
|
if (run.status === ACTOR_JOB_STATUSES.SUCCEEDED) {
|
|
63
91
|
success({ message: `${type} finished.` });
|
|
64
92
|
}
|
|
@@ -74,7 +102,8 @@ export async function runActorOrTaskOnCloud(apifyClient, options) {
|
|
|
74
102
|
process.exitCode = CommandExitCodes.RunFailed;
|
|
75
103
|
}
|
|
76
104
|
}
|
|
77
|
-
|
|
105
|
+
// Return the finished run
|
|
106
|
+
yield run;
|
|
78
107
|
}
|
|
79
108
|
export const SharedRunOnCloudFlags = (type) => ({
|
|
80
109
|
build: Flags.string({
|
|
@@ -92,10 +121,5 @@ export const SharedRunOnCloudFlags = (type) => ({
|
|
|
92
121
|
description: `Amount of memory allocated for the ${type} run, in megabytes.`,
|
|
93
122
|
required: false,
|
|
94
123
|
}),
|
|
95
|
-
'wait-for-finish': Flags.string({
|
|
96
|
-
char: 'w',
|
|
97
|
-
description: 'Seconds for waiting to run to finish, if no value passed, it waits forever.',
|
|
98
|
-
required: false,
|
|
99
|
-
}),
|
|
100
124
|
});
|
|
101
125
|
//# sourceMappingURL=run-on-cloud.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-on-cloud.js","sourceRoot":"","sources":["../../../src/lib/commands/run-on-cloud.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"run-on-cloud.js","sourceRoot":"","sources":["../../../src/lib/commands/run-on-cloud.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { ApifyClient, Dataset, DatasetClient, KeyValueStore, KeyValueStoreClient } from 'apify-client';
|
|
2
|
+
export declare function tryToGetDataset(client: ApifyClient, datasetId: string): Promise<{
|
|
3
|
+
dataset: Dataset;
|
|
4
|
+
datasetClient: DatasetClient;
|
|
5
|
+
} | null>;
|
|
6
|
+
export declare function tryToGetKeyValueStore(client: ApifyClient, keyValueStoreId: string): Promise<{
|
|
7
|
+
keyValueStore: KeyValueStore;
|
|
8
|
+
keyValueStoreClient: KeyValueStoreClient;
|
|
9
|
+
} | null>;
|
|
10
|
+
//# sourceMappingURL=storages.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storages.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/storages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA2C5G,wBAAsB,eAAe,CACpC,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,aAAa,CAAA;CAAE,GAAG,IAAI,CAAC,CAEpE;AAED,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,WAAW,EACnB,eAAe,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,aAAa,EAAE,aAAa,CAAC;IAAC,mBAAmB,EAAE,mBAAmB,CAAA;CAAE,GAAG,IAAI,CAAC,CAE5F"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { getLocalUserInfo } from '../utils.js';
|
|
2
|
+
async function tryToGetStorage(client, id, storageType) {
|
|
3
|
+
const byIdOrName = await client[storageType](id)
|
|
4
|
+
.get()
|
|
5
|
+
.catch(() => undefined);
|
|
6
|
+
if (byIdOrName) {
|
|
7
|
+
return {
|
|
8
|
+
[storageType]: byIdOrName,
|
|
9
|
+
[`${storageType}Client`]: client[storageType](byIdOrName.id),
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
const info = await getLocalUserInfo();
|
|
13
|
+
const byName = await client[storageType](`${info.username}/${id}`)
|
|
14
|
+
.get()
|
|
15
|
+
.catch(() => undefined);
|
|
16
|
+
if (byName) {
|
|
17
|
+
return {
|
|
18
|
+
[storageType]: byName,
|
|
19
|
+
[`${storageType}Client`]: client[storageType](byName.id),
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
24
|
+
export async function tryToGetDataset(client, datasetId) {
|
|
25
|
+
return tryToGetStorage(client, datasetId, 'dataset');
|
|
26
|
+
}
|
|
27
|
+
export async function tryToGetKeyValueStore(client, keyValueStoreId) {
|
|
28
|
+
return tryToGetStorage(client, keyValueStoreId, 'keyValueStore');
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=storages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storages.js","sourceRoot":"","sources":["../../../src/lib/commands/storages.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAS/C,KAAK,UAAU,eAAe,CAC7B,MAAmB,EACnB,EAAU,EACV,WAAc;IAEd,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;SAC9C,GAAG,EAAE;SACL,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAEzB,IAAI,UAAU,EAAE,CAAC;QAChB,OAAO;YACN,CAAC,WAAW,CAAC,EAAE,UAAU;YACzB,CAAC,GAAG,WAAW,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;SACjC,CAAC;IAC9B,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,QAAS,IAAI,EAAE,EAAE,CAAC;SACjE,GAAG,EAAE;SACL,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAEzB,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO;YACN,CAAC,WAAW,CAAC,EAAE,MAAM;YACrB,CAAC,GAAG,WAAW,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;SAC7B,CAAC;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACpC,MAAmB,EACnB,SAAiB;IAEjB,OAAO,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAC1C,MAAmB,EACnB,eAAuB;IAEvB,OAAO,eAAe,CAAC,MAAM,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;AAClE,CAAC"}
|
package/dist/lib/consts.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/lib/consts.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,wBAAwB,kBAAkB,CAAC;AAExD,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C,eAAO,MAAM,kBAAkB;;;;;;CAM9B,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,OAAO,QAAQ,CAAC,CAAC;AAEhE,eAAO,MAAM,aAAa;;;;;CAKzB,CAAC;AAEF,eAAO,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/lib/consts.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,wBAAwB,kBAAkB,CAAC;AAExD,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C,eAAO,MAAM,kBAAkB;;;;;;CAM9B,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,OAAO,QAAQ,CAAC,CAAC;AAEhE,eAAO,MAAM,aAAa;;;;;CAKzB,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAcjC,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAsB,CAAC;AAE9D,eAAO,MAAM,qBAAqB,cAQjC,CAAC;AAEF,eAAO,MAAM,cAAc,cAAmD,CAAC;AAE/E,eAAO,MAAM,iBAAiB,cAAsD,CAAC;AAErF,eAAO,MAAM,eAAe,cAAoD,CAAC;AAEjF,eAAO,MAAM,mBAAmB,cAAwD,CAAC;AAEzF,eAAO,MAAM,4BAA4B,eAAe,CAAC;AAEzD,eAAO,MAAM,0BAA0B,WAAW,CAAC;AAEnD,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAE9C,eAAO,MAAM,iBAAiB,QAAsD,CAAC;AAErF,eAAO,MAAM,kBAAkB,QAAoD,CAAC;AAEpF,eAAO,MAAM,SAAS,YAAY,CAAC;AAInC,eAAO,MAAM,wBAAwB,KAAmB,CAAC;AAEzD,eAAO,MAAM,yBAAyB,KAAc,CAAC;AAErD,eAAO,MAAM,4BAA4B;;CAAiD,CAAC;AAE3F,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAExD,eAAO,MAAM,gBAAgB,UAAU,CAAC;AAExC,eAAO,MAAM,cAAc,qCAAqC,CAAC;AAEjE,oBAAY,gBAAgB;IAC3B,WAAW,IAAI;IACf,SAAS,IAAI;IAEb,aAAa,IAAI;IAEjB,YAAY,IAAI;IAChB,UAAU,IAAI;IAEd,aAAa,IAAI;IAEjB,YAAY,IAAI;IAChB,gBAAgB,IAAI;CACpB"}
|
package/dist/lib/consts.js
CHANGED
|
@@ -25,7 +25,17 @@ export const PROJECT_TYPES = {
|
|
|
25
25
|
PRE_CRAWLEE_APIFY_SDK: 'apify',
|
|
26
26
|
UNKNOWN: 'unknown',
|
|
27
27
|
};
|
|
28
|
-
export const COMMANDS_WITHIN_ACTOR = [
|
|
28
|
+
export const COMMANDS_WITHIN_ACTOR = [
|
|
29
|
+
'init',
|
|
30
|
+
'run',
|
|
31
|
+
'push',
|
|
32
|
+
'actors:push',
|
|
33
|
+
'pull',
|
|
34
|
+
'actors:pull',
|
|
35
|
+
'call',
|
|
36
|
+
'actors:call',
|
|
37
|
+
'actors:start',
|
|
38
|
+
];
|
|
29
39
|
export const CHECK_VERSION_EVERY_MILLIS = 24 * 60 * 60 * 1000; // Once a day
|
|
30
40
|
export const GLOBAL_CONFIGS_FOLDER = () => {
|
|
31
41
|
const base = join(homedir(), '.apify');
|
package/dist/lib/consts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/lib/consts.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,yCAAyC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEnE,MAAM,CAAC,MAAM,yBAAyB,GAAG,SAAS,CAAC;AAEnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,eAAe,CAAC;AAExD,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAAG;IACjC,kBAAkB,EAAE,2BAA2B;IAC/C,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,QAAQ;IAClB,oBAAoB,EAAE,EAAE;CACxB,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG;IACvB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,KAAK;CACd,CAAC;AAIF,MAAM,CAAC,MAAM,aAAa,GAAG;IAC5B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,qBAAqB,EAAE,OAAO;IAC9B,OAAO,EAAE,SAAS;CAClB,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/lib/consts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Manifest, Template } from '@apify/actor-templates';
|
|
1
|
+
import type { Manifest, Template } from '@apify/actor-templates';
|
|
2
2
|
export declare const ensureValidActorName: (maybeActorName?: string) => Promise<string>;
|
|
3
3
|
export declare const getTemplateDefinition: (maybeTemplateName: string | undefined, manifestPromise: Promise<Manifest | Error>) => Promise<Template>;
|
|
4
4
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-utils.d.ts","sourceRoot":"","sources":["../../src/lib/create-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"create-utils.d.ts","sourceRoot":"","sources":["../../src/lib/create-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AASjE,eAAO,MAAM,oBAAoB,oBAA2B,MAAM,oBAMjE,CAAC;AAGF,eAAO,MAAM,qBAAqB,sBACd,MAAM,GAAG,SAAS,mBACpB,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,sBAgB1C,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,4BAA4B,eAAsB,MAAM,mBAAmB,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,kBAgBhH,CAAC"}
|
package/dist/lib/create-utils.js
CHANGED
|
@@ -138,16 +138,15 @@ async function promptTemplateInstallation(templateDefinition) {
|
|
|
138
138
|
new inquirer.Separator(),
|
|
139
139
|
{ name: 'Go back', value: false },
|
|
140
140
|
];
|
|
141
|
-
const message = 'Do you want to install the following template?';
|
|
142
141
|
const label = chalk.underline(templateDefinition.label);
|
|
143
142
|
const description = chalk.dim(templateDefinition.description);
|
|
144
143
|
const suffix = `\n ${label}:\n ${description}`;
|
|
144
|
+
const message = `Do you want to install the following template?${suffix}`;
|
|
145
145
|
const answer = await inquirer.prompt([
|
|
146
146
|
{
|
|
147
147
|
type: 'list',
|
|
148
148
|
name: 'shouldInstall',
|
|
149
149
|
message,
|
|
150
|
-
suffix,
|
|
151
150
|
default: choices[0],
|
|
152
151
|
choices,
|
|
153
152
|
loop: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-utils.js","sourceRoot":"","sources":["../../src/lib/create-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create-utils.js","sourceRoot":"","sources":["../../src/lib/create-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/exec.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,wBAAwB,EAAS,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,wBAAwB,EAAS,MAAM,oBAAoB,CAAC;AA0C7F,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,EAAE,IAAI,GAAE,wBAA6B,iBAGtG"}
|
package/dist/lib/exec.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
+
import { isAbsolute } from 'node:path';
|
|
2
3
|
import { run } from './outputs.js';
|
|
3
4
|
const windowsOptions = {
|
|
4
5
|
shell: true,
|
|
@@ -8,8 +9,9 @@ const windowsOptions = {
|
|
|
8
9
|
* Run child process and returns stdout and stderr to user stout
|
|
9
10
|
*/
|
|
10
11
|
const spawnPromised = async (cmd, args, opts) => {
|
|
12
|
+
const escapedCommand = isAbsolute(cmd) && process.platform === 'win32' ? `"${cmd}"` : cmd;
|
|
11
13
|
// NOTE: Pipes stderr, stdout to main process
|
|
12
|
-
const childProcess = spawn(
|
|
14
|
+
const childProcess = spawn(escapedCommand, args, {
|
|
13
15
|
...opts,
|
|
14
16
|
stdio: process.env.APIFY_NO_LOGS_IN_TESTS ? 'ignore' : 'inherit',
|
|
15
17
|
...(process.platform === 'win32' ? windowsOptions : {}),
|
package/dist/lib/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,MAAM,cAAc,GAAiB;IACpC,KAAK,EAAE,IAAI;IACX,WAAW,EAAE,IAAI;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,IAAc,EAAE,IAA8B,EAAE,EAAE;IAC3F,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1F,6CAA6C;IAC7C,MAAM,YAAY,GAAG,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE;QAChD,GAAG,IAAI;QACP,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QAChE,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;KACvD,CAAC,CAAC;IAEH,gDAAgD;IAChD,yDAAyD;IACzD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACzB,IAAI,CAAC;YACJ,YAAY,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACR,iEAAiE;QAClE,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACjC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACjC,IAAI,IAAI,KAAK,CAAC;gBAAE,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,GAAG,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAW,EAAE,OAAiB,EAAE,EAAE,OAAiC,EAAE;IACtG,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7C,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScrapyProjectAnalyzer.d.ts","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/ScrapyProjectAnalyzer.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,MAAM,cAAc,CAAC;AAKxC,qBAAa,qBAAqB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,YAAY,CAAS;IACpC,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAQ;gBAE3D,QAAQ,EAAE,MAAM;IAM5B,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM;IAI9B,IAAI;IAIV,aAAa;IAaP,YAAY;
|
|
1
|
+
{"version":3,"file":"ScrapyProjectAnalyzer.d.ts","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/ScrapyProjectAnalyzer.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,MAAM,cAAc,CAAC;AAKxC,qBAAa,qBAAqB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,YAAY,CAAS;IACpC,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAQ;gBAE3D,QAAQ,EAAE,MAAM;IAM5B,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM;IAI9B,IAAI;IAIV,aAAa;IAaP,YAAY;IAyBlB,OAAO;IAIP,mBAAmB;CAsBnB"}
|
|
@@ -4,25 +4,10 @@ import ConfigParser from 'configparser';
|
|
|
4
4
|
import inquirer from 'inquirer';
|
|
5
5
|
import { SpiderFileAnalyzer } from './SpiderFileAnalyzer.js';
|
|
6
6
|
export class ScrapyProjectAnalyzer {
|
|
7
|
+
pathname;
|
|
8
|
+
configuration = null;
|
|
9
|
+
settings = null;
|
|
7
10
|
constructor(pathname) {
|
|
8
|
-
Object.defineProperty(this, "pathname", {
|
|
9
|
-
enumerable: true,
|
|
10
|
-
configurable: true,
|
|
11
|
-
writable: true,
|
|
12
|
-
value: void 0
|
|
13
|
-
});
|
|
14
|
-
Object.defineProperty(this, "configuration", {
|
|
15
|
-
enumerable: true,
|
|
16
|
-
configurable: true,
|
|
17
|
-
writable: true,
|
|
18
|
-
value: null
|
|
19
|
-
});
|
|
20
|
-
Object.defineProperty(this, "settings", {
|
|
21
|
-
enumerable: true,
|
|
22
|
-
configurable: true,
|
|
23
|
-
writable: true,
|
|
24
|
-
value: null
|
|
25
|
-
});
|
|
26
11
|
this.pathname = pathname;
|
|
27
12
|
this.settings = null;
|
|
28
13
|
this.loadScrapyCfg();
|
|
@@ -56,12 +41,13 @@ Are you sure there is a Scrapy project there?`);
|
|
|
56
41
|
type: 'input',
|
|
57
42
|
name: 'SPIDER_MODULES',
|
|
58
43
|
message: 'What folder are the Scrapy spider modules stored in? (see SPIDER_MODULES in settings.py):',
|
|
59
|
-
default:
|
|
44
|
+
default: `${assumedBotName}.spiders`,
|
|
60
45
|
},
|
|
61
46
|
]);
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
47
|
+
this.settings = {
|
|
48
|
+
BOT_NAME: settings.BOT_NAME,
|
|
49
|
+
SPIDER_MODULES: typeof settings.SPIDER_MODULES === 'string' ? [settings.SPIDER_MODULES] : settings.SPIDER_MODULES,
|
|
50
|
+
};
|
|
65
51
|
}
|
|
66
52
|
getName() {
|
|
67
53
|
return this.settings?.BOT_NAME;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScrapyProjectAnalyzer.js","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/ScrapyProjectAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,YAAY,MAAM,cAAc,CAAC;AACxC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,OAAO,qBAAqB;
|
|
1
|
+
{"version":3,"file":"ScrapyProjectAnalyzer.js","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/ScrapyProjectAnalyzer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,29 +1,9 @@
|
|
|
1
1
|
export class Spider {
|
|
2
|
+
name;
|
|
3
|
+
class_name;
|
|
4
|
+
start_urls;
|
|
5
|
+
pathname;
|
|
2
6
|
constructor(data) {
|
|
3
|
-
Object.defineProperty(this, "name", {
|
|
4
|
-
enumerable: true,
|
|
5
|
-
configurable: true,
|
|
6
|
-
writable: true,
|
|
7
|
-
value: void 0
|
|
8
|
-
});
|
|
9
|
-
Object.defineProperty(this, "class_name", {
|
|
10
|
-
enumerable: true,
|
|
11
|
-
configurable: true,
|
|
12
|
-
writable: true,
|
|
13
|
-
value: void 0
|
|
14
|
-
});
|
|
15
|
-
Object.defineProperty(this, "start_urls", {
|
|
16
|
-
enumerable: true,
|
|
17
|
-
configurable: true,
|
|
18
|
-
writable: true,
|
|
19
|
-
value: void 0
|
|
20
|
-
});
|
|
21
|
-
Object.defineProperty(this, "pathname", {
|
|
22
|
-
enumerable: true,
|
|
23
|
-
configurable: true,
|
|
24
|
-
writable: true,
|
|
25
|
-
value: void 0
|
|
26
|
-
});
|
|
27
7
|
this.name = data.name;
|
|
28
8
|
this.class_name = data.class_name;
|
|
29
9
|
this.start_urls = data.start_urls;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Spider.js","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/Spider.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,MAAM;
|
|
1
|
+
{"version":3,"file":"Spider.js","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/Spider.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,MAAM;IAClB,IAAI,CAAU;IACd,UAAU,CAAS;IACnB,UAAU,CAAU;IACpB,QAAQ,CAAS;IAEjB,YAAY,IAAgB;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC/B,CAAC;CACD"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
1
|
import { readFileSync } from 'node:fs';
|
|
2
2
|
import { Spider } from './Spider.js';
|
|
3
3
|
export class SpiderFileAnalyzer {
|
|
4
|
+
pathname;
|
|
4
5
|
constructor(pathname) {
|
|
5
|
-
Object.defineProperty(this, "pathname", {
|
|
6
|
-
enumerable: true,
|
|
7
|
-
configurable: true,
|
|
8
|
-
writable: true,
|
|
9
|
-
value: void 0
|
|
10
|
-
});
|
|
11
6
|
this.pathname = pathname;
|
|
12
7
|
}
|
|
13
8
|
getSpiders() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpiderFileAnalyzer.js","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/SpiderFileAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,OAAO,kBAAkB;
|
|
1
|
+
{"version":3,"file":"SpiderFileAnalyzer.js","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/SpiderFileAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,OAAO,kBAAkB;IAC9B,QAAQ,CAAS;IAEjB,YAAY,QAAgB;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,UAAU;QACT,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEjD,MAAM,KAAK,GAAG,gBAAgB,CAAC;QAC/B,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,IAAI,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,OAAO,KAAK,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC5E,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapScrapyProject.d.ts","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/wrapScrapyProject.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wrapScrapyProject.d.ts","sourceRoot":"","sources":["../../../../src/lib/projects/scrapy/wrapScrapyProject.ts"],"names":[],"mappings":"AA4EA,wBAAsB,iBAAiB,CAAC,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,iBA+EhF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { appendFileSync, copyFileSync, createWriteStream, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
|
|
2
2
|
import { basename, join, relative, sep } from 'node:path';
|
|
3
|
+
import { fileURLToPath } from 'node:url';
|
|
3
4
|
import { fetchManifest, wrapperManifestUrl } from '@apify/actor-templates';
|
|
4
5
|
import rootWalk from '@root/walk';
|
|
5
6
|
import ConfigParser from 'configparser';
|
|
@@ -12,6 +13,7 @@ import { downloadAndUnzip, sanitizeActorName } from '../../utils.js';
|
|
|
12
13
|
* Files that should be concatenated instead of copied (and overwritten).
|
|
13
14
|
*/
|
|
14
15
|
const concatenableFiles = ['.dockerignore', '.gitignore'];
|
|
16
|
+
const templatePath = fileURLToPath(new URL('./templates/python-scrapy', import.meta.url));
|
|
15
17
|
async function merge(fromPath, toPath, options = { bindings: {} }) {
|
|
16
18
|
await rootWalk.walk(fromPath, async (_err, pathname, dirent) => {
|
|
17
19
|
if (pathname === fromPath)
|
|
@@ -84,7 +86,6 @@ export async function wrapScrapyProject({ projectPath }) {
|
|
|
84
86
|
const manifest = await fetchManifest(wrapperManifestUrl);
|
|
85
87
|
info({ message: 'Downloading the latest Scrapy wrapper template...' });
|
|
86
88
|
const { archiveUrl } = manifest.templates.find(({ id }) => id === 'python-scrapy');
|
|
87
|
-
const templatePath = join(__dirname, 'templates', 'python-scrapy');
|
|
88
89
|
if (existsSync(templatePath))
|
|
89
90
|
rmSync(templatePath, { recursive: true });
|
|
90
91
|
await downloadAndUnzip({
|
|
@@ -92,7 +93,7 @@ export async function wrapScrapyProject({ projectPath }) {
|
|
|
92
93
|
pathTo: templatePath,
|
|
93
94
|
});
|
|
94
95
|
info({ message: 'Wrapping the Scrapy project...' });
|
|
95
|
-
await merge(
|
|
96
|
+
await merge(templatePath, projectPath, {
|
|
96
97
|
bindings: templateBindings,
|
|
97
98
|
});
|
|
98
99
|
const apifyConf = new ConfigParser();
|