build: make npm build to run integration tests too

e2e/create-certificate.test.ts

@@ -6,7 +6,7 @@ import {
   AcmeOrder,
   Dns01Challenge,
   DnsUtils,
-} from "@fishballpkg/acme";
+} from "../src/mod.ts";
 import { expect, it } from "../test_deps.ts";
 import { CloudflareZone } from "./utils/cloudflare.ts";
 import { expectToBeDefined } from "./utils/expectToBeDefined.ts";

e2e/workflows.test.ts

@@ -3,7 +3,7 @@ import {
   AcmeClient,
   AcmeOrder,
   AcmeWorkflows,
-} from "@fishballpkg/acme";
+} from "../src/mod.ts";
 import { describe, expect, it } from "../test_deps.ts";
 import { CloudflareZone } from "./utils/cloudflare.ts";
 import { randomFishballTestingSubdomain } from "./utils/randomFishballTestingSubdomain.ts";

integration/workflows.test.ts → integration/01workflows.test.ts

@@ -1,8 +1,13 @@
-import { AcmeClient, AcmeOrder, AcmeWorkflows } from "@fishballpkg/acme";
+// 01 prefix to this file because of https://github.com/denoland/dnt/issues/432
+import { AcmeClient, AcmeOrder, AcmeWorkflows } from "../src/mod.ts";
 import { describe, expect, it } from "../test_deps.ts";
 import { EMAIL, PEBBLE_DIRECTORY_URL } from "./CONSTANTS.ts";
 import { generateRandomDomain } from "./utils/generateRandomDomain.ts";
 import { PebbleChallTestSrv } from "./utils/PebbleChallTestSrv.ts";
+import { resolveDns } from "./utils/resolveDns.ts";
+import { setupNode } from "./utils/setupNode.ts";
+
+setupNode();
 
 const DOMAINS = [
   generateRandomDomain(),
@@ -27,14 +32,7 @@ describe("requestCertificates", () => {
       updateDnsRecords: async (dnsRecords) => {
         await pebbleChallTestSrv.createDnsRecords(dnsRecords);
       },
-      resolveDns: async (query, recordType) => {
-        return await Deno.resolveDns(query, recordType, {
-          nameServer: {
-            ipAddr: "127.0.0.1",
-            port: 8053,
-          },
-        });
-      },
+      resolveDns,
     });
 
     expect(certKeyPair.privateKey).toBeInstanceOf(CryptoKey);

integration/account.test.ts

@@ -1,6 +1,9 @@
-import { AcmeClient } from "@fishballpkg/acme";
+import { AcmeClient } from "../src/mod.ts";
 import { expect, it } from "../test_deps.ts";
 import { EMAIL, PEBBLE_DIRECTORY_URL } from "./CONSTANTS.ts";
+import { setupNode } from "./utils/setupNode.ts";
+
+setupNode();
 
 it("should create the account successfully and the key pair should allow login", async () => {
   const client = await AcmeClient.init(PEBBLE_DIRECTORY_URL);

integration/order.test.ts

@@ -1,7 +1,10 @@
-import { AcmeClient } from "@fishballpkg/acme";
+import { AcmeClient } from "../src/mod.ts";
 import { expect, it } from "../test_deps.ts";
 import { EMAIL, PEBBLE_DIRECTORY_URL } from "./CONSTANTS.ts";
 import { generateRandomDomain } from "./utils/generateRandomDomain.ts";
+import { setupNode } from "./utils/setupNode.ts";
+
+setupNode();
 
 it("should place an order correctly and get the corresponding authorizations", async () => {
   const client = await AcmeClient.init(PEBBLE_DIRECTORY_URL);

integration/utils/PebbleChallTestSrv.ts

@@ -1,4 +1,4 @@
-import type { DnsTxtRecord } from "@fishballpkg/acme";
+import type { DnsTxtRecord } from "../../src/mod.ts";
 import { afterEach } from "../../test_deps.ts";
 
 const PEBBLE_CHALLTESTSRV_URL = "http://localhost:8055";

integration/utils/resolveDns.ts

@@ -0,0 +1,19 @@
+import {
+  defaultResolveDns,
+  type ResolveDnsFunction,
+} from "../../src/DnsUtils/resolveDns.ts";
+
+/**
+ * A resolveDns function specifically for integration tests to allow TXT lookups to be done via pebble-testchallsrv
+ */
+export const resolveDns: ResolveDnsFunction = async (query, recordType) => {
+  return (await defaultResolveDns(query, recordType, {
+    nameServer: recordType === "TXT"
+      ? {
+        ipAddr: "127.0.0.1",
+        port: 8053,
+      } // only lookup via pebble-challtestsrv for txt records
+      : undefined,
+    // deno-lint-ignore no-explicit-any -- typescript is hard
+  })) as any;
+};

integration/utils/setupNode.ts

@@ -0,0 +1,6 @@
+export const setupNode = () => {
+  if ("process" in globalThis) {
+    // @ts-ignore: node specific
+    globalThis["process"]["env"]["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
+  }
+};

scripts/build-npm.ts

@@ -19,16 +19,20 @@ await emptyDir(OUT_DIR);
 const GITHUB_REPO = "https://github.com/fishballapp/acme";
 
 await build({
+  testPattern: "integration/**/*.test.ts",
   entryPoints: Object.entries(DENO_JSON.exports).map(([name, path]) => ({
     kind: "export",
     name,
     path: join(PROJECT_ROOT, path),
   })),
   outDir: OUT_DIR,
-  test: false,
-  shims: {},
+  test: true,
+  shims: {
+    deno: "dev",
+    undici: "dev",
+  },
   compilerOptions: {
-    lib: ["ES2023", "DOM"],
+    lib: ["ESNext", "DOM"],
     target: "ES2022",
   },
   package: {

src/DnsUtils/_helpers.ts

@@ -28,7 +28,8 @@ const isIpVersionSupported = async (
         },
       });
       return true;
-    } catch {
+    } catch (e) {
+      console.error(e);
       return false;
     }
   })();

src/DnsUtils/resolveDns.node.ts

@@ -5,6 +5,7 @@
  */
 
 import { Resolver } from "node:dns/promises";
+import { isIPv4, isIPv6 } from "node:net";
 import type { ResolveDnsFunction } from "./resolveDns.ts";
 
 export const resolveDns: ResolveDnsFunction = async (
@@ -14,9 +15,17 @@ export const resolveDns: ResolveDnsFunction = async (
 ) => {
   const resolver = new Resolver();
   if (options?.nameServer?.ipAddr !== undefined) {
-    resolver.setServers([options.nameServer.ipAddr]);
+    resolver.setServers([
+      ipPort(options.nameServer.ipAddr, options.nameServer.port ?? 53),
+    ]);
   }
 
   // deno-lint-ignore no-explicit-any -- typescript is hard
   return (await resolver.resolve(domain, recordType)) as any;
 };
+
+function ipPort(ip: string, port: number): string {
+  if (isIPv4(ip)) return `${ip}:${port}`;
+  if (isIPv6(ip)) return `[${ip}]:${port}`;
+  throw new Error("Invalid IP address");
+}

src/DnsUtils/resolveDns.ts

@@ -7,6 +7,7 @@ export type ResolveDnsFunction = <R extends "A" | "AAAA" | "NS" | "TXT">(
   options?: {
     nameServer?: {
       ipAddr: string;
+      port?: number;
     };
   },
 ) => Promise<"TXT" extends R ? string[][] : string[]>;