UniqueSoft/serpbear
2
0
Fork 0
mirror of https://github.com/towfiqi/serpbear synced 2025-06-26 18:15:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Resolves broken Docker build due to croner package version mismatch.

Browse Source 
closes #247
This commit is contained in:
towfiqi 2024-11-14 23:08:54 +06:00
parent 12eac2b012
commit aeed1f8559
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cron.js
View File

@ -1,7 +1,8 @@
/* eslint-disable no-new */
const Cryptr = require('cryptr'); const Cryptr = require('cryptr');
const { promises } = require('fs'); const { promises } = require('fs');
const { readFile } = require('fs'); const { readFile } = require('fs');
const Cron = require('croner'); const { Cron } = require('croner');
require('dotenv').config({ path: './.env.local' }); require('dotenv').config({ path: './.env.local' });
const getAppSettings = async () => { const getAppSettings = async () => {
@ -71,7 +72,7 @@ const runAppCronJobs = () => {
const scrape_interval = settings.scrape_interval || 'daily'; const scrape_interval = settings.scrape_interval || 'daily';
if (scrape_interval !== 'never') { if (scrape_interval !== 'never') {
const scrapeCronTime = generateCronTime(scrape_interval); const scrapeCronTime = generateCronTime(scrape_interval);
Cron(scrapeCronTime, () => { new Cron(scrapeCronTime, () => {
// console.log('### Running Keyword Position Cron Job!'); // console.log('### Running Keyword Position Cron Job!');
const fetchOpts = { method: 'POST', headers: { Authorization: `Bearer ${process.env.APIKEY}` } }; const fetchOpts = { method: 'POST', headers: { Authorization: `Bearer ${process.env.APIKEY}` } };
fetch(`${process.env.NEXT_PUBLIC_APP_URL}/api/cron`, fetchOpts) fetch(`${process.env.NEXT_PUBLIC_APP_URL}/api/cron`, fetchOpts)
@ -89,7 +90,7 @@ const runAppCronJobs = () => {
if (notif_interval) { if (notif_interval) {
const cronTime = generateCronTime(notif_interval === 'daily' ? 'daily_morning' : notif_interval); const cronTime = generateCronTime(notif_interval === 'daily' ? 'daily_morning' : notif_interval);
if (cronTime) { if (cronTime) {
Cron(cronTime, () => { new Cron(cronTime, () => {
// console.log('### Sending Notification Email...'); // console.log('### Sending Notification Email...');
const fetchOpts = { method: 'POST', headers: { Authorization: `Bearer ${process.env.APIKEY}` } }; const fetchOpts = { method: 'POST', headers: { Authorization: `Bearer ${process.env.APIKEY}` } };
fetch(`${process.env.NEXT_PUBLIC_APP_URL}/api/notify`, fetchOpts) fetch(`${process.env.NEXT_PUBLIC_APP_URL}/api/notify`, fetchOpts)
@ -106,7 +107,7 @@ const runAppCronJobs = () => {
// Run Failed scraping CRON (Every Hour) // Run Failed scraping CRON (Every Hour)
const failedCronTime = generateCronTime('hourly'); const failedCronTime = generateCronTime('hourly');
Cron(failedCronTime, () => { new Cron(failedCronTime, () => {
// console.log('### Retrying Failed Scrapes...'); // console.log('### Retrying Failed Scrapes...');
readFile(`${process.cwd()}/data/failed_queue.json`, { encoding: 'utf-8' }, (err, data) => { readFile(`${process.cwd()}/data/failed_queue.json`, { encoding: 'utf-8' }, (err, data) => {
@ -135,7 +136,7 @@ const runAppCronJobs = () => {
// Run Google Search Console Scraper Daily // Run Google Search Console Scraper Daily
if (process.env.SEARCH_CONSOLE_PRIVATE_KEY && process.env.SEARCH_CONSOLE_CLIENT_EMAIL) { if (process.env.SEARCH_CONSOLE_PRIVATE_KEY && process.env.SEARCH_CONSOLE_CLIENT_EMAIL) {
const searchConsoleCRONTime = generateCronTime('daily'); const searchConsoleCRONTime = generateCronTime('daily');
Cron(searchConsoleCRONTime, () => { new Cron(searchConsoleCRONTime, () => {
const fetchOpts = { method: 'POST', headers: { Authorization: `Bearer ${process.env.APIKEY}` } }; const fetchOpts = { method: 'POST', headers: { Authorization: `Bearer ${process.env.APIKEY}` } };
fetch(`${process.env.NEXT_PUBLIC_APP_URL}/api/searchconsole`, fetchOpts) fetch(`${process.env.NEXT_PUBLIC_APP_URL}/api/searchconsole`, fetchOpts)
.then((res) => res.json()) .then((res) => res.json())

11
package-lock.json generated
View File

@ -17,7 +17,7 @@
"cheerio": "^1.0.0", "cheerio": "^1.0.0",
"concurrently": "^7.6.0", "concurrently": "^7.6.0",
"cookies": "^0.8.0", "cookies": "^0.8.0",
"croner": "^5.3.5", "croner": "^9.0.0",
"cryptr": "^6.0.3", "cryptr": "^6.0.3",
"dayjs": "^1.11.5", "dayjs": "^1.11.5",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
@ -4977,11 +4977,12 @@
} }
}, },
"node_modules/croner": { "node_modules/croner": {
"version": "5.7.0", "version": "9.0.0",
"resolved": "https://registry.npmjs.org/croner/-/croner-5.7.0.tgz", "resolved": "https://registry.npmjs.org/croner/-/croner-9.0.0.tgz",
"integrity": "sha512-9pSLe+tDJnmNak2JeMkz6ZmTCXP5p6vCxSd4kvDqrTJkqAP62j2uAEIZjf8cPDZIakStujqVzh5Y5MIWH3yYAw==", "integrity": "sha512-onMB0OkDjkXunhdW9htFjEhqrD54+M94i6ackoUkjHKbRnXdyEyKRelp4nJ1kAz32+s27jP1FsebpJCVl0BsvA==",
"license": "MIT",
"engines": { "engines": {
"node": ">=6.0" "node": ">=18.0"
} }
}, },
"node_modules/cross-fetch": { "node_modules/cross-fetch": {

2
package.json
View File

@ -27,7 +27,7 @@
"cheerio": "^1.0.0", "cheerio": "^1.0.0",
"concurrently": "^7.6.0", "concurrently": "^7.6.0",
"cookies": "^0.8.0", "cookies": "^0.8.0",
"croner": "^5.3.5", "croner": "^9.0.0",
"cryptr": "^6.0.3", "cryptr": "^6.0.3",
"dayjs": "^1.11.5", "dayjs": "^1.11.5",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",