@jsenv/core 23.1.4 → 23.2.0

package/src/startExploring.js

@@ -1,14 +1,13 @@
-import {
-  createCancellationToken,
-  composeCancellationToken,
-} from "@jsenv/cancellation"
 import {
   normalizeStructuredMetaMap,
   collectFiles,
   urlToRelativeUrl,
 } from "@jsenv/filesystem"
 
-import { executeJsenvAsyncFunction } from "./internal/executeJsenvAsyncFunction.js"
+import {
+  Abortable,
+  raceProcessTeardownEvents,
+} from "@jsenv/core/src/abort/main.js"
 import { jsenvCoreDirectoryUrl } from "./internal/jsenvCoreDirectoryUrl.js"
 import {
   assertProjectDirectoryUrl,
@@ -31,8 +30,8 @@ import {
 import { jsenvRuntimeSupportDuringDev } from "./jsenvRuntimeSupportDuringDev.js"
 
 export const startExploring = async ({
-  cancellationToken = createCancellationToken(),
-  cancelOnSIGINT = false,
+  signal = new AbortController().signal,
+  handleSIGINT = true,
 
   explorableConfig = jsenvExplorableConfig,
   projectDirectoryUrl,
@@ -58,79 +57,76 @@ export const startExploring = async ({
   livereloadWatchConfig,
   jsenvDirectoryClean,
 }) => {
-  const jsenvStartExploringFunction = async ({ jsenvCancellationToken }) => {
-    cancellationToken = composeCancellationToken(
-      cancellationToken,
-      jsenvCancellationToken,
-    )
+  projectDirectoryUrl = assertProjectDirectoryUrl({ projectDirectoryUrl })
+  await assertProjectDirectoryExists({ projectDirectoryUrl })
 
-    projectDirectoryUrl = assertProjectDirectoryUrl({ projectDirectoryUrl })
-    await assertProjectDirectoryExists({ projectDirectoryUrl })
-
-    const outDirectoryRelativeUrl = computeOutDirectoryRelativeUrl({
-      projectDirectoryUrl,
-      jsenvDirectoryRelativeUrl,
-      outDirectoryName,
-    })
+  const exploringServerOperation = Abortable.fromSignal(signal)
+  if (handleSIGINT) {
+    Abortable.effect(exploringServerOperation, (cb) =>
+      raceProcessTeardownEvents(
+        {
+          SIGINT: true,
+        },
+        cb,
+      ),
+    )
+  }
 
-    const redirectFiles = createRedirectFilesService({
-      projectDirectoryUrl,
-      outDirectoryRelativeUrl,
-    })
-    const serveExploringData = createExploringDataService({
-      projectDirectoryUrl,
-      outDirectoryRelativeUrl,
-      explorableConfig,
-      livereloading,
-    })
-    const serveExplorableListAsJson = createExplorableListAsJsonService({
-      projectDirectoryUrl,
-      outDirectoryRelativeUrl,
-      explorableConfig,
-    })
+  const outDirectoryRelativeUrl = computeOutDirectoryRelativeUrl({
+    projectDirectoryUrl,
+    jsenvDirectoryRelativeUrl,
+    outDirectoryName,
+  })
 
-    const compileServer = await startCompileServer({
-      cancellationToken,
-      projectDirectoryUrl,
-      keepProcessAlive,
-      livereloadSSE: livereloading,
-      accessControlAllowRequestOrigin: true,
-      accessControlAllowRequestMethod: true,
-      accessControlAllowRequestHeaders: true,
-      accessControlAllowCredentials: true,
-      stopOnPackageVersionChange: true,
-      jsenvToolbarInjection: jsenvToolbar,
-      customServices: {
-        "service:exploring-redirect": (request) => redirectFiles(request),
-        "service:exploring-data": (request) => serveExploringData(request),
-        "service:explorables": (request) => serveExplorableListAsJson(request),
-      },
-      customCompilers,
-      jsenvDirectoryRelativeUrl,
-      outDirectoryName,
-      inlineImportMapIntoHTML,
+  const redirectFiles = createRedirectFilesService({
+    projectDirectoryUrl,
+    outDirectoryRelativeUrl,
+  })
+  const serveExploringData = createExploringDataService({
+    projectDirectoryUrl,
+    outDirectoryRelativeUrl,
+    explorableConfig,
+    livereloading,
+  })
+  const serveExplorableListAsJson = createExplorableListAsJsonService({
+    projectDirectoryUrl,
+    outDirectoryRelativeUrl,
+    explorableConfig,
+  })
 
-      compileServerLogLevel,
-      compileServerCanReadFromFilesystem,
-      compileServerCanWriteOnFilesystem,
-      compileServerPort,
-      compileServerProtocol,
-      compileServerHttp2,
-      compileServerCertificate,
-      compileServerPrivateKey,
-      sourcemapMethod,
-      babelPluginMap,
-      runtimeSupport: runtimeSupportDuringDev,
-      livereloadWatchConfig,
-      jsenvDirectoryClean,
-    })
+  const compileServer = await startCompileServer({
+    signal: exploringServerOperation.signal,
+    keepProcessAlive,
 
-    return compileServer
-  }
+    projectDirectoryUrl,
+    livereloadSSE: livereloading,
+    jsenvToolbarInjection: jsenvToolbar,
+    customServices: {
+      "service:exploring-redirect": (request) => redirectFiles(request),
+      "service:exploring-data": (request) => serveExploringData(request),
+      "service:explorables": (request) => serveExplorableListAsJson(request),
+    },
+    customCompilers,
+    jsenvDirectoryRelativeUrl,
+    outDirectoryName,
+    inlineImportMapIntoHTML,
 
-  return executeJsenvAsyncFunction(jsenvStartExploringFunction, {
-    cancelOnSIGINT,
+    compileServerLogLevel,
+    compileServerCanReadFromFilesystem,
+    compileServerCanWriteOnFilesystem,
+    compileServerPort,
+    compileServerProtocol,
+    compileServerHttp2,
+    compileServerCertificate,
+    compileServerPrivateKey,
+    sourcemapMethod,
+    babelPluginMap,
+    runtimeSupport: runtimeSupportDuringDev,
+    livereloadWatchConfig,
+    jsenvDirectoryClean,
   })
+
+  return compileServer
 }
 
 const createRedirectFilesService = ({ projectDirectoryUrl }) => {

package/src/internal/executeJsenvAsyncFunction.js

@@ -1,34 +0,0 @@
-import {
-  executeAsyncFunction,
-  createCancellationSource,
-} from "@jsenv/cancellation"
-import { SIGINTSignal } from "@jsenv/node-signals"
-
-export const executeJsenvAsyncFunction = (
-  fn,
-  { cancelOnSIGINT = false } = {},
-) => {
-  return executeAsyncFunction(
-    async () => {
-      const jsenvCancellationSource = createCancellationSource()
-      const jsenvCancellationToken = jsenvCancellationSource.token
-
-      if (cancelOnSIGINT) {
-        const unregister = SIGINTSignal.addCallback(() => {
-          jsenvCancellationSource.cancel("process SIGINT")
-        })
-        try {
-          return await fn({ jsenvCancellationToken })
-        } finally {
-          unregister()
-        }
-      }
-
-      return fn({ jsenvCancellationToken })
-    },
-    {
-      catchCancellation: true,
-      considerUnhandledRejectionsAsExceptions: true,
-    },
-  )
-}

package/src/internal/trackRessources.js

@@ -1,23 +0,0 @@
-import { memoize } from "@jsenv/filesystem"
-
-export const trackRessources = () => {
-  const callbackArray = []
-
-  const registerCleanupCallback = (callback) => {
-    if (typeof callback !== "function")
-      throw new TypeError(`callback must be a function
-callback: ${callback}`)
-    callbackArray.push(callback)
-    return () => {
-      const index = callbackArray.indexOf(callback)
-      if (index > -1) callbackArray.splice(index, 1)
-    }
-  }
-
-  const cleanup = memoize(async (reason) => {
-    const localCallbackArray = callbackArray.slice()
-    await Promise.all(localCallbackArray.map((callback) => callback(reason)))
-  })
-
-  return { registerCleanupCallback, cleanup }
-}