cross-seed 6.13.6 → 7.0.0-2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -13
- package/dist/Result.d.ts +27 -0
- package/dist/action.d.ts +34 -0
- package/dist/action.js +2 -1
- package/dist/action.js.map +1 -1
- package/dist/arr.d.ts +31 -0
- package/dist/arr.js +107 -39
- package/dist/arr.js.map +1 -1
- package/dist/auth.d.ts +3 -0
- package/dist/auth.js +9 -6
- package/dist/auth.js.map +1 -1
- package/dist/clients/Deluge.d.ts +153 -0
- package/dist/clients/Deluge.js +6 -6
- package/dist/clients/Deluge.js.map +1 -1
- package/dist/clients/QBittorrent.d.ts +218 -0
- package/dist/clients/RTorrent.d.ts +43 -0
- package/dist/clients/RTorrent.js +6 -3
- package/dist/clients/RTorrent.js.map +1 -1
- package/dist/clients/TorrentClient.d.ts +108 -0
- package/dist/clients/TorrentClient.js +136 -67
- package/dist/clients/TorrentClient.js.map +1 -1
- package/dist/clients/Transmission.d.ts +43 -0
- package/dist/clients/Transmission.js +2 -2
- package/dist/clients/Transmission.js.map +1 -1
- package/dist/cmd.d.ts +2 -0
- package/dist/cmd.js +42 -110
- package/dist/cmd.js.map +1 -1
- package/dist/configSchema.d.ts +1 -0
- package/dist/configSchema.js +1 -666
- package/dist/configSchema.js.map +1 -1
- package/dist/configuration.d.ts +63 -0
- package/dist/configuration.js +263 -24
- package/dist/configuration.js.map +1 -1
- package/dist/constants.d.ts +108 -0
- package/dist/constants.js +2 -32
- package/dist/constants.js.map +1 -1
- package/dist/dataFiles.d.ts +8 -0
- package/dist/dataFiles.js +21 -6
- package/dist/dataFiles.js.map +1 -1
- package/dist/db.d.ts +3 -0
- package/dist/dbConfig.d.ts +4 -0
- package/dist/dbConfig.js +67 -0
- package/dist/dbConfig.js.map +1 -0
- package/dist/decide.d.ts +25 -0
- package/dist/decide.js +4 -4
- package/dist/decide.js.map +1 -1
- package/dist/diff.d.ts +1 -0
- package/dist/errors.d.ts +3 -0
- package/dist/errors.js +0 -9
- package/dist/errors.js.map +1 -1
- package/dist/indexers.d.ts +105 -0
- package/dist/indexers.js +82 -14
- package/dist/indexers.js.map +1 -1
- package/dist/inject.d.ts +2 -0
- package/dist/jobs.d.ts +29 -0
- package/dist/jobs.js +14 -9
- package/dist/jobs.js.map +1 -1
- package/dist/logger.d.ts +29 -0
- package/dist/logger.js +18 -4
- package/dist/logger.js.map +1 -1
- package/dist/migrations/00-initialSchema.d.ts +9 -0
- package/dist/migrations/01-jobs.d.ts +9 -0
- package/dist/migrations/02-timestamps.d.ts +9 -0
- package/dist/migrations/03-rateLimits.d.ts +9 -0
- package/dist/migrations/04-auth.d.ts +9 -0
- package/dist/migrations/04-auth.js +1 -1
- package/dist/migrations/04-auth.js.map +1 -1
- package/dist/migrations/05-caps.d.ts +9 -0
- package/dist/migrations/06-uniqueDecisions.d.ts +9 -0
- package/dist/migrations/07-limits.d.ts +9 -0
- package/dist/migrations/08-rss.d.ts +9 -0
- package/dist/migrations/09-clientAndDataSearchees.d.ts +9 -0
- package/dist/migrations/10-indexerNameAudioBookCaps.d.ts +9 -0
- package/dist/migrations/11-trackers.d.ts +9 -0
- package/dist/migrations/12-user-auth.d.ts +9 -0
- package/dist/migrations/12-user-auth.js +22 -0
- package/dist/migrations/12-user-auth.js.map +1 -0
- package/dist/migrations/13-settings.d.ts +9 -0
- package/dist/migrations/13-settings.js +23 -0
- package/dist/migrations/13-settings.js.map +1 -0
- package/dist/migrations/14-indexer-enabled-flag.d.ts +9 -0
- package/dist/migrations/14-indexer-enabled-flag.js +12 -0
- package/dist/migrations/14-indexer-enabled-flag.js.map +1 -0
- package/dist/migrations/15-remove-url-unique-constraint.d.ts +9 -0
- package/dist/migrations/15-remove-url-unique-constraint.js +14 -0
- package/dist/migrations/15-remove-url-unique-constraint.js.map +1 -0
- package/dist/migrations/16-prune-inactive-indexers.d.ts +9 -0
- package/dist/migrations/16-prune-inactive-indexers.js +17 -0
- package/dist/migrations/16-prune-inactive-indexers.js.map +1 -0
- package/dist/migrations/migrations.d.ts +13 -0
- package/dist/migrations/migrations.js +10 -0
- package/dist/migrations/migrations.js.map +1 -1
- package/dist/parseTorrent.d.ts +53 -0
- package/dist/pipeline.d.ts +41 -0
- package/dist/pipeline.js +57 -10
- package/dist/pipeline.js.map +1 -1
- package/dist/preFilter.d.ts +25 -0
- package/dist/preFilter.js +15 -15
- package/dist/preFilter.js.map +1 -1
- package/dist/problems/linking.d.ts +2 -0
- package/dist/problems/linking.js +80 -0
- package/dist/problems/linking.js.map +1 -0
- package/dist/problems/path.d.ts +22 -0
- package/dist/problems/path.js +96 -0
- package/dist/problems/path.js.map +1 -0
- package/dist/problems.d.ts +13 -0
- package/dist/problems.js +48 -0
- package/dist/problems.js.map +1 -0
- package/dist/pushNotifier.d.ts +19 -0
- package/dist/routes/baseApi.d.ts +2 -0
- package/dist/routes/baseApi.js +354 -0
- package/dist/routes/baseApi.js.map +1 -0
- package/dist/routes/indexerApi.d.ts +6 -0
- package/dist/routes/indexerApi.js +165 -0
- package/dist/routes/indexerApi.js.map +1 -0
- package/dist/routes/staticFrontendPlugin.d.ts +4 -0
- package/dist/routes/staticFrontendPlugin.js +61 -0
- package/dist/routes/staticFrontendPlugin.js.map +1 -0
- package/dist/runtimeConfig.d.ts +6 -0
- package/dist/runtimeConfig.js +17 -1
- package/dist/runtimeConfig.js.map +1 -1
- package/dist/searchee.d.ts +108 -0
- package/dist/searchee.js +36 -5
- package/dist/searchee.js.map +1 -1
- package/dist/server.d.ts +4 -0
- package/dist/server.js +38 -429
- package/dist/server.js.map +1 -1
- package/dist/services/indexerService.d.ts +96 -0
- package/dist/services/indexerService.js +287 -0
- package/dist/services/indexerService.js.map +1 -0
- package/dist/sessionCookies.d.ts +5 -0
- package/dist/sessionCookies.js +27 -0
- package/dist/sessionCookies.js.map +1 -0
- package/dist/startup.d.ts +25 -0
- package/dist/startup.js +105 -151
- package/dist/startup.js.map +1 -1
- package/dist/torrent.d.ts +69 -0
- package/dist/torrent.js +17 -13
- package/dist/torrent.js.map +1 -1
- package/dist/torznab.d.ts +60 -0
- package/dist/torznab.js +14 -89
- package/dist/torznab.js.map +1 -1
- package/dist/trpc/fastifyAdapter.d.ts +2 -0
- package/dist/trpc/fastifyAdapter.js +9 -0
- package/dist/trpc/fastifyAdapter.js.map +1 -0
- package/dist/trpc/index.d.ts +49 -0
- package/dist/trpc/index.js +53 -0
- package/dist/trpc/index.js.map +1 -0
- package/dist/trpc/routers/auth.d.ts +43 -0
- package/dist/trpc/routers/auth.js +116 -0
- package/dist/trpc/routers/auth.js.map +1 -0
- package/dist/trpc/routers/clients.d.ts +21 -0
- package/dist/trpc/routers/clients.js +65 -0
- package/dist/trpc/routers/clients.js.map +1 -0
- package/dist/trpc/routers/health.d.ts +14 -0
- package/dist/trpc/routers/health.js +20 -0
- package/dist/trpc/routers/health.js.map +1 -0
- package/dist/trpc/routers/index.d.ts +391 -0
- package/dist/trpc/routers/index.js +23 -0
- package/dist/trpc/routers/index.js.map +1 -0
- package/dist/trpc/routers/indexers.d.ts +75 -0
- package/dist/trpc/routers/indexers.js +79 -0
- package/dist/trpc/routers/indexers.js.map +1 -0
- package/dist/trpc/routers/jobs.d.ts +33 -0
- package/dist/trpc/routers/jobs.js +84 -0
- package/dist/trpc/routers/jobs.js.map +1 -0
- package/dist/trpc/routers/logs.d.ts +27 -0
- package/dist/trpc/routers/logs.js +91 -0
- package/dist/trpc/routers/logs.js.map +1 -0
- package/dist/trpc/routers/searchees.d.ts +51 -0
- package/dist/trpc/routers/searchees.js +156 -0
- package/dist/trpc/routers/searchees.js.map +1 -0
- package/dist/trpc/routers/settings.d.ts +83 -0
- package/dist/trpc/routers/settings.js +92 -0
- package/dist/trpc/routers/settings.js.map +1 -0
- package/dist/trpc/routers/stats.d.ts +42 -0
- package/dist/trpc/routers/stats.js +102 -0
- package/dist/trpc/routers/stats.js.map +1 -0
- package/dist/userAuth.d.ts +21 -0
- package/dist/userAuth.js +86 -0
- package/dist/userAuth.js.map +1 -0
- package/dist/utils/authUtils.d.ts +10 -0
- package/dist/utils/authUtils.js +24 -0
- package/dist/utils/authUtils.js.map +1 -0
- package/dist/utils/logWatcher.d.ts +28 -0
- package/dist/utils/logWatcher.js +218 -0
- package/dist/utils/logWatcher.js.map +1 -0
- package/dist/utils/object.d.ts +1 -0
- package/dist/utils/object.js +4 -0
- package/dist/utils/object.js.map +1 -0
- package/dist/utils.d.ts +175 -0
- package/dist/utils.js +61 -38
- package/dist/utils.js.map +1 -1
- package/dist/webui/assets/FieldInfo-Bxj_j8SJ.js +1 -0
- package/dist/webui/assets/Page-C3rteCZt.js +1 -0
- package/dist/webui/assets/array-field-DVSC6nHP.js +1 -0
- package/dist/webui/assets/badge-DTZMtS0e.js +1 -0
- package/dist/webui/assets/check-Bu3ldi63.js +1 -0
- package/dist/webui/assets/chevron-down-CRy8M0kJ.js +1 -0
- package/dist/webui/assets/clients-CW8oEZoQ.js +1 -0
- package/dist/webui/assets/connect-YBNsnjWT.js +1 -0
- package/dist/webui/assets/debug-mz8-WYZj.js +1 -0
- package/dist/webui/assets/directories-BSK28RgR.js +1 -0
- package/dist/webui/assets/duration-field-C6xoSlJg.js +1 -0
- package/dist/webui/assets/general-lJJxZhH7.js +1 -0
- package/dist/webui/assets/health-CXbsVrie.js +1 -0
- package/dist/webui/assets/index-Bi48hI2z.js +54 -0
- package/dist/webui/assets/index-C-Ul7GNg.css +1 -0
- package/dist/webui/assets/index-C2cH1Gst.js +1 -0
- package/dist/webui/assets/index-Cc5bDmJr.js +1 -0
- package/dist/webui/assets/jobs-CxmNab9w.js +1 -0
- package/dist/webui/assets/library-vaj2W8sE.js +1 -0
- package/dist/webui/assets/loader-circle-M0gu1gZ-.js +1 -0
- package/dist/webui/assets/logs-Cu9RyKS0.js +1 -0
- package/dist/webui/assets/search-2R5sIdT8.js +1 -0
- package/dist/webui/assets/select-field-BCqNLDrJ.js +1 -0
- package/dist/webui/assets/select-zHgqMzLj.js +1 -0
- package/dist/webui/assets/settings-CMYjpTbZ.js +1 -0
- package/dist/webui/assets/submit-button-BtcnyggQ.js +1 -0
- package/dist/webui/assets/switch-G0W3uJVN.js +1 -0
- package/dist/webui/assets/switch-field-IBd9ORNq.js +1 -0
- package/dist/webui/assets/table-DvgJU7Gh.js +1 -0
- package/dist/webui/assets/test-tube-BIwmoM45.js +1 -0
- package/dist/webui/assets/text-field-DruSbGhy.js +1 -0
- package/dist/webui/assets/time-BSMZjmyW.js +1 -0
- package/dist/webui/assets/trackers-D-OpAe63.js +7 -0
- package/dist/webui/assets/use-form-validation-context-BkAfWAh0.js +1 -0
- package/dist/webui/assets/use-settings-form-submit-CDRh-E9U.js +2 -0
- package/dist/webui/assets/useQuery-A4Hv_4uX.js +1 -0
- package/dist/webui/index.html +13 -0
- package/node_modules/@cross-seed/shared/dist/configSchema.d.ts +261 -0
- package/node_modules/@cross-seed/shared/dist/configSchema.d.ts.map +1 -0
- package/node_modules/@cross-seed/shared/dist/configSchema.js +53 -0
- package/node_modules/@cross-seed/shared/dist/configSchema.js.map +1 -0
- package/node_modules/@cross-seed/shared/dist/constants.d.ts +122 -0
- package/node_modules/@cross-seed/shared/dist/constants.d.ts.map +1 -0
- package/node_modules/@cross-seed/shared/dist/constants.js +127 -0
- package/node_modules/@cross-seed/shared/dist/constants.js.map +1 -0
- package/node_modules/@cross-seed/shared/dist/tsconfig.tsbuildinfo +1 -0
- package/node_modules/@cross-seed/shared/dist/utils.d.ts +6 -0
- package/node_modules/@cross-seed/shared/dist/utils.d.ts.map +1 -0
- package/node_modules/@cross-seed/shared/dist/utils.js +9 -0
- package/node_modules/@cross-seed/shared/dist/utils.js.map +1 -0
- package/node_modules/@cross-seed/shared/package.json +22 -0
- package/package.json +35 -11
- package/dist/config.template.cjs +0 -353
- package/dist/config.template.cjs.map +0 -1
package/dist/indexers.js
CHANGED
|
@@ -16,7 +16,7 @@ const allFields = {
|
|
|
16
16
|
name: "name",
|
|
17
17
|
apikey: "apikey",
|
|
18
18
|
trackers: "trackers",
|
|
19
|
-
|
|
19
|
+
enabled: "enabled",
|
|
20
20
|
status: "status",
|
|
21
21
|
retryAfter: "retry_after",
|
|
22
22
|
searchCap: "search_cap",
|
|
@@ -63,10 +63,17 @@ export const ALL_CAPS = {
|
|
|
63
63
|
tvMazeId: true,
|
|
64
64
|
},
|
|
65
65
|
};
|
|
66
|
-
function deserialize(dbIndexer) {
|
|
66
|
+
export function deserialize(dbIndexer) {
|
|
67
67
|
const { trackers, tvIdCaps, movieIdCaps, catCaps, limitsCaps, ...rest } = dbIndexer;
|
|
68
68
|
return {
|
|
69
69
|
...rest,
|
|
70
|
+
enabled: Boolean(rest.enabled),
|
|
71
|
+
searchCap: Boolean(rest.searchCap),
|
|
72
|
+
tvSearchCap: Boolean(rest.tvSearchCap),
|
|
73
|
+
movieSearchCap: Boolean(rest.movieSearchCap),
|
|
74
|
+
musicSearchCap: Boolean(rest.musicSearchCap),
|
|
75
|
+
audioSearchCap: Boolean(rest.audioSearchCap),
|
|
76
|
+
bookSearchCap: Boolean(rest.bookSearchCap),
|
|
70
77
|
trackers: JSON.parse(trackers ?? "null"),
|
|
71
78
|
tvIdCaps: JSON.parse(tvIdCaps ?? "null"),
|
|
72
79
|
movieIdCaps: JSON.parse(movieIdCaps ?? "null"),
|
|
@@ -75,19 +82,13 @@ function deserialize(dbIndexer) {
|
|
|
75
82
|
};
|
|
76
83
|
}
|
|
77
84
|
/**
|
|
78
|
-
* All indexers
|
|
85
|
+
* All indexers that users currently have configured regardless of whether they are working.
|
|
79
86
|
*/
|
|
80
87
|
export async function getAllIndexers() {
|
|
81
88
|
return (await db("indexer").select(allFields)).map(deserialize);
|
|
82
89
|
}
|
|
83
90
|
/**
|
|
84
|
-
*
|
|
85
|
-
*/
|
|
86
|
-
export async function getActiveIndexers() {
|
|
87
|
-
return (await db("indexer").where({ active: true }).select(allFields)).map(deserialize);
|
|
88
|
-
}
|
|
89
|
-
/**
|
|
90
|
-
* Indexers that are currently working.
|
|
91
|
+
* Indexers that are currently working and enabled.
|
|
91
92
|
*/
|
|
92
93
|
export async function getEnabledIndexers() {
|
|
93
94
|
return (await db("indexer")
|
|
@@ -103,7 +104,7 @@ export async function getEnabledIndexers() {
|
|
|
103
104
|
cat_caps: null,
|
|
104
105
|
limits_caps: null,
|
|
105
106
|
})
|
|
106
|
-
.where({
|
|
107
|
+
.where({ enabled: true, search_cap: true })
|
|
107
108
|
.where((i) => i
|
|
108
109
|
.where({ status: null })
|
|
109
110
|
.orWhere({ status: IndexerStatus.OK })
|
|
@@ -126,10 +127,10 @@ export async function updateSearchTimestamps(name, indexerIds) {
|
|
|
126
127
|
for (const indexerId of indexerIds) {
|
|
127
128
|
await db.transaction(async (trx) => {
|
|
128
129
|
const now = Date.now();
|
|
129
|
-
const { id: searchee_id } = await trx("searchee")
|
|
130
|
+
const { id: searchee_id } = (await trx("searchee")
|
|
130
131
|
.where({ name })
|
|
131
132
|
.select("id")
|
|
132
|
-
.first();
|
|
133
|
+
.first());
|
|
133
134
|
await trx("timestamp")
|
|
134
135
|
.insert({
|
|
135
136
|
searchee_id,
|
|
@@ -138,7 +139,7 @@ export async function updateSearchTimestamps(name, indexerIds) {
|
|
|
138
139
|
first_searched: now,
|
|
139
140
|
})
|
|
140
141
|
.onConflict(["searchee_id", "indexer_id"])
|
|
141
|
-
.merge(["
|
|
142
|
+
.merge(["last_searched"]);
|
|
142
143
|
});
|
|
143
144
|
}
|
|
144
145
|
}
|
|
@@ -177,4 +178,71 @@ export async function getHostToNameMap() {
|
|
|
177
178
|
}
|
|
178
179
|
return hostToName;
|
|
179
180
|
}
|
|
181
|
+
function indexerProblemId(suffix, indexerId) {
|
|
182
|
+
return `indexer:${suffix}:${indexerId}`;
|
|
183
|
+
}
|
|
184
|
+
function indexerDisplayName(url, name) {
|
|
185
|
+
return name?.trim() || url;
|
|
186
|
+
}
|
|
187
|
+
export async function collectIndexerProblems() {
|
|
188
|
+
const problems = [];
|
|
189
|
+
const indexers = await getAllIndexers();
|
|
190
|
+
if (!indexers.length) {
|
|
191
|
+
problems.push({
|
|
192
|
+
id: "indexer:none-configured",
|
|
193
|
+
severity: "error",
|
|
194
|
+
summary: "No indexers configured.",
|
|
195
|
+
details: "Add at least one indexer so cross-seed can search for releases.",
|
|
196
|
+
});
|
|
197
|
+
return problems;
|
|
198
|
+
}
|
|
199
|
+
const enabledIndexers = await getEnabledIndexers();
|
|
200
|
+
if (!enabledIndexers.length) {
|
|
201
|
+
problems.push({
|
|
202
|
+
id: "indexer:none-enabled",
|
|
203
|
+
severity: "error",
|
|
204
|
+
summary: "All configured indexers are disabled.",
|
|
205
|
+
details: "Enable at least one indexer so cross-seed can run searches.",
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
const now = Date.now();
|
|
209
|
+
for (const indexer of indexers) {
|
|
210
|
+
const name = indexerDisplayName(indexer.url, indexer.name);
|
|
211
|
+
if (!indexer.searchCap) {
|
|
212
|
+
problems.push({
|
|
213
|
+
id: indexerProblemId("no-search-cap", indexer.id),
|
|
214
|
+
severity: "warning",
|
|
215
|
+
summary: `Indexer "${name}" does not support searching.`,
|
|
216
|
+
details: "Update the indexer's capabilities (caps) in Prowlarr/Jackett or disable it for searching.",
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
if (indexer.status === IndexerStatus.RATE_LIMITED &&
|
|
220
|
+
typeof indexer.retryAfter === "number" &&
|
|
221
|
+
indexer.retryAfter > now) {
|
|
222
|
+
problems.push({
|
|
223
|
+
id: indexerProblemId("rate-limited", indexer.id),
|
|
224
|
+
severity: "warning",
|
|
225
|
+
summary: `Indexer "${name}" is rate limited.`,
|
|
226
|
+
details: `Cross-seed will retry after ${humanReadableDate(indexer.retryAfter)}.`,
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
if (indexer.status === IndexerStatus.UNKNOWN_ERROR) {
|
|
230
|
+
problems.push({
|
|
231
|
+
id: indexerProblemId("unknown-error", indexer.id),
|
|
232
|
+
severity: "warning",
|
|
233
|
+
summary: `Indexer "${name}" recently failed.`,
|
|
234
|
+
details: "Check logs for the underlying error and verify the indexer configuration.",
|
|
235
|
+
});
|
|
236
|
+
}
|
|
237
|
+
if (!indexer.enabled) {
|
|
238
|
+
problems.push({
|
|
239
|
+
id: indexerProblemId("disabled", indexer.id),
|
|
240
|
+
severity: "info",
|
|
241
|
+
summary: `Indexer "${name}" is disabled.`,
|
|
242
|
+
details: "Re-enable the indexer if you want cross-seed to include it in searches.",
|
|
243
|
+
});
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
return problems;
|
|
247
|
+
}
|
|
180
248
|
//# sourceMappingURL=indexers.js.map
|
package/dist/indexers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indexers.js","sourceRoot":"","sources":["../src/indexers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"indexers.js","sourceRoot":"","sources":["../src/indexers.ts"],"names":[],"mappings":"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"}
|
package/dist/inject.d.ts
ADDED
package/dist/jobs.d.ts
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { RuntimeConfig } from "./runtimeConfig.js";
|
|
2
|
+
export declare enum JobName {
|
|
3
|
+
RSS = "rss",
|
|
4
|
+
SEARCH = "search",
|
|
5
|
+
UPDATE_INDEXER_CAPS = "updateIndexerCaps",
|
|
6
|
+
INJECT = "inject",
|
|
7
|
+
CLEANUP = "cleanup"
|
|
8
|
+
}
|
|
9
|
+
declare class Job {
|
|
10
|
+
name: JobName;
|
|
11
|
+
cadence: number;
|
|
12
|
+
exec: () => Promise<void>;
|
|
13
|
+
isActive: boolean;
|
|
14
|
+
runAheadOfSchedule: boolean;
|
|
15
|
+
delayNextRun: boolean;
|
|
16
|
+
configOverride: Partial<RuntimeConfig>;
|
|
17
|
+
shouldRunFn: () => boolean;
|
|
18
|
+
constructor(name: JobName, cadence: number, exec: () => Promise<void>, shouldRunFn?: () => boolean);
|
|
19
|
+
shouldRun(): boolean;
|
|
20
|
+
run(): Promise<boolean>;
|
|
21
|
+
}
|
|
22
|
+
export declare function getJobs(): Job[];
|
|
23
|
+
export declare function getJobLastRun(name: JobName): Promise<number | undefined>;
|
|
24
|
+
export declare function checkJobs(options?: {
|
|
25
|
+
isFirstRun: boolean;
|
|
26
|
+
useQueue: boolean;
|
|
27
|
+
}): Promise<void>;
|
|
28
|
+
export declare function jobsLoop(): Promise<void>;
|
|
29
|
+
export {};
|
package/dist/jobs.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import ms from "ms";
|
|
2
2
|
import { Action } from "./constants.js";
|
|
3
3
|
import { cleanupDB, db } from "./db.js";
|
|
4
|
-
import { exitOnCrossSeedErrors } from "./errors.js";
|
|
5
4
|
import { injectSavedTorrents } from "./inject.js";
|
|
6
|
-
import { Label, logger } from "./logger.js";
|
|
5
|
+
import { Label, logger, exitOnCrossSeedErrors } from "./logger.js";
|
|
7
6
|
import { bulkSearch, scanRssFeeds } from "./pipeline.js";
|
|
8
7
|
import { getRuntimeConfig } from "./runtimeConfig.js";
|
|
9
8
|
import { updateCaps } from "./torznab.js";
|
|
@@ -25,7 +24,8 @@ class Job {
|
|
|
25
24
|
runAheadOfSchedule;
|
|
26
25
|
delayNextRun;
|
|
27
26
|
configOverride;
|
|
28
|
-
|
|
27
|
+
shouldRunFn;
|
|
28
|
+
constructor(name, cadence, exec, shouldRunFn = () => true) {
|
|
29
29
|
this.name = name;
|
|
30
30
|
this.cadence = cadence;
|
|
31
31
|
this.exec = exec;
|
|
@@ -33,6 +33,10 @@ class Job {
|
|
|
33
33
|
this.runAheadOfSchedule = false;
|
|
34
34
|
this.delayNextRun = false;
|
|
35
35
|
this.configOverride = {};
|
|
36
|
+
this.shouldRunFn = shouldRunFn;
|
|
37
|
+
}
|
|
38
|
+
shouldRun() {
|
|
39
|
+
return this.shouldRunFn();
|
|
36
40
|
}
|
|
37
41
|
async run() {
|
|
38
42
|
if (this.isActive)
|
|
@@ -59,16 +63,14 @@ class Job {
|
|
|
59
63
|
}
|
|
60
64
|
}
|
|
61
65
|
function createJobs() {
|
|
62
|
-
const { action, rssCadence, searchCadence
|
|
66
|
+
const { action, rssCadence, searchCadence } = getRuntimeConfig();
|
|
63
67
|
if (rssCadence) {
|
|
64
|
-
jobs.push(new Job(JobName.RSS, rssCadence, scanRssFeeds));
|
|
68
|
+
jobs.push(new Job(JobName.RSS, rssCadence, scanRssFeeds, () => !!getRuntimeConfig().rssCadence));
|
|
65
69
|
}
|
|
66
70
|
if (searchCadence) {
|
|
67
|
-
jobs.push(new Job(JobName.SEARCH, searchCadence, bulkSearch));
|
|
68
|
-
}
|
|
69
|
-
if (torznab.length > 0) {
|
|
70
|
-
jobs.push(new Job(JobName.UPDATE_INDEXER_CAPS, ms("1 day"), updateCaps));
|
|
71
|
+
jobs.push(new Job(JobName.SEARCH, searchCadence, bulkSearch, () => !!getRuntimeConfig().searchCadence));
|
|
71
72
|
}
|
|
73
|
+
jobs.push(new Job(JobName.UPDATE_INDEXER_CAPS, ms("1 day"), updateCaps));
|
|
72
74
|
if (action === Action.INJECT) {
|
|
73
75
|
jobs.push(new Job(JobName.INJECT, ms("1 hour"), injectSavedTorrents));
|
|
74
76
|
}
|
|
@@ -99,6 +101,9 @@ export async function checkJobs(options = { isFirstRun: false, useQueue: false }
|
|
|
99
101
|
return withMutex(Mutex.CHECK_JOBS, { useQueue: options.useQueue }, async () => {
|
|
100
102
|
const now = Date.now();
|
|
101
103
|
for (const job of jobs) {
|
|
104
|
+
if (!job.shouldRun()) {
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
102
107
|
const lastRun = await getJobLastRun(job.name);
|
|
103
108
|
const eligibilityTs = lastRun ? lastRun + job.cadence : now;
|
|
104
109
|
if (options.isFirstRun) {
|
package/dist/jobs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobs.js","sourceRoot":"","sources":["../src/jobs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"jobs.js","sourceRoot":"","sources":["../src/jobs.ts"],"names":[],"mappings":"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"}
|
package/dist/logger.d.ts
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import winston from "winston";
|
|
2
|
+
export declare enum Label {
|
|
3
|
+
QBITTORRENT = "qbittorrent",
|
|
4
|
+
RTORRENT = "rtorrent",
|
|
5
|
+
TRANSMISSION = "transmission",
|
|
6
|
+
DELUGE = "deluge",
|
|
7
|
+
DECIDE = "decide",
|
|
8
|
+
PREFILTER = "prefilter",
|
|
9
|
+
CONFIG = "config",
|
|
10
|
+
TORZNAB = "torznab",
|
|
11
|
+
SERVER = "server",
|
|
12
|
+
SCHEDULER = "scheduler",
|
|
13
|
+
SEARCH = "search",
|
|
14
|
+
RSS = "rss",
|
|
15
|
+
ANNOUNCE = "announce",
|
|
16
|
+
WEBHOOK = "webhook",
|
|
17
|
+
INJECT = "inject",
|
|
18
|
+
PERF = "perf",
|
|
19
|
+
CLEANUP = "cleanup",
|
|
20
|
+
ARRS = "arrs",
|
|
21
|
+
RADARR = "radarr",
|
|
22
|
+
SONARR = "sonarr",
|
|
23
|
+
AUTH = "auth",
|
|
24
|
+
INDEX = "index"
|
|
25
|
+
}
|
|
26
|
+
export declare let logger: winston.Logger;
|
|
27
|
+
export declare function logOnce(cacheKey: string, cb: () => void, ttl?: number): void;
|
|
28
|
+
export declare function initializeLogger(options: Record<string, unknown>): void;
|
|
29
|
+
export declare function exitOnCrossSeedErrors(error: unknown): void;
|
package/dist/logger.js
CHANGED
|
@@ -3,8 +3,9 @@ import stripAnsi from "strip-ansi";
|
|
|
3
3
|
import winston from "winston";
|
|
4
4
|
import DailyRotateFile from "winston-daily-rotate-file";
|
|
5
5
|
import { parseClientEntry } from "./clients/TorrentClient.js";
|
|
6
|
-
import { appDir
|
|
6
|
+
import { appDir } from "./configuration.js";
|
|
7
7
|
import { LOGS_FOLDER } from "./constants.js";
|
|
8
|
+
import { CrossSeedError } from "./errors.js";
|
|
8
9
|
export var Label;
|
|
9
10
|
(function (Label) {
|
|
10
11
|
Label["QBITTORRENT"] = "qbittorrent";
|
|
@@ -13,10 +14,9 @@ export var Label;
|
|
|
13
14
|
Label["DELUGE"] = "deluge";
|
|
14
15
|
Label["DECIDE"] = "decide";
|
|
15
16
|
Label["PREFILTER"] = "prefilter";
|
|
16
|
-
Label["
|
|
17
|
+
Label["CONFIG"] = "config";
|
|
17
18
|
Label["TORZNAB"] = "torznab";
|
|
18
19
|
Label["SERVER"] = "server";
|
|
19
|
-
Label["STARTUP"] = "startup";
|
|
20
20
|
Label["SCHEDULER"] = "scheduler";
|
|
21
21
|
Label["SEARCH"] = "search";
|
|
22
22
|
Label["RSS"] = "rss";
|
|
@@ -28,6 +28,8 @@ export var Label;
|
|
|
28
28
|
Label["ARRS"] = "arrs";
|
|
29
29
|
Label["RADARR"] = "radarr";
|
|
30
30
|
Label["SONARR"] = "sonarr";
|
|
31
|
+
Label["AUTH"] = "auth";
|
|
32
|
+
Label["INDEX"] = "index";
|
|
31
33
|
})(Label || (Label = {}));
|
|
32
34
|
export let logger;
|
|
33
35
|
const REDACTED_MSG = "[REDACTED]";
|
|
@@ -92,7 +94,6 @@ export function logOnce(cacheKey, cb, ttl) {
|
|
|
92
94
|
}
|
|
93
95
|
}
|
|
94
96
|
export function initializeLogger(options) {
|
|
95
|
-
createAppDirHierarchy();
|
|
96
97
|
logger = winston.createLogger({
|
|
97
98
|
level: "info",
|
|
98
99
|
format: winston.format.combine(winston.format.timestamp({
|
|
@@ -140,4 +141,17 @@ export function initializeLogger(options) {
|
|
|
140
141
|
],
|
|
141
142
|
});
|
|
142
143
|
}
|
|
144
|
+
export function exitOnCrossSeedErrors(error) {
|
|
145
|
+
if (logger) {
|
|
146
|
+
logger.error(error);
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
console.error(error);
|
|
150
|
+
}
|
|
151
|
+
if (error instanceof CrossSeedError) {
|
|
152
|
+
process.exitCode = 1;
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
throw error;
|
|
156
|
+
}
|
|
143
157
|
//# sourceMappingURL=logger.js.map
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,eAAe,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,eAAe,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,CAAN,IAAY,KAuBX;AAvBD,WAAY,KAAK;IAChB,oCAA2B,CAAA;IAC3B,8BAAqB,CAAA;IACrB,sCAA6B,CAAA;IAC7B,0BAAiB,CAAA;IACjB,0BAAiB,CAAA;IACjB,gCAAuB,CAAA;IACvB,0BAAiB,CAAA;IACjB,4BAAmB,CAAA;IACnB,0BAAiB,CAAA;IACjB,gCAAuB,CAAA;IACvB,0BAAiB,CAAA;IACjB,oBAAW,CAAA;IACX,8BAAqB,CAAA;IACrB,4BAAmB,CAAA;IACnB,0BAAiB,CAAA;IACjB,sBAAa,CAAA;IACb,4BAAmB,CAAA;IACnB,sBAAa,CAAA;IACb,0BAAiB,CAAA;IACjB,0BAAiB,CAAA;IACjB,sBAAa,CAAA;IACb,wBAAe,CAAA;AAChB,CAAC,EAvBW,KAAK,KAAL,KAAK,QAuBhB;AAED,MAAM,CAAC,IAAI,MAAsB,CAAC;AAElC,MAAM,YAAY,GAAG,YAAY,CAAC;AAClC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAC5C,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAExC,SAAS,iBAAiB,CAAC,OAAe,EAAE,MAAc;IACzD,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACJ,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QACtB,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5D,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5D,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACzD,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC/D,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAChE,CAAC;IACF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,aAAa;IACd,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CACrB,OAAyB,EACzB,OAAgC;IAEhC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,IAAI,GAAG,GAAG,OAAO,CAAC;IAElB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,OAAO,YAAY,EAAE,CAAC,CAAC;IAC9D,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,QAAQ,YAAY,EAAE,CAAC,CAAC;IAChE,GAAG,GAAG,GAAG,CAAC,OAAO,CAChB,iDAAiD,EACjD,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAChD,CAAC;IACF,GAAG,GAAG,GAAG,CAAC,OAAO,CAChB,iDAAiD,EACjD,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAChD,CAAC;IACF,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,YAAY,EAAE,CAAC,CAAC;IAE9D,GAAG,GAAG,GAAG,CAAC,OAAO,CAChB,6CAA6C,EAC7C,2BAA2B,YAAY,EAAE,CACzC,CAAC;IACF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtD,GAAG,GAAG,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,GAAG,KAAK,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACtD,KAAK,MAAM,WAAW,IAAI,KAAK,EAAE,CAAC;gBACjC,GAAG,GAAG,iBAAiB,CACtB,GAAG,EACH,gBAAgB,CAAC,WAAW,CAAE,CAAC,GAAG,CAClC,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,SAAS,cAAc,CAAC,OAAyB;IAChD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,YAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;AAE5C,MAAM,UAAU,OAAO,CAAC,QAAgB,EAAE,EAAc,EAAE,GAAY;IACrE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3B,EAAE,EAAE,CAAC;QAEL,IAAI,GAAG,EAAE,CAAC;YACT,UAAU,CAAC,GAAG,EAAE;gBACf,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACF,CAAC;AACF,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAgC;IAChE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;QAC7B,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAC7B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;YACxB,MAAM,EAAE,yBAAyB;SACjC,CAAC,EACF,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACtC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EACtB,OAAO,CAAC,MAAM,CAAC,MAAM,CACpB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;YACtD,MAAM,GAAG,GAAG,CAAC,KAAK;gBACjB,CAAC,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC1C,CAAC,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAC9C,kBAAkB,EAClB,EAAE,CACF,CAAC;YACJ,OAAO,GAAG,SAAS,IAAI,KAAK,KAC3B,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EACzB,GAAG,cAAc,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;QAClD,CAAC,CACD,CACD;QACD,UAAU,EAAE;YACX,IAAI,eAAe,CAAC;gBACnB,QAAQ,EAAE,kBAAkB;gBAC5B,aAAa,EAAE,IAAI;gBACnB,WAAW,EAAE,mBAAmB;gBAChC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC;gBACpC,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,OAAO;aACd,CAAC;YACF,IAAI,eAAe,CAAC;gBACnB,QAAQ,EAAE,iBAAiB;gBAC3B,aAAa,EAAE,IAAI;gBACnB,WAAW,EAAE,kBAAkB;gBAC/B,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC;gBACpC,QAAQ,EAAE,KAAK;aACf,CAAC;YACF,IAAI,eAAe,CAAC;gBACnB,QAAQ,EAAE,oBAAoB;gBAC9B,aAAa,EAAE,IAAI;gBACnB,WAAW,EAAE,qBAAqB;gBAClC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC;gBACpC,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,OAAO;aACd,CAAC;YACF,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC9B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;gBACzC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACtC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,OAAO,CAAC,MAAM,CAAC,MAAM,CACpB,CAAC,EACA,KAAK,EACL,OAAO,EACP,KAAK,EACL,SAAS,EACT,KAAK,EACL,KAAK,GACL,EAAE,EAAE;oBACJ,SAAS,GAAI,SAAoB,CAAC,OAAO,CACxC,mBAAmB,EACnB,EAAE,CACF,CAAC;oBACF,MAAM,GAAG,GAAG,CAAC,KAAK;wBACjB,CAAC,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;wBAC1C,CAAC,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAC9C,kBAAkB,EAClB,EAAE,CACF,CAAC;oBACJ,OAAO,GAAG,SAAS,IAAI,KAAK,KAC3B,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EACzB,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC;gBAClC,CAAC,CACD,CACD;aACD,CAAC;SACF;KACD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IACnD,IAAI,MAAM,EAAE,CAAC;QACZ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;IACD,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;QACrC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACR,CAAC;IACD,MAAM,KAAK,CAAC;AACb,CAAC"}
|
|
@@ -4,7 +4,7 @@ async function up(knex) {
|
|
|
4
4
|
table.check("id = 0");
|
|
5
5
|
table.string("apikey");
|
|
6
6
|
});
|
|
7
|
-
await knex("settings
|
|
7
|
+
await knex.raw("INSERT INTO settings (id, apikey) VALUES (0, '')");
|
|
8
8
|
}
|
|
9
9
|
async function down(knex) {
|
|
10
10
|
await knex.schema.dropTable("settings");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"04-auth.js","sourceRoot":"","sources":["../../src/migrations/04-auth.ts"],"names":[],"mappings":"AAEA,KAAK,UAAU,EAAE,CAAC,IAAe;IAChC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;QACnD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QAC9B,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtB,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"04-auth.js","sourceRoot":"","sources":["../../src/migrations/04-auth.ts"],"names":[],"mappings":"AAEA,KAAK,UAAU,EAAE,CAAC,IAAe;IAChC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;QACnD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QAC9B,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtB,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;AACpE,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAe;IAClC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AACzC,CAAC;AAED,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
async function up(knex) {
|
|
2
|
+
// Create user table (singular naming)
|
|
3
|
+
await knex.schema.createTable("user", (table) => {
|
|
4
|
+
table.increments("id").primary();
|
|
5
|
+
table.string("username").unique().notNullable();
|
|
6
|
+
table.string("password").notNullable();
|
|
7
|
+
table.timestamp("created_at").defaultTo(knex.fn.now()).notNullable();
|
|
8
|
+
});
|
|
9
|
+
// Create session table (singular naming)
|
|
10
|
+
await knex.schema.createTable("session", (table) => {
|
|
11
|
+
table.string("id").primary();
|
|
12
|
+
table.integer("user_id").notNullable().references("id").inTable("user");
|
|
13
|
+
table.integer("expires_at").notNullable();
|
|
14
|
+
table.integer("created_at").notNullable();
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
async function down(knex) {
|
|
18
|
+
await knex.schema.dropTable("session");
|
|
19
|
+
await knex.schema.dropTable("user");
|
|
20
|
+
}
|
|
21
|
+
export default { name: "12-user-auth", up, down };
|
|
22
|
+
//# sourceMappingURL=12-user-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"12-user-auth.js","sourceRoot":"","sources":["../../src/migrations/12-user-auth.ts"],"names":[],"mappings":"AAEA,KAAK,UAAU,EAAE,CAAC,IAAe;IAChC,sCAAsC;IACtC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAC/C,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QACjC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;QAChD,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;QACvC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;QAClD,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QAC7B,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxE,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1C,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAe;IAClC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC"}
|