Skip to content

Commit 418d5e4

Browse files
clanstyclansty
committed
browser render 收费了，省省
1 parent 4d21e00 commit 418d5e4

File tree

2 files changed

+200
-39
lines changed

2 files changed

+200
-39
lines changed

‎apps/tgbot/src/renderer/Renderer.ts‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ import { Env } from '../types';
22
import puppeteer, { Browser } from '@cloudflare/puppeteer';
33
import { DurableObjectState } from '@cloudflare/workers-types';
44

5-
// 渲染过程（打开 Page）应该是可以并行的，所以这个更应该用 Durable object 而不是 queue
6-
7-
const KEEP_BROWSER_ALIVE_IN_SECONDS = 300;
8-
95
export class Renderer implements DurableObject {
10-
keptAliveInSeconds = 0;
116
browser: Browser;
127

138
constructor(private readonly state: DurableObjectState, private readonly env: Env) {
@@ -18,9 +13,6 @@ export class Renderer implements DurableObject {
1813
const { url, width } = await request.json() as { url: string, width: number };
1914
const result = await this.renderHtml(url, width);
2015

21-
// Reset keptAlive after performing tasks to the DO.
22-
this.keptAliveInSeconds = 0;
23-
2416
return new Response(result.data, {
2517
headers: {
2618
'Content-Type': 'image/png',
@@ -44,17 +36,6 @@ export class Renderer implements DurableObject {
4436
}
4537
}
4638

47-
// Reset keptAlive after each call to the DO
48-
this.keptAliveInSeconds = 0;
49-
50-
// set the first alarm to keep DO alive
51-
let currentAlarm = await this.state.storage.getAlarm();
52-
if (currentAlarm == null) {
53-
console.log(`Browser DO: setting alarm`);
54-
const TEN_SECONDS = 10 * 1000;
55-
await this.state.storage.setAlarm(Date.now() + TEN_SECONDS);
56-
}
57-
5839
return await this.browser.newPage();
5940
}
6041

@@ -72,24 +53,4 @@ export class Renderer implements DurableObject {
7253
this.state.waitUntil(page.close()); // async
7354
return { data, width, height };
7455
}
75-
76-
async alarm() {
77-
this.keptAliveInSeconds += 10;
78-
79-
// Extend browser DO life
80-
if (this.keptAliveInSeconds < KEEP_BROWSER_ALIVE_IN_SECONDS) {
81-
console.log(`Browser DO: has been kept alive for ${this.keptAliveInSeconds} seconds. Extending lifespan.`);
82-
await this.state.storage.setAlarm(Date.now() + 10 * 1000);
83-
// You could ensure the ws connection is kept alive by requesting something
84-
// or just let it close automatically when there is no work to be done
85-
// for example, `await this.browser.version()`
86-
await this.browser.version();
87-
} else {
88-
console.log(`Browser DO: exceeded life of ${KEEP_BROWSER_ALIVE_IN_SECONDS}s.`);
89-
if (this.browser) {
90-
console.log(`Closing browser.`);
91-
await this.browser.close();
92-
}
93-
}
94-
}
9556
}

‎packages/data/src/all-music.json‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31640,6 +31640,26 @@
3164031640
}
3164131641
]
3164231642
},
31643+
"10187": {
31644+
"name": "ローリンガール",
31645+
"ver": "25515",
31646+
"composer": "wowaka",
31647+
"genre": "niconicoボーカロイド",
31648+
"notes": [
31649+
{
31650+
"lv": 4
31651+
},
31652+
{
31653+
"lv": 7.8
31654+
},
31655+
{
31656+
"lv": 10.9
31657+
},
31658+
{
31659+
"lv": 13.3
31660+
}
31661+
]
31662+
},
3164331663
"10188": {
3164431664
"name": "天ノ弱",
3164531665
"ver": "21009",
@@ -48362,6 +48382,66 @@
4836248382
}
4836348383
]
4836448384
},
48385+
"11828": {
48386+
"name": "crazy (about you)",
48387+
"ver": "25514",
48388+
"composer": "kamome sano",
48389+
"genre": "オンゲキCHUNITHM",
48390+
"notes": [
48391+
{
48392+
"lv": 3
48393+
},
48394+
{
48395+
"lv": 7
48396+
},
48397+
{
48398+
"lv": 10.8
48399+
},
48400+
{
48401+
"lv": 13.8
48402+
}
48403+
]
48404+
},
48405+
"11829": {
48406+
"name": "Drivessover",
48407+
"ver": "25514",
48408+
"composer": "Taishi",
48409+
"genre": "オンゲキCHUNITHM",
48410+
"notes": [
48411+
{
48412+
"lv": 4
48413+
},
48414+
{
48415+
"lv": 7.8
48416+
},
48417+
{
48418+
"lv": 12.2
48419+
},
48420+
{
48421+
"lv": 13.6
48422+
}
48423+
]
48424+
},
48425+
"11830": {
48426+
"name": "Tidal Wave",
48427+
"ver": "25515",
48428+
"composer": "D-Cee",
48429+
"genre": "オンゲキCHUNITHM",
48430+
"notes": [
48431+
{
48432+
"lv": 4
48433+
},
48434+
{
48435+
"lv": 7.7
48436+
},
48437+
{
48438+
"lv": 12.3
48439+
},
48440+
{
48441+
"lv": 13.8
48442+
}
48443+
]
48444+
},
4836548445
"11831": {
4836648446
"name": "きゅびずむ",
4836748447
"ver": "25500",
@@ -48871,6 +48951,86 @@
4887148951
}
4887248952
]
4887348953
},
48954+
"11856": {
48955+
"name": "MIRA",
48956+
"ver": "25516",
48957+
"composer": "Kanaria",
48958+
"genre": "niconicoボーカロイド",
48959+
"notes": [
48960+
{
48961+
"lv": 2
48962+
},
48963+
{
48964+
"lv": 6
48965+
},
48966+
{
48967+
"lv": 9.5
48968+
},
48969+
{
48970+
"lv": 12.9
48971+
}
48972+
]
48973+
},
48974+
"11857": {
48975+
"name": "空回りライブラリ",
48976+
"ver": "25516",
48977+
"composer": "雪乃イト",
48978+
"genre": "niconicoボーカロイド",
48979+
"notes": [
48980+
{
48981+
"lv": 3
48982+
},
48983+
{
48984+
"lv": 6.5
48985+
},
48986+
{
48987+
"lv": 9.7
48988+
},
48989+
{
48990+
"lv": 12.8
48991+
}
48992+
]
48993+
},
48994+
"11858": {
48995+
"name": "お呪い",
48996+
"ver": "25516",
48997+
"composer": "なきそ",
48998+
"genre": "niconicoボーカロイド",
48999+
"notes": [
49000+
{
49001+
"lv": 2
49002+
},
49003+
{
49004+
"lv": 6.2
49005+
},
49006+
{
49007+
"lv": 10.2
49008+
},
49009+
{
49010+
"lv": 13
49011+
}
49012+
]
49013+
},
49014+
"11859": {
49015+
"name": "ありきたりな恋の歌",
49016+
"ver": "25517",
49017+
"composer": "GYARI",
49018+
"genre": "niconicoボーカロイド",
49019+
"notes": [
49020+
{
49021+
"lv": 4
49022+
},
49023+
{
49024+
"lv": 7.5
49025+
},
49026+
{
49027+
"lv": 10.5
49028+
},
49029+
{
49030+
"lv": 13.8
49031+
}
49032+
]
49033+
},
4887449034
"11860": {
4887549035
"name": "MYTH Re：LEASE",
4887649036
"ver": "25507",
@@ -48891,6 +49051,26 @@
4889149051
}
4889249052
]
4889349053
},
49054+
"11861": {
49055+
"name": "∀",
49056+
"ver": "25515",
49057+
"composer": "ああああ",
49058+
"genre": "ゲームバラエティ",
49059+
"notes": [
49060+
{
49061+
"lv": 6
49062+
},
49063+
{
49064+
"lv": 8.2
49065+
},
49066+
{
49067+
"lv": 11.9
49068+
},
49069+
{
49070+
"lv": 14.2
49071+
}
49072+
]
49073+
},
4889449074
"11862": {
4889549075
"name": "㋰責任集合体",
4889649076
"ver": "25510",
@@ -49074,6 +49254,26 @@
4907449254
}
4907549255
]
4907649256
},
49257+
"11878": {
49258+
"name": "Pixel Galaxy",
49259+
"ver": "25516",
49260+
"composer": "Snail's House",
49261+
"genre": "ゲームバラエティ",
49262+
"notes": [
49263+
{
49264+
"lv": 3
49265+
},
49266+
{
49267+
"lv": 7.4
49268+
},
49269+
{
49270+
"lv": 9.9
49271+
},
49272+
{
49273+
"lv": 13.1
49274+
}
49275+
]
49276+
},
4907749277
"12001": {
4907849278
"name": "キラメキラリ",
4907949279
"ver": "22001",

0 commit comments

Comments
 (0)