dde82e25a5
* Convert worker to ESM To use ESM for the worker, I created a package.json file in worker/ with `{ type: "module" }` as its sole content. I then rewrote every import to use ESM syntax. I also tried to set `{ type: "module" }` in the root package.json file to also use ESM in next.config.js. However, this resulted in a weird problem: default imports were now getting imported as objects in this shape: `{ default: <defaultImport> }`. Afaik, this should only be the case if you use "import * as foo from 'bar'" syntax: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import#default_import This is fixed by not using `{ type: "module" }` for some reason. However, then, next.config.js also doesn't support ESM import syntax anymore. The documentation says that if you want to use ESM, you can use next.config.mjs: https://nextjs.org/docs/pages/api-reference/next-config-js But I didn't want to use MJS extension since I don't have any experience with it. For example, not sure if it's good style to mix JS with MJS etc. So I kept the CJS import syntax there. * Ignore worker/ during linting I wasn't able to fix the following errors: /home/runner/work/stacker.news/stacker.news/worker/auction.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/auction.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/earn.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/earn.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/index.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/index.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/nostr.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/nostr.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/ots.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/ots.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/repin.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/repin.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/search.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/search.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/streak.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/streak.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/trust.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/trust.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/views.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/views.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) /home/runner/work/stacker.news/stacker.news/worker/wallet.js:0:0: Parsing error: No Babel config file detected for /home/runner/work/stacker.news/stacker.news/worker/wallet.js. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files. (null) I tried to tell babel where to find the babel config file (.babelrc), specifying the babel config in worker/package.json under "babel", using babel.config.json etc. to no avail. However, afaict, we don't need babel for the worker since it won't run in a browser. Babel is only used to transpile code to target browsers. But it still would be nice to lint the worker code with standard. But we can figure this out later. * Fix worker imports from lib/ and api/ This fixes the issue that we can't use `{ "type": "module" }` in the root package.json since it breaks the app with this error: app | TypeError: next_auth_providers_credentials__WEBPACK_IMPORTED_MODULE_2__ is not a function app | at eval (webpack-internal:///./pages/api/auth/[...nextauth].js:218:20) app | at process.processTicksAndRejections (node:internal/process/task_queues:95:5) app | LND GRPC connection successful app | - error pages/api/auth/[...nextauth].js (139:2) @ CredentialsProvider app | - error Error [TypeError]: next_auth_providers_credentials__WEBPACK_IMPORTED_MODULE_2__ is not a function app | at eval (webpack-internal:///./pages/api/auth/[...nextauth].js:218:20) { app | digest: undefined app | } app | 137 | app | 138 | const providers = [ app | > 139 | CredentialsProvider({ app | | ^ app | 140 | id: 'lightning', app | 141 | name: 'Lightning', app | 142 | credentials: { app | TypeError: next_auth_providers_credentials__WEBPACK_IMPORTED_MODULE_2__ is not a function app | at eval (webpack-internal:///./pages/api/auth/[...nextauth].js:218:20) app | at process.processTicksAndRejections (node:internal/process/task_queues:95:5) build but we need to tell the worker that the files are MJS, else we get this error: worker | file:///app/worker/wallet.js:3 worker | import { datePivot } from '../lib/time.js' worker | ^^^^^^^^^ worker | SyntaxError: Named export 'datePivot' not found. The requested module '../lib/time.js' is a CommonJS module, which may not support all module.exports as named exports. worker | CommonJS modules can always be imported via the default export, for example using: worker | worker | import pkg from '../lib/time.js'; worker | const { datePivot } = pkg; worker | worker | at ModuleJob._instantiate (node:internal/modules/esm/module_job:124:21) worker | at async ModuleJob.run (node:internal/modules/esm/module_job:190:5) worker | worker | Node.js v18.17.0 worker | worker exited with code 1 * Fix global not defined in browser context * Also ignore api/ and lib/ during linting I did not want to do this but I was not able to fix this error in any other way I tried: /home/ekzyis/programming/stacker.news/api/lnd/index.js:0:0: Parsing error: No Babel config file detected for /home/ekzyis/programming/stacker.news/api/lnd/index.js. Either disable config file checking with requ ireConfigFile: false, or configure Babel so that it can find the config files. (null) Did not want to look deeper into all this standard, eslint, babel configuration stuff ... --------- Co-authored-by: ekzyis <ek@stacker.news> Co-authored-by: Keyan <34140557+huumn@users.noreply.github.com>
111 lines
4.3 KiB
JavaScript
111 lines
4.3 KiB
JavaScript
const STREAK_THRESHOLD = 100
|
|
|
|
export function computeStreaks ({ models }) {
|
|
return async function () {
|
|
console.log('computing streaks')
|
|
|
|
// get all eligible users in the last day
|
|
// if the user doesn't have an active streak, add one
|
|
// if they have an active streak but didn't maintain it, end it
|
|
await models.$executeRawUnsafe(
|
|
`WITH day_streaks (id) AS (
|
|
SELECT "userId"
|
|
FROM
|
|
((SELECT "userId", floor(sum("ItemAct".msats)/1000) as sats_spent
|
|
FROM "ItemAct"
|
|
WHERE (created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/Chicago')::date >= (now() AT TIME ZONE 'America/Chicago' - interval '1 day')::date
|
|
GROUP BY "userId")
|
|
UNION ALL
|
|
(SELECT "userId", sats as sats_spent
|
|
FROM "Donation"
|
|
WHERE (created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/Chicago')::date >= (now() AT TIME ZONE 'America/Chicago' - interval '1 day')::date
|
|
)) spending
|
|
GROUP BY "userId"
|
|
HAVING sum(sats_spent) >= 100
|
|
), existing_streaks (id, started_at) AS (
|
|
SELECT "userId", "startedAt"
|
|
FROM "Streak"
|
|
WHERE "Streak"."endedAt" IS NULL
|
|
), new_streaks (id) AS (
|
|
SELECT day_streaks.id
|
|
FROM day_streaks
|
|
LEFT JOIN existing_streaks ON existing_streaks.id = day_streaks.id
|
|
WHERE existing_streaks.id IS NULL
|
|
), ending_streaks (id) AS (
|
|
SELECT existing_streaks.id
|
|
FROM existing_streaks
|
|
LEFT JOIN day_streaks ON existing_streaks.id = day_streaks.id
|
|
WHERE day_streaks.id IS NULL
|
|
), extending_streaks (id, started_at) AS (
|
|
SELECT existing_streaks.id, existing_streaks.started_at
|
|
FROM existing_streaks
|
|
JOIN day_streaks ON existing_streaks.id = day_streaks.id
|
|
),
|
|
-- a bunch of mutations
|
|
streak_insert AS (
|
|
INSERT INTO "Streak" ("userId", "startedAt", created_at, updated_at)
|
|
SELECT id, (now() AT TIME ZONE 'America/Chicago' - interval '1 day')::date, now_utc(), now_utc()
|
|
FROM new_streaks
|
|
), user_update_new_streaks AS (
|
|
UPDATE users SET streak = 1 FROM new_streaks WHERE new_streaks.id = users.id
|
|
), user_update_end_streaks AS (
|
|
UPDATE users SET streak = NULL FROM ending_streaks WHERE ending_streaks.id = users.id
|
|
), user_update_extend_streaks AS (
|
|
UPDATE users
|
|
SET streak = (now() AT TIME ZONE 'America/Chicago')::date - extending_streaks.started_at
|
|
FROM extending_streaks WHERE extending_streaks.id = users.id
|
|
)
|
|
UPDATE "Streak"
|
|
SET "endedAt" = (now() AT TIME ZONE 'America/Chicago' - interval '1 day')::date, updated_at = now_utc()
|
|
FROM ending_streaks
|
|
WHERE ending_streaks.id = "Streak"."userId" AND "endedAt" IS NULL`)
|
|
|
|
console.log('done computing streaks')
|
|
}
|
|
}
|
|
|
|
export function checkStreak ({ models }) {
|
|
return async function ({ data: { id } }) {
|
|
console.log('checking streak', id)
|
|
|
|
// if user is actively streaking skip
|
|
const streak = await models.streak.findFirst({
|
|
where: {
|
|
userId: Number(id),
|
|
endedAt: null
|
|
}
|
|
})
|
|
|
|
if (streak) {
|
|
console.log('done checking streak', id)
|
|
return
|
|
}
|
|
|
|
await models.$executeRaw`
|
|
WITH streak_started (id) AS (
|
|
SELECT "userId"
|
|
FROM
|
|
((SELECT "userId", floor(sum("ItemAct".msats)/1000) as sats_spent
|
|
FROM "ItemAct"
|
|
WHERE (created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/Chicago')::date >= (now() AT TIME ZONE 'America/Chicago')::date
|
|
AND "userId" = ${Number(id)}
|
|
GROUP BY "userId")
|
|
UNION ALL
|
|
(SELECT "userId", sats as sats_spent
|
|
FROM "Donation"
|
|
WHERE (created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/Chicago')::date >= (now() AT TIME ZONE 'America/Chicago')::date
|
|
AND "userId" = ${Number(id)}
|
|
)) spending
|
|
GROUP BY "userId"
|
|
HAVING sum(sats_spent) >= ${STREAK_THRESHOLD}
|
|
), user_start_streak AS (
|
|
UPDATE users SET streak = 0 FROM streak_started WHERE streak_started.id = users.id
|
|
)
|
|
INSERT INTO "Streak" ("userId", "startedAt", created_at, updated_at)
|
|
SELECT id, (now() AT TIME ZONE 'America/Chicago')::date, now_utc(), now_utc()
|
|
FROM streak_started`
|
|
|
|
console.log('done checking streak', id)
|
|
}
|
|
}
|