sliftutils 1.4.7 → 1.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "1.4.7",
+    "version": "1.4.9",
     "main": "index.js",
     "license": "MIT",
     "files": [

package/storage/FileFolderAPI.tsx

@@ -86,14 +86,30 @@ type RemoteConfig = { url: string; password: string };
 function remoteConfigKey() { return getFileAPIKey() + ":remote"; }
 function loadRemoteConfig(): RemoteConfig | undefined {
     try {
-        const s = localStorage.getItem(remoteConfigKey());
+        const key = remoteConfigKey();
+        const s = localStorage.getItem(key);
+        console.log("[remotecfg] load", JSON.stringify(key), "->", s);
         if (!s) return undefined;
         const c = JSON.parse(s);
         if (c && typeof c.url === "string" && typeof c.password === "string") return c;
-    } catch { /* ignore */ }
+    } catch (e) { console.warn("[remotecfg] load error", e); }
     return undefined;
 }
-function saveRemoteConfig(c: RemoteConfig) { localStorage.setItem(remoteConfigKey(), JSON.stringify(c)); }
+function saveRemoteConfig(c: RemoteConfig) {
+    const key = remoteConfigKey();
+    localStorage.setItem(key, JSON.stringify(c));
+    console.log("[remotecfg] saved", JSON.stringify(key), "readback ->", localStorage.getItem(key));
+}
+
+// The server is always HTTPS on the filehoster's default port, so the user only needs to type the host
+// (e.g. "65.109.93.113"). We strip any scheme/path they include and default the port if omitted.
+const DEFAULT_REMOTE_PORT = 8787; // matches remoteFileServer.js's default
+function normalizeServerUrl(raw: string): string {
+    let s = raw.trim().replace(/^\w+:\/\//, "").replace(/\/.*$/, "");
+    if (!s) return "";
+    if (!/:\d+$/.test(s)) s += ":" + DEFAULT_REMOTE_PORT;
+    return "https://" + s;
+}
 
 // One shared factory (and therefore one shared range cache) per remote config.
 let remoteFactory: { key: string; factory: ReturnType<typeof getRemoteFileStorage> } | undefined;
@@ -129,7 +145,7 @@ class DirectoryPrompter extends preact.Component {
 @observer
 class ServerConnectForm extends preact.Component {
     private obs = observable({ expanded: false, url: "", password: "", error: "", connecting: false, needsCert: false, showPassword: false });
-    private cleanUrl() { return this.obs.url.trim().replace(/\/+$/, ""); }
+    private cleanUrl() { return normalizeServerUrl(this.obs.url); }
     private connect = async () => {
         const s = this.obs;
         s.error = "";
@@ -166,7 +182,7 @@ class ServerConnectForm extends preact.Component {
         }
         return (
             <div className={css.vbox(16).center}>
-                <input className={inputCss} placeholder="https://host:8787" value={s.url}
+                <input className={inputCss} placeholder="server address (e.g. 65.109.93.113, or host:port)" value={s.url}
                     onInput={e => s.url = (e.target as HTMLInputElement).value} />
                 <div className={css.hbox(10).center}>
                     <input className={inputCss} type={s.showPassword ? "text" : "password"} placeholder="password (six words)" value={s.password}

package/storage/remoteFileServer.ts

@@ -427,14 +427,18 @@ export async function runFileHoster(): Promise<void> {
     let externalIP: string | undefined;
     try { externalIP = (await getExternalIP()).trim(); } catch { /* offline / unreachable */ }
 
+    // What the user types into the app: just the host, plus ":port" only if it's not the default. No
+    // scheme — the app always uses https.
+    const host = externalIP || "localhost";
+    const appAddress = host + (info.port === 8787 ? "" : ":" + info.port);
+    const certUrl = "https://" + host + ":" + info.port;
     console.log("");
     console.log("  Serving:   " + path.resolve(root));
     console.log("  Password:  " + info.password);
-    console.log("  Local:     " + info.url);
-    if (externalIP) console.log("  Public:    https://" + externalIP + ":" + info.port + "   (once port-forwarding succeeds)");
+    console.log("  Address:   " + appAddress + "     <- in the app, choose \"Connect to a server\" and enter this");
     console.log("");
-    console.log("  In the app, choose \"Connect to a server\" and enter the URL + password.");
-    console.log("  (Self-signed cert: open the URL once in your browser and accept it first.)");
+    console.log("  First time only: open  " + certUrl + "  in a browser once and accept the");
+    console.log("  self-signed certificate warning, then connect from the app.");
     console.log("");
 
     // Keep the UPnP port mapping alive — leases expire ~hourly, so refresh well within that. No-op on