Merge pull request #131 from mebtte/beta

stop timer

Dockerfile

@@ -4,5 +4,5 @@ COPY build/cicada /bin/cicada
 ENTRYPOINT ["/bin/cicada"]
 
 LABEL org.opencontainers.image.title="cicada" \
-  org.opencontainers.image.authors="mebtte<hi@mebtte.com>" \
+  org.opencontainers.image.authors="mebtte<i@mebtte.com>" \
   org.opencontainers.image.url="https://github.com/mebtte/cicada"

apps/cli/src/commands/import_music.ts

@@ -33,7 +33,7 @@ let ignored = 0;
 
 /**
  * 检查音乐是否已存在
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 async function checkMusicExist({
   singers,
@@ -90,7 +90,7 @@ async function importFile(
 
   /**
    * 检查文件类型
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   const ft = await fileType.fromFile(filepath);
   const { acceptTypes } = ASSET_TYPE_MAP[AssetType.MUSIC];
@@ -207,7 +207,7 @@ async function importDirectory(
 ) {
   /**
    * 过滤隐藏文件
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   const files = (await fs.readdir(directory)).filter((f) => !f.startsWith('.'));
   for (const file of files) {
@@ -247,7 +247,7 @@ async function importMusic({
 
   /**
    * 检查 uid 是否存在
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   const user = await getUserById(uid, [UserProperty.ID]);
   if (!user) {

apps/cli/src/commands/start_server/api_app/controllers/admin_delete_user.ts

@@ -63,7 +63,7 @@ export default async (ctx: Context) => {
   /**
    * 1. 删除数据库相关记录, 注意外键依赖顺序
    * 2. 转移所有权
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   const musicbillList = await getUserMusicbillList(id, [MusicbillProperty.ID]);
   await Promise.all([

apps/cli/src/commands/start_server/api_app/controllers/create_music.ts

@@ -32,7 +32,7 @@ export default async (ctx: Context) => {
     name.trim() !== name ||
     typeof singerIds !== 'string' ||
     !singerIds.length ||
-    // @ts-expect-error
+    // @ts-expect-error: known type
     !MUSIC_TYPES.includes(type) ||
     typeof asset !== 'string'
   ) {
@@ -54,7 +54,7 @@ export default async (ctx: Context) => {
 
   /**
    * 0 表示无限制
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   if (ctx.user.createMusicMaxAmountPerDay !== 0) {
     const now = day();

apps/cli/src/commands/start_server/api_app/controllers/create_musicbill.ts

@@ -17,7 +17,7 @@ export default async (ctx: Context) => {
 
   /**
    * 0 表示无限制
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   if (ctx.user.musicbillMaxAmount !== 0) {
     const musicbillList = await getUserMusicbillList(ctx.user.id, [

apps/cli/src/commands/start_server/api_app/controllers/delete_musicbill_shared_user.ts

@@ -12,7 +12,7 @@ import { Context } from '../constants';
 /**
  * 所有者可以删除任何人
  * 共享者只能删除自己
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 export default async (ctx: Context) => {
   const { musicbillId, userId } = ctx.query as {

apps/cli/src/commands/start_server/api_app/controllers/get_musicbill.ts

@@ -34,7 +34,7 @@ export default async (ctx: Context) => {
    * 1. 乐单是否存在
    * 2. 是否乐单创建者
    * 3. 是否拥有共享乐单
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   const musicbill = await getDB().get<
     Pick<
@@ -130,13 +130,11 @@ export default async (ctx: Context) => {
     [id],
   );
 
-  const musicIdMapSingers: {
-    [key: string]: {
+  const musicIdMapSingers: Record<string, {
       id: string;
       name: string;
       aliases: string[];
-    }[];
-  } = {};
+    }[]> = {};
   if (musicList.length) {
     const allSingerList = await getSingerListInMusicIds(
       Array.from(new Set(musicList.map((m) => m.id))),

apps/cli/src/commands/start_server/api_app/router.ts

@@ -103,7 +103,7 @@ router.delete('/2fa', disable2FA); // disable 2FA
 
 /**
  * 管理员
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 router.post('/admin/user', adminAuthorize, parseBody, adminCreateUser); // 创建用户
 router.put('/admin/user', adminAuthorize, parseBody, adminUpdateUser); // 更新用户

apps/cli/src/commands/start_server/asset_app/controllers/get_image.ts

@@ -44,7 +44,7 @@ async function getCover(
       /**
        * 如果图片本身尺寸小于需要的尺寸
        * 直接写入缓存
-       * @author mebtte<hi@mebtte.com>
+       * @author mebtte<i@mebtte.com>
        */
       if (cover.bitmap.width > sizeNumber) {
         await new Promise<void>((resolve, reject) =>
@@ -57,13 +57,13 @@ async function getCover(
         await fsPromises.writeFile(cachePath, fs.createReadStream(assetPath));
       }
     }
-    return send(ctx, cacheName, {
+    return await send(ctx, cacheName, {
       immutable: true,
       root: getCacheDirectory(),
     });
   }
 
-  return send(ctx, asset, {
+  return await send(ctx, asset, {
     immutable: true,
     root: getAssetDirectory(type),
   });

apps/cli/src/commands/start_server/base_app/router.ts

@@ -21,7 +21,7 @@ router.post('/login_with_2fa', parseBody, loginWith2FA);
  * 上传音乐播放记录
  * 由于使用 navigator.sendBeacon
  * 无法设置 http header, 需要特殊处理鉴权
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 router.post('/music_play_record', parseBody, createMusicPlayRecord);
 

apps/cli/src/commands/start_server/form_app/controllers/upload_asset.ts

@@ -17,7 +17,7 @@ const isSquare = async (buffer: Buffer) => {
   const image = await jimp.read(buffer);
   /**
    * 允许一定的误差
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   return Math.abs(image.bitmap.width - image.bitmap.height) < 5;
 };

apps/cli/src/commands/start_server/index.ts

@@ -54,7 +54,7 @@ export default async ({
 
       /**
        * 当 navigator.sendBeacon 格式是 json 时必须
-       * @author mebtte<hi@mebtte.com>
+       * @author mebtte<i@mebtte.com>
        */
       credentials: true,
     }),

apps/cli/src/commands/start_server/initialize.ts

@@ -56,7 +56,7 @@ function mkdirIfNotExist(dir: string) {
 export default async () => {
   /**
    * create directory
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   const directories = [
     getConfig().data,
@@ -73,7 +73,7 @@ export default async () => {
 
   /**
    * initialize or verify data version
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   if (fs.existsSync(getDataVersionPath())) {
     const dataVersion = Number(
@@ -95,7 +95,7 @@ export default async () => {
 
   /**
    * initialize database
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   if (
     !fs.existsSync(getDBFilePath()) ||

apps/cli/src/commands/upgrade_data.ts

@@ -63,7 +63,7 @@ async function addUserPassword() {
 
   /**
    * make user.password not null
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   const tmpTableName = 'user_tmp';
   await getDB().run(

apps/cli/src/index.ts

@@ -18,7 +18,7 @@ const program = new Command()
 
 /**
  * 启动服务
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 program
   .command('start')
@@ -62,7 +62,7 @@ program
 
 /**
  * 数据升级
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 program
   .command('upgrade data')
@@ -80,7 +80,7 @@ program
 
 /**
  * 数据修复
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 program
   .command('fix-data')
@@ -98,7 +98,7 @@ program
 
 /**
  * 导入音乐
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 program
   .command('import')

apps/cli/src/platform/captcha.ts

@@ -51,7 +51,7 @@ export async function verify({
   /**
    * 无论验证成功与否
    * 都需要记录已使用
-   * @author mebtte<hi@mebtte.com>
+   * @author mebtte<i@mebtte.com>
    */
   getDB()
     .run(

apps/cli/src/utils/db.ts

@@ -1,15 +1,15 @@
 /**
  * API referrence: https://github.com/TryGhost/node-sqlite3/wiki/API
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 import * as sqlite3 from 'sqlite3';
 
 export enum EventType {
   PROFILE = 'profile',
 }
-type EventTypeMapListener = {
+interface EventTypeMapListener {
   [EventType.PROFILE]: (sql: string, ms: number) => void;
-};
+}
 
 class DB {
   db: sqlite3.Database;

apps/pwa/src/components/button.tsx

@@ -86,6 +86,7 @@ const Style = styled.button<{
   height: ${ComponentSize.NORMAL}px;
   padding: 0 15px;
 
+  white-space: nowrap;
   border-radius: ${CSSVariable.BORDER_RADIUS_NORMAL};
   font-size: ${CSSVariable.TEXT_SIZE_NORMAL};
   cursor: pointer;

apps/pwa/src/components/dialog.tsx

@@ -50,7 +50,7 @@ const Body = styled(animated.div)`
 
 /**
  * 弹窗
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 const Dialog = ({
   open,

apps/pwa/src/components/empty.tsx

@@ -26,7 +26,7 @@ const Style = styled.div`
 
 /**
  * 空数据
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 function Empty({
   /** 描述 */

apps/pwa/src/components/error_boundary.tsx

@@ -4,7 +4,7 @@ import logger from '@/utils/logger';
 
 /**
  * 错误边界
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 class ErrorBoundary extends React.PureComponent<
   React.PropsWithChildren<{

apps/pwa/src/components/error_card.tsx

@@ -34,7 +34,7 @@ const Style = styled.div`
 
 /**
  * 错误卡片
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 function ErrorCard({
   errorMessage,

apps/pwa/src/components/page_container.ts

@@ -3,7 +3,7 @@ import styled from 'styled-components';
 
 /**
  * 根路由容器
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 const RouteContainer = styled.div`
   ${absoluteFullSize}

apps/pwa/src/components/popup.tsx

@@ -35,7 +35,7 @@ const Body = styled(animated.div)`
 
 /**
  * 弹出框
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 const Popup = ({
   open,

apps/pwa/src/components/spinner.tsx

@@ -41,7 +41,7 @@ const Style = styled.div`
 
 /**
  * 加载器
- * @author mebtte<hi@mebtte.com>
+ * @author mebtte<i@mebtte.com>
  */
 function Spinner({
   size = ComponentSize.SMALL,

apps/pwa/src/definition.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable no-underscore-dangle,no-undef */
 declare global {
+  // eslint-disable-next-line @typescript-eslint/naming-convention
   const __DEFINE__: {
     VERSION: string;
 

apps/pwa/src/global_states/server.ts

@@ -1,10 +1,8 @@
 import XState from '@/utils/x_state';
 import logger from '@/utils/logger';
 import storage, { Key } from '@/storage';
-import { Server, ServerState } from '@/constants/server';
+import { type Server, type ServerState } from '@/constants/server';
 import globalEventemitter, { EventType } from '@/platform/global_eventemitter';
-import getMetadata from '@/server/base/get_metadata';
-import getProfile from '@/server/api/get_profile';
 import definition from '@/definition';
 import { BETA_VERSION_START } from '#/constants';
 
@@ -34,7 +32,8 @@ server.onChange((ss) => {
 window.setInterval(() => {
   const selectedServer = getSelectedServer(server.get());
   if (selectedServer) {
-    getMetadata(selectedServer.origin)
+    import('@/server/base/get_metadata')
+      .then(({ default: getMetadata }) => getMetadata(selectedServer.origin))
       .then((data) => {
         if (
           !definition.DEVELOPMENT &&
@@ -43,7 +42,7 @@ window.setInterval(() => {
         ) {
           /**
            * @todo 不兼容提示
-           * @author mebtte<hi@mebtte.com>
+           * @author mebtte<i@mebtte.com>
            */
         }
 
@@ -98,6 +97,7 @@ export async function reloadUser() {
   if (selectedServer) {
     const user = getSelectedUser(selectedServer);
     if (user) {
+      const { default: getProfile } = await import('@/server/api/get_profile');
       const profile = await getProfile(user.token);
       server.set((ss) => ({
         ...ss,