@getexception/cli 0.1.23 → 0.1.25

package/dist/integration.d.ts

@@ -31,10 +31,10 @@ declare function validateGitLabContext(value: unknown, env: NodeJS.ProcessEnv, o
     release: string;
     assetPrefix: string;
     deployment: {
-        environment: "production" | "staging" | "development";
+        environment: string;
         review?: {
-            provider: "gitlab";
-            repositoryId: number;
+            provider: "gitlab" | "github" | "other";
+            repositoryId: string | number;
             number: number;
         } | undefined;
     };
@@ -60,4 +60,44 @@ declare function assertPublicOutput(root: string, options?: {
     mapsEnabled?: boolean;
 }): Promise<void>;
 
-export { type GitLabDeploymentOptions, type GitLabDeploymentResult, assertPublicOutput, deployWithGetException, validateGitLabContext };
+type PrepareSourceMapsOptions = {
+    directory: string;
+    output: string;
+    release: string;
+    buildId: string;
+    urlPrefix?: string;
+    format?: "esm" | "classic";
+    credentials?: string[];
+    signal?: AbortSignal;
+};
+declare function prepareSourceMaps(options: PrepareSourceMapsOptions): Promise<{
+    directory: string;
+    release: string;
+    buildId: string;
+}>;
+type SourceMapDeliveryOptions = {
+    directory: string;
+    url: string;
+    projectId: string;
+    token: string | undefined;
+    environment: string;
+    timeoutMs?: number;
+    signal?: AbortSignal;
+};
+declare function uploadSourceMaps(options: SourceMapDeliveryOptions, transport?: typeof fetch): Promise<{
+    status: "ready";
+    batches: number;
+    diagnostic?: undefined;
+} | {
+    status: "unavailable";
+    diagnostic: string;
+    batches?: undefined;
+}>;
+
+type CiCredential = string | {
+    gitlabIdToken: string;
+};
+
+declare function registerRelease(address: string, project: string, token: CiCredential, value: unknown, transport?: typeof fetch): Promise<void>;
+
+export { type GitLabDeploymentOptions, type GitLabDeploymentResult, type PrepareSourceMapsOptions, type SourceMapDeliveryOptions, assertPublicOutput, deployWithGetException, prepareSourceMaps, registerRelease, uploadSourceMaps, validateGitLabContext };

package/dist/integration.js

@@ -1820,18 +1820,18 @@ var validateAsync = async (schema, value, _ctx) => {
   return result.issues.length === 0;
 };
 var _encode = (_Err) => {
-  const parse4 = _parse(_Err);
+  const parse5 = _parse(_Err);
   const fn = (schema, value, _ctx, _params) => {
     const ctx = _ctx ? { ..._ctx, direction: "backward" } : { direction: "backward" };
-    return parse4(schema, value, ctx, finalizeParams(fn, _params));
+    return parse5(schema, value, ctx, finalizeParams(fn, _params));
   };
   return fn;
 };
 var encode = /* @__PURE__ */ _encode($ZodRealError);
 var _decode = (_Err) => {
-  const parse4 = _parse(_Err);
+  const parse5 = _parse(_Err);
   const fn = (schema, value, _ctx, _params) => {
-    return parse4(schema, value, _ctx, finalizeParams(fn, _params));
+    return parse5(schema, value, _ctx, finalizeParams(fn, _params));
   };
   return fn;
 };
@@ -18885,7 +18885,12 @@ var SOURCE_MAP_LIMITS = {
   diskReserveBytes: 5 * 1024 * 1024 * 1024,
   manifestBytes: 64 * 1024
 };
-var releaseNameSchema = external_exports.string().regex(/^[a-z0-9][a-z0-9-]{0,79}@[a-f0-9]{40}$/);
+var releaseNameSchema = external_exports.string().max(160).regex(/^[A-Za-z0-9][A-Za-z0-9._+-]*(?:@[A-Za-z0-9][A-Za-z0-9._+-]*)?$/).refine((value) => !/^[^@]+@[a-zA-Z][^@]*\.[a-zA-Z]{2,}$/.test(value));
+var environmentNameSchema = external_exports.string().max(64).regex(/^[a-z][a-z0-9_-]{0,63}$/).refine(
+  (value) => !["all", "constructor", "prototype", "__proto__"].includes(value)
+);
+var buildIdSchema = external_exports.string().max(64).regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/);
+var environmentListSchema = external_exports.array(environmentNameSchema).max(20).refine((values) => new Set(values).size === values.length);
 var artifactPathSchema = external_exports.string().max(512).regex(/^[a-zA-Z0-9_@~.-]+(?:\/[a-zA-Z0-9_@~.-]+)*\.(?:js|mjs)$/).refine(
   (value) => !value.split("/").some((part) => part === "." || part === "..")
 );
@@ -18897,9 +18902,13 @@ var sourceArtifactSchema = external_exports.object({
 }).strict();
 var sourceUploadSchema = external_exports.object({
   release: releaseNameSchema,
+  environment: environmentNameSchema.optional(),
+  buildId: buildIdSchema.optional(),
+  batchIndex: external_exports.number().int().min(0).max(4095).optional(),
+  batchCount: external_exports.number().int().min(1).max(4096).optional(),
   artifacts: external_exports.array(sourceArtifactSchema).min(1).max(SOURCE_MAP_LIMITS.files)
 }).strict().superRefine((value, ctx) => {
-  if (value.artifacts.reduce((sum, file2) => sum + file2.size, 0) > SOURCE_MAP_LIMITS.releaseBytes || new Set(value.artifacts.map((file2) => file2.path)).size !== value.artifacts.length || new Set(value.artifacts.map((file2) => file2.debugId)).size !== value.artifacts.length) {
+  if ((value.batchIndex !== void 0 || value.batchCount !== void 0) && (value.batchIndex === void 0 || value.batchCount === void 0 || value.batchIndex >= value.batchCount) || value.artifacts.reduce((sum, file2) => sum + file2.size, 0) > SOURCE_MAP_LIMITS.releaseBytes || new Set(value.artifacts.map((file2) => file2.path)).size !== value.artifacts.length || new Set(value.artifacts.map((file2) => file2.debugId)).size !== value.artifacts.length) {
     ctx.addIssue({ code: "custom", message: "Invalid artifact manifest" });
   }
 });
@@ -18924,20 +18933,18 @@ function sanitizeAppVersion(value) {
   const parsed = appVersionSchema.safeParse(value);
   return parsed.success ? parsed.data : void 0;
 }
-var RELEASE_ENVIRONMENTS = [
-  "production",
-  "staging",
-  "development"
-];
 var deploymentSchema = external_exports.object({
-  environment: external_exports.enum(RELEASE_ENVIRONMENTS),
+  environment: environmentNameSchema,
   review: external_exports.object({
-    provider: external_exports.literal("gitlab"),
-    repositoryId: external_exports.number().int().min(1).max(2147483647),
+    provider: external_exports.enum(["gitlab", "github", "other"]),
+    repositoryId: external_exports.union([
+      external_exports.number().int().min(1).max(2147483647),
+      external_exports.string().max(200).regex(/^[A-Za-z0-9_.-]+(?:\/[A-Za-z0-9_.-]+)+$/)
+    ]),
     number: external_exports.number().int().min(1).max(2147483647)
   }).strict().optional()
-}).strict().refine((value) => !value.review || value.environment === "staging", {
-  message: "Merge requests belong to staging"
+}).strict().refine((value) => !value.review || value.environment !== "production", {
+  message: "Reviews belong to non-production environments"
 });
 var releaseRegistrationSchema = external_exports.object({
   release: releaseNameSchema,
@@ -19061,7 +19068,7 @@ var safeEventSchema = external_exports.object({
   message: external_exports.string().max(1024),
   exceptionType: external_exports.string().max(120),
   handled: external_exports.boolean(),
-  environment: external_exports.enum(["production", "staging", "development"]),
+  environment: environmentNameSchema,
   release: external_exports.string().max(160).optional(),
   appVersion: appVersionSchema.optional(),
   dist: external_exports.string().max(64).optional(),
@@ -19088,7 +19095,13 @@ var codeSchema = external_exports.enum([
   "HTTP_ERROR",
   "CONTRACT_JSON",
   "CONTRACT_RESPONSE",
-  "COMMAND_FAILED"
+  "COMMAND_FAILED",
+  "ENVIRONMENT_FORBIDDEN",
+  "BUILD_CONFLICT",
+  "INVALID_UPLOAD",
+  "STORAGE_FULL",
+  "RATE_LIMITED",
+  "UPLOAD_UNAVAILABLE"
 ]);
 var diagnosticSchema = external_exports.object({
   version: external_exports.literal(1),
@@ -19107,6 +19120,17 @@ var CliError = class extends Error {
   httpStatus;
   requestId;
 };
+function formatDiagnostic(error61) {
+  const safe = diagnosticSchema.safeParse({
+    version: 1,
+    code: error61 instanceof CliError ? error61.code : "COMMAND_FAILED",
+    ...error61 instanceof CliError ? { httpStatus: error61.httpStatus, requestId: error61.requestId } : {}
+  });
+  return `GETEXCEPTION_DIAGNOSTIC ${JSON.stringify(
+    safe.success ? safe.data : { version: 1, code: "COMMAND_FAILED" }
+  )}
+`;
+}
 function networkError(error61, httpStatus) {
   let current = error61;
   for (let depth = 0; depth < 4 && current instanceof Error; depth++) {
@@ -19159,6 +19183,17 @@ function authorizationHeader(credential) {
 }
 
 // packages/cli/src/api-response.ts
+var uploadFailureSchema = external_exports.object({
+  code: external_exports.enum([
+    "ENVIRONMENT_FORBIDDEN",
+    "BUILD_CONFLICT",
+    "INVALID_UPLOAD",
+    "STORAGE_FULL",
+    "RATE_LIMITED",
+    "UPLOAD_UNAVAILABLE"
+  ]),
+  requestId: external_exports.string().uuid()
+});
 async function responseJson(response) {
   const reader = response.body?.getReader();
   const chunks = [];
@@ -19208,6 +19243,14 @@ async function httpError(response) {
           result.data.requestId
         );
       }
+      const upload = uploadFailureSchema.safeParse(candidate);
+      if (upload.success) {
+        return new CliError(
+          upload.data.code,
+          response.status,
+          upload.data.requestId
+        );
+      }
     }
   } catch {
   }
@@ -19242,6 +19285,9 @@ function projectApi(address, project, token, transport = fetch, options = {}) {
   const requestTimeout = options.requestTimeoutMs ?? 3e4;
   return async function request(path, method = "GET", body, contentEncoding) {
     for (let attempt = 0; attempt < 3; attempt++) {
+      if (options.signal?.aborted) {
+        throw new CliError("NETWORK_TIMEOUT");
+      }
       if (Date.now() >= deadline) {
         throw new CliError("NETWORK_TIMEOUT");
       }
@@ -19257,14 +19303,21 @@ function projectApi(address, project, token, transport = fetch, options = {}) {
           body,
           redirect: "error",
           credentials: "omit",
-          signal: AbortSignal.timeout(
-            Math.min(requestTimeout, deadline - Date.now())
-          )
+          signal: AbortSignal.any([
+            AbortSignal.timeout(
+              Math.min(requestTimeout, deadline - Date.now())
+            ),
+            ...options.signal ? [options.signal] : []
+          ])
         });
       } catch (error61) {
         const failure = networkError(error61);
         if (retryableNetworkError(failure) && attempt < 2) {
-          await delay(1e3 * 2 ** attempt);
+          await delay(
+            Math.min(1e3 * 2 ** attempt, Math.max(1, deadline - Date.now())),
+            void 0,
+            { signal: options.signal }
+          );
           continue;
         }
         throw failure;
@@ -19274,7 +19327,11 @@ function projectApi(address, project, token, transport = fetch, options = {}) {
       }
       if ((response.status === 429 || response.status >= 500) && attempt < 2) {
         await response.body?.cancel().catch(() => void 0);
-        await delay(1e3 * 2 ** attempt);
+        await delay(
+          Math.min(1e3 * 2 ** attempt, Math.max(1, deadline - Date.now())),
+          void 0,
+          { signal: options.signal }
+        );
         continue;
       }
       throw await httpError(response);
@@ -19314,6 +19371,7 @@ import { dirname as dirname2, join as join3, relative as relative3 } from "path"
 
 // packages/cli/src/prepare.ts
 import { createHash, randomUUID } from "crypto";
+import { parse as parse3 } from "acorn";
 import {
   lstat,
   mkdir,
@@ -19359,7 +19417,7 @@ async function files(root, directory = root, result = []) {
   }
   return result;
 }
-async function prepareMaps(directory, output2, release, prefix = "") {
+async function prepareMaps(directory, output2, release, prefix = "", options = {}) {
   const root = await realpath(directory);
   const destination = join(
     await realpath(dirname(resolve(output2))),
@@ -19367,6 +19425,9 @@ async function prepareMaps(directory, output2, release, prefix = "") {
   );
   const child = relative(root, destination);
   releaseNameSchema.parse(release);
+  if (options.buildId) {
+    buildIdSchema.parse(options.buildId);
+  }
   if (!child || !isAbsolute(child) && child !== ".." && !child.startsWith(`..${sep}`)) {
     throw new Error(
       "Private artifacts must be outside the public build directory"
@@ -19392,7 +19453,7 @@ async function prepareMaps(directory, output2, release, prefix = "") {
       (await regular(join(root, mapPath), SOURCE_MAP_LIMITS.fileBytes)).toString("utf8")
     );
     const source = (await regular(join(root, jsPath), SOURCE_MAP_LIMITS.fileBytes)).toString("utf8");
-    if (map2.version !== 3 || typeof map2.mappings !== "string" || map2.sections || map2.debug_id || source.startsWith(
+    if (map2.version !== 3 || typeof map2.mappings !== "string" || map2.sections || map2.debug_id || source.startsWith("#!") || source.startsWith(
       ";(globalThis.__GETEXCEPTION_DEBUG_IDS__??=Object.create(null))"
     )) {
       throw new Error("Expected a fresh, non-indexed v3 source map");
@@ -19417,12 +19478,29 @@ async function prepareMaps(directory, output2, release, prefix = "") {
       /(?:^|\n)[ \t]*(?:\/\/[#@][ \t]*sourceMappingURL=[^\r\n]*|\/\*[#@][ \t]*sourceMappingURL=[^\r\n]*?\*\/)[ \t]*(?:\r?\n)?$/,
       (comment) => comment.replace(/[^\r\n]/g, " ")
     );
-    const js = `;(globalThis.__GETEXCEPTION_DEBUG_IDS__??=Object.create(null))[import.meta.url]=${JSON.stringify(debugId)};
+    const directives = [];
+    if (options.format === "classic") {
+      const program = parse3(source, {
+        ecmaVersion: "latest",
+        sourceType: "script"
+      });
+      for (const statement of program.body) {
+        if (!("directive" in statement) || typeof statement.directive !== "string") {
+          break;
+        }
+        directives.push(statement.directive);
+      }
+    }
+    const injection = options.format === "classic" ? `${directives.map((value) => JSON.stringify(value) + ";").join("")};(()=>{const s=typeof document!=="undefined"?document.currentScript?.src:undefined;if(s)(globalThis.__GETEXCEPTION_DEBUG_IDS__??=Object.create(null))[s]=${JSON.stringify(debugId)};})();` : `;(globalThis.__GETEXCEPTION_DEBUG_IDS__??=Object.create(null))[import.meta.url]=${JSON.stringify(debugId)};`;
+    const js = `${injection}
 ${body}`;
     prepared.push({ mapPath, jsPath, bytes, js, entry });
   }
   const manifest = sourceUploadSchema.parse({
     release,
+    ...options.buildId ? { buildId: options.buildId } : {},
+    ...options.environment ? { environment: options.environment } : {},
+    ...options.batchIndex !== void 0 ? { batchIndex: options.batchIndex, batchCount: options.batchCount } : {},
     artifacts: prepared.map((item) => item.entry)
   });
   await mkdir(destination, { mode: 448 });
@@ -19472,7 +19550,7 @@ import { lstat as lstat2, readFile as readFile2, readdir as readdir2 } from "fs/
 import { basename as basename2, extname, join as join2, relative as relative2, sep as sep2 } from "path";
 import { brotliDecompress, gunzip } from "zlib";
 import { promisify } from "util";
-import { parse as parse3 } from "acorn";
+import { parse as parse4 } from "acorn";
 import postcss from "postcss";
 var gunzipAsync = promisify(gunzip);
 var brotliAsync = promisify(brotliDecompress);
@@ -19512,7 +19590,7 @@ function hasInlineMap(source, extension) {
     return found2;
   }
   let found = false;
-  parse3(source, {
+  parse4(source, {
     ecmaVersion: "latest",
     sourceType: extension === ".cjs" ? "script" : "module",
     onComment: (_block, comment) => {
@@ -19568,7 +19646,7 @@ async function assertPublicOutput(root, options = {}) {
 
 // packages/cli/src/prepare-build.ts
 var maxBuildMaps = 4096;
-async function prepareBuild(output2, privateRoot, release, signal = AbortSignal.timeout(5 * 6e4)) {
+async function prepareBuild(output2, privateRoot, release, signal = AbortSignal.timeout(5 * 6e4), options = {}) {
   signal.throwIfAborted();
   const paths = await listPublicFiles(output2);
   const maps = paths.filter((file2) => /\.(?:m?js)\.map$/i.test(file2)).sort();
@@ -19618,7 +19696,10 @@ async function prepareBuild(output2, privateRoot, release, signal = AbortSignal.
         await copyFile(file2, copy);
       }
     }
-    await prepareMaps(staging, destination, release);
+    await prepareMaps(staging, destination, release, options.urlPrefix, {
+      ...options,
+      ...options.buildId ? { batchIndex: index, batchCount: batches.length } : {}
+    });
     signal.throwIfAborted();
     for (const map2 of batch) {
       const js = map2.slice(0, -4);
@@ -19676,11 +19757,16 @@ var receiptSchema = external_exports.object({
 var uploadConcurrency = 8;
 var uploadDeadlineMs = 20 * 6e4;
 var gzipAsync = promisify2(gzip);
-async function uploadMaps(directory, address, project, token, transport = fetch) {
-  const manifest = await readPrepared(directory);
+async function uploadMaps(directory, address, project, token, transport = fetch, options = {}) {
+  const prepared = await readPrepared(directory);
+  const manifest = sourceUploadSchema.parse({
+    ...prepared,
+    ...options.environment ? { environment: options.environment } : {}
+  });
   const api = projectApi(address, project, token, transport, {
-    deadlineMs: uploadDeadlineMs,
-    requestTimeoutMs: 6e4
+    deadlineMs: options.deadlineMs ?? uploadDeadlineMs,
+    requestTimeoutMs: 6e4,
+    signal: options.signal
   });
   const request = (path, method = "GET", body, contentEncoding) => api("/source-maps" + path, method, body, contentEncoding);
   const receipt = receiptSchema.parse(
@@ -19728,7 +19814,7 @@ async function uploadMaps(directory, address, project, token, transport = fetch)
     if (result.status === "failed") {
       throw new Error("Source map validation failed; rebuild the artifacts");
     }
-    await delay2(1e3);
+    await delay2(1e3, void 0, { signal: options.signal });
   }
 }
 
@@ -19936,8 +20022,102 @@ async function deployWithGetException(options) {
     }
   }
 }
+
+// packages/cli/src/source-map-delivery.ts
+import { mkdir as mkdir3, realpath as realpath2, readdir as readdir4, rm as rm3 } from "fs/promises";
+import { dirname as dirname3, resolve as resolve2, relative as relative4, isAbsolute as isAbsolute2, sep as sep3, join as join5 } from "path";
+async function prepareSourceMaps(options) {
+  releaseNameSchema.parse(options.release);
+  buildIdSchema.parse(options.buildId);
+  const directory = await realpath2(options.directory);
+  const target = resolve2(options.output);
+  const output2 = join5(
+    await realpath2(dirname3(target)),
+    target.slice(dirname3(target).length + 1)
+  );
+  const child = relative4(directory, output2);
+  if (!child || !isAbsolute2(child) && child !== ".." && !child.startsWith(`..${sep3}`)) {
+    throw new CliError("CLI_CONFIGURATION");
+  }
+  await mkdir3(output2, { mode: 448 });
+  try {
+    const maps = await prepareBuild(
+      directory,
+      output2,
+      options.release,
+      options.signal,
+      options
+    );
+    await assertPublicOutput(directory, {
+      mapsEnabled: true,
+      credentials: options.credentials
+    });
+    await rm3(join5(output2, "work"), { recursive: true });
+    return {
+      directory: maps,
+      release: options.release,
+      buildId: options.buildId
+    };
+  } catch (error61) {
+    await rm3(output2, { recursive: true, force: true });
+    throw error61;
+  }
+}
+async function uploadSourceMaps(options, transport = fetch) {
+  try {
+    options.signal?.throwIfAborted();
+    if (typeof options.token !== "string") {
+      throw new CliError("CLI_CONFIGURATION");
+    }
+    authorizationHeader(options.token);
+    const environment = environmentNameSchema.parse(options.environment);
+    const budget = options.timeoutMs ?? 30 * 6e4;
+    if (!Number.isInteger(budget) || budget < 1e3 || budget > 60 * 6e4) {
+      throw new CliError("CLI_CONFIGURATION");
+    }
+    const deadline = Date.now() + budget;
+    const entries = await readdir4(options.directory, { withFileTypes: true });
+    const batches = entries.filter((entry) => /^batch-[0-9]{3,4}$/.test(entry.name)).sort((a, b) => Number(a.name.slice(6)) - Number(b.name.slice(6)));
+    if (!batches.length || batches.length > 4096 || batches.some((entry) => !entry.isDirectory() || entry.isSymbolicLink()) || batches.length !== entries.length) {
+      throw new CliError("CLI_CONFIGURATION");
+    }
+    const manifests = await Promise.all(
+      batches.map((entry) => readPrepared(join5(options.directory, entry.name)))
+    );
+    const first = manifests[0];
+    if (!first.buildId || manifests.some(
+      (manifest, index) => manifest.buildId !== first.buildId || manifest.release !== first.release || manifest.batchCount !== batches.length || manifest.batchIndex !== index
+    )) {
+      throw new CliError("CLI_CONFIGURATION");
+    }
+    for (const batch of batches) {
+      options.signal?.throwIfAborted();
+      const remaining = deadline - Date.now();
+      if (remaining < 1) {
+        throw new CliError("NETWORK_TIMEOUT");
+      }
+      await uploadMaps(
+        join5(options.directory, batch.name),
+        options.url,
+        options.projectId,
+        options.token,
+        transport,
+        { environment, deadlineMs: remaining, signal: options.signal }
+      );
+    }
+    return { status: "ready", batches: batches.length };
+  } catch (error61) {
+    return {
+      status: "unavailable",
+      diagnostic: formatDiagnostic(error61).trim()
+    };
+  }
+}
 export {
   assertPublicOutput,
   deployWithGetException,
+  prepareSourceMaps,
+  registerRelease,
+  uploadSourceMaps,
   validateGitLabContext
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getexception/cli",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Private source map uploads for GetException",
   "type": "module",
   "license": "MIT",
@@ -31,7 +31,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/GetException/GetException.git",
+    "url": "git+https://gitlab.sndsy.ru/sendsay-ru/frontend/getexception.git",
     "directory": "packages/cli"
   },
   "dependencies": {