feat: YAML 依赖更换

Author: xream

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.24.22",
+  "version": "2.25.0",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "packageManager": "pnpm@11.0.9",
@@ -45,8 +45,8 @@
     "ms": "^2.1.3",
     "nanoid": "^3.3.3",
     "semver": "^7.6.3",
-    "static-js-yaml": "^1.0.0",
-    "undici": "^7.4.0"
+    "undici": "^7.4.0",
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
     "@babel/core": "^7.18.0",

backend/pnpm-lock.yaml

@@ -12,6 +12,7 @@ import $ from '@/core/app';
 import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
 import { formatDateTime } from '@/utils';
 import { normalizeAgePublicKeyConfig } from '@/utils/age';
+import { normalizeEditorLanguageConfig } from '@/utils/editor-language';
 
 export default function register($app) {
     if (!$.read(COLLECTIONS_KEY)) $.write({}, COLLECTIONS_KEY);
@@ -81,6 +82,7 @@ function updateCollection(req, res) {
             ...collection,
         };
         normalizeAgePublicKeyConfig(newCol);
+        normalizeEditorLanguageConfig(newCol);
         $.info(`正在更新组合订阅：${name}...`);
 
         if (name !== newCol.name) {
@@ -145,7 +147,10 @@ function getAllCollections(req, res) {
 function replaceCollection(req, res) {
     try {
         const allCols = req.body;
-        allCols.forEach(normalizeAgePublicKeyConfig);
+        allCols.forEach((collection) => {
+            normalizeAgePublicKeyConfig(collection);
+            normalizeEditorLanguageConfig(collection);
+        });
         $.write(allCols, COLLECTIONS_KEY);
         success(res);
     } catch (error) {
@@ -155,6 +160,7 @@ function replaceCollection(req, res) {
 
 function createCollectionItem(collection) {
     normalizeAgePublicKeyConfig(collection);
+    normalizeEditorLanguageConfig(collection);
     $.info(`正在创建组合订阅：${collection.name}`);
     if (/\//.test(collection.name)) {
         throw new RequestInvalidError(

backend/src/restful/collections.js

@@ -24,6 +24,7 @@ import {
 } from '@/restful/age-output';
 import { findShareToken } from '@/restful/token';
 import { maskAgeSecretInUrl, normalizeAgePublicKeyConfig } from '@/utils/age';
+import { normalizeEditorLanguageConfig } from '@/utils/editor-language';
 
 export default function register($app) {
     if (!$.read(FILES_KEY)) $.write([], FILES_KEY);
@@ -381,6 +382,7 @@ function updateFile(req, res) {
             ...file,
         };
         normalizeAgePublicKeyConfig(newFile);
+        normalizeEditorLanguageConfig(newFile);
         $.info(`正在更新文件：${name}...`);
 
         if (name !== newFile.name) {
@@ -442,7 +444,10 @@ function getAllWholeFiles(req, res) {
 function replaceFile(req, res) {
     try {
         const allFiles = req.body;
-        allFiles.forEach(normalizeAgePublicKeyConfig);
+        allFiles.forEach((file) => {
+            normalizeAgePublicKeyConfig(file);
+            normalizeEditorLanguageConfig(file);
+        });
         $.write(allFiles, FILES_KEY);
         success(res);
     } catch (error) {
@@ -455,6 +460,7 @@ function createFileItem(rawFile) {
         ...rawFile,
     };
     normalizeAgePublicKeyConfig(file);
+    normalizeEditorLanguageConfig(file);
     file.name = `${file.name ?? Date.now()}`;
     $.info(`正在创建文件：${file.name}`);
     const allFiles = $.read(FILES_KEY);

backend/src/restful/file.js

@@ -27,6 +27,7 @@ import { success, failed } from './response';
 import $ from '@/core/app';
 import { formatDateTime } from '@/utils';
 import { maskAgeSecretInUrl, normalizeAgePublicKeyConfig } from '@/utils/age';
+import { normalizeEditorLanguageConfig } from '@/utils/editor-language';
 
 if (!$.read(SUBS_KEY)) $.write({}, SUBS_KEY);
 
@@ -292,6 +293,7 @@ function updateSubscription(req, res) {
             ...sub,
         };
         normalizeAgePublicKeyConfig(newSub);
+        normalizeEditorLanguageConfig(newSub);
         $.info(`正在更新订阅： ${name}`);
         // allow users to update the subscription name
         if (name !== sub.name) {
@@ -366,7 +368,10 @@ function getAllSubscriptions(req, res) {
 function replaceSubscriptions(req, res) {
     try {
         const allSubs = req.body;
-        allSubs.forEach(normalizeAgePublicKeyConfig);
+        allSubs.forEach((sub) => {
+            normalizeAgePublicKeyConfig(sub);
+            normalizeEditorLanguageConfig(sub);
+        });
         $.write(allSubs, SUBS_KEY);
         success(res);
     } catch (error) {
@@ -379,6 +384,7 @@ function createSubscriptionItem(rawSub) {
         ...rawSub,
     };
     normalizeAgePublicKeyConfig(sub);
+    normalizeEditorLanguageConfig(sub);
     delete sub.subscriptions;
     $.info(`正在创建订阅： ${sub.name}`);
     if (/\//.test(sub.name)) {

backend/src/restful/subscriptions.js

@@ -0,0 +1,30 @@
+const EDITOR_LANGUAGE_IDS = new Set([
+    'javascript',
+    'json',
+    'json5',
+    'yaml',
+    'ini',
+    'plaintext',
+]);
+
+const LANGUAGE_FIELDS = ['editorLanguage', 'previewLanguage'];
+
+function normalizeEditorLanguageField(target) {
+    if (!target || typeof target !== 'object') return;
+
+    for (const field of LANGUAGE_FIELDS) {
+        if (!EDITOR_LANGUAGE_IDS.has(target[field])) {
+            delete target[field];
+        }
+    }
+}
+
+export function normalizeEditorLanguageConfig(config) {
+    normalizeEditorLanguageField(config);
+
+    if (!Array.isArray(config?.process)) return;
+
+    config.process.forEach((item) => {
+        normalizeEditorLanguageField(item?.args);
+    });
+}

backend/src/utils/editor-language.js

@@ -1,4 +1,9 @@
-import YAML from 'static-js-yaml';
+import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
+
+const DEFAULT_PARSE_OPTIONS = {
+    logLevel: 'error',
+    merge: true,
+};
 
 function retry(fn, content, ...args) {
     try {
@@ -16,17 +21,73 @@ function retry(fn, content, ...args) {
     }
 }
 
+function toSerializable(content) {
+    return JSON.parse(JSON.stringify(content));
+}
+
+function normalizeParseOptions(options) {
+    return {
+        ...DEFAULT_PARSE_OPTIONS,
+        ...(options || {}),
+    };
+}
+
+function normalizeStringifyOptions(options = {}) {
+    const {
+        forceQuotes,
+        lineWidth,
+        noArrayIndent,
+        noRefs,
+        quotingType,
+        sortKeys,
+        ...rest
+    } = options || {};
+    const normalized = { ...rest };
+
+    if (typeof lineWidth === 'number') {
+        normalized.lineWidth = lineWidth <= 0 ? 0 : lineWidth;
+    }
+    if (typeof noArrayIndent === 'boolean') {
+        normalized.indentSeq = !noArrayIndent;
+    }
+    if (typeof noRefs === 'boolean') {
+        normalized.aliasDuplicateObjects = !noRefs;
+    }
+    if (typeof sortKeys !== 'undefined') {
+        normalized.sortMapEntries = sortKeys;
+    }
+    if (quotingType === "'") {
+        normalized.singleQuote = true;
+    } else if (quotingType === '"') {
+        normalized.singleQuote = false;
+    }
+    if (forceQuotes) {
+        normalized.defaultStringType =
+            quotingType === "'" ? 'QUOTE_SINGLE' : 'QUOTE_DOUBLE';
+    }
+
+    return normalized;
+}
+
+function parse(content, options) {
+    return parseYaml(content, normalizeParseOptions(options));
+}
+
+function stringify(content, options) {
+    return stringifyYaml(content, normalizeStringifyOptions(options));
+}
+
 export function safeLoad(content, ...args) {
-    return retry(YAML.safeLoad, JSON.parse(JSON.stringify(content)), ...args);
+    return retry(parse, toSerializable(content), ...args);
 }
 export function load(content, ...args) {
-    return retry(YAML.load, JSON.parse(JSON.stringify(content)), ...args);
+    return retry(parse, toSerializable(content), ...args);
 }
 export function safeDump(content, ...args) {
-    return YAML.safeDump(JSON.parse(JSON.stringify(content)), ...args);
+    return stringify(toSerializable(content), ...args);
 }
 export function dump(content, ...args) {
-    return YAML.dump(JSON.parse(JSON.stringify(content)), ...args);
+    return stringify(toSerializable(content), ...args);
 }
 
 export default {