apify-cli 0.6.7 → 0.7.0

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.6.7","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 \"apify.json\" file.","required":false}]},"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.Visit https://github.com/apifytech/actor-templates/raw/master/templates/manifest.json to find available template names.","required":false}},"args":[{"name":"actorName","description":"Name of the actor and its directory","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 \"apify.json\" file and the \"apify_storage\" directory in the current directory, but will not touch anything else.\n\nWARNING: The directory at \"apify_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 \"apify.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 \"apify.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 \"apify.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 \"apify.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 \"apify.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 \"apify_storage\" directory, rather than on the Apify platform.\n\nNOTE: You can override the default behaviour of command overriding 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.json file and prints errors found.","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}]},"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 \"apify.json\" file by adding the \"@\" prefix:\n\n{\n  \"name\": \"my_actor\",\n  \"env\": { \"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.7.0","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 \"apify.json\" file.","required":false}]},"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.Visit https://github.com/apifytech/actor-templates/raw/master/templates/manifest.json to find available template names.","required":false}},"args":[{"name":"actorName","description":"Name of the actor and its directory","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 \"apify.json\" file and the \"apify_storage\" directory in the current directory, but will not touch anything else.\n\nWARNING: The directory at \"apify_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 \"apify.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 \"apify.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 \"apify.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 \"apify.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 \"apify.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 \"apify_storage\" directory, rather than on the Apify platform.\n\nNOTE: You can override the default behaviour of command overriding 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.json file and prints errors found.","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}]},"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 \"apify.json\" file by adding the \"@\" prefix:\n\n{\n  \"name\": \"my_actor\",\n  \"env\": { \"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.6.7",
+    "version": "0.7.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": {
@@ -48,24 +48,25 @@
     },
     "homepage": "https://github.com/apify/apify-cli#readme",
     "engines": {
-        "node": ">=10.0.0"
+        "node": ">=12.0.0"
     },
     "dependencies": {
         "@apify/actor-templates": "^0.1.1",
+        "@apify/consts": "^1.7.0",
         "@apify/http-request": "^2.1.2",
-        "@oclif/command": "^1.8.0",
-        "@oclif/config": "^1.17.0",
+        "@apify/input_schema": "^2.0.8",
+        "@oclif/command": "^1.8.16",
+        "@oclif/config": "^1.18.3",
         "@oclif/errors": "^1.3.5",
-        "@oclif/plugin-commands": "^1.3.0",
-        "@oclif/plugin-help": "^3.2.3",
-        "ajv": "^6.12.6",
-        "apify-client": "^0.6.0",
-        "apify-shared": "^0.6.3",
+        "@oclif/plugin-commands": "^2.1.0",
+        "@oclif/plugin-help": "^5.1.12",
+        "ajv": "^8.10.0",
+        "apify-client": "^2.2.0",
         "archiver-promise": "^1.0.0",
         "chalk": "^4.1.2",
         "child-process-promise": "^2.2.1",
         "extract-zip": "^2.0.1",
-        "globby": "^11.0.4",
+        "globby": "^11.1.0",
         "inquirer": "^7.3.3",
         "is-online": "^9.0.1",
         "load-json-file": "^6.2.0",
@@ -73,17 +74,17 @@
         "minimist": "^1.2.5",
         "rimraf": "^3.0.2",
         "semver": "^7.3.5",
-        "underscore": "^1.13.1",
+        "underscore": "^1.13.2",
         "unzipper": "^0.10.11",
         "write-json-file": "^4.3.0"
     },
     "devDependencies": {
-        "@apify/eslint-config": "^0.1.4",
+        "@apify/eslint-config": "^0.2.3",
         "@oclif/dev-cli": "^1.26.0",
-        "@oclif/test": "^1.2.8",
+        "@oclif/test": "^2.1.0",
         "chai": "^4.3.4",
         "chai-as-promised": "^7.1.1",
-        "eslint": "^7.32.0",
+        "eslint": "^8.11.0",
         "mocha": "^8.4.0",
         "sinon": "^9.2.4"
     },

package/src/commands/call.js

@@ -1,5 +1,6 @@
 const { flags: flagsHelper } = require('@oclif/command');
-const { ACT_JOB_STATUSES } = require('apify-shared/consts');
+const { ACT_JOB_STATUSES } = require('@apify/consts');
+const mime = require('mime');
 const { ApifyCommand } = require('../lib/apify_command');
 const { getLocalConfig, getLoggedClientOrThrow,
     getLocalUserInfo, getLocalInput, outputJobLog } = require('../lib/utils');
@@ -21,12 +22,12 @@ class CallCommand extends ApifyCommand {
         const forceActorId = args.actId;
         let actorId;
         if (forceActorId) {
-            const actor = await apifyClient.acts.getAct({ actId: forceActorId });
+            const actor = await apifyClient.actor(forceActorId).get();
             if (!actor) throw new Error(`Cannot find actor with ID '${forceActorId}' in your account.`);
             actorId = actor.username ? `${actor.username}/${actor.name}` : actor.id;
         } else {
             actorId = `${usernameOrId}/${localConfig.name}`;
-            const actor = await apifyClient.acts.getAct({ actId: actorId });
+            const actor = await apifyClient.actor(actorId).get();
             if (!actor) {
                 throw new Error(`Cannot find actor with ID '${actorId}' `
                     + 'in your account. Call "apify push" to push this actor to Apify platform.');
@@ -34,7 +35,6 @@ class CallCommand extends ApifyCommand {
         }
 
         const runOpts = {
-            actId: actorId,
             waitForFinish: 2, // NOTE: We need to wait some time to Apify open stream and we can create connection
         };
         const waitForFinishMillis = Number.isNaN(flags.waitForFinish)
@@ -47,13 +47,20 @@ class CallCommand extends ApifyCommand {
 
         // Get input for act
         const localInput = getLocalInput();
-        if (localInput) Object.assign(runOpts, localInput);
 
-        outputs.run(`Calling actor ${runOpts.actId}`);
+        outputs.run(`Calling actor ${actorId}`);
 
         let run;
         try {
-            run = await apifyClient.acts.runAct(runOpts);
+            if (localInput) {
+                // TODO: For some reason we cannot pass json as buffer with right contentType into apify-client.
+                // It will save malformed JSON which looks like buffer as INPUT.
+                // We need to fix this in v1 during removing call under actor namespace.
+                const input = mime.getExtension(localInput.contentType) === 'json' ? JSON.parse(localInput.body.toString('utf-8')) : localInput.body;
+                run = await apifyClient.actor(actorId).start(input, { ...runOpts, contentType: localInput.contentType });
+            } else {
+                run = await apifyClient.actor(actorId).start(null, runOpts);
+            }
         } catch (err) {
             // TODO: Better error message in apify-client-js
             if (err.type === 'record-not-found') throw new Error(`Actor ${runOpts.actId} not found!`);
@@ -67,7 +74,7 @@ class CallCommand extends ApifyCommand {
             console.error(err);
         }
 
-        run = await apifyClient.acts.getRun({ actId: run.actId, runId: run.id });
+        run = await apifyClient.run(run.id).get();
         console.dir(run);
 
         outputs.link('Actor run detail', `https://console.apify.com/actors/${run.actId}#/runs/${run.id}`);

package/src/commands/push.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const { flags: flagsHelper } = require('@oclif/command');
 const actorTemplates = require('@apify/actor-templates');
 const { ACT_JOB_STATUSES, ACT_SOURCE_TYPES,
-    MAX_MULTIFILE_BYTES } = require('apify-shared/consts');
+    MAX_MULTIFILE_BYTES } = require('@apify/consts');
 const { ApifyCommand } = require('../lib/apify_command');
 const { createActZip, getLoggedClientOrThrow,
     outputJobLog, getLocalUserInfo, getActorLocalFilePaths,
@@ -33,12 +33,12 @@ class PushCommand extends ApifyCommand {
         // It causes that we push actor to this id but attributes in localConfig will remain same.
         const forceActorId = args.actorId;
         if (forceActorId) {
-            actor = await apifyClient.acts.getAct({ actId: forceActorId });
+            actor = await apifyClient.actor(forceActorId).get();
             if (!actor) throw new Error(`Cannot find actor with ID '${forceActorId}' in your account.`);
             actorId = actor.id;
         } else {
             const usernameOrId = userInfo.username || userInfo.id;
-            actor = await apifyClient.acts.getAct({ actId: `${usernameOrId}/${localConfig.name}` });
+            actor = await apifyClient.actor(`${usernameOrId}/${localConfig.name}`).get();
             if (actor) {
                 actorId = actor.id;
             } else {
@@ -55,7 +55,7 @@ class PushCommand extends ApifyCommand {
                         tarballUrl: actorTemplate.archiveUrl,
                     }],
                 };
-                actor = await apifyClient.acts.createAct({ act: newActor });
+                actor = await apifyClient.actors().create(newActor);
                 actorId = actor.id;
                 outputs.info(`Created actor with name ${localConfig.name} on Apify.`);
                 console.dir(actor);
@@ -66,6 +66,7 @@ class PushCommand extends ApifyCommand {
 
         const filePathsToPush = await getActorLocalFilePaths();
         const filesSize = await sumFilesSizeInBytes(filePathsToPush);
+        const actorClient = apifyClient.actor(actorId);
 
         let sourceType;
         let sourceFiles;
@@ -79,13 +80,12 @@ class PushCommand extends ApifyCommand {
             await createActZip(TEMP_ZIP_FILE_NAME, filePathsToPush);
 
             // Upload it to Apify.keyValueStores
-            const store = await apifyClient.keyValueStores.getOrCreateStore({ storeName: UPLOADS_STORE_NAME });
+            const store = await apifyClient.keyValueStores().getOrCreate(UPLOADS_STORE_NAME);
             const key = `${actor.name}-${version}.zip`;
             const buffer = fs.readFileSync(TEMP_ZIP_FILE_NAME);
-            await apifyClient.keyValueStores.putRecord({
-                storeId: store.id,
+            await apifyClient.keyValueStore(store.id).setRecord({
                 key,
-                body: buffer,
+                value: buffer,
                 contentType: 'application/zip',
             });
             fs.unlinkSync(TEMP_ZIP_FILE_NAME);
@@ -94,15 +94,11 @@ class PushCommand extends ApifyCommand {
         }
 
         // Update actor version
-        const actorCurrentVersion = await apifyClient.acts.getActVersion({ actId: actorId, versionNumber: version });
+        const actorCurrentVersion = await actorClient.version(version).get();
         if (actorCurrentVersion) {
             const actorVersionModifier = { tarballUrl, sourceFiles, buildTag, sourceType };
             if (localConfig.env) actorVersionModifier.envVars = transformEnvToEnvVars(localConfig.env);
-            await apifyClient.acts.updateActVersion({
-                actId: actorId,
-                versionNumber: version,
-                actVersion: actorVersionModifier,
-            });
+            await actorClient.version(version).update(actorVersionModifier);
             outputs.run(`Updated version ${version} for ${actor.name} actor.`);
         } else {
             const actorNewVersion = {
@@ -113,19 +109,16 @@ class PushCommand extends ApifyCommand {
                 sourceType,
             };
             if (localConfig.env) actorNewVersion.envVars = transformEnvToEnvVars(localConfig.env);
-            await apifyClient.acts.createActVersion({
-                actId: actorId,
+            await actorClient.versions().create({
                 versionNumber: version,
-                actVersion: actorNewVersion,
+                ...actorNewVersion,
             });
             outputs.run(`Created version ${version} for ${actor.name} actor.`);
         }
 
         // Build actor on Apify and wait for build to finish
         outputs.run(`Building actor ${actor.name}`);
-        let build = await apifyClient.acts.buildAct({
-            actId: actorId,
-            version,
+        let build = await actorClient.build(version, {
             useCache: true,
             waitForFinish: 2, // NOTE: We need to wait some time to Apify open stream and we can create connection
         });
@@ -137,7 +130,7 @@ class PushCommand extends ApifyCommand {
             console.error(err);
         }
 
-        build = await apifyClient.acts.getBuild({ actId: build.actId, buildId: build.id });
+        build = await apifyClient.build(build.id).get();
         console.dir(build);
 
         outputs.link('Actor build detail', `https://console.apify.com/actors/${build.actId}#/builds/${build.buildNumber}`);

package/src/commands/run.js

@@ -2,7 +2,7 @@ const { flags: flagsHelper } = require('@oclif/command');
 const fs = require('fs');
 const path = require('path');
 const loadJson = require('load-json-file');
-const { ENV_VARS } = require('apify-shared/consts');
+const { ENV_VARS } = require('@apify/consts');
 const semver = require('semver');
 const execWithLog = require('../lib/exec');
 const { DEFAULT_LOCAL_STORAGE_DIR, SUPPORTED_NODEJS_VERSION } = require('../lib/consts');

package/src/commands/vis.js

@@ -1,4 +1,4 @@
-const { validateInputSchema } = require('apify-shared/input_schema');
+const { validateInputSchema } = require('@apify/input_schema');
 const Ajv = require('ajv');
 const fs = require('fs');
 const { ApifyCommand } = require('../lib/apify_command');
@@ -10,7 +10,7 @@ class ValidateInputSchemaCommand extends ApifyCommand {
     async run() {
         const { args } = this.parse(ValidateInputSchemaCommand);
         const { path = DEFAULT_INPUT_SCHEMA_PATH } = args;
-        const validator = new Ajv({ cache: false });
+        const validator = new Ajv({ cache: false, strict: false });
 
         let inputSchemaObj;
 

package/src/lib/consts.js

@@ -1,6 +1,6 @@
 const os = require('os');
 const path = require('path');
-const { KEY_VALUE_STORE_KEYS } = require('apify-shared/consts');
+const { KEY_VALUE_STORE_KEYS } = require('@apify/consts');
 
 exports.DEFAULT_LOCAL_STORAGE_DIR = 'apify_storage';
 

package/src/lib/files.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const rimraf = require('rimraf');
 
-const updateLocalJson = async (jsonFilePath, updateAttrs = {}, nestedObjectAttr) => {
+const updateLocalJson = async (jsonFilePath, updateAttrs = {}, nestedObjectAttr = null) => {
     const currentObject = await loadJson(jsonFilePath);
     let newObject;
 

package/src/lib/utils.js

@@ -8,9 +8,9 @@ const loadJson = require('load-json-file');
 const writeJson = require('write-json-file');
 const inquirer = require('inquirer');
 const { LOCAL_STORAGE_SUBDIRS, ENV_VARS, LOCAL_ENV_VARS,
-    KEY_VALUE_STORE_KEYS, ACT_JOB_TERMINAL_STATUSES, SOURCE_FILE_FORMATS, ACTOR_NAME } = require('apify-shared/consts');
+    KEY_VALUE_STORE_KEYS, ACT_JOB_TERMINAL_STATUSES, SOURCE_FILE_FORMATS, ACTOR_NAME } = require('@apify/consts');
 const https = require('https');
-const ApifyClient = require('apify-client');
+const { ApifyClient } = require('apify-client');
 const { execSync, spawnSync } = require('child_process');
 const semver = require('semver');
 const isOnline = require('is-online');
@@ -73,15 +73,14 @@ const getLoggedClientOrThrow = async () => {
  * @return {Promise<*>}
  */
 const getLoggedClient = async (token) => {
-    let userInfo;
-    const apifyClient = new ApifyClient();
-
     if (!token && fs.existsSync(GLOBAL_CONFIGS_FOLDER) && fs.existsSync(AUTH_FILE_PATH)) {
         ({ token } = loadJson.sync(AUTH_FILE_PATH));
     }
 
+    const apifyClient = new ApifyClient({ token });
+    let userInfo;
     try {
-        userInfo = await apifyClient.users.getUser({ token });
+        userInfo = await apifyClient.user('me').get();
     } catch (e) {
         return false;
     }
@@ -89,7 +88,6 @@ const getLoggedClient = async (token) => {
     // Always refresh Auth file
     if (!fs.existsSync(GLOBAL_CONFIGS_FOLDER)) fs.mkdirSync(GLOBAL_CONFIGS_FOLDER);
     writeJson.sync(AUTH_FILE_PATH, { token, ...userInfo });
-    apifyClient.setOptions({ token, userId: userInfo.id });
     return apifyClient;
 };
 
@@ -305,12 +303,13 @@ const outputJobLog = async (job, jobStatus, timeout) => {
     const { id: logId, status } = job;
     // In case job was already done just output log
     if (ACT_JOB_TERMINAL_STATUSES.includes(status)) {
-        const { logs } = new ApifyClient();
-        const log = await logs.getLog({ logId });
+        const apifyClient = new ApifyClient();
+        const log = await apifyClient.log(logId).get();
         process.stdout.write(log);
     }
 
     // In other case stream it to stdout
+    // TODO: Use apifyClient.log(logId).stream() instead of http request stream.
     return new Promise((resolve, reject) => {
         const req = https.get(`https://api.apify.com/v2/logs/${logId}?stream=1`);
         let res;