wrangler 3.13.0 → 3.13.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/package.json +5 -5
- package/wrangler-dist/cli.d.ts +46 -21800
- package/wrangler-dist/cli.js +12325 -12829
- package/templates/startDevWorker/InspectorProxyWorker.ts +0 -526
- package/templates/startDevWorker/ProxyWorker.ts +0 -260
- package/wrangler-dist/InspectorProxyWorker.js +0 -361
- package/wrangler-dist/InspectorProxyWorker.js.map +0 -6
- package/wrangler-dist/ProxyWorker.js +0 -188
- package/wrangler-dist/ProxyWorker.js.map +0 -6
|
@@ -1,188 +0,0 @@
|
|
|
1
|
-
// src/api/startDevWorker/utils.ts
|
|
2
|
-
import assert from "node:assert";
|
|
3
|
-
function createDeferred(previousDeferred) {
|
|
4
|
-
let resolve, reject;
|
|
5
|
-
const newPromise = new Promise((_resolve, _reject) => {
|
|
6
|
-
resolve = _resolve;
|
|
7
|
-
reject = _reject;
|
|
8
|
-
});
|
|
9
|
-
assert(resolve);
|
|
10
|
-
assert(reject);
|
|
11
|
-
previousDeferred?.resolve(newPromise);
|
|
12
|
-
return {
|
|
13
|
-
promise: newPromise,
|
|
14
|
-
resolve,
|
|
15
|
-
reject
|
|
16
|
-
};
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
// templates/startDevWorker/ProxyWorker.ts
|
|
20
|
-
var LIVE_RELOAD_PROTOCOL = "WRANGLER_PROXYWORKER_LIVE_RELOAD_PROTOCOL";
|
|
21
|
-
var ProxyWorker_default = {
|
|
22
|
-
fetch(req, env) {
|
|
23
|
-
const singleton = env.DURABLE_OBJECT.idFromName("");
|
|
24
|
-
const inspectorProxy = env.DURABLE_OBJECT.get(singleton);
|
|
25
|
-
return inspectorProxy.fetch(req);
|
|
26
|
-
}
|
|
27
|
-
};
|
|
28
|
-
var ProxyWorker = class {
|
|
29
|
-
constructor(state, env) {
|
|
30
|
-
this.state = state;
|
|
31
|
-
this.env = env;
|
|
32
|
-
}
|
|
33
|
-
proxyData;
|
|
34
|
-
requestQueue = /* @__PURE__ */ new Map();
|
|
35
|
-
fetch(request) {
|
|
36
|
-
if (isRequestForLiveReloadWebsocket(request)) {
|
|
37
|
-
return this.handleLiveReloadWebSocket(request);
|
|
38
|
-
}
|
|
39
|
-
if (isRequestFromProxyController(request, this.env)) {
|
|
40
|
-
return this.processProxyControllerRequest(request);
|
|
41
|
-
}
|
|
42
|
-
const deferred = createDeferred();
|
|
43
|
-
this.requestQueue.set(request, deferred);
|
|
44
|
-
this.processQueue();
|
|
45
|
-
return deferred.promise;
|
|
46
|
-
}
|
|
47
|
-
handleLiveReloadWebSocket(request) {
|
|
48
|
-
const { 0: response, 1: liveReload } = new WebSocketPair();
|
|
49
|
-
const websocketProtocol = request.headers.get("Sec-WebSocket-Protocol") ?? "";
|
|
50
|
-
this.state.acceptWebSocket(liveReload, ["live-reload"]);
|
|
51
|
-
return new Response(null, {
|
|
52
|
-
status: 101,
|
|
53
|
-
webSocket: response,
|
|
54
|
-
headers: { "Sec-WebSocket-Protocol": websocketProtocol }
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
processProxyControllerRequest(request) {
|
|
58
|
-
const event = request.cf?.hostMetadata;
|
|
59
|
-
switch (event?.type) {
|
|
60
|
-
case "pause":
|
|
61
|
-
this.proxyData = void 0;
|
|
62
|
-
break;
|
|
63
|
-
case "play":
|
|
64
|
-
this.proxyData = event.proxyData;
|
|
65
|
-
this.processQueue();
|
|
66
|
-
this.state.getWebSockets("live-reload").forEach((ws) => ws.send("reload"));
|
|
67
|
-
break;
|
|
68
|
-
}
|
|
69
|
-
return new Response(null, { status: 204 });
|
|
70
|
-
}
|
|
71
|
-
processQueue() {
|
|
72
|
-
const { proxyData } = this;
|
|
73
|
-
if (proxyData === void 0)
|
|
74
|
-
return;
|
|
75
|
-
for (const [request, deferredResponse] of this.requestQueue) {
|
|
76
|
-
this.requestQueue.delete(request);
|
|
77
|
-
const url = new URL(request.url);
|
|
78
|
-
const headers = new Headers(request.headers);
|
|
79
|
-
Object.assign(url, proxyData.userWorkerUrl);
|
|
80
|
-
const innerUrl = new URL(url.href);
|
|
81
|
-
Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides);
|
|
82
|
-
if (proxyData.userWorkerInnerUrlOverrides && proxyData.userWorkerInnerUrlOverrides.port === void 0) {
|
|
83
|
-
innerUrl.port = "";
|
|
84
|
-
}
|
|
85
|
-
headers.set("MF-Original-URL", innerUrl.href);
|
|
86
|
-
for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
|
|
87
|
-
if (key.toLowerCase() === "cookie") {
|
|
88
|
-
const existing = request.headers.get("cookie") ?? "";
|
|
89
|
-
headers.set("cookie", `${existing};${value}`);
|
|
90
|
-
} else {
|
|
91
|
-
headers.set(key, value);
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
void fetch(url, new Request(request, { headers })).then((res) => {
|
|
95
|
-
if (isHtmlResponse(res)) {
|
|
96
|
-
res = insertLiveReloadScript(request, res, this.env, proxyData);
|
|
97
|
-
}
|
|
98
|
-
deferredResponse.resolve(res);
|
|
99
|
-
}).catch((error) => {
|
|
100
|
-
void sendMessageToProxyController(this.env, {
|
|
101
|
-
type: "error",
|
|
102
|
-
error: {
|
|
103
|
-
name: error.name,
|
|
104
|
-
message: error.message,
|
|
105
|
-
stack: error.stack,
|
|
106
|
-
cause: error.cause
|
|
107
|
-
}
|
|
108
|
-
});
|
|
109
|
-
deferredResponse.reject(error);
|
|
110
|
-
});
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
};
|
|
114
|
-
function isRequestFromProxyController(req, env) {
|
|
115
|
-
return req.headers.get("Authorization") === env.PROXY_CONTROLLER_AUTH_SECRET;
|
|
116
|
-
}
|
|
117
|
-
function isHtmlResponse(res) {
|
|
118
|
-
return res.headers.get("content-type")?.startsWith("text/html") ?? false;
|
|
119
|
-
}
|
|
120
|
-
function isRequestForLiveReloadWebsocket(req) {
|
|
121
|
-
const websocketProtocol = req.headers.get("Sec-WebSocket-Protocol");
|
|
122
|
-
const isWebSocketUpgrade = req.headers.get("Upgrade") === "websocket";
|
|
123
|
-
return isWebSocketUpgrade && websocketProtocol === LIVE_RELOAD_PROTOCOL;
|
|
124
|
-
}
|
|
125
|
-
async function sendMessageToProxyController(env, message, retries = 3) {
|
|
126
|
-
try {
|
|
127
|
-
await env.PROXY_CONTROLLER.fetch("http://dummy", {
|
|
128
|
-
method: "POST",
|
|
129
|
-
body: JSON.stringify(message)
|
|
130
|
-
});
|
|
131
|
-
} catch (cause) {
|
|
132
|
-
if (retries > 0) {
|
|
133
|
-
return sendMessageToProxyController(env, message, retries - 1);
|
|
134
|
-
}
|
|
135
|
-
throw cause;
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
function insertLiveReloadScript(request, response, env, proxyData) {
|
|
139
|
-
const htmlRewriter = new HTMLRewriter();
|
|
140
|
-
let errorDetails = "";
|
|
141
|
-
htmlRewriter.on("#cf-error-details", {
|
|
142
|
-
text(element) {
|
|
143
|
-
errorDetails += element.text;
|
|
144
|
-
}
|
|
145
|
-
});
|
|
146
|
-
htmlRewriter.onDocument({
|
|
147
|
-
end(end) {
|
|
148
|
-
if (response.status === 400 && errorDetails.includes("Invalid Workers Preview configuration")) {
|
|
149
|
-
void sendMessageToProxyController(env, {
|
|
150
|
-
type: "previewTokenExpired",
|
|
151
|
-
proxyData
|
|
152
|
-
});
|
|
153
|
-
}
|
|
154
|
-
if (proxyData.liveReload) {
|
|
155
|
-
const websocketUrl = new URL(request.url);
|
|
156
|
-
websocketUrl.protocol = websocketUrl.protocol === "http:" ? "ws:" : "wss:";
|
|
157
|
-
end.append(
|
|
158
|
-
`
|
|
159
|
-
<script>
|
|
160
|
-
(function() {
|
|
161
|
-
var ws;
|
|
162
|
-
function recover() {
|
|
163
|
-
ws = null;
|
|
164
|
-
setTimeout(initLiveReload, 100);
|
|
165
|
-
}
|
|
166
|
-
function initLiveReload() {
|
|
167
|
-
if (ws) return;
|
|
168
|
-
var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host;
|
|
169
|
-
ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}");
|
|
170
|
-
ws.onclose = recover;
|
|
171
|
-
ws.onerror = recover;
|
|
172
|
-
ws.onmessage = location.reload.bind(location);
|
|
173
|
-
}
|
|
174
|
-
})();
|
|
175
|
-
</script>
|
|
176
|
-
`,
|
|
177
|
-
{ html: true }
|
|
178
|
-
);
|
|
179
|
-
}
|
|
180
|
-
}
|
|
181
|
-
});
|
|
182
|
-
return htmlRewriter.transform(response);
|
|
183
|
-
}
|
|
184
|
-
export {
|
|
185
|
-
ProxyWorker,
|
|
186
|
-
ProxyWorker_default as default
|
|
187
|
-
};
|
|
188
|
-
//# sourceMappingURL=ProxyWorker.js.map
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"version": 3,
|
|
3
|
-
"sources": ["../src/api/startDevWorker/utils.ts", "../templates/startDevWorker/ProxyWorker.ts"],
|
|
4
|
-
"mappings": "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",
|
|
5
|
-
"names": []
|
|
6
|
-
}
|