@ai-ecoverse/slicc-kernel 1.170.4 → 1.172.0

package/dist/node-driver-worker.js

@@ -305,6 +305,18 @@ var TransportError = class extends Error {
     this.detail = detail === "transport" ? detail : void 0;
   }
 };
+function unfollowed(redirect) {
+  return redirect !== void 0 && redirect !== "follow";
+}
+function honors(traits, redirect) {
+  if (traits.redirectPolicy === true) return true;
+  const hops = traits.redirectHops;
+  const raw = traits.manualRedirects === true && (hops === void 0 || hops === false);
+  return redirect === "manual" && raw;
+}
+function refused(message) {
+  return new TransportError(message, 502, void 0, "transport");
+}
 var RemoteTransport = class {
   traits;
   port;
@@ -388,10 +400,13 @@ var RemoteTransport = class {
     waiter?.reject(new TransportError("the request was cancelled"));
     this.port.postMessage({ net: "cancel", nid });
   }
-  async fetch(request) {
+  async fetch(request, owner, stamp) {
     const nid = ++this.nextId;
-    const { signal } = request;
+    const { signal, redirect } = request;
     signal.throwIfAborted();
+    if (unfollowed(redirect) && !honors(this.traits, redirect)) {
+      throw refused(`this transport cannot honor redirect: ${redirect}`);
+    }
     let finished = false;
     const abort = () => {
       finished = true;
@@ -414,13 +429,16 @@ var RemoteTransport = class {
         url: request.url,
         method: request.method,
         headers: request.headers,
-        ...request.bodyStream ? { streamed: true } : request.body ? { body: request.body } : {}
+        ...request.bodyStream ? { streamed: true } : request.body ? { body: request.body } : {},
+        ...redirect !== void 0 ? { redirect } : {},
+        ...owner !== void 0 ? { owner } : {},
+        ...stamp ? { stamp } : {}
       });
     } catch (e) {
       finish();
       throw e;
     }
-    const { status, statusText, headers, url, redirected, redirects } = head;
+    const { status, statusText, headers, url, redirected, redirects, opaqueRedirect } = head;
     const read = async () => {
       if (finished) return void 0;
       const reply = await this.ask({ net: "read", nid }).catch((e) => {
@@ -436,9 +454,15 @@ var RemoteTransport = class {
       finish();
       this.cancel(nid);
     };
+    if (unfollowed(redirect) && (redirected || redirects?.length)) {
+      await cancel();
+      throw refused(`this transport followed a redirect despite redirect: ${redirect}`);
+    }
     return {
-      ...redirected ? { url, redirected } : {},
+      ...url !== void 0 ? { url } : {},
+      ...redirected !== void 0 ? { redirected } : {},
       ...redirects ? { redirects } : {},
+      ...opaqueRedirect ? { opaqueRedirect } : {},
       status,
       statusText,
       headers,
@@ -1197,9 +1221,9 @@ async function greet(channel, lock, timeoutMs, requests) {
   } finally {
     clearTimeout(timer);
   }
-  const refused2 = hello.error ?? versionError(hello.protocol);
-  if (refused2) {
-    const error = new Error(refused2);
+  const refused3 = hello.error ?? versionError(hello.protocol);
+  if (refused3) {
+    const error = new Error(refused3);
     channel.end(error);
     throw error;
   }
@@ -1346,9 +1370,9 @@ function serveFilesystem(port, handlers, capabilities = {}, options = {}) {
   let open = false;
   const reply = (message, transfer = []) => port.postMessage(message, transfer);
   async function hello(message) {
-    const refused2 = driverVersionError(message.protocol);
-    if (refused2) {
-      reply({ hello: { protocol: DRIVER_PROTOCOL, error: refused2, errno: "EPROTO" } });
+    const refused3 = driverVersionError(message.protocol);
+    if (refused3) {
+      reply({ hello: { protocol: DRIVER_PROTOCOL, error: refused3, errno: "EPROTO" } });
       return;
     }
     try {
@@ -1862,7 +1886,7 @@ function zeroedBuffers(buffer) {
     poolSize: fixed(0)
   });
 }
-function refused(specifier) {
+function refused2(specifier) {
   return Object.assign(new Error(`slicc-kernel: a JS program cannot import ${specifier}`), {
     code: "ERR_ACCESS_DENIED"
   });
@@ -1877,12 +1901,12 @@ function refuseModules() {
   registerHooks({
     resolve(specifier, context, next) {
       if (specifier.startsWith(SOURCE_MODULE)) {
-        if (!sources.has(specifier)) throw refused(specifier);
+        if (!sources.has(specifier)) throw refused2(specifier);
         return { url: specifier, shortCircuit: true };
       }
-      if (isBuiltin(specifier)) throw refused(specifier);
+      if (isBuiltin(specifier)) throw refused2(specifier);
       const resolved = next(specifier, context);
-      if (!resolved.url.startsWith("data:")) throw refused(resolved.url);
+      if (!resolved.url.startsWith("data:")) throw refused2(resolved.url);
       return resolved;
     },
     load(url, context, next) {