fix: slow upload step

Author: NeKzor

.github/workflows/CD.yml

@@ -32,20 +32,12 @@ jobs:
         if: github.repository_owner == 'p2sr'
         env:
           DL_SAR_API_TOKEN: ${{ secrets.DL_SAR_API_TOKEN }}
-        run: |
-          SAR_VERSION=$(git describe --tags)
-          curl -X "POST" \
-            -H "Authorization: Bearer $DL_SAR_API_TOKEN" \
-            -H "Content-Type: multipart/form-data" \
-            -F "version=$(echo $SAR_VERSION | awk -F- '{print $1}')" \
-            -F "sar_version=$SAR_VERSION" \
-            -F "system=linux" \
-            -F "commit=$GITHUB_SHA" \
-            -F "branch=$GITHUB_REF_NAME" \
-            -F "count=1" \
-            -F "hashes[0]=$(sha256sum sar.so | cut -d ' ' -f 1)" \
-            -F "files[0]=@sar.so" \
-            "https://dl.sar.portal2.sr/api/v1/upload"
+          RELEASE_BUILD: 1
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const script = require('./.github/workflows/canary.js');
+            return await script({ github, context, core });
   build-win:
     name: Windows Build
     runs-on: windows-2019
@@ -77,25 +69,14 @@ jobs:
           if-no-files-found: error
       - name: Upload to dl.sar.portal2.sr
         if: github.repository_owner == 'p2sr'
-        shell: bash
         env:
           DL_SAR_API_TOKEN: ${{ secrets.DL_SAR_API_TOKEN }}
-        run: |
-          SAR_VERSION=$(git describe --tags)
-          curl -X "POST" \
-            -H "Authorization: Bearer $DL_SAR_API_TOKEN" \
-            -H "Content-Type: multipart/form-data" \
-            -F "version=$(echo $SAR_VERSION | awk -F- '{print $1}')" \
-            -F "sar_version=$SAR_VERSION" \
-            -F "system=windows" \
-            -F "commit=$GITHUB_SHA" \
-            -F "branch=$GITHUB_REF_NAME" \
-            -F "count=2" \
-            -F "hashes[0]=$(sha256sum bin/sar.dll | cut -d ' ' -f 1)" \
-            -F "hashes[1]=$(sha256sum bin/sar.pdb | cut -d ' ' -f 1)" \
-            -F "files[0]=@bin/sar.dll" \
-            -F "files[1]=@bin/sar.pdb" \
-            "https://dl.sar.portal2.sr/api/v1/upload"
+          RELEASE_BUILD: 1
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const script = require('./.github/workflows/canary.js');
+            return await script({ github, context, core });
   release:
     name: Release
     if: github.repository == 'p2sr/SourceAutoRecord'

.github/workflows/CI.yml

@@ -43,20 +43,12 @@ jobs:
         if: github.ref == 'refs/heads/master' && github.repository_owner == 'p2sr'
         env:
           DL_SAR_API_TOKEN: ${{ secrets.DL_SAR_API_TOKEN }}
-        run: |
-          SAR_VERSION=$(git describe --tags)
-          curl -X "POST" \
-            -H "Authorization: Bearer $DL_SAR_API_TOKEN" \
-            -H "Content-Type: multipart/form-data" \
-            -F "version=$(echo $SAR_VERSION | awk -F- '{print $1}')-canary" \
-            -F "sar_version=$SAR_VERSION-canary" \
-            -F "system=linux" \
-            -F "commit=$GITHUB_SHA" \
-            -F "branch=$GITHUB_REF_NAME" \
-            -F "count=1" \
-            -F "hashes[0]=$(sha256sum sar.so | cut -d ' ' -f 1)" \
-            -F "files[0]=@sar.so" \
-            "https://dl.sar.portal2.sr/api/v1/upload"
+          RELEASE_BUILD: 0
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const script = require('./.github/workflows/canary.js');
+            console.log(await script({ github, context, core }));
 
   build-win:
     name: Windows Build
@@ -84,22 +76,11 @@ jobs:
           if-no-files-found: error
       - name: Upload to dl.sar.portal2.sr
         if: github.ref == 'refs/heads/master' && github.repository_owner == 'p2sr'
-        shell: bash
         env:
           DL_SAR_API_TOKEN: ${{ secrets.DL_SAR_API_TOKEN }}
-        run: |
-          SAR_VERSION=$(git describe --tags)
-          curl -X "POST" \
-            -H "Authorization: Bearer $DL_SAR_API_TOKEN" \
-            -H "Content-Type: multipart/form-data" \
-            -F "version=$(echo $SAR_VERSION | awk -F- '{print $1}')-canary" \
-            -F "sar_version=$SAR_VERSION-canary" \
-            -F "system=windows" \
-            -F "commit=$GITHUB_SHA" \
-            -F "branch=$GITHUB_REF_NAME" \
-            -F "count=2" \
-            -F "hashes[0]=$(sha256sum bin/sar.dll | cut -d ' ' -f 1)" \
-            -F "hashes[1]=$(sha256sum bin/sar.pdb | cut -d ' ' -f 1)" \
-            -F "files[0]=@bin/sar.dll" \
-            -F "files[1]=@bin/sar.pdb" \
-            "https://dl.sar.portal2.sr/api/v1/upload"
+          RELEASE_BUILD: 0
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const script = require('./.github/workflows/canary.js');
+            console.log(await script({ github, context, core }));

.github/workflows/canary.js

@@ -0,0 +1,50 @@
+const { readFile } = require("node:fs/promises");
+const { spawnSync } = require("node:child_process");
+const { createHash } = require("node:crypto");
+
+const isWindows = process.platform === "win32";
+const files = isWindows ? ["sar.dll", "sar.pdb"] : ["sar.so"];
+
+// @ts-check
+/** @param {import('@types/github-script').AsyncFunctionArguments} AsyncFunctionArguments */
+module.exports = async ({ context, core }) => {
+  const git = spawnSync("git", ["describe", "--tags"]);
+  if (git.status !== 0) {
+    return git.stderr.toString("utf-8");
+  }
+
+  const SAR_VERSION = git.stdout.toString("utf-8");
+  const release = process.env.release == '1';
+
+  core.info(`Uploading ${release ? 'release' : 'canary'} version ${SAR_VERSION}`);
+
+  const body = new FormData();
+  body.set("version", `${SAR_VERSION.split("-").at(0)}${!release ? '-canary' : ''}`);
+  body.set("sar_version", `${SAR_VERSION}${!release ? '-canary' : ''}`);
+  body.set("system", isWindows ? "windows" : "linux");
+  body.set("commit", context.sha);
+  body.set("branch", context.ref.split("/").at(-1));
+  body.set("count", files.length.toString());
+
+  for (let i = 0; i < files.length; ++i) {
+    const filename = files[i];
+    const file = await readFile(`./bin/${filename}`);
+    body.set(`hashes[${i}]`, createHash("sha256").update(file).digest("hex"));
+    body.set(`files[${i}]`, new Blob([file]), filename);
+  }
+
+  core.debug(JSON.stringify([...body.entries()]));
+
+  const res = await fetch("https://dl.sar.portal2.sr/api/v1/upload", {
+    method: "POST",
+    headers: {
+      "Authorization": `Bearer ${process.env.DL_SAR_API_TOKEN}`,
+      "Content-Type": "multipart/form-data",
+    },
+    body,
+  });
+
+  core.info(res.statusText);
+
+  return await res.text();
+};