Fix CI failures: oauth-discovery test, formatter, lint, Workers build, miniflare test

Rhys Sullivan committed 6 months ago

Commit a3bd6801 parent 485996011 files · +31 −30Browse files

Unified · Split

11 files

 export default defineExecutorConfig({
   dialect: "pg",
-  plugins: ({
+  plugins: ({ workosCredentials, workosVaultClient }: CloudPluginDeps = {}) =>
-    workosCredentials,
-    workosVaultClient,
-  }: CloudPluginDeps = {}) =>
     [
       openApiPlugin(),
       mcpPlugin({

 } from "@executor-js/api/server";
 import { createExecutionEngine } from "@executor-js/execution";
 import { makeQuickJsExecutor } from "@executor-js/runtime-quickjs";
-import {
+import { Scope, ScopeId, collectSchemas, createExecutor } from "@executor-js/sdk";
-  Scope,
-  ScopeId,
-  collectSchemas,
-  createExecutor,
-} from "@executor-js/sdk";
 import { makePostgresAdapter, makePostgresBlobStore } from "@executor-js/storage-postgres";
 import { makeTestWorkOSVaultClient } from "@executor-js/plugin-workos-vault/testing";

     const { db } = yield* DbService;
     const plugins = orgPlugins();
-    const httpClientLayer = makeHostedHttpClientLayer();
+    const httpClientLayer = makeHostedHttpClientLayer({
+      allowLocalNetwork: env.NODE_ENV === "test",
+    });
     const schema = collectSchemas(plugins);
     const adapter = makePostgresAdapter({ db, schema });
     const blobs = makePostgresBlobStore({ db });

@@ -336,9 +336,9 @@ describe("tenant isolation (HTTP)", () => { · 335 unmodified lines
336	client.connections.usages({	336	client.connections.usages({
337	params: { scopeId: ScopeId.make(orgB), connectionId: connectionIdA },	337	params: { scopeId: ScopeId.make(orgB), connectionId: connectionIdA },
338	}),	338	}),
339	).pipe(Effect.result);	339	);
340		340
341	if (Result.isSuccess(usages)) expect(usages.success).toEqual([]);	341	expect(usages).toEqual([]);
342	}),	342	}),
343	);	343	);
344		344

@@ -2458,7 +2458,7 @@ export const createExecutor = <const TPlugins extends readonly AnyPlugin[] = []> · 2457 unmodified lines
2458	usagesForConnection: credentialBindingUsagesForConnection,	2458	usagesForConnection: credentialBindingUsagesForConnection,
2459	};	2459	};
2460		2460
2461	const oauthBundle = makeOAuth2Service({	2461	const oauthBundle = makeOAuth2Service({
2462	adapter: core,	2462	adapter: core,
2463	rawAdapter: adapter,	2463	rawAdapter: adapter,
2464	secretsGet: (id) =>	2464	secretsGet: (id) =>

         "http://192.168.1.10/mcp",
         "http://169.254.169.254/latest/meta-data/",
       ]) {
-        const result = yield* validateHostedOutboundUrl(url).pipe(Effect.result);
+        const error = yield* validateHostedOutboundUrl(url).pipe(Effect.flip);
-        expect(Result.isFailure(result)).toBe(true);
+        expect(error).toBeInstanceOf(HostedOutboundRequestBlocked);
-        if (Result.isFailure(result)) {
-          expect(result.failure).toBeInstanceOf(HostedOutboundRequestBlocked);
-        }
       }
     }),
   );

   });
 const guardFetch = (
-  fetch: typeof globalThis.fetch,
+  underlying: typeof globalThis.fetch,
   options: HostedHttpClientOptions,
 ): typeof globalThis.fetch =>
   (async (input, init) => {
     for (let redirects = 0; redirects <= maxRedirects; redirects++) {
       const url = current instanceof Request ? current.url : String(current);
       Effect.runSync(validateHostedOutboundUrl(url, options));
-      const response = await fetch(current, { ...init, redirect: "manual" });
+      const response = await underlying(current, { ...init, redirect: "manual" });
       if (
         response.status >= 300 &&
         response.status < 400 &&
       }
       return response;
     }
-    return fetch(current, { ...init, redirect: "manual" });
+    return underlying(current, { ...init, redirect: "manual" });
   }) as typeof globalThis.fetch;
 export const makeHostedHttpClientLayer = (
         ? Layer.succeed(FetchHttpClient.Fetch)(guardFetch(options.fetch, options))
         : Layer.effect(
             FetchHttpClient.Fetch,
-            Effect.map(Effect.service(FetchHttpClient.Fetch), (fetch) => guardFetch(fetch, options)),
+            Effect.map(Effect.service(FetchHttpClient.Fetch), (underlying) =>
+              guardFetch(underlying, options),
+            ),
           ),
     ),
   );

@@ -433,7 +433,7 @@ describe("beginDynamicAuthorization", () => { · 432 unmodified lines
433	),	433	),
434	);	434	);
435		435
436	it.effect("requests empty scope when only AS-level scopes_supported is advertised", () =>	436	it.effect("omits scope when only AS-level scopes_supported is advertised", () =>
437	withOAuthFixture(	437	withOAuthFixture(
438	(request, baseUrl) => {	438	(request, baseUrl) => {
439	if (request.url === "/.well-known/oauth-protected-resource") {	439	if (request.url === "/.well-known/oauth-protected-resource") {
@@ -475,7 +475,7 @@ describe("beginDynamicAuthorization", () => { · 35 unmodified lines
475	expect(body.scope).toBeUndefined();	475	expect(body.scope).toBeUndefined();
476		476
477	const authUrl = new URL(result.authorizationUrl);	477	const authUrl = new URL(result.authorizationUrl);
478	expect(authUrl.searchParams.get("scope")).toBe("");	478	expect(authUrl.searchParams.has("scope")).toBe(false);
479	}),	479	}),
480	),	480	),
481	);	481	);

@@ -261,9 +261,9 @@ export const makeOAuth2Service = ( · 260 unmodified lines
261	})();	261	})();
262		262
263	const authServer = authorizationServerUrl	263	const authServer = authorizationServerUrl
264	? yield* discoverAuthorizationServerMetadata(authorizationServerUrl, { httpClientLayer }).pipe(	264	? yield* discoverAuthorizationServerMetadata(authorizationServerUrl, {
265	Effect.catchTag("OAuthDiscoveryError", () => Effect.succeed(null)),	265	httpClientLayer,
266	)	266	}).pipe(Effect.catchTag("OAuthDiscoveryError", () => Effect.succeed(null)))
267	: null;	267	: null;
268		268
269	// Dynamic registration is only viable when the AS advertises a	269	// Dynamic registration is only viable when the AS advertises a

   ],
   "type": "module",
   "exports": {
-    ".": "./src/index.ts"
+    ".": {
+      "types": "./src/index.ts",
+      "bun": "./src/index.ts",
+      "default": "./dist/index.js"
+    }
   },
   "publishConfig": {
     "access": "public",

     storage: (deps): GraphqlStore => makeDefaultGraphqlStore(deps),
     extension: (ctx) =>
-      makeGraphqlExtension(ctx, options?.httpClientLayer ?? ctx.httpClientLayer, options?.configFile),
+      makeGraphqlExtension(
+        ctx,
+        options?.httpClientLayer ?? ctx.httpClientLayer,
+        options?.configFile,
+      ),
     staticSources: (self) => [
       {