feat: 优化调整 Gist 同步逻辑; 增加 GitLab Snippet 同步

backend/src/restful/artifacts.js

@@ -35,13 +35,14 @@ export default function register($app) {
 async function restoreArtifacts(_, res) {
     $.info('开始恢复远程配置...');
     try {
-        const { gistToken } = $.read(SETTINGS_KEY);
+        const { gistToken, syncPlatform } = $.read(SETTINGS_KEY);
         if (!gistToken) {
             return Promise.reject('未设置 GitHub Token！');
         }
         const manager = new Gist({
             token: gistToken,
             key: ARTIFACT_REPOSITORY_KEY,
+            syncPlatform,
         });
 
         try {
@@ -243,13 +244,14 @@ function validateArtifactName(name) {
 }
 
 async function syncToGist(files) {
-    const { gistToken } = $.read(SETTINGS_KEY);
+    const { gistToken, syncPlatform } = $.read(SETTINGS_KEY);
     if (!gistToken) {
         return Promise.reject('未设置 GitHub Token！');
     }
     const manager = new Gist({
         token: gistToken,
         key: ARTIFACT_REPOSITORY_KEY,
+        syncPlatform,
     });
     return manager.upload(files);
 }

backend/src/restful/miscs.js

@@ -1,7 +1,7 @@
 import $ from '@/core/app';
 import { ENV } from '@/vendor/open-api';
 import { failed, success } from '@/restful/response';
-import { updateArtifactStore, updateGitHubAvatar } from '@/restful/settings';
+import { updateArtifactStore, updateAvatar } from '@/restful/settings';
 import resourceCache from '@/utils/resource-cache';
 import {
     GIST_BACKUP_FILE_NAME,
@@ -68,7 +68,7 @@ function getEnv(req, res) {
 
 async function refresh(_, res) {
     // 1. get GitHub avatar and artifact store
-    await updateGitHubAvatar();
+    await updateAvatar();
     await updateArtifactStore();
 
     // 2. clear resource cache
@@ -79,7 +79,7 @@ async function refresh(_, res) {
 async function gistBackup(req, res) {
     const { action } = req.query;
     // read token
-    const { gistToken } = $.read(SETTINGS_KEY);
+    const { gistToken, syncPlatform } = $.read(SETTINGS_KEY);
     if (!gistToken) {
         failed(
             res,
@@ -92,6 +92,7 @@ async function gistBackup(req, res) {
         const gist = new Gist({
             token: gistToken,
             key: GIST_BACKUP_KEY,
+            syncPlatform,
         });
         try {
             let content;

backend/src/restful/settings.js

@@ -18,7 +18,7 @@ async function getSettings(req, res) {
             $.write(settings, SETTINGS_KEY);
         }
 
-        if (!settings.avatarUrl) await updateGitHubAvatar();
+        if (!settings.avatarUrl) await updateAvatar();
         if (!settings.artifactStore) await updateArtifactStore();
 
         success(res, settings);
@@ -43,7 +43,7 @@ async function updateSettings(req, res) {
             ...req.body,
         };
         $.write(newSettings, SETTINGS_KEY);
-        await updateGitHubAvatar();
+        await updateAvatar();
         await updateArtifactStore();
         success(res, newSettings);
     } catch (e) {
@@ -59,28 +59,57 @@ async function updateSettings(req, res) {
     }
 }
 
-export async function updateGitHubAvatar() {
+export async function updateAvatar() {
     const settings = $.read(SETTINGS_KEY);
-    const username = settings.githubUser;
+    const { githubUser: username, syncPlatform } = settings;
     if (username) {
-        try {
-            const data = await $.http
-                .get({
-                    url: `https://api.github.com/users/${username}`,
-                    headers: {
-                        'User-Agent':
-                            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
-                    },
-                })
-                .then((resp) => JSON.parse(resp.body));
-            settings.avatarUrl = data['avatar_url'];
-            $.write(settings, SETTINGS_KEY);
-        } catch (err) {
-            $.error(
-                `Failed to fetch GitHub avatar for User: ${username}. Reason: ${
-                    err.message ?? err
-                }`,
-            );
+        if (syncPlatform === 'gitlab') {
+            try {
+                const data = await $.http
+                    .get({
+                        url: `https://gitlab.com/api/v4/users?username=${encodeURIComponent(
+                            username,
+                        )}`,
+                        headers: {
+                            'User-Agent':
+                                'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
+                        },
+                    })
+                    .then((resp) => JSON.parse(resp.body));
+                settings.avatarUrl = data[0]['avatar_url'].replace(
+                    /(\?|&)s=\d+(&|$)/,
+                    '$1s=160$2',
+                );
+                $.write(settings, SETTINGS_KEY);
+            } catch (err) {
+                $.error(
+                    `Failed to fetch GitLab avatar for User: ${username}. Reason: ${
+                        err.message ?? err
+                    }`,
+                );
+            }
+        } else {
+            try {
+                const data = await $.http
+                    .get({
+                        url: `https://api.github.com/users/${encodeURIComponent(
+                            username,
+                        )}`,
+                        headers: {
+                            'User-Agent':
+                                'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
+                        },
+                    })
+                    .then((resp) => JSON.parse(resp.body));
+                settings.avatarUrl = data['avatar_url'];
+                $.write(settings, SETTINGS_KEY);
+            } catch (err) {
+                $.error(
+                    `Failed to fetch GitHub avatar for User: ${username}. Reason: ${
+                        err.message ?? err
+                    }`,
+                );
+            }
         }
     }
 }
@@ -88,19 +117,21 @@ export async function updateGitHubAvatar() {
 export async function updateArtifactStore() {
     $.log('Updating artifact store');
     const settings = $.read(SETTINGS_KEY);
-    const { gistToken } = settings;
+    const { gistToken, syncPlatform } = settings;
     if (gistToken) {
         const manager = new Gist({
             token: gistToken,
             key: ARTIFACT_REPOSITORY_KEY,
+            syncPlatform,
         });
 
         try {
             const gist = await manager.locate();
-            if (gist?.html_url) {
-                $.log(`找到 Sub-Store Gist: ${gist.html_url}`);
+            const url = gist?.html_url ?? gist?.web_url;
+            if (url) {
+                $.log(`找到 Sub-Store Gist: ${url}`);
                 // 只需要保证 token 是对的, 现在 username 错误只会导致头像错误
-                settings.artifactStore = gist.html_url;
+                settings.artifactStore = url;
                 settings.artifactStoreStatus = 'VALID';
             } else {
                 $.error(`找不到 Sub-Store Gist`);

backend/src/restful/sync.js

@@ -492,9 +492,18 @@ async function syncArtifacts() {
             if (artifact.sync) {
                 artifact.updated = new Date().getTime();
                 // extract real url from gist
-                artifact.url = body.files[
-                    encodeURIComponent(artifact.name)
-                ]?.raw_url.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+                let files = body.files;
+                let isGitLab;
+                if (Array.isArray(files)) {
+                    isGitLab = true;
+                    files = Object.fromEntries(
+                        files.map((item) => [item.path, item]),
+                    );
+                }
+                const url = files[encodeURIComponent(artifact.name)]?.raw_url;
+                artifact.url = isGitLab
+                    ? url
+                    : url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
             }
         }
 
@@ -582,9 +591,16 @@ async function syncArtifact(req, res) {
         });
         artifact.updated = new Date().getTime();
         const body = JSON.parse(resp.body);
-        artifact.url = body.files[
-            encodeURIComponent(artifact.name)
-        ]?.raw_url.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+        let files = body.files;
+        let isGitLab;
+        if (Array.isArray(files)) {
+            isGitLab = true;
+            files = Object.fromEntries(files.map((item) => [item.path, item]));
+        }
+        const url = files[encodeURIComponent(artifact.name)]?.raw_url;
+        artifact.url = isGitLab
+            ? url
+            : url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
         $.write(allArtifacts, ARTIFACTS_KEY);
         success(res, artifact);
     } catch (err) {