Skip to content

Introduce Asian directory server in code #3697

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.

Sign up for GitHub

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

Merged
ann0see merged 1 commit into from
May 19, 2026
Merged

Introduce Asian directory server in code #3697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/connectdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ void CConnectDlg::UpdateDirectoryComboBox()
cbxDirectory->clear();
cbxDirectory->addItem ( DirectoryTypeToString ( AT_DEFAULT ) );
cbxDirectory->addItem ( DirectoryTypeToString ( AT_ANY_GENRE2 ) );
cbxDirectory->addItem ( DirectoryTypeToString ( AT_ANY_GENRE3 ) );
cbxDirectory->addItem ( DirectoryTypeToString ( AT_ANY_GENRE_ASIA ) );
cbxDirectory->addItem ( DirectoryTypeToString ( AT_GENRE_ROCK ) );
cbxDirectory->addItem ( DirectoryTypeToString ( AT_GENRE_JAZZ ) );
cbxDirectory->addItem ( DirectoryTypeToString ( AT_GENRE_CLASSICAL_FOLK ) );
Expand Down
2 changes: 1 addition & 1 deletion src/global.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ LED bar: lbr
#define DEFAULT_SERVER_ADDRESS "anygenre1.jamulus.io:22124" // default port explicit to avoid unneeded SRV lookup
#define DEFAULT_PORT_NUMBER 22124
#define CENTSERV_ANY_GENRE2 "anygenre2.jamulus.io:22224"
#define CENTSERV_ANY_GENRE3 "anygenre3.jamulus.io:22624"
#define CENTSERV_ANY_GENRE_ASIA "asia.jamulus.io:22624"
#define CENTSERV_GENRE_ROCK "rock.jamulus.io:22424"
#define CENTSERV_GENRE_JAZZ "jazz.jamulus.io:22324"
#define CENTSERV_GENRE_CLASSICAL_FOLK "classical.jamulus.io:22524"
Expand Down
2 changes: 1 addition & 1 deletion src/serverdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_NONE ) );
cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_DEFAULT ) );
cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_ANY_GENRE2 ) );
cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_ANY_GENRE3 ) );
cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_ANY_GENRE_ASIA ) );
cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_GENRE_ROCK ) );
cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_GENRE_JAZZ ) );
cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_GENRE_CLASSICAL_FOLK ) );
Expand Down
4 changes: 2 additions & 2 deletions src/serverrpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ const std::unordered_map<EDirectoryType, std::string>
{ EDirectoryType::AT_NONE, "none" },
{ EDirectoryType::AT_DEFAULT, "any_genre_1" },
{ EDirectoryType::AT_ANY_GENRE2, "any_genre_2" },
{ EDirectoryType::AT_ANY_GENRE3, "any_genre_3" },
{ EDirectoryType::AT_ANY_GENRE_ASIA, "any_genre_asia" },
{ EDirectoryType::AT_GENRE_ROCK, "genre_rock" },
{ EDirectoryType::AT_GENRE_JAZZ, "genre_jazz" },
{ EDirectoryType::AT_GENRE_CLASSICAL_FOLK, "genre_classical_folk" },
Expand All @@ -302,7 +302,7 @@ const std::unordered_map<std::string, EDirectoryType> CServerRpc::sumStringToDir
{ "none", EDirectoryType::AT_NONE },
{ "any_genre_1", EDirectoryType::AT_DEFAULT },
{ "any_genre_2", EDirectoryType::AT_ANY_GENRE2 },
{ "any_genre_3", EDirectoryType::AT_ANY_GENRE3 },
{ "any_genre_asia", EDirectoryType::AT_ANY_GENRE_ASIA },
{ "genre_rock", EDirectoryType::AT_GENRE_ROCK },
{ "genre_jazz", EDirectoryType::AT_GENRE_JAZZ },
{ "genre_classical_folk", EDirectoryType::AT_GENRE_CLASSICAL_FOLK },
Expand Down
4 changes: 2 additions & 2 deletions src/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,8 +965,8 @@ QString NetworkUtil::GetDirectoryAddress ( const EDirectoryType eDirectoryType,
return strDirectoryAddress;
case AT_ANY_GENRE2:
return CENTSERV_ANY_GENRE2;
case AT_ANY_GENRE3:
return CENTSERV_ANY_GENRE3;
Copy link
Copy Markdown
Member Author

@ann0see ann0see May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably rather not name it CENTSERV anymore...

Copy link
Copy Markdown
Collaborator

@pljones pljones May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was going to say - separate PR to move to DIRECTORY_ and .app in one go?

Copy link
Copy Markdown
Member Author

@ann0see ann0see May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could do this yes. But .app didn't resolve for me yet. @gilgongo

Copy link
Copy Markdown
Member

@gilgongo gilgongo May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, looking at the Cloudflare config- I'd forgotten that it works using 301 redirects. For some reason I thought it had some DNS wildcard capability. So no .app for directories right now I'm afraid.

Copy link
Copy Markdown
Member

@gilgongo gilgongo May 19, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was going to say - separate PR to move to DIRECTORY_ and .app in one go?

I suppose we could replicate the .io zone to .app and maintain both in parallel? We don't make changes that often after all. As far as I can tell, CloudFlare don't allow pointing two domains to the same zone file at least.

Copy link
Copy Markdown
Member

@gilgongo gilgongo May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK sure. I'll see if I can set up .app with the same host names as .io. Then when that's done we can CNAME all the the .io hosts to those. Might mean some slight downtime on the website cert while that gets re-generated perhaps (or some other hidden issue crops up).

BTW we don't use the CF proxy for .io - in fact we found out we can't with GitHub Pages as it breaks their cert renewal. The proxy is only for .app at the moment so that it can do the http redirects I think.

Copy link
Copy Markdown
Member

@softins softins May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, looking at the Cloudflare config- I'd forgotten that it works using 301 redirects. For some reason I thought it had some DNS wildcard capability. So no .app for directories right now I'm afraid.

301 redirects are a HTTP-only concept, and don't apply when just resolving names in DNS. We can do all we need using CNAMEs or parallel A records (and AAAA when we're ready).

Copy link
Copy Markdown
Member

@gilgongo gilgongo May 19, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK so I can try this:

  1. Export the .io zone file
  2. Change all .io references in the exported file to .app
  3. Remove any TXT records that have keys relating to .io (eg _github-challenge-jamulussoftware)
  4. Delete all the current zone entries in .app
  5. Import the new zone file into .app
  6. Add TXT records with new keys for .app
  7. Remove the www 301 redirect and switch Github Pages over to using .app

The worst that can happen is that the .app version of the website stops responding while it gets sorted out, but .io will be unaffected. Then once it's all working for .app, we change all the relevant CNAMEs in .io to .app.

Copy link
Copy Markdown
Member Author

@ann0see ann0see May 19, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Maybe we could rather wait for the main website? So just set all the directories as .app instead.
This means duplicating only the cnames set for the .app zone similar to what we have in .io

Then wait a day.
Then put the CNAMEs in .io to .app

Don't change anything on GitHub pages.

Copy link
Copy Markdown
Collaborator

@pljones pljones May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'd just copy the Directory .io entries over as .app entries -- export both zones, extract the Directories from .io, rename to .app, add to the .app zone file, reimport the .app zone file. That should give two DNS entries for each target without any chance of anything breaking.

case AT_ANY_GENRE_ASIA:
return CENTSERV_ANY_GENRE_ASIA;
case AT_GENRE_ROCK:
return CENTSERV_GENRE_ROCK;
case AT_GENRE_JAZZ:
Expand Down
6 changes: 3 additions & 3 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ enum EDirectoryType
AT_NONE = -1, // means not registered, "invalid value"
AT_DEFAULT = 0,
AT_ANY_GENRE2 = 1,
AT_ANY_GENRE3 = 2,
AT_ANY_GENRE_ASIA = 2,
AT_GENRE_ROCK = 3,
AT_GENRE_JAZZ = 4,
AT_GENRE_CLASSICAL_FOLK = 5,
Expand All @@ -600,8 +600,8 @@ inline QString DirectoryTypeToString ( EDirectoryType eAddrType )
case AT_ANY_GENRE2:
return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre 2" );

case AT_ANY_GENRE3:
return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre 3" );
case AT_ANY_GENRE_ASIA:
return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre Asia" );

case AT_GENRE_ROCK:
return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock" );
Expand Down
Loading