webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 02:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Implement exit code for rate limiting error

Browse source 
Closes #1240
This commit is contained in:
AsamK 2023-10-13 19:35:29 +02:00
parent af4709255a
commit 56ee173d03
6 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java
View file

@ -19,4 +19,11 @@ public record SendMessageResults(long timestamp, Map<RecipientIdentifier, List<S
.allMatch(identityFailure -> identityFailure)
&& results.values().stream().mapToInt(List::size).sum() > 0;
}
public boolean hasOnlyRateLimitFailure() {
return results.values()
.stream()
.flatMap(res -> res.stream().map(SendMessageResult::isRateLimitFailure))
.allMatch(r -> r) && results.values().stream().mapToInt(List::size).sum() > 0;
}
}

1
man/signal-cli.1.adoc
View file

@ -788,6 +788,7 @@ signal-cli -a ACCOUNT trust -a NUMBER
* *2*: Some unexpected error
* *3*: Server or IO error
* *4*: Sending failed due to untrusted key
* *5*: Server rate limiting error
== Files

3
src/main/java/org/asamk/signal/Main.java
View file

@ -24,6 +24,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.IOErrorException;
import org.asamk.signal.commands.exceptions.RateLimitErrorException;
import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
@ -116,6 +117,8 @@ public class Main {
return 3;
} else if (e instanceof UntrustedKeyErrorException) {
return 4;
} else if (e instanceof RateLimitErrorException) {
return 5;
} else {
return 2;
}

5
src/main/java/org/asamk/signal/commands/RegisterCommand.java
View file

@ -9,6 +9,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.OutputType;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.IOErrorException;
import org.asamk.signal.commands.exceptions.RateLimitErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.manager.RegistrationManager;
import org.asamk.signal.manager.api.CaptchaRequiredException;
@ -64,7 +65,7 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
private void register(
final RegistrationManager m, final boolean voiceVerification, final String captcha
) throws UserErrorException, IOErrorException {
) throws CommandException {
try {
m.register(voiceVerification, captcha);
} catch (RateLimitException e) {
@ -72,7 +73,7 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
if (e.getNextAttemptTimestamp() > 0) {
message += "\nNext attempt may be tried at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
}
throw new UserErrorException(message);
throw new RateLimitErrorException(message, e);
} catch (CaptchaRequiredException e) {
String message;
if (captcha == null) {

10
src/main/java/org/asamk/signal/commands/exceptions/RateLimitErrorException.java Normal file
View file

@ -0,0 +1,10 @@
package org.asamk.signal.commands.exceptions;
import org.asamk.signal.manager.api.RateLimitException;
public final class RateLimitErrorException extends CommandException {
public RateLimitErrorException(final String message, final RateLimitException cause) {
super(message, cause);
}
}

7
src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
View file

@ -1,10 +1,12 @@
package org.asamk.signal.util;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.RateLimitErrorException;
import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.json.JsonSendMessageResult;
import org.asamk.signal.manager.api.ProofRequiredException;
import org.asamk.signal.manager.api.RateLimitException;
import org.asamk.signal.manager.api.RecipientIdentifier;
import org.asamk.signal.manager.api.SendGroupMessageResults;
import org.asamk.signal.manager.api.SendMessageResult;
@ -51,6 +53,9 @@ public class SendMessageResultUtils {
if (!sendMessageResults.hasSuccess()) {
if (sendMessageResults.hasOnlyUntrustedIdentity()) {
throw new UntrustedKeyErrorException("Failed to send message due to untrusted identities");
} else if (sendMessageResults.hasOnlyRateLimitFailure()) {
throw new RateLimitErrorException("Failed to send message due to rate limiting",
new RateLimitException(0));
} else {
throw new UserErrorException("Failed to send message");
}
@ -111,7 +116,7 @@ public class SendMessageResultUtils {
}
public static void printSendMessageResultErrors(PlainTextWriter writer, List<String> errors) {
if (errors.size() == 0) {
if (errors.isEmpty()) {
return;
}
writer.println("Failed to send (some) messages:");