@ms-cloudpack/api-server 0.64.19 → 0.64.21

package/README.md

@@ -1,5 +1,3 @@
 # @ms-cloudpack/api-server
 
-Provides an API server that exposes a pub/sub endpoint for trigger long running tasks.
-
-## Usage
+Cloudpack-internal API server that exposes pub/sub endpoints for triggering long-running tasks.

package/lib/apis/ensurePackageBundled.js

@@ -129,8 +129,12 @@ async function ensurePackageBundledInternal(params, ctx) {
                 await notifyHost({ reason: 'on-package-change', packagePath: packageEntry.path, hash: watchedResult.result.hash }, { bus, session, telemetryClient });
             }
         };
-        await watcher.watch(watchOptions, () => {
-            void onPackageChange();
+        await watcher.watch(watchOptions, (changedPaths) => {
+            // Filter out the configPaths, we don't want to re-bundle on config changes. CLI will restart it instead.
+            const filteredPaths = changedPaths.filter((p) => !config.configPaths?.appConfigPaths.includes(p));
+            if (filteredPaths.length > 0) {
+                void onPackageChange();
+            }
         });
     }
     // If enabled, enqueue dependencies.

package/lib/apis/ensurePackageBundled.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensurePackageBundled.js","sourceRoot":"","sources":["../../src/apis/ensurePackageBundled.ts"],"names":[],"mappings":"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","sourcesContent":["import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport { createBundleTask } from '../utilities/createBundleTask.js';\nimport type { Context } from '../types/Context.js';\nimport type { WatchOptions } from '@ms-cloudpack/file-watcher';\nimport { getConsumedDependencies } from '../utilities/getConsumedDependencies.js';\nimport type { TargetEnvironment, WithOptional } from '@ms-cloudpack/common-types';\nimport { notifyHost } from '../utilities/notifyHost.js';\n\n/**\n * Input for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledInput\n  extends Pick<BundleRequest, 'outputPath' | 'version' | 'disableSourceMaps' | 'shouldGetBundleInfo'> {\n  /** Package name */\n  name: string;\n  /**\n   * Target environment for the bundle.\n   * @default 'browser'\n   */\n  targetEnvironment?: TargetEnvironment;\n  /** Whether to also ensure dependencies are bundled */\n  enqueueDependencies?: boolean;\n  /** Whether to re-run the bundle task */\n  shouldRerun?: boolean;\n  /**\n   * Whether to watch for changes (internal packages only).\n   * NOTE: requires `ctx.bus` and `ctx.watcher` to be set.\n   */\n  shouldWatch?: boolean;\n  /** Whether to force re-bundling */\n  shouldForce?: boolean;\n  /** Whether to disable caching. */\n  disableCache?: boolean;\n  /** Whether to support incremental rebuilds. Defaults to true for internal libraries. */\n  isIncremental?: boolean;\n  /**\n   * Whether to use a hash as the bundle id instead of the path.\n   * Reduces performance when used with shouldForce as it hashes twice,\n   * but eliminates task cache artifacts when handling many apps.\n   */\n  useHashAsId?: boolean;\n  /** Priority for bundling. Greater priority will be scheduled first (defaults to 0). */\n  priority?: number;\n}\n\n/**\n * Result of ensuring a single package is bundled.\n */\nexport interface EnsurePackageBundledResult\n  extends Omit<NonNullable<BundleRequest['result']>, 'rebuild' | 'dispose' | 'bundlerName' | 'inputPath'> {\n  /** Package name */\n  name: string;\n  /** Package version */\n  version: string;\n  /** Package dependency names (prod and peer) */\n  dependencies?: string[];\n  /** Whether the package is external (not defined in this repo). Unset if it's not found. */\n  isExternal?: boolean;\n  /** Absolute path of the package. Will be unset if the package couldn't be found. */\n  inputPath?: string;\n}\n\n/**\n * Complete output for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledOutput {\n  /** Result of bundling this package */\n  result: EnsurePackageBundledResult;\n  /** Results of bundling dependencies */\n  dependencies: Promise<EnsurePackageBundledResult[]>;\n}\n\n/**\n * Context for `ensurePackageBundled`. `bus` and `watcher` are only needed if `shouldWatch` is true.\n */\nexport type EnsurePackageBundledContext = WithOptional<Context, 'bus' | 'watcher'>;\n\n/**\n * Checks if the package is bundled or needs bundling, and returns the result.\n * For internal packages, we also notify the watcher to monitor for code changes.\n */\nexport async function ensurePackageBundled(\n  input: EnsurePackageBundledInput,\n  ctx: EnsurePackageBundledContext,\n): Promise<EnsurePackageBundledOutput> {\n  const results: EnsurePackageBundledResult[] = [];\n  const visited = new Set<`${string}@${string}`>();\n\n  // Bundle the package itself\n  let result: EnsurePackageBundledResult;\n  let mainDependencies: EnsurePackageBundledInput[];\n  try {\n    ({ result, dependencyInputs: mainDependencies } = await ensurePackageBundledInternal({ ...input, visited }, ctx));\n  } catch (err) {\n    return {\n      result: getErrorResult(input, err),\n      dependencies: Promise.resolve([]),\n    };\n  }\n\n  // Enqueue main dependencies\n  // TODO: should processing this queue have a rate limit? right now if enqueueDependencies is enabled,\n  // `await dependencies` will fire off all deps at once.\n  let pending = 0;\n  const dependencies = new Promise<EnsurePackageBundledResult[]>((resolve) => {\n    const enqueue = (dependencyInputs: EnsurePackageBundledInput[]) => {\n      for (const dependencyInput of dependencyInputs) {\n        pending++;\n\n        void ensurePackageBundledInternal({ ...dependencyInput, visited }, ctx)\n          .then((dependencyBundleResult) => {\n            // Save result and enqueue this dep's deps\n            results.push(dependencyBundleResult.result);\n            enqueue(dependencyBundleResult.dependencyInputs);\n          })\n          .catch((err) => {\n            // If there's an error (most likely that the dependency wasn't found in the resolve map),\n            // save it in a result instead of throwing. This generally gives better logging.\n            results.push(getErrorResult(dependencyInput, err));\n          })\n          .then(() => {\n            pending--;\n            if (!pending) {\n              resolve(results);\n            }\n          });\n      }\n    };\n\n    enqueue(mainDependencies);\n  });\n\n  return {\n    result,\n    dependencies,\n  };\n}\n\nasync function ensurePackageBundledInternal(\n  params: EnsurePackageBundledInput & {\n    visited: Set<`${string}@${string}`>;\n  },\n  ctx: EnsurePackageBundledContext,\n): Promise<{ result: EnsurePackageBundledResult; dependencyInputs: EnsurePackageBundledInput[] }> {\n  const { taskRunner, session, watcher, packageHashes, bus, telemetryClient } = ctx;\n  const { resolveMap, config } = session;\n  const {\n    name,\n    version,\n    shouldWatch,\n    disableSourceMaps = config.features?.disableSourceMaps,\n    enqueueDependencies = config.features?.enqueueDependencies,\n    outputPath,\n    shouldGetBundleInfo,\n    shouldRerun,\n    shouldForce,\n    disableCache,\n    isIncremental,\n    useHashAsId,\n    priority,\n    targetEnvironment = 'browser',\n    visited,\n  } = params;\n\n  const dependencyInputs: EnsurePackageBundledInput[] = [];\n\n  visited.add(`${name}@${version}`);\n\n  // First, we find the resolve map entry. This helps us resolve the physical location of the package\n  // according to the resolveMap used in the session. (This can change based on linking.)\n  const packageEntry = findResolveMapEntry({ packageName: name, version, resolveMap });\n\n  if (!packageEntry) {\n    throw new Error(`Could not find package ${version ? `${name}@${version}` : name} in the resolve map.`);\n  }\n\n  const isExternal = !!packageEntry.isExternal;\n\n  let hash: string | undefined;\n  let sourceHash: string | undefined;\n\n  if (useHashAsId) {\n    // If we are using the hash as the task id, we need to calculate it once and pass it to the task\n    // to prevent a race condition in which we get a different hash than the one used in the task id.\n    hash = await packageHashes.get({\n      packagePath: packageEntry.path,\n      isSourceHashingEnabled: false,\n      shouldRecalculate: true,\n      targetEnvironment,\n    });\n\n    if (!packageEntry.isExternal) {\n      // We only need the source hash for internal packages for cache validation.\n      sourceHash = await packageHashes.get({\n        packagePath: packageEntry.path,\n        isSourceHashingEnabled: true,\n        shouldRecalculate: true,\n        targetEnvironment,\n      });\n    }\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: hash ?? `${packageEntry.path}--env:${targetEnvironment}`,\n    packagePath: packageEntry.path,\n    packageName: name,\n    targetEnvironment,\n    isExternal,\n    isIncremental,\n    outputPath,\n    version,\n    disableSourceMaps,\n    shouldGetBundleInfo: shouldGetBundleInfo || enqueueDependencies,\n    disableCache,\n    mode: config.mode,\n  };\n\n  // Make priority negative to have retry count set to positive values.\n  const retryCount = priority ? -1 * priority : undefined;\n\n  const task = createBundleTask({ bundleRequest, force: shouldForce, hash, sourceHash, retryCount }, ctx);\n\n  // TODO: Add lage scheduling back.\n  const { result } = await taskRunner.add(task, { rerun: shouldRerun, priority });\n\n  if (!result) {\n    throw new Error('Bundle failed, no result');\n  }\n\n  // For internal packages, make sure we're watching the source to re-trigger bundling.\n  if (shouldWatch && !isExternal) {\n    if (!bus || !watcher) {\n      throw new Error('bus and watcher must be provided in context if shouldWatch is true (this is a bug).');\n    }\n\n    const definition = await ctx.packages.get(packageEntry.path);\n    const watchOptions: WatchOptions = {\n      id: bundleRequest.id,\n      path: packageEntry.path,\n      watchPaths: definition.cloudpack?.inputPaths,\n    };\n\n    const onPackageChange = async () => {\n      const watchedResult = await taskRunner.add(task, { rerun: true });\n\n      // If the result was successful, notify potential clients for reload.\n      if (watchedResult.result?.errors?.length === 0) {\n        await notifyHost(\n          { reason: 'on-package-change', packagePath: packageEntry.path, hash: watchedResult.result.hash },\n          { bus, session, telemetryClient },\n        );\n      }\n    };\n    await watcher.watch(watchOptions, () => {\n      void onPackageChange();\n    });\n  }\n\n  // If enabled, enqueue dependencies.\n  if (enqueueDependencies && result.info) {\n    for (const dependencyName of getConsumedDependencies(result.info)) {\n      const dependencyVersion = packageEntry.dependencies[dependencyName];\n\n      // If we've already visited this package from another package, skip it.\n      if (visited.has(`${dependencyName}@${dependencyVersion}`)) {\n        continue;\n      }\n\n      dependencyInputs.push({\n        name: dependencyName,\n        version: dependencyVersion,\n        shouldWatch,\n        enqueueDependencies,\n      });\n    }\n  }\n\n  return {\n    result: {\n      version,\n      name,\n      isExternal,\n      ...result,\n    },\n    dependencyInputs,\n  };\n}\n\nfunction getErrorResult(input: EnsurePackageBundledInput, error: unknown): EnsurePackageBundledResult {\n  const text = `Error thrown while bundling: ${error instanceof Error ? error.stack || error.message : error}`;\n  return {\n    name: input.name,\n    version: input.version,\n    errors: [{ text, source: 'ensurePackageBundled' }],\n  };\n}\n\n// This function doesn't have an attached procedure because it's never called via the TRPC server.\n"]}
+{"version":3,"file":"ensurePackageBundled.js","sourceRoot":"","sources":["../../src/apis/ensurePackageBundled.ts"],"names":[],"mappings":"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","sourcesContent":["import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport { createBundleTask } from '../utilities/createBundleTask.js';\nimport type { Context } from '../types/Context.js';\nimport type { WatchOptions } from '@ms-cloudpack/file-watcher';\nimport { getConsumedDependencies } from '../utilities/getConsumedDependencies.js';\nimport type { TargetEnvironment, WithOptional } from '@ms-cloudpack/common-types';\nimport { notifyHost } from '../utilities/notifyHost.js';\n\n/**\n * Input for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledInput\n  extends Pick<BundleRequest, 'outputPath' | 'version' | 'disableSourceMaps' | 'shouldGetBundleInfo'> {\n  /** Package name */\n  name: string;\n  /**\n   * Target environment for the bundle.\n   * @default 'browser'\n   */\n  targetEnvironment?: TargetEnvironment;\n  /** Whether to also ensure dependencies are bundled */\n  enqueueDependencies?: boolean;\n  /** Whether to re-run the bundle task */\n  shouldRerun?: boolean;\n  /**\n   * Whether to watch for changes (internal packages only).\n   * NOTE: requires `ctx.bus` and `ctx.watcher` to be set.\n   */\n  shouldWatch?: boolean;\n  /** Whether to force re-bundling */\n  shouldForce?: boolean;\n  /** Whether to disable caching. */\n  disableCache?: boolean;\n  /** Whether to support incremental rebuilds. Defaults to true for internal libraries. */\n  isIncremental?: boolean;\n  /**\n   * Whether to use a hash as the bundle id instead of the path.\n   * Reduces performance when used with shouldForce as it hashes twice,\n   * but eliminates task cache artifacts when handling many apps.\n   */\n  useHashAsId?: boolean;\n  /** Priority for bundling. Greater priority will be scheduled first (defaults to 0). */\n  priority?: number;\n}\n\n/**\n * Result of ensuring a single package is bundled.\n */\nexport interface EnsurePackageBundledResult\n  extends Omit<NonNullable<BundleRequest['result']>, 'rebuild' | 'dispose' | 'bundlerName' | 'inputPath'> {\n  /** Package name */\n  name: string;\n  /** Package version */\n  version: string;\n  /** Package dependency names (prod and peer) */\n  dependencies?: string[];\n  /** Whether the package is external (not defined in this repo). Unset if it's not found. */\n  isExternal?: boolean;\n  /** Absolute path of the package. Will be unset if the package couldn't be found. */\n  inputPath?: string;\n}\n\n/**\n * Complete output for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledOutput {\n  /** Result of bundling this package */\n  result: EnsurePackageBundledResult;\n  /** Results of bundling dependencies */\n  dependencies: Promise<EnsurePackageBundledResult[]>;\n}\n\n/**\n * Context for `ensurePackageBundled`. `bus` and `watcher` are only needed if `shouldWatch` is true.\n */\nexport type EnsurePackageBundledContext = WithOptional<Context, 'bus' | 'watcher'>;\n\n/**\n * Checks if the package is bundled or needs bundling, and returns the result.\n * For internal packages, we also notify the watcher to monitor for code changes.\n */\nexport async function ensurePackageBundled(\n  input: EnsurePackageBundledInput,\n  ctx: EnsurePackageBundledContext,\n): Promise<EnsurePackageBundledOutput> {\n  const results: EnsurePackageBundledResult[] = [];\n  const visited = new Set<`${string}@${string}`>();\n\n  // Bundle the package itself\n  let result: EnsurePackageBundledResult;\n  let mainDependencies: EnsurePackageBundledInput[];\n  try {\n    ({ result, dependencyInputs: mainDependencies } = await ensurePackageBundledInternal({ ...input, visited }, ctx));\n  } catch (err) {\n    return {\n      result: getErrorResult(input, err),\n      dependencies: Promise.resolve([]),\n    };\n  }\n\n  // Enqueue main dependencies\n  // TODO: should processing this queue have a rate limit? right now if enqueueDependencies is enabled,\n  // `await dependencies` will fire off all deps at once.\n  let pending = 0;\n  const dependencies = new Promise<EnsurePackageBundledResult[]>((resolve) => {\n    const enqueue = (dependencyInputs: EnsurePackageBundledInput[]) => {\n      for (const dependencyInput of dependencyInputs) {\n        pending++;\n\n        void ensurePackageBundledInternal({ ...dependencyInput, visited }, ctx)\n          .then((dependencyBundleResult) => {\n            // Save result and enqueue this dep's deps\n            results.push(dependencyBundleResult.result);\n            enqueue(dependencyBundleResult.dependencyInputs);\n          })\n          .catch((err) => {\n            // If there's an error (most likely that the dependency wasn't found in the resolve map),\n            // save it in a result instead of throwing. This generally gives better logging.\n            results.push(getErrorResult(dependencyInput, err));\n          })\n          .then(() => {\n            pending--;\n            if (!pending) {\n              resolve(results);\n            }\n          });\n      }\n    };\n\n    enqueue(mainDependencies);\n  });\n\n  return {\n    result,\n    dependencies,\n  };\n}\n\nasync function ensurePackageBundledInternal(\n  params: EnsurePackageBundledInput & {\n    visited: Set<`${string}@${string}`>;\n  },\n  ctx: EnsurePackageBundledContext,\n): Promise<{ result: EnsurePackageBundledResult; dependencyInputs: EnsurePackageBundledInput[] }> {\n  const { taskRunner, session, watcher, packageHashes, bus, telemetryClient } = ctx;\n  const { resolveMap, config } = session;\n  const {\n    name,\n    version,\n    shouldWatch,\n    disableSourceMaps = config.features?.disableSourceMaps,\n    enqueueDependencies = config.features?.enqueueDependencies,\n    outputPath,\n    shouldGetBundleInfo,\n    shouldRerun,\n    shouldForce,\n    disableCache,\n    isIncremental,\n    useHashAsId,\n    priority,\n    targetEnvironment = 'browser',\n    visited,\n  } = params;\n\n  const dependencyInputs: EnsurePackageBundledInput[] = [];\n\n  visited.add(`${name}@${version}`);\n\n  // First, we find the resolve map entry. This helps us resolve the physical location of the package\n  // according to the resolveMap used in the session. (This can change based on linking.)\n  const packageEntry = findResolveMapEntry({ packageName: name, version, resolveMap });\n\n  if (!packageEntry) {\n    throw new Error(`Could not find package ${version ? `${name}@${version}` : name} in the resolve map.`);\n  }\n\n  const isExternal = !!packageEntry.isExternal;\n\n  let hash: string | undefined;\n  let sourceHash: string | undefined;\n\n  if (useHashAsId) {\n    // If we are using the hash as the task id, we need to calculate it once and pass it to the task\n    // to prevent a race condition in which we get a different hash than the one used in the task id.\n    hash = await packageHashes.get({\n      packagePath: packageEntry.path,\n      isSourceHashingEnabled: false,\n      shouldRecalculate: true,\n      targetEnvironment,\n    });\n\n    if (!packageEntry.isExternal) {\n      // We only need the source hash for internal packages for cache validation.\n      sourceHash = await packageHashes.get({\n        packagePath: packageEntry.path,\n        isSourceHashingEnabled: true,\n        shouldRecalculate: true,\n        targetEnvironment,\n      });\n    }\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: hash ?? `${packageEntry.path}--env:${targetEnvironment}`,\n    packagePath: packageEntry.path,\n    packageName: name,\n    targetEnvironment,\n    isExternal,\n    isIncremental,\n    outputPath,\n    version,\n    disableSourceMaps,\n    shouldGetBundleInfo: shouldGetBundleInfo || enqueueDependencies,\n    disableCache,\n    mode: config.mode,\n  };\n\n  // Make priority negative to have retry count set to positive values.\n  const retryCount = priority ? -1 * priority : undefined;\n\n  const task = createBundleTask({ bundleRequest, force: shouldForce, hash, sourceHash, retryCount }, ctx);\n\n  // TODO: Add lage scheduling back.\n  const { result } = await taskRunner.add(task, { rerun: shouldRerun, priority });\n\n  if (!result) {\n    throw new Error('Bundle failed, no result');\n  }\n\n  // For internal packages, make sure we're watching the source to re-trigger bundling.\n  if (shouldWatch && !isExternal) {\n    if (!bus || !watcher) {\n      throw new Error('bus and watcher must be provided in context if shouldWatch is true (this is a bug).');\n    }\n\n    const definition = await ctx.packages.get(packageEntry.path);\n    const watchOptions: WatchOptions = {\n      id: bundleRequest.id,\n      path: packageEntry.path,\n      watchPaths: definition.cloudpack?.inputPaths,\n    };\n\n    const onPackageChange = async () => {\n      const watchedResult = await taskRunner.add(task, { rerun: true });\n\n      // If the result was successful, notify potential clients for reload.\n      if (watchedResult.result?.errors?.length === 0) {\n        await notifyHost(\n          { reason: 'on-package-change', packagePath: packageEntry.path, hash: watchedResult.result.hash },\n          { bus, session, telemetryClient },\n        );\n      }\n    };\n    await watcher.watch(watchOptions, (changedPaths) => {\n      // Filter out the configPaths, we don't want to re-bundle on config changes. CLI will restart it instead.\n      const filteredPaths = changedPaths.filter((p) => !config.configPaths?.appConfigPaths.includes(p));\n      if (filteredPaths.length > 0) {\n        void onPackageChange();\n      }\n    });\n  }\n\n  // If enabled, enqueue dependencies.\n  if (enqueueDependencies && result.info) {\n    for (const dependencyName of getConsumedDependencies(result.info)) {\n      const dependencyVersion = packageEntry.dependencies[dependencyName];\n\n      // If we've already visited this package from another package, skip it.\n      if (visited.has(`${dependencyName}@${dependencyVersion}`)) {\n        continue;\n      }\n\n      dependencyInputs.push({\n        name: dependencyName,\n        version: dependencyVersion,\n        shouldWatch,\n        enqueueDependencies,\n      });\n    }\n  }\n\n  return {\n    result: {\n      version,\n      name,\n      isExternal,\n      ...result,\n    },\n    dependencyInputs,\n  };\n}\n\nfunction getErrorResult(input: EnsurePackageBundledInput, error: unknown): EnsurePackageBundledResult {\n  const text = `Error thrown while bundling: ${error instanceof Error ? error.stack || error.message : error}`;\n  return {\n    name: input.name,\n    version: input.version,\n    errors: [{ text, source: 'ensurePackageBundled' }],\n  };\n}\n\n// This function doesn't have an attached procedure because it's never called via the TRPC server.\n"]}

package/lib/trpc/createCloudpackClient.d.ts

@@ -12,5 +12,7 @@ export declare function createCloudpackClient(options: {
     url: string;
     /** Task reporter for use on the server */
     reporter?: TaskReporter;
+    /** Triggered when a WebSocket connection is established */
+    onOpen?: () => void;
 }): Promise<CloudpackClient>;
 //# sourceMappingURL=createCloudpackClient.d.ts.map

package/lib/trpc/createCloudpackClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCloudpackClient.d.ts","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG;IACpD,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACnD,uCAAuC;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,GAAG,OAAO,CAAC,eAAe,CAAC,CAmF3B"}
+{"version":3,"file":"createCloudpackClient.d.ts","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG;IACpD,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACnD,uCAAuC;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB,GAAG,OAAO,CAAC,eAAe,CAAC,CAsF3B"}

package/lib/trpc/createCloudpackClient.js

@@ -6,7 +6,7 @@ import { ignoreSelfSignedCertErrors } from '../utilities/ignoreSelfSignedCertErr
  * Creates a cloudpack client that can be used to communicate with the cloudpack server using trpc.
  */
 export async function createCloudpackClient(options) {
-    const { url: wsUrl, reporter } = options;
+    const { url: wsUrl, reporter, onOpen } = options;
     // We polyfill websocket in node conditions.
     await ensureWebsocketDefined();
     ignoreSelfSignedCertErrors({ reporter });
@@ -28,6 +28,9 @@ export async function createCloudpackClient(options) {
                 console.error('[Cloudpack] Unexpected websocket client error');
             }
         },
+        onOpen() {
+            onOpen?.();
+        },
     });
     const tempUrl = makeUrl(wsUrl);
     // Replace the protocol with http so that we can use the same url for http requests.

package/lib/trpc/createCloudpackClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createCloudpackClient.js","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TRPCClient } from '@trpc/client';\nimport { createTRPCClient, createWSClient, httpBatchLink, splitLink, wsLink } from '@trpc/client';\nimport { ensureWebsocketDefined } from '../utilities/ensureWebsocketDefined.js';\nimport { ignoreSelfSignedCertErrors } from '../utilities/ignoreSelfSignedCertErrors.js';\nimport type { AppRouter } from '../types/AppRouter.js';\n\nexport type CloudpackClient = TRPCClient<AppRouter> & {\n  close: () => Promise<void>;\n};\n\n/**\n * Creates a cloudpack client that can be used to communicate with the cloudpack server using trpc.\n */\nexport async function createCloudpackClient(options: {\n  /** API server URL (`ws:` or `wss:`) */\n  url: string;\n  /** Task reporter for use on the server */\n  reporter?: TaskReporter;\n}): Promise<CloudpackClient> {\n  const { url: wsUrl, reporter } = options;\n\n  // We polyfill websocket in node conditions.\n  await ensureWebsocketDefined();\n\n  ignoreSelfSignedCertErrors({ reporter });\n\n  // Ignore these wsClient `onError` events as we handle them with try/catch when checking if a session is active\n  reporter?.ignoreLogMessage('Received network error or non-101 status code.');\n  reporter?.ignoreLogMessage('Connection was closed before it was established.');\n\n  // Create the client.\n  const wsClient = createWSClient({\n    url: wsUrl,\n    onError: (evt) => {\n      const error = evt as { message?: string } | undefined;\n      // On node evt is an Event with a message property\n      // On browser it is an Event with no relevant information\n      // We can't directly log or stringify the event as it will be undefined\n      if (error?.message) {\n        console.error(`[Cloudpack] Websocket client error: ${error.message}`);\n      } else {\n        console.error('[Cloudpack] Unexpected websocket client error');\n      }\n    },\n  });\n  const tempUrl = makeUrl(wsUrl);\n\n  // Replace the protocol with http so that we can use the same url for http requests.\n  const isSSL = tempUrl.protocol === 'wss:';\n  tempUrl.protocol = isSSL ? 'https:' : 'http:';\n\n  const httpUrl = tempUrl.toString().replace(/\\/$/, '');\n  const client = createTRPCClient<AppRouter>({\n    links: [\n      // send subscriptions to the websocket client and handle operations with HTTP requests\n      splitLink({\n        condition(op) {\n          return op.type === 'subscription';\n        },\n        true: wsLink({\n          client: wsClient,\n        }),\n        false: httpBatchLink({\n          url: httpUrl,\n        }),\n      }),\n    ],\n  });\n\n  const close: CloudpackClient['close'] = async () => {\n    await wsClient.close();\n  };\n\n  // Add a default onError handler for onDataChanged subscriptions.\n  // Otherwise errors (such as from zod type violations) will be hidden.\n  const onDataChanged: CloudpackClient['onDataChanged'] = {\n    subscribe: (source, opts) => {\n      opts = { ...opts };\n      opts.onError ??= (err) => {\n        console.error(\n          `[Cloudpack] Error in ${source.path.join('.')} data subscription (this may be a Cloudpack bug): ` +\n            err.message,\n        );\n      };\n      return client.onDataChanged.subscribe(source, opts);\n    },\n  };\n\n  // Ugh. This is a hack to get around the fact that the client is a proxy.\n  // Make another proxy which defines the close method and onDataChanged wrapper,\n  // and passes through everything else to the original client.\n  return new Proxy<CloudpackClient>({ close, onDataChanged } as CloudpackClient, {\n    get(target, prop) {\n      // eslint-disable-next-line no-prototype-builtins\n      if (target.hasOwnProperty(prop)) {\n        return target[prop as keyof typeof target];\n      }\n\n      return client[prop as Exclude<keyof CloudpackClient, 'close'>];\n    },\n  });\n}\n"]}
+{"version":3,"file":"createCloudpackClient.js","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TRPCClient } from '@trpc/client';\nimport { createTRPCClient, createWSClient, httpBatchLink, splitLink, wsLink } from '@trpc/client';\nimport { ensureWebsocketDefined } from '../utilities/ensureWebsocketDefined.js';\nimport { ignoreSelfSignedCertErrors } from '../utilities/ignoreSelfSignedCertErrors.js';\nimport type { AppRouter } from '../types/AppRouter.js';\n\nexport type CloudpackClient = TRPCClient<AppRouter> & {\n  close: () => Promise<void>;\n};\n\n/**\n * Creates a cloudpack client that can be used to communicate with the cloudpack server using trpc.\n */\nexport async function createCloudpackClient(options: {\n  /** API server URL (`ws:` or `wss:`) */\n  url: string;\n  /** Task reporter for use on the server */\n  reporter?: TaskReporter;\n  /** Triggered when a WebSocket connection is established */\n  onOpen?: () => void;\n}): Promise<CloudpackClient> {\n  const { url: wsUrl, reporter, onOpen } = options;\n\n  // We polyfill websocket in node conditions.\n  await ensureWebsocketDefined();\n\n  ignoreSelfSignedCertErrors({ reporter });\n\n  // Ignore these wsClient `onError` events as we handle them with try/catch when checking if a session is active\n  reporter?.ignoreLogMessage('Received network error or non-101 status code.');\n  reporter?.ignoreLogMessage('Connection was closed before it was established.');\n\n  // Create the client.\n  const wsClient = createWSClient({\n    url: wsUrl,\n    onError: (evt) => {\n      const error = evt as { message?: string } | undefined;\n      // On node evt is an Event with a message property\n      // On browser it is an Event with no relevant information\n      // We can't directly log or stringify the event as it will be undefined\n      if (error?.message) {\n        console.error(`[Cloudpack] Websocket client error: ${error.message}`);\n      } else {\n        console.error('[Cloudpack] Unexpected websocket client error');\n      }\n    },\n    onOpen() {\n      onOpen?.();\n    },\n  });\n  const tempUrl = makeUrl(wsUrl);\n\n  // Replace the protocol with http so that we can use the same url for http requests.\n  const isSSL = tempUrl.protocol === 'wss:';\n  tempUrl.protocol = isSSL ? 'https:' : 'http:';\n\n  const httpUrl = tempUrl.toString().replace(/\\/$/, '');\n  const client = createTRPCClient<AppRouter>({\n    links: [\n      // send subscriptions to the websocket client and handle operations with HTTP requests\n      splitLink({\n        condition(op) {\n          return op.type === 'subscription';\n        },\n        true: wsLink({\n          client: wsClient,\n        }),\n        false: httpBatchLink({\n          url: httpUrl,\n        }),\n      }),\n    ],\n  });\n\n  const close: CloudpackClient['close'] = async () => {\n    await wsClient.close();\n  };\n\n  // Add a default onError handler for onDataChanged subscriptions.\n  // Otherwise errors (such as from zod type violations) will be hidden.\n  const onDataChanged: CloudpackClient['onDataChanged'] = {\n    subscribe: (source, opts) => {\n      opts = { ...opts };\n      opts.onError ??= (err) => {\n        console.error(\n          `[Cloudpack] Error in ${source.path.join('.')} data subscription (this may be a Cloudpack bug): ` +\n            err.message,\n        );\n      };\n      return client.onDataChanged.subscribe(source, opts);\n    },\n  };\n\n  // Ugh. This is a hack to get around the fact that the client is a proxy.\n  // Make another proxy which defines the close method and onDataChanged wrapper,\n  // and passes through everything else to the original client.\n  return new Proxy<CloudpackClient>({ close, onDataChanged } as CloudpackClient, {\n    get(target, prop) {\n      // eslint-disable-next-line no-prototype-builtins\n      if (target.hasOwnProperty(prop)) {\n        return target[prop as keyof typeof target];\n      }\n\n      return client[prop as Exclude<keyof CloudpackClient, 'close'>];\n    },\n  });\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.64.19",
-  "description": "An implementation of the API server that does interacts with a task scheduler.",
+  "version": "0.64.21",
+  "description": "Internal API server for Cloudpack",
   "license": "MIT",
   "type": "module",
   "types": "./lib/index.d.ts",
@@ -25,23 +25,23 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/bundler": "^0.25.32",
-    "@ms-cloudpack/common-types": "^0.27.6",
-    "@ms-cloudpack/config": "^0.38.3",
-    "@ms-cloudpack/create-express-app": "^1.10.50",
+    "@ms-cloudpack/bundler": "^0.25.34",
+    "@ms-cloudpack/common-types": "^0.27.7",
+    "@ms-cloudpack/config": "^0.38.4",
+    "@ms-cloudpack/create-express-app": "^1.10.51",
     "@ms-cloudpack/data-bus": "^0.5.0",
     "@ms-cloudpack/environment": "^0.1.1",
-    "@ms-cloudpack/esm-stub-utilities": "^0.15.14",
-    "@ms-cloudpack/file-watcher": "^0.4.8",
-    "@ms-cloudpack/import-map": "^0.10.44",
+    "@ms-cloudpack/esm-stub-utilities": "^0.15.15",
+    "@ms-cloudpack/file-watcher": "^0.4.9",
+    "@ms-cloudpack/import-map": "^0.10.45",
     "@ms-cloudpack/json-utilities": "^0.1.11",
-    "@ms-cloudpack/package-hashes": "^0.8.27",
-    "@ms-cloudpack/package-utilities": "^12.5.0",
+    "@ms-cloudpack/package-hashes": "^0.8.28",
+    "@ms-cloudpack/package-utilities": "^12.5.1",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.1.21",
-    "@ms-cloudpack/remote-cache": "^0.11.38",
-    "@ms-cloudpack/task-reporter": "^0.17.3",
-    "@ms-cloudpack/telemetry": "^0.11.39",
+    "@ms-cloudpack/path-utilities": "^3.1.22",
+    "@ms-cloudpack/remote-cache": "^0.11.39",
+    "@ms-cloudpack/task-reporter": "^0.17.4",
+    "@ms-cloudpack/telemetry": "^0.11.40",
     "@trpc/client": "^11.1.1",
     "@trpc/server": "^11.1.1",
     "cors": "^2.8.5",