socket-function 0.12.10 → 0.12.12

package/SocketFunction.ts

@@ -15,11 +15,13 @@ 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();
+setImmediate(async () => {
+    const { shimDateNow } = await import("./time/trueTimeShim");
+    shimDateNow();
+});
 
 setFlag(require, "cbor-x", "allowclient", true);
 let cborxInstance = new cborx.Encoder({ structuredClone: true });
@@ -247,6 +249,7 @@ export class SocketFunction {
             this.mountedIP = config.ip;
         }
 
+        const { waitForFirstTimeSync } = await import("./time/trueTimeShim");
         await waitForFirstTimeSync();
 
         // Wait for any additionals functions to expose themselves
@@ -291,7 +294,7 @@ export class SocketFunction {
     }
 
     public static browserNodeId() {
-        if (!isNode()) {
+        if (isNode()) {
             throw new Error("Cannot get browser nodeId on server");
         }
         return SocketFunction.connect({ address: location.hostname, port: +location.port || 443 });

package/package.json

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

package/src/formatting/format.ts

@@ -205,4 +205,20 @@ export function formatBinaryNumber(count: number | undefined, maxAbsoluteValue?:
     let maxDecimals = noDecimal ? 0 : 3;
 
     return formatMaxDecimals(count, maxDecimals, maxAbsoluteValue, currencyDecimalsNeeded ? 2 : undefined) + suffix;
+}
+
+/** YYYY/MM/DD HH:MM:SS PM/AM */
+export function formatDateTime(time: number) {
+    function p(s: number) {
+        return s.toString().padStart(2, "0");
+    }
+    let date = new Date(time);
+    let hours = date.getHours();
+    let minutes = date.getMinutes();
+    let seconds = date.getSeconds();
+    let ampm = hours >= 12 ? "PM" : "AM";
+    hours = hours % 12;
+    hours = hours ? hours : 12; // the hour '0' should be '12'
+    let strTime = p(hours) + ":" + p(minutes) + ":" + p(seconds) + " " + ampm;
+    return date.getFullYear() + "/" + p(date.getMonth() + 1) + "/" + p(date.getDate()) + " " + strTime;
 }

package/src/misc.ts

@@ -228,7 +228,7 @@ export function throttleFunction<Args extends any[]>(
             afterCall(Date.now() + delay);
         }
     }
-    function afterCall(setNextAllowedCall: number | undefined) {
+    function afterCall(setNextAllowedCall: number | undefined, time = Date.now()) {
 
         // NOTE: Ignore error, we really shouldn't have any here
         if (setNextAllowedCall) {
@@ -237,7 +237,7 @@ export function throttleFunction<Args extends any[]>(
             if (nextAllowedCall === Number.POSITIVE_INFINITY) return;
         }
         if (!pendingArgs) return;
-        if (Date.now() > nextAllowedCall) {
+        if (time > nextAllowedCall) {
             let args = pendingArgs;
             pendingArgs = undefined;
             // Delay, so we don't turn a series of sequential calls to a series of nested calls
@@ -251,7 +251,7 @@ export function throttleFunction<Args extends any[]>(
                     pendingArgs = undefined;
                     doCall(args.args, args.promiseObj);
                 }
-            }, nextAllowedCall - Date.now());
+            }, nextAllowedCall - time);
         }
     }
     return function (...args: Args): Promise<void> {
@@ -266,7 +266,7 @@ export function throttleFunction<Args extends any[]>(
             return promise.promise;
         } else {
             pendingArgs = { args, promiseObj: promiseObj() };
-            afterCall(undefined);
+            afterCall(undefined, time);
             return pendingArgs.promiseObj.promise;
         }
     };

package/time/trueTimeShim.ts

@@ -144,9 +144,14 @@ setInterval(() => {
     if (baseGetTime() < nextUpdateTime) return;
     nextUpdateTime = baseGetTime() + UPDATE_INTERVAL;
     updateTimeOffset().catch((e) => {
-        console.error("Error updating time offset:", e);
+        console.warn("Error updating time offset:", e);
     });
 }, UPDATE_SUB_INTERVAL);
+setImmediate(() => {
+    updateTimeOffset().catch((e) => {
+        console.error("Error updating initial offset:", e);
+    });
+});
 
 
 class TimeControllerBase {