feat: Surge 输出会判断 HTTP 是否 headers 字段

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.16.59",
+  "version": "2.16.63",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "scripts": {

backend/src/core/proxy-utils/processors/index.js

@@ -379,19 +379,22 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
                         throw new Error('patch is not an object');
                     output.$content = ProxyUtils.yaml.safeDump(
                         deepMerge(
-                            config || {
-                                proxies: await produceArtifact({
-                                    type:
-                                        output?.$file?.sourceType ||
-                                        'collection',
-                                    name: output?.$file?.sourceName,
-                                    platform: 'mihomo',
-                                    produceType: 'internal',
-                                    produceOpts: {
-                                        'delete-underscore-fields': true,
-                                    },
-                                }),
-                            },
+                            config ||
+                                (output?.$file?.sourceType === 'none'
+                                    ? {}
+                                    : {
+                                          proxies: await produceArtifact({
+                                              type:
+                                                  output?.$file?.sourceType ||
+                                                  'collection',
+                                              name: output?.$file?.sourceName,
+                                              platform: 'mihomo',
+                                              produceType: 'internal',
+                                              produceOpts: {
+                                                  'delete-underscore-fields': true,
+                                              },
+                                          }),
+                                      }),
                             patch,
                         ),
                     );
@@ -430,7 +433,7 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
                                             console.log(e.message ?? e);
                                         }
                                     }
-                                    $content = ProxyUtils.yaml.safeDump(await main(config || {
+                                    $content = ProxyUtils.yaml.safeDump(await main(config || ($file.sourceType === 'none' ? {} : {
                                         proxies: await produceArtifact({
                                             type: $file.sourceType || 'collection',
                                             name: $file.sourceName,
@@ -440,7 +443,7 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
                                                 'delete-underscore-fields': true
                                             }
                                         }),
-                                    }))
+                                    })))
                                 }
                             } else {
                                 ${script}

backend/src/core/proxy-utils/producers/surge.js

@@ -433,6 +433,9 @@ function ssh(proxy) {
     return result.toString();
 }
 function http(proxy) {
+    if (proxy.headers && Object.keys(proxy.headers).length > 0) {
+        throw new Error(`headers is unsupported`);
+    }
     const result = new Result(proxy);
     const type = proxy.tls ? 'https' : 'http';
     result.append(`${proxy.name}=${type},${proxy.server},${proxy.port}`);

backend/src/restful/index.js

@@ -2,7 +2,7 @@ import express from '@/vendor/express';
 import $ from '@/core/app';
 import migrate from '@/utils/migration';
 import download from '@/utils/download';
-import { syncArtifacts } from '@/restful/sync';
+import { syncArtifacts, produceArtifact } from '@/restful/sync';
 import { gistBackupAction } from '@/restful/miscs';
 import { TOKENS_KEY } from '@/constants';
 
@@ -75,6 +75,39 @@ export default function serve() {
                 // 'Asia/Shanghai' // timeZone
             );
         }
+        // 格式: 0 */2 * * *,sub,a;0 */3 * * *,col,b
+        // 每 2 小时处理一次单条订阅 a, 每 3 小时处理一次组合订阅 b
+        const produce_cron = eval('process.env.SUB_STORE_PRODUCE_CRON');
+        if (produce_cron) {
+            $.info(`[PRODUCE CRON] ${produce_cron} enabled`);
+            const { CronJob } = eval(`require("cron")`);
+            produce_cron.split(/\s*;\s*/).map((item) => {
+                const [cron, type, name] = item.split(/\s*,\s*/);
+                new CronJob(
+                    cron.trim(),
+                    async function () {
+                        try {
+                            $.info(
+                                `[PRODUCE CRON] ${type} ${name} ${cron} started`,
+                            );
+                            await produceArtifact({ type, name });
+                            $.info(
+                                `[PRODUCE CRON] ${type} ${name} ${cron} finished`,
+                            );
+                        } catch (e) {
+                            $.error(
+                                `[PRODUCE CRON] ${type} ${name} ${cron} error: ${
+                                    e.message ?? e
+                                }`,
+                            );
+                        }
+                    }, // onTick
+                    null, // onComplete
+                    true, // start
+                    // 'Asia/Shanghai' // timeZone
+                );
+            });
+        }
         const backend_download_cron = eval(
             'process.env.SUB_STORE_BACKEND_DOWNLOAD_CRON',
         );

backend/src/restful/sync.js

@@ -43,7 +43,7 @@ async function produceArtifact({
 }) {
     platform = platform || 'JSON';
 
-    if (type === 'subscription') {
+    if (['subscription', 'sub'].includes(type)) {
         let sub;
         if (name) {
             const allSubs = $.read(SUBS_KEY);
@@ -190,7 +190,7 @@ async function produceArtifact({
         }
         // produce
         return ProxyUtils.produce(proxies, platform, produceType, produceOpts);
-    } else if (type === 'collection') {
+    } else if (['collection', 'col'].includes(type)) {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const collection = findByName(allCols, name);

backend/src/utils/script-resource-cache.js

@@ -24,7 +24,7 @@ class ResourceCache {
         this._cleanup();
     }
 
-    _cleanup() {
+    _cleanup(prefix, expires) {
         // clear obsolete cached resource
         let clear = false;
         Object.entries(this.resourceCache).forEach((entry) => {
@@ -35,7 +35,11 @@ class ResourceCache {
                 $.delete(`#${id}`);
                 clear = true;
             }
-            if (new Date().getTime() - updated.time > this.expires) {
+            if (
+                new Date().getTime() - updated.time >
+                    (expires ?? this.expires) ||
+                (prefix && id.startsWith(prefix))
+            ) {
                 delete this.resourceCache[id];
                 clear = true;
             }
@@ -52,10 +56,15 @@ class ResourceCache {
         $.write(JSON.stringify(this.resourceCache), SCRIPT_RESOURCE_CACHE_KEY);
     }
 
-    get(id) {
+    get(id, expires, remove) {
         const updated = this.resourceCache[id] && this.resourceCache[id].time;
-        if (updated && new Date().getTime() - updated <= this.expires) {
-            return this.resourceCache[id].data;
+        if (updated) {
+            if (new Date().getTime() - updated <= (expires ?? this.expires))
+                return this.resourceCache[id].data;
+            if (remove) {
+                delete this.resourceCache[id];
+                this._persist();
+            }
         }
         return null;
     }

scripts/demo.js

@@ -52,8 +52,32 @@ function operator(proxies = [], targetPlatform, context) {
   // scriptResourceCache 缓存
   // 可参考 https://t.me/zhetengsha/1003
   // const cache = scriptResourceCache
-  // cache.set(id, data)
-  // cache.get(id)
+  // 设置
+  // cache.set('a:1', 1)
+  // cache.set('a:2', 2)
+  // 获取
+  // cache.get('a:1')
+  // 支持第二个参数: 自定义过期时间
+  // 支持第三个参数: 是否删除过期项
+  // cache.get('a:2', 1000, true)
+
+  // 清理
+  // cache._cleanup()
+  // 支持第一个参数: 匹配前缀的项也一起删除
+  // 支持第二个参数: 自定义过期时间
+  // cache._cleanup('a:', 1000)
+
+  // 关于缓存时长
+
+  // 拉取 Sub-Store 订阅时, 会自动拉取远程订阅
+
+  // 远程订阅缓存是 1 小时, 缓存的唯一 key 为 url+ user agent. 可通过前端的刷新按钮刷新缓存. 或使用参数 noCache 来禁用缓存. 例: 内部配置订阅链接时使用 http://a.com#noCache, 外部使用 sub-store 链接时使用 https://sub.store/download/1?noCache=true
+
+  // 当使用相关脚本时, 若在对应的脚本中使用参数开启缓存, 可设置持久化缓存 sub-store-csr-expiration-time 的值来自定义默认缓存时长, 默认为 172800000 (48 * 3600 * 1000, 即 48 小时)
+
+  // 🎈Loon 可在插件中设置
+
+  // 其他平台同理, 持久化缓存数据在 JSON 里
 
   // ProxyUtils 为节点处理工具
   // 可参考 https://t.me/zhetengsha/1066