Skip to content

Commit cca8f4b

Browse files
thsc42thsc42
committed
We have a working routing, certs are delivered and verification works with a few E2E test. Promising.
1 parent 2b8ece1 commit cca8f4b

File tree

77 files changed

+343
-319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+343
-319
lines changed

‎SharkMessengerUI.jar‎

-490 KB
Binary file not shown.

‎makeSharkMessengerUIJar.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jar -x -f ..\libs\SharkPeer.jar
66
jar -x -f ..\libs\SharkPKI.jar
77
rmdir /s /q META-INF
88
xcopy /S ..\out\production\SharkMessenger\* .
9-
jar cmvf META-INF/MANIFEST.MF SharkMessengerUI.jar *
9+
jar cmvf META-INF/MANIFEST.MF SharkMessengerCLI.jar *
1010
cd ..
11-
move tempLibBuildFolder\SharkMessengerUI.jar .
11+
move tempLibBuildFolder\SharkMessengerCLI.jar .
1212
rmdir /s /q tempLibBuildFolder

‎src/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Manifest-Version: 1.0
2-
Main-Class: net.sharksystem.cmdline.sharkmessengerUI.TestUI
2+
Main-Class: net.sharksystem.messenger.cli.ProductionUI
33

src/net/sharksystem/cmdline/sharkmessengerUI/CredentialReceivedListener.java renamed to src/net/sharksystem/messenger/cli/CredentialReceivedListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sharksystem.cmdline.sharkmessengerUI;
1+
package net.sharksystem.messenger.cli;
22

33
import net.sharksystem.pki.CredentialMessage;
44
import net.sharksystem.pki.SharkCredentialReceivedListener;

src/net/sharksystem/cmdline/sharkmessengerUI/MessageReceivedListener.java renamed to src/net/sharksystem/messenger/cli/MessageReceivedListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sharksystem.cmdline.sharkmessengerUI;
1+
package net.sharksystem.messenger.cli;
22

33
import net.sharksystem.messenger.SharkMessageList;
44
import net.sharksystem.messenger.SharkMessagesReceivedListener;

src/net/sharksystem/cmdline/sharkmessengerUI/ProductionUI.java renamed to src/net/sharksystem/messenger/cli/ProductionUI.java

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
1-
package net.sharksystem.cmdline.sharkmessengerUI;
1+
package net.sharksystem.messenger.cli;
22

33
import java.io.BufferedReader;
44
import java.io.IOException;
55
import java.io.InputStreamReader;
66
import java.io.PrintStream;
77

88
import net.sharksystem.SharkException;
9-
import net.sharksystem.cmdline.sharkmessengerUI.commands.basics.*;
10-
import net.sharksystem.cmdline.sharkmessengerUI.commands.encounter.UICommandShowEncounter;
11-
import net.sharksystem.cmdline.sharkmessengerUI.commands.messenger.*;
12-
import net.sharksystem.cmdline.sharkmessengerUI.commands.hubaccess.*;
13-
import net.sharksystem.cmdline.sharkmessengerUI.commands.hubmanagement.UICommandListHub;
14-
import net.sharksystem.cmdline.sharkmessengerUI.commands.hubmanagement.UICommandStartHub;
15-
import net.sharksystem.cmdline.sharkmessengerUI.commands.hubmanagement.UICommandStopHub;
16-
import net.sharksystem.cmdline.sharkmessengerUI.commands.persons.UICommandListPersons;
17-
import net.sharksystem.cmdline.sharkmessengerUI.commands.testing.UICommandSaveLog;
18-
import net.sharksystem.cmdline.sharkmessengerUI.commands.testing.UICommandShowLog;
19-
import net.sharksystem.cmdline.sharkmessengerUI.commands.pki.*;
20-
import net.sharksystem.cmdline.sharkmessengerUI.commands.tcp.UICommandCloseTCP;
21-
import net.sharksystem.cmdline.sharkmessengerUI.commands.tcp.UICommandConnectTCP;
22-
import net.sharksystem.cmdline.sharkmessengerUI.commands.tcp.UICommandOpenTCP;
23-
import net.sharksystem.cmdline.sharkmessengerUI.commands.tcp.UICommandShowOpenTCPPorts;
9+
import net.sharksystem.messenger.cli.commands.basics.*;
10+
import net.sharksystem.messenger.cli.commands.encounter.UICommandShowEncounter;
11+
import net.sharksystem.messenger.cli.commands.hubmanagement.UICommandListHub;
12+
import net.sharksystem.messenger.cli.commands.hubmanagement.UICommandStartHub;
13+
import net.sharksystem.messenger.cli.commands.hubmanagement.UICommandStopHub;
14+
import net.sharksystem.messenger.cli.commands.messenger.*;
15+
import net.sharksystem.messenger.cli.commands.persons.UICommandListPersons;
16+
import net.sharksystem.messenger.cli.commands.pki.*;
17+
import net.sharksystem.messenger.cli.commands.testing.UICommandSaveLog;
18+
import net.sharksystem.messenger.cli.commands.testing.UICommandShowLog;
19+
import net.sharksystem.messenger.cli.commands.tcp.UICommandCloseTCP;
20+
import net.sharksystem.messenger.cli.commands.tcp.UICommandConnectTCP;
21+
import net.sharksystem.messenger.cli.commands.tcp.UICommandOpenTCP;
22+
import net.sharksystem.messenger.cli.commands.tcp.UICommandShowOpenTCPPorts;
2423
import net.sharksystem.fs.ExtraData;
2524
import net.sharksystem.fs.ExtraDataFS;
2625
import net.sharksystem.hub.peerside.ASAPHubManager;
26+
import net.sharksystem.messenger.cli.commands.hubaccess.*;
2727
import net.sharksystem.utils.Log;
2828

2929
/**
3030
* This class is the entry point for the application.
3131
* Only commands a user should be able to execute are used below.
32+
*
33+
* (I have no idea if that class serves any reason any longer. thsc, Aug'24)
3234
*/
3335
public class ProductionUI {
3436
public static final String SETTINGSFILENAME = ".sharkMessengerSessionSettings";
@@ -64,19 +66,21 @@ public static void main(String[] args) throws SharkException, IOException {
6466
break;
6567
default:
6668
System.out.println("possible arguments: ");
67-
System.out.println("\n -n peerName");
69+
System.out.println("\n peerName syncWithHubInSeconds");
6870
System.exit(1);
6971
break;
7072

7173
}
7274

7375
System.out.println("Welcome to SharkMessenger version 0.1");
7476
if(peerName == null) {
77+
try {
7578
byte[] storedPeerNameBytes = sessionSettings.getExtra(PEERNAME_KEY);
76-
if(storedPeerNameBytes != null) {
7779
// we have a peer name
7880
peerName = new String(storedPeerNameBytes);
7981
isBack = true;
82+
} catch(SharkException se) {
83+
// nothing from a previous session
8084
}
8185
}
8286

@@ -132,7 +136,7 @@ public static void main(String[] args) throws SharkException, IOException {
132136
smUI.addCommand(new UICommandShowOpenTCPPorts(sharkMessengerApp, smUI, "showOpenTCPPorts", false));
133137

134138
// encounter control
135-
smUI.addCommand(new UICommandShowEncounter(sharkMessengerApp, smUI, "showEncounter", false));
139+
smUI.addCommand(new UICommandShowEncounter(sharkMessengerApp, smUI, "lsEncounter", false));
136140

137141
// PKI
138142
smUI.addCommand(new UICommandListPersons(sharkMessengerApp, smUI, "lsPersons", true));
@@ -165,7 +169,7 @@ public static void main(String[] args) throws SharkException, IOException {
165169
smUI.addCommand(new UICommandListHub(sharkMessengerApp, smUI, "lsHubs", true));
166170

167171

168-
smUI.printUsage();
172+
System.out.println("press ? or anything else to get a command list");
169173
smUI.runCommandLoop();
170174
}
171175
}

src/net/sharksystem/cmdline/sharkmessengerUI/SharkMessengerApp.java renamed to src/net/sharksystem/messenger/cli/SharkMessengerApp.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package net.sharksystem.cmdline.sharkmessengerUI;
1+
package net.sharksystem.messenger.cli;
22

33
import net.sharksystem.SharkException;
44
import net.sharksystem.SharkPeer;
55
import net.sharksystem.SharkPeerEncounterChangedListener;
66
import net.sharksystem.SharkPeerFS;
77
import net.sharksystem.asap.*;
88
import net.sharksystem.asap.apps.TCPServerSocketAcceptor;
9-
import net.sharksystem.asap.crypto.InMemoASAPKeyStore;
109
import net.sharksystem.asap.pki.ASAPCertificate;
1110
import net.sharksystem.asap.utils.DateTimeHelper;
1211
import net.sharksystem.asap.utils.PeerIDHelper;
@@ -27,8 +26,6 @@
2726
import java.net.Socket;
2827
import java.util.*;
2928

30-
import static net.sharksystem.cmdline.sharkmessengerUI.ProductionUI.SYNC_WITH_OTHERS_IN_SECONDS_KEY;
31-
3229
/**
3330
* Proposed and suggested pattern for Shark app. Implement a central entity (could even be a singleton)
3431
* that provides access to any component that is part of this application

src/net/sharksystem/cmdline/sharkmessengerUI/SharkMessengerAppListener.java renamed to src/net/sharksystem/messenger/cli/SharkMessengerAppListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sharksystem.cmdline.sharkmessengerUI;
1+
package net.sharksystem.messenger.cli;
22

33
abstract class SharkMessengerAppListener {
44
protected final SharkMessengerApp sharkMessengerApp;

src/net/sharksystem/cmdline/sharkmessengerUI/SharkMessengerUI.java renamed to src/net/sharksystem/messenger/cli/SharkMessengerUI.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package net.sharksystem.cmdline.sharkmessengerUI;
1+
package net.sharksystem.messenger.cli;
22

3-
import net.sharksystem.cmdline.sharkmessengerUI.commandarguments.UICommandQuestion;
4-
import net.sharksystem.cmdline.sharkmessengerUI.commandarguments.UICommandQuestionnaire;
3+
import net.sharksystem.messenger.cli.commandarguments.UICommandQuestion;
4+
import net.sharksystem.messenger.cli.commandarguments.UICommandQuestionnaire;
55

66
import java.io.*;
77
import java.util.*;

src/net/sharksystem/cmdline/sharkmessengerUI/UICommand.java renamed to src/net/sharksystem/messenger/cli/UICommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package net.sharksystem.cmdline.sharkmessengerUI;
1+
package net.sharksystem.messenger.cli;
22

3-
import net.sharksystem.cmdline.sharkmessengerUI.commandarguments.UICommandQuestionnaire;
3+
import net.sharksystem.messenger.cli.commandarguments.UICommandQuestionnaire;
44

55
import java.io.PrintStream;
66
import java.util.List;

0 commit comments

Comments
 (0)