🐞 fix(subscriptions): negative usage flow

.github/workflows/main.yml

@@ -48,5 +48,7 @@ jobs:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: |
             ./backend/sub-store.min.js
-            ./backend/dist/cron-sync-artifacts.min.js
+            ./backend/dist/sub-store-0.min.js
+            ./backend/dist/sub-store-1.min.js
             ./backend/dist/sub-store-parser.loon.min.js
+            ./backend/dist/cron-sync-artifacts.min.js

backend/package.json

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

backend/src/products/cron-sync-artifacts.js

@@ -51,12 +51,14 @@ async function doSync() {
         const body = JSON.parse(resp.body);
 
         for (const artifact of allArtifacts) {
-            artifact.updated = new Date().getTime();
-            // extract real url from gist
-            artifact.url = body.files[artifact.name].raw_url.replace(
-                /\/raw\/[^/]*\/(.*)/,
-                '/raw/$1',
-            );
+            if (artifact.sync) {
+                artifact.updated = new Date().getTime();
+                // extract real url from gist
+                artifact.url = body.files[artifact.name].raw_url.replace(
+                    /\/raw\/[^/]*\/(.*)/,
+                    '/raw/$1',
+                );
+            }
         }
 
         $.write(allArtifacts, ARTIFACTS_KEY);

backend/src/restful/subscriptions.js

@@ -66,8 +66,12 @@ async function getFlowInfo(req, res) {
         }
 
         // unit is KB
-        const upload = Number(flowHeaders.match(/upload=(\d+)/)[1]);
-        const download = Number(flowHeaders.match(/download=(\d+)/)[1]);
+        const uploadMatch = flowHeaders.match(/upload=(-?)(\d+)/)
+        const upload = Number(uploadMatch[1] + uploadMatch[2]);
+
+        const downloadMatch = flowHeaders.match(/download=(-?)(\d+)/)
+        const download = Number(downloadMatch[1] + downloadMatch[2]);
+
         const total = Number(flowHeaders.match(/total=(\d+)/)[1]);
 
         // optional expire timestamp

backend/src/restful/sync.js

@@ -201,12 +201,14 @@ async function syncAllArtifacts(_, res) {
         const body = JSON.parse(resp.body);
 
         for (const artifact of allArtifacts) {
-            artifact.updated = new Date().getTime();
-            // extract real url from gist
-            artifact.url = body.files[artifact.name].raw_url.replace(
-                /\/raw\/[^/]*\/(.*)/,
-                '/raw/$1',
-            );
+            if (artifact.sync) {
+                artifact.updated = new Date().getTime();
+                // extract real url from gist
+                artifact.url = body.files[artifact.name].raw_url.replace(
+                    /\/raw\/[^/]*\/(.*)/,
+                    '/raw/$1',
+                );
+            }
         }
 
         $.write(allArtifacts, ARTIFACTS_KEY);

config/Loon.plugin

@@ -9,6 +9,7 @@
 hostname=sub.store
 
 [Script]
-http-request https?:\/\/sub\.store script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store.min.js, requires-body=true, timeout=120, tag=Sub-Store
+http-request ^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, tag=Sub-Store Core
+http-request https?:\/\/sub\.store script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js, requires-body=true, timeout=120, tag=Sub-Store Simple
 
 cron "0 0 * * *" script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js, tag=Sub-Store Sync

config/QX.snippet

@@ -1,3 +1,4 @@
 hostname=sub.store
 
-^https?:\/\/sub\.store url script-analyze-echo-response https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store.min.js
+^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))) url script-analyze-echo-response https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js
+^https?:\/\/sub\.store url script-analyze-echo-response https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js

config/Stash.stoverride

@@ -5,8 +5,13 @@ http:
   mitm:
     - sub.store
   script:
+    - match: ^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info)))
+      name: sub-store-1
+      type: request
+      require-body: true
+      timeout: 120
     - match: ^https?:\/\/sub\.store
-      name: sub-store
+      name: sub-store-0
       type: request
       require-body: true
       timeout: 120
@@ -18,8 +23,12 @@ cron:
       timeout: 120
 
 script-providers:
-  sub-store:
-    url: https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store.min.js
+  sub-store-0:
+    url: https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js
+    interval: 86400
+
+  sub-store-1:
+    url: https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js
     interval: 86400
 
   cron-sync-artifacts:

config/Surge.sgmodule

@@ -4,6 +4,7 @@
 hostname=%APPEND% sub.store
 
 [Script]
-Sub-Store = type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store.min.js,requires-body=true,timeout=120,max-size=131072,ability=http-client-policy
+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,ability=http-client-policy
+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
+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