@astralyn/sash 0.1.1 → 0.1.2

package/dist/http.js

@@ -87,6 +87,7 @@ export async function fetchWithRetry(url, opts = {}) {
     const bodyInactivityTimeoutMs = positiveTimeout(opts.bodyInactivityTimeoutMs, 30_000, "bodyInactivityTimeoutMs");
     const deadlineMs = positiveTimeout(opts.deadlineMs, 60_000, "deadlineMs");
     const deadline = new AbortController();
+    const signal = opts.signal ? AbortSignal.any([deadline.signal, opts.signal]) : deadline.signal;
     const deadlineTimer = setTimeout(() => {
         deadline.abort(new Error(`HTTP request deadline exceeded after ${deadlineMs}ms`));
     }, deadlineMs);
@@ -108,7 +109,7 @@ export async function fetchWithRetry(url, opts = {}) {
                     body: opts.body,
                     headersTimeout: headersTimeoutMs,
                     bodyTimeout: bodyInactivityTimeoutMs,
-                    signal: deadline.signal,
+                    signal,
                     dispatcher: pickDispatcher(opts),
                 });
                 if (RETRYABLE_STATUS.has(res.statusCode) && attempt < attempts) {
@@ -166,10 +167,10 @@ export async function fetchWithRetry(url, opts = {}) {
             }
             catch (err) {
                 lastErr = err;
-                if (deadline.signal.aborted || attempt === attempts)
+                if (signal.aborted || attempt === attempts)
                     break;
-                await sleep(Math.min(4_000, 300 * 2 ** (attempt - 1)) + Math.random() * 200, deadline.signal);
-                if (deadline.signal.aborted)
+                await sleep(Math.min(4_000, 300 * 2 ** (attempt - 1)) + Math.random() * 200, signal);
+                if (signal.aborted)
                     break;
             }
         }
@@ -202,6 +203,7 @@ export async function downloadToFile(url, dest, opts) {
     const deadlineMs = positiveTimeout(opts.deadlineMs, 15 * 60_000, "deadlineMs");
     const maxRedirects = 5;
     const deadline = new AbortController();
+    const signal = opts.signal ? AbortSignal.any([deadline.signal, opts.signal]) : deadline.signal;
     const deadlineTimer = setTimeout(() => {
         deadline.abort(new Error(`Download deadline exceeded after ${deadlineMs}ms`));
     }, deadlineMs);
@@ -217,7 +219,7 @@ export async function downloadToFile(url, dest, opts) {
                 headers: { "user-agent": USER_AGENT, ...opts.headers },
                 headersTimeout: 30_000,
                 bodyTimeout: stallMs,
-                signal: deadline.signal,
+                signal,
                 dispatcher,
             });
             const isRedirect = res.statusCode >= 300 && res.statusCode < 400 && Boolean(res.headers.location);

package/dist/mihomo-config.js

@@ -227,7 +227,7 @@ export function resolveSubscriptionRedirect(initial, current, location) {
     }
     return target;
 }
-export async function fetchSubscriptionProfile(url) {
+export async function fetchSubscriptionProfile(url, signal) {
     let initial;
     try {
         initial = new URL(url);
@@ -247,6 +247,7 @@ export async function fetchSubscriptionProfile(url) {
             throw new Error(`Subscription fetch deadline exceeded after ${PROFILE_FETCH_DEADLINE_MS}ms`);
         }
         res = await fetchWithRetry(current.href, {
+            signal,
             attempts: 3,
             deadlineMs: remainingDeadlineMs,
             manualRedirect: true,

package/dist/paths.js

@@ -24,27 +24,25 @@ export function sashRoot() {
 }
 export function sashLayout(root = sashRoot()) {
     const exeName = process.platform === "win32" ? "mihomo.exe" : "mihomo";
+    const userControlDir = process.platform === "win32"
+        ? path.join(envPathOr(path.join(os.homedir(), "AppData", "Local"), process.env.LOCALAPPDATA), "Sash")
+        : path.join(root, "state");
     return {
         root,
         binDir: path.join(root, "bin"),
         coreExe: path.join(root, "bin", exeName),
-        configFile: path.join(root, "config.yaml"),
+        configFile: path.join(root, "runtime", "config.yaml"),
         settingsFile: path.join(root, "sash.json"),
         profilesDir: path.join(root, "profiles"),
-        profilesIndexFile: path.join(root, "profiles", "index.json"),
         uiDir: path.join(root, "ui"),
         stateDir: path.join(root, "state"),
         pidFile: path.join(root, "state", "sash.pid"),
         daemonPidFile: path.join(root, "state", "sashd.pid"),
         daemonLeaseFile: path.join(root, "state", "sashd.lock"),
         daemonStartLockFile: path.join(root, "state", "sashd-start.lock"),
-        runtimeOperationLockFile: path.join(root, "state", "runtime.lock"),
-        mutationLockFile: path.join(root, "state", "mutation.lock"),
-        settingsLockFile: path.join(root, "state", "settings.lock"),
         systemProxyStateFile: path.join(root, "state", "system-proxy.json"),
-        managedStateTransactionFile: path.join(root, "state", "managed-state-transaction.json"),
+        systemProxyLockFile: path.join(userControlDir, "system-proxy.lock"),
         installFile: path.join(root, "state", "install.json"),
-        coreInstallTransactionFile: path.join(root, "state", "core-install-transaction.json"),
         coreUpdateTransactionFile: path.join(root, "state", "core-update-transaction.json"),
         logsDir: path.join(root, "logs"),
         coreLogFile: path.join(root, "logs", "mihomo.log"),

package/dist/profile-model.js

@@ -0,0 +1,87 @@
+import { isCanonicalIsoTimestamp, isPlainObject } from "./json-shape.js";
+export const DEFAULT_PROFILE_INTERVAL_HOURS = 24;
+export const MAX_PROFILE_INTERVAL_HOURS = 24 * 365;
+export function parseProfilesIndex(value) {
+    if (!isPlainObject(value) ||
+        Object.keys(value).some((key) => key !== "activeId" && key !== "profiles") ||
+        !Array.isArray(value.profiles) ||
+        (value.activeId !== null && typeof value.activeId !== "string"))
+        throw new Error("Profiles index has an invalid shape");
+    const profiles = value.profiles.map(parseProfileMeta);
+    const ids = new Set(profiles.map((profile) => profile.id));
+    if (ids.size !== profiles.length)
+        throw new Error("Profiles index has duplicate profile ids");
+    if (value.activeId !== null && !ids.has(value.activeId))
+        throw new Error("Selected profile is missing");
+    return { activeId: value.activeId, profiles };
+}
+export function parseProfileMeta(item) {
+    if (!isPlainObject(item) ||
+        typeof item.id !== "string" ||
+        !/^[0-9]+$/.test(item.id) ||
+        typeof item.revision !== "number" ||
+        !Number.isSafeInteger(item.revision) ||
+        item.revision < 1 ||
+        typeof item.name !== "string" ||
+        !item.name.trim() ||
+        item.name.length > 120 ||
+        typeof item.url !== "string" ||
+        typeof item.intervalHours !== "number" ||
+        !Number.isSafeInteger(item.intervalHours) ||
+        item.intervalHours < 0 ||
+        item.intervalHours > MAX_PROFILE_INTERVAL_HOURS ||
+        !isCanonicalIsoTimestamp(item.createdAt) ||
+        !isCanonicalIsoTimestamp(item.updatedAt))
+        throw new Error("Profiles index has invalid profile metadata");
+    if (item.url) {
+        const url = new URL(item.url);
+        if (url.protocol !== "https:" && url.protocol !== "http:")
+            throw new Error("Invalid profile URL");
+    }
+    let subInfo;
+    if (item.subInfo !== undefined) {
+        const info = item.subInfo;
+        if (!isPlainObject(info) ||
+            typeof info.upload !== "number" ||
+            !Number.isFinite(info.upload) ||
+            info.upload < 0 ||
+            typeof info.download !== "number" ||
+            !Number.isFinite(info.download) ||
+            info.download < 0 ||
+            typeof info.total !== "number" ||
+            !Number.isFinite(info.total) ||
+            info.total < 0 ||
+            (info.expire !== undefined &&
+                (typeof info.expire !== "number" || !Number.isFinite(info.expire) || info.expire < 0)))
+            throw new Error("Invalid subscription quota");
+        subInfo = {
+            upload: info.upload,
+            download: info.download,
+            total: info.total,
+            ...(typeof info.expire === "number" ? { expire: info.expire } : {}),
+        };
+    }
+    if (item.homePage !== undefined) {
+        if (typeof item.homePage !== "string")
+            throw new Error("Invalid profile home page");
+        const url = new URL(item.homePage);
+        if (url.protocol !== "https:" && url.protocol !== "http:")
+            throw new Error("Invalid profile home page");
+    }
+    if (item.lastError !== undefined &&
+        (typeof item.lastError !== "string" || item.lastError.length > 300)) {
+        throw new Error("Invalid profile update error");
+    }
+    return {
+        id: item.id,
+        revision: item.revision,
+        name: item.name,
+        url: item.url,
+        intervalHours: item.intervalHours,
+        createdAt: item.createdAt,
+        updatedAt: item.updatedAt,
+        ...(subInfo ? { subInfo } : {}),
+        ...(typeof item.homePage === "string" ? { homePage: item.homePage } : {}),
+        ...(typeof item.lastError === "string" ? { lastError: item.lastError } : {}),
+    };
+}