sliftutils 1.1.0 → 1.1.2

package/.gitignore

@@ -28,6 +28,7 @@ data
 *.gif
 *.bmp
 *.tiff
+*.cert
 temp
 yarn-error.log
 pretrained_models

package/index.d.ts

@@ -176,6 +176,20 @@ declare module "sliftutils/misc/https/httpsCerts" {
 
 }
 
+declare module "sliftutils/misc/https/ip" {
+    export declare const getExternalIP: {
+        (): Promise<string>;
+        reset(): void;
+        set(newValue: Promise<string>): void;
+    };
+    export declare const getPublicIP: {
+        (): Promise<string>;
+        reset(): void;
+        set(newValue: Promise<string>): void;
+    };
+
+}
+
 declare module "sliftutils/misc/https/node-forge-ed25519" {
 
 

package/misc/https/httpsCerts.ts

@@ -5,11 +5,22 @@ import * as forge from "node-forge";
 import acme from "acme-client";
 import { magenta, red } from "socket-function/src/formatting/logColors";
 import { formatDateTime, formatTime } from "socket-function/src/formatting/format";
-import { timeInMinute } from "socket-function/src/misc";
+import { timeInHour, timeInMinute } from "socket-function/src/misc";
 import { delay } from "socket-function/src/batching";
 import fs from "fs";
 import { getKeyStore } from "./persistentLocalStorage";
 
+// For example:
+/*
+let domain = "querysubtest.com";
+await loadIdentityCA(domain);
+
+let listenPublic = false;
+let port = 9823;
+let localDomain = "127-0-0-1." + domain;
+await addRecord("A", localDomain, "127.0.0.1");
+let keyCert = await getHTTPSCert(domain);
+*/
 
 // Expire EXPIRATION_THRESHOLD% of the way through the certificate's lifetime
 const EXPIRATION_THRESHOLD = 0.4;
@@ -19,6 +30,12 @@ export const getHTTPSCert = cache(async (domain: string): Promise<{ key: string;
     if (!domain.endsWith(".")) {
         domain = domain + ".";
     }
+
+    // No matter what, reset this from the in-memory cache in an hour. This is fine. We'll just see the cache on disk and see that it hasn't expired. Or we might see that it has expired, and then we will get the new value. 
+    setTimeout(() => {
+        getHTTPSCert.clear(domain);
+    }, timeInHour);
+
     let keyCert: { key: string; cert: string } | undefined;
     let path = domain + ".cert";
 

package/misc/https/ip.d.ts

@@ -0,0 +1,10 @@
+export declare const getExternalIP: {
+    (): Promise<string>;
+    reset(): void;
+    set(newValue: Promise<string>): void;
+};
+export declare const getPublicIP: {
+    (): Promise<string>;
+    reset(): void;
+    set(newValue: Promise<string>): void;
+};

package/misc/https/ip.ts

@@ -0,0 +1,21 @@
+import { lazy } from "socket-function/src/caching";
+import { httpsRequest } from "socket-function/src/https";
+
+const ipServers = [
+    "http://quentinbrooks.com:4283",
+    "https://ipinfo.io/ip",
+    "https://api.ipify.org"
+];
+
+export const getExternalIP = lazy((async function getExternalIP(): Promise<string> {
+    for (let server of ipServers) {
+        try {
+            return (await httpsRequest(server, undefined, undefined, false)).toString();
+        } catch (e) {
+            console.warn(`Failed to get external ip from ${server}: ${e}`);
+        }
+    }
+    throw new Error(`Failed to get external ip from any server`);
+}));
+
+export const getPublicIP = getExternalIP;

package/package.json

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