build: show public asset

powrrfulyang · Apr 2, 2024 · 0404e49 · 0404e49
1 parent dea0886
commit 0404e49
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 80 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,15 +19,15 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: latest
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
@@ -36,7 +36,7 @@ jobs:
         run: pnpm install
       - name: Get number of CPU cores
         id: cpu-cores
-        uses: SimenB/github-actions-cpu-cores@v1
+        uses: SimenB/github-actions-cpu-cores@v2
       - name: Test
         run: pnpm run test:unit --max-workers ${{ steps.cpu-cores.outputs.count }}
       - name: TSC check
@@ -56,15 +56,15 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/asset/asset.service.ts b/src/asset/asset.service.ts
@@ -7,8 +7,8 @@ import { AZUKI_ASSET_PATH, getBucketAssetPath } from '@/constants/asset_constant
 import { ScheduleType } from '@/enum/ScheduleType';
 import { getEXIF } from '@/lib/exif';
 import { InstagramBotService } from '@/libs/instagram-bot';
-import { PinterestBotService } from '@/libs/pinterest-bot';
 import type { PinterestInterface } from '@/libs/pinterest-bot';
+import { PinterestBotService } from '@/libs/pinterest-bot';
 import { PixivBotService } from '@/libs/pixiv-bot';
 import { ProxyFetchService } from '@/libs/proxy-fetch';
 import { BaseService } from '@/service/base/BaseService';
@@ -30,11 +30,11 @@ import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
 import { calculateHammingDistances, pHash, sha1 } from '@powerfulyang/node-utils';
 import { firstItem, isArray, isNotNull, isNull, lastItem } from '@powerfulyang/utils';
 import { ensureFileSync } from 'fs-extra';
+import fetch from 'node-fetch';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
 import sharp from 'sharp';
 import { DataSource, In, Not, Repository } from 'typeorm';
-import fetch from 'node-fetch';
-import { join } from 'node:path';
 
 @Injectable()
 export class AssetService extends BaseService {
@@ -287,10 +287,13 @@ export class AssetService extends BaseService {
     const undoes: PinterestInterface[] = await this.fetchUndoes(bucketName);
 
     this.logger.info(`[${bucketName}]: undoes count is ${undoes.length}`);
+
+    const botUser = await this.userService.getAssetBotUser();
+
     for (const undo of undoes.reverse()) {
       this.logger.info(`[${bucketName}]: ${undo.id}\n${undo.imgList.join('\n')}`);
       // check if the asset sn is already exist
-      const existingAsset = await this.assetDao.exist({
+      const existingAsset = await this.assetDao.exists({
         where: {
           sn: undo.id,
         },
@@ -305,7 +308,7 @@ export class AssetService extends BaseService {
 
             await this.processAsset(buffer, {
               bucketName: bucket.name,
-              uploadBy: await this.userService.getAssetBotUser(),
+              uploadBy: botUser,
               async: true,
               assetAddition: {
                 sn: undo.id,
@@ -324,7 +327,7 @@ export class AssetService extends BaseService {
   async infiniteQuery(params: InfiniteQueryParams<AuthorizationParams> = {}) {
     const { userIds = [], prevCursor, nextCursor } = params;
     const take = this.formatInfiniteTake(params.take);
-    const BotUser = await this.userService.getAssetBotUser();
+    const { publicBucketIds, publicUserIds } = await this.listPublicAssetSource();
     const cursor = this.generateInfiniteCursor({
       nextCursor,
       prevCursor,
@@ -345,12 +348,20 @@ export class AssetService extends BaseService {
         },
         alt: true,
       },
-      where: {
-        uploadBy: {
-          id: In(userIds.concat(BotUser.id)),
+      where: [
+        {
+          uploadBy: {
+            id: In(userIds.concat(publicUserIds)),
+          },
+          id: cursor,
         },
-        id: cursor,
-      },
+        {
+          bucket: {
+            id: In(publicBucketIds),
+          },
+          id: cursor,
+        },
+      ],
       order: {
         id: 'DESC',
       },

diff --git a/src/fastify/hook.ts b/src/fastify/hook.ts
@@ -34,7 +34,7 @@ export const createFastifyInstance = (): FastifyInstance => {
   fastifyInstance.addHook('onSend', (_request, reply: FastifyReply, _payload, done) => {
     // fix log.middleware.ts can't get response headers
     reply.raw.setHeader('x-request-id', getRequestId() || '');
-    reply.header('x-process-time', `${reply.getResponseTime().toFixed(3)}ms`);
+    reply.header('x-process-time', `${reply.elapsedTime.toFixed(3)}ms`);
     reply.header('x-server-id', HOSTNAME);
     reply.header('x-server-time', DateTimeFormat());
     done();