Merge branch 'master' into experimental

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "traxxx",
-    "version": "1.212.7",
+    "version": "1.212.9",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "traxxx",
-            "version": "1.212.7",
+            "version": "1.212.9",
             "license": "ISC",
             "dependencies": {
                 "@casl/ability": "^5.2.2",
@@ -11650,6 +11650,25 @@
                 "webidl-conversions": "^3.0.0"
             }
         },
+        "node_modules/node-fetch/node_modules/tr46": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+            "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "node_modules/node-fetch/node_modules/webidl-conversions": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+            "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "node_modules/node-fetch/node_modules/whatwg-url": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+            "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+            "dependencies": {
+                "tr46": "~0.0.3",
+                "webidl-conversions": "^3.0.0"
+            }
+        },
         "node_modules/node-gyp": {
             "version": "7.1.2",
             "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.212.7",
+    "version": "1.212.9",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {

seeds/02_sites.js

@@ -810,6 +810,13 @@ const sites = [
 		parameters: { siteId: 3261 },
 		parent: 'bang',
 	},
+	{
+		name: 'Bang! Podcast',
+		slug: 'bangpodcast',
+		url: 'https://www.bang.com/videos?in=bang!%20podcast',
+		parameters: { siteId: 6305 },
+		parent: 'bang',
+	},
 	// BANGBROS
 	{
 		name: 'Ass Parade',
@@ -5271,7 +5278,7 @@ const sites = [
 	{
 		slug: 'bigdicksatschool',
 		name: 'Big Dicks At School',
-		url: 'https://www.bigdicksatschool.com',
+		url: 'https://www.men.com/scenes?site=252',
 		description: '',
 		parameters: { siteId: 252 },
 		tags: ['gay'],
@@ -5280,7 +5287,7 @@ const sites = [
 	{
 		slug: 'drillmyhole',
 		name: 'Drill My Hole',
-		url: 'https://www.drillmyhole.com',
+		url: 'https://www.men.com/scenes?site=253',
 		description: '',
 		parameters: { siteId: 253 },
 		tags: ['gay'],
@@ -5289,7 +5296,7 @@ const sites = [
 	{
 		slug: 'str8togay',
 		name: 'Str8 to Gay',
-		url: 'https://www.str8togay.com',
+		url: 'https://www.men.com/scenes?site=254',
 		tags: ['gay'],
 		parameters: { siteId: 254 },
 		parent: 'men',
@@ -5297,7 +5304,7 @@ const sites = [
 	{
 		slug: 'thegayoffice',
 		name: 'The Gay Office',
-		url: 'https://www.thegayoffice.com',
+		url: 'https://www.men.com/scenes?site=255',
 		tags: ['gay'],
 		parameters: { siteId: 255 },
 		parent: 'men',
@@ -5305,7 +5312,7 @@ const sites = [
 	{
 		slug: 'jizzorgy',
 		name: 'Jizz Orgy',
-		url: 'https://www.jizzorgy.com',
+		url: 'https://www.men.com/scenes?site=256',
 		tags: ['gay'],
 		parameters: { siteId: 256 },
 		parent: 'men',
@@ -5313,7 +5320,7 @@ const sites = [
 	{
 		slug: 'menofuk',
 		name: 'Men of UK',
-		url: 'https://www.menofuk.com',
+		url: 'https://www.men.com/scenes?site=258',
 		tags: ['gay'],
 		parameters: { siteId: 258 },
 		parent: 'men',
@@ -5321,7 +5328,7 @@ const sites = [
 	{
 		slug: 'toptobottom',
 		name: 'Top to Bottom',
-		url: 'https://www.toptobottom.com',
+		url: 'https://www.men.com/scenes?site=259',
 		tags: ['gay'],
 		parameters: { siteId: 259 },
 		parent: 'men',
@@ -5329,7 +5336,7 @@ const sites = [
 	{
 		slug: 'godsofmen',
 		name: 'Gods of Men',
-		url: 'https://www.godsofmen.com',
+		url: 'https://www.men.com/scenes?site=260',
 		tags: ['gay'],
 		parameters: { siteId: 260 },
 		parent: 'men',

src/app.js

@@ -85,6 +85,23 @@ async function startMemorySample(snapshotTriggers = []) {
 	}, config.memorySampling.sampleDuration);
 }
 
+async function startMemorySample() {
+	await inspector.heap.enable();
+	await inspector.heap.startSampling();
+
+	// monitorMemory();
+
+	logger.info(`Start heap sampling, memory usage: ${process.memoryUsage.rss() / 1000000} MB`);
+
+	setTimeout(async () => {
+		await stopMemorySample();
+
+		if (!done) {
+			await startMemorySample();
+		}
+	}, 30000);
+}
+
 async function init() {
 	try {
 		if (argv.server) {