@slicemachine/manager 0.2.2-dev-page-types.1 → 0.2.2-dev-page-types.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/manager",
-	"version": "0.2.2-dev-page-types.1",
+	"version": "0.2.2-dev-page-types.3",
 	"description": "Manage all aspects of a Slice Machine project.",
 	"repository": {
 		"type": "git",
@@ -62,10 +62,10 @@
 	},
 	"dependencies": {
 		"@antfu/ni": "^0.20.0",
-		"@prismicio/custom-types-client": "^1.1.0",
+		"@prismicio/custom-types-client": "1.2.0-alpha.0",
 		"@prismicio/mocks": "2.0.0-alpha.2",
 		"@prismicio/types-internal": "2.0.0-alpha.9",
-		"@slicemachine/plugin-kit": "0.2.1-dev-page-types.1",
+		"@slicemachine/plugin-kit": "0.2.1-dev-page-types.3",
 		"@wooorm/starry-night": "^1.6.0",
 		"analytics-node": "^6.2.0",
 		"cookie": "^0.5.0",
@@ -138,5 +138,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "9cb54f39f52db111f1430c4c19e6e8e431455438"
+	"gitHead": "d2c2d77cb89aba03b05df7647420fb20cc6aa7fb"
 }

package/src/auth/PrismicAuthManager.ts

@@ -5,7 +5,7 @@ import * as os from "node:os";
 import * as http from "node:http";
 
 import * as h3 from "h3";
-import fetch from "node-fetch";
+import fetch from "../lib/fetch";
 import cookie from "cookie";
 import cors from "cors";
 import getPort from "get-port";

package/src/lib/checkIsURLAccessible.ts

@@ -1,4 +1,4 @@
-import fetch from "node-fetch";
+import fetch from "./fetch";
 
 export const checkIsURLAccessible = async (url: string): Promise<boolean> => {
 	const res = await fetch(url);

package/src/lib/fetch.ts

@@ -0,0 +1,46 @@
+// This temporary wrapper around `node-fetch` fixes an issue where quick
+// consecutive network requests cause failed requests.
+//
+// See https://github.com/node-fetch/node-fetch/issues/1735 for more details.
+//
+// TODO: Remove this wrapper and replace all imports with `node-fetch` if https://github.com/node-fetch/node-fetch/pull/1736 is merged.
+
+import * as http from "node:http";
+import * as https from "node:https";
+import baseFetch from "node-fetch";
+
+export * from "node-fetch";
+
+/**
+ * The default HTTP Agent with `keepAlive: true` used in `fetch()` requests.
+ */
+const DEFAULT_HTTP_AGENT = new http.Agent({ keepAlive: true });
+
+/**
+ * The default HTTPS Agent with `keepAlive: true` used in `fetch()` requests.
+ */
+const DEFAULT_HTTPS_AGENT = new https.Agent({ keepAlive: true });
+
+/**
+ * Patched `fetch()` from `node-fetch` that fixes a bug where quick consecutive
+ * network requests cause failed requests.
+ *
+ * Use this `fetch()` in place of `node-fetch`'s `fetch()`.
+ *
+ * @remarks
+ * `fetch()` is patched by setting an HTTP/HTTPS Agent with `keepAlive: true`.
+ * If you need to assign an Agent, be sure to retain the `keepAlive: true`
+ * option.
+ */
+const fetch: typeof baseFetch = (url, init) => {
+	return baseFetch(url, {
+		agent: (parsedURL) => {
+			return parsedURL.protocol === "http:"
+				? DEFAULT_HTTP_AGENT
+				: DEFAULT_HTTPS_AGENT;
+		},
+		...init,
+	});
+};
+
+export default fetch;

package/src/lib/fetchGitHubReleaseBodyForRelease.ts

@@ -1,5 +1,5 @@
 import * as t from "io-ts";
-import fetch from "node-fetch";
+import fetch from "./fetch";
 import pLimit from "p-limit";
 
 import { decode } from "./decode";

package/src/lib/fetchNPMPackageVersions.ts

@@ -1,5 +1,5 @@
 import * as t from "io-ts";
-import fetch from "node-fetch";
+import fetch from "./fetch";
 
 import { decode } from "./decode";
 

package/src/managers/customTypes/CustomTypesManager.ts

@@ -1,5 +1,4 @@
 import * as t from "io-ts";
-import fetch from "node-fetch";
 import * as prismicCustomTypesClient from "@prismicio/custom-types-client";
 import { CustomType } from "@prismicio/types-internal/lib/customtypes";
 import {
@@ -17,12 +16,14 @@ import {
 import { DecodeError } from "../../lib/DecodeError";
 import { assertPluginsInitialized } from "../../lib/assertPluginsInitialized";
 import { decodeHookResult } from "../../lib/decodeHookResult";
+import fetch from "../../lib/fetch";
 
-import { API_ENDPOINTS } from "../../constants/API_ENDPOINTS";
 import { OnlyHookErrors } from "../../types";
+import { API_ENDPOINTS } from "../../constants/API_ENDPOINTS";
+import { SLICE_MACHINE_USER_AGENT } from "../../constants/SLICE_MACHINE_USER_AGENT";
+import { UnauthorizedError } from "../../errors";
 
 import { BaseManager } from "../BaseManager";
-import { UnauthorizedError } from "../../errors";
 
 type SliceMachineManagerReadCustomTypeLibraryReturnType = {
 	ids: string[];
@@ -226,6 +227,7 @@ export class CustomTypesManager extends BaseManager {
 				endpoint: API_ENDPOINTS.PrismicModels,
 				repositoryName: sliceMachineConfig.repositoryName,
 				token: authenticationToken,
+				userAgent: SLICE_MACHINE_USER_AGENT,
 				fetch,
 			});
 
@@ -310,6 +312,7 @@ export class CustomTypesManager extends BaseManager {
 			endpoint: API_ENDPOINTS.PrismicModels,
 			repositoryName: sliceMachineConfig.repositoryName,
 			token: authenticationToken,
+			userAgent: SLICE_MACHINE_USER_AGENT,
 			fetch,
 		});
 

package/src/managers/prismicRepository/PrismicRepositoryManager.ts

@@ -1,5 +1,5 @@
 import * as t from "io-ts";
-import fetch, { Response } from "node-fetch";
+import fetch, { Response } from "../../lib/fetch";
 import { fold } from "fp-ts/Either";
 
 import { decode } from "../../lib/decode";

package/src/managers/screenshots/ScreenshotsManager.ts

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
 import { fileTypeFromBuffer } from "file-type";
-import fetch, { FormData, Blob, Response } from "node-fetch";
+import fetch, { FormData, Blob, Response } from "../../lib/fetch";
 // puppeteer is lazy-loaded in captureSliceSimulatorScreenshot
 import type { BrowserContext, Viewport } from "puppeteer";
 

package/src/managers/simulator/SimulatorManager.ts

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
 import { HookError } from "@slicemachine/plugin-kit";
-import fetch from "node-fetch";
+import fetch from "../../lib/fetch";
 
 import { DecodeError } from "../../lib/DecodeError";
 import { assertPluginsInitialized } from "../../lib/assertPluginsInitialized";

package/src/managers/slices/SlicesManager.ts

@@ -1,7 +1,8 @@
 import * as t from "io-ts";
-import fetch from "node-fetch";
 import * as prismicCustomTypesClient from "@prismicio/custom-types-client";
 import { SharedSliceContent } from "@prismicio/types-internal/lib/content";
+import { SliceComparator } from "@prismicio/types-internal/lib/customtypes/diff";
+import { SharedSlice } from "@prismicio/types-internal/lib/customtypes";
 import {
 	CallHookReturnType,
 	HookError,
@@ -19,17 +20,17 @@ import { DecodeError } from "../../lib/DecodeError";
 import { assertPluginsInitialized } from "../../lib/assertPluginsInitialized";
 import { bufferCodec } from "../../lib/bufferCodec";
 import { decodeHookResult } from "../../lib/decodeHookResult";
+import { createContentDigest } from "../../lib/createContentDigest";
+import { mockSlice } from "../../lib/mockSlice";
+import fetch from "../../lib/fetch";
 
 import { OnlyHookErrors } from "../../types";
 import { DEFAULT_SLICE_SCREENSHOT_URL } from "../../constants/DEFAULT_SLICE_SCREENSHOT_URL";
+import { SLICE_MACHINE_USER_AGENT } from "../../constants/SLICE_MACHINE_USER_AGENT";
 import { API_ENDPOINTS } from "../../constants/API_ENDPOINTS";
 import { UnauthenticatedError, UnauthorizedError } from "../../errors";
 
 import { BaseManager } from "../BaseManager";
-import { createContentDigest } from "../../lib/createContentDigest";
-import { mockSlice } from "../../lib/mockSlice";
-import { SliceComparator } from "@prismicio/types-internal/lib/customtypes/diff";
-import { SharedSlice } from "@prismicio/types-internal/lib/customtypes";
 
 type SlicesManagerReadSliceLibraryReturnType = {
 	sliceIDs: string[];
@@ -434,6 +435,7 @@ export class SlicesManager extends BaseManager {
 				endpoint: API_ENDPOINTS.PrismicModels,
 				repositoryName: sliceMachineConfig.repositoryName,
 				token: authenticationToken,
+				userAgent: SLICE_MACHINE_USER_AGENT,
 				fetch,
 			});
 
@@ -630,6 +632,7 @@ export class SlicesManager extends BaseManager {
 			endpoint: API_ENDPOINTS.PrismicModels,
 			repositoryName: sliceMachineConfig.repositoryName,
 			token: authenticationToken,
+			userAgent: SLICE_MACHINE_USER_AGENT,
 			fetch,
 		});