@solidjs/web 2.0.0-rc.16 → 2.0.0-rc.17

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.
@@ -1,6 +1,6 @@
1
1
  import { sharedConfig, ssrSanitizeError, creationStamp, ssrHandleError, runInServerComponentScope, trackFillReads, shareAsyncIterable, getProjectionTrace } from 'solid-js/internal';
2
2
  import { getOwner, NoHydration, runWithOwner, createMemo, createOwner, Hydration } from 'solid-js';
3
- import { isResponseEnvelope, renderToStream, createLiveHoles } from '@solidjs/web';
3
+ import { isResponseEnvelope, RequestContext, renderToStream, createLiveHoles } from '@solidjs/web';
4
4
  import { Feature, createStream, toCrossJSONStream } from 'seroval';
5
5
  import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
6
6
  import { frameAddress, getEventServerFunctionInvocation, ChunkReader, serializeStream, guardFailures, armLiveBody, createEventChunk, createChunk, textDigest } from '@solidjs/web/server-functions/server';
@@ -772,12 +772,13 @@ function createFrameSink(write, frame, have, hooks) {
772
772
  },
773
773
  flush,
774
774
  slot(key, args) {
775
- put(id, {
775
+ const r = {
776
776
  [`slot:${key}`]: {
777
777
  kind: "slot",
778
778
  args
779
779
  }
780
- });
780
+ };
781
+ swept ? Object.assign(swept.r, r) : put(id, r);
781
782
  },
782
783
  region(childId, value) {
783
784
  needs("regions");
@@ -799,6 +800,11 @@ function createFrameSink(write, frame, have, hooks) {
799
800
  record.base = base;
800
801
  } else record.value = source;
801
802
  withHoles(record, holeDigests(record.rows ? rows.r.map(r => r[1]).join("") : source, null));
803
+ if (record.rows && hooks && hooks.retain) record[HOLE_SOURCE] = withHoles({
804
+ kind: "html",
805
+ value: source,
806
+ digest: record.digest
807
+ }, holeDigests(source, null));
802
808
  const r = {
803
809
  ["hole:" + key]: record
804
810
  };
@@ -819,6 +825,7 @@ function createFrameSink(write, frame, have, hooks) {
819
825
  },
820
826
  attrBaseline(key, text) {
821
827
  attrText.set(key, text);
828
+ if (hooks && hooks.retain) hooks.retain(key, text);
822
829
  },
823
830
  openBinding(key, b) {
824
831
  if (/^lha?:/.test(key)) needs("wire");
@@ -920,6 +927,7 @@ function frameStream(makeCode, options) {
920
927
  };
921
928
  const sink = createFrameSink(emit, frame, options.resume && options.resume.have, {
922
929
  live: options.live,
930
+ retain: options.broadcast,
923
931
  onYield: bounded ? () => {
924
932
  if (flushed && maxYields > 0 && ++yields >= maxYields) cut("yields");
925
933
  } : undefined
@@ -2056,6 +2064,12 @@ function frameTransformResult(event, result, context) {
2056
2064
  const invocation = getEventServerFunctionInvocation(event);
2057
2065
  const live = !!(invocation && invocation.live);
2058
2066
  const have = live ? decodeHaveList(requestHeader(event, FRAME_HAVE_HEADER)) : undefined;
2067
+ if (live && invocation.broadcast && invocation.shareKey !== undefined) return broadcastResponse(invocation.id + "\0" + invocation.shareKey, result, {
2068
+ frame: {
2069
+ id: invocation.id || ""
2070
+ },
2071
+ live: true
2072
+ }, requestSignal(event), have, init);
2059
2073
  return serverComponentResponse(result, {
2060
2074
  frame: {
2061
2075
  id: invocation && invocation.id || ""
@@ -2067,6 +2081,269 @@ function frameTransformResult(event, result, context) {
2067
2081
  }
2068
2082
  }, init);
2069
2083
  }
2084
+ const HOLE_SOURCE = Symbol("solid.frames.holeSource");
2085
+ const BROADCASTS = new Map();
2086
+ function broadcastResponse(key, component, options, signal, have, init) {
2087
+ let shared = BROADCASTS.get(key);
2088
+ if (!shared || shared.ended) shared = startBroadcast(key, component, options);
2089
+ return tapResponse(shared, signal, have, init);
2090
+ }
2091
+ function startBroadcast(key, component, options) {
2092
+ const shared = {
2093
+ key,
2094
+ id: options.frame.id,
2095
+ start: null,
2096
+ taps: new Set(),
2097
+ records: new Map(),
2098
+ data: [],
2099
+ kept: 0,
2100
+ attrs: new Map(),
2101
+ tiers: new Set(["wire"]),
2102
+ failed: false,
2103
+ ended: false,
2104
+ teardown: new AbortController()
2105
+ };
2106
+ BROADCASTS.set(key, shared);
2107
+ const stream = renderServerComponent(component, {
2108
+ ...options,
2109
+ broadcast: (key, text) => shared.attrs.set(key, text),
2110
+ signal: shared.teardown.signal
2111
+ });
2112
+ const run = () => stream.pipe({
2113
+ write(message) {
2114
+ const bytes = createEventChunk(JSON.stringify(message));
2115
+ if (message.type === "start") return void (shared.start = bytes);
2116
+ retain(shared, message);
2117
+ for (const tap of shared.taps) tap.write(bytes);
2118
+ },
2119
+ end() {
2120
+ shared.ended = true;
2121
+ if (BROADCASTS.get(key) === shared) BROADCASTS.delete(key);
2122
+ for (const tap of [...shared.taps]) tap.end();
2123
+ },
2124
+ [ANNOUNCE](tiers) {
2125
+ for (const tier of tiers) shared.tiers.add(tier);
2126
+ }
2127
+ });
2128
+ const store = globalThis[RequestContext];
2129
+ store ? store.run(broadcastEvent(), run) : run();
2130
+ return shared;
2131
+ }
2132
+ function broadcastEvent() {
2133
+ const event = {
2134
+ broadcast: true
2135
+ };
2136
+ for (const name of ["request", "locals", "clientAddress", "nativeEvent"]) Object.defineProperty(event, name, {
2137
+ get() {
2138
+ return undefined;
2139
+ }
2140
+ });
2141
+ return event;
2142
+ }
2143
+ function retain(shared, message) {
2144
+ if (message.tiers) for (const tier of message.tiers) shared.tiers.add(tier);
2145
+ if (!message.r) {
2146
+ shared.data.push(message);
2147
+ if (shared.data.length > 64 && shared.data.length > 2 * shared.kept) shared.kept = (shared.data = referencedData(shared)).length;
2148
+ return;
2149
+ }
2150
+ const {
2151
+ id,
2152
+ version
2153
+ } = message;
2154
+ for (const k in message.r) {
2155
+ let record = message.r[k];
2156
+ if (k === ":error") shared.failed = true;
2157
+ if (k === "") for (const [rk, e] of shared.records) if (e.id === id) shared.records.delete(rk);
2158
+ if (record && record[HOLE_SOURCE]) record = record[HOLE_SOURCE];
2159
+ const rk = id + "\0" + k;
2160
+ const prev = shared.records.get(rk);
2161
+ if (prev && record && record.kind === "attrs" && prev.record.removed) {
2162
+ const removed = new Set(prev.record.removed);
2163
+ if (record.removed) for (const name of record.removed) removed.add(name);
2164
+ record = {
2165
+ ...record,
2166
+ removed: [...removed]
2167
+ };
2168
+ }
2169
+ shared.records.delete(rk);
2170
+ shared.records.set(rk, {
2171
+ id,
2172
+ version,
2173
+ k,
2174
+ record
2175
+ });
2176
+ }
2177
+ }
2178
+ function referencedData(shared) {
2179
+ const refs = new Set();
2180
+ for (const {
2181
+ record
2182
+ } of shared.records.values()) if (record && typeof record === "object") for (const m of JSON.stringify(record).matchAll(/"\$ref":"((?:[^"\\]|\\.)*)"/g)) refs.add(JSON.parse(`"${m[1]}"`));
2183
+ return shared.data.filter(m => typeof m.key !== "string" || refs.has(m.key));
2184
+ }
2185
+ function snapshot(shared, have) {
2186
+ const out = referencedData(shared);
2187
+ const root = shared.records.get(shared.id + "\0");
2188
+ const conditional = !!(have && root && root.record && have[""] === root.record.digest);
2189
+ let open = null;
2190
+ const put = (id, version, k, record) => {
2191
+ if (!open || open.id !== id) out.push(open = {
2192
+ id,
2193
+ version,
2194
+ r: {}
2195
+ });
2196
+ open.r[k] = record;
2197
+ };
2198
+ if (!conditional) {
2199
+ for (const {
2200
+ id,
2201
+ version,
2202
+ k,
2203
+ record
2204
+ } of shared.records.values()) put(id, version, k, record);
2205
+ return out;
2206
+ }
2207
+ const containers = [];
2208
+ for (const e of shared.records.values()) if (e.id === shared.id && (e.k === "" || /^seg:[^:]+$/.test(e.k)) && e.record) containers.push({
2209
+ e,
2210
+ value: e.record.value
2211
+ });
2212
+ for (const {
2213
+ k,
2214
+ record
2215
+ } of shared.records.values()) {
2216
+ if (!k.startsWith("hole:lh:") || k.endsWith(":error") || !record || record.value == null) continue;
2217
+ const n = k.slice(8);
2218
+ const startMark = `<!--lh:${n}-->`;
2219
+ const endMark = `<!--lh:/${n}-->`;
2220
+ for (const c of containers) {
2221
+ const start = c.value.indexOf(startMark);
2222
+ if (start < 0) continue;
2223
+ const end = c.value.indexOf(endMark, start);
2224
+ if (end < 0) continue;
2225
+ c.value = c.value.slice(0, start + startMark.length) + record.value + c.value.slice(end);
2226
+ break;
2227
+ }
2228
+ }
2229
+ for (const e of shared.records.values()) {
2230
+ const {
2231
+ id,
2232
+ version,
2233
+ k,
2234
+ record
2235
+ } = e;
2236
+ if (id !== shared.id) {
2237
+ put(id, version, k, record);
2238
+ continue;
2239
+ }
2240
+ if (k === "" || k === "seg::assets" || k.startsWith("hole:lh:") && !k.endsWith(":error")) continue;
2241
+ const seg = /^seg:([^:]+)(?::(.*))?$/.exec(k);
2242
+ if (seg && have[seg[1]] !== undefined && seg[2] !== "error") continue;
2243
+ if (seg && seg[2] === undefined) {
2244
+ const c = containers.find(c => c.e === e);
2245
+ if (c && c.value !== record.value) {
2246
+ put(id, version, k, withHoles({
2247
+ ...record,
2248
+ value: c.value,
2249
+ digest: textDigest(c.value)
2250
+ }, holeDigests(c.value, null)));
2251
+ continue;
2252
+ }
2253
+ }
2254
+ if (k.startsWith("attr:")) continue;
2255
+ put(id, version, k, record);
2256
+ }
2257
+ for (const c of containers) {
2258
+ const seg = c.e.k && /^seg:([^:]+)$/.exec(c.e.k);
2259
+ if (seg && have[seg[1]] === undefined) continue;
2260
+ for (const m of c.value.matchAll(HOLE_RANGE)) {
2261
+ const key = "lh:" + m[1];
2262
+ const digest = textDigest(stripHoleMarkers(m[2]));
2263
+ if (have[key] === digest) continue;
2264
+ put(shared.id, c.e.version, "hole:" + key, withHoles({
2265
+ kind: "html",
2266
+ value: m[2],
2267
+ digest
2268
+ }, holeDigests(m[2], null)));
2269
+ }
2270
+ for (const m of c.value.matchAll(ATTR_ADDRESS)) {
2271
+ const latest = shared.records.get(shared.id + "\0attr:" + m[1]);
2272
+ const text = latest ? latest.record.value : shared.attrs.get("lha:" + m[1]);
2273
+ if (text === undefined) continue;
2274
+ const digest = latest ? latest.record.digest : textDigest(text);
2275
+ if (have["lha:" + m[1]] === digest) continue;
2276
+ put(shared.id, c.e.version, "attr:" + m[1], latest ? latest.record : {
2277
+ kind: "attrs",
2278
+ value: text,
2279
+ digest
2280
+ });
2281
+ }
2282
+ }
2283
+ return out;
2284
+ }
2285
+ function tapResponse(shared, signal, have, init = {}) {
2286
+ const headers = copyInitHeaders(init.headers);
2287
+ headers.set(FRAME_STREAM_HEADER, shared.id);
2288
+ headers.set("X-Content-Raw", "1");
2289
+ headers.set("Content-Type", "text/event-stream");
2290
+ headers.set("Cache-Control", "no-store");
2291
+ headers.set("X-Accel-Buffering", "no");
2292
+ headers.set(FRAME_TIERS_HEADER, [...shared.tiers].join(","));
2293
+ let closed = false;
2294
+ let stopLive = null;
2295
+ let tap = null;
2296
+ const leave = () => {
2297
+ if (closed) return;
2298
+ closed = true;
2299
+ if (stopLive) stopLive();
2300
+ if (signal) signal.removeEventListener("abort", leave);
2301
+ shared.taps.delete(tap);
2302
+ if (!shared.taps.size && !shared.ended) {
2303
+ shared.ended = true;
2304
+ if (BROADCASTS.get(shared.key) === shared) BROADCASTS.delete(shared.key);
2305
+ shared.teardown.abort({
2306
+ [DISCONNECTED]: true
2307
+ });
2308
+ }
2309
+ };
2310
+ const body = new ReadableStream({
2311
+ start(controller) {
2312
+ tap = {
2313
+ write(bytes) {
2314
+ if (closed) return;
2315
+ try {
2316
+ controller.enqueue(bytes);
2317
+ } catch (_) {
2318
+ leave();
2319
+ }
2320
+ },
2321
+ end() {
2322
+ leave();
2323
+ try {
2324
+ controller.close();
2325
+ } catch (_) {}
2326
+ }
2327
+ };
2328
+ if (shared.start) controller.enqueue(shared.start);
2329
+ for (const message of snapshot(shared, have)) controller.enqueue(createEventChunk(JSON.stringify(message)));
2330
+ if (shared.ended || signal && signal.aborted) return tap.end();
2331
+ shared.taps.add(tap);
2332
+ stopLive = armLiveBody(controller, leave);
2333
+ if (signal) signal.addEventListener("abort", leave, {
2334
+ once: true
2335
+ });
2336
+ },
2337
+ cancel() {
2338
+ leave();
2339
+ }
2340
+ });
2341
+ if (shared.failed) headers.set("Cache-Control", "no-store");
2342
+ return new Response(body, {
2343
+ status: init.status || 200,
2344
+ headers
2345
+ });
2346
+ }
2070
2347
  function requestSignal(event) {
2071
2348
  const request = event && event.request;
2072
2349
  return request && request.signal instanceof AbortSignal ? request.signal : undefined;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@solidjs/web",
3
3
  "description": "Solid's web runtime: client rendering, hydration, SSR, and DOM-specific control flow (Portal, Dynamic).",
4
- "version": "2.0.0-rc.16",
4
+ "version": "2.0.0-rc.17",
5
5
  "author": "Ryan Carniato",
6
6
  "license": "MIT",
7
7
  "homepage": "https://solidjs.com",
@@ -377,7 +377,7 @@
377
377
  "seroval-plugins": "1.6.7"
378
378
  },
379
379
  "peerDependencies": {
380
- "solid-js": "^2.0.0-rc.16"
380
+ "solid-js": "^2.0.0-rc.17"
381
381
  },
382
382
  "devDependencies": {
383
383
  "@codspeed/vitest-plugin": "^5.4.0",
@@ -858,7 +858,7 @@ function parseServerFunctionActionUrl(url) {
858
858
  }
859
859
  function serializeArguments(args) {
860
860
  if (!config.serializeArgs) {
861
- throw new Error("Server function arguments are sent as JSON by default and these " + "arguments are not JSON-serializable. Call enableRichArguments() " + '(from "@solidjs/web/server-functions/rich-args") once at startup ' + "to send Dates, Maps, Sets, typed arrays, etc. through the codec — " + "or pass a single Blob/FormData/File argument, which has a native " + "HTTP encoding.");
861
+ throw new Error("Server function arguments are sent as JSON by default and these " + "arguments are not JSON-serializable. Call enableRichArguments() " + '(from "@solidjs/web/server-functions/rich-args") once at startup ' + "to send Dates, Maps, Sets, typed arrays, files, etc. through the codec — " + "or pass a single Blob/FormData/File argument, which has a native " + "HTTP encoding.");
862
862
  }
863
863
  return config.serializeArgs(args);
864
864
  }
@@ -877,11 +877,10 @@ function configureServerFunctionsClient({
877
877
  if (responseHandler !== undefined) config.responseHandler = responseHandler;
878
878
  if (serializeArgs !== undefined) config.serializeArgs = serializeArgs;
879
879
  }
880
- let rpcProvided = false;
880
+ let rpc;
881
881
  function provideRPC() {
882
- if (rpcProvided) return;
883
- rpcProvided = true;
884
- provideServerFunctionRPC({
882
+ if (rpc) return;
883
+ provideServerFunctionRPC(rpc = {
885
884
  GET,
886
885
  decodeResponse
887
886
  });
@@ -895,7 +894,6 @@ function siblingAddressFor(base, kind) {
895
894
  return `${path.slice(0, slash + 1)}${kind}/${path.slice(slash + 1)}${rest}`;
896
895
  }
897
896
  const dataAddressFor = base => siblingAddressFor(base, "data");
898
- const liveAddressFor = base => siblingAddressFor(base, "live");
899
897
  function serverFunctionFailure(response, value) {
900
898
  const unknown = response.headers.get(UNKNOWN_HEADER) !== null;
901
899
  const error = value ?? new Error(unknown ? "Server function is not part of the deployment that answered (version skew or removed function)" : `Server function call failed with status ${response.status}`);
@@ -1022,7 +1020,6 @@ async function initializeResponse(base, id, options, args, meta) {
1022
1020
  body: await serializeArguments(args),
1023
1021
  headers: {
1024
1022
  ...options.headers,
1025
- "Content-Type": "text/plain",
1026
1023
  [BODY_FORMAT_HEADER]: BodyFormat.Serialized
1027
1024
  }
1028
1025
  }, meta);
@@ -1225,6 +1222,9 @@ function trackLiveConnection(id, open) {
1225
1222
  const names = [...openLiveConnections].map(([fnId, n]) => n > 1 ? `${fnId} ×${n}` : fnId);
1226
1223
  console.warn(`live: ${total} live connections are open (${names.join(", ")}) and this page was served ` + `over ${protocol}. Browsers allow six connections per origin under HTTP/1.1, so the next ` + `request to this origin — a navigation, a fetch, an image — waits behind them. live ` + `requires HTTP/2: the dev server speaks it with \`server.https\`; production hosts do by default.`);
1227
1224
  }
1225
+ function broadcast(fn) {
1226
+ return live(fn);
1227
+ }
1228
1228
  function localOrSend(hit, send) {
1229
1229
  if (hit === null || typeof hit.then !== "function") return hit;
1230
1230
  return hit.then(answer => answer === undefined ? send() : answer);
@@ -1237,6 +1237,7 @@ function live(fn) {
1237
1237
  if (!isServerFunction(fn)) {
1238
1238
  throw new Error("live expects a server function reference");
1239
1239
  }
1240
+ if (getServerFunctionMetadata(fn)?.method !== "GET") fn = rpc.GET(fn);
1240
1241
  const id = fn.id;
1241
1242
  const metadata = {
1242
1243
  ...getServerFunctionMetadata(fn),
@@ -1329,19 +1330,7 @@ function live(fn) {
1329
1330
  wire.headers = from ? from.headers : undefined;
1330
1331
  if (from && from.position !== undefined) wire.position = from.position;
1331
1332
  }
1332
- if (metadata.method === "GET") return fn[SERVER_FUNCTION_INVOKE](args, wireOptions);
1333
- if (handler && handler.intercept && !wire.adopted) {
1334
- const hit = handler.intercept({
1335
- id,
1336
- meta: metadata,
1337
- args
1338
- });
1339
- if (hit !== undefined) return hit;
1340
- }
1341
- return fetchServerFunction(liveAddressFor(fn.url), id, {
1342
- ...wireOptions,
1343
- read: true
1344
- }, args, metadata, args);
1333
+ return fn[SERVER_FUNCTION_INVOKE](args, wireOptions);
1345
1334
  };
1346
1335
  const pull = async () => {
1347
1336
  if (resume !== undefined) {
@@ -1470,4 +1459,4 @@ function getServerFunctionInvocation() {
1470
1459
  return undefined;
1471
1460
  }
1472
1461
 
1473
- export { ChunkReader, ERROR_HEADER, EVENT_STREAM_HEARTBEAT, EventStreamReader, FLASH_COOKIE, GET, LAST_EVENT_ID_HEADER, LIVE_WIRE, REDIRECT_HEADER, REVALIDATE_HEADER, SERVER_FUNCTION_INVOKE, SINGLE_FLIGHT_HEADER, UNKNOWN_HEADER, clearFlashCookie, configureServerFunctionsClient, createChunk, createEventChunk, createServerReference, decodeErrorHeaderValue, decodeRedirectHeaderValue, decodeResponse, decodeResponsePayload, deliverFlightData, deserializeStream, encodeErrorHeaderValue, frameAddress, getFlightDataConsumer, getFlightDataSourceIds, getServerFunctionInvocation, getServerFunctionMetadata, getServerFunctionsCodec, hasFlashCookie, hasFlightMetadata, invoke, isEventStream, isServerFunction, live, parseServerFunctionActionUrl, positionDigest, registerServerReference, serializeString, serverFunctionActionUrl, serverFunctionUrl, subscribeFlightData, withMeta };
1462
+ export { ChunkReader, ERROR_HEADER, EVENT_STREAM_HEARTBEAT, EventStreamReader, FLASH_COOKIE, GET, LAST_EVENT_ID_HEADER, LIVE_WIRE, REDIRECT_HEADER, REVALIDATE_HEADER, SERVER_FUNCTION_INVOKE, SINGLE_FLIGHT_HEADER, UNKNOWN_HEADER, broadcast, clearFlashCookie, configureServerFunctionsClient, createChunk, createEventChunk, createServerReference, decodeErrorHeaderValue, decodeRedirectHeaderValue, decodeResponse, decodeResponsePayload, deliverFlightData, deserializeStream, encodeErrorHeaderValue, frameAddress, getFlightDataConsumer, getFlightDataSourceIds, getServerFunctionInvocation, getServerFunctionMetadata, getServerFunctionsCodec, hasFlashCookie, hasFlightMetadata, invoke, isEventStream, isServerFunction, live, parseServerFunctionActionUrl, positionDigest, registerServerReference, serializeString, serverFunctionActionUrl, serverFunctionUrl, subscribeFlightData, withMeta };
@@ -750,7 +750,7 @@ function parseServerFunctionActionUrl(url) {
750
750
  }
751
751
  function serializeArguments(args) {
752
752
  if (!config.serializeArgs) {
753
- throw new Error("Server function arguments are sent as JSON by default and these " + "arguments are not JSON-serializable. Call enableRichArguments() " + '(from "@solidjs/web/server-functions/rich-args") once at startup ' + "to send Dates, Maps, Sets, typed arrays, etc. through the codec — " + "or pass a single Blob/FormData/File argument, which has a native " + "HTTP encoding.");
753
+ throw new Error("Server function arguments are sent as JSON by default and these " + "arguments are not JSON-serializable. Call enableRichArguments() " + '(from "@solidjs/web/server-functions/rich-args") once at startup ' + "to send Dates, Maps, Sets, typed arrays, files, etc. through the codec — " + "or pass a single Blob/FormData/File argument, which has a native " + "HTTP encoding.");
754
754
  }
755
755
  return config.serializeArgs(args);
756
756
  }
@@ -769,11 +769,10 @@ function configureServerFunctionsClient({
769
769
  if (responseHandler !== undefined) config.responseHandler = responseHandler;
770
770
  if (serializeArgs !== undefined) config.serializeArgs = serializeArgs;
771
771
  }
772
- let rpcProvided = false;
772
+ let rpc;
773
773
  function provideRPC() {
774
- if (rpcProvided) return;
775
- rpcProvided = true;
776
- provideServerFunctionRPC({
774
+ if (rpc) return;
775
+ provideServerFunctionRPC(rpc = {
777
776
  GET,
778
777
  decodeResponse
779
778
  });
@@ -787,7 +786,6 @@ function siblingAddressFor(base, kind) {
787
786
  return `${path.slice(0, slash + 1)}${kind}/${path.slice(slash + 1)}${rest}`;
788
787
  }
789
788
  const dataAddressFor = base => siblingAddressFor(base, "data");
790
- const liveAddressFor = base => siblingAddressFor(base, "live");
791
789
  function serverFunctionFailure(response, value) {
792
790
  const unknown = response.headers.get(UNKNOWN_HEADER) !== null;
793
791
  const error = value ?? new Error(unknown ? "Server function is not part of the deployment that answered (version skew or removed function)" : `Server function call failed with status ${response.status}`);
@@ -906,7 +904,6 @@ async function initializeResponse(base, id, options, args, meta) {
906
904
  body: await serializeArguments(args),
907
905
  headers: {
908
906
  ...options.headers,
909
- "Content-Type": "text/plain",
910
907
  [BODY_FORMAT_HEADER]: BodyFormat.Serialized
911
908
  }
912
909
  }, meta);
@@ -1073,6 +1070,9 @@ function GET(fn) {
1073
1070
  method: "GET"
1074
1071
  });
1075
1072
  }
1073
+ function broadcast(fn) {
1074
+ return live(fn);
1075
+ }
1076
1076
  function localOrSend(hit, send) {
1077
1077
  if (hit === null || typeof hit.then !== "function") return hit;
1078
1078
  return hit.then(answer => answer === undefined ? send() : answer);
@@ -1085,6 +1085,7 @@ function live(fn) {
1085
1085
  if (!isServerFunction(fn)) {
1086
1086
  throw new Error("live expects a server function reference");
1087
1087
  }
1088
+ if (getServerFunctionMetadata(fn)?.method !== "GET") fn = rpc.GET(fn);
1088
1089
  const id = fn.id;
1089
1090
  const metadata = {
1090
1091
  ...getServerFunctionMetadata(fn),
@@ -1172,19 +1173,7 @@ function live(fn) {
1172
1173
  wire.headers = from ? from.headers : undefined;
1173
1174
  if (from && from.position !== undefined) wire.position = from.position;
1174
1175
  }
1175
- if (metadata.method === "GET") return fn[SERVER_FUNCTION_INVOKE](args, wireOptions);
1176
- if (handler && handler.intercept && !wire.adopted) {
1177
- const hit = handler.intercept({
1178
- id,
1179
- meta: metadata,
1180
- args
1181
- });
1182
- if (hit !== undefined) return hit;
1183
- }
1184
- return fetchServerFunction(liveAddressFor(fn.url), id, {
1185
- ...wireOptions,
1186
- read: true
1187
- }, args, metadata, args);
1176
+ return fn[SERVER_FUNCTION_INVOKE](args, wireOptions);
1188
1177
  };
1189
1178
  const pull = async () => {
1190
1179
  if (resume !== undefined) {
@@ -1313,4 +1302,4 @@ function getServerFunctionInvocation() {
1313
1302
  return undefined;
1314
1303
  }
1315
1304
 
1316
- export { ChunkReader, ERROR_HEADER, EVENT_STREAM_HEARTBEAT, EventStreamReader, FLASH_COOKIE, GET, LAST_EVENT_ID_HEADER, LIVE_WIRE, REDIRECT_HEADER, REVALIDATE_HEADER, SERVER_FUNCTION_INVOKE, SINGLE_FLIGHT_HEADER, UNKNOWN_HEADER, clearFlashCookie, configureServerFunctionsClient, createChunk, createEventChunk, createServerReference, decodeErrorHeaderValue, decodeRedirectHeaderValue, decodeResponse, decodeResponsePayload, deliverFlightData, deserializeStream, encodeErrorHeaderValue, frameAddress, getFlightDataConsumer, getFlightDataSourceIds, getServerFunctionInvocation, getServerFunctionMetadata, getServerFunctionsCodec, hasFlashCookie, hasFlightMetadata, invoke, isEventStream, isServerFunction, live, parseServerFunctionActionUrl, positionDigest, registerServerReference, serializeString, serverFunctionActionUrl, serverFunctionUrl, subscribeFlightData, withMeta };
1305
+ export { ChunkReader, ERROR_HEADER, EVENT_STREAM_HEARTBEAT, EventStreamReader, FLASH_COOKIE, GET, LAST_EVENT_ID_HEADER, LIVE_WIRE, REDIRECT_HEADER, REVALIDATE_HEADER, SERVER_FUNCTION_INVOKE, SINGLE_FLIGHT_HEADER, UNKNOWN_HEADER, broadcast, clearFlashCookie, configureServerFunctionsClient, createChunk, createEventChunk, createServerReference, decodeErrorHeaderValue, decodeRedirectHeaderValue, decodeResponse, decodeResponsePayload, deliverFlightData, deserializeStream, encodeErrorHeaderValue, frameAddress, getFlightDataConsumer, getFlightDataSourceIds, getServerFunctionInvocation, getServerFunctionMetadata, getServerFunctionsCodec, hasFlashCookie, hasFlightMetadata, invoke, isEventStream, isServerFunction, live, parseServerFunctionActionUrl, positionDigest, registerServerReference, serializeString, serverFunctionActionUrl, serverFunctionUrl, subscribeFlightData, withMeta };
@@ -858,7 +858,7 @@ function parseServerFunctionActionUrl(url) {
858
858
  }
859
859
  function serializeArguments(args) {
860
860
  if (!config.serializeArgs) {
861
- throw new Error("Server function arguments are sent as JSON by default and these " + "arguments are not JSON-serializable. Call enableRichArguments() " + '(from "@solidjs/web/server-functions/rich-args") once at startup ' + "to send Dates, Maps, Sets, typed arrays, etc. through the codec — " + "or pass a single Blob/FormData/File argument, which has a native " + "HTTP encoding.");
861
+ throw new Error("Server function arguments are sent as JSON by default and these " + "arguments are not JSON-serializable. Call enableRichArguments() " + '(from "@solidjs/web/server-functions/rich-args") once at startup ' + "to send Dates, Maps, Sets, typed arrays, files, etc. through the codec — " + "or pass a single Blob/FormData/File argument, which has a native " + "HTTP encoding.");
862
862
  }
863
863
  return config.serializeArgs(args);
864
864
  }
@@ -877,11 +877,10 @@ function configureServerFunctionsClient({
877
877
  if (responseHandler !== undefined) config.responseHandler = responseHandler;
878
878
  if (serializeArgs !== undefined) config.serializeArgs = serializeArgs;
879
879
  }
880
- let rpcProvided = false;
880
+ let rpc;
881
881
  function provideRPC() {
882
- if (rpcProvided) return;
883
- rpcProvided = true;
884
- provideServerFunctionRPC({
882
+ if (rpc) return;
883
+ provideServerFunctionRPC(rpc = {
885
884
  GET,
886
885
  decodeResponse
887
886
  });
@@ -895,7 +894,6 @@ function siblingAddressFor(base, kind) {
895
894
  return `${path.slice(0, slash + 1)}${kind}/${path.slice(slash + 1)}${rest}`;
896
895
  }
897
896
  const dataAddressFor = base => siblingAddressFor(base, "data");
898
- const liveAddressFor = base => siblingAddressFor(base, "live");
899
897
  function serverFunctionFailure(response, value) {
900
898
  const unknown = response.headers.get(UNKNOWN_HEADER) !== null;
901
899
  const error = value ?? new Error(unknown ? "Server function is not part of the deployment that answered (version skew or removed function)" : `Server function call failed with status ${response.status}`);
@@ -1022,7 +1020,6 @@ async function initializeResponse(base, id, options, args, meta) {
1022
1020
  body: await serializeArguments(args),
1023
1021
  headers: {
1024
1022
  ...options.headers,
1025
- "Content-Type": "text/plain",
1026
1023
  [BODY_FORMAT_HEADER]: BodyFormat.Serialized
1027
1024
  }
1028
1025
  }, meta);
@@ -1209,6 +1206,9 @@ function GET(fn) {
1209
1206
  method: "GET"
1210
1207
  });
1211
1208
  }
1209
+ function broadcast(fn) {
1210
+ return live(fn);
1211
+ }
1212
1212
  function localOrSend(hit, send) {
1213
1213
  if (hit === null || typeof hit.then !== "function") return hit;
1214
1214
  return hit.then(answer => answer === undefined ? send() : answer);
@@ -1221,6 +1221,7 @@ function live(fn) {
1221
1221
  if (!isServerFunction(fn)) {
1222
1222
  throw new Error("live expects a server function reference");
1223
1223
  }
1224
+ if (getServerFunctionMetadata(fn)?.method !== "GET") fn = rpc.GET(fn);
1224
1225
  const id = fn.id;
1225
1226
  const metadata = {
1226
1227
  ...getServerFunctionMetadata(fn),
@@ -1308,19 +1309,7 @@ function live(fn) {
1308
1309
  wire.headers = from ? from.headers : undefined;
1309
1310
  if (from && from.position !== undefined) wire.position = from.position;
1310
1311
  }
1311
- if (metadata.method === "GET") return fn[SERVER_FUNCTION_INVOKE](args, wireOptions);
1312
- if (handler && handler.intercept && !wire.adopted) {
1313
- const hit = handler.intercept({
1314
- id,
1315
- meta: metadata,
1316
- args
1317
- });
1318
- if (hit !== undefined) return hit;
1319
- }
1320
- return fetchServerFunction(liveAddressFor(fn.url), id, {
1321
- ...wireOptions,
1322
- read: true
1323
- }, args, metadata, args);
1312
+ return fn[SERVER_FUNCTION_INVOKE](args, wireOptions);
1324
1313
  };
1325
1314
  const pull = async () => {
1326
1315
  if (resume !== undefined) {
@@ -1449,4 +1438,4 @@ function getServerFunctionInvocation() {
1449
1438
  return undefined;
1450
1439
  }
1451
1440
 
1452
- export { ChunkReader, ERROR_HEADER, EVENT_STREAM_HEARTBEAT, EventStreamReader, FLASH_COOKIE, GET, LAST_EVENT_ID_HEADER, LIVE_WIRE, REDIRECT_HEADER, REVALIDATE_HEADER, SERVER_FUNCTION_INVOKE, SINGLE_FLIGHT_HEADER, UNKNOWN_HEADER, clearFlashCookie, configureServerFunctionsClient, createChunk, createEventChunk, createServerReference, decodeErrorHeaderValue, decodeRedirectHeaderValue, decodeResponse, decodeResponsePayload, deliverFlightData, deserializeStream, encodeErrorHeaderValue, frameAddress, getFlightDataConsumer, getFlightDataSourceIds, getServerFunctionInvocation, getServerFunctionMetadata, getServerFunctionsCodec, hasFlashCookie, hasFlightMetadata, invoke, isEventStream, isServerFunction, live, parseServerFunctionActionUrl, positionDigest, registerServerReference, serializeString, serverFunctionActionUrl, serverFunctionUrl, subscribeFlightData, withMeta };
1441
+ export { ChunkReader, ERROR_HEADER, EVENT_STREAM_HEARTBEAT, EventStreamReader, FLASH_COOKIE, GET, LAST_EVENT_ID_HEADER, LIVE_WIRE, REDIRECT_HEADER, REVALIDATE_HEADER, SERVER_FUNCTION_INVOKE, SINGLE_FLIGHT_HEADER, UNKNOWN_HEADER, broadcast, clearFlashCookie, configureServerFunctionsClient, createChunk, createEventChunk, createServerReference, decodeErrorHeaderValue, decodeRedirectHeaderValue, decodeResponse, decodeResponsePayload, deliverFlightData, deserializeStream, encodeErrorHeaderValue, frameAddress, getFlightDataConsumer, getFlightDataSourceIds, getServerFunctionInvocation, getServerFunctionMetadata, getServerFunctionsCodec, hasFlashCookie, hasFlightMetadata, invoke, isEventStream, isServerFunction, live, parseServerFunctionActionUrl, positionDigest, registerServerReference, serializeString, serverFunctionActionUrl, serverFunctionUrl, subscribeFlightData, withMeta };
@@ -23,18 +23,69 @@ function encodeRefusal(name) {
23
23
  };
24
24
  }
25
25
  let encodeRefusals;
26
- function argumentEncodeCodec(codec) {
26
+ function argumentEncodeCodec(codec, extra = []) {
27
27
  if (!encodeRefusals) encodeRefusals = [encodeRefusal("Response"), encodeRefusal("Request")];
28
- const refusals = encodeRefusals;
28
+ const refusals = extra.length ? [...extra, ...encodeRefusals] : encodeRefusals;
29
29
  return {
30
30
  ...codec,
31
31
  plugins: codec && codec.plugins ? [...refusals, ...codec.plugins] : refusals
32
32
  };
33
33
  }
34
34
 
35
+ const UPLOAD_ARGS_PART = "args";
36
+ const UPLOAD_FILE_PART = "file";
37
+ const UPLOAD_TAG = "solid/server-function-upload";
38
+ function isBlob(value) {
39
+ if (typeof Blob !== "undefined" && value instanceof Blob) return true;
40
+ return typeof value === "object" && value !== null && typeof value.size === "number" && typeof value.type === "string" && typeof value.arrayBuffer === "function" && typeof value.slice === "function";
41
+ }
42
+ function malformed() {
43
+ return new TypeError("Malformed server function upload");
44
+ }
45
+ function createUploadSerializer(files) {
46
+ const indexOf = value => {
47
+ const index = files.indexOf(value);
48
+ return index === -1 ? files.push(value) - 1 : index;
49
+ };
50
+ return {
51
+ tag: UPLOAD_TAG,
52
+ test: isBlob,
53
+ parse: {
54
+ sync: (value, ctx) => ({
55
+ i: ctx.parse(indexOf(value))
56
+ }),
57
+ async: async (value, ctx) => ({
58
+ i: await ctx.parse(indexOf(value))
59
+ }),
60
+ stream: (value, ctx) => ({
61
+ i: ctx.parse(indexOf(value))
62
+ })
63
+ },
64
+ serialize: (node, ctx) => ctx.serialize(node.i),
65
+ deserialize: () => {
66
+ throw malformed();
67
+ }
68
+ };
69
+ }
70
+ async function createUploadBody(serialized, files) {
71
+ const form = new FormData();
72
+ form.set(UPLOAD_ARGS_PART, serialized);
73
+ const blobs = await Promise.all(files.map(async file => file instanceof Blob ? file : new Blob([await file.arrayBuffer()], {
74
+ type: file.type
75
+ })));
76
+ for (let i = 0; i < blobs.length; i++) {
77
+ form.set(UPLOAD_FILE_PART + i, blobs[i], files[i].name ?? "blob");
78
+ }
79
+ return form;
80
+ }
81
+
35
82
  function enableRichArguments() {
36
83
  configureServerFunctionsClient({
37
- serializeArgs: args => serializeString(args, argumentEncodeCodec(getServerFunctionsCodec()))
84
+ serializeArgs: async args => {
85
+ const files = [];
86
+ const serialized = await serializeString(args, argumentEncodeCodec(getServerFunctionsCodec(), [createUploadSerializer(files)]));
87
+ return files.length ? await createUploadBody(serialized, files) : serialized;
88
+ }
38
89
  });
39
90
  }
40
91