diff --git a/app/MetadataResolver/CienResolver.php b/app/MetadataResolver/CienResolver.php
index a7d9d67..47d0e44 100644
--- a/app/MetadataResolver/CienResolver.php
+++ b/app/MetadataResolver/CienResolver.php
@@ -27,12 +27,18 @@ class CienResolver extends MetadataResolver
$res = $this->client->get($url);
$metadata = $this->ogpResolver->parse((string) $res->getBody());
- // 画像URLから有効期限の起点を拾う
+ // 画像URLのJWTから有効期限を拾う
parse_str(parse_url($metadata->image, PHP_URL_QUERY), $params);
- if (empty($params['px-time'])) {
- throw new \RuntimeException('Parameter "px-time" not found. Image=' . $metadata->image . ' Source=' . $url);
+ if (empty($params['jwt'])) {
+ throw new \RuntimeException('Parameter "jwt" not found. Image=' . $metadata->image . ' Source=' . $url);
}
- $metadata->expires_at = Carbon::createFromTimestamp($params['px-time'])->addHour(1);
+ $parts = explode('.', $params['jwt']);
+ if (count($parts) !== 3) {
+ throw new \RuntimeException('Invalid jwt. Image=' . $metadata->image . ' Source=' . $url);
+ }
+ $payload = json_decode(base64_decode(str_replace(['-', '_'], ['+', '/'], $parts[1])), true);
+
+ $metadata->expires_at = Carbon::createFromTimestamp($payload['exp']);
return $metadata;
}
diff --git a/tests/Unit/MetadataResolver/CienResolverTest.php b/tests/Unit/MetadataResolver/CienResolverTest.php
index 080ec7b..2395dc0 100644
--- a/tests/Unit/MetadataResolver/CienResolverTest.php
+++ b/tests/Unit/MetadataResolver/CienResolverTest.php
@@ -25,12 +25,12 @@ class CienResolverTest extends TestCase
$this->createResolver(CienResolver::class, $responseText);
$metadata = $this->resolver->resolve('https://ci-en.dlsite.com/creator/2462/article/87502');
- $this->assertSame('進捗とボツ立ち絵', $metadata->title);
- $this->assertSame('ドット製２D ACTを製作しています。' . PHP_EOL . '恐ろしい存在に襲われる絶望感や、被虐的な官能がテーマです。', $metadata->description);
- $this->assertStringStartsWith('https://media.ci-en.jp/private/attachment/creator/00002462/a7afd3b02a6d1caa6afe6a3bf5550fb6a42aefba686f17a0a2f63c97fd6867ab/image-800.jpg?px-time=', $metadata->image);
+ $this->assertSame('進捗とボツ立ち絵 - ねんない５ - Ci-en（シエン）', $metadata->title);
+ $this->assertSame('今日のサムネイルはストアページに掲載する予定のキャラクター紹介画像です。 ドットでない解像度の高いイラストは時間も体力も精神力もかかるので、こういうのを行うタスクを開発終盤に残さないでよかったと本気……', $metadata->description);
+ $this->assertStringStartsWith('https://media.ci-en.jp/private/attachment/creator/00002462/a7afd3b02a6d1caa6afe6a3bf5550fb6a42aefba686f17a0a2f63c97fd6867ab/image-800.jpg?jwt=', $metadata->image);
if ($this->shouldUseMock()) {
- $this->assertSame('https://media.ci-en.jp/private/attachment/creator/00002462/a7afd3b02a6d1caa6afe6a3bf5550fb6a42aefba686f17a0a2f63c97fd6867ab/image-800.jpg?px-time=1568231879&px-hash=70c57e9a73d5afb4ac5363d1f37a851af8e0cb1f', $metadata->image);
- $this->assertSame(1568235479, $metadata->expires_at->timestamp);
+ $this->assertSame('https://media.ci-en.jp/private/attachment/creator/00002462/a7afd3b02a6d1caa6afe6a3bf5550fb6a42aefba686f17a0a2f63c97fd6867ab/image-800.jpg?jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJrZXkiOiJqd3RhdXRoX3NlY18yMDIwT2N0IiwiaXNzIjoiaHR0cHM6XC9cL2NpLWVuLmRsc2l0ZS5jb21cLyIsInN1YiI6IjAwMDAwMDAwMDAwIiwiYXVkIjoiYTdhZmQzYjAyYTZkMWNhYTZhZmU2YTNiZjU1NTBmYjZhNDJhZWZiYTY4NmYxN2EwYTJmNjNjOTdmZDY4NjdhYiIsImV4cCI6MTYwMjk5NTIyMX0.bXUG2T6nXl4hdvsvt1wkIMvbbBdsKk-xbwB6SaxARZA', $metadata->image);
+ $this->assertSame(1602995221, $metadata->expires_at->timestamp);
$this->assertSame('https://ci-en.dlsite.com/creator/2462/article/87502', (string) $this->handler->getLastRequest()->getUri());
}
}
@@ -41,7 +41,7 @@ class CienResolverTest extends TestCase
$this->createResolver(CienResolver::class, $responseText);
$this->expectException(\RuntimeException::class);
- $this->expectExceptionMessage('Parameter "px-time" not found. Image=https://ci-en.dlsite.com/assets/img/common/logo_Ci-en_R18.svg Source=https://ci-en.dlsite.com/');
+ $this->expectExceptionMessage('Parameter "jwt" not found. Image=https://ci-en.dlsite.com/assets/img/common/logo_Ci-en_R18.svg Source=https://ci-en.dlsite.com/');
$this->resolver->resolve('https://ci-en.dlsite.com/');
}
diff --git a/tests/fixture/Cien/test.html b/tests/fixture/Cien/test.html
index 04f73fa..74bd19f 100644
--- a/tests/fixture/Cien/test.html
+++ b/tests/fixture/Cien/test.html
@@ -1,38 +1,42 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 進捗とボツ立ち絵 - ねんない５ - Ci-en
-
+ 進捗とボツ立ち絵 - ねんない５ - Ci-en（シエン）
+
-
-
+
+
+
+
-
+
+
+
@@ -80,7 +84,7 @@
creator-id=""
>
- 
-
-
+
+
@@ -233,7 +237,8 @@
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 