feat: redis weak (#426)

> manifest 读取场景弱依赖 redis * 添加 try-catch 防止 redis 请求失败导致读取失败 * 读取完成后异步设置缓存 ---- > Redis dependency from manifest with weak scene dependence: * Adds try-catch to prevent reading failure from redis interruption. * Asynchronously sets cache after reading is complete.
cnpm · Mar 20, 2023 · 300f0e4 · 300f0e4
1 parent 5877f71
commit 300f0e4
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 21 deletions.
diff --git a/app/port/controller/package/ShowPackageController.ts b/app/port/controller/package/ShowPackageController.ts
@@ -31,28 +31,35 @@ export class ShowPackageController extends AbstractController {
     const isSync = isSyncWorkerRequest(ctx);
     const abbreviatedMetaType = 'application/vnd.npm.install-v1+json';
     const isFullManifests = ctx.accepts([ 'json', abbreviatedMetaType ]) !== abbreviatedMetaType;
+
     // handle cache
-    const cacheEtag = await this.cacheService.getPackageEtag(fullname, isFullManifests);
-    if (!isSync && cacheEtag) {
-      let requestEtag = ctx.request.get('if-none-match');
-      if (requestEtag.startsWith('W/')) {
-        requestEtag = requestEtag.substring(2);
-      }
-      if (requestEtag === cacheEtag) {
-        // make sure CDN cache header set here
-        this.setCDNHeaders(ctx);
-        // match etag, set status 304
-        ctx.status = 304;
-        return;
-      }
-      // get cache pkg data
-      const cacheBytes = await this.cacheService.getPackageManifests(fullname, isFullManifests);
-      if (cacheBytes && cacheBytes.length > 0) {
-        ctx.set('etag', `W/${cacheEtag}`);
-        ctx.type = 'json';
-        this.setCDNHeaders(ctx);
-        return cacheBytes;
+    // fallback to db when cache error
+    try {
+      const cacheEtag = await this.cacheService.getPackageEtag(fullname, isFullManifests);
+      if (!isSync && cacheEtag) {
+        let requestEtag = ctx.request.get('if-none-match');
+        if (requestEtag.startsWith('W/')) {
+          requestEtag = requestEtag.substring(2);
+        }
+        if (requestEtag === cacheEtag) {
+          // make sure CDN cache header set here
+          this.setCDNHeaders(ctx);
+          // match etag, set status 304
+          ctx.status = 304;
+          return;
+        }
+        // get cache pkg data
+        const cacheBytes = await this.cacheService.getPackageManifests(fullname, isFullManifests);
+        if (cacheBytes && cacheBytes.length > 0) {
+          ctx.set('etag', `W/${cacheEtag}`);
+          ctx.type = 'json';
+          this.setCDNHeaders(ctx);
+          return cacheBytes;
+        }
       }
+    } catch (e) {
+      this.logger.error(e);
+      this.logger.error('[ShowPackageController.show:error] get cache error, ignore');
     }
 
     // handle cache miss
@@ -78,7 +85,9 @@ export class ShowPackageController extends AbstractController {
     // only set cache with normal request
     // sync request response with no bug version fixed
     if (!isSync) {
-      await this.cacheService.savePackageEtagAndManifests(fullname, isFullManifests, etag, cacheBytes);
+      ctx.runInBackground(async () => {
+        await this.cacheService.savePackageEtagAndManifests(fullname, isFullManifests, etag, cacheBytes);
+      });
     }
 
     // set etag

diff --git a/test/port/controller/package/ShowPackageController.test.ts b/test/port/controller/package/ShowPackageController.test.ts
@@ -62,6 +62,35 @@ describe('test/port/controller/package/ShowPackageController.test.ts', () => {
       assert.match(res.body.rev, /^\d+\-\w{24}$/);
     });
 
+    describe('should fallback when cache error', async () => {
+      it('should fallback when get etag error', async () => {
+        app.mockLog();
+        mock(CacheService.prototype, 'getPackageEtag', async () => {
+          throw new Error('mock get etag error');
+        });
+        await app.httpRequest()
+          .get(`/${name}`)
+          .expect(200);
+
+        app.expectLog(/ShowPackageController.show:error/);
+      });
+
+      it('should fallback when get getPackageManifests error', async () => {
+        app.mockLog();
+        mock(CacheService.prototype, 'getPackageEtag', async () => {
+          return 'mock-etag';
+        });
+        mock(CacheService.prototype, 'getPackageManifests', async () => {
+          throw new Error('mock get etag error');
+        });
+        await app.httpRequest()
+          .get(`/${name}`)
+          .expect(200);
+
+        app.expectLog(/ShowPackageController.show:error/);
+      });
+    });
+
     it('should show one package with full manifests', async () => {
       mock(app.config.cnpmcore, 'syncMode', 'all');
       const res = await app.httpRequest()