socket-function 0.12.8 → 0.12.10

package/SocketFunction.ts

@@ -15,6 +15,12 @@ import { JSONLACKS } from "./src/JSONLACKS/JSONLACKS";
 import "./SetProcessVariables";
 import cborx from "cbor-x";
 import { setFlag } from "./require/compileFlags";
+import { shimDateNow, waitForFirstTimeSync } from "./time/trueTimeShim";
+import { isNode } from "./src/misc";
+
+/** Always shim Date.now(), because we usually DO want an accurate time... */
+shimDateNow();
+
 setFlag(require, "cbor-x", "allowclient", true);
 let cborxInstance = new cborx.Encoder({ structuredClone: true });
 
@@ -241,6 +247,8 @@ export class SocketFunction {
             this.mountedIP = config.ip;
         }
 
+        await waitForFirstTimeSync();
+
         // Wait for any additionals functions to expose themselves
         await delay("immediate");
 
@@ -282,8 +290,11 @@ export class SocketFunction {
         return getNodeId(location.address, location.port);
     }
 
-    public static locationNode() {
-        return SocketFunction.connect({ address: location.hostname, port: +location.port });
+    public static browserNodeId() {
+        if (!isNode()) {
+            throw new Error("Cannot get browser nodeId on server");
+        }
+        return SocketFunction.connect({ address: location.hostname, port: +location.port || 443 });
     }
 
     public static addGlobalHook(hook: SocketFunctionHook<SocketExposedInterface>) {

package/hot/HotReloadController.ts

@@ -14,11 +14,10 @@ import { magenta, red } from "../src/formatting/logColors";
  *      - Triggers a reload server, for modules marked with `module.hotreload`
  */
 export function watchFilesAndTriggerHotReloading(noAutomaticBrowserWatch = false) {
-
     SocketFunction.expose(HotReloadController);
     if (!isNode()) {
         if (!noAutomaticBrowserWatch) {
-            HotReloadController.nodes[SocketFunction.locationNode()]
+            HotReloadController.nodes[SocketFunction.browserNodeId()]
                 .watchFiles()
                 .catch(e => console.error("watchFiles error", e))
                 ;
@@ -42,6 +41,7 @@ declare global {
             hotreload?: boolean;
             /** Only hotreloads the file in the browser. */
             hotreloadBrowser?: boolean;
+            noserverhotreload?: boolean;
         }
     }
 }
@@ -70,7 +70,7 @@ const hotReloadModule = cache((module: NodeJS.Module) => {
         if (curr.mtime.getTime() === prev.mtime.getTime()) return;
         console.log(`Hot reloading due to change: ${module.filename}`);
         module.updateContents?.();
-        if (isNode()) {
+        if (isNode() && !module.noserverhotreload) {
             if (
                 module.hotreload
                 // A fairly big hack (as this could just be in a string, or something similar), but... it also VERY useful
@@ -164,5 +164,11 @@ export const HotReloadController = SocketFunction.register(
     () => ({
         watchFiles: {},
         fileUpdated: {}
-    })
+    }),
+    () => ({
+
+    }),
+    {
+        noAutoExpose: true,
+    }
 );

package/package.json

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

package/require/RequireController.ts

@@ -40,7 +40,7 @@ declare global {
     interface Window {
         clientsideBootTime: number;
     }
-    var suppressUnexpectedModuleWarning: boolean;
+    var suppressUnexpectedModuleWarning: number | undefined;
 }
 
 export interface SerializedModule {

package/require/require.js

@@ -1,6 +1,8 @@
 (function () {
     //# sourceURL=require.js
 
+    let startTime = Date.now();
+
     // Globals
     Object.assign(window, {
         process: {
@@ -144,7 +146,7 @@
         }
     }
     async function rootRequireMultiple(requests) {
-        console.log(`%cimport(${requests.join(", ")})`, "color: orange");
+        console.log(`%cimport(${requests.join(", ")}) at ${Date.now() - startTime}ms`, "color: orange");
 
         let time = Date.now();
 
@@ -216,7 +218,7 @@
         let moduleCount = Object.values(modules).filter(x => x.source).length;
         let requireModuleCount = Object.values(modules).filter(x => !x.source).length;
         let dependenciesOnlyText = requireModuleCount ? ` (+${requireModuleCount} dependencies only)` : "";
-        console.log(`%cimport(${requests.join(", ")}) download ${time}ms, ${Math.ceil(rawText.length / 1024)}KB, ${moduleCount} modules${dependenciesOnlyText}`, "color: green");
+        console.log(`%cimport(${requests.join(", ")}) finished download ${time}ms, ${Math.ceil(rawText.length / 1024)}KB, ${moduleCount} modules${dependenciesOnlyText} at ${Date.now() - startTime}ms`, "color: green");
 
         time = Date.now();
 
@@ -234,7 +236,7 @@
             return requestsResolvedPaths.map(x => getModule(x));
         } finally {
             time = Date.now() - time;
-            console.log(`%cimport(${requests.join(", ")}) evaluate ${time}ms (${moduleCount} modules)`, "color: blue");
+            console.log(`%cimport(${requests.join(", ")}) finished evaluate ${time}ms (${moduleCount} modules) at ${Date.now() - startTime}ms`, "color: blue");
         }
     }
 

package/src/nodeCache.ts

@@ -19,8 +19,7 @@ export function getNodeId(domain: string, port: number): string {
 }
 
 export function getNodeIdFromLocation() {
-    if (isNode()) throw new Error(`Cannot get nodeId from location, as we are running in NodeJS`);
-    return getNodeId(location.hostname, location.port ? parseInt(location.port) : 443);
+    return SocketFunction.browserNodeId();
 }
 
 /** A nodeId not available for reconnecting. */

package/time/trueTimeShim.ts

@@ -0,0 +1,172 @@
+import { SocketFunction } from "../SocketFunction";
+import { isNode } from "../src/misc";
+
+module.allowclient = true;
+
+const UPDATE_INTERVAL = 1000 * 60 * 10;
+// More frequent, to ensure we don't run into major issues with sleep (coming back from sleep,
+//  having the interval not be fired immediately, and having the time be off for a few minutes).
+const UPDATE_SUB_INTERVAL = 1000 * 10;
+// Smearing is important, otherwise some performance timing (especially on load) can easily be off
+//  by a few hundred milliseconds. The current smear parameters will mean even with 1s of offset
+//  we only add 10ms every 100ms, so worst case scenario some timing that takes 0ms will take 10ms.
+const UPDATE_SMEAR_TICK_DURATION = 100;
+const UPDATE_SMEAR_TICK_COUNT = 100;
+const UPDATE_VERIFY_COUNT = 3;
+
+let trueTimeOffset = 0;
+let didFirstTimeSync = false;
+let onFirstTimeSync!: () => void;
+let firstTimeSyncPromise = new Promise<void>((resolve) => {
+    onFirstTimeSync = resolve;
+});
+
+const baseGetTime = Date.now;
+export function getTrueTime() {
+    return baseGetTime() + trueTimeOffset;
+}
+export function getTrueTimeOffset() {
+    return trueTimeOffset;
+}
+export function waitForFirstTimeSync() {
+    return firstTimeSyncPromise;
+}
+export function shimDateNow() {
+    Date.now = getTrueTime;
+}
+
+export function setGetTimeOffsetBase(base: () => Promise<number>) {
+    getTimeOffsetBase = base;
+}
+
+
+async function defaultGetTimeOffset(): Promise<number> {
+    if (!isNode()) {
+        let sendTime = baseGetTime();
+        let serverTrueTime = await TimeController.nodes[SocketFunction.browserNodeId()].getTrueTime();
+        let systemTime = baseGetTime();
+        let predictedServerToClientLatency = (systemTime - sendTime) / 2;
+        let trueTimeRightNow = serverTrueTime + predictedServerToClientLatency;
+        return trueTimeRightNow - systemTime;
+    }
+    const dgram = await import("dgram");
+    const NTP_SERVER = "time.google.com";
+    const NTP_PORT = 123;
+    const NTP_PACKET_SIZE = 48;
+    const NTP_EPOCH_OFFSET = 2208988800000; // Number of milliseconds between 1900-01-01 and 1970-01-01
+    return new Promise((resolve, reject) => {
+        const client = dgram.createSocket("udp4");
+        const message = Buffer.alloc(NTP_PACKET_SIZE);
+
+        // Set the first byte to represent NTP client request (LI = 0, VN = 3, Mode = 3)
+        message[0] = 0x1B;
+
+        const sendTime = baseGetTime();
+
+        client.send(message, 0, message.length, NTP_PORT, NTP_SERVER);
+        client.on("error", (err) => {
+            client.close();
+            reject(err);
+        });
+
+        client.on("message", (msg) => {
+            const receiveTime = baseGetTime();
+
+            // Extract the transmit timestamp from the server response
+            const transmitTimestampSeconds = msg.readUInt32BE(40);
+            const transmitTimestampFraction = msg.readUInt32BE(44);
+            const transmitTimestamp = (transmitTimestampSeconds * 1000) + (transmitTimestampFraction * 1000 / 0x100000000) - NTP_EPOCH_OFFSET;
+
+            const predictedServerToClientLatency = (receiveTime - sendTime) / 2;
+
+            // Calculate the offset
+            const systemTime = baseGetTime();
+            const actualTime = transmitTimestamp + predictedServerToClientLatency;
+            const offset = actualTime - systemTime;
+
+            client.close();
+            resolve(offset);
+        });
+    });
+}
+
+let getTimeOffsetBase: () => Promise<number> = defaultGetTimeOffset;
+let updatingOffset = false;
+async function updateTimeOffset() {
+    if (updatingOffset) return;
+    updatingOffset = true;
+    try {
+        let offsets: number[] = [];
+        for (let i = 0; i < UPDATE_VERIFY_COUNT; i++) {
+            try {
+                offsets.push(await getTimeOffsetBase());
+            } catch (e) {
+                console.error("Error getting time offset:", e);
+            }
+        }
+        // If we have no offsets, it likely means every call errored out (probably because the network is down).
+        //  This is fine, just don't update (DO register the first sync as being done, otherwise calling code
+        //  might be waiting forever).
+        if (offsets.length > 0) {
+            // Pick the middle offset
+            offsets.sort((a, b) => a - b);
+            let offset = offsets[Math.floor(offsets.length / 2)];
+
+            // Smear it slowly
+            let currentSmearCount = UPDATE_SMEAR_TICK_COUNT;
+            // Update the initial time all at once, otherwise initial requests to other servers might
+            //  be rejected (because they could use the system time, which could be off by a few seconds).
+            if (!didFirstTimeSync) {
+                currentSmearCount = 1;
+            }
+
+            let prevOffset = trueTimeOffset;
+            for (let i = 0; i < currentSmearCount; i++) {
+                let fraction = (i + 1) / currentSmearCount;
+                trueTimeOffset = prevOffset * (1 - fraction) + offset * fraction;
+                if (i < currentSmearCount - 1) {
+                    await new Promise((resolve) => setTimeout(resolve, UPDATE_SMEAR_TICK_DURATION));
+                }
+            }
+        }
+
+        if (!didFirstTimeSync) {
+            didFirstTimeSync = true;
+            onFirstTimeSync();
+        }
+    } finally {
+        updatingOffset = false;
+    }
+}
+
+let nextUpdateTime = 0;
+setInterval(() => {
+    if (baseGetTime() < nextUpdateTime) return;
+    nextUpdateTime = baseGetTime() + UPDATE_INTERVAL;
+    updateTimeOffset().catch((e) => {
+        console.error("Error updating time offset:", e);
+    });
+}, UPDATE_SUB_INTERVAL);
+
+
+class TimeControllerBase {
+    public async getTrueTime() {
+        await waitForFirstTimeSync();
+        return getTrueTime();
+    }
+}
+
+const TimeController = SocketFunction.register(
+    "TimeController-ddf4753e-fc8a-413f-8cc2-b927dd449976",
+    new TimeControllerBase(),
+    () => ({
+        getTrueTime: {},
+    }),
+    () => ({
+    }),
+    {
+        // NOTE: Autoexpose, because our exposed endpoints are incredibly lightweight
+        //  (just a ping), and don't expose really expose any data.
+        // noAutoExpose: true
+    }
+);