Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ghost/core/core/server/services/oembed/oembed-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class OEmbedService {
'user-agent': USER_AGENT
},
timeout: {
request: 2000
request: 5000
},
followRedirect: true,
...options
Expand Down Expand Up @@ -294,6 +294,7 @@ class OEmbedService {
};

const metascraper = require('metascraper')([
require('metascraper-amazon')(),
require('metascraper-url')(),
require('metascraper-title')(),
require('metascraper-description')(),
Expand Down
1 change: 1 addition & 0 deletions ghost/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
"luxon": "3.7.2",
"mailgun.js": "10.4.0",
"metascraper": "5.45.15",
"metascraper-amazon": "5.45.10",
"metascraper-author": "5.45.10",
"metascraper-description": "5.45.10",
"metascraper-image": "5.45.10",
Expand Down
36 changes: 36 additions & 0 deletions ghost/core/test/unit/server/services/oembed/oembed-service.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,24 @@ describe('oembed-service', function () {
});
});

describe('fetchPage', function () {
it('requests pages with a 5 second timeout', async function () {
const externalRequest = sinon.stub().resolves({});

const service = new OembedService({
config: {get() {
return true;
}},
externalRequest
});

await service.fetchPage('https://www.example.com', {});

const options = externalRequest.firstCall.args[1];
assert.equal(options.timeout.request, 5000);
});
});

describe('fetchOembedData', function () {
const pageHtml = `<html><head><link type="application/json+oembed" href="https://www.example.com/oembed"></head></html>`;

Expand Down Expand Up @@ -182,6 +200,24 @@ describe('oembed-service', function () {
assert.equal(response.metadata.title, 'Example');
});

it('extracts Amazon product metadata via the metascraper-amazon ruleset', async function () {
nock('https://www.amazon.com')
.get('/dp/B08N5WRWNW')
.query(true)
.reply(200, `<html><head><title>Amazon.com</title></head><body>
<span id="productTitle">Example Product Title</span>
<img class="a-dynamic-image" src="https://m.media-amazon.com/images/I/example.jpg" data-old-hires="https://m.media-amazon.com/images/I/example-hires.jpg">
</body></html>`);

const response = await oembedService.fetchOembedDataFromUrl('https://www.amazon.com/dp/B08N5WRWNW', 'bookmark');

assert.equal(response.version, '1.0');
assert.equal(response.type, 'bookmark');
assert.equal(response.metadata.title, 'Example Product Title');
assert.equal(response.metadata.publisher, 'Amazon');
assert.equal(response.metadata.thumbnail, 'https://m.media-amazon.com/images/I/example-hires.jpg');
});

it('should return a bookmark response when the oembed endpoint returns a link type', async function () {
nock('https://www.example.com')
.get('/')
Expand Down
17 changes: 17 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading