socket-function 0.36.0 → 0.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "0.36.0",
+	"version": "0.38.0",
 	"main": "index.js",
 	"license": "MIT",
 	"note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/forwardPort.ts

@@ -11,6 +11,9 @@ export async function forwardPort(config: {
     internalPort: number;
     duration?: number;
 }) {
+    // On linux, just return, the server probably doesn't require forwarding, and if it does,
+    //  it probably this code probably won't work anyways.
+    if (os.platform() === "linux") return;
     try {
         const { externalPort, internalPort } = config;
         let duration = config.duration ?? timeInHour;

package/src/https.ts

@@ -23,13 +23,15 @@ export function httpsRequest(
             if (urlObj.port) {
                 port = +urlObj.port;
             }
-
             return new Promise<Buffer>((resolve, reject) => {
                 let httpRequest = requestor.request(
                     urlObj + "",
                     {
                         method,
                         headers: config?.headers,
+                        // NOTE: We get a lot of backblaze errors when we try to re-use connections. It might be faster,
+                        //  but... anything that cares about speed should use websockets anyways...
+                        agent: new requestor.Agent({ keepAlive: false }),
                     },
                     async httpResponse => {
                         let data: Buffer[] = [];

package/src/webSocketServer.ts

@@ -67,6 +67,9 @@ export async function startSocketServer(
         let httpServerPromise = new Promise<https.Server>(r => onHttpServer = r);
         let lastOptions!: https.ServerOptions;
         await watchOptions(value => {
+            // NOTE: If this is called a lot... STOP CALLING IT A LOT! Calling setSecureContext
+            //  so frequently likely leaks memory!
+            console.log(`Updating websocket server options`);
             lastOptions = {
                 ...value,
                 ca: getTrustedCertificates(),
@@ -88,6 +91,9 @@ export async function startSocketServer(
         }
 
         watchTrustedCertificates(() => {
+            // NOTE: If this is called a lot... STOP CALLING IT A LOT! Calling setSecureContext
+            //  so frequently likely leaks memory!
+            console.log(`Updating websocket server trusted certificates`);
             lastOptions.ca = getTrustedCertificates();
             httpsServer.setSecureContext(lastOptions);
         });

package/src/websocketFactory.ts

@@ -38,12 +38,6 @@ export function createWebsocketFactory(): (nodeId: string) => SenderInterface {
             }
             let webSocket = new ws.WebSocket(`wss://${address}:${port}`, undefined, {
                 ca: getTrustedCertificates(),
-                // createConnection(options, oncreate) {
-                //     // NOTE: If our latency is 500ms, with 10MB/s, then we need a high water
-                //     //  mark of at least 5MB, otherwise our connection is slowed down.
-                //     //(options as any).writableHighWaterMark = 5 * 1024 * 1024;
-                //     return tls.connect(options as any, oncreate as any);
-                // },
             });
 
             // NOTE: Little setup is done here, because Sometimes websockets are created here,