Update all non-major dependencies

.envrc.sample

@@ -17,8 +17,11 @@ export SPOTIFY_CLIENT_ID=""
 export SPOTIFY_CLIENT_SECRET=""
 
 export MUSIXMATCH_API_KEY=""
-export EVENT_ID=""
-export STRAGE_URL=""
+export EVENT_ID="todo"
+export STORAGE_ID=""
+export STORAGE_URL=""
 
-export THREAD_TITLE_WORD=""
+export EMPTY_MODE_SEARCH_WORD="探偵 クイズ 推理 アニメ " # クイズなど
+
+export THREAD_TITLE_WORD="ならアニソン"
 export DIRECT_MODE=0

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 vipzero
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

maintanace-flow.md

@@ -0,0 +1,97 @@
+## メンテフロー
+
+### Event 作成
+
+```
+$ vi .envrc EVENT_ID
+EVENT_ID=xxxxxx
+$ yarn setup			 		# EVENT_ID から動作
+$ yarn setup:anison
+```
+
+```mermaid
+sequenceDiagram
+
+participant you_ as You
+participant envB as BackEnd環境設定
+participant appB as haikei-server
+participant fbdb as Firestore
+participant andb as AnisonDb
+
+you_ ->> envB : .envrc EVENT_ID 更新
+you_ ->> appB : yarn setup
+envB ->> appB : EVENT_ID
+appB ->> fbdb : event 追加
+```
+
+```mermaid
+sequenceDiagram
+
+participant you_ as You
+participant envB as BackEnd環境設定 data/*.csv
+participant appB as haikei-server
+participant andb as AnisonDb
+
+you_ ->> appB : yarn setup:anison
+appB ->> andb : get
+andb ->> envB : 同期
+```
+
+### FrontEnd のセットアップ
+
+rekka-haikei の `src/config/incdex.ts`
+
+- イベント追加 `xxxxxx`
+- 終了時間指定
+
+### サーバー起動
+
+```mermaid
+
+sequenceDiagram
+
+participant you_ as You
+participant appB as haikei-server
+participant fbhi as Firestore/hist
+participant fbco as Firestore/counts
+participant strm as Stream
+
+you_ ->> appB : yarn start
+appB ->> fbhi : get [eventId]
+fbhi ->> appB : lastSong
+appB ->> fbco : get [eventId]
+fbco ->> appB : all cache
+
+appB ->> strm : subscribe
+
+```
+
+### 動作中
+
+```mermaid
+
+sequenceDiagram
+
+participant strm as Stream
+participant appB as haikei-server
+participant fbhi as Firestore/hist
+participant fbso as Firestore/song
+participant fbco as Firestore/counts
+
+
+strm ->> appB : icy
+appB ->> appB : 解析
+appB ->> fbhi : update
+appB ->> fbso : push
+appB ->> fbco : update
+
+```
+
+### 終了
+
+アーカイブする。
+イベント中の履歴は Firestore からロードするが、アーカイブ後は履歴を Cloud Storage からダウンロードするようになる。
+
+```
+yarn close:archive {event_ia}
+```

package.json

@@ -3,33 +3,45 @@
   "type": "commonjs",
   "dependencies": {
     "@types/jest": "^27.4.1",
-    "axios": "0.21.1",
+    "axios": "0.27.2",
     "chalk": "4.1.2",
     "chch": "2.8.0",
-    "cheerio": "1.0.0-rc.10",
-    "csv-parse": "4.16.0",
-    "date-fns": "2.23.0",
-    "file-type": "16.5.3",
-    "got": "11.8.2",
+    "cheerio": "1.0.0-rc.12",
+    "csv-parse": "4.16.3",
+    "csv-stringify": "^6.0.5",
+    "date-fns": "2.30.0",
+    "esbuild": "^0.17.0",
+    "esbuild-register": "^3.3.2",
+    "file-type": "16.5.4",
+    "got": "11.8.6",
     "iconv-lite": "0.6.3",
     "icy": "2.1.0",
+    "jaco": "^4.0.0",
     "jest": "^27.5.1",
+    "jimp": "^0.22.0",
+    "jptext-to-emoji": "0.3.0",
+    "luxon": "^3.3.0",
     "node-spotify-api": "1.1.1",
-    "sharp": "0.28.3"
+    "sharp": "0.32.1"
   },
   "scripts": {
-    "start": "ts-node src/index.ts",
+    "start": "yarn start:esbuild",
+    "start:esbuild": "node -r esbuild-register src/index.ts",
+    "start:ts-node": "ts-node src/index.ts",
     "get_history": "curl http://w.hoshinoa.me:8000/play.txt -o data/history.txt",
     "setup": "ts-node scripts/setupEvent.ts",
     "setup:ee": "ts-node scripts/setupEasterEgg.ts",
     "setup:anison": "./scripts/updateAnisonDb.mjs",
+    "close:archive": "ts-node ./scripts/archiveEvent/index.ts",
     "import2": "ts-node scripts/batch/importHistoryFromCells.ts",
     "map:watch": "./scripts/hourly-yarn-map.sh",
     "map": "yarn map-load-thread && yarn map-save",
     "map-load-thread": "ts-node scripts/loadThreads.ts",
     "map-save": "ts-node scripts/makePostCountMap.ts",
+    "fix:counts": "ts-node scripts/batch/migrateWordCounts.ts",
     "active-thread": "chch dump-threads |jq -r '.threads[] | \"\\(.url),\\(.title)\"' |grep \"ならアニソン\"",
-    "test": "jest"
+    "test": "jest",
+    "test:type": "npx tsc --noEmit"
   },
   "devDependencies": {
     "@swc/core": "^1.2.168",
@@ -39,18 +51,19 @@
     "@types/imagemin": "7.0.1",
     "@types/imagemin-gifsicle": "7.0.1",
     "@types/imagemin-mozjpeg": "8.0.1",
+    "@types/luxon": "^3.3.0",
     "@types/node": "17.0.24",
     "@types/sharp": "0.28.5",
-    "@typescript-eslint/eslint-plugin": "4.29.1",
-    "@typescript-eslint/parser": "4.29.1",
-    "eslint": "8.13.0",
-    "firebase-admin": "9.11.0",
+    "@typescript-eslint/eslint-plugin": "5.21.0",
+    "@typescript-eslint/parser": "5.21.0",
+    "eslint": "8.14.0",
+    "firebase-admin": "9.12.0",
     "imagemin": "7.0.1",
     "imagemin-gifsicle": "7.0.0",
     "imagemin-mozjpeg": "9.0.0",
     "imagemin-pngquant": "9.0.2",
     "rimraf": "3.0.2",
-    "ts-node": "10.7.0",
-    "typescript": "4.6.3"
+    "ts-node": "10.9.1",
+    "typescript": "4.9.5"
   }
 }

readme.md

@@ -46,8 +46,29 @@ iTunes API (認証なし)
 - spotify: アートワーク・アルバム名・(邦楽・アニソンあまり取れないため)
 - musixmatch: アートワーク・アルバム名・歌詞の出だし(有料 API では FULL)
 
+調整・アルゴリズム関係
 
-## 検索文字生成部分や調整しているアルゴリズムなど
-https://github.com/vipzero/haikei-server/wiki/algo
+## 画像検索文字列の生成部分
 
+方針
 
+- 関連性のあるものが出るように
+- meme やキャプ画像が出るように
+- 平凡な公式タイトル画像以外が出るように
+
+コード
+
+https://github.com/vipzero/haikei-server/blob/main/src/utils/makeSearchWord.ts
+
+## 画像選択
+
+imagemin などで Optimize 後のメタデータで  
+ソートして上から 3 つ
+
+コード
+
+https://github.com/vipzero/haikei-server/blob/main/src/imageIo/uploadManage.ts
+
+## メンテフロー
+
+[./maintanace-flow.md](./maintanace-flow.md)

scripts/archiveEvent/index.ts

@@ -0,0 +1,38 @@
+import { assert } from 'console'
+import { stringify } from 'csv-stringify/sync'
+import { writeFile } from 'fs/promises'
+
+import {
+  archiveUrl,
+  loadHistEventSongs,
+  uploadStorageArchive,
+} from '../../src/service/firebase'
+import { log } from '../../src/utils/logger'
+
+const archiveEventCsv = async (id: string) => {
+  log({ id })
+  if (!id) return
+  const data = await loadHistEventSongs(id)
+  const dataWithN = data.map((d) => ({ ...d, n: d.n || 0 }))
+  const csvText = stringify(dataWithN, {
+    header: true,
+    columns: ['time', 'title', 'n'].map((key) => ({ key, header: key })),
+  })
+
+  await saveFile(id, csvText)
+}
+
+const saveFile = async (id: string, text: string) => {
+  const paths = archiveUrl(id)
+  const { localFile } = paths
+
+  await writeFile(localFile, text)
+  await uploadStorageArchive(paths)
+  log({ paths })
+}
+
+const eventId = process.argv[2]
+
+assert(eventId, 'need arg [event_id]')
+
+archiveEventCsv(eventId).then(() => log('doae'))

scripts/batch/importHistoryFromCells.ts

@@ -22,7 +22,7 @@ async function main() {
     const { title, time } = parseLine(line)
     await sleep(200)
     await addHistory(title, time)
-    anaCounts(title, {})
+    anaCounts([title], {}, [], true)
 
     process.stdout.write('.')
   }

scripts/batch/importHistoryFromCells2.ts

@@ -0,0 +1,31 @@
+import { readFileSync } from 'fs'
+import { addHistory } from '../../src/service/firebase'
+import { sleep } from '../../src/utils'
+import { anaCounts } from '../../src/utils/wordCounts'
+
+const parseLine = (text: string) => {
+  const [time, title] = text.split(',')
+
+  return { time, title }
+}
+
+const importFile = './data/20220501_0200-0800.mid.csv'
+const text = readFileSync(importFile, 'utf8')
+
+const lines = text.trim().split('\r\n')
+
+async function main() {
+  // for (let i = 0; i < 3; i++) {
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]
+    const { title, time } = parseLine(line)
+
+    await sleep(200)
+    await addHistory(title.trim(), Number(time), 0)
+    anaCounts([title], {}, [], true)
+
+    process.stdout.write('.')
+  }
+}
+
+main().then(() => console.log('fin'))

scripts/batch/importHistoryFromCells3.ts

@@ -0,0 +1,32 @@
+import { readFileSync } from 'fs'
+import { addHistory } from '../../src/service/firebase'
+import { sleep } from '../../src/utils'
+import { anaCounts } from '../../src/utils/wordCounts'
+
+const parseLine = (text: string) => {
+  const [title, artist, time] = text.split(',')
+
+  return { time, title: `${title} - ${artist}` }
+}
+
+const importFile = './data/archive/history_1214.txt'
+const text = readFileSync(importFile, 'utf8')
+
+const lines = text.trim().split('\n')
+
+async function main() {
+  // for (let i = 0; i < 3; i++) {
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]
+    const { title, time } = parseLine(line)
+
+    await sleep(200)
+
+    await addHistory(title.trim(), Number(time), 0)
+    anaCounts([title], {}, [], true)
+
+    process.stdout.write('.')
+  }
+}
+
+main().then(() => console.log('fin'))