|
|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
// This is the Open Group equivalent to the PubKey type.
|
|
|
|
|
import { ConversationModel } from '../../../js/models/conversations';
|
|
|
|
|
|
|
|
|
|
interface OpenGroupParams {
|
|
|
|
|
server: string;
|
|
|
|
|
@ -8,7 +8,7 @@ interface OpenGroupParams {
|
|
|
|
|
|
|
|
|
|
export class OpenGroup {
|
|
|
|
|
private static readonly serverRegex = new RegExp(
|
|
|
|
|
'^([\\w-]{2,}.){1,2}[\\w-]{2,}$'
|
|
|
|
|
'^((https?:\\/\\/){0,1})([\\w-]{2,}\\.){1,2}[\\w-]{2,}$'
|
|
|
|
|
);
|
|
|
|
|
private static readonly groupIdRegex = new RegExp(
|
|
|
|
|
'^publicChat:[0-9]*@([\\w-]{2,}.){1,2}[\\w-]{2,}$'
|
|
|
|
|
@ -18,9 +18,17 @@ export class OpenGroup {
|
|
|
|
|
public readonly groupId?: string;
|
|
|
|
|
public readonly conversationId: string;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* An OpenGroup object.
|
|
|
|
|
* If `params.server` is not valid, this will throw an `Error`.
|
|
|
|
|
*
|
|
|
|
|
* @param params.server The server URL. `https` will be prepended if `http` or `https` is not explicitly set
|
|
|
|
|
* @param params.channel The server channel
|
|
|
|
|
* @param params.groupId The string corresponding to the server. Eg. `publicChat:1@chat.getsession.org`
|
|
|
|
|
* @param params.conversationId The conversation ID for the backbone model
|
|
|
|
|
*/
|
|
|
|
|
constructor(params: OpenGroupParams) {
|
|
|
|
|
const strippedServer = params.server.replace('https://', '');
|
|
|
|
|
this.server = strippedServer;
|
|
|
|
|
this.server = OpenGroup.prefixify(params.server.toLowerCase());
|
|
|
|
|
|
|
|
|
|
// Validate server format
|
|
|
|
|
const isValid = OpenGroup.serverRegex.test(this.server);
|
|
|
|
|
@ -33,14 +41,29 @@ export class OpenGroup {
|
|
|
|
|
this.groupId = OpenGroup.getGroupId(this.server, this.channel);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Validate the URL of an open group server
|
|
|
|
|
*
|
|
|
|
|
* @param serverUrl The server URL to validate
|
|
|
|
|
*/
|
|
|
|
|
public static validate(serverUrl: string): boolean {
|
|
|
|
|
return this.serverRegex.test(serverUrl);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Try to make a new instance of `OpenGroup`.
|
|
|
|
|
* This does NOT respect `ConversationController` and does not guarentee the conversation's existence.
|
|
|
|
|
*
|
|
|
|
|
* @param groupId The string corresponding to the server. Eg. `publicChat:1@chat.getsession.org`
|
|
|
|
|
* @param conversationId The conversation ID for the backbone model
|
|
|
|
|
* @returns `OpenGroup` if valid otherwise returns `undefined`.
|
|
|
|
|
*/
|
|
|
|
|
public static from(
|
|
|
|
|
groupId: string,
|
|
|
|
|
conversationId: string
|
|
|
|
|
conversationId: string,
|
|
|
|
|
hasSSL: boolean = true
|
|
|
|
|
): OpenGroup | undefined {
|
|
|
|
|
// Returns a new instance from a groupId if it's valid
|
|
|
|
|
// eg. groupId = 'publicChat:1@chat.getsession.org'
|
|
|
|
|
|
|
|
|
|
const server = this.getServer(groupId);
|
|
|
|
|
const server = this.getServer(groupId, hasSSL);
|
|
|
|
|
const channel = this.getChannel(groupId);
|
|
|
|
|
|
|
|
|
|
// Was groupId successfully utilized?
|
|
|
|
|
@ -55,17 +78,121 @@ export class OpenGroup {
|
|
|
|
|
conversationId,
|
|
|
|
|
} as OpenGroupParams;
|
|
|
|
|
|
|
|
|
|
if (this.serverRegex.test(server)) {
|
|
|
|
|
const isValid = OpenGroup.serverRegex.test(server);
|
|
|
|
|
if (!isValid) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return new OpenGroup(openGroupParams);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static getServer(groupId: string): string | undefined {
|
|
|
|
|
/**
|
|
|
|
|
* Join an open group
|
|
|
|
|
*
|
|
|
|
|
* @param server The server URL
|
|
|
|
|
* @param onLoading Callback function to be called once server begins connecting
|
|
|
|
|
* @returns `OpenGroup` if connection success or if already connected
|
|
|
|
|
*/
|
|
|
|
|
public static async join(
|
|
|
|
|
server: string,
|
|
|
|
|
onLoading?: any
|
|
|
|
|
): Promise<OpenGroup | undefined> {
|
|
|
|
|
const prefixedServer = OpenGroup.prefixify(server);
|
|
|
|
|
if (!OpenGroup.validate(server)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Make this not hard coded
|
|
|
|
|
const channel = 1;
|
|
|
|
|
let conversation;
|
|
|
|
|
let conversationId;
|
|
|
|
|
|
|
|
|
|
// Return OpenGroup if we're already connected
|
|
|
|
|
conversation = await OpenGroup.getConversation(prefixedServer);
|
|
|
|
|
if (conversation) {
|
|
|
|
|
conversationId = conversation?.cid;
|
|
|
|
|
if (conversationId) {
|
|
|
|
|
return new OpenGroup({
|
|
|
|
|
server: prefixedServer,
|
|
|
|
|
channel: 1,
|
|
|
|
|
conversationId,
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Try to connect to server
|
|
|
|
|
try {
|
|
|
|
|
if (onLoading) {
|
|
|
|
|
onLoading();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
conversation = await window.attemptConnection(prefixedServer, channel);
|
|
|
|
|
conversationId = conversation?.cid;
|
|
|
|
|
} catch (e) {
|
|
|
|
|
throw new Error(e);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Do we want to add conversation as a property of OpenGroup?
|
|
|
|
|
return new OpenGroup({
|
|
|
|
|
server,
|
|
|
|
|
channel,
|
|
|
|
|
conversationId,
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Get the conversation model of a server from its URL
|
|
|
|
|
*
|
|
|
|
|
* @param server The server URL
|
|
|
|
|
* @returns BackBone conversation model corresponding to the server if it exists, otherwise `undefined`
|
|
|
|
|
*/
|
|
|
|
|
public static async getConversation(
|
|
|
|
|
server: string
|
|
|
|
|
): Promise<ConversationModel | undefined> {
|
|
|
|
|
if (!OpenGroup.validate(server)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const prefixedServer = this.prefixify(server);
|
|
|
|
|
const serverInfo = (await window.lokiPublicChatAPI.findOrCreateServer(
|
|
|
|
|
prefixedServer
|
|
|
|
|
)) as any;
|
|
|
|
|
|
|
|
|
|
if (!serverInfo?.channels?.length) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return serverInfo.channels[0].conversation;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Check if the server exists.
|
|
|
|
|
* This does not compare against your conversations with the server.
|
|
|
|
|
*
|
|
|
|
|
* @param server The server URL
|
|
|
|
|
*/
|
|
|
|
|
public static async serverExists(server: string): Promise<boolean> {
|
|
|
|
|
if (!OpenGroup.validate(server)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const prefixedServer = this.prefixify(server);
|
|
|
|
|
return Boolean(
|
|
|
|
|
await window.lokiPublicChatAPI.findOrCreateServer(prefixedServer)
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static getServer(
|
|
|
|
|
groupId: string,
|
|
|
|
|
hasSSL: boolean
|
|
|
|
|
): string | undefined {
|
|
|
|
|
const isValid = this.groupIdRegex.test(groupId);
|
|
|
|
|
const strippedServer = isValid ? groupId.split('@')[1] : undefined;
|
|
|
|
|
|
|
|
|
|
return isValid ? groupId.split('@')[1] : undefined;
|
|
|
|
|
// We don't know for sure if the server is https or http when taken from the groupId. Preifx accordingly.
|
|
|
|
|
return strippedServer
|
|
|
|
|
? this.prefixify(strippedServer.toLowerCase(), hasSSL)
|
|
|
|
|
: undefined;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static getChannel(groupId: string): number | undefined {
|
|
|
|
|
@ -76,7 +203,22 @@ export class OpenGroup {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static getGroupId(server: string, channel: number): string {
|
|
|
|
|
// server is already validated in constructor; no need to re-check
|
|
|
|
|
return `publicChat:${channel}@${server}`;
|
|
|
|
|
// Server is already validated in constructor; no need to re-check
|
|
|
|
|
|
|
|
|
|
// Strip server prefix
|
|
|
|
|
const prefixRegex = new RegExp('https?:\\/\\/');
|
|
|
|
|
const strippedServer = server.replace(prefixRegex, '');
|
|
|
|
|
|
|
|
|
|
return `publicChat:${channel}@${strippedServer}`;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static prefixify(server: string, hasSSL: boolean = true): string {
|
|
|
|
|
// Prefix server with https:// if it's not already prefixed with http or https.
|
|
|
|
|
const hasPrefix = server.match('^https?://');
|
|
|
|
|
if (hasPrefix) {
|
|
|
|
|
return server;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return `http${hasSSL ? 's' : ''}://${server}`;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Audric Ackermann
5 years ago
committed by
GitHub