Don't leak libsodium types and refactor online managers a bit.

Ref #15
etesync · Mar 4, 2021 · 5c03297 · 5c03297
1 parent c0f977c
commit 5c03297
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/Crypto.ts b/src/Crypto.ts
@@ -12,7 +12,7 @@ import { Rollsum } from "./Chunker";
 
 import type rnsodiumType from "react-native-sodium";
 
-export const sodium = _sodium;
+const sodium = _sodium;
 
 let rnsodium: typeof rnsodiumType;
 

diff --git a/src/Helpers.ts b/src/Helpers.ts
@@ -2,7 +2,7 @@ import * as msgpack from "@msgpack/msgpack";
 
 import _sodium from "libsodium-wrappers";
 
-export const sodium = _sodium;
+const sodium = _sodium;
 
 export type base64 = string;
 

diff --git a/src/OnlineManagers.ts b/src/OnlineManagers.ts
@@ -128,24 +128,24 @@ interface AccountOnlineData {
   authToken: string | null;
 }
 
-class BaseNetwork {
-
-  public static urlExtend(baseUrlIn: URI, segments: string[]): URI {
-    const baseUrl = baseUrlIn.clone();
-    for (const segment of segments) {
-      baseUrl.segment(segment);
-    }
-    baseUrl.segment("");
-    return baseUrl.normalize();
+function urlExtend(baseUrlIn: URI, segments: string[]): URI {
+  const baseUrl = baseUrlIn.clone();
+  for (const segment of segments) {
+    baseUrl.segment(segment);
   }
+  baseUrl.segment("");
+  return baseUrl.normalize();
+}
+
+class BaseNetwork {
   public apiBase: URI;
 
   constructor(apiBase: string) {
     this.apiBase = URI(apiBase).normalize();
   }
 
   public async newCall<T = any>(segments: string[] = [], extra: RequestInit = {}, apiBaseIn: URI = this.apiBase): Promise<T> {
-    const apiBase = BaseNetwork.urlExtend(apiBaseIn, segments);
+    const apiBase = urlExtend(apiBaseIn, segments);
 
     extra = {
       ...extra,
@@ -205,7 +205,7 @@ class BaseNetwork {
 export class Authenticator extends BaseNetwork {
   constructor(apiBase: string) {
     super(apiBase);
-    this.apiBase = BaseNetwork.urlExtend(this.apiBase, ["api", "v1", "authentication"]);
+    this.apiBase = urlExtend(this.apiBase, ["api", "v1", "authentication"]);
   }
 
   public async isEtebase(): Promise<boolean> {
@@ -318,7 +318,7 @@ class BaseManager extends BaseNetwork {
   constructor(etebase: AccountOnlineData, segments: string[]) {
     super(etebase.serverUrl);
     this.etebase = etebase;
-    this.apiBase = BaseNetwork.urlExtend(this.apiBase, ["api", "v1"].concat(segments));
+    this.apiBase = urlExtend(this.apiBase, ["api", "v1"].concat(segments));
   }
 
   public newCall<T = any>(segments: string[] = [], extra: RequestInit = {}, apiBase: URI = this.apiBase): Promise<T> {
@@ -714,7 +714,7 @@ export class WebSocketManagerOnline extends BaseManager {
     const urlProvider = async () => {
       const options = await this.getUrlOptions();
       const apiBase = this.urlFromFetchOptions(options.fetchOptions).protocol(protocol);
-      return BaseNetwork.urlExtend(apiBase, [options.ticket]).toString();
+      return urlExtend(apiBase, [options.ticket]).toString();
     };
 
     return new WebSocketHandle(urlProvider, cb);