@gilhrpenner/convex-files-control 0.1.1 → 0.2.0
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 +243 -207
- package/dist/client/http.d.ts +4 -4
- package/dist/client/http.d.ts.map +1 -1
- package/dist/client/http.js +39 -10
- package/dist/client/http.js.map +1 -1
- package/dist/client/index.d.ts +66 -11
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +136 -41
- package/dist/client/index.js.map +1 -1
- package/dist/component/_generated/component.d.ts +2 -0
- package/dist/component/_generated/component.d.ts.map +1 -1
- package/dist/component/download.d.ts +2 -0
- package/dist/component/download.d.ts.map +1 -1
- package/dist/component/download.js +33 -12
- package/dist/component/download.js.map +1 -1
- package/dist/component/schema.d.ts +3 -1
- package/dist/component/schema.d.ts.map +1 -1
- package/dist/component/schema.js +1 -0
- package/dist/component/schema.js.map +1 -1
- package/dist/react/index.d.ts +2 -2
- package/dist/react/index.d.ts.map +1 -1
- package/dist/react/index.js +10 -6
- package/dist/react/index.js.map +1 -1
- package/package.json +4 -3
- package/src/__tests__/client-extra.test.ts +157 -4
- package/src/__tests__/client.test.ts +572 -46
- package/src/__tests__/download-core.test.ts +70 -0
- package/src/__tests__/entrypoints.test.ts +13 -0
- package/src/__tests__/http.test.ts +34 -0
- package/src/__tests__/react.test.ts +10 -16
- package/src/__tests__/shared.test.ts +0 -5
- package/src/__tests__/transfer.test.ts +103 -0
- package/src/client/http.ts +51 -10
- package/src/client/index.ts +242 -51
- package/src/component/_generated/component.ts +2 -0
- package/src/component/download.ts +35 -14
- package/src/component/schema.ts +1 -0
- package/src/react/index.ts +11 -10
|
@@ -93,11 +93,13 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
|
|
|
93
93
|
expiresAt?: null | number;
|
|
94
94
|
maxUses?: null | number;
|
|
95
95
|
password?: string;
|
|
96
|
+
shareableLink?: boolean;
|
|
96
97
|
storageId: string;
|
|
97
98
|
}, {
|
|
98
99
|
downloadToken: string;
|
|
99
100
|
expiresAt: null | number;
|
|
100
101
|
maxUses: null | number;
|
|
102
|
+
shareableLink: boolean;
|
|
101
103
|
storageId: string;
|
|
102
104
|
}, Name>;
|
|
103
105
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/component/_generated/component.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/component/_generated/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,12 +24,14 @@ export declare const createDownloadGrant: import("convex/server").RegisteredMuta
|
|
|
24
24
|
expiresAt?: number | null | undefined;
|
|
25
25
|
password?: string | undefined;
|
|
26
26
|
maxUses?: number | null | undefined;
|
|
27
|
+
shareableLink?: boolean | undefined;
|
|
27
28
|
storageId: string;
|
|
28
29
|
}, Promise<{
|
|
29
30
|
downloadToken: import("convex/values").GenericId<"downloadGrants">;
|
|
30
31
|
storageId: string;
|
|
31
32
|
expiresAt: number | null;
|
|
32
33
|
maxUses: number | null;
|
|
34
|
+
shareableLink: boolean;
|
|
33
35
|
}>>;
|
|
34
36
|
/**
|
|
35
37
|
* Consume a download grant and return a signed URL when allowed.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/component/download.ts"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/component/download.ts"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;GAuE9B,CAAC;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,KAAK,wBAAwB,GAAG;IAC9B,MAAM,EACF,IAAI,GACJ,WAAW,GACX,SAAS,GACT,WAAW,GACX,cAAc,GACd,cAAc,GACd,eAAe,GACf,mBAAmB,GACnB,kBAAkB,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;;;;;;;;qCAmBrC,CAAC;AA6IH;;;;GAIG;AACH,eAAO,MAAM,yBAAyB;;;;;;;;iBAUpC,CAAC"}
|
|
@@ -34,12 +34,14 @@ export const createDownloadGrant = mutation({
|
|
|
34
34
|
maxUses: v.optional(v.union(v.null(), v.number())),
|
|
35
35
|
expiresAt: v.optional(v.union(v.null(), v.number())),
|
|
36
36
|
password: v.optional(v.string()),
|
|
37
|
+
shareableLink: v.optional(v.boolean()),
|
|
37
38
|
},
|
|
38
39
|
returns: v.object({
|
|
39
40
|
downloadToken: v.id("downloadGrants"),
|
|
40
41
|
storageId: v.string(),
|
|
41
42
|
expiresAt: v.union(v.null(), v.number()),
|
|
42
43
|
maxUses: v.union(v.null(), v.number()),
|
|
44
|
+
shareableLink: v.boolean(),
|
|
43
45
|
}),
|
|
44
46
|
handler: async (ctx, args) => {
|
|
45
47
|
const now = Date.now();
|
|
@@ -73,11 +75,13 @@ export const createDownloadGrant = mutation({
|
|
|
73
75
|
passwordAlgorithm: passwordRecord.algorithm,
|
|
74
76
|
}
|
|
75
77
|
: {};
|
|
78
|
+
const shareableLink = args.shareableLink ?? false;
|
|
76
79
|
const downloadToken = await ctx.db.insert("downloadGrants", {
|
|
77
80
|
storageId: args.storageId,
|
|
78
81
|
expiresAt: expiresAt ?? undefined,
|
|
79
82
|
maxUses: maxUses ?? null,
|
|
80
83
|
useCount: 0,
|
|
84
|
+
shareableLink,
|
|
81
85
|
...passwordFields,
|
|
82
86
|
});
|
|
83
87
|
return {
|
|
@@ -85,6 +89,7 @@ export const createDownloadGrant = mutation({
|
|
|
85
89
|
storageId: args.storageId,
|
|
86
90
|
expiresAt,
|
|
87
91
|
maxUses: maxUses ?? null,
|
|
92
|
+
shareableLink,
|
|
88
93
|
};
|
|
89
94
|
},
|
|
90
95
|
});
|
|
@@ -123,28 +128,44 @@ async function consumeDownloadGrantCore(ctx, args) {
|
|
|
123
128
|
}
|
|
124
129
|
const filePromise = findFileByStorageId(ctx, grant.storageId);
|
|
125
130
|
const accessKey = normalizeAccessKey(args.accessKey);
|
|
126
|
-
|
|
131
|
+
// Shareable links bypass access key validation
|
|
132
|
+
if (grant.shareableLink) {
|
|
127
133
|
const file = await filePromise;
|
|
128
134
|
if (!file) {
|
|
129
135
|
await ctx.db.delete(grant._id);
|
|
130
136
|
return { status: "file_missing" };
|
|
131
137
|
}
|
|
132
|
-
return { status: "access_denied" };
|
|
133
138
|
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
139
|
+
else {
|
|
140
|
+
// Regular grants require a valid access key
|
|
141
|
+
if (!accessKey) {
|
|
142
|
+
const file = await filePromise;
|
|
143
|
+
if (!file) {
|
|
144
|
+
await ctx.db.delete(grant._id);
|
|
145
|
+
return { status: "file_missing" };
|
|
146
|
+
}
|
|
147
|
+
return { status: "access_denied" };
|
|
148
|
+
}
|
|
149
|
+
const [file, hasAccess] = await Promise.all([
|
|
150
|
+
filePromise,
|
|
151
|
+
hasAccessKey(ctx, {
|
|
152
|
+
accessKey,
|
|
153
|
+
storageId: grant.storageId,
|
|
154
|
+
}),
|
|
155
|
+
]);
|
|
156
|
+
if (!file) {
|
|
157
|
+
await ctx.db.delete(grant._id);
|
|
158
|
+
return { status: "file_missing" };
|
|
159
|
+
}
|
|
160
|
+
if (!hasAccess) {
|
|
161
|
+
return { status: "access_denied" };
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
const file = await filePromise;
|
|
141
165
|
if (!file) {
|
|
142
166
|
await ctx.db.delete(grant._id);
|
|
143
167
|
return { status: "file_missing" };
|
|
144
168
|
}
|
|
145
|
-
if (!hasAccess) {
|
|
146
|
-
return { status: "access_denied" };
|
|
147
|
-
}
|
|
148
169
|
if (grant.passwordHash) {
|
|
149
170
|
const password = args.password;
|
|
150
171
|
if (!password || password.trim() === "") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../src/component/download.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,QAAQ,GAET,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,WAAW,EACX,cAAc,GACf,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAE5E;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAC;IAC1C,IAAI,EAAE;QACJ,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAClD,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QACpD,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../src/component/download.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ declare const _default: import("convex/server").SchemaDefinition<{
|
|
|
26
26
|
}, {}, {}>;
|
|
27
27
|
downloadGrants: import("convex/server").TableDefinition<import("convex/values").VObject<{
|
|
28
28
|
expiresAt?: number | undefined;
|
|
29
|
+
shareableLink?: boolean | undefined;
|
|
29
30
|
passwordHash?: string | undefined;
|
|
30
31
|
passwordSalt?: string | undefined;
|
|
31
32
|
passwordIterations?: number | undefined;
|
|
@@ -38,11 +39,12 @@ declare const _default: import("convex/server").SchemaDefinition<{
|
|
|
38
39
|
expiresAt: import("convex/values").VFloat64<number | undefined, "optional">;
|
|
39
40
|
maxUses: import("convex/values").VUnion<number | null, [import("convex/values").VNull<null, "required">, import("convex/values").VFloat64<number, "required">], "required", never>;
|
|
40
41
|
useCount: import("convex/values").VFloat64<number, "required">;
|
|
42
|
+
shareableLink: import("convex/values").VBoolean<boolean | undefined, "optional">;
|
|
41
43
|
passwordHash: import("convex/values").VString<string | undefined, "optional">;
|
|
42
44
|
passwordSalt: import("convex/values").VString<string | undefined, "optional">;
|
|
43
45
|
passwordIterations: import("convex/values").VFloat64<number | undefined, "optional">;
|
|
44
46
|
passwordAlgorithm: import("convex/values").VString<string | undefined, "optional">;
|
|
45
|
-
}, "required", "expiresAt" | "storageId" | "maxUses" | "useCount" | "passwordHash" | "passwordSalt" | "passwordIterations" | "passwordAlgorithm">, {
|
|
47
|
+
}, "required", "expiresAt" | "storageId" | "maxUses" | "shareableLink" | "useCount" | "passwordHash" | "passwordSalt" | "passwordIterations" | "passwordAlgorithm">, {
|
|
46
48
|
by_storageId: ["storageId", "_creationTime"];
|
|
47
49
|
by_expiresAt: ["expiresAt", "_creationTime"];
|
|
48
50
|
}, {}, {}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/component/schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/component/schema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,wBAqCG"}
|
package/dist/component/schema.js
CHANGED
|
@@ -22,6 +22,7 @@ export default defineSchema({
|
|
|
22
22
|
expiresAt: v.optional(v.number()),
|
|
23
23
|
maxUses: v.union(v.null(), v.number()),
|
|
24
24
|
useCount: v.number(),
|
|
25
|
+
shareableLink: v.optional(v.boolean()),
|
|
25
26
|
passwordHash: v.optional(v.string()),
|
|
26
27
|
passwordSalt: v.optional(v.string()),
|
|
27
28
|
passwordIterations: v.optional(v.number()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/component/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,CAAC,EAAE,MAAM,eAAe,CAAC;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,eAAe,YAAY,CAAC;IAC1B,KAAK,EAAE,WAAW,CAAC;QACjB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,eAAe,EAAE,wBAAwB;QACzC,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAClC,CAAC;SACC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;SACpC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;IAEvC,UAAU,EAAE,WAAW,CAAC;QACtB,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC;QACrB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC;SACC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC;SAC9B,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;SACpC,KAAK,CAAC,4BAA4B,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAElE,cAAc,EAAE,WAAW,CAAC;QAC1B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;QACtC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;QACpB,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACpC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACpC,kBAAkB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC1C,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAC1C,CAAC;SACC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;SACpC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;IAEvC,cAAc,EAAE,WAAW,CAAC;QAC1B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,eAAe,EAAE,wBAAwB;QACzC,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAClC,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;CACxC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/component/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,CAAC,EAAE,MAAM,eAAe,CAAC;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,eAAe,YAAY,CAAC;IAC1B,KAAK,EAAE,WAAW,CAAC;QACjB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,eAAe,EAAE,wBAAwB;QACzC,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAClC,CAAC;SACC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;SACpC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;IAEvC,UAAU,EAAE,WAAW,CAAC;QACtB,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC;QACrB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC;SACC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC;SAC9B,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;SACpC,KAAK,CAAC,4BAA4B,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAElE,cAAc,EAAE,WAAW,CAAC;QAC1B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;QACtC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;QACpB,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACtC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACpC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACpC,kBAAkB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC1C,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAC1C,CAAC;SACC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;SACpC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;IAEvC,cAAc,EAAE,WAAW,CAAC;QAC1B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,eAAe,EAAE,wBAAwB;QACzC,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAClC,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;CACxC,CAAC,CAAC"}
|
package/dist/react/index.d.ts
CHANGED
|
@@ -6,10 +6,10 @@ export type HttpUploadOptions = {
|
|
|
6
6
|
uploadUrl?: string;
|
|
7
7
|
baseUrl?: string;
|
|
8
8
|
pathPrefix?: string;
|
|
9
|
+
authToken?: string;
|
|
9
10
|
};
|
|
10
11
|
export type UploadFileArgs = {
|
|
11
12
|
file: File;
|
|
12
|
-
accessKeys: string[];
|
|
13
13
|
expiresAt?: number | null;
|
|
14
14
|
method?: UploadMethod;
|
|
15
15
|
http?: HttpUploadOptions;
|
|
@@ -37,7 +37,7 @@ export type UploadApi = {
|
|
|
37
37
|
* import { useUploadFile } from "@gilhrpenner/convex-files-control/react";
|
|
38
38
|
*
|
|
39
39
|
* const { uploadFile } = useUploadFile(api.filesControl, { method: "presigned" });
|
|
40
|
-
* await uploadFile({ file
|
|
40
|
+
* await uploadFile({ file });
|
|
41
41
|
* ```
|
|
42
42
|
*/
|
|
43
43
|
export declare function useUploadFile<Api extends UploadApi>(api: Api, options?: UseUploadFileOptions): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/react/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAOvD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAE/D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,MAAM,CAAC;AAChD,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/react/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAOvD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAE/D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,MAAM,CAAC;AAChD,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,iBAAiB,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACjD,cAAc,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;CAC/C,CAAC;AAmBF;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAAC,GAAG,SAAS,SAAS,EACjD,GAAG,EAAE,GAAG,EACR,OAAO,GAAE,oBAAyB;uBAiGnB,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;kCA3FtC,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;gCAwCtC,cAAc,KAAG,OAAO,CAAC,YAAY,CAAC;EAgEtD"}
|
package/dist/react/index.js
CHANGED
|
@@ -28,14 +28,14 @@ function resolveUploadUrl(http) {
|
|
|
28
28
|
* import { useUploadFile } from "@gilhrpenner/convex-files-control/react";
|
|
29
29
|
*
|
|
30
30
|
* const { uploadFile } = useUploadFile(api.filesControl, { method: "presigned" });
|
|
31
|
-
* await uploadFile({ file
|
|
31
|
+
* await uploadFile({ file });
|
|
32
32
|
* ```
|
|
33
33
|
*/
|
|
34
34
|
export function useUploadFile(api, options = {}) {
|
|
35
35
|
const generateUploadUrl = useMutation(api.generateUploadUrl);
|
|
36
36
|
const finalizeUpload = useMutation(api.finalizeUpload);
|
|
37
37
|
const uploadViaPresignedUrl = useCallback(async (args) => {
|
|
38
|
-
const { file,
|
|
38
|
+
const { file, expiresAt } = args;
|
|
39
39
|
const provider = args.provider ?? options.provider ?? "convex";
|
|
40
40
|
const { uploadUrl, uploadToken, storageId: presetStorageId } = await generateUploadUrl({ provider });
|
|
41
41
|
const uploadResponse = await fetch(uploadUrl, {
|
|
@@ -59,20 +59,20 @@ export function useUploadFile(api, options = {}) {
|
|
|
59
59
|
return await finalizeUpload({
|
|
60
60
|
uploadToken,
|
|
61
61
|
storageId,
|
|
62
|
-
|
|
62
|
+
fileName: file.name,
|
|
63
63
|
expiresAt,
|
|
64
64
|
});
|
|
65
65
|
}, [generateUploadUrl, finalizeUpload, options.provider]);
|
|
66
66
|
const uploadViaHttpAction = useCallback(async (args) => {
|
|
67
|
-
const { file,
|
|
67
|
+
const { file, expiresAt } = args;
|
|
68
68
|
const provider = args.provider ?? options.provider ?? "convex";
|
|
69
|
-
const
|
|
69
|
+
const httpConfig = args.http ?? options.http;
|
|
70
|
+
const uploadUrl = resolveUploadUrl(httpConfig);
|
|
70
71
|
if (!uploadUrl) {
|
|
71
72
|
throw new Error("Missing HTTP upload URL. Provide http.uploadUrl or http.baseUrl.");
|
|
72
73
|
}
|
|
73
74
|
const formData = new FormData();
|
|
74
75
|
formData.append(uploadFormFields.file, file);
|
|
75
|
-
formData.append(uploadFormFields.accessKeys, JSON.stringify(accessKeys));
|
|
76
76
|
formData.append(uploadFormFields.provider, provider);
|
|
77
77
|
if (expiresAt !== undefined) {
|
|
78
78
|
formData.append(uploadFormFields.expiresAt, expiresAt === null ? "null" : String(expiresAt));
|
|
@@ -80,6 +80,10 @@ export function useUploadFile(api, options = {}) {
|
|
|
80
80
|
const uploadResponse = await fetch(uploadUrl, {
|
|
81
81
|
method: "POST",
|
|
82
82
|
body: formData,
|
|
83
|
+
credentials: "include",
|
|
84
|
+
headers: httpConfig?.authToken
|
|
85
|
+
? { Authorization: `Bearer ${httpConfig.authToken}` }
|
|
86
|
+
: undefined,
|
|
83
87
|
});
|
|
84
88
|
let payload = null;
|
|
85
89
|
try {
|
package/dist/react/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/react/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,WAAW,CAAC;AAgCnB,SAAS,gBAAgB,CAAC,IAAwB;IAChD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,IAAI,mBAAmB,CAAC;IACzD,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,aAAa,CAC3B,GAAQ,EACR,UAAgC,EAAE;IAElC,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAEvD,MAAM,qBAAqB,GAAG,WAAW,CACvC,KAAK,EAAE,IAAoB,EAAyB,EAAE;QACpD,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/react/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"bugs": {
|
|
10
10
|
"url": "https://github.com/gilhrpenner/convex-files-control/issues"
|
|
11
11
|
},
|
|
12
|
-
"version": "0.
|
|
12
|
+
"version": "0.2.0",
|
|
13
13
|
"publishConfig": {
|
|
14
14
|
"access": "public"
|
|
15
15
|
},
|
|
@@ -33,8 +33,9 @@
|
|
|
33
33
|
"build": "tsc --project ./tsconfig.build.json",
|
|
34
34
|
"build:codegen": "npx convex codegen --component-dir ./src/component && npm run build",
|
|
35
35
|
"build:clean": "rm -rf dist *.tsbuildinfo && npm run build:codegen",
|
|
36
|
-
"typecheck": "tsc --noEmit
|
|
37
|
-
"
|
|
36
|
+
"typecheck": "tsc --noEmit",
|
|
37
|
+
"typecheck:all": "tsc --noEmit && tsc -p example && tsc -p example/convex",
|
|
38
|
+
"lint": "eslint src/",
|
|
38
39
|
"all": "run-p -r 'dev:*' 'test:watch'",
|
|
39
40
|
"test": "vitest run --typecheck",
|
|
40
41
|
"test:watch": "vitest --typecheck --clearScreen false",
|
|
@@ -105,17 +105,32 @@ function makeCtx(runMutation?: unknown, runQuery?: unknown, runAction?: unknown)
|
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
describe("registerRoutes extra coverage", () => {
|
|
108
|
+
// Helper to create a mock checkUploadRequest hook that returns accessKeys
|
|
109
|
+
function mockCheckUploadRequest(accessKeys: string[] = ["test-user"]) {
|
|
110
|
+
return vi.fn(async () => ({ accessKeys }));
|
|
111
|
+
}
|
|
112
|
+
|
|
108
113
|
test("skips download route when disabled", () => {
|
|
109
114
|
const router = createRouter();
|
|
110
115
|
registerRoutes(router, component, {
|
|
111
116
|
enableUploadRoute: true,
|
|
112
117
|
enableDownloadRoute: false,
|
|
118
|
+
checkUploadRequest: mockCheckUploadRequest(),
|
|
113
119
|
});
|
|
114
120
|
|
|
115
121
|
expect(getRoute(router, "/files/download", "GET")).toBeUndefined();
|
|
116
122
|
expect(getRoute(router, "/files/upload", "POST")).toBeDefined();
|
|
117
123
|
});
|
|
118
124
|
|
|
125
|
+
test("upload route requires checkUploadRequest when enabled", () => {
|
|
126
|
+
const router = createRouter();
|
|
127
|
+
expect(() =>
|
|
128
|
+
registerRoutes(router, component, { enableUploadRoute: true }),
|
|
129
|
+
).toThrow(
|
|
130
|
+
"checkUploadRequest is required when enableUploadRoute is true. This hook must authenticate the request and return { accessKeys }.",
|
|
131
|
+
);
|
|
132
|
+
});
|
|
133
|
+
|
|
119
134
|
test("download route short-circuits with checkDownloadRequest", async () => {
|
|
120
135
|
const router = createRouter();
|
|
121
136
|
const checkDownloadRequest = vi.fn(() =>
|
|
@@ -138,6 +153,67 @@ describe("registerRoutes extra coverage", () => {
|
|
|
138
153
|
expect(runMutation).not.toHaveBeenCalled();
|
|
139
154
|
});
|
|
140
155
|
|
|
156
|
+
test("download route uses accessKey from checkDownloadRequest", async () => {
|
|
157
|
+
const router = createRouter();
|
|
158
|
+
const checkDownloadRequest = vi.fn(async () => ({ accessKey: "from-hook" }));
|
|
159
|
+
registerRoutes(router, component, { checkDownloadRequest });
|
|
160
|
+
|
|
161
|
+
const downloadRoute = getRoute(router, "/files/download", "GET");
|
|
162
|
+
const handler = getHandler(downloadRoute?.handler);
|
|
163
|
+
|
|
164
|
+
const runMutation = vi.fn(async () => ({
|
|
165
|
+
status: "ok",
|
|
166
|
+
downloadUrl: "https://file.example.com",
|
|
167
|
+
}));
|
|
168
|
+
const ctx = makeCtx(runMutation);
|
|
169
|
+
|
|
170
|
+
vi.stubGlobal("fetch", vi.fn(async () => new Response("file", { status: 200 })));
|
|
171
|
+
|
|
172
|
+
await handler(
|
|
173
|
+
ctx,
|
|
174
|
+
buildDownloadRequest("https://example.com/files/download?token=token"),
|
|
175
|
+
);
|
|
176
|
+
|
|
177
|
+
expect(runMutation).toHaveBeenCalledWith(
|
|
178
|
+
component.download.consumeDownloadGrantForUrl,
|
|
179
|
+
expect.objectContaining({
|
|
180
|
+
downloadToken: "token",
|
|
181
|
+
accessKey: "from-hook",
|
|
182
|
+
password: undefined,
|
|
183
|
+
}),
|
|
184
|
+
);
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
test("download route ignores checkDownloadRequest without accessKey", async () => {
|
|
188
|
+
const router = createRouter();
|
|
189
|
+
const checkDownloadRequest = vi.fn(async () => ({}));
|
|
190
|
+
registerRoutes(router, component, { checkDownloadRequest });
|
|
191
|
+
|
|
192
|
+
const downloadRoute = getRoute(router, "/files/download", "GET");
|
|
193
|
+
const handler = getHandler(downloadRoute?.handler);
|
|
194
|
+
|
|
195
|
+
const runMutation = vi.fn(async () => ({
|
|
196
|
+
status: "ok",
|
|
197
|
+
downloadUrl: "https://file.example.com",
|
|
198
|
+
}));
|
|
199
|
+
const ctx = makeCtx(runMutation);
|
|
200
|
+
|
|
201
|
+
vi.stubGlobal("fetch", vi.fn(async () => new Response("file", { status: 200 })));
|
|
202
|
+
|
|
203
|
+
await handler(
|
|
204
|
+
ctx,
|
|
205
|
+
buildDownloadRequest("https://example.com/files/download?token=token"),
|
|
206
|
+
);
|
|
207
|
+
|
|
208
|
+
expect(runMutation).toHaveBeenCalledWith(
|
|
209
|
+
component.download.consumeDownloadGrantForUrl,
|
|
210
|
+
expect.objectContaining({
|
|
211
|
+
downloadToken: "token",
|
|
212
|
+
accessKey: undefined,
|
|
213
|
+
}),
|
|
214
|
+
);
|
|
215
|
+
});
|
|
216
|
+
|
|
141
217
|
test("download route reads r2 config from env and handles disabled password params", async () => {
|
|
142
218
|
process.env.R2_ACCOUNT_ID = "acct";
|
|
143
219
|
process.env.R2_ACCESS_KEY_ID = "access";
|
|
@@ -186,11 +262,88 @@ describe("registerRoutes extra coverage", () => {
|
|
|
186
262
|
delete process.env.R2_BUCKET_NAME;
|
|
187
263
|
});
|
|
188
264
|
|
|
265
|
+
test("upload route rejects invalid checkUploadRequest results", async () => {
|
|
266
|
+
const router = createRouter();
|
|
267
|
+
const checkUploadRequest = vi.fn(async () => null);
|
|
268
|
+
registerRoutes(router, component, {
|
|
269
|
+
enableUploadRoute: true,
|
|
270
|
+
checkUploadRequest,
|
|
271
|
+
});
|
|
272
|
+
|
|
273
|
+
const uploadRoute = getRoute(router, "/files/upload", "POST");
|
|
274
|
+
const handler = getHandler(uploadRoute?.handler);
|
|
275
|
+
|
|
276
|
+
const request = buildUploadRequest({
|
|
277
|
+
[uploadFormFields.file]: new File(["file"], "name.txt", {
|
|
278
|
+
type: "text/plain",
|
|
279
|
+
}),
|
|
280
|
+
});
|
|
281
|
+
|
|
282
|
+
const response = await handler(makeCtx(), request);
|
|
283
|
+
expect(response.status).toBe(500);
|
|
284
|
+
expect(await response.json()).toEqual({
|
|
285
|
+
error: "checkUploadRequest must return accessKeys",
|
|
286
|
+
});
|
|
287
|
+
});
|
|
288
|
+
|
|
289
|
+
test("upload route short-circuits when checkUploadRequest returns Response", async () => {
|
|
290
|
+
const router = createRouter();
|
|
291
|
+
const checkUploadRequest = vi.fn(async () =>
|
|
292
|
+
new Response("blocked", { status: 401 }),
|
|
293
|
+
);
|
|
294
|
+
registerRoutes(router, component, {
|
|
295
|
+
enableUploadRoute: true,
|
|
296
|
+
checkUploadRequest,
|
|
297
|
+
});
|
|
298
|
+
|
|
299
|
+
const uploadRoute = getRoute(router, "/files/upload", "POST");
|
|
300
|
+
const handler = getHandler(uploadRoute?.handler);
|
|
301
|
+
|
|
302
|
+
const request = buildUploadRequest({
|
|
303
|
+
[uploadFormFields.file]: new File(["file"], "name.txt", {
|
|
304
|
+
type: "text/plain",
|
|
305
|
+
}),
|
|
306
|
+
});
|
|
307
|
+
request.headers.set("Origin", "https://origin.example");
|
|
308
|
+
|
|
309
|
+
const response = await handler(makeCtx(), request);
|
|
310
|
+
expect(response.status).toBe(401);
|
|
311
|
+
expect(response.headers.get("Access-Control-Allow-Origin")).toBe(
|
|
312
|
+
"https://origin.example",
|
|
313
|
+
);
|
|
314
|
+
});
|
|
315
|
+
|
|
316
|
+
test("upload route rejects empty accessKeys", async () => {
|
|
317
|
+
const router = createRouter();
|
|
318
|
+
const checkUploadRequest = vi.fn(async () => ({ accessKeys: [] }));
|
|
319
|
+
registerRoutes(router, component, {
|
|
320
|
+
enableUploadRoute: true,
|
|
321
|
+
checkUploadRequest,
|
|
322
|
+
});
|
|
323
|
+
|
|
324
|
+
const uploadRoute = getRoute(router, "/files/upload", "POST");
|
|
325
|
+
const handler = getHandler(uploadRoute?.handler);
|
|
326
|
+
|
|
327
|
+
const request = buildUploadRequest({
|
|
328
|
+
[uploadFormFields.file]: new File(["file"], "name.txt", {
|
|
329
|
+
type: "text/plain",
|
|
330
|
+
}),
|
|
331
|
+
});
|
|
332
|
+
|
|
333
|
+
const response = await handler(makeCtx(), request);
|
|
334
|
+
expect(response.status).toBe(500);
|
|
335
|
+
expect(await response.json()).toEqual({
|
|
336
|
+
error: "checkUploadRequest must return accessKeys",
|
|
337
|
+
});
|
|
338
|
+
});
|
|
339
|
+
|
|
189
340
|
test("upload route fails when r2 config missing", async () => {
|
|
341
|
+
const checkUploadRequest = mockCheckUploadRequest(["a"]);
|
|
190
342
|
const router = createRouter();
|
|
191
343
|
registerRoutes(router, component, {
|
|
192
344
|
enableUploadRoute: true,
|
|
193
345
|
defaultUploadProvider: "r2",
|
|
346
|
+
checkUploadRequest,
|
|
194
347
|
});
|
|
195
348
|
|
|
196
349
|
const uploadRoute = getRoute(router, "/files/upload", "POST");
|
|
@@ -200,7 +353,6 @@ describe("registerRoutes extra coverage", () => {
|
|
|
200
353
|
[uploadFormFields.file]: new File(["file"], "name.txt", {
|
|
201
354
|
type: "text/plain",
|
|
202
355
|
}),
|
|
203
|
-
[uploadFormFields.accessKeys]: JSON.stringify(["a"]),
|
|
204
356
|
});
|
|
205
357
|
|
|
206
358
|
const response = await handler(makeCtx(), request);
|
|
@@ -208,10 +360,12 @@ describe("registerRoutes extra coverage", () => {
|
|
|
208
360
|
});
|
|
209
361
|
|
|
210
362
|
test("upload route supports r2 provider and invalid provider defaults", async () => {
|
|
363
|
+
const checkUploadRequest = mockCheckUploadRequest(["a"]);
|
|
211
364
|
const router = createRouter();
|
|
212
365
|
registerRoutes(router, component, {
|
|
213
366
|
enableUploadRoute: true,
|
|
214
367
|
defaultUploadProvider: "convex",
|
|
368
|
+
checkUploadRequest,
|
|
215
369
|
r2: {
|
|
216
370
|
accountId: "acct",
|
|
217
371
|
accessKeyId: "access",
|
|
@@ -259,7 +413,6 @@ describe("registerRoutes extra coverage", () => {
|
|
|
259
413
|
|
|
260
414
|
const r2Request = buildUploadRequest({
|
|
261
415
|
[uploadFormFields.file]: new File(["file"], "name.bin"),
|
|
262
|
-
[uploadFormFields.accessKeys]: JSON.stringify(["a"]),
|
|
263
416
|
[uploadFormFields.provider]: "r2",
|
|
264
417
|
});
|
|
265
418
|
|
|
@@ -282,7 +435,6 @@ describe("registerRoutes extra coverage", () => {
|
|
|
282
435
|
[uploadFormFields.file]: new File(["file"], "name.txt", {
|
|
283
436
|
type: "text/plain",
|
|
284
437
|
}),
|
|
285
|
-
[uploadFormFields.accessKeys]: JSON.stringify(["a"]),
|
|
286
438
|
[uploadFormFields.provider]: "nope",
|
|
287
439
|
});
|
|
288
440
|
|
|
@@ -295,10 +447,12 @@ describe("registerRoutes extra coverage", () => {
|
|
|
295
447
|
});
|
|
296
448
|
|
|
297
449
|
test("upload route handles non-Error throws", async () => {
|
|
450
|
+
const checkUploadRequest = mockCheckUploadRequest(["a"]);
|
|
298
451
|
const router = createRouter();
|
|
299
452
|
registerRoutes(router, component, {
|
|
300
453
|
enableUploadRoute: true,
|
|
301
454
|
defaultUploadProvider: "r2",
|
|
455
|
+
checkUploadRequest,
|
|
302
456
|
});
|
|
303
457
|
|
|
304
458
|
const uploadRoute = getRoute(router, "/files/upload", "POST");
|
|
@@ -308,7 +462,6 @@ describe("registerRoutes extra coverage", () => {
|
|
|
308
462
|
[uploadFormFields.file]: new File(["file"], "name.txt", {
|
|
309
463
|
type: "text/plain",
|
|
310
464
|
}),
|
|
311
|
-
[uploadFormFields.accessKeys]: JSON.stringify(["a"]),
|
|
312
465
|
});
|
|
313
466
|
|
|
314
467
|
const OriginalError = globalThis.Error;
|