@conorroberts/utils 0.0.31 → 0.0.35
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/dist/images.d.ts +6 -1
- package/dist/images.js +19 -5
- package/dist/images.js.map +1 -1
- package/package.json +1 -1
package/dist/images.d.ts
CHANGED
|
@@ -27,10 +27,12 @@ interface CreateImageUrlResponse {
|
|
|
27
27
|
}
|
|
28
28
|
declare class ImageUtils<ImageIds extends Record<string, any>> {
|
|
29
29
|
private blacklist;
|
|
30
|
-
private
|
|
30
|
+
private accountId;
|
|
31
|
+
private accountHash;
|
|
31
32
|
private _imageIds;
|
|
32
33
|
constructor(args: {
|
|
33
34
|
accountId: string;
|
|
35
|
+
accountHash: string;
|
|
34
36
|
blacklist?: string[];
|
|
35
37
|
imageIds?: ImageIds;
|
|
36
38
|
});
|
|
@@ -51,6 +53,9 @@ declare class ImageUtils<ImageIds extends Record<string, any>> {
|
|
|
51
53
|
url: string;
|
|
52
54
|
id: string;
|
|
53
55
|
}[]>;
|
|
56
|
+
serverUpload(data: Blob, args: {
|
|
57
|
+
apiKey: string;
|
|
58
|
+
}): Promise<any>;
|
|
54
59
|
upload(url: string, body: FormData): Promise<string>;
|
|
55
60
|
delete(id: string, args: {
|
|
56
61
|
apiKey: string;
|
package/dist/images.js
CHANGED
|
@@ -4,10 +4,12 @@ import dayjs from "dayjs";
|
|
|
4
4
|
import { ofetch } from "ofetch";
|
|
5
5
|
var ImageUtils = class {
|
|
6
6
|
blacklist = ["img.clerk.com"];
|
|
7
|
-
|
|
7
|
+
accountId;
|
|
8
|
+
accountHash;
|
|
8
9
|
_imageIds;
|
|
9
10
|
constructor(args) {
|
|
10
|
-
this.
|
|
11
|
+
this.accountId = args.accountId;
|
|
12
|
+
this.accountHash = args.accountHash;
|
|
11
13
|
this._imageIds = args.imageIds;
|
|
12
14
|
if (args.blacklist) {
|
|
13
15
|
this.blacklist.push(...args.blacklist);
|
|
@@ -20,7 +22,7 @@ var ImageUtils = class {
|
|
|
20
22
|
return this._imageIds;
|
|
21
23
|
}
|
|
22
24
|
url(id) {
|
|
23
|
-
return `https://imagedelivery.net/${this.
|
|
25
|
+
return `https://imagedelivery.net/${this.accountHash}/${id}/public`;
|
|
24
26
|
}
|
|
25
27
|
isBlacklisted(url) {
|
|
26
28
|
return this.blacklist.some((u) => url.includes(u));
|
|
@@ -72,7 +74,7 @@ var ImageUtils = class {
|
|
|
72
74
|
form.append("id", id);
|
|
73
75
|
form.append("expiry", dayjs().add(5, "minute").toISOString());
|
|
74
76
|
const img = await ofetch(
|
|
75
|
-
`https://api.cloudflare.com/client/v4/accounts/${this.
|
|
77
|
+
`https://api.cloudflare.com/client/v4/accounts/${this.accountId}/images/v2/direct_upload`,
|
|
76
78
|
{ method: "POST", headers, body: form }
|
|
77
79
|
);
|
|
78
80
|
if (!img.success) {
|
|
@@ -87,6 +89,18 @@ var ImageUtils = class {
|
|
|
87
89
|
);
|
|
88
90
|
return urls;
|
|
89
91
|
}
|
|
92
|
+
async serverUpload(data, args) {
|
|
93
|
+
const formData = new FormData();
|
|
94
|
+
formData.append("file", data, nanoid());
|
|
95
|
+
const headers = new Headers();
|
|
96
|
+
headers.set("Authorization", `Bearer ${args.apiKey}`);
|
|
97
|
+
const response = await fetch(`https://api.cloudflare.com/client/v4/accounts/${this.accountId}/images/v1`, {
|
|
98
|
+
method: "POST",
|
|
99
|
+
headers,
|
|
100
|
+
body: formData
|
|
101
|
+
});
|
|
102
|
+
return response.json();
|
|
103
|
+
}
|
|
90
104
|
async upload(url, body) {
|
|
91
105
|
const fetchResponse = await ofetch(url, {
|
|
92
106
|
method: "POST",
|
|
@@ -108,7 +122,7 @@ var ImageUtils = class {
|
|
|
108
122
|
try {
|
|
109
123
|
const headers = new Headers();
|
|
110
124
|
headers.set("Authorization", `Bearer ${args.apiKey}`);
|
|
111
|
-
await ofetch(`https://api.cloudflare.com/client/v4/accounts/${this.
|
|
125
|
+
await ofetch(`https://api.cloudflare.com/client/v4/accounts/${this.accountId}/images/v1/${id}`, {
|
|
112
126
|
method: "POST",
|
|
113
127
|
headers
|
|
114
128
|
});
|
package/dist/images.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/images.ts"],"sourcesContent":["import { nanoid } from \"nanoid\";\nimport dayjs from \"dayjs\";\nimport { ofetch } from \"ofetch\";\n\nexport interface OptimizedImageOptions {\n anim?: boolean;\n background?: string;\n blur?: number;\n brightness?: number;\n compression?: \"fast\"; // faster compression = larger file size\n contrast?: number;\n dpr?: number;\n fit?: \"scale-down\" | \"contain\" | \"cover\" | \"crop\" | \"pad\";\n format?: \"webp\" | \"avif\" | \"json\";\n gamma?: number;\n width?: number;\n height?: number;\n metadata?: \"keep\" | \"copyright\" | \"none\";\n quality?: number;\n rotate?: number;\n sharpen?: number;\n}\n\nexport interface CreateImageUrlResponse {\n result: {\n id: string;\n uploadURL: string;\n };\n success: boolean;\n errors: unknown[];\n messages: unknown[];\n}\n\ninterface UploadImageResponse {\n result: {\n id: string;\n filename: string;\n uploaded: string;\n requireSignedURLs: boolean;\n variants: string[];\n };\n success: boolean;\n errors: unknown[];\n messages: unknown[];\n}\n\nexport class ImageUtils<ImageIds extends Record<string, any>> {\n private blacklist: string[] = [\"img.clerk.com\"];\n private
|
|
1
|
+
{"version":3,"sources":["../src/images.ts"],"sourcesContent":["import { nanoid } from \"nanoid\";\nimport dayjs from \"dayjs\";\nimport { ofetch } from \"ofetch\";\n\nexport interface OptimizedImageOptions {\n anim?: boolean;\n background?: string;\n blur?: number;\n brightness?: number;\n compression?: \"fast\"; // faster compression = larger file size\n contrast?: number;\n dpr?: number;\n fit?: \"scale-down\" | \"contain\" | \"cover\" | \"crop\" | \"pad\";\n format?: \"webp\" | \"avif\" | \"json\";\n gamma?: number;\n width?: number;\n height?: number;\n metadata?: \"keep\" | \"copyright\" | \"none\";\n quality?: number;\n rotate?: number;\n sharpen?: number;\n}\n\nexport interface CreateImageUrlResponse {\n result: {\n id: string;\n uploadURL: string;\n };\n success: boolean;\n errors: unknown[];\n messages: unknown[];\n}\n\ninterface UploadImageResponse {\n result: {\n id: string;\n filename: string;\n uploaded: string;\n requireSignedURLs: boolean;\n variants: string[];\n };\n success: boolean;\n errors: unknown[];\n messages: unknown[];\n}\n\nexport class ImageUtils<ImageIds extends Record<string, any>> {\n private blacklist: string[] = [\"img.clerk.com\"];\n private accountId: string;\n private accountHash: string;\n private _imageIds: ImageIds | undefined;\n\n constructor(args: {\n accountId: string;\n accountHash: string;\n blacklist?: string[];\n imageIds?: ImageIds;\n }) {\n this.accountId = args.accountId;\n this.accountHash = args.accountHash;\n\n this._imageIds = args.imageIds;\n\n if (args.blacklist) {\n this.blacklist.push(...args.blacklist);\n }\n }\n\n get imageIds() {\n if (!this._imageIds) {\n throw new Error(\"imageIds was not supplied in constructor\");\n }\n\n return this._imageIds;\n }\n\n public url(id: string) {\n return `https://imagedelivery.net/${this.accountHash}/${id}/public`;\n }\n\n private isBlacklisted(url: string) {\n return this.blacklist.some((u) => url.includes(u));\n }\n\n private isProtected(id: string) {\n if (!this._imageIds) {\n return false;\n }\n\n return Object.values(this._imageIds).some((e) => e === id);\n }\n\n /**\n * Will only operate on images that have been uploaded via cloudflare images\n */\n public optimizeUrl(url: string, options: OptimizedImageOptions) {\n if (this.isBlacklisted(url)) {\n return url;\n }\n\n // Final format should look similar to: https://imagedelivery.net/<ACCOUNT_HASH>/<IMAGE_ID>/w=400,sharpen=3\n return url.replace(\"public\", this.createImageOptionsString(options));\n }\n\n public optimizeId(id: string, options: OptimizedImageOptions) {\n return this.optimizeUrl(this.url(id), options);\n }\n\n public createOptionsSearchParams(options: OptimizedImageOptions) {\n const params = new URLSearchParams();\n\n const pairs = Object.entries(options);\n\n for (const [key, val] of pairs) {\n if (val === undefined) {\n continue;\n }\n\n params.set(key, val.toString());\n }\n\n return params;\n }\n\n public createImageOptionsString(options: OptimizedImageOptions) {\n const params = this.createOptionsSearchParams(options);\n\n return Array.from(params.entries())\n .map(([key, val]) => `${key}=${val}`)\n .join(\",\");\n }\n\n public async createUploadUrls(count: number, args: { apiKey: string }) {\n if (count === 0) {\n return [];\n }\n\n const headers = new Headers();\n headers.set(\"Authorization\", `Bearer ${args.apiKey}`);\n\n const urls = await Promise.all(\n Array.from({ length: count }).map(async () => {\n try {\n const form = new FormData();\n const id = nanoid();\n form.append(\"id\", id);\n form.append(\"expiry\", dayjs().add(5, \"minute\").toISOString());\n\n const img = await ofetch<CreateImageUrlResponse>(\n `https://api.cloudflare.com/client/v4/accounts/${this.accountId}/images/v2/direct_upload`,\n { method: \"POST\", headers, body: form },\n );\n\n if (!img.success) {\n throw new Error(\"Error uploading image\");\n }\n\n return { url: img.result.uploadURL, id };\n } catch (e) {\n console.error(\"Error uploading image\");\n throw e;\n }\n }),\n );\n\n return urls;\n }\n\n public async serverUpload(data: Blob, args: { apiKey: string }) {\n const formData = new FormData();\n formData.append(\"file\", data, nanoid());\n\n const headers = new Headers();\n headers.set(\"Authorization\", `Bearer ${args.apiKey}`);\n\n const response = await fetch(`https://api.cloudflare.com/client/v4/accounts/${this.accountId}/images/v1`, {\n method: \"POST\",\n headers,\n body: formData,\n });\n\n return response.json();\n }\n\n public async upload(url: string, body: FormData) {\n const fetchResponse = await ofetch<UploadImageResponse>(url, {\n method: \"POST\",\n body,\n });\n\n if (!fetchResponse.success) {\n throw new Error(\"Failed to upload image\");\n }\n\n const downloadUrl = fetchResponse.result.variants[0];\n\n if (!downloadUrl) {\n throw new Error(\"Could not find download URL\");\n }\n\n return downloadUrl;\n }\n\n public async delete(id: string, args: { apiKey: string }) {\n if (this.isProtected(id)) {\n return { success: true };\n }\n\n try {\n const headers = new Headers();\n headers.set(\"Authorization\", `Bearer ${args.apiKey}`);\n\n await ofetch(`https://api.cloudflare.com/client/v4/accounts/${this.accountId}/images/v1/${id}`, {\n method: \"POST\",\n headers,\n });\n return { success: true };\n } catch {\n return { success: false };\n }\n }\n\n public async batchUpload(files: { file: File; url: { id: string; value: string } }[]) {\n return await Promise.all(\n files.map(async (e) => {\n const formData = new FormData();\n formData.append(\"file\", e.file);\n\n const downloadUrl = await this.upload(e.url.value, formData);\n\n return {\n url: downloadUrl,\n id: e.url.id,\n };\n }),\n );\n }\n}\n"],"mappings":"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","names":[]}
|