抽出成 aNow()

Author: cyfung1031

src/app/service/service_worker/value.ts

@@ -5,7 +5,7 @@ import { type Value, ValueDAO } from "@App/app/repo/value";
 import type { IGetSender, Group } from "@Packages/message/server";
 import { type RuntimeService } from "./runtime";
 import { type PopupService } from "./popup";
-import { getStorageName } from "@App/pkg/utils/utils";
+import { aNow, getStorageName } from "@App/pkg/utils/utils";
 import type { ValueUpdateDataEncoded, ValueUpdateSendData, ValueUpdateSender } from "../content/types";
 import type { TScriptValueUpdate } from "../queue";
 import { type TDeleteScript } from "../queue";
@@ -15,8 +15,6 @@ import { stackAsyncTask } from "@App/pkg/utils/async_queue";
 import { encodeMessage } from "@App/pkg/utils/message_value";
 import { isEarlyStartScript } from "../content/utils";
 
-let lastUpdateTime = 0;
-
 type ValueUpdateTaskInfo = {
   uuid: string;
   id: string;
@@ -143,6 +141,7 @@ export class ValueService {
   }
 
   async setValuesByStorageName(storageName: string) {
+    let valueModel: Value | undefined = await this.valueDAO.get(storageName);
     const cacheKey = `${CACHE_KEY_SET_VALUE}${storageName}`;
     const taskListRef = valueUpdateTasks.get(cacheKey);
     if (!taskListRef?.length) return;
@@ -151,19 +150,13 @@ export class ValueService {
     // ------ 读取 & 更新 ------
     let updatetime = 0;
     const listRetToTab: Record<string, ValueUpdateDataEncoded[]> = {};
-    let valueModel: Value | undefined = await this.valueDAO.get(storageName);
     let valueModelUpdated = false;
     let hasValueUpdated = false;
     for (const task of taskList) {
       const entries = [] as [string, any, any][];
       const { uuid, values, removeNotProvided } = task;
       let oldValueRecord: { [key: string]: any } = {};
-      let now = Date.now();
-      // 保证严格递增
-      if (lastUpdateTime >= now) {
-        now = lastUpdateTime + 0.0009765625; // 2^-10
-      }
-      lastUpdateTime = now;
+      const now = aNow(); // 保证严格递增
       let newData;
       if (!valueModel) {
         const dataModel: { [key: string]: any } = {};

src/pkg/utils/utils.test.ts

@@ -1,9 +1,32 @@
 import { describe, expect, it } from "vitest";
-import { checkSilenceUpdate, cleanFileName, stringMatching } from "./utils";
+import { aNow, checkSilenceUpdate, cleanFileName, stringMatching } from "./utils";
 import { ltever, versionCompare } from "@App/pkg/utils/semver";
 import { nextTime } from "./cron";
 import dayjs from "dayjs";
 
+describe.concurrent("aNow", () => {
+  it.sequential("aNow is Strictly Increasing", () => {
+    const p1 = [aNow(), aNow(), aNow(), aNow(), aNow(), aNow()];
+    expect(p1[0]).lessThan(p1[1]);
+    expect(p1[1]).lessThan(p1[2]);
+    expect(p1[2]).lessThan(p1[3]);
+    expect(p1[3]).lessThan(p1[4]);
+    expect(p1[4]).lessThan(p1[5]);
+    const p2 = [...p1].sort();
+    expect(p1).toEqual(p2);
+  });
+  it.sequential("t1 > t2 (busy) and t3 = t4 (idle)", async () => {
+    const _p1 = [aNow(), aNow(), aNow(), aNow(), aNow(), aNow()];
+    const t1 = aNow();
+    const t2 = Date.now();
+    expect(t1).greaterThan(t2);
+    await new Promise((resolve) => setTimeout(resolve, 10));
+    const t3 = aNow();
+    const t4 = Date.now();
+    expect(t3).toEqual(t4);
+  });
+});
+
 describe.concurrent("nextTime", () => {
   const date = new Date(1737275107000);
   it.concurrent("每分钟表达式", () => {

src/pkg/utils/utils.ts

@@ -11,6 +11,18 @@ export function randomMessageFlag(): string {
   return `-${Date.now().toString(36)}.${randNum(8e11, 2e12).toString(36)}`;
 }
 
+let prevNow = 0;
+/**
+ * accumulated "now".
+ * 用 aNow 取得的现在时间能保证严格递增
+ */
+export const aNow = () => {
+  let now = Date.now();
+  if (prevNow >= now) now = prevNow + 0.0009765625; // 2^-10
+  prevNow = now;
+  return now;
+};
+
 export function isFirefox() {
   //@ts-ignore
   return typeof mozInnerScreenX !== "undefined";