e621 1.0.9 → 2.0.0-dev.11

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.
Files changed (50) hide show
  1. package/.node-version +1 -0
  2. package/README.md +116 -187
  3. package/build/package.json +14 -11
  4. package/build/src/index.d.ts +28 -295
  5. package/build/src/index.js +83 -442
  6. package/build/src/modules/Pools.d.ts +120 -0
  7. package/build/src/modules/Pools.js +247 -0
  8. package/build/src/modules/PostSets.d.ts +88 -0
  9. package/build/src/modules/PostSets.js +182 -0
  10. package/build/src/modules/Posts.d.ts +124 -0
  11. package/build/src/modules/Posts.js +323 -0
  12. package/build/src/modules/UserFeedback.d.ts +66 -0
  13. package/build/src/modules/UserFeedback.js +134 -0
  14. package/build/src/modules/Users.d.ts +110 -0
  15. package/build/src/modules/Users.js +248 -0
  16. package/build/src/modules/WikiPages.d.ts +99 -0
  17. package/build/src/modules/WikiPages.js +208 -0
  18. package/build/src/structures/AuthenticatedUser.d.ts +109 -0
  19. package/build/src/structures/AuthenticatedUser.js +128 -0
  20. package/build/src/structures/Pool.d.ts +85 -0
  21. package/build/src/structures/Pool.js +110 -0
  22. package/build/src/structures/PoolHistory.d.ts +42 -0
  23. package/build/src/structures/PoolHistory.js +53 -0
  24. package/build/src/structures/Post.d.ts +147 -0
  25. package/build/src/structures/Post.js +155 -0
  26. package/build/src/structures/PostHistory.d.ts +52 -0
  27. package/build/src/structures/PostHistory.js +93 -0
  28. package/build/src/structures/PostSet.d.ts +71 -0
  29. package/build/src/structures/PostSet.js +91 -0
  30. package/build/src/structures/User.d.ts +62 -0
  31. package/build/src/structures/User.js +80 -0
  32. package/build/src/structures/WikiPage.d.ts +16 -0
  33. package/build/src/structures/WikiPage.js +26 -0
  34. package/build/src/structures/WikiPageHistory.d.ts +37 -0
  35. package/build/src/structures/WikiPageHistory.js +49 -0
  36. package/build/src/types/index.d.ts +92 -0
  37. package/build/src/types/pools.d.ts +60 -0
  38. package/build/src/types/post_sets.d.ts +33 -0
  39. package/build/src/types/posts.d.ts +165 -0
  40. package/build/src/types/user_feedback.d.ts +27 -0
  41. package/build/src/types/users.d.ts +277 -0
  42. package/build/src/types/wiki_pages.d.ts +65 -0
  43. package/build/src/util/FormHelper.d.ts +9 -0
  44. package/build/src/util/FormHelper.js +15 -0
  45. package/build/src/util/MultipartData.d.ts +7 -0
  46. package/build/src/util/MultipartData.js +39 -0
  47. package/build/src/util/RequestHandler.d.ts +37 -0
  48. package/build/src/util/RequestHandler.js +311 -0
  49. package/package.json +14 -11
  50. package/LICENSE +0 -21
@@ -0,0 +1,311 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
20
+ };
21
+ var __importDefault = (this && this.__importDefault) || function (mod) {
22
+ return (mod && mod.__esModule) ? mod : { "default": mod };
23
+ };
24
+ Object.defineProperty(exports, "__esModule", { value: true });
25
+ exports.APIError = void 0;
26
+ const MultipartData_1 = __importDefault(require("./MultipartData"));
27
+ const http = __importStar(require("http"));
28
+ const https = __importStar(require("https"));
29
+ class APIError extends Error {
30
+ name = "APIError";
31
+ type;
32
+ statusCode;
33
+ statusMessage;
34
+ method;
35
+ path;
36
+ reqBody;
37
+ resBody;
38
+ constructor(type, statusCode, statusMessage, method, path, reqBody, resBody) {
39
+ if (type === "UNEXPECTED")
40
+ super(`Unexpected ${statusCode} ${statusMessage} on "${method.toUpperCase()} ${path}"`);
41
+ else if (type === "PARSE")
42
+ super(`Parse Error on "${method.toUpperCase()} ${path}"`);
43
+ else
44
+ super(`Unknown Error on "${method.toUpperCase()} ${path}" (${statusCode} ${statusMessage})`);
45
+ this.name = `APIError[${type || "UNKNOWN"}]`;
46
+ this.type = type;
47
+ this.statusCode = statusCode;
48
+ this.statusMessage = statusMessage;
49
+ this.method = method;
50
+ this.path = path;
51
+ this.reqBody = reqBody;
52
+ this.resBody = resBody;
53
+ }
54
+ }
55
+ exports.APIError = APIError;
56
+ class RequestHandler {
57
+ auth;
58
+ main;
59
+ constructor(main) {
60
+ Object.defineProperties(this, {
61
+ auth: {
62
+ get() {
63
+ return !this.main.options.authUser || !this.main.options.authKey ? null : `Basic ${Buffer.from(`${this.main.options.authUser}:${this.main.options.authKey}`).toString("base64")}`;
64
+ },
65
+ configurable: false,
66
+ enumerable: false
67
+ },
68
+ main: {
69
+ value: main,
70
+ configurable: false,
71
+ enumerable: false,
72
+ writable: false
73
+ }
74
+ });
75
+ }
76
+ authCheck(func, error = true) {
77
+ if (this.auth === null) {
78
+ if (error)
79
+ throw new Error(`Authentication is required to use ${func}`);
80
+ else
81
+ return false;
82
+ }
83
+ else
84
+ return true;
85
+ }
86
+ // null = 204 No Content
87
+ async get(path) {
88
+ return new Promise((resolve, reject) => {
89
+ const r = (this.main.options.instanceSSL ? https : http)
90
+ .request({
91
+ method: "GET",
92
+ timeout: this.main.options.requestTimeout * 1000,
93
+ hostname: this.main.options.instanceHost,
94
+ port: this.main.options.instancePort,
95
+ path,
96
+ headers: {
97
+ "User-Agent": this.main.options.userAgent,
98
+ "Host": this.main.options.instanceHost,
99
+ ...(this.auth === null ? {} : {
100
+ Authorization: this.auth
101
+ })
102
+ }
103
+ }, (req) => {
104
+ const data = [];
105
+ req
106
+ .on("error", (err) => reject(err))
107
+ .on("data", (d) => data.push(d))
108
+ .on("end", () => {
109
+ if (!req.statusCode || !req.statusMessage)
110
+ reject(new Error("No Status Information"));
111
+ if (req.statusCode === 204)
112
+ return resolve(null);
113
+ else if (req.statusCode === 200 || req.statusCode === 201) {
114
+ try {
115
+ resolve(JSON.parse(Buffer.concat(data).toString()));
116
+ }
117
+ catch {
118
+ reject(new APIError("PARSE", req.statusCode, req.statusMessage, "GET", path, null, Buffer.concat(data).toString()));
119
+ }
120
+ }
121
+ else {
122
+ let d;
123
+ try {
124
+ d = Buffer.concat(data).toString();
125
+ d = JSON.parse(String(d));
126
+ }
127
+ catch {
128
+ // ignore
129
+ }
130
+ reject(new APIError("UNEXPECTED", req.statusCode, req.statusMessage, "GET", path, null, d));
131
+ }
132
+ });
133
+ })
134
+ .setTimeout(this.main.options.requestTimeout * 1000, () => {
135
+ r.destroy(new Error(`Request Went Over The Limit Of ${this.main.options.requestTimeout * 1000}ms`));
136
+ });
137
+ r.end();
138
+ });
139
+ }
140
+ async post(path, body) { return this.other("POST", path, body); }
141
+ async postWithFile(path, body, files) { return this.otherWithFile("POST", path, body, files); }
142
+ async patch(path, body) { return this.other("PATCH", path, body); }
143
+ async put(path, body) { return this.other("PUT", path, body); }
144
+ async delete(path, body) { return this.other("DELETE", path, body); }
145
+ async other(method, path, body) {
146
+ return new Promise((resolve, reject) => {
147
+ const r = (this.main.options.instanceSSL ? https : http)
148
+ .request({
149
+ method,
150
+ timeout: this.main.options.requestTimeout * 1000,
151
+ hostname: this.main.options.instanceHost,
152
+ port: this.main.options.instancePort,
153
+ path,
154
+ headers: {
155
+ "User-Agent": this.main.options.userAgent,
156
+ "Content-Type": "application/x-www-form-urlencoded",
157
+ "Host": this.main.options.instanceHost,
158
+ ...(this.auth === null ? {} : {
159
+ Authorization: this.auth
160
+ })
161
+ }
162
+ }, (req) => {
163
+ const data = [];
164
+ req
165
+ .on("error", (err) => reject(err))
166
+ .on("data", (d) => data.push(d))
167
+ .on("end", () => {
168
+ if (!req.statusCode || !req.statusMessage)
169
+ reject(new Error("No Status Information"));
170
+ if (req.statusCode === 204)
171
+ return resolve(null);
172
+ else if (req.statusCode === 200 || req.statusCode === 201) {
173
+ try {
174
+ resolve(JSON.parse(Buffer.concat(data).toString()));
175
+ }
176
+ catch {
177
+ reject(new APIError("PARSE", req.statusCode, req.statusMessage, method, path, body ?? null, Buffer.concat(data).toString()));
178
+ }
179
+ }
180
+ else {
181
+ let d;
182
+ try {
183
+ d = Buffer.concat(data).toString();
184
+ d = JSON.parse(String(d));
185
+ }
186
+ catch {
187
+ // ignore
188
+ }
189
+ reject(new APIError("UNEXPECTED", req.statusCode, req.statusMessage, method, path, body ?? null, d));
190
+ }
191
+ });
192
+ })
193
+ .setTimeout(this.main.options.requestTimeout * 1000, () => {
194
+ r.destroy(new Error(`Request Went Over The Limit Of ${this.main.options.requestTimeout * 1000}ms`));
195
+ });
196
+ if (body)
197
+ r.write(body);
198
+ r.end();
199
+ });
200
+ }
201
+ // the things I do for zero dependencies
202
+ // not well tested at all
203
+ async otherWithFile(method, path, body, files) {
204
+ return new Promise((resolve, reject) => {
205
+ const multi = new MultipartData_1.default();
206
+ files.forEach(({ content, name }, i) => {
207
+ const magic = [...(new Uint8Array(content.slice(0, 4)))].map(v => v.toString(16).toUpperCase()).join("");
208
+ let filename;
209
+ switch (magic) {
210
+ case "47494638":
211
+ filename = `upload${i}.gif`;
212
+ break;
213
+ case "89504E47":
214
+ filename = `upload${i}.png`;
215
+ break;
216
+ case "FFD8FFDB":
217
+ case "FFD8FFE0":
218
+ case "49460001":
219
+ case "FFD8FFEE":
220
+ case "69660000":
221
+ filename = `upload${i}.jpeg`;
222
+ break;
223
+ case "1A45DFA3":
224
+ filename = `upload${i}.webm`;
225
+ break;
226
+ case "52494646":
227
+ filename = `upload${i}.webp`;
228
+ break;
229
+ default: throw new Error(`Unrecognized file type (magic: ${magic})`);
230
+ }
231
+ multi.attach(name, content, filename);
232
+ });
233
+ body.get2d().forEach(([key, value]) => {
234
+ multi.attach(key, value);
235
+ });
236
+ const formData = multi.finish();
237
+ const r = (this.main.options.instanceSSL ? https : http)
238
+ .request({
239
+ method,
240
+ timeout: this.main.options.requestTimeout * 1000,
241
+ hostname: this.main.options.instanceHost,
242
+ port: this.main.options.instancePort,
243
+ path,
244
+ headers: {
245
+ "User-Agent": this.main.options.userAgent,
246
+ "Content-Type": `multipart/form-data; boundary=${multi.boundary}`,
247
+ "Host": this.main.options.instanceHost,
248
+ ...(this.auth === null ? {} : {
249
+ Authorization: this.auth
250
+ })
251
+ }
252
+ }, (req) => {
253
+ const data = [];
254
+ req
255
+ .on("error", (err) => reject(err))
256
+ .on("data", (d) => data.push(d))
257
+ .on("end", () => {
258
+ console.log(JSON.parse(Buffer.concat(data).toString()));
259
+ if (!req.statusCode || !req.statusMessage)
260
+ reject(new Error("No Status Information"));
261
+ if (req.statusCode === 204)
262
+ return resolve(null);
263
+ else if (req.statusCode === 200 || req.statusCode === 201) {
264
+ try {
265
+ resolve(JSON.parse(Buffer.concat(data).toString()));
266
+ }
267
+ catch {
268
+ reject(new APIError("PARSE", req.statusCode, req.statusMessage, method, path, "Multipart Form Data", Buffer.concat(data).toString()));
269
+ }
270
+ }
271
+ else {
272
+ let d;
273
+ try {
274
+ d = Buffer.concat(data).toString();
275
+ d = JSON.parse(String(d));
276
+ }
277
+ catch {
278
+ // ignore
279
+ }
280
+ reject(new APIError("UNEXPECTED", req.statusCode, req.statusMessage, method, path, "Multipart Form Data", d));
281
+ }
282
+ });
283
+ })
284
+ .setTimeout(this.main.options.requestTimeout * 1000, () => {
285
+ r.destroy(new Error(`Request Went Over The Limit Of ${this.main.options.requestTimeout * 1000}ms`));
286
+ });
287
+ for (const chunk of formData)
288
+ r.write(chunk);
289
+ r.end();
290
+ });
291
+ }
292
+ get instanceURL() {
293
+ return `http${this.main.options.instanceSSL ? "s" : ""}://${this.main.options.instanceHost}${[80, 443].includes(this.main.options.instancePort) ? "" : `:${this.main.options.instancePort}`}`;
294
+ }
295
+ // the deleted image url is on the instance itself by default
296
+ get deletedImageURL() {
297
+ return `${this.instanceURL}/images/deleted-preview.png`;
298
+ }
299
+ constructURL(md5, type, ext = "png") {
300
+ if (this.main.options.reconstructStaticURL)
301
+ return this.main.options.reconstructStaticURL(md5, type, ext);
302
+ switch (this.main.options.imageReconstructionType) {
303
+ case "e621": return `https://static1.e621.net/data/${type === "original" ? "" : `${type}/`}${md5.slice(0, 2)}/${md5.slice(2, 4)}/${md5}.${ext}`;
304
+ case "yiffy": return `https://v3.yiff.media/${type === "original" ? "" : `${type}/`}${md5.slice(0, 2)}/${md5.slice(2, 4)}/${md5}.${ext}`;
305
+ case "dev": return `http://e621.local/data/${type === "original" ? "" : `${type}/`}${md5}.${ext}`;
306
+ default: throw new Error(`Image reconstruction failed with no implemented method (type: ${String(this.main.options.imageReconstructionType)}, host: ${this.main.options.instanceHost})`);
307
+ }
308
+ }
309
+ }
310
+ exports.default = RequestHandler;
311
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RequestHandler.js","sourceRoot":"","sources":["../../../src/util/RequestHandler.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "e621",
3
- "version": "1.0.9",
4
- "description": "A module for fetching posts from e621.",
3
+ "version": "2.0.0-dev.11",
4
+ "description": "A module for interfacing with e621.",
5
5
  "main": "build/src/index.js",
6
- "types": "build/src/index.d.ts",
7
6
  "scripts": {
8
- "prepare": "rm -rf build && tsc && echo Build Finished",
9
- "build": "npm run prepare"
7
+ "build": "rm -rf build && tsc -p tsc.json && sed -i '/__exportStar(require(\".\\/types\"), exports);/d' build/src/index.js && cp -r src/types build/src",
8
+ "prepublishOnly": "npm run build",
9
+ "dev": "npm publish --tag dev"
10
10
  },
11
11
  "repository": {
12
12
  "type": "git",
@@ -14,20 +14,23 @@
14
14
  },
15
15
  "keywords": [
16
16
  "e621",
17
- "api",
18
17
  "e621-api",
18
+ "api",
19
19
  "e926",
20
- "e926-api"
20
+ "e926-api",
21
+ "e6",
22
+ "e9"
21
23
  ],
22
- "author": "Donovan_DMC <hewwo@yiff.rocks> (https://donovan.is.gay)",
24
+ "author": "Donovan Daniels <hewwo@yiff.rocks>",
23
25
  "license": "MIT",
24
26
  "bugs": {
25
27
  "url": "https://github.com/DonovanDMC/E621/issues"
26
28
  },
27
29
  "homepage": "https://github.com/DonovanDMC/E621#readme",
28
30
  "devDependencies": {
29
- "@types/node": "^14.14.22",
30
- "@uwu-codes/eslint-config": "^1.0.8",
31
- "@uwu-codes/tsconfig": "^1.0.1"
31
+ "@uwu-codes/eslint-config": "^1.0.25",
32
+ "@uwu-codes/tsconfig": "^1.0.1",
33
+ "ts-node": "^10.3.0",
34
+ "typescript": "^4.4.4"
32
35
  }
33
36
  }
package/LICENSE DELETED
@@ -1,21 +0,0 @@
1
- MIT License
2
-
3
- Copyright (c) 2021 Donovan Daniels
4
-
5
- Permission is hereby granted, free of charge, to any person obtaining a copy
6
- of this software and associated documentation files (the "Software"), to deal
7
- in the Software without restriction, including without limitation the rights
8
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
- copies of the Software, and to permit persons to whom the Software is
10
- furnished to do so, subject to the following conditions:
11
-
12
- The above copyright notice and this permission notice shall be included in all
13
- copies or substantial portions of the Software.
14
-
15
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
- SOFTWARE.