fix: force detect unpkg-white-list (#695)

app/core/service/PackageVersionFileService.ts

@@ -28,6 +28,7 @@ import { PackageManagerService } from './PackageManagerService';
 import { CacheAdapter } from '../../common/adapter/CacheAdapter';
 
 const unpkgWhiteListUrl = 'https://github.com/cnpm/unpkg-white-list';
+const CHECK_TIMEOUT = process.env.NODE_ENV === 'test' ? 1 : 60000;
 
 @SingletonProto({
   accessLevel: AccessLevel.PUBLIC,
@@ -46,6 +47,7 @@ export class PackageVersionFileService extends AbstractService {
   @Inject()
   private readonly cacheAdapter: CacheAdapter;
 
+  #unpkgWhiteListCheckTime: number = 0;
   #unpkgWhiteListCurrentVersion: string = '';
   #unpkgWhiteListAllowPackages: Record<string, {
     version: string;
@@ -81,6 +83,11 @@ export class PackageVersionFileService extends AbstractService {
 
   async #updateUnpkgWhiteList() {
     if (!this.config.cnpmcore.enableSyncUnpkgFilesWhiteList) return;
+    if (Date.now() - this.#unpkgWhiteListCheckTime <= CHECK_TIMEOUT) {
+      // check update every 60s
+      return;
+    }
+    this.#unpkgWhiteListCheckTime = Date.now();
     const whiteListScope = '';
     const whiteListPackageName = 'unpkg-white-list';
     const whiteListPackageVersion = await this.packageVersionRepository.findVersionByTag(
@@ -103,7 +110,7 @@ export class PackageVersionFileService extends AbstractService {
     );
   }
 
-  async #checkPackageVersionInUnpkgWhiteList(pkgScope: string, pkgName: string, pkgVersion: string) {
+  async checkPackageVersionInUnpkgWhiteList(pkgScope: string, pkgName: string, pkgVersion: string) {
     if (!this.config.cnpmcore.enableSyncUnpkgFilesWhiteList) return;
     await this.#updateUnpkgWhiteList();
 
@@ -180,7 +187,7 @@ export class PackageVersionFileService extends AbstractService {
     if (!pkg) return files;
 
     // check unpkg white list
-    await this.#checkPackageVersionInUnpkgWhiteList(pkg.scope, pkg.name, pkgVersion.version);
+    await this.checkPackageVersionInUnpkgWhiteList(pkg.scope, pkg.name, pkgVersion.version);
 
     const dirname = `unpkg_${pkg.fullname.replace('/', '_')}@${pkgVersion.version}_${randomUUID()}`;
     const tmpdir = await createTempDir(this.config.dataDir, dirname);

app/port/controller/PackageVersionFileController.ts

@@ -144,6 +144,7 @@ export class PackageVersionFileController extends AbstractController {
       return files;
     }
 
+    await this.packageVersionFileService.checkPackageVersionInUnpkgWhiteList(scope, name, packageVersion.version);
     const file = await this.packageVersionFileService.showPackageVersionFile(packageVersion, path);
     const hasMeta = typeof meta === 'string';
 

app/repository/TaskRepository.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { AccessLevel, SingletonProto, Inject } from '@eggjs/tegg';
 import { ModelConvertor } from './util/ModelConvertor';
 import type { Task as TaskModel } from './model/Task';

app/repository/util/EntityProperty.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { EggProtoImplClass } from '@eggjs/tegg';
 import { ModelConvertorUtil } from './ModelConvertorUtil';
 

config/config.default.ts

@@ -1,6 +1,6 @@
-import assert from 'assert';
-import { randomUUID } from 'crypto';
-import { join } from 'path';
+import { strict as assert } from 'node:assert';
+import { randomUUID } from 'node:crypto';
+import { join } from 'node:path';
 import { EggAppConfig, PowerPartial } from 'egg';
 import OSSClient from 'oss-cnpm';
 import { patchAjv } from '../app/port/typebox';

test/cli/npm/access.test.ts

@@ -1,5 +1,4 @@
-// import assert from 'assert';
-import path from 'path';
+import path from 'node:path';
 import { app } from 'egg-mock/bootstrap';
 import coffee from 'coffee';
 import semver from 'semver';

test/cli/npm/install.test.ts

@@ -1,5 +1,5 @@
-import assert from 'assert';
-import path from 'path';
+import { strict as assert } from 'node:assert';
+import path from 'node:path';
 import { app } from 'egg-mock/bootstrap';
 import coffee from 'coffee';
 import { TestUtil } from '../../../test/TestUtil';

test/common/PackageUtil.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { formatAuthor, formatTarball, hasShrinkWrapInTgz } from '../../app/common/PackageUtil';
 import { TestUtil } from '../TestUtil';
 

test/common/UserUtil.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { randomToken, checkToken } from '../../app/common/UserUtil';
 
 describe('test/common/UserUtil.test.ts', () => {

test/common/adapter/BugVersionStore.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { BugVersionStore } from '../../../app/common/adapter/BugVersionStore';
 import { BugVersion } from '../../../app/core/entity/BugVersion';

test/common/adapter/CacheAdapter.test.ts

@@ -1,5 +1,5 @@
-import assert from 'assert';
-import { setTimeout } from 'timers/promises';
+import { strict as assert } from 'node:assert';
+import { setTimeout } from 'node:timers/promises';
 import { app, mock } from 'egg-mock/bootstrap';
 import { CacheAdapter } from '../../../app/common/adapter/CacheAdapter';
 

test/common/adapter/NpmRegistry.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { NPMRegistry } from '../../../app/common/adapter/NPMRegistry';
 

test/common/adapter/binary/ApiBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { ApiBinary } from '../../../../app/common/adapter/binary/ApiBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/BucketBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { BucketBinary } from '../../../../app/common/adapter/binary/BucketBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/ChromeForTestingBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { ChromeForTestingBinary } from '../../../../app/common/adapter/binary/ChromeForTestingBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/EdgedriverBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { EdgedriverBinary } from '../../../../app/common/adapter/binary/EdgedriverBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/ElectronBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { ElectronBinary } from '../../../../app/common/adapter/binary/ElectronBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/GithubBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { GithubBinary } from '../../../../app/common/adapter/binary/GithubBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/ImageminBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { ImageminBinary } from '../../../../app/common/adapter/binary/ImageminBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/NodeBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { NodeBinary } from '../../../../app/common/adapter/binary/NodeBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/NodePreGypBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { NodePreGypBinary } from '../../../../app/common/adapter/binary/NodePreGypBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/NwjsBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { NwjsBinary } from '../../../../app/common/adapter/binary/NwjsBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/PlaywrightBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { PlaywrightBinary } from '../../../../app/common/adapter/binary/PlaywrightBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/PuppeteerBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { PuppeteerBinary } from '../../../../app/common/adapter/binary/PuppeteerBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/binary/SqlcipherBinary.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { SqlcipherBinary } from '../../../../app/common/adapter/binary/SqlcipherBinary';
 import { TestUtil } from '../../../../test/TestUtil';

test/common/adapter/changesStream/CnpmcoreChangesStream.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { ChangesStreamChange } from '../../../../app/common/adapter/changesStream/AbstractChangesStream';
 import { CnpmcoreChangesStream } from '../../../../app/common/adapter/changesStream/CnpmcoreChangesStream';

test/common/adapter/changesStream/CnpmjsorgChangesStream.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { ChangesStreamChange } from '../../../../app/common/adapter/changesStream/AbstractChangesStream';
 import { CnpmjsorgChangesStream } from '../../../../app/common/adapter/changesStream/CnpmjsorgChangesStream';

test/common/adapter/changesStream/NpmChangesStream.test.ts

@@ -1,5 +1,5 @@
 import { Readable, Duplex } from 'node:stream';
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { ChangesStreamChange } from '../../../../app/common/adapter/changesStream/AbstractChangesStream';
 import { NpmChangesStream } from '../../../../app/common/adapter/changesStream/NpmChangesStream';

test/core/entity/BugVersion.test.ts

@@ -1,5 +1,5 @@
+import { strict as assert } from 'node:assert';
 import { BugVersion } from '../../../app/core/entity/BugVersion';
-import assert from 'assert';
 
 describe('test/core/entity/BugVersion.test.ts', () => {
   const bugVersion = new BugVersion({

test/core/entity/PaddingSemver.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { PaddingSemVer } from '../../../app/core/entity/PaddingSemVer';
 
 describe('test/npm/core/entity/PaddingSemver.test.ts', () => {

test/core/entity/SqlRange.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { SqlRange } from '../../../app/core/entity/SqlRange';
 
 describe('test/npm/core/entity/SqlRange.test.ts', () => {

test/core/event/BugVersionFixHandler.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { BUG_VERSIONS } from '../../../app/common/constants';
 import { CacheService } from '../../../app/core/service/CacheService';

test/core/event/StoreManifest.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../test/TestUtil';
 import { getScopeAndName } from '../../../app/common/PackageUtil';

test/core/service/BinarySyncerService/createTask.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { BinarySyncerService } from '../../../../app/core/service/BinarySyncerService';
 import { BinaryName } from '../../../../config/binaries';

test/core/service/BinarySyncerService/executeTask.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { BinarySyncerService } from '../../../../app/core/service/BinarySyncerService';

test/core/service/BugVersionService/cleanBugVersionPackageCache.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { BugVersionService } from '../../../../app/core/service/BugVersionService';

test/core/service/BugVersionService/fixPackageBugVersion.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { BugVersionService } from '../../../../app/core/service/BugVersionService';

test/core/service/BugVersionService/fixPackageBugVersions.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { BugVersionService } from '../../../../app/core/service/BugVersionService';

test/core/service/ChangesStreamService.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { Readable } from 'node:stream';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../test/TestUtil';

test/core/service/CreateHookTriggerService.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../test/TestUtil';
 import { HookManageService } from '../../../app/core/service/HookManageService';

test/core/service/HookManageService/createHook.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { HookManageService } from '../../../../app/core/service/HookManageService';

test/core/service/HookManageService/deleteHook.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { HookManageService } from '../../../../app/core/service/HookManageService';

test/core/service/HookManageService/getHookByOwnerId.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { HookManageService } from '../../../../app/core/service/HookManageService';

test/core/service/HookManageService/updateHook.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { HookManageService } from '../../../../app/core/service/HookManageService';

test/core/service/HookTriggerService.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { HttpClientRequestOptions } from 'egg';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../test/TestUtil';

test/core/service/PackageManagerService/block.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { PackageManagerService } from '../../../../app/core/service/PackageManagerService';

test/core/service/PackageManagerService/publish.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { PackageManagerService } from '../../../../app/core/service/PackageManagerService';

test/core/service/PackageSyncerService/createTask.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { setTimeout } from 'timers/promises';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';

test/core/service/PackageSyncerService/executeTask.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil';
 import { PackageSyncerService } from '../../../../app/core/service/PackageSyncerService';

test/core/service/PackageSyncerService/findExecuteTask.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { PackageSyncerService } from '../../../../app/core/service/PackageSyncerService';
 import { Task as TaskModel } from '../../../../app/repository/model/Task';

test/core/service/PackageSyncerService/getTaskRegistry.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { PackageSyncerService } from '../../../../app/core/service/PackageSyncerService';
 import { RegistryManagerService } from '../../../../app/core/service/RegistryManagerService';

test/core/service/PackageVersionService.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mock } from 'egg-mock/bootstrap';
 import npa from 'npm-package-arg';
 

test/core/service/RegistryManagerService/index.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { RegistryManagerService } from '../../../../app/core/service/RegistryManagerService';
 import { RegistryType } from '../../../../app/common/enum/Registry';

test/core/service/ScopeManagerService/index.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { ScopeManagerService } from '../../../../app/core/service/ScopeManagerService';
 

test/core/service/TaskService/findExecuteTask.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app, mm } from 'egg-mock/bootstrap';
 import { TaskService } from '../../../../app/core/service/TaskService';
 import { PackageSyncerService } from '../../../../app/core/service/PackageSyncerService';

test/core/util/EntityUtil.test.ts

@@ -1,5 +1,5 @@
+import { strict as assert } from 'node:assert';
 import { EntityUtil } from '../../../app/core/util/EntityUtil';
-import assert from 'assert';
 
 describe('test/core/util/EntityUtil.test.ts', () => {
   describe('convertPageOptionsToLimitOption', () => {

test/infra/QueueAdapter.test.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'node:assert';
 import { app } from 'egg-mock/bootstrap';
 import { RedisQueueAdapter } from '../../app/infra/QueueAdapter';