socket-function 0.147.0 → 0.148.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "0.147.0",
+	"version": "0.148.0",
 	"main": "index.js",
 	"license": "MIT",
 	"dependencies": {

package/require/RequireController.ts

@@ -419,11 +419,12 @@ async function compressCached(bufferKey: string, buffer: () => Buffer): Promise<
 }
 
 export function getIsAllowClient(module: NodeJS.Module) {
+    if (module.serveronly) return false;
     // IMPORTANT! We do not allow everything in node modules by default, as most things in node modules, you don't want to import client-side, and it will break if you import it client-side. Many of these are imported, but will never end up being called client-side, so it's fine to exclude them.
     if (allowAllNodeModulesFlag && module.filename.includes("node_modules")) {
         return true;
     }
-    return module.allowclient && !module.serveronly;
+    return module.allowclient;
 }
 
 type ClientRemapCallback = (args: GetModulesArgs) => Promise<GetModulesArgs>;

package/src/webSocketServer.ts

@@ -2,7 +2,6 @@ import https from "https";
 import http from "http";
 import net from "net";
 import tls from "tls";
-import * as ws from "ws";
 import { getNodeIdsFromRequest, httpCallHandler } from "./callHTTPHandler";
 import { SocketFunction } from "../SocketFunction";
 import { getTrustedCertificates, watchTrustedCertificates } from "./certStore";
@@ -60,6 +59,7 @@ export type SocketServerConfig = (
 export async function startSocketServer(
     config: SocketServerConfig
 ): Promise<string> {
+    const ws = await import("ws");
 
     const webSocketServer = new ws.Server({
         noServer: true,

package/src/websocketFactory.ts

@@ -1,4 +1,3 @@
-import ws from "ws";
 import tls from "tls";
 import { isNode } from "./misc";
 import { SenderInterface } from "./CallFactory";
@@ -6,6 +5,7 @@ import { getTrustedCertificates } from "./certStore";
 import { getNodeIdLocation } from "./nodeCache";
 import debugbreak from "debugbreak";
 import { SocketFunction } from "../SocketFunction";
+import type * as ws from "ws";
 
 export function getTLSSocket(webSocket: ws.WebSocket) {
     return (webSocket as any)._socket as tls.TLSSocket;
@@ -36,6 +36,7 @@ export function createWebsocketFactory(): (nodeId: string) => SenderInterface {
             if (!SocketFunction.silent) {
                 console.log(`Connecting to ${address}:${port}`);
             }
+            const ws = require("ws") as typeof import("ws");
             let webSocket = new ws.WebSocket(`wss://${address}:${port}`, undefined, {
                 ca: getTrustedCertificates(),
             });