apify-cli 0.14.1-beta.0 → 0.14.2-beta.0

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.14.1","commands":{"call":{"id":"call","description":"Runs a specific actor remotely on the Apify cloud platform.\nThe actor is run under your current Apify account. Therefore you need to be logged in by calling \"apify login\". It takes input for the actor from the default local key-value store by default.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"build":{"name":"build","type":"option","char":"b","description":"Tag or number of the build to run (e.g. \"latest\" or \"1.2.34\").","required":false},"timeout":{"name":"timeout","type":"option","char":"t","description":"Timeout for the actor run in seconds. Zero value means there is no timeout.","required":false},"memory":{"name":"memory","type":"option","char":"m","description":"Amount of memory allocated for the actor run, in megabytes.","required":false},"wait-for-finish":{"name":"wait-for-finish","type":"option","char":"w","description":"Seconds for waiting to run to finish, if no value passed, it waits forever.","required":false}},"args":[{"name":"actId","description":"Name or ID of the actor to run (e.g. \"apify/hello-world\" or \"E2jjCZBezvAZnX8Rb\"). If not provided, the command runs the remote actor specified in the \".actor/actor.json\" file.","required":false}]},"check-version":{"id":"check-version","description":"Checks that installed Apify CLI version is up to date.","pluginName":"apify-cli","pluginType":"core","hidden":true,"aliases":["cv"],"flags":{"enforce-update":{"name":"enforce-update","type":"boolean","char":"e","description":"[Optional] Enforce version update from NPM","required":false,"allowNo":false}},"args":[]},"create":{"id":"create","description":"Creates a new actor project directory from a selected boilerplate template.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"template":{"name":"template","type":"option","char":"t","description":"Template for the actor. If not provided, the command will prompt for it.\nVisit https://raw.githubusercontent.com/apify/actor-templates/master/templates/manifest.json to find available template names.","required":false},"skip-dependency-install":{"name":"skip-dependency-install","type":"boolean","description":"Skip installing actor dependencies.","required":false,"allowNo":false},"template-archive-url":{"name":"template-archive-url","type":"option","description":"Actor template archive url. Useful for developing new templates.","hidden":true,"required":false}},"args":[{"name":"actorName","description":"Name of the actor and its directory","required":false}]},"edit-input-schema":{"id":"edit-input-schema","description":"Lets you edit your input schema that would be used on the platform in a visual input schema editor.","pluginName":"apify-cli","pluginType":"core","hidden":true,"aliases":["eis"],"flags":{},"args":[{"name":"path","description":"Optional path to your INPUT_SCHEMA.json file. If not provided default platform location for input schema is used.","required":false}]},"info":{"id":"info","description":"Displays information about the currently active Apify account.\nThe information is printed to the console.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"init":{"id":"init","description":"Initializes a new actor project in an existing directory.\nThe command only creates the \".actor/actor.json\" file and the \"storage\" directory in the current directory, but will not touch anything else.\n\nWARNING: The directory at \"storage\" will be overwritten if it already exists.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"actorName","description":"Name of the actor. If not provided, you will be prompted for it.","required":false}]},"login":{"id":"login","description":"Logs in to your Apify account using a provided API token.\nThe API token and other account information is stored in the ~/.apify directory, from where it is read by all other \"apify\" commands. To log out, call \"apify logout\".","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"token":{"name":"token","type":"option","char":"t","description":"[Optional] Apify API token","required":false}},"args":[]},"logout":{"id":"logout","description":"Logs out of your Apify account.\nThe command deletes the API token and all other account information stored in the ~/.apify directory. To log in again, call \"apify login\".","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"push":{"id":"push","description":"Uploads the actor to the Apify platform and builds it there.\nThe actor settings are read from the \".actor/actor.json\" file in the current directory, but they can be overridden using command-line options.\nNOTE: If the source files are smaller than 3 MB then they are uploaded as \n\"Multiple source files\", otherwise they are uploaded as \"Zip file\".\n\nWARNING: If the target actor already exists in your Apify account, it will be overwritten!","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"version-number":{"name":"version-number","type":"option","description":"DEPRECATED: Use flag version instead. Actor version number to which the files should be pushed. By default, it is taken from the \".actor/actor.json\" file.","required":false},"version":{"name":"version","type":"option","char":"v","description":"Actor version number to which the files should be pushed. By default, it is taken from the \".actor/actor.json\" file.","required":false},"build-tag":{"name":"build-tag","type":"option","char":"b","description":"Build tag to be applied to the successful actor build. By default, it is taken from the \".actor/actor.json\" file","required":false},"wait-for-finish":{"name":"wait-for-finish","type":"option","char":"w","description":"Seconds for waiting to build to finish, if no value passed, it waits forever.","required":false}},"args":[{"name":"actorId","description":"ID of an existing actor on the Apify platform where the files will be pushed. If not provided, the command will create or modify the actor with the name specified in \".actor/actor.json\" file.","required":false}]},"run":{"id":"run","description":"Runs the actor locally in the current directory by executing \"npm start\".\nIt sets various APIFY_XYZ environment variables in order to provide a working execution environment for the actor. For example, this causes the actor input, as well as all other data in key-value stores, datasets or request queues to be stored in the \"storage\" directory, rather than on the Apify platform.\n\nNOTE: You can override the command's default behavior by overriding the npm start script value in a package.json file. You can set up your own main file or environment variables by changing it.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"purge":{"name":"purge","type":"boolean","char":"p","description":"Shortcut that combines the --purge-queue, --purge-dataset and --purge-key-value-store options.","required":false,"allowNo":false},"purge-queue":{"name":"purge-queue","type":"boolean","description":"Deletes the local directory containing the default request queue before the run starts.","required":false,"allowNo":false},"purge-dataset":{"name":"purge-dataset","type":"boolean","description":"Deletes the local directory containing the default dataset before the run starts.","required":false,"allowNo":false},"purge-key-value-store":{"name":"purge-key-value-store","type":"boolean","description":"Deletes all records from the default key-value store in the local directory before the run starts, except for the \"INPUT\" key.","required":false,"allowNo":false}},"args":[]},"vis":{"id":"vis","description":"Validates input schema and prints errors found.\nThe input schema for the actor is used from these locations in order of preference.\nThe first one found is validated as it would be the one used on the Apify platform.\n1. Directly embedded object in \".actor/actor.json\" under 'input' key\n2. Path to JSON file referenced in \".actor/actor.json\" under 'input' key\n3. JSON file at .actor/INPUT_SCHEMA.json\n4. JSON file at INPUT_SCHEMA.json\n\nYou can also pass any custom path to your input schema to have it validated instead.\n","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"Optional path to your INPUT_SCHEMA.json file. If not provided ./INPUT_SCHEMA.json is used.","required":false}]},"actor:get-input":{"id":"actor:get-input","description":"Gets the actor input value from the default key-value store associated with the actor run.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"actor:get-value":{"id":"actor:get-value","description":"Gets a value from the default key-value store associated with the actor run.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"key","description":"Key of the record in key-value store","required":true}]},"actor":{"id":"actor","description":"Commands are designed to be used in actor runs. All commands are in PoC state, do not use in production environments.\n","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"actor:push-data":{"id":"actor:push-data","description":"Stores an object or an array of objects to the default dataset of the actor run.\nIt is possible to pass data using item argument or stdin.\nPassing data using argument:\n$ apify actor:push-data {\"foo\": \"bar\"}\nPassing data using stdin with pipe:\n$ cat ./test.json | apify actor:push-data\n","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"item","description":"JSON string with one object or array of objects containing data to be stored in the default dataset.","required":false}]},"actor:set-value":{"id":"actor:set-value","description":"Sets or removes record into the default KeyValueStore associated with the actor run.\nIt is possible to pass data using argument or stdin.\nPassing data using argument:\n$ apify actor:set-value KEY my-value\nPassing data using stdin with pipe:\n$ cat ./my-text-file.txt | apify actor:set-value KEY --contentType text/plain\n","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"contentType":{"name":"contentType","type":"option","char":"c","description":"Specifies a custom MIME content type of the record. By default \"application/json\" is used.","required":false}},"args":[{"name":"key","description":"Key of the record in key-value store.","required":true},{"name":"value","description":"Record data, which can be one of the following values:\n- If empty, the record in the key-value store is deleted.\n- If no `contentType` flag is specified, value is expected to be any JSON string value.\n- If options.contentType is set, value is taken as is.","required":false}]},"secrets:add":{"id":"secrets:add","description":"Adds a new secret value.\nThe secrets are stored to a file at ~/.apify","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"name","description":"Name of the secret","required":true},{"name":"value","description":"Value of the secret","required":true}]},"secrets":{"id":"secrets","description":"Manages secret values for actor environment variables.\n\nExample:\n$ apify secrets:add mySecret TopSecretValue123\n\nNow the \"mySecret\" value can be used in an environment variable defined in \".actor/actor.json\" file by adding the \"@\" prefix:\n\n{\n  \"actorSpecification\": 1,\n  \"name\": \"my_actor\",\n  \"environmentVariables\": { \"SECRET_ENV_VAR\": \"@mySecret\" },\n  \"version\": \"0.1\n}\n\nWhen the actor is pushed to Apify cloud, the \"SECRET_ENV_VAR\" and its value is stored as a secret environment variable of the actor.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"secrets:rm":{"id":"secrets:rm","description":"Removes the secret.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"name","description":"Name of the secret","required":true}]}}}
+{"version":"0.14.2","commands":{"call":{"id":"call","description":"Runs a specific actor remotely on the Apify cloud platform.\nThe actor is run under your current Apify account. Therefore you need to be logged in by calling \"apify login\". It takes input for the actor from the default local key-value store by default.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"build":{"name":"build","type":"option","char":"b","description":"Tag or number of the build to run (e.g. \"latest\" or \"1.2.34\").","required":false},"timeout":{"name":"timeout","type":"option","char":"t","description":"Timeout for the actor run in seconds. Zero value means there is no timeout.","required":false},"memory":{"name":"memory","type":"option","char":"m","description":"Amount of memory allocated for the actor run, in megabytes.","required":false},"wait-for-finish":{"name":"wait-for-finish","type":"option","char":"w","description":"Seconds for waiting to run to finish, if no value passed, it waits forever.","required":false}},"args":[{"name":"actId","description":"Name or ID of the actor to run (e.g. \"apify/hello-world\" or \"E2jjCZBezvAZnX8Rb\"). If not provided, the command runs the remote actor specified in the \".actor/actor.json\" file.","required":false}]},"check-version":{"id":"check-version","description":"Checks that installed Apify CLI version is up to date.","pluginName":"apify-cli","pluginType":"core","hidden":true,"aliases":["cv"],"flags":{"enforce-update":{"name":"enforce-update","type":"boolean","char":"e","description":"[Optional] Enforce version update from NPM","required":false,"allowNo":false}},"args":[]},"create":{"id":"create","description":"Creates a new actor project directory from a selected boilerplate template.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"template":{"name":"template","type":"option","char":"t","description":"Template for the actor. If not provided, the command will prompt for it.\nVisit https://raw.githubusercontent.com/apify/actor-templates/master/templates/manifest.json to find available template names.","required":false},"skip-dependency-install":{"name":"skip-dependency-install","type":"boolean","description":"Skip installing actor dependencies.","required":false,"allowNo":false},"template-archive-url":{"name":"template-archive-url","type":"option","description":"Actor template archive url. Useful for developing new templates.","hidden":true,"required":false}},"args":[{"name":"actorName","description":"Name of the actor and its directory","required":false}]},"edit-input-schema":{"id":"edit-input-schema","description":"Lets you edit your input schema that would be used on the platform in a visual input schema editor.","pluginName":"apify-cli","pluginType":"core","hidden":true,"aliases":["eis"],"flags":{},"args":[{"name":"path","description":"Optional path to your INPUT_SCHEMA.json file. If not provided default platform location for input schema is used.","required":false}]},"info":{"id":"info","description":"Displays information about the currently active Apify account.\nThe information is printed to the console.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"init":{"id":"init","description":"Initializes a new actor project in an existing directory.\nThe command only creates the \".actor/actor.json\" file and the \"storage\" directory in the current directory, but will not touch anything else.\n\nWARNING: The directory at \"storage\" will be overwritten if it already exists.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"actorName","description":"Name of the actor. If not provided, you will be prompted for it.","required":false}]},"login-new":{"id":"login-new","description":"Logs in to your Apify account using your API token.\nThe API token and other account information is stored in the ~/.apify directory, from where it is read by all other \"apify\" commands. To log out, call \"apify logout\".","pluginName":"apify-cli","pluginType":"core","hidden":true,"aliases":[],"flags":{"token":{"name":"token","type":"option","char":"t","description":"[Optional] Apify API token","required":false}},"args":[]},"login":{"id":"login","description":"Logs in to your Apify account using a provided API token.\nThe API token and other account information is stored in the ~/.apify directory, from where it is read by all other \"apify\" commands. To log out, call \"apify logout\".","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"token":{"name":"token","type":"option","char":"t","description":"[Optional] Apify API token","required":false}},"args":[]},"logout":{"id":"logout","description":"Logs out of your Apify account.\nThe command deletes the API token and all other account information stored in the ~/.apify directory. To log in again, call \"apify login\".","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"push":{"id":"push","description":"Uploads the actor to the Apify platform and builds it there.\nThe actor settings are read from the \".actor/actor.json\" file in the current directory, but they can be overridden using command-line options.\nNOTE: If the source files are smaller than 3 MB then they are uploaded as \n\"Multiple source files\", otherwise they are uploaded as \"Zip file\".\n\nWARNING: If the target actor already exists in your Apify account, it will be overwritten!","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"version-number":{"name":"version-number","type":"option","description":"DEPRECATED: Use flag version instead. Actor version number to which the files should be pushed. By default, it is taken from the \".actor/actor.json\" file.","required":false},"version":{"name":"version","type":"option","char":"v","description":"Actor version number to which the files should be pushed. By default, it is taken from the \".actor/actor.json\" file.","required":false},"build-tag":{"name":"build-tag","type":"option","char":"b","description":"Build tag to be applied to the successful actor build. By default, it is taken from the \".actor/actor.json\" file","required":false},"wait-for-finish":{"name":"wait-for-finish","type":"option","char":"w","description":"Seconds for waiting to build to finish, if no value passed, it waits forever.","required":false}},"args":[{"name":"actorId","description":"ID of an existing actor on the Apify platform where the files will be pushed. If not provided, the command will create or modify the actor with the name specified in \".actor/actor.json\" file.","required":false}]},"run":{"id":"run","description":"Runs the actor locally in the current directory by executing \"npm start\".\nIt sets various APIFY_XYZ environment variables in order to provide a working execution environment for the actor. For example, this causes the actor input, as well as all other data in key-value stores, datasets or request queues to be stored in the \"storage\" directory, rather than on the Apify platform.\n\nNOTE: You can override the command's default behavior by overriding the npm start script value in a package.json file. You can set up your own main file or environment variables by changing it.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"purge":{"name":"purge","type":"boolean","char":"p","description":"Shortcut that combines the --purge-queue, --purge-dataset and --purge-key-value-store options.","required":false,"allowNo":false},"purge-queue":{"name":"purge-queue","type":"boolean","description":"Deletes the local directory containing the default request queue before the run starts.","required":false,"allowNo":false},"purge-dataset":{"name":"purge-dataset","type":"boolean","description":"Deletes the local directory containing the default dataset before the run starts.","required":false,"allowNo":false},"purge-key-value-store":{"name":"purge-key-value-store","type":"boolean","description":"Deletes all records from the default key-value store in the local directory before the run starts, except for the \"INPUT\" key.","required":false,"allowNo":false}},"args":[]},"vis":{"id":"vis","description":"Validates input schema and prints errors found.\nThe input schema for the actor is used from these locations in order of preference.\nThe first one found is validated as it would be the one used on the Apify platform.\n1. Directly embedded object in \".actor/actor.json\" under 'input' key\n2. Path to JSON file referenced in \".actor/actor.json\" under 'input' key\n3. JSON file at .actor/INPUT_SCHEMA.json\n4. JSON file at INPUT_SCHEMA.json\n\nYou can also pass any custom path to your input schema to have it validated instead.\n","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"Optional path to your INPUT_SCHEMA.json file. If not provided ./INPUT_SCHEMA.json is used.","required":false}]},"actor:get-input":{"id":"actor:get-input","description":"Gets the actor input value from the default key-value store associated with the actor run.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"actor:get-value":{"id":"actor:get-value","description":"Gets a value from the default key-value store associated with the actor run.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"key","description":"Key of the record in key-value store","required":true}]},"actor":{"id":"actor","description":"Commands are designed to be used in actor runs. All commands are in PoC state, do not use in production environments.\n","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"actor:push-data":{"id":"actor:push-data","description":"Stores an object or an array of objects to the default dataset of the actor run.\nIt is possible to pass data using item argument or stdin.\nPassing data using argument:\n$ apify actor:push-data {\"foo\": \"bar\"}\nPassing data using stdin with pipe:\n$ cat ./test.json | apify actor:push-data\n","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"item","description":"JSON string with one object or array of objects containing data to be stored in the default dataset.","required":false}]},"actor:set-value":{"id":"actor:set-value","description":"Sets or removes record into the default KeyValueStore associated with the actor run.\nIt is possible to pass data using argument or stdin.\nPassing data using argument:\n$ apify actor:set-value KEY my-value\nPassing data using stdin with pipe:\n$ cat ./my-text-file.txt | apify actor:set-value KEY --contentType text/plain\n","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{"contentType":{"name":"contentType","type":"option","char":"c","description":"Specifies a custom MIME content type of the record. By default \"application/json\" is used.","required":false}},"args":[{"name":"key","description":"Key of the record in key-value store.","required":true},{"name":"value","description":"Record data, which can be one of the following values:\n- If empty, the record in the key-value store is deleted.\n- If no `contentType` flag is specified, value is expected to be any JSON string value.\n- If options.contentType is set, value is taken as is.","required":false}]},"secrets:add":{"id":"secrets:add","description":"Adds a new secret value.\nThe secrets are stored to a file at ~/.apify","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"name","description":"Name of the secret","required":true},{"name":"value","description":"Value of the secret","required":true}]},"secrets":{"id":"secrets","description":"Manages secret values for actor environment variables.\n\nExample:\n$ apify secrets:add mySecret TopSecretValue123\n\nNow the \"mySecret\" value can be used in an environment variable defined in \".actor/actor.json\" file by adding the \"@\" prefix:\n\n{\n  \"actorSpecification\": 1,\n  \"name\": \"my_actor\",\n  \"environmentVariables\": { \"SECRET_ENV_VAR\": \"@mySecret\" },\n  \"version\": \"0.1\n}\n\nWhen the actor is pushed to Apify cloud, the \"SECRET_ENV_VAR\" and its value is stored as a secret environment variable of the actor.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"secrets:rm":{"id":"secrets:rm","description":"Removes the secret.","pluginName":"apify-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"name","description":"Name of the secret","required":true}]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-cli",
-  "version": "0.14.1-beta.0",
+  "version": "0.14.2-beta.0",
   "description": "Apify command-line interface helps you create, develop, build and run Apify actors, and manage the Apify cloud platform.",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "lint": "eslint src test",
     "lint:fix": "eslint src test --fix",
     "commands-md": "npm run manifest && oclif-dev readme",
-    "prepare-release": "npm run manifest && npm run commands-md && npm run prod-shrinkwrap",
+    "prepare-release": "npm run commands-md && npm run prod-shrinkwrap",
     "prod-shrinkwrap": "rm -rf node_modules && npm install --production && npm shrinkwrap",
     "manifest": "rm -f oclif.manifest.json && oclif-dev manifest",
     "postinstall": "node \"./src/bin/run\" check-version"
@@ -66,12 +66,12 @@
     "apify-client": "^2.2.0",
     "archiver-promise": "^1.0.0",
     "chalk": "^4.1.2",
+    "computer-name": "^0.1.0",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
     "detect-indent": "^6.1.0",
     "express": "^4.18.2",
     "globby": "^11.1.0",
-    "got-scraping": "^3.2.9",
     "inquirer": "^7.3.3",
     "is-online": "^10.0.0",
     "istextorbinary": "^6.0.0",

package/src/commands/create.js

@@ -1,8 +1,6 @@
 const { flags: flagsHelper } = require('@oclif/command');
 const fs = require('fs');
 const path = require('path');
-const inquirer = require('inquirer');
-const { gotScraping } = require('got-scraping');
 const actorTemplates = require('@apify/actor-templates');
 const unzipper = require('unzipper');
 const { ApifyCommand } = require('../lib/apify_command');
@@ -13,64 +11,39 @@ const {
     setLocalConfig,
     setLocalEnv,
     getNpmCmd,
-    validateActorName,
     getJsonFileContent,
     detectPythonVersion,
     isPythonVersionSupported,
     getPythonCommand,
 } = require('../lib/utils');
 const { EMPTY_LOCAL_CONFIG, LOCAL_CONFIG_PATH, PYTHON_VENV_PATH } = require('../lib/consts');
+const { httpsGet, ensureValidActorName, getTemplateDefinition } = require('../lib/create-utils');
 
 class CreateCommand extends ApifyCommand {
     async run() {
         const { flags, args } = this.parse(CreateCommand);
         let { actorName } = args;
-        let { templateArchiveUrl, template: templateName } = flags;
-        const { skipDependencyInstall } = flags;
+        const {
+            template: templateName,
+            skipDependencyInstall,
+        } = flags;
+
+        // --template-archive-url is an internal, undocumented flag that's used
+        // for testing of templates that are not yet published in the manifest
+        let { templateArchiveUrl } = flags;
         let skipOptionalDeps = false;
 
-        // Check proper format of actorName
-        if (!actorName) {
-            const actorNamePrompt = await inquirer.prompt([{
-                name: 'actorName',
-                message: 'Name of the new actor:',
-                type: 'input',
-                validate: (promptText) => {
-                    try {
-                        validateActorName(promptText);
-                    } catch (err) {
-                        return err.message;
-                    }
-                    return true;
-                },
-            }]);
-            ({ actorName } = actorNamePrompt);
-        } else {
-            validateActorName(actorName);
-        }
-
-        if (!templateArchiveUrl) {
-            const manifest = await actorTemplates.fetchManifest();
-            if (!templateName) {
-                const choices = manifest.templates.map((t) => ({
-                    value: t.name,
-                    name: t.description,
-                }));
-
-                const answer = await inquirer.prompt([{
-                    type: 'list',
-                    name: 'template',
-                    message: 'Please select the template for your new actor',
-                    default: choices[0],
-                    choices,
-                    loop: false,
-                    pageSize: 8, // Due to the answers wrapping, the prompt looks best if the `pageSize` is a multiple of 2
-                }]);
-                templateName = answer.template;
-            }
-
-            const templateObj = manifest.templates.find((t) => t.name === templateName);
-            ({ archiveUrl: templateArchiveUrl, skipOptionalDeps } = templateObj);
+        // Start fetching manifest immediately to prevent
+        // annoying delays that sometimes happen on CLI startup.
+        const manifestPromise = templateArchiveUrl
+            ? undefined // not fetching manifest when we have direct template URL
+            : actorTemplates.fetchManifest().catch((err) => {
+                return new Error(`Could not fetch template list from server. Cause: ${err?.message}`);
+            });
+
+        actorName = await ensureValidActorName(actorName);
+        if (manifestPromise) {
+            ({ archiveUrl: templateArchiveUrl, skipOptionalDeps } = await getTemplateDefinition(templateName, manifestPromise));
         }
 
         const cwd = process.cwd();
@@ -88,10 +61,7 @@ class CreateCommand extends ApifyCommand {
             throw err;
         }
 
-        const zipStream = await gotScraping({
-            url: templateArchiveUrl,
-            isStream: true,
-        });
+        const zipStream = await httpsGet(templateArchiveUrl);
         const unzip = unzipper.Extract({ path: actFolderDir });
         await zipStream.pipe(unzip).promise();
 

package/src/commands/login-new.js

@@ -0,0 +1,164 @@
+const { flags: flagsHelper } = require('@oclif/command');
+const computerName = require('computer-name');
+const cors = require('cors');
+const express = require('express');
+const open = require('open');
+
+const { cryptoRandomObjectId } = require('@apify/utilities');
+
+const inquirer = require('inquirer');
+const { ApifyCommand } = require('../lib/apify_command');
+const outputs = require('../lib/outputs');
+const { getLoggedClient } = require('../lib/utils');
+const { getLocalUserInfo } = require('../lib/utils');
+
+const CONSOLE_BASE_URL = 'https://console.apify.com/account?tab=integrations';
+// const CONSOLE_BASE_URL = 'http://localhost:3000/account?tab=integrations';
+const CONSOLE_URL_ORIGIN = new URL(CONSOLE_BASE_URL).origin;
+
+const API_BASE_URL = CONSOLE_BASE_URL.includes('localhost') ? 'http://localhost:3333' : undefined;
+
+// Not really checked right now, but it might come useful if we ever need to do some breaking changes
+const API_VERSION = 'v1';
+
+let tokenPrompt;
+let promptUi;
+
+const tryToLogin = async (token) => {
+    const isUserLogged = await getLoggedClient(token, API_BASE_URL);
+    const userInfo = getLocalUserInfo();
+    if (isUserLogged) {
+        outputs.success(`You are logged in to Apify as ${userInfo.username || userInfo.id}!`);
+        promptUi.close();
+    } else {
+        outputs.error('Login to Apify failed, the provided API token is not valid.');
+    }
+    return isUserLogged;
+};
+
+class LoginNewCommand extends ApifyCommand {
+    async run() {
+        outputs.warning('This command is still experimental and might break at any time. Use at your own risk.\n');
+
+        const { flags } = this.parse(LoginNewCommand);
+        let { token } = flags;
+        if (!token) {
+            let server;
+            const app = express();
+
+            // To send requests from browser to localhost, CORS has to be configured properly
+            app.use(cors({
+                origin: CONSOLE_URL_ORIGIN,
+                allowedHeaders: ['Content-Type', 'Authorization'],
+            }));
+
+            // Turn off keepalive, otherwise closing the server when command is finished is lagging
+            app.use((req, res, next) => {
+                res.set('Connection', 'close');
+                next();
+            });
+
+            app.use(express.json());
+
+            // Basic authorization via a random token, which is passed to the Apify Console,
+            // and that sends it back via the `token` query param, or `Authorization` header
+            const authToken = cryptoRandomObjectId();
+            app.use((req, res, next) => {
+                let { token: serverToken } = req.query;
+                if (!serverToken) {
+                    const authorizationHeader = req.get('Authorization');
+                    if (authorizationHeader) {
+                        const [schema, tokenFromHeader, ...extra] = authorizationHeader.trim().split(/\s+/);
+                        if (schema.toLowerCase() === 'bearer' && tokenFromHeader && extra.length === 0) {
+                            serverToken = tokenFromHeader;
+                        }
+                    }
+                }
+
+                if (serverToken !== authToken) {
+                    res.status(401);
+                    res.send('Authorization failed');
+                } else {
+                    next();
+                }
+            });
+
+            const apiRouter = express.Router();
+            app.use(`/api/${API_VERSION}`, apiRouter);
+
+            apiRouter.post('/login-token', async (req, res) => {
+                try {
+                    if (req.body.apiToken) {
+                        console.log('canceled');
+                        outputs.info('Got token from console...');
+                        await tryToLogin(req.body.apiToken);
+                    } else {
+                        throw new Error('Request did not contain API token');
+                    }
+                    res.end();
+                } catch (err) {
+                    const errorMessage = `Login to Apify failed with error: ${err.message}`;
+                    outputs.error(errorMessage);
+                    res.status(500);
+                    res.send(errorMessage);
+                }
+                server.close();
+            });
+
+            apiRouter.post('/exit', (req, res) => {
+                if (req.body.isWindowClosed) {
+                    outputs.error('Login to Apify failed, the console window was closed.');
+                } else if (req.body.actionCanceled) {
+                    outputs.error('Login to Apify failed, the action was canceled in the Apify Console.');
+                } else {
+                    outputs.error('Login to Apify failed.');
+                }
+
+                res.end();
+                server.close();
+            });
+
+            // Listening on port 0 will assign a random available port
+            server = app.listen(0);
+            const { port } = server.address();
+            outputs.info(`Waiting for token from Apify console (on port ${port})...`);
+
+            const consoleUrl = new URL(CONSOLE_BASE_URL);
+            consoleUrl.searchParams.set('localCliCommand', 'login');
+            consoleUrl.searchParams.set('localCliPort', port);
+            consoleUrl.searchParams.set('localCliToken', authToken);
+            consoleUrl.searchParams.set('localCliApiVersion', API_VERSION);
+            consoleUrl.searchParams.set('localCliComputerName', encodeURIComponent(computerName()));
+
+            outputs.info(`Opening Apify Console at "${consoleUrl.href}"...`);
+            outputs.info('You can also paste your Apify token below');
+            await open(consoleUrl.href);
+            tokenPrompt = inquirer.prompt([{ name: 'token', message: 'token:', type: 'password' }]);
+            promptUi = tokenPrompt.ui;
+            const { token: insertedToken } = await tokenPrompt;
+            server.close();
+            const loginSuccessful = await tryToLogin(insertedToken);
+            if (loginSuccessful) {
+                token = insertedToken;
+            }
+        } else {
+            return tryToLogin(token);
+        }
+    }
+}
+
+LoginNewCommand.description = 'Logs in to your Apify account using your API token.\nThe API token and other account '
+    + 'information is stored in the ~/.apify directory, from where it is read by all other "apify" commands. '
+    + 'To log out, call "apify logout".';
+
+LoginNewCommand.flags = {
+    token: flagsHelper.string({
+        char: 't',
+        description: '[Optional] Apify API token',
+        required: false,
+    }),
+};
+
+LoginNewCommand.hidden = true;
+
+module.exports = LoginNewCommand;

package/src/lib/create-utils.js

@@ -0,0 +1,175 @@
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const https = require('https');
+const { validateActorName } = require('./utils');
+
+const PROGRAMMING_LANGUAGES = ['JavaScript', 'TypeScript', 'Python'];
+
+/**
+ * @param {string} url
+ * @returns {Promise<unknown>}
+ */
+exports.httpsGet = async (url) => {
+    return new Promise((resolve, reject) => {
+        https.get(url, (response) => {
+            if (response.statusCode === 301 || response.statusCode === 302) {
+                resolve(exports.httpsGet(response.headers.location));
+            } else {
+                resolve(response);
+            }
+        }).on('error', reject);
+    });
+};
+
+/**
+ * @param {string} maybeActorName
+ * @returns {Promise<string>}
+ */
+exports.ensureValidActorName = async (maybeActorName) => {
+    if (maybeActorName) {
+        validateActorName(maybeActorName);
+        return maybeActorName;
+    }
+    return promptActorName();
+};
+
+/**
+ * @param {string} maybeTemplateName
+ * @param {Promise<object>} manifestPromise
+ * @returns {Promise<object>}
+ */
+exports.getTemplateDefinition = async (maybeTemplateName, manifestPromise) => {
+    const manifest = await manifestPromise;
+    // If the fetch failed earlier, the resolve value of
+    // the promise will be the error from fetching the manifest.
+    if (manifest instanceof Error) throw manifest;
+
+    if (maybeTemplateName) {
+        const templateDefinition = manifest.templates.find((t) => t.name === maybeTemplateName);
+        if (!templateDefinition) {
+            throw new Error(`Could not find the selected template: ${maybeTemplateName} in the list of templates.`);
+        }
+        return templateDefinition;
+    }
+
+    return executePrompts(manifest);
+};
+
+/**
+ * Inquirer does not have a native way to "go back" between prompts.
+ * @param {object} manifest
+ * @returns {Promise<object>}
+ */
+async function executePrompts(manifest) {
+    const programmingLanguage = await promptProgrammingLanguage();
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const templateDefinition = await promptTemplateDefinition(manifest, programmingLanguage);
+        if (templateDefinition) {
+            const shouldInstall = await promptTemplateInstallation(templateDefinition);
+            if (shouldInstall) {
+                return templateDefinition;
+            }
+        } else {
+            return executePrompts(manifest);
+        }
+    }
+}
+
+/**
+ * @returns {Promise<string>}
+ */
+async function promptActorName() {
+    const answer = await inquirer.prompt([{
+        name: 'actorName',
+        message: 'Name of your new actor:',
+        type: 'input',
+        validate: (promptText) => {
+            try {
+                validateActorName(promptText);
+            } catch (err) {
+                return err.message;
+            }
+            return true;
+        },
+    }]);
+    return answer.actorName;
+}
+
+/**
+ * @returns {Promise<string>}
+ */
+async function promptProgrammingLanguage() {
+    const answer = await inquirer.prompt([{
+        type: 'list',
+        name: 'programmingLanguage',
+        message: 'Choose the programming language of your new actor:',
+        default: PROGRAMMING_LANGUAGES[0],
+        choices: PROGRAMMING_LANGUAGES,
+        loop: false,
+    }]);
+    return answer.programmingLanguage;
+}
+
+/**
+ * @param {object} manifest
+ * @param {string} programmingLanguage
+ * @returns {Promise<object>} template definition
+ */
+async function promptTemplateDefinition(manifest, programmingLanguage) {
+    const choices = manifest.templates
+        .filter((t) => {
+            return t.category.toLowerCase() === programmingLanguage.toLowerCase();
+        })
+        .map((t) => {
+            return {
+                name: t.label,
+                value: t,
+            };
+        });
+
+    choices.push(new inquirer.Separator());
+    choices.push({
+        name: 'Go back',
+        value: false,
+    });
+
+    const answer = await inquirer.prompt([{
+        type: 'list',
+        name: 'templateDefinition',
+        message: 'Choose a template for your new actor. Detailed information about the template will be shown in the next step.',
+        default: choices[0],
+        choices,
+        loop: false,
+        pageSize: 8,
+    }]);
+
+    return answer.templateDefinition;
+}
+
+/**
+ * @param {object} templateDefinition
+ * @returns {Promise<string>}
+ */
+async function promptTemplateInstallation(templateDefinition) {
+    const choices = [{ name: `Install template`, value: true }];
+    choices.push(new inquirer.Separator());
+    choices.push({ name: 'Go back', value: false });
+
+    const message = 'Do you want to install the following template?';
+    const label = chalk.underline(templateDefinition.label);
+    const description = chalk.dim(templateDefinition.description);
+    const suffix = `\n ${label}:\n ${description}`;
+
+    const answer = await inquirer.prompt([{
+        type: 'list',
+        name: 'shouldInstall',
+        message,
+        suffix,
+        default: choices[0],
+        choices,
+        loop: false,
+    }]);
+
+    return answer.shouldInstall;
+}

package/src/lib/utils.js

@@ -98,14 +98,14 @@ const getLoggedClientOrThrow = async () => {
  * @param {String|null|undefined} token
  * @returns {Object}
  */
-const getApifyClientOptions = (token) => {
+const getApifyClientOptions = (token, apiBaseUrl) => {
     if (!token && fs.existsSync(GLOBAL_CONFIGS_FOLDER) && fs.existsSync(AUTH_FILE_PATH)) {
         ({ token } = loadJson.sync(AUTH_FILE_PATH));
     }
 
     return {
         token,
-        baseUrl: process.env.APIFY_CLIENT_BASE_URL,
+        baseUrl: apiBaseUrl || process.env.APIFY_CLIENT_BASE_URL,
         requestInterceptors: [(config) => {
             config.headers = { ...APIFY_CLIENT_DEFAULT_HEADERS, ...config.headers };
             return config;
@@ -119,8 +119,12 @@ const getApifyClientOptions = (token) => {
  * @param [token]
  * @return {Promise<*>}
  */
-const getLoggedClient = async (token) => {
-    const apifyClient = new ApifyClient(getApifyClientOptions(token));
+const getLoggedClient = async (token, apiBaseUrl) => {
+    if (!token && fs.existsSync(GLOBAL_CONFIGS_FOLDER) && fs.existsSync(AUTH_FILE_PATH)) {
+        ({ token } = loadJson.sync(AUTH_FILE_PATH));
+    }
+
+    const apifyClient = new ApifyClient(getApifyClientOptions(token, apiBaseUrl));
     let userInfo;
     try {
         userInfo = await apifyClient.user('me').get();