mslxdff 0.1.68 → 0.1.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mslxdff",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "description": "测试项目，请勿使用。",
   "type": "module",
   "bin": {

package/src/cli/commands/system.js

@@ -6,6 +6,7 @@ import { loadToken, refreshToken } from "../../state.js";
 import { stopDaemon, pidFile, logFile } from "../../daemon.js";
 import { logDir, eventsFile, callsFile, errorsFile, recentEvents } from "../../logs.js";
 import { fmtEvent } from "../format.js";
+import { fmtShanghaiYMDHMS, fmtShanghaiHMS } from "../../time.js";
 import { printHelp } from "../help.js";
 import { printStatus } from "../status.js";
 import { loadPlugins, resolvePluginDirs } from "../../plugins.js";
@@ -178,7 +179,7 @@ export async function handleFree(args) {
   const { fetchV2exFree } = await import("../../free-watcher.js");
   const show = async () => {
     const hits = await fetchV2exFree({ timeoutMs: 6000 });
-    const ts = new Date().toISOString().replace("T", " ").slice(0, 19);
+    const ts = fmtShanghaiYMDHMS(new Date());
     console.log(`[V2EX] free check @ ${ts} — ${hits.length} hit(s)`);
     if (!hits.length) {
       console.log("(暂无命中 — 关键词：白嫖|限免|免费额度|注册送|羊毛，来源：/api/topics/latest.json + hot.json)");
@@ -192,7 +193,7 @@ export async function handleFree(args) {
   }
   console.log("V2EX 白嫖雷达 watch 模式 — 每 5 分钟拉一次 Ctrl+C 退出");
   const run = async () => {
-    try { await show(); } catch (err) { console.error(`[${new Date().toISOString().slice(11,19)}] 拉取失败: ${err?.message || err}`); }
+    try { await show(); } catch (err) { console.error(`[${fmtShanghaiHMS(new Date())}] 拉取失败: ${err?.message || err}`); }
     console.log("---");
   };
   await run();

package/src/cli/commands/timezone.js

@@ -0,0 +1,47 @@
+import { loadTimezone, loadTimezoneState, saveTimezone, clearTimezone, getTimezoneEnv, isValidTimezone, DEFAULT_TZ } from "../../state/schemas/timezone.js";
+import { getTimezone } from "../../time.js";
+
+export async function handleTimezone(args) {
+  if (!(args.includes("-timezone") || args.includes("--timezone") || args.includes("-tz") || args.includes("--tz") || args.includes("-time") || args.includes("--time"))) return false;
+  const idx = args.findIndex((x) => ["-timezone","--timezone","-tz","--tz","-time","--time"].includes(x));
+  const sub = args[idx + 1];
+  const rest = args.slice(idx + 2);
+  const env = getTimezoneEnv();
+  const current = loadTimezoneState();
+  const effective = getTimezone();
+
+  if (!sub || sub === "status" || sub === "list" || sub === "show") {
+    console.log(`timezone: ${effective} ${env ? `(env ${env} 覆盖)` : ""}`.trim());
+    console.log(`  state: ${current}  ${current === DEFAULT_TZ ? "(默认 Asia/Shanghai)" : ""}`);
+    if (env) console.log(`  env  : ${env}  (MSLXDFF_TZ 覆盖 state)`);
+    else console.log(`  env  : (未设 MSLXDFF_TZ)`);
+    console.log(`\n可用示例: Asia/Shanghai, UTC, America/New_York, Europe/London, Asia/Tokyo`);
+    console.log(`用法:`);
+    console.log(`  mslxdff -timezone set Asia/Shanghai   设为上海时间（默认）`);
+    console.log(`  mslxdff -timezone set UTC             设为 UTC`);
+    console.log(`  mslxdff -timezone clear               恢复默认 (${DEFAULT_TZ})`);
+    console.log(`  MSLXDFF_TZ=UTC mslxdff -status        临时用 UTC（env 覆盖，不落盘）`);
+    process.exit(0);
+  }
+  if (sub === "clear" || sub === "reset") {
+    clearTimezone();
+    console.log(`timezone 已清除，恢复默认: ${DEFAULT_TZ}`);
+    process.exit(0);
+  }
+  let target = "";
+  if (sub === "set") target = rest[0];
+  else target = sub;
+  if (!target) {
+    console.error("usage: mslxdff -timezone set <Timezone>  e.g. Asia/Shanghai, UTC");
+    console.error("       mslxdff -timezone <Timezone>  直接设置");
+    process.exit(1);
+  }
+  if (!isValidTimezone(target)) {
+    console.error(`无效时区: ${target}`);
+    console.error(`示例: Asia/Shanghai, UTC, America/New_York`);
+    process.exit(1);
+  }
+  saveTimezone(target);
+  console.log(`timezone 已设为: ${target}（已写入 state.json，${env ? "但当前 env MSLXDFF_TZ 仍覆盖，需 unset 后生效" : "立即生效"}）`);
+  process.exit(0);
+}

package/src/cli/index.js

@@ -12,6 +12,8 @@ export async function run(args = process.argv.slice(2)) {
   if (await handleUpdate(args, VERSION)) return;
   if (await handleRefreshToken(args)) return;
   if (await handleShowToken(args)) return;
+  const { handleTimezone } = await import("./commands/timezone.js");
+  if (await handleTimezone(args)) return;
 
   const { handleStop, handleRestart } = await import("./commands/daemon.js");
   if (await handleStop(args)) return;

package/src/logs.js

@@ -3,6 +3,7 @@ import { appendFile, stat, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import os from "node:os";
 import { defaultStateFile } from "./state.js";
+import { fmtShanghaiYMDHMS } from "./time.js";
 
 const MAX_CALLS = 500;
 const MAX_ERRORS = 200;
@@ -73,7 +74,7 @@ function shouldSync(file) {
 
 function appendLine(file, entry) {
   ensureDir(dirname(file));
-  const line = JSON.stringify({ ts: new Date().toISOString(), ...entry }) + "\n";
+  const line = JSON.stringify({ ts: fmtShanghaiYMDHMS(new Date()), ...entry }) + "\n";
   if (shouldSync(file)) {
     appendFileSync(file, line);
     trimIfOversized(file);

package/src/providers/workbuddy/rotation-log.js

@@ -1,5 +1,6 @@
 import { appendFileSync, mkdirSync, readFileSync, writeFileSync, statSync } from "node:fs";
 import { join } from "node:path";
+import { fmtShanghaiYMDHMS } from "../../time.js";
 
 function defaultDirs() {
   const dirs = new Set();
@@ -22,7 +23,7 @@ export function appendRotationLog({ uid, model, totalMs, balanceHit, error, cloc
   const useFs = fsOverride || { appendFileSync, mkdirSync, readFileSync, writeFileSync, statSync, join };
   const useDirs = dirsOverride || defaultDirs();
   try {
-    const line = `${new Date(clock()).toISOString()} uid=${uid} model=${model || "-"} totalMs=${totalMs} balanceHit=${balanceHit ? 1 : 0}${error ? ` error=${String(error).slice(0, 120)}` : ""}\n`;
+    const line = `${fmtShanghaiYMDHMS(new Date(clock()))} uid=${uid} model=${model || "-"} totalMs=${totalMs} balanceHit=${balanceHit ? 1 : 0}${error ? ` error=${String(error).slice(0, 120)}` : ""}\n`;
     for (const dir of useDirs) {
       try {
         useFs.mkdirSync(dir, { recursive: true });

package/src/routes/groups.js

@@ -1,11 +1,12 @@
 import { clientIp, json, readBody, errMsg } from "./helpers.js";
+import { fmtShanghaiYMDHMS } from "../time.js";
 
 export async function joinHandler({ req, res, groups, token, bans }) {
   if (!groups) return json(res, 501, { error: "Groups service not configured" });
   const ip = clientIp(req);
   const banned = bans?.isBanned(ip);
   if (banned) {
-    return json(res, 403, { error: `banned until ${new Date(banned.until).toISOString()}` });
+    return json(res, 403, { error: `banned until ${fmtShanghaiYMDHMS(banned.until)}` });
   }
   let body;
   try {

package/src/state/facade.js

@@ -55,3 +55,4 @@ export {
 } from "./schemas/model.js";
 export { loadPeers, savePeers, loadPeerErrors, savePeerErrors, loadPeerStats, savePeerStats } from "./schemas/peer.js";
 export { loadGroups, loadGroupsJoined, saveGroupsJoined, loadBans, saveBans, saveGroups } from "./schemas/group.js";
+export { loadTimezone, loadTimezoneState, saveTimezone, clearTimezone, getTimezoneEnv, DEFAULT_TZ, isValidTimezone } from "./schemas/timezone.js";

package/src/state/schemas/timezone.js

@@ -0,0 +1,70 @@
+import { readState, writeStateImmediate, defaultStateFile } from "../store.js";
+
+const DEFAULT_TZ = "Asia/Shanghai";
+const ENV_KEYS = ["MSLXDFF_TZ", "MSLXDFF_TIMEZONE", "TZ"];
+
+function isValidTimezone(tz) {
+  try {
+    new Intl.DateTimeFormat("en-GB", { timeZone: tz });
+    return true;
+  } catch { return false; }
+}
+
+export function getTimezoneEnv() {
+  for (const k of ENV_KEYS) {
+    const v = String(process.env[k] || "").trim();
+    if (v && isValidTimezone(v)) return v;
+  }
+  return "";
+}
+
+export function loadTimezone({ file } = {}) {
+  const env = getTimezoneEnv();
+  if (env) return env;
+  try {
+    const f = file || defaultStateFile();
+    const s = readState(f);
+    const v = String(s?.timezone || s?.tz || "").trim();
+    if (v && isValidTimezone(v)) return v;
+  } catch {}
+  return DEFAULT_TZ;
+}
+
+export function loadTimezoneState({ file } = {}) {
+  try {
+    const f = file || defaultStateFile();
+    const s = readState(f);
+    const v = String(s?.timezone || s?.tz || "").trim();
+    if (v && isValidTimezone(v)) return v;
+  } catch {}
+  return DEFAULT_TZ;
+}
+
+export function saveTimezone(tz, { file } = {}) {
+  const v = String(tz || "").trim();
+  if (!v) throw new Error("timezone 不能为空");
+  if (!isValidTimezone(v)) throw new Error(`无效时区: ${v}（示例: Asia/Shanghai, UTC, America/New_York）`);
+  const f = file || defaultStateFile();
+  const patch = { timezone: v };
+  // 兼容旧字段 tz
+  const cur = readState(f);
+  if (cur?.tz !== undefined) patch.tz = undefined;
+  return writeStateImmediate(f, patch);
+}
+
+export function clearTimezone({ file } = {}) {
+  const f = file || defaultStateFile();
+  const cur = readState(f);
+  const patch = {};
+  if (cur?.timezone !== undefined) patch.timezone = undefined;
+  if (cur?.tz !== undefined) patch.tz = undefined;
+  if (!Object.keys(patch).length) return cur;
+  // 通过写 undefined 触发 merge 覆盖？用直接删后写回
+  const next = { ...cur };
+  delete next.timezone;
+  delete next.tz;
+  writeStateImmediate(f, next);
+  return next;
+}
+
+export { DEFAULT_TZ, isValidTimezone };

package/src/state/schemas/token.js

@@ -1,6 +1,7 @@
 import { mkdirSync, readFileSync, writeFileSync, existsSync, statSync } from "node:fs";
 import { dirname } from "node:path";
 import { defaultStateFile, tokenFile, generateToken, readState, writeStateImmediate, getEntry } from "../store.js";
+import { fmtShanghaiYMDHMS } from "../../time.js";
 
 function syncTokenFile(token, file) {
   try {
@@ -29,13 +30,13 @@ export async function loadToken({ file = defaultStateFile() } = {}) {
     } catch {}
   }
   const tok = generateToken();
-  const saved = writeStateImmediate(file, { token: tok, createdAt: new Date().toISOString() }).token;
+  const saved = writeStateImmediate(file, { token: tok, createdAt: fmtShanghaiYMDHMS(new Date()) }).token;
   syncTokenFile(saved, file);
   return { token: saved, created: true };
 }
 
 export async function refreshToken({ file = defaultStateFile() } = {}) {
-  const tok = writeStateImmediate(file, { token: generateToken(), createdAt: new Date().toISOString() }).token;
+  const tok = writeStateImmediate(file, { token: generateToken(), createdAt: fmtShanghaiYMDHMS(new Date()) }).token;
   syncTokenFile(tok, file);
   return tok;
 }

package/src/time.js

@@ -1,23 +1,50 @@
-const TZ = "Asia/Shanghai";
+import { loadTimezone } from "./state/schemas/timezone.js";
 
-function shanghaiParts(d) {
+const DEFAULT_TZ = "Asia/Shanghai";
+
+function getTimezone() {
+  try { return loadTimezone() || DEFAULT_TZ; } catch { return DEFAULT_TZ; }
+}
+
+function tzParts(d, tz) {
+  const zone = tz || getTimezone();
   const date = d instanceof Date ? d : new Date(d);
-  const fmt = new Intl.DateTimeFormat("en-GB", {
-    timeZone: TZ,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit",
-    hour12: false,
-  });
-  const parts = fmt.formatToParts(date);
-  const m = {};
-  for (const p of parts) m[p.type] = p.value;
-  return m; // {year, month, day, hour, minute, second}
+  try {
+    const fmt = new Intl.DateTimeFormat("en-GB", {
+      timeZone: zone,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hour12: false,
+    });
+    const parts = fmt.formatToParts(date);
+    const m = {};
+    for (const p of parts) m[p.type] = p.value;
+    return m; // {year, month, day, hour, minute, second}
+  } catch {
+    // 回退上海
+    const fmt = new Intl.DateTimeFormat("en-GB", {
+      timeZone: DEFAULT_TZ,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hour12: false,
+    });
+    const parts = fmt.formatToParts(date);
+    const m = {};
+    for (const p of parts) m[p.type] = p.value;
+    return m;
+  }
 }
 
+function shanghaiParts(d) { return tzParts(d, getTimezone()); }
+
 // "MM-DD HH:mm:ss" e.g. "08-27 15:07:14"
 export function fmtShanghai(isoOrTs) {
   if (isoOrTs == null) return "-";
@@ -71,3 +98,9 @@ export function nowShanghaiYMDHM() {
 export function fmtTsShanghai(iso) {
   return fmtShanghai(iso);
 }
+
+export { getTimezone };
+// 通用别名（实际已可配置，不再仅限上海）
+export const fmtYMDHMS = fmtShanghaiYMDHMS;
+export const fmtYMDHM = fmtShanghaiYMDHM;
+export const fmtHMS = fmtShanghaiHMS;