generalized URI authority inference

Author: krisbitney

packages/js/core/src/__tests__/Uri.spec.ts

@@ -53,14 +53,14 @@ describe("Uri", () => {
 
   it("Infers common URI authorities", () => {
     let uri = new Uri("https://domain.com/path/to/thing");
-    expect(uri.uri).toEqual("wrap://https/https://domain.com/path/to/thing");
+    expect(uri.uri).toEqual("wrap://https/domain.com/path/to/thing");
     expect(uri.authority).toEqual("https");
-    expect(uri.path).toEqual("https://domain.com/path/to/thing");
+    expect(uri.path).toEqual("domain.com/path/to/thing");
 
     uri = new Uri("http://domain.com/path/to/thing");
-    expect(uri.uri).toEqual("wrap://http/http://domain.com/path/to/thing");
+    expect(uri.uri).toEqual("wrap://http/domain.com/path/to/thing");
     expect(uri.authority).toEqual("http");
-    expect(uri.path).toEqual("http://domain.com/path/to/thing");
+    expect(uri.path).toEqual("domain.com/path/to/thing");
 
     uri = new Uri("ipfs://QmaM318ABUXDhc5eZGGbmDxkb2ZgnbLxigm5TyZcCsh1Kw");
     expect(uri.uri).toEqual("wrap://ipfs/QmaM318ABUXDhc5eZGGbmDxkb2ZgnbLxigm5TyZcCsh1Kw");

packages/js/core/src/types/Uri.ts

@@ -210,24 +210,15 @@ export class Uri {
     return this._config.uri;
   }
 
-  private static inferAuthority(path: string): UriConfig | undefined {
-    let authority: string | undefined;
-
-    if (path.startsWith("https://")) {
-      authority = "https";
-    } else if (path.startsWith("http://")) {
-      authority = "http";
-    } else if (path.startsWith("ipfs://")) {
-      authority = "ipfs";
-      path = path.substring(7);
-    } else if (path.startsWith("ens://")) {
-      authority = "ens";
-      path = path.substring(6);
-    }
+  private static inferAuthority(_path: string): UriConfig | undefined {
+    const re = /^(?<authority>[a-z][a-z0-9-_]+):\/\/(?<path>.*)$/;
+    const result: RegExpGroups<"authority" | "path"> = re.exec(_path);
 
-    if (!authority) {
+    if (!result || !result.groups) {
       return undefined;
     }
+    const authority = result.groups.authority as string;
+    const path = result.groups.path as string;
 
     return { authority, path, uri: `wrap://${authority}/${path}` };
   }