socket-function 1.0.1 → 1.0.3

package/SocketFunction.d.ts

@@ -1,5 +1,6 @@
 /// <reference path="require/RequireController.d.ts" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { SocketExposedInterface, SocketFunctionHook, SocketFunctionClientHook, SocketExposedShape, SocketRegistered, CallerContext, FullCallType, SocketRegisterType } from "./SocketFunctionTypes";
 import { SocketServerConfig } from "./src/webSocketServer";
 import { Args, MaybePromise } from "./src/types";

package/generateIndexDts.js

@@ -24,20 +24,36 @@ function generateIndexDts() {
     const renderUtilsPath = __dirname;
     const dtsFiles = getAllDtsFiles(renderUtilsPath);
 
+    const excludedModules = ["socket-function/SocketFunction", "socket-function/index"];
+
     const modules = dtsFiles
-        .filter(filePath => {
-            // Exclude SocketFunction.d.ts and index.d.ts from being wrapped in a module declaration
-            const relativePath = path.relative(renderUtilsPath, filePath);
-            const withoutExt = relativePath.replace(/\.d\.ts$/, "");
-            const modulePath = "socket-function/" + withoutExt.replace(/\\/g, "/");
-            return modulePath !== "socket-function/SocketFunction" && modulePath !== "socket-function/index";
-        })
         .map(filePath => {
             const relativePath = path.relative(renderUtilsPath, filePath);
             const withoutExt = relativePath.replace(/\.d\.ts$/, "");
             const modulePath = "socket-function/" + withoutExt.replace(/\\/g, "/");
+            if (excludedModules.includes(modulePath)) return undefined;
+
+            let content = fs.readFileSync(filePath, "utf8");
+
+            // Resolve relative imports to absolute module paths
+            const moduleDir = path.dirname(modulePath);
+            content = content.replace(
+                /(import|export)\s+([^"']*)\s+from\s+["'](\.[^"']+)["']/g,
+                (match, keyword, imported, relativeImport) => {
+                    const absoluteModulePath = path.join(moduleDir, relativeImport).replace(/\\/g, "/");
+                    return `${keyword} ${imported} from "${absoluteModulePath}"`;
+                }
+            );
+
+            // Resolve dynamic imports like import("../path")
+            content = content.replace(
+                /import\(["'](\.[^"']+)["']\)/g,
+                (match, relativeImport) => {
+                    const absoluteModulePath = path.join(moduleDir, relativeImport).replace(/\\/g, "/");
+                    return `import("${absoluteModulePath}")`;
+                }
+            );
 
-            const content = fs.readFileSync(filePath, "utf8");
             const indentedContent = content
                 .split("\n")
                 .map(line => line ? "    " + line : line)
@@ -45,6 +61,7 @@ function generateIndexDts() {
 
             return `declare module "${modulePath}" {\n${indentedContent}\n}`;
         })
+        .filter(x => x)
         .sort()
         .join("\n\n");
 

package/index.d.ts

@@ -8,8 +8,8 @@ declare module "socket-function/SetProcessVariables" {
 
 declare module "socket-function/SocketFunctionTypes" {
     /// <reference path="require/RequireController.d.ts" />
-    import { getCallObj } from "./src/nodeProxy";
-    import { Args, MaybePromise } from "./src/types";
+    import { getCallObj } from "socket-function/src/nodeProxy";
+    import { Args, MaybePromise } from "socket-function/src/types";
     export declare const socket: unique symbol;
     export type SocketExposedInterface = {
         [functionName: string]: (...args: any[]) => Promise<unknown>;
@@ -127,7 +127,7 @@ declare module "socket-function/hot/HotReloadController" {
     export declare function hotReloadingGuard(): true;
     export declare function setExternalHotReloading(value: boolean): void;
     export declare function onHotReload(callback: (modules: NodeJS.Module[]) => void): void;
-    export declare const HotReloadController: import("../SocketFunctionTypes").SocketRegistered<{
+    export declare const HotReloadController: import("socket-function/SocketFunctionTypes").SocketRegistered<{
         watchFiles: () => Promise<void>;
         fileUpdated: (files: string[], changeTime: number) => Promise<void>;
     }>;
@@ -194,6 +194,7 @@ declare module "socket-function/require/CSSShim" {
 declare module "socket-function/require/RequireController" {
     /// <reference path="../../typenode/index.d.ts" />
     /// <reference types="node" />
+    /// <reference types="node" />
     declare global {
         namespace NodeJS {
             interface Module {
@@ -272,7 +273,7 @@ declare module "socket-function/require/RequireController" {
     /** @deprecated, not needed, as this defaults to ".", which is a lot easier to reason about anyways. */
     export declare function setRequireBootRequire(dir: string): void;
     export declare function allowAllNodeModules(): void;
-    export declare const RequireController: import("../SocketFunctionTypes").SocketRegistered<{
+    export declare const RequireController: import("socket-function/SocketFunctionTypes").SocketRegistered<{
         rootResolvePath: "Function has implementation but is not exposed in the SocketFunction.register call";
         requireHTML: (config?: {
             requireCalls?: string[];
@@ -317,6 +318,7 @@ declare module "socket-function/require/compileFlags" {
 }
 
 declare module "socket-function/require/extMapper" {
+    /// <reference types="node" />
     /// <reference types="node" />
     export declare function getExtContentType(ext: string): string;
     export declare function getContentTypeFromBuffer(buffer: Buffer): string | undefined;
@@ -344,7 +346,8 @@ declare module "socket-function/require/require" {
 declare module "socket-function/src/CallFactory" {
     /// <reference types="node" />
     /// <reference types="node" />
-    import { CallType } from "../SocketFunctionTypes";
+    /// <reference types="node" />
+    import { CallType } from "socket-function/SocketFunctionTypes";
     import * as ws from "ws";
     import * as tls from "tls";
     export interface CallFactory {
@@ -382,6 +385,7 @@ declare module "socket-function/src/CallFactory" {
 }
 
 declare module "socket-function/src/JSONLACKS/JSONLACKS" {
+    /// <reference types="node" />
     /// <reference types="node" />
     export interface JSONLACKS_ParseConfig {
         extended?: boolean;
@@ -430,7 +434,7 @@ declare module "socket-function/src/args" {
 }
 
 declare module "socket-function/src/batching" {
-    import { AnyFunction } from "./types";
+    import { AnyFunction } from "socket-function/src/types";
     export type DelayType = (number | "afterio" | "immediate" | "afterpromises" | "paintLoop" | "afterPaint");
     export declare function delay(delayTime: DelayType, immediateShortDelays?: "immediateShortDelays"): Promise<void>;
     export declare function batchFunctionNone<Arg, Result = void>(config: unknown, fnc: (arg: Arg[]) => (Promise<Result> | Result)): (arg: Arg) => Promise<Result>;
@@ -465,7 +469,7 @@ declare module "socket-function/src/batching" {
 }
 
 declare module "socket-function/src/caching" {
-    import { AnyFunction, Args } from "./types";
+    import { AnyFunction, Args } from "socket-function/src/types";
     export declare function lazy<T>(factory: () => T): {
         (): T;
         reset(): void;
@@ -528,10 +532,11 @@ declare module "socket-function/src/caching" {
 }
 
 declare module "socket-function/src/callHTTPHandler" {
+    /// <reference types="node" />
     /// <reference types="node" />
     /// <reference types="node" />
     import http from "http";
-    import { CallType } from "../SocketFunctionTypes";
+    import { CallType } from "socket-function/SocketFunctionTypes";
     export declare function setDefaultHTTPCall(call: CallType): void;
     export declare function getServerLocationFromRequest(request: http.IncomingMessage): {
         address: string;
@@ -558,7 +563,7 @@ declare module "socket-function/src/callHTTPHandler" {
 
 declare module "socket-function/src/callManager" {
     /// <reference path="../hot/HotReloadController.d.ts" />
-    import { CallerContext, CallType, ClientHookContext, FullCallType, FunctionFlags, HookContext, SocketExposedInterface, SocketExposedShape, SocketFunctionClientHook, SocketFunctionHook, SocketRegistered } from "../SocketFunctionTypes";
+    import { CallerContext, CallType, ClientHookContext, FullCallType, FunctionFlags, HookContext, SocketExposedInterface, SocketExposedShape, SocketFunctionClientHook, SocketFunctionHook, SocketRegistered } from "socket-function/SocketFunctionTypes";
     export declare function getCallFlags(call: CallType): FunctionFlags | undefined;
     export declare function shouldCompressCall(call: CallType): boolean;
     export declare function performLocalCall(config: {
@@ -582,6 +587,7 @@ declare module "socket-function/src/callManager" {
 }
 
 declare module "socket-function/src/certStore" {
+    /// <reference types="node" />
     /// <reference types="node" />
     /** Must be populated before the server starts */
     export declare function trustCertificate(cert: string | Buffer): void;
@@ -695,6 +701,7 @@ declare module "socket-function/src/forwardPort" {
 }
 
 declare module "socket-function/src/https" {
+    /// <reference types="node" />
     /// <reference types="node" />
     export declare function httpsRequest(url: string, payload?: Buffer | Buffer[], method?: string, sendSessionCookies?: boolean, config?: {
         headers?: {
@@ -707,7 +714,8 @@ declare module "socket-function/src/https" {
 
 declare module "socket-function/src/misc" {
     /// <reference types="node" />
-    import { MaybePromise } from "./types";
+    /// <reference types="node" />
+    import { MaybePromise } from "socket-function/src/types";
     export declare const timeInSecond = 1000;
     export declare const timeInMinute: number;
     export declare const timeInHour: number;
@@ -822,8 +830,8 @@ declare module "socket-function/src/networking" {
 }
 
 declare module "socket-function/src/nodeCache" {
-    import { CallFactory } from "./CallFactory";
-    import { MaybePromise } from "./types";
+    import { CallFactory } from "socket-function/src/CallFactory";
+    import { MaybePromise } from "socket-function/src/types";
     export declare function getNodeId(domain: string, port: number): string;
     /** @deprecated, call getBrowserUrlNode instead, which does important additional checks. */
     export declare function getNodeIdFromLocation(): string;
@@ -850,7 +858,7 @@ declare module "socket-function/src/nodeCache" {
 }
 
 declare module "socket-function/src/nodeProxy" {
-    import { FullCallType, SocketInternalInterface } from "../SocketFunctionTypes";
+    import { FullCallType, SocketInternalInterface } from "socket-function/SocketFunctionTypes";
     type CallProxyType = {
         [nodeId: string]: SocketInternalInterface;
     };
@@ -877,7 +885,7 @@ declare module "socket-function/src/profiling/getOwnTime" {
 }
 
 declare module "socket-function/src/profiling/measure" {
-    import { StatsValue } from "./stats";
+    import { StatsValue } from "socket-function/src/profiling/stats";
     /** NOTE: Must be called BEFORE anything else is imported!
      *      NOTE: Measurements on on by default now, so this doesn't really need to be called...
     */
@@ -998,7 +1006,7 @@ declare module "socket-function/src/profiling/stats" {
 }
 
 declare module "socket-function/src/profiling/statsFormat" {
-    import { StatsValue } from "./stats";
+    import { StatsValue } from "socket-function/src/profiling/stats";
     export declare function percent(value: number): string;
     export declare function formatStats(stats: StatsValue, config?: {
         noColor?: boolean;
@@ -1116,6 +1124,7 @@ declare module "socket-function/src/storagePath" {
 }
 
 declare module "socket-function/src/tlsParsing" {
+    /// <reference types="node" />
     /// <reference types="node" />
     export declare function parseTLSHello(buffer: Buffer): {
         extensions: {
@@ -1140,10 +1149,11 @@ declare module "socket-function/src/types" {
 }
 
 declare module "socket-function/src/webSocketServer" {
+    /// <reference types="node" />
     /// <reference types="node" />
     /// <reference types="node" />
     import https from "https";
-    import { Watchable } from "./misc";
+    import { Watchable } from "socket-function/src/misc";
     export type SocketServerConfig = (https.ServerOptions & {
         key: string | Buffer;
         cert: string | Buffer;
@@ -1175,7 +1185,7 @@ declare module "socket-function/src/webSocketServer" {
 declare module "socket-function/src/websocketFactory" {
     /// <reference types="node" />
     import tls from "tls";
-    import { SenderInterface } from "./CallFactory";
+    import { SenderInterface } from "socket-function/src/CallFactory";
     import type * as ws from "ws";
     export declare function getTLSSocket(webSocket: ws.WebSocket): tls.TLSSocket;
     /** NOTE: We create a factory, which embeds the key/cert information. Otherwise retries might use

package/package.json

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

package/require/RequireController.d.ts

@@ -1,5 +1,6 @@
 /// <reference path="../../typenode/index.d.ts" />
 /// <reference types="node" />
+/// <reference types="node" />
 declare global {
     namespace NodeJS {
         interface Module {

package/require/extMapper.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare function getExtContentType(ext: string): string;
 export declare function getContentTypeFromBuffer(buffer: Buffer): string | undefined;

package/src/CallFactory.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { CallType } from "../SocketFunctionTypes";
 import * as ws from "ws";
 import * as tls from "tls";

package/src/JSONLACKS/JSONLACKS.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export interface JSONLACKS_ParseConfig {
     extended?: boolean;
     discardMissingReferences?: boolean;

package/src/callHTTPHandler.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import http from "http";
 import { CallType } from "../SocketFunctionTypes";
 export declare function setDefaultHTTPCall(call: CallType): void;

package/src/certStore.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 /** Must be populated before the server starts */
 export declare function trustCertificate(cert: string | Buffer): void;
 export declare function getTrustedCertificates(): string[];

package/src/https.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare function httpsRequest(url: string, payload?: Buffer | Buffer[], method?: string, sendSessionCookies?: boolean, config?: {
     headers?: {
         [key: string]: string | undefined;

package/src/misc.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { MaybePromise } from "./types";
 export declare const timeInSecond = 1000;
 export declare const timeInMinute: number;

package/src/tlsParsing.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare function parseTLSHello(buffer: Buffer): {
     extensions: {
         type: number;

package/src/webSocketServer.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import https from "https";
 import { Watchable } from "./misc";
 export type SocketServerConfig = (https.ServerOptions & {