@gadicc/loom 1.23.0 → 1.25.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 +19 -2
- package/db/databaseTls.js +42 -0
- package/db/databaseTls.test.ts +171 -0
- package/db/neonFull.js +2 -4
- package/esm/_dnt.polyfills.d.ts +11 -0
- package/esm/_dnt.polyfills.d.ts.map +1 -1
- package/esm/_dnt.polyfills.js +14 -0
- package/esm/src/cli/filesR2Policy.d.ts +33 -0
- package/esm/src/cli/filesR2Policy.d.ts.map +1 -0
- package/esm/src/cli/filesR2Policy.js +130 -0
- package/esm/src/cli/mod.d.ts.map +1 -1
- package/esm/src/cli/mod.js +163 -60
- package/esm/src/cli/releaseConfig.d.ts +10 -0
- package/esm/src/cli/releaseConfig.d.ts.map +1 -0
- package/esm/src/cli/releaseConfig.js +22 -0
- package/esm/src/next/pwa/mod.d.ts +10 -2
- package/esm/src/next/pwa/mod.d.ts.map +1 -1
- package/esm/src/next/pwa/mod.js +142 -31
- package/package.json +2 -2
- package/script/_dnt.polyfills.d.ts +11 -0
- package/script/_dnt.polyfills.d.ts.map +1 -1
- package/script/_dnt.polyfills.js +14 -0
- package/script/src/cli/filesR2Policy.d.ts +33 -0
- package/script/src/cli/filesR2Policy.d.ts.map +1 -0
- package/script/src/cli/filesR2Policy.js +135 -0
- package/script/src/cli/mod.d.ts.map +1 -1
- package/script/src/cli/mod.js +163 -60
- package/script/src/cli/releaseConfig.d.ts +10 -0
- package/script/src/cli/releaseConfig.d.ts.map +1 -0
- package/script/src/cli/releaseConfig.js +26 -0
- package/script/src/next/pwa/mod.d.ts +10 -2
- package/script/src/next/pwa/mod.d.ts.map +1 -1
- package/script/src/next/pwa/mod.js +142 -31
- package/skills/loom-db/SKILL.md +5 -1
- package/skills/loom-files/SKILL.md +12 -1
package/esm/src/next/pwa/mod.js
CHANGED
|
@@ -28,13 +28,24 @@ function reportError(error, onError, logger) {
|
|
|
28
28
|
(logger ?? console).error("[PWA] Service worker lifecycle error", error);
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
const registrations = new WeakMap();
|
|
32
|
+
function registerOnce(serwist) {
|
|
33
|
+
let pending = registrations.get(serwist);
|
|
34
|
+
if (!pending) {
|
|
35
|
+
// React effects can remount while registration is still waiting for load.
|
|
36
|
+
pending = Promise.resolve().then(() => serwist.register());
|
|
37
|
+
registrations.set(serwist, pending);
|
|
38
|
+
void pending.catch(() => registrations.delete(serwist));
|
|
39
|
+
}
|
|
40
|
+
return pending;
|
|
33
41
|
}
|
|
34
42
|
/**
|
|
35
43
|
* Registers Loom's Serwist lifecycle listeners and optional update polling.
|
|
36
44
|
*
|
|
37
|
-
*
|
|
45
|
+
* Cleanup removes this observer's listeners and polling without unregistering
|
|
46
|
+
* the worker or removing offline caches. Pending callbacks cannot activate or
|
|
47
|
+
* reload after cleanup. Registration is shared across effect remounts.
|
|
48
|
+
*
|
|
38
49
|
* In `prompt` mode, a waiting worker is activated only after `canReloadNow` and
|
|
39
50
|
* `confirmUpdate` both allow it; in `manual` mode Loom reports availability but
|
|
40
51
|
* never activates the worker for the app.
|
|
@@ -48,8 +59,19 @@ export function setupLoomPwaLifecycle(options = {}) {
|
|
|
48
59
|
const logger = options.logger === false ? false : options.logger ?? console;
|
|
49
60
|
const reload = options.reload ?? defaultReload;
|
|
50
61
|
let disposed = false;
|
|
51
|
-
let
|
|
62
|
+
let reloaded = false;
|
|
63
|
+
let reloadPending = false;
|
|
64
|
+
let approvedWorker;
|
|
65
|
+
let legacyApproval = false;
|
|
66
|
+
let registration;
|
|
52
67
|
let updateInterval;
|
|
68
|
+
let updatePending = false;
|
|
69
|
+
let promptQueue = Promise.resolve();
|
|
70
|
+
const pendingWaiting = new WeakSet();
|
|
71
|
+
const decidedWaiting = new WeakSet();
|
|
72
|
+
const controller = () => navigator.serviceWorker.controller;
|
|
73
|
+
let previousController = controller();
|
|
74
|
+
let latestControl;
|
|
53
75
|
const makeContext = (reason, event) => ({
|
|
54
76
|
event,
|
|
55
77
|
isUpdate: event.isUpdate ?? reason === "waiting",
|
|
@@ -57,77 +79,166 @@ export function setupLoomPwaLifecycle(options = {}) {
|
|
|
57
79
|
serwist,
|
|
58
80
|
wasWaitingBeforeRegister: event.wasWaitingBeforeRegister,
|
|
59
81
|
});
|
|
82
|
+
const failed = (error) => {
|
|
83
|
+
if (!disposed)
|
|
84
|
+
reportError(error, options.onError, options.logger);
|
|
85
|
+
};
|
|
60
86
|
const deferUpdate = (context) => {
|
|
87
|
+
if (disposed)
|
|
88
|
+
return;
|
|
61
89
|
options.onUpdateDeferred?.(context);
|
|
62
90
|
logger && logger.info("[PWA] Update deferred.");
|
|
63
91
|
};
|
|
92
|
+
const isCurrent = (worker) => !worker || controller() === worker ||
|
|
93
|
+
worker.state === "activating" || worker.state === "activated" ||
|
|
94
|
+
(worker.state !== "redundant" &&
|
|
95
|
+
(!registration || registration.waiting === worker));
|
|
96
|
+
const applyControl = async (context) => {
|
|
97
|
+
const current = controller();
|
|
98
|
+
const approved = approvedWorker
|
|
99
|
+
? current === approvedWorker
|
|
100
|
+
: legacyApproval;
|
|
101
|
+
if (disposed || reloaded || reloadPending ||
|
|
102
|
+
(!approved && (updateMode !== "auto" || !context.isUpdate)))
|
|
103
|
+
return;
|
|
104
|
+
// Reserve before awaiting the app's guard; controller events can overlap.
|
|
105
|
+
reloadPending = true;
|
|
106
|
+
try {
|
|
107
|
+
const allowed = await (options.canReloadNow?.(context) ?? true);
|
|
108
|
+
if (disposed || reloaded || current !== controller())
|
|
109
|
+
return;
|
|
110
|
+
if (!allowed) {
|
|
111
|
+
deferUpdate(context);
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
reloaded = true;
|
|
115
|
+
options.onUpdateActivated?.(context);
|
|
116
|
+
if (!disposed)
|
|
117
|
+
reload();
|
|
118
|
+
}
|
|
119
|
+
finally {
|
|
120
|
+
reloadPending = false;
|
|
121
|
+
}
|
|
122
|
+
};
|
|
64
123
|
const handleWaiting = async (event) => {
|
|
124
|
+
const key = event.sw ?? event;
|
|
125
|
+
if (disposed || reloaded || decidedWaiting.has(key))
|
|
126
|
+
return;
|
|
65
127
|
const context = makeContext("waiting", event);
|
|
66
128
|
options.onUpdateAvailable?.(context);
|
|
129
|
+
if (disposed)
|
|
130
|
+
return;
|
|
67
131
|
if (updateMode === "manual") {
|
|
68
132
|
deferUpdate(context);
|
|
69
133
|
return;
|
|
70
134
|
}
|
|
71
|
-
|
|
135
|
+
const allowed = await (options.canReloadNow?.(context) ?? true);
|
|
136
|
+
if (disposed || reloaded)
|
|
137
|
+
return;
|
|
138
|
+
if (!allowed || !isCurrent(event.sw)) {
|
|
72
139
|
deferUpdate(context);
|
|
73
140
|
return;
|
|
74
141
|
}
|
|
75
142
|
const accepted = updateMode === "auto"
|
|
76
143
|
? true
|
|
77
144
|
: await (options.confirmUpdate?.(context) ?? defaultConfirmUpdate());
|
|
78
|
-
if (
|
|
145
|
+
if (disposed || reloaded)
|
|
146
|
+
return;
|
|
147
|
+
decidedWaiting.add(key);
|
|
148
|
+
if (!accepted || !isCurrent(event.sw)) {
|
|
79
149
|
deferUpdate(context);
|
|
80
150
|
return;
|
|
81
151
|
}
|
|
82
|
-
|
|
152
|
+
approvedWorker = event.sw;
|
|
153
|
+
legacyApproval = !event.sw;
|
|
83
154
|
options.onUpdateAccepted?.(context);
|
|
84
|
-
|
|
85
|
-
};
|
|
86
|
-
const handleControlling = async (event) => {
|
|
87
|
-
const context = makeContext("controlling", event);
|
|
88
|
-
if (!context.isUpdate || (!reloadOnNextControl && updateMode !== "auto")) {
|
|
155
|
+
if (disposed || reloaded)
|
|
89
156
|
return;
|
|
157
|
+
if (event.sw && controller() === event.sw) {
|
|
158
|
+
// Another tab may have activated the accepted worker during the prompt.
|
|
159
|
+
await applyControl(latestControl ?? makeContext("controlling", {
|
|
160
|
+
type: "controlling",
|
|
161
|
+
isUpdate: true,
|
|
162
|
+
sw: event.sw,
|
|
163
|
+
}));
|
|
90
164
|
}
|
|
91
|
-
if (
|
|
92
|
-
|
|
93
|
-
|
|
165
|
+
else if (event.sw) {
|
|
166
|
+
// Serwist's messageSkipWaiting selects whichever worker is waiting now.
|
|
167
|
+
// Address the approved identity so a replacement cannot inherit consent.
|
|
168
|
+
if (event.sw.state !== "activating" && event.sw.state !== "activated") {
|
|
169
|
+
event.sw.postMessage({ type: "SKIP_WAITING" });
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
// Preserve integrations that implement the original identity-free API.
|
|
174
|
+
await serwist.messageSkipWaiting();
|
|
94
175
|
}
|
|
95
|
-
options.onUpdateActivated?.(context);
|
|
96
|
-
reload();
|
|
97
176
|
};
|
|
98
177
|
const waitingListener = (event) => {
|
|
99
|
-
|
|
178
|
+
const key = event.sw ?? event;
|
|
179
|
+
if (disposed || reloaded || pendingWaiting.has(key))
|
|
180
|
+
return;
|
|
181
|
+
pendingWaiting.add(key);
|
|
182
|
+
// The shared confirmation UI has one dialog. Serialize different workers.
|
|
183
|
+
promptQueue = promptQueue.then(() => handleWaiting(event)).catch(failed)
|
|
184
|
+
.finally(() => pendingWaiting.delete(key));
|
|
100
185
|
};
|
|
101
186
|
const controllingListener = (event) => {
|
|
102
|
-
|
|
187
|
+
if (disposed)
|
|
188
|
+
return;
|
|
189
|
+
const current = controller();
|
|
190
|
+
const context = makeContext("controlling", event);
|
|
191
|
+
// Serwist snapshots isUpdate at registration, even on a first-install page
|
|
192
|
+
// that later receives updates. Its external event.sw can also be outdated.
|
|
193
|
+
context.isUpdate ||= Boolean(previousController && current !== previousController);
|
|
194
|
+
previousController = current;
|
|
195
|
+
latestControl = context;
|
|
196
|
+
void applyControl(context).catch(failed);
|
|
103
197
|
};
|
|
104
198
|
serwist.addEventListener("waiting", waitingListener);
|
|
105
199
|
serwist.addEventListener("controlling", controllingListener);
|
|
200
|
+
const observeRegistration = (value) => {
|
|
201
|
+
if (disposed || !value)
|
|
202
|
+
return;
|
|
203
|
+
registration = value;
|
|
204
|
+
// Cached registration does not emit waiting again when an effect remounts.
|
|
205
|
+
if (value.waiting) {
|
|
206
|
+
waitingListener({
|
|
207
|
+
type: "waiting",
|
|
208
|
+
sw: value.waiting,
|
|
209
|
+
wasWaitingBeforeRegister: true,
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
};
|
|
106
213
|
if (options.register ?? true) {
|
|
107
|
-
serwist.
|
|
214
|
+
void registerOnce(serwist).then(observeRegistration).catch(failed);
|
|
108
215
|
}
|
|
109
216
|
if (options.updateCheckIntervalMs !== undefined &&
|
|
110
217
|
options.updateCheckIntervalMs > 0) {
|
|
111
|
-
navigator.serviceWorker.ready
|
|
112
|
-
|
|
113
|
-
if (disposed) {
|
|
218
|
+
void navigator.serviceWorker.ready.then((value) => {
|
|
219
|
+
if (disposed)
|
|
114
220
|
return;
|
|
115
|
-
|
|
116
|
-
logger &&
|
|
117
|
-
logger.info(`[PWA] Will check for updates every ${options.updateCheckIntervalMs / 1000} seconds.`);
|
|
221
|
+
registration = value;
|
|
222
|
+
logger && logger.info(`[PWA] Will check for updates every ${options.updateCheckIntervalMs / 1000} seconds.`);
|
|
118
223
|
updateInterval = setInterval(() => {
|
|
119
|
-
|
|
224
|
+
if (disposed || updatePending)
|
|
225
|
+
return;
|
|
226
|
+
updatePending = true;
|
|
227
|
+
void Promise.resolve().then(() => {
|
|
228
|
+
if (!disposed)
|
|
229
|
+
return value.update();
|
|
230
|
+
}).catch(failed).finally(() => {
|
|
231
|
+
updatePending = false;
|
|
232
|
+
});
|
|
120
233
|
}, options.updateCheckIntervalMs);
|
|
121
|
-
})
|
|
122
|
-
.catch((error) => reportError(error, options.onError, options.logger));
|
|
234
|
+
}).catch(failed);
|
|
123
235
|
}
|
|
124
236
|
return () => {
|
|
125
237
|
disposed = true;
|
|
126
238
|
serwist.removeEventListener("waiting", waitingListener);
|
|
127
239
|
serwist.removeEventListener("controlling", controllingListener);
|
|
128
|
-
if (updateInterval !== undefined)
|
|
240
|
+
if (updateInterval !== undefined)
|
|
129
241
|
clearInterval(updateInterval);
|
|
130
|
-
}
|
|
131
242
|
};
|
|
132
243
|
}
|
|
133
244
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gadicc/loom",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.25.0",
|
|
4
4
|
"description": "Deno-first shared helpers for extracting common Next.js app code.",
|
|
5
5
|
"homepage": "https://github.com/gadicc/loom#readme",
|
|
6
6
|
"repository": {
|
|
@@ -231,7 +231,7 @@
|
|
|
231
231
|
},
|
|
232
232
|
"scripts": {},
|
|
233
233
|
"loom": {
|
|
234
|
-
"gitCommit": "
|
|
234
|
+
"gitCommit": "2e3c6570131f3cc234913ed72fbe945428b94d3d"
|
|
235
235
|
},
|
|
236
236
|
"bin": {
|
|
237
237
|
"loom": "script/bin/loom.js"
|
|
@@ -152,4 +152,15 @@ declare global {
|
|
|
152
152
|
}
|
|
153
153
|
}
|
|
154
154
|
export {};
|
|
155
|
+
declare global {
|
|
156
|
+
interface Object {
|
|
157
|
+
/**
|
|
158
|
+
* Determines whether an object has a property with the specified name.
|
|
159
|
+
* @param o An object.
|
|
160
|
+
* @param v A property name.
|
|
161
|
+
*/
|
|
162
|
+
hasOwn(o: object, v: PropertyKey): boolean;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
export {};
|
|
155
166
|
//# sourceMappingURL=_dnt.polyfills.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.polyfills.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.polyfills.ts"],"names":[],"mappings":"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"}
|
package/script/_dnt.polyfills.js
CHANGED
|
@@ -164,3 +164,17 @@ if (!Uint8Array.prototype.findLast) {
|
|
|
164
164
|
return findLast(this, callbackfn, that);
|
|
165
165
|
};
|
|
166
166
|
}
|
|
167
|
+
// https://github.com/tc39/proposal-accessible-object-hasownproperty/blob/main/polyfill.js
|
|
168
|
+
if (!Object.hasOwn) {
|
|
169
|
+
Object.defineProperty(Object, "hasOwn", {
|
|
170
|
+
value: function (object, property) {
|
|
171
|
+
if (object == null) {
|
|
172
|
+
throw new TypeError("Cannot convert undefined or null to object");
|
|
173
|
+
}
|
|
174
|
+
return Object.prototype.hasOwnProperty.call(Object(object), property);
|
|
175
|
+
},
|
|
176
|
+
configurable: true,
|
|
177
|
+
enumerable: false,
|
|
178
|
+
writable: true,
|
|
179
|
+
});
|
|
180
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/** Explicit browser transport permission; it never grants public object access. */
|
|
2
|
+
export type FilesR2DirectUploadPolicy = {
|
|
3
|
+
kind: "presigned-put";
|
|
4
|
+
origins: Record<"production" | "preview", string[]>;
|
|
5
|
+
allowedHeaders: string[];
|
|
6
|
+
maxAgeSeconds: number;
|
|
7
|
+
};
|
|
8
|
+
type PolicyInput = {
|
|
9
|
+
accessMode?: unknown;
|
|
10
|
+
directBrowserAccess?: unknown;
|
|
11
|
+
directUpload?: unknown;
|
|
12
|
+
forcePathStyle?: unknown;
|
|
13
|
+
publicUrl?: unknown;
|
|
14
|
+
};
|
|
15
|
+
/** Validates untrusted manifest policy before setup or network side effects. */
|
|
16
|
+
export declare function filesR2PolicyIssues(provider: PolicyInput): string[];
|
|
17
|
+
type CorsRule = {
|
|
18
|
+
origins: string[];
|
|
19
|
+
methods: string[];
|
|
20
|
+
headers: string[];
|
|
21
|
+
exposeHeaders: string[];
|
|
22
|
+
maxAgeSeconds: number;
|
|
23
|
+
};
|
|
24
|
+
/**
|
|
25
|
+
* Wrangler 4.112 has no CORS JSON flag. Parse its complete labelled permission
|
|
26
|
+
* projection, rejecting unknown formats instead of treating a successful CLI
|
|
27
|
+
* exit as proof. Rule IDs are not rendered and have no permission semantics.
|
|
28
|
+
*/
|
|
29
|
+
export declare function parseWranglerR2Cors(text: string, bucket: string): CorsRule[] | null;
|
|
30
|
+
/** Compares one minimal PUT rule, combining declared origins for a shared bucket. */
|
|
31
|
+
export declare function r2CorsMatchesPolicy(rules: CorsRule[], policy: FilesR2DirectUploadPolicy, environments: Array<"production" | "preview">): boolean;
|
|
32
|
+
export {};
|
|
33
|
+
//# sourceMappingURL=filesR2Policy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filesR2Policy.d.ts","sourceRoot":"","sources":["../../../src/src/cli/filesR2Policy.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,YAAY,GAAG,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IACpD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AA2BF,gFAAgF;AAChF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,EAAE,CAuEnE;AAED,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,QAAQ,EAAE,GAAG,IAAI,CA6CnB;AAED,qFAAqF;AACrF,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,QAAQ,EAAE,EACjB,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAC5C,OAAO,CAcT"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.filesR2PolicyIssues = filesR2PolicyIssues;
|
|
4
|
+
exports.parseWranglerR2Cors = parseWranglerR2Cors;
|
|
5
|
+
exports.r2CorsMatchesPolicy = r2CorsMatchesPolicy;
|
|
6
|
+
function record(value) {
|
|
7
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
8
|
+
}
|
|
9
|
+
function exactKeys(value, keys) {
|
|
10
|
+
return Object.keys(value).length === keys.length &&
|
|
11
|
+
keys.every((key) => Object.hasOwn(value, key));
|
|
12
|
+
}
|
|
13
|
+
function uniqueStrings(value) {
|
|
14
|
+
return Array.isArray(value) && value.length > 0 &&
|
|
15
|
+
value.every((entry) => typeof entry === "string") &&
|
|
16
|
+
new Set(value).size === value.length;
|
|
17
|
+
}
|
|
18
|
+
function exactHttpsOrigin(value) {
|
|
19
|
+
try {
|
|
20
|
+
const url = new URL(value);
|
|
21
|
+
return url.protocol === "https:" && url.origin === value &&
|
|
22
|
+
!value.includes("*");
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
/** Validates untrusted manifest policy before setup or network side effects. */
|
|
29
|
+
function filesR2PolicyIssues(provider) {
|
|
30
|
+
const issues = [];
|
|
31
|
+
if (provider.accessMode !== "private" || provider.publicUrl !== null) {
|
|
32
|
+
issues.push("Files R2 provider policy must remain private with publicUrl null.");
|
|
33
|
+
}
|
|
34
|
+
if (provider.forcePathStyle !== undefined &&
|
|
35
|
+
typeof provider.forcePathStyle !== "boolean") {
|
|
36
|
+
issues.push("Files R2 forcePathStyle must be an explicit boolean when present.");
|
|
37
|
+
}
|
|
38
|
+
if (provider.directBrowserAccess === false &&
|
|
39
|
+
provider.directUpload === undefined)
|
|
40
|
+
return issues;
|
|
41
|
+
if (provider.directBrowserAccess !== true) {
|
|
42
|
+
issues.push("Files R2 directBrowserAccess must be false, or true with an explicit presigned-put policy.");
|
|
43
|
+
return issues;
|
|
44
|
+
}
|
|
45
|
+
const policy = provider.directUpload;
|
|
46
|
+
if (!record(policy) ||
|
|
47
|
+
!exactKeys(policy, [
|
|
48
|
+
"kind",
|
|
49
|
+
"origins",
|
|
50
|
+
"allowedHeaders",
|
|
51
|
+
"maxAgeSeconds",
|
|
52
|
+
]) || policy.kind !== "presigned-put") {
|
|
53
|
+
issues.push("Files R2 directUpload must be an explicit presigned-put policy with only the documented fields.");
|
|
54
|
+
return issues;
|
|
55
|
+
}
|
|
56
|
+
if (!record(policy.origins) ||
|
|
57
|
+
!exactKeys(policy.origins, ["production", "preview"]) ||
|
|
58
|
+
![policy.origins.production, policy.origins.preview].every((origins) => uniqueStrings(origins) && origins.every(exactHttpsOrigin))) {
|
|
59
|
+
issues.push("Files R2 directUpload origins must be nonempty unique exact HTTPS origins for Production and Preview, without paths or wildcards.");
|
|
60
|
+
}
|
|
61
|
+
if (!uniqueStrings(policy.allowedHeaders) ||
|
|
62
|
+
!policy.allowedHeaders.every((header) => /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(header))) {
|
|
63
|
+
issues.push("Files R2 directUpload allowedHeaders must be unique explicit lowercase header names without wildcards.");
|
|
64
|
+
}
|
|
65
|
+
if (typeof policy.maxAgeSeconds !== "number" ||
|
|
66
|
+
!Number.isSafeInteger(policy.maxAgeSeconds) || policy.maxAgeSeconds < 0 ||
|
|
67
|
+
policy.maxAgeSeconds > 86400) {
|
|
68
|
+
issues.push("Files R2 directUpload maxAgeSeconds must be an integer from 0 to 86400.");
|
|
69
|
+
}
|
|
70
|
+
return issues;
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Wrangler 4.112 has no CORS JSON flag. Parse its complete labelled permission
|
|
74
|
+
* projection, rejecting unknown formats instead of treating a successful CLI
|
|
75
|
+
* exit as proof. Rule IDs are not rendered and have no permission semantics.
|
|
76
|
+
*/
|
|
77
|
+
function parseWranglerR2Cors(text, bucket) {
|
|
78
|
+
const lines = text.trim().split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
|
|
79
|
+
if (lines.shift() !== `Listing CORS rules for bucket '${bucket}'...`) {
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
if (lines.length === 1 &&
|
|
83
|
+
lines[0] ===
|
|
84
|
+
`There is no CORS configuration defined for bucket '${bucket}'.`)
|
|
85
|
+
return [];
|
|
86
|
+
if (!lines.length || lines.length % 5)
|
|
87
|
+
return null;
|
|
88
|
+
const labels = [
|
|
89
|
+
"allowed_origins",
|
|
90
|
+
"allowed_methods",
|
|
91
|
+
"allowed_headers",
|
|
92
|
+
"exposed_headers",
|
|
93
|
+
"max_age_seconds",
|
|
94
|
+
];
|
|
95
|
+
const rules = [];
|
|
96
|
+
for (let i = 0; i < lines.length; i += 5) {
|
|
97
|
+
const values = labels.map((label, offset) => {
|
|
98
|
+
const line = lines[i + offset];
|
|
99
|
+
return line.startsWith(`${label}:`)
|
|
100
|
+
? line.slice(label.length + 1).trim()
|
|
101
|
+
: null;
|
|
102
|
+
});
|
|
103
|
+
if (values.some((value) => value === null || value === ""))
|
|
104
|
+
return null;
|
|
105
|
+
const [origins, methods, headers, exposeHeaders, maxAge] = values;
|
|
106
|
+
if (!/^(?:0|[1-9]\d*|\(0 seconds\))$/.test(maxAge))
|
|
107
|
+
return null;
|
|
108
|
+
const maxAgeSeconds = maxAge === "(0 seconds)" ? 0 : Number(maxAge);
|
|
109
|
+
if (!Number.isSafeInteger(maxAgeSeconds))
|
|
110
|
+
return null;
|
|
111
|
+
const list = (value, empty) => value === empty ? [] : value.split(", ");
|
|
112
|
+
rules.push({
|
|
113
|
+
origins: list(origins, "(no origins)"),
|
|
114
|
+
methods: list(methods, "(no methods)"),
|
|
115
|
+
headers: list(headers, "(no headers)"),
|
|
116
|
+
exposeHeaders: list(exposeHeaders, "(no exposed headers)"),
|
|
117
|
+
maxAgeSeconds,
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
return rules;
|
|
121
|
+
}
|
|
122
|
+
/** Compares one minimal PUT rule, combining declared origins for a shared bucket. */
|
|
123
|
+
function r2CorsMatchesPolicy(rules, policy, environments) {
|
|
124
|
+
if (rules.length !== 1)
|
|
125
|
+
return false;
|
|
126
|
+
const rule = rules[0];
|
|
127
|
+
const equal = (a, b) => JSON.stringify([...a].sort()) === JSON.stringify([...b].sort());
|
|
128
|
+
return equal(rule.origins, [
|
|
129
|
+
...new Set(environments.flatMap((environment) => policy.origins[environment])),
|
|
130
|
+
]) &&
|
|
131
|
+
equal(rule.methods, ["PUT"]) &&
|
|
132
|
+
equal(rule.headers, policy.allowedHeaders) &&
|
|
133
|
+
rule.exposeHeaders.length === 0 &&
|
|
134
|
+
rule.maxAgeSeconds === policy.maxAgeSeconds;
|
|
135
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
|