mirrors/bibliogram
1
0
Fork 0
mirror of https://git.sr.ht/~cadence/bibliogram synced 2025-12-18 03:58:49 +00:00
Code Issues Projects Releases Wiki Activity

Hopefully the final assistants changes

Browse Source
This commit is contained in:
Cadence Ember
2020-04-13 02:52:04 +12:00
parent dc91575e1c
commit 41cbffa95a
9 changed files with 97 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/structures/Assistant.js
View File

@@ -2,17 +2,20 @@ const {request} = require("../utils/request")
const constants = require("../constants")
class Assistant {
constructor(origin) {
constructor(origin, key) {
this.origin = origin
this.key = key
this.lastRequest = 0
this.lastRequestStatus = constants.symbols.assistant_statuses.NONE
}
available() {
if (this.lastRequestStatus === constants.symbols.assistant_statuses.OFFLINE) {
return Date.now() - this.lastRequest > constants.assistant.offline_request_cooldown
return Date.now() - this.lastRequest > constants.use_assistant.offline_request_cooldown
} else if (this.lastRequestStatus === constants.symbols.assistant_statuses.BLOCKED) {
return Date.now() - this.lastRequest > constants.assistant.blocked_request_cooldown
return Date.now() - this.lastRequest > constants.use_assistant.blocked_request_cooldown
} else if (this.lastRequestStatus === constants.symbols.assistant_statuses.NOT_AUTHENTICATED) {
return false
} else {
return true
}
@@ -21,7 +24,9 @@ class Assistant {
requestUser(username) {
this.lastRequest = Date.now()
return new Promise((resolve, reject) => {
request(`${this.origin}/api/user/v1/${username}`).json().then(root => {
const url = new URL(`${this.origin}/api/user/v1/${username}`)
if (this.key !== null) url.searchParams.append("key", this.key)
request(url.toString()).json().then(root => {
// console.log(root)
if (root.status === "ok") {
this.lastRequestStatus = constants.symbols.assistant_statuses.OK
@@ -30,6 +35,9 @@ class Assistant {
if (root.identifier === "NOT_FOUND") {
this.lastRequestStatus = constants.symbols.assistant_statuses.OK
reject(constants.symbols.NOT_FOUND)
} else if (root.identifier === "NOT_AUTHENTICATED") {
this.lastRequestStatus = constants.symbols.assistant_statuses.NOT_AUTHENTICATED
reject(constants.symbols.assistant_statuses.NOT_AUTHENTICATED)
} else { // blocked
this.lastRequestStatus = constants.symbols.assistant_statuses.BLOCKED
reject(constants.symbols.assistant_statuses.BLOCKED)

7
src/lib/structures/AssistantSwitcher.js
View File

@@ -5,11 +5,11 @@ const db = require("../db")
class AssistantSwitcher {
constructor() {
this.assistants = constants.assistant.origins.map(origin => new Assistant(origin))
this.assistants = constants.use_assistant.assistants.map(data => new Assistant(data.origin, data.key))
}
enabled() {
return constants.assistant.enabled && this.assistants.length
return constants.use_assistant.enabled && this.assistants.length
}
getAvailableAssistants() {
@@ -30,6 +30,9 @@ class AssistantSwitcher {
rejection.catch(() => {}) // otherwise we get a warning that the rejection was handled asynchronously
collectors.userRequestCache.set(`user/${username}`, false, rejection)
return reject(e)
} else if (e === constants.symbols.assistant_statuses.NOT_AUTHENTICATED) {
// no further requests will be successful. the assistant has already marked itself as not available.
console.error(`Assistant ${assistant.origin} refused request, not authenticated`)
}
// that assistant broke. try the next one.
}