@interncom/diplomatic 0.0.5 → 0.0.7

package/dist/index.d.ts

@@ -1,5 +1,7 @@
-import useClient from "./useClient";
+import { useClientState } from "./useClient";
 import { StateManager, useStateWatcher } from './state';
 import { localStorageStore } from "./localStorageStore";
 import DiplomaticClient from "./client";
-export { useClient, StateManager, useStateWatcher, localStorageStore, DiplomaticClient, };
+import libsodiumCrypto from "./crypto";
+import { btoh, htob } from "./shared/lib";
+export { useClientState, StateManager, useStateWatcher, localStorageStore, DiplomaticClient, libsodiumCrypto, btoh, htob, };

package/dist/index.mjs

@@ -11,7 +11,144 @@ var __export = (target, all) => {
 };
 
 // src/useClient.ts
-import { useState, useEffect as useEffect2, useCallback, useMemo } from "react";
+import { useState, useEffect } from "react";
+var initialState = "loading";
+function useClientState(client) {
+  const [state, setState] = useState(initialState);
+  useEffect(() => {
+    setState(client.state);
+    client.listener = setState;
+  }, [client]);
+  return state;
+}
+
+// src/state.ts
+import { useEffect as useEffect2, useState as useState2 } from "react";
+
+// src/eventEmitter.ts
+var EventEmitter = class {
+  events = {};
+  on(event, listener) {
+    if (!this.events[event]) {
+      this.events[event] = [];
+    }
+    this.events[event].push(listener);
+  }
+  off(event, listener) {
+    if (!this.events[event]) return;
+    this.events[event] = this.events[event].filter((l) => l !== listener);
+  }
+  // Method to emit an event
+  emit(event) {
+    if (!this.events[event]) return;
+    for (const listener of this.events[event]) {
+      listener();
+    }
+  }
+};
+
+// src/state.ts
+var StateManager = class {
+  emitter = new EventEmitter();
+  applier;
+  constructor(applier) {
+    this.applier = applier;
+  }
+  apply = async (op) => {
+    await this.applier(op);
+    this.emitter.emit(op.type);
+  };
+  on = (opType, listener) => {
+    this.emitter.on(opType, listener);
+  };
+  off = (opType, listener) => {
+    this.emitter.off(opType, listener);
+  };
+};
+function useStateWatcher(mgr, opType, callback) {
+  const [val, setVal] = useState2(callback());
+  useEffect2(() => {
+    function update() {
+      const newVal = callback();
+      setVal(newVal);
+    }
+    mgr.on(opType, update);
+    return () => {
+      mgr.off(opType, update);
+    };
+  }, [mgr, opType, callback]);
+  return val;
+}
+
+// ../shared/lib.ts
+function btoh(bytes) {
+  const hex = Array.from(bytes).map((byte) => byte.toString(16).padStart(2, "0")).join("");
+  return hex;
+}
+function htob(hex) {
+  if (hex.length % 2 !== 0) {
+    throw new Error("Invalid hex string");
+  }
+  const bytes = new Uint8Array(hex.length / 2);
+  for (let i = 0; i < hex.length; i += 2) {
+    bytes[i / 2] = Number.parseInt(hex.substr(i, 2), 16);
+  }
+  return bytes;
+}
+
+// src/localStorageStore.ts
+var seedKey = "seedHex";
+var hostURLKey = "hostURL";
+var hostIDKey = "hostID";
+var LocalStorageStore = class {
+  async getSeed() {
+    const storedSeed = localStorage.getItem(seedKey);
+    if (storedSeed) {
+      const seed = htob(storedSeed);
+      return seed;
+    }
+  }
+  async setSeed(seed) {
+    const seedString = btoh(seed);
+    localStorage.setItem(seedKey, seedString);
+  }
+  async getHostURL() {
+    return localStorage.getItem(hostURLKey) ?? void 0;
+  }
+  async setHostURL(url) {
+    return localStorage.setItem(hostURLKey, url);
+  }
+  async getHostID() {
+    return localStorage.getItem(hostIDKey) ?? void 0;
+  }
+  async setHostID(id) {
+    return localStorage.setItem(hostIDKey, id);
+  }
+  uploadQueue = /* @__PURE__ */ new Map();
+  enqueueUpload = async (sha256, cipherOp) => {
+    const hex = btoh(sha256);
+    this.uploadQueue.set(hex, cipherOp);
+  };
+  dequeueUpload = async (sha256) => {
+    const hex = btoh(sha256);
+    this.uploadQueue.delete(hex);
+  };
+  peekUpload = async (sha256) => {
+    const hex = btoh(sha256);
+    return this.uploadQueue.get(hex);
+  };
+  async listUploadQueue() {
+    return Array.from(this.uploadQueue.keys());
+  }
+  downloadQueue = /* @__PURE__ */ new Set();
+  enqueueDownload = async (path) => {
+    this.downloadQueue.add(path);
+  };
+  dequeueDownload = async (path) => {
+    this.downloadQueue.delete(path);
+  };
+};
+var localStorageStore = new LocalStorageStore();
 
 // node_modules/@msgpack/msgpack/dist.es5+esm/utils/utf8.mjs
 function utf8Count(str) {
@@ -1874,22 +2011,6 @@ function decodeAsync(streamLike, options) {
   });
 }
 
-// ../shared/lib.ts
-function btoh(bytes) {
-  const hex = Array.from(bytes).map((byte) => byte.toString(16).padStart(2, "0")).join("");
-  return hex;
-}
-function htob(hex) {
-  if (hex.length % 2 !== 0) {
-    throw new Error("Invalid hex string");
-  }
-  const bytes = new Uint8Array(hex.length / 2);
-  for (let i = 0; i < hex.length; i += 2) {
-    bytes[i / 2] = Number.parseInt(hex.substr(i, 2), 16);
-  }
-  return bytes;
-}
-
 // ../deno/vendor/raw.githubusercontent.com/interncom/libsodium.js/esm/dist/modules/libsodium-esm-wrappers.js
 var libsodium_esm_wrappers_exports = {};
 __export(libsodium_esm_wrappers_exports, {
@@ -8312,6 +8433,7 @@ var DiplomaticClient = class {
   constructor(params) {
     this.store = params.store;
     this.applier = params.stateManager.apply;
+    console.log("constructing");
     this.init(params);
   }
   websocket;
@@ -8320,7 +8442,11 @@ var DiplomaticClient = class {
       return;
     }
     const url = new URL(hostURL);
-    url.protocol = "ws";
+    if (window.location.protocol === "https:") {
+      url.protocol = "wss";
+    } else {
+      url.protocol = "ws";
+    }
     const keyHex = btoh(this.hostKeyPair?.publicKey);
     url.searchParams.set("key", keyHex);
     this.websocket = new WebSocket(url);
@@ -8474,163 +8600,13 @@ var DiplomaticClient = class {
     return this.apply(op);
   }
 };
-
-// src/sync.ts
-import { useEffect } from "react";
-function usePollingSync(client, intervalMillis) {
-  useEffect(() => {
-    if (intervalMillis <= 0) {
-      return;
-    }
-    async function poll() {
-      console.log("Polling");
-      await client.processDeltas();
-      await client.pushQueuedOps();
-    }
-    poll();
-    const handle = setInterval(poll, intervalMillis);
-    return () => {
-      clearInterval(handle);
-    };
-  }, [client, intervalMillis]);
-}
-
-// src/localStorageStore.ts
-var seedKey = "seedHex";
-var hostURLKey = "hostURL";
-var hostIDKey = "hostID";
-var LocalStorageStore = class {
-  async getSeed() {
-    const storedSeed = localStorage.getItem(seedKey);
-    if (storedSeed) {
-      const seed = htob(storedSeed);
-      return seed;
-    }
-  }
-  async setSeed(seed) {
-    const seedString = btoh(seed);
-    localStorage.setItem(seedKey, seedString);
-  }
-  async getHostURL() {
-    return localStorage.getItem(hostURLKey) ?? void 0;
-  }
-  async setHostURL(url) {
-    return localStorage.setItem(hostURLKey, url);
-  }
-  async getHostID() {
-    return localStorage.getItem(hostIDKey) ?? void 0;
-  }
-  async setHostID(id) {
-    return localStorage.setItem(hostIDKey, id);
-  }
-  uploadQueue = /* @__PURE__ */ new Map();
-  enqueueUpload = async (sha256, cipherOp) => {
-    const hex = btoh(sha256);
-    this.uploadQueue.set(hex, cipherOp);
-  };
-  dequeueUpload = async (sha256) => {
-    const hex = btoh(sha256);
-    this.uploadQueue.delete(hex);
-  };
-  peekUpload = async (sha256) => {
-    const hex = btoh(sha256);
-    return this.uploadQueue.get(hex);
-  };
-  async listUploadQueue() {
-    return Array.from(this.uploadQueue.keys());
-  }
-  downloadQueue = /* @__PURE__ */ new Set();
-  enqueueDownload = async (path) => {
-    this.downloadQueue.add(path);
-  };
-  dequeueDownload = async (path) => {
-    this.downloadQueue.delete(path);
-  };
-};
-var localStorageStore = new LocalStorageStore();
-
-// src/useClient.ts
-var initialState = "loading";
-function useClient(params) {
-  const [state, setState] = useState(initialState);
-  console.log("rendering useClient");
-  const fullParams = useMemo(
-    () => ({ store: localStorageStore, ...params }),
-    [params]
-  );
-  const [client, setClient] = useState(new DiplomaticClient(fullParams));
-  useEffect2(() => {
-    client.listener = setState;
-  }, [client]);
-  const reset = useCallback(() => {
-    setClient(new DiplomaticClient(fullParams));
-    setState(initialState);
-  }, [fullParams]);
-  usePollingSync(client, params.refreshInterval ?? 1e3);
-  return [client, state, reset];
-}
-
-// src/state.ts
-import { useEffect as useEffect3, useState as useState2 } from "react";
-
-// src/eventEmitter.ts
-var EventEmitter = class {
-  events = {};
-  on(event, listener) {
-    if (!this.events[event]) {
-      this.events[event] = [];
-    }
-    this.events[event].push(listener);
-  }
-  off(event, listener) {
-    if (!this.events[event]) return;
-    this.events[event] = this.events[event].filter((l) => l !== listener);
-  }
-  // Method to emit an event
-  emit(event) {
-    if (!this.events[event]) return;
-    for (const listener of this.events[event]) {
-      listener();
-    }
-  }
-};
-
-// src/state.ts
-var StateManager = class {
-  emitter = new EventEmitter();
-  applier;
-  constructor(applier) {
-    this.applier = applier;
-  }
-  apply = async (op) => {
-    await this.applier(op);
-    this.emitter.emit(op.type);
-  };
-  on = (opType, listener) => {
-    this.emitter.on(opType, listener);
-  };
-  off = (opType, listener) => {
-    this.emitter.off(opType, listener);
-  };
-};
-function useStateWatcher(mgr, opType, callback) {
-  const [val, setVal] = useState2(callback());
-  useEffect3(() => {
-    function update() {
-      const newVal = callback();
-      setVal(newVal);
-    }
-    mgr.on(opType, update);
-    return () => {
-      mgr.off(opType, update);
-    };
-  }, [mgr, opType, callback]);
-  return val;
-}
 export {
   DiplomaticClient,
   StateManager,
+  btoh,
+  htob,
+  crypto_default as libsodiumCrypto,
   localStorageStore,
-  useClient,
+  useClientState,
   useStateWatcher
 };

package/dist/useClient.d.ts

@@ -1,8 +1,3 @@
-import DiplomaticClient, { type IDiplomaticClientParams } from "./client";
-import type { DiplomaticClientState, IClientStateStore } from "./types";
-interface IClientHookParams extends Omit<IDiplomaticClientParams, "store"> {
-    refreshInterval?: number;
-    store?: IClientStateStore;
-}
-export default function useClient(params: IClientHookParams): [DiplomaticClient, DiplomaticClientState, () => void];
-export {};
+import DiplomaticClient from "./client";
+import type { DiplomaticClientState } from "./types";
+export declare function useClientState(client: DiplomaticClient): DiplomaticClientState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interncom/diplomatic",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "type": "module",
   "description": "Secure sync layer",
   "main": "dist/index.mjs",