Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[xmppclient] Add send image throught HTTP #11247

Merged
merged 1 commit into from
Oct 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions bundles/org.openhab.binding.xmppclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@
<version>${smack.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-experimental</artifactId>
<version>${smack.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.minidns</groupId>
<artifactId>minidns-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
<feature>openhab-runtime-base</feature>

<bundle dependency="true">mvn:org.igniterealtime.smack/smack-extensions/4.3.3</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-experimental/4.3.3</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-im/4.3.3</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-tcp/4.3.3</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-core/0.6.3</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-jid/0.6.3</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-util-cache/0.6.3</bundle>
<bundle dependency="true">mvn:org.minidns/minidns-core/0.3.3</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk15on/1.69</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-core/4.3.3</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-sasl-javax/4.3.3</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_7</bundle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
*/
package org.openhab.binding.xmppclient.internal;

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.HashSet;
import java.util.Set;

Expand All @@ -30,6 +32,7 @@
import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity;
import org.jivesoftware.smackx.httpfileupload.HttpFileUploadManager;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.stringprep.XmppStringprepException;
Expand All @@ -46,6 +49,7 @@ public class XMPPClient implements IncomingChatMessageListener, ConnectionListen
private final Logger logger = LoggerFactory.getLogger(XMPPClient.class);
private AbstractXMPPConnection connection;
private ChatManager chatManager;
private HttpFileUploadManager httpFileUploadManager;
private Set<XMPPClientMessageSubscriber> subscribers = new HashSet<>();

public void subscribe(XMPPClientMessageSubscriber channel) {
Expand Down Expand Up @@ -90,6 +94,7 @@ public void connect(String host, Integer port, String login, String domain, Stri

chatManager = ChatManager.getInstanceFor(connection);
chatManager.addIncomingListener(this);
httpFileUploadManager = HttpFileUploadManager.getInstanceFor(connection);
}

public void disconnect() {
Expand All @@ -116,6 +121,24 @@ public void sendMessage(String to, String message) {
}
}

public void sendImageByHTTP(String to, String filename) {
if (connection == null) {
logger.warn("XMPP connection is null");
return;
}
if (httpFileUploadManager == null) {
logger.warn("XMPP httpFileUploadManager is null");
return;
}
try {
URL u = httpFileUploadManager.uploadFile(new File(filename));
// Use Stanza oob
this.sendMessage(to, u.toString());
} catch (XMPPException.XMPPErrorException | SmackException | InterruptedException | IOException e) {
logger.warn("XMPP HTTP image sending error", e);
}
}

@Override
public void newIncomingMessage(EntityBareJid from, Message message, Chat chat) {
logger.debug("XMPP {} says {}", from.asBareJid().toString(), message.getBody());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,33 @@ public void publishXMPP(@ActionInput(name = "to", label = "To", description = "S
connection.sendMessage(to, text);
}

@RuleAction(label = "publish an image by HTTP", description = "Publish an image by HTTP using XMPP.")
public void publishXMPPImageByHTTP(
@ActionInput(name = "to", label = "To", description = "Send to") @Nullable String to,
@ActionInput(name = "filename", label = "Filename", description = "Image Filename") @Nullable String filename) {
XMPPClientHandler clientHandler = handler;
if (clientHandler == null) {
logger.warn("XMPP ThingHandler is null");
return;
}

XMPPClient connection = clientHandler.getXMPPClient();
if (connection == null) {
logger.warn("XMPP ThingHandler connection is null");
return;
}
if ((to == null) || (filename == null)) {
logger.warn("Skipping XMPP messaging to {} value {}", to, filename);
return;
}
connection.sendImageByHTTP(to, filename);
}

public static void publishXMPP(ThingActions actions, @Nullable String to, @Nullable String text) {
((XMPPActions) actions).publishXMPP(to, text);
}

public static void publishXMPPImageByHTTP(ThingActions actions, @Nullable String to, @Nullable String filename) {
((XMPPActions) actions).publishXMPPImageByHTTP(to, filename);
}
}