apify-cli 1.0.0-beta.4 → 1.0.0-beta.41

package/dist/commands/actor/push-data.js

@@ -38,9 +38,9 @@ Object.defineProperty(PushDataCommand, "description", {
     value: 'Stores an object or an array of objects to the default dataset of the Actor run.\n'
         + 'It is possible to pass data using item argument or stdin.\n'
         + 'Passing data using argument:\n'
-        + '$ apify actor:push-data {"foo": "bar"}\n'
+        + '$ apify actor push-data {"foo": "bar"}\n'
         + 'Passing data using stdin with pipe:\n'
-        + '$ cat ./test.json | apify actor:push-data\n'
+        + '$ cat ./test.json | apify actor push-data\n'
 });
 Object.defineProperty(PushDataCommand, "args", {
     enumerable: true,

package/dist/commands/actor/set-value.js

@@ -24,7 +24,7 @@ export class SetValueCommand extends ApifyCommand {
         const recordValue = value || stdin;
         const apifyClient = await getApifyStorageClient();
         const storeClient = apifyClient.keyValueStore(getDefaultStorageId(APIFY_STORAGE_TYPES.KEY_VALUE_STORE));
-        if (recordValue === undefined || recordValue === null) {
+        if (recordValue === undefined || recordValue === null || recordValue === '' || recordValue === 'null' || recordValue === 'undefined') {
             await storeClient.deleteRecord(key);
         }
         else {
@@ -39,9 +39,9 @@ Object.defineProperty(SetValueCommand, "description", {
     value: 'Sets or removes record into the default KeyValueStore associated with the Actor run.\n'
         + 'It is possible to pass data using argument or stdin.\n'
         + 'Passing data using argument:\n'
-        + '$ apify actor:set-value KEY my-value\n'
+        + '$ apify actor set-value KEY my-value\n'
         + 'Passing data using stdin with pipe:\n'
-        + '$ cat ./my-text-file.txt | apify actor:set-value KEY --contentType text/plain\n'
+        + '$ cat ./my-text-file.txt | apify actor set-value KEY --contentType text/plain\n'
 });
 Object.defineProperty(SetValueCommand, "args", {
     enumerable: true,

package/dist/commands/actor/set-value.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-value.js","sourceRoot":"","sources":["../../../src/commands/actor/set-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,OAAO,eAAgB,SAAQ,YAAoC;IAAzE;;QA8BY;;;;;WAA6B;IAwBzC,CAAC;IAtBY,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,sCAAsC;QACtC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACjC,MAAM,EAAE,WAAW,GAAG,iCAAiC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEvE,oGAAoG;QACpG,MAAM,WAAW,GAAG,KAAK,IAAI,KAAK,CAAC;QACnC,MAAM,WAAW,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,WAAW,CAAC,aAAa,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;QAExG,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACpD,MAAM,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;;AApDe;;;;WAAc,wFAAwF;UAChH,wDAAwD;UACxD,gCAAgC;UAChC,wCAAwC;UACxC,uCAAuC;UACvC,iFAAiF;EAL5D,CAK6D;AAExE;;;;WAAO;QACnB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;YACb,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,uCAAuC;SACvD,CAAC;QACF,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,0DAA0D;kBACrE,6DAA6D;kBAC7D,2FAA2F;kBAC3F,wDAAwD;SAC7D,CAAC;KACL;EAZmB,CAYlB;AAEc;;;;WAAQ;QACpB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,4FAA4F;YACzG,QAAQ,EAAE,KAAK;SAClB,CAAC;KACL;EANoB,CAMnB"}
+{"version":3,"file":"set-value.js","sourceRoot":"","sources":["../../../src/commands/actor/set-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,OAAO,eAAgB,SAAQ,YAAoC;IAAzE;;QA8BY;;;;;WAA6B;IAwBzC,CAAC;IAtBY,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,sCAAsC;QACtC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACjC,MAAM,EAAE,WAAW,GAAG,iCAAiC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEvE,oGAAoG;QACpG,MAAM,WAAW,GAAG,KAAK,IAAI,KAAK,CAAC;QACnC,MAAM,WAAW,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,WAAW,CAAC,aAAa,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;QAExG,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,EAAE,IAAI,WAAW,KAAK,MAAM,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;YACnI,MAAM,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;;AApDe;;;;WAAc,wFAAwF;UAChH,wDAAwD;UACxD,gCAAgC;UAChC,wCAAwC;UACxC,uCAAuC;UACvC,iFAAiF;EAL5D,CAK6D;AAExE;;;;WAAO;QACnB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;YACb,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,uCAAuC;SACvD,CAAC;QACF,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,0DAA0D;kBACrE,6DAA6D;kBAC7D,2FAA2F;kBAC3F,wDAAwD;SAC7D,CAAC;KACL;EAZmB,CAYlB;AAEc;;;;WAAQ;QACpB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,4FAA4F;YACzG,QAAQ,EAAE,KAAK;SAClB,CAAC;KACL;EANoB,CAMnB"}

package/dist/commands/call.d.ts

@@ -11,5 +11,6 @@ export declare class CallCommand extends ApifyCommand<typeof CallCommand> {
         actorId: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
+    private resolveActorId;
 }
 //# sourceMappingURL=call.d.ts.map

package/dist/commands/call.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../src/commands/call.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,qBAAa,WAAY,SAAQ,YAAY,CAAC,OAAO,WAAW,CAAC;IAC7D,OAAgB,WAAW,SAEyD;IAEpF,OAAgB,KAAK;;;;;MAqBnB;IAEF,OAAgB,IAAI;;MAMlB;IAEI,GAAG;CAoFZ"}
+{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../src/commands/call.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,qBAAa,WAAY,SAAQ,YAAY,CAAC,OAAO,WAAW,CAAC;IAC7D,OAAgB,WAAW,SAEyD;IAEpF,OAAgB,KAAK;;;;;MAqBnB;IAEF,OAAgB,IAAI;;MAMlB;IAEI,GAAG;YAgFK,cAAc;CA4C/B"}

package/dist/commands/call.js

@@ -7,7 +7,7 @@ import { ACTOR_JOB_STATUSES } from '@apify/consts';
 import { Args, Flags } from '@oclif/core';
 import mime from 'mime';
 import { ApifyCommand } from '../lib/apify_command.js';
-import { LOCAL_CONFIG_PATH } from '../lib/consts.js';
+import { CommandExitCodes, LOCAL_CONFIG_PATH } from '../lib/consts.js';
 import { error, link, run as runLog, success, warning } from '../lib/outputs.js';
 import { getLocalConfig, getLocalInput, getLocalUserInfo, getLoggedClientOrThrow, outputJobLog } from '../lib/utils.js';
 export class CallCommand extends ApifyCommand {
@@ -17,22 +17,10 @@ export class CallCommand extends ApifyCommand {
         const apifyClient = await getLoggedClientOrThrow();
         const userInfo = await getLocalUserInfo();
         const usernameOrId = userInfo.username || userInfo.id;
-        const forceActorId = this.args.actorId;
-        let actorId;
-        if (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.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.');
-            }
+        if (!usernameOrId) {
+            throw new Error('Corrupted local user info was found. Please run "apify login" to fix it, then re-run this command.');
         }
+        const { id: actorId, userFriendlyId } = await this.resolveActorId(apifyClient, localConfig.name, usernameOrId);
         const runOpts = {
             waitForFinish: 2, // NOTE: We need to wait some time to Apify open stream and we can create connection
         };
@@ -50,7 +38,7 @@ export class CallCommand extends ApifyCommand {
         }
         // Get input for act
         const localInput = getLocalInput(cwd);
-        runLog(`Calling Actor ${actorId}`);
+        runLog(`Calling Actor ${userFriendlyId} (${actorId})`);
         let run;
         try {
             if (localInput) {
@@ -68,7 +56,7 @@ export class CallCommand extends ApifyCommand {
         catch (err) {
             // TODO: Better error message in apify-client-js
             if (err.type === 'record-not-found')
-                throw new Error(`Actor ${actorId} not found!`);
+                throw new Error(`Actor ${userFriendlyId} (${actorId}) not found!`);
             else
                 throw err;
         }
@@ -87,9 +75,50 @@ export class CallCommand extends ApifyCommand {
         else if (run.status === ACTOR_JOB_STATUSES.RUNNING) {
             warning('Actor is still running!');
         }
+        else if (run.status === ACTOR_JOB_STATUSES.ABORTED || run.status === ACTOR_JOB_STATUSES.ABORTING) {
+            warning('Actor was aborted!');
+            process.exitCode = CommandExitCodes.RunAborted;
+        }
         else {
             error('Actor failed!');
+            process.exitCode = CommandExitCodes.RunFailed;
+        }
+    }
+    async resolveActorId(client, localActorName, usernameOrId) {
+        const { actorId } = this.args;
+        // Full ID
+        if (actorId?.includes('/')) {
+            const actor = await client.actor(actorId).get();
+            if (!actor)
+                throw new Error(`Cannot find Actor with ID '${actorId}' in your account.`);
+            return {
+                userFriendlyId: `${actor.username}/${actor.name}`,
+                id: actor.id,
+            };
+        }
+        // Try fetching actor directly by name
+        if (actorId) {
+            const actor = await client.actor(`${usernameOrId}/${actorId.toLowerCase()}`).get();
+            if (!actor) {
+                throw new Error(`Cannot find Actor with name '${actorId}' in your account.`);
+            }
+            return {
+                userFriendlyId: `${actor.username}/${actor.name}`,
+                id: actor.id,
+            };
+        }
+        if (localActorName) {
+            const actor = await client.actor(`${usernameOrId}/${localActorName}`).get();
+            if (!actor) {
+                throw new Error(`Cannot find Actor with ID '${usernameOrId}/${localActorName}' `
+                    + 'in your account. Call "apify push" to push this Actor to Apify platform.');
+            }
+            return {
+                userFriendlyId: `${actor.username}/${actor.name}`,
+                id: actor.id,
+            };
         }
+        throw new Error('Please provide an Actor ID or name, or run this command from a directory with a valid Apify actor.');
     }
 }
 Object.defineProperty(CallCommand, "description", {
@@ -134,7 +163,7 @@ Object.defineProperty(CallCommand, "args", {
     value: {
         actorId: Args.string({
             required: false,
-            description: 'Name or ID of the Actor to run (e.g. "apify/hello-world" or "E2jjCZBezvAZnX8Rb"). '
+            description: 'Name or ID of the Actor to run (e.g. "my-actor", "apify/hello-world" or "E2jjCZBezvAZnX8Rb"). '
                 + `If not provided, the command runs the remote Actor specified in the "${LOCAL_CONFIG_PATH}" file.`,
         }),
     }

package/dist/commands/call.js.map

@@ -1 +1 @@
-{"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/commands/call.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/commands/call.ts"],"names":[],"mappings":"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"}

package/dist/commands/create.d.ts

@@ -5,6 +5,7 @@ export declare class CreateCommand extends ApifyCommand<typeof CreateCommand> {
         template: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'skip-dependency-install': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'template-archive-url': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        'omit-optional-deps': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static args: {
         actorName: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;

package/dist/commands/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAqBvD,qBAAa,aAAc,SAAQ,YAAY,CAAC,OAAO,aAAa,CAAC;IACjE,OAAgB,WAAW,SAAiF;IAE5G,OAAgB,KAAK;;;;MAgBnB;IAEF,OAAgB,IAAI;;MAKlB;IAEI,GAAG;CA0JZ"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAqBvD,qBAAa,aAAc,SAAQ,YAAY,CAAC,OAAO,aAAa,CAAC;IACjE,OAAgB,WAAW,SAAiF;IAE5G,OAAgB,KAAK;;;;;MAqBnB;IAEF,OAAgB,IAAI;;MAKlB;IAEI,GAAG;CA+JZ"}

package/dist/commands/create.js

@@ -59,6 +59,10 @@ export class CreateCommand extends ApifyCommand {
                 skipOptionalDeps = templateDefinition.skipOptionalDeps;
             }
         }
+        // Set this _after_ the template is resolved, so that the flag takes precedence
+        if (this.flags.omitOptionalDeps) {
+            skipOptionalDeps = true;
+        }
         await downloadAndUnzip({ url: templateArchiveUrl, pathTo: actFolderDir });
         // There may be .actor/actor.json file in used template - let's try to load it and change the name prop value to actorName
         const localConfig = getJsonFileContent(join(actFolderDir, LOCAL_CONFIG_PATH));
@@ -134,7 +138,7 @@ export class CreateCommand extends ApifyCommand {
         }
         if (dependenciesInstalled) {
             success(`Actor '${actorName}' was created. To run it, run "cd ${actorName}" and "apify run".`);
-            success('To run your code in the cloud, run "apify push" and deploy your code to Apify Console.');
+            info('To run your code in the cloud, run "apify push" and deploy your code to Apify Console.');
             if (messages?.postCreate) {
                 info(messages?.postCreate);
             }
@@ -170,6 +174,11 @@ Object.defineProperty(CreateCommand, "flags", {
             required: false,
             hidden: true,
         }),
+        'omit-optional-deps': Flags.boolean({
+            aliases: ['no-optional'],
+            description: 'Skip installing optional dependencies.',
+            required: false,
+        }),
     }
 });
 Object.defineProperty(CreateCommand, "args", {

package/dist/commands/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}

package/dist/commands/login.d.ts

@@ -3,6 +3,7 @@ export declare class LoginCommand extends ApifyCommand<typeof LoginCommand> {
     static description: string;
     static flags: {
         token: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        method: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,qBAAa,YAAa,SAAQ,YAAY,CAAC,OAAO,YAAY,CAAC;IAC/D,OAAgB,WAAW,SAEU;IAErC,OAAgB,KAAK;;MAMnB;IAEI,GAAG;CAgBZ"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AA0BvD,qBAAa,YAAa,SAAQ,YAAY,CAAC,OAAO,YAAY,CAAC;IAC/D,OAAgB,WAAW,SAEU;IAErC,OAAgB,KAAK;;;MAYnB;IAEI,GAAG;CA6HZ"}

package/dist/commands/login.js

@@ -1,30 +1,155 @@
+import { cryptoRandomObjectId } from '@apify/utilities';
 import { Flags } from '@oclif/core';
+import computerName from 'computer-name';
+import cors from 'cors';
+import express from 'express';
 import inquirer from 'inquirer';
+import open from 'open';
 import { ApifyCommand } from '../lib/apify_command.js';
-import { error, success } from '../lib/outputs.js';
+import { error, info, success } from '../lib/outputs.js';
 import { useApifyIdentity } from '../lib/telemetry.js';
 import { getLocalUserInfo, getLoggedClient } from '../lib/utils.js';
+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';
+const tryToLogin = async (token) => {
+    const isUserLogged = await getLoggedClient(token, API_BASE_URL);
+    const userInfo = await getLocalUserInfo();
+    if (isUserLogged) {
+        await useApifyIdentity(userInfo.id);
+        success(`You are logged in to Apify as ${userInfo.username || userInfo.id}!`);
+    }
+    else {
+        error('Login to Apify failed, the provided API token is not valid.');
+    }
+    return isUserLogged;
+};
 export class LoginCommand extends ApifyCommand {
     async run() {
-        let { token } = this.flags;
-        if (!token) {
+        const { token, method } = this.flags;
+        if (token) {
+            await tryToLogin(token);
+            return;
+        }
+        let selectedMethod = method;
+        if (!method) {
+            const answer = await inquirer.prompt([{
+                    type: 'list',
+                    name: 'loginMethod',
+                    message: 'Choose how you want to log in to Apify',
+                    choices: [
+                        {
+                            value: 'console',
+                            name: 'Through Apify Console in your default browser',
+                            short: 'Through Apify Console',
+                        },
+                        { value: 'manual', name: 'Enter API token manually', short: 'Manually' },
+                    ],
+                    loop: true,
+                }]);
+            selectedMethod = answer.loginMethod;
+        }
+        if (selectedMethod === 'console') {
+            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((_, 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) {
+                        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}`;
+                    error(errorMessage);
+                    res.status(500);
+                    res.send(errorMessage);
+                }
+                server.close();
+            });
+            apiRouter.post('/exit', (req, res) => {
+                if (req.body.isWindowClosed) {
+                    error('Login to Apify failed, the console window was closed.');
+                }
+                else if (req.body.actionCanceled) {
+                    error('Login to Apify failed, the action was canceled in the Apify Console.');
+                }
+                else {
+                    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();
+            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);
+            try {
+                consoleUrl.searchParams.set('localCliComputerName', encodeURIComponent(computerName()));
+            }
+            catch {
+                // Ignore errors from fetching computer name as it's not critical
+            }
+            info(`Opening Apify Console at "${consoleUrl.href}"...`);
+            await open(consoleUrl.href);
+        }
+        else {
             console.log('Enter your Apify API token. You can find it at https://console.apify.com/account#/integrations');
-            const tokenPrompt = await inquirer.prompt([{ name: 'token', message: 'token:', type: 'password' }]);
-            ({ token } = tokenPrompt);
+            const tokenAnswer = await inquirer.prompt([{ name: 'token', message: 'token:', type: 'password' }]);
+            await tryToLogin(tokenAnswer.token);
         }
-        const isUserLogged = await getLoggedClient(token);
-        const userInfo = await getLocalUserInfo();
-        await useApifyIdentity(userInfo.id);
-        return isUserLogged
-            ? success(`You are logged in to Apify as ${userInfo.username || userInfo.id}!`)
-            : error('Login to Apify failed, the provided API token is not valid.');
     }
 }
 Object.defineProperty(LoginCommand, "description", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: 'Logs in to your Apify account using a provided API token.\nThe API token and other account '
+    value: 'Logs in to your Apify account.\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".'
 });
@@ -38,6 +163,12 @@ Object.defineProperty(LoginCommand, "flags", {
             description: '[Optional] Apify API token',
             required: false,
         }),
+        method: Flags.string({
+            char: 'm',
+            description: '[Optional] Method of logging in to Apify',
+            options: ['console', 'manual'],
+            required: false,
+        }),
     }
 });
 //# sourceMappingURL=login.js.map

package/dist/commands/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,OAAO,YAAa,SAAQ,YAAiC;IAa/D,KAAK,CAAC,GAAG;QACL,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE3B,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,gGAAgG,CAAC,CAAC;YAC9G,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAoB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;YACvH,CAAC,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,CAAC;QAC9B,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC1C,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAG,CAAC,CAAC;QACrC,OAAO,YAAY;YACf,CAAC,CAAC,OAAO,CAAC,iCAAiC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE,GAAG,CAAC;YAC/E,CAAC,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;IAC/E,CAAC;;AA3Be;;;;WAAc,6FAA6F;UACzH,wGAAwG;UACxG,kCAAkC;GAAC;AAErB;;;;WAAQ;QACpB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;YAChB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,4BAA4B;YACzC,QAAQ,EAAE,KAAK;SAClB,CAAC;KACL;GAAC"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}

package/dist/commands/push.d.ts

@@ -7,10 +7,12 @@ export declare class PushCommand extends ApifyCommand<typeof PushCommand> {
         'build-tag': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'wait-for-finish': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'no-prompt': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static args: {
         actorId: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
     };
+    catch(caughtError: Error): Promise<void>;
     run(): Promise<void>;
 }
 //# sourceMappingURL=push.d.ts.map

package/dist/commands/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AA6BvD,qBAAa,WAAY,SAAQ,YAAY,CAAC,OAAO,WAAW,CAAC;IAC7D,OAAgB,WAAW,SAIoE;IAE/F,OAAgB,KAAK;;;;;;MA2BnB;IAEF,OAAgB,IAAI;;MAMlB;IAEI,GAAG;CAmKZ"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AA6BvD,qBAAa,WAAY,SAAQ,YAAY,CAAC,OAAO,WAAW,CAAC;IAC7D,OAAgB,WAAW,SAI4H;IAEvJ,OAAgB,KAAK;;;;;;;MAgCnB;IAEF,OAAgB,IAAI;;MAMlB;IAGa,KAAK,CAAC,WAAW,EAAE,KAAK;IAIjC,GAAG;CA+LZ"}

package/dist/commands/push.js

@@ -1,4 +1,5 @@
-import { readFileSync, unlinkSync } from 'node:fs';
+import { readFileSync, unlinkSync, statSync } from 'node:fs';
+import { join } from 'node:path';
 import process from 'node:process';
 import { fetchManifest } from '@apify/actor-templates';
 import { ACTOR_JOB_STATUSES, ACTOR_SOURCE_TYPES, MAX_MULTIFILE_BYTES } from '@apify/consts';
@@ -7,7 +8,7 @@ import inquirer from 'inquirer';
 import isCI from 'is-ci';
 import open from 'open';
 import { ApifyCommand } from '../lib/apify_command.js';
-import { LOCAL_CONFIG_PATH, UPLOADS_STORE_NAME } from '../lib/consts.js';
+import { CommandExitCodes, LOCAL_CONFIG_PATH, UPLOADS_STORE_NAME } from '../lib/consts.js';
 import { sumFilesSizeInBytes } from '../lib/files.js';
 import { error, info, link, run, success, warning } from '../lib/outputs.js';
 import { transformEnvToEnvVars } from '../lib/secrets.js';
@@ -25,6 +26,10 @@ const DEFAULT_ACTOR_VERSION_NUMBER = '0.0';
 // that changes, we have to add it.
 const DEFAULT_BUILD_TAG = 'latest';
 export class PushCommand extends ApifyCommand {
+    // TODO: Global handler in ApifyCommand
+    async catch(caughtError) {
+        throw caughtError;
+    }
     async run() {
         const cwd = process.cwd();
         const apifyClient = await getLoggedClientOrThrow();
@@ -34,6 +39,7 @@ export class PushCommand extends ApifyCommand {
         const redirectUrlPart = isOrganizationLoggedIn ? `/organization/${userInfo.id}` : '';
         let actorId;
         let actor;
+        let isActorCreatedNow = false;
         // User can override actor version and build tag, attributes in localConfig will remain same.
         const version = this.flags.version || this.flags.versionNumber || localConfig?.version || DEFAULT_ACTOR_VERSION_NUMBER;
         let buildTag = this.flags.buildTag || localConfig.buildTag;
@@ -79,6 +85,7 @@ export class PushCommand extends ApifyCommand {
                 };
                 actor = await apifyClient.actors().create(newActor);
                 actorId = actor.id;
+                isActorCreatedNow = true;
                 info(`Created Actor with name ${localConfig.name} on Apify.`);
             }
         }
@@ -90,6 +97,21 @@ export class PushCommand extends ApifyCommand {
         let sourceFiles;
         let tarballUrl;
         if (filesSize < MAX_MULTIFILE_BYTES) {
+            const client = await actorClient.get();
+            if (!isActorCreatedNow) {
+                // Check when was files modified last
+                const mostRecentModifiedFileMs = filePathsToPush.reduce((modifiedMs, filePath) => {
+                    const { mtimeMs, ctimeMs } = statSync(join(cwd, filePath));
+                    // Sometimes it's possible mtimeMs is some messed up value (like 2000/01/01 midnight), then we want to check created if it's newer
+                    const fileModifiedMs = mtimeMs > ctimeMs ? mtimeMs : ctimeMs;
+                    return modifiedMs > fileModifiedMs ? modifiedMs : fileModifiedMs;
+                }, 0);
+                const actorModifiedMs = client?.modifiedAt.valueOf();
+                if (!this.flags.force && actorModifiedMs && mostRecentModifiedFileMs < actorModifiedMs && (localConfig?.name || forceActorId)) {
+                    throw new Error(`Actor with identifier "${localConfig?.name || forceActorId}" is already on the platform and was modified there since modified locally.
+Skipping push. Use --force to override.`);
+                }
+            }
             sourceFiles = await createSourceFiles(filePathsToPush, cwd);
             sourceType = ACTOR_SOURCE_TYPES.SOURCE_FILES;
         }
@@ -174,13 +196,16 @@ export class PushCommand extends ApifyCommand {
         }
         else if (build.status === ACTOR_JOB_STATUSES.ABORTED || build.status === ACTOR_JOB_STATUSES.ABORTING) {
             warning('Build was aborted!');
+            process.exitCode = CommandExitCodes.BuildAborted;
             // @ts-expect-error FIX THESE TYPES 😢
         }
         else if (build.status === ACTOR_JOB_STATUSES.TIMED_OUT || build.status === ACTOR_JOB_STATUSES.TIMING_OUT) {
             warning('Build timed out!');
+            process.exitCode = CommandExitCodes.BuildTimedOut;
         }
         else {
             error('Build failed!');
+            process.exitCode = CommandExitCodes.BuildFailed;
         }
     }
 }
@@ -192,7 +217,7 @@ Object.defineProperty(PushCommand, "description", {
         + `The Actor settings are read from the "${LOCAL_CONFIG_PATH}" file in the current directory, but they can be overridden using command-line options.\n`
         + `NOTE: If the source files are smaller than ${MAX_MULTIFILE_BYTES / (1024 ** 2)} MB then they are uploaded as \n`
         + '"Multiple source files", otherwise they are uploaded as "Zip file".\n\n'
-        + 'WARNING: If the target Actor already exists in your Apify account, it will be overwritten!'
+        + 'When there\'s an attempt to push files that are older than the Actor on the platform, the command will fail. Can be overwritten with --force flag.'
 });
 Object.defineProperty(PushCommand, "flags", {
     enumerable: true,
@@ -225,6 +250,11 @@ Object.defineProperty(PushCommand, "flags", {
             default: false,
             required: false,
         }),
+        force: Flags.boolean({
+            description: 'Push an Actor even when the local files are older than the Actor on the platform.',
+            default: false,
+            required: false,
+        }),
     }
 });
 Object.defineProperty(PushCommand, "args", {