Merge pull request #227 from xream/feature/snell

feat: Added support for producing snell nodes with reuse and optional obfs

backend/package.json

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

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

@@ -3,6 +3,7 @@ import Clash_Producer from './clash';
 import Stash_Producer from './stash';
 import Loon_Producer from './loon';
 import URI_Producer from './uri';
+import V2Ray_Producer from './v2ray';
 import QX_Producer from './qx';
 
 function JSON_Producer() {
@@ -17,6 +18,7 @@ export default {
     Loon: Loon_Producer(),
     Clash: Clash_Producer(),
     URI: URI_Producer(),
+    V2Ray: V2Ray_Producer(),
     JSON: JSON_Producer(),
     Stash: Stash_Producer(),
 };

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

@@ -215,15 +215,15 @@ function snell(proxy) {
 
     // obfs
     result.appendIfPresent(
-        `,obfs=${proxy['obfs-opts'].mode}`,
+        `,obfs=${proxy['obfs-opts']?.mode}`,
         'obfs-opts.mode',
     );
     result.appendIfPresent(
-        `,obfs-host=${proxy['obfs-opts'].host}`,
+        `,obfs-host=${proxy['obfs-opts']?.host}`,
         'obfs-opts.host',
     );
     result.appendIfPresent(
-        `,obfs-uri=${proxy['obfs-opts'].path}`,
+        `,obfs-uri=${proxy['obfs-opts']?.path}`,
         'obfs-opts.path',
     );
 
@@ -233,6 +233,9 @@ function snell(proxy) {
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
 
+    // reuse
+    result.appendIfPresent(`,reuse=${proxy['reuse']}`, 'reuse');
+
     return result.toString();
 }
 

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

@@ -0,0 +1,12 @@
+/* eslint-disable no-case-declarations */
+import { Base64 } from 'js-base64';
+import URI_Producer from './uri';
+
+const URI = URI_Producer();
+
+export default function V2Ray_Producer() {
+    const type = 'ALL';
+    const produce = (proxies) =>
+        Base64.encode(proxies.map((proxy) => URI.produce(proxy)).join('\n'));
+    return { type, produce };
+}

backend/src/restful/artifacts.js

@@ -131,7 +131,12 @@ async function deleteArtifact(req, res) {
             files[encodeURIComponent(artifact.name)] = {
                 content: '',
             };
-            await syncToGist(files);
+            // 当别的Sub 删了同步订阅 或 gist里面删了 当前设备没有删除 时 无法删除的bug 
+            try {
+                await syncToGist(files);
+            } catch (i) {
+                $.error(`Function syncToGist: ${name} : ${i}`);
+            }
         }
         // delete local cache
         deleteByName(allArtifacts, name);

backend/src/utils/gist.js

@@ -40,6 +40,10 @@ export default class Gist {
     }
 
     async upload(files) {
+        if (Object.keys(files).length === 0) {
+            return Promise.reject('未提供需上传的文件');
+        }
+
         const id = await this.locate();
 
         if (id === -1) {

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

@@ -65,7 +65,7 @@ class ResourceCache {
 }
 
 function getExpiredTime() {
-    console.log($.read(CSR_EXPIRATION_TIME_KEY));
+    // console.log($.read(CSR_EXPIRATION_TIME_KEY));
     if (!$.read(CSR_EXPIRATION_TIME_KEY)) {
         $.write('1728e5', CSR_EXPIRATION_TIME_KEY); // 48 * 3600 * 1000
     }
@@ -88,7 +88,7 @@ function getExpiredTime() {
             '\u53c2\u6570\u4f20\u5165': 'readcachets', // "参数输入"
         };
         let intimed = $.read('#\u8282\u70b9\u7f13\u5b58\u6709\u6548\u671f'); // Loon #节点缓存有效期
-        console.log(intimed);
+        // console.log(intimed);
         if (intimed in loont) {
             expiration = loont[intimed];
             if (expiration === 'readcachets') {

config/Surge-Noability.sgmodule

@@ -0,0 +1,12 @@
+#!name=Sub-Store
+#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用原版
+
+[MITM]
+hostname = %APPEND% sub.store
+
+[Script]
+# 主程序 已经去掉 Sub-Store Core 的参数 [,ability=http-client-policy] 不会爆内存，这个参数在 Surge 非常占用内存； 如果不需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 则可以使用此脚本
+Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120
+Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
+
+Sub-Store Sync=type=cron,cronexp=0 0 * * *,wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js