@happier-dev/relay-server 0.2.6-dev.1778098335.1 → 0.2.11-preview.2

package/bin/happier-server.mjs

@@ -5,10 +5,10 @@ import { join } from 'node:path';
 import { spawn } from 'node:child_process';
 
 import { resolveServerReleaseAssets, resolveUiWebReleaseAssets } from '../src/releaseAssets.mjs';
+import { extractReleaseArchiveIntoCache } from '../src/archiveCache.mjs';
 import { resolveRunnerCacheRoot, resolveServerRunnerTarget } from '../src/target.mjs';
 import { parseRunnerInvocation } from '../src/runnerConfig.mjs';
 import { downloadVerifiedReleaseAssetBundle } from '@happier-dev/release-runtime/verifiedDownload';
-import { planArchiveExtraction } from '@happier-dev/release-runtime/extractPlan';
 import { fetchGitHubReleaseByTag } from '@happier-dev/release-runtime/github';
 
 const OWNER = 'happier-dev';
@@ -80,18 +80,10 @@ async function main() {
         userAgent: 'happier-server-runner',
       });
 
-      const plan = planArchiveExtraction({
+      await extractReleaseArchiveIntoCache({
         archiveName: downloaded.archiveName,
         archivePath: downloaded.archivePath,
-        destDir: cacheDir,
-        os: target.os,
-      });
-
-      // Extract archive into cache (archive root contains the artifactStem folder).
-      const extract = spawn(plan.command.cmd, plan.command.args, { stdio: 'inherit' });
-      await new Promise((resolve, reject) => {
-        extract.on('error', reject);
-        extract.on('exit', (code) => (code === 0 ? resolve() : reject(new Error(`${plan.command.cmd} exited with ${code}`))));
+        cacheDir,
       });
     }
 
@@ -100,7 +92,7 @@ async function main() {
     }
 
     const childEnv = { ...process.env };
-    if (withUiWeb && !String(process.env.HAPPIER_SERVER_UI_DIR ?? '').trim()) {
+    if (withUiWeb && !String(process.env.HAPPIER_SERVER_UI_DIR ?? '').trim() && uiWebTag) {
       const uiRelease = await fetchGitHubReleaseByTag({
         githubRepo,
         tag: uiWebTag,
@@ -127,17 +119,10 @@ async function main() {
           userAgent: 'happier-server-runner',
         });
 
-        const uiPlan = planArchiveExtraction({
+        await extractReleaseArchiveIntoCache({
           archiveName: uiDownloaded.archiveName,
           archivePath: uiDownloaded.archivePath,
-          destDir: uiCacheDir,
-          os: target.os,
-        });
-
-        const extractUi = spawn(uiPlan.command.cmd, uiPlan.command.args, { stdio: 'inherit' });
-        await new Promise((resolve, reject) => {
-          extractUi.on('error', reject);
-          extractUi.on('exit', (code) => (code === 0 ? resolve() : reject(new Error(`${uiPlan.command.cmd} exited with ${code}`))));
+          cacheDir: uiCacheDir,
         });
       }
 
@@ -146,6 +131,13 @@ async function main() {
       }
 
       childEnv.HAPPIER_SERVER_UI_DIR = uiDir;
+    } else if (withUiWeb && !String(process.env.HAPPIER_SERVER_UI_DIR ?? '').trim()) {
+      const embeddedUiDir = join(serverDir, 'ui-web', 'current');
+      const embeddedUiIndex = join(embeddedUiDir, 'index.html');
+      if (!(await pathExists(embeddedUiIndex))) {
+        fail(`Embedded ui web bundle not found at ${embeddedUiIndex}`);
+      }
+      childEnv.HAPPIER_SERVER_UI_DIR = embeddedUiDir;
     }
 
     const child = spawn(serverBin, positionals, { stdio: 'inherit', env: childEnv });

package/node_modules/@happier-dev/release-runtime/dist/archiveExtraction.d.ts

@@ -0,0 +1,38 @@
+export type ArchiveExtractionLimits = Readonly<{
+    maxArchiveBytes: number;
+    maxEntries: number;
+    maxFiles: number;
+    maxFileBytes: number;
+    maxExpandedBytes: number;
+    maxCompressionRatio: number;
+    timeoutMs: number;
+}>;
+export declare const DEFAULT_ARCHIVE_EXTRACTION_LIMITS: ArchiveExtractionLimits;
+export declare const FIRST_PARTY_RELEASE_ARCHIVE_EXTRACTION_LIMITS: ArchiveExtractionLimits;
+type ArchiveEntryKind = 'directory' | 'file';
+export type InspectedTarArchiveEntry = Readonly<{
+    path: string;
+    kind: ArchiveEntryKind;
+    mode: number | null;
+    uid: number | null;
+    gid: number | null;
+}>;
+type TarLinkPolicy = 'reject' | 'skip';
+export declare function inspectTarArchiveEntries(params: Readonly<{
+    archivePath: string;
+    limits?: Partial<ArchiveExtractionLimits>;
+    signal?: AbortSignal;
+}>): Promise<readonly InspectedTarArchiveEntry[]>;
+export type ArchiveExtractionParams = Readonly<{
+    allowedEntryRoots?: readonly string[];
+    archivePath: string;
+    archiveName: string;
+    extractDir: string;
+    limits?: Partial<ArchiveExtractionLimits>;
+    signal?: AbortSignal;
+    tarLinkPolicy?: TarLinkPolicy;
+}>;
+export declare function extractFirstPartyReleaseArchiveToDirectory(params: ArchiveExtractionParams): Promise<void>;
+export declare function extractArchivePayloadToDirectory(params: ArchiveExtractionParams): Promise<void>;
+export {};
+//# sourceMappingURL=archiveExtraction.d.ts.map

package/node_modules/@happier-dev/release-runtime/dist/archiveExtraction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"archiveExtraction.d.ts","sourceRoot":"","sources":["../src/archiveExtraction.ts"],"names":[],"mappings":"AAkBA,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,eAAO,MAAM,iCAAiC,EAAE,uBAQ9C,CAAC;AAKH,eAAO,MAAM,6CAA6C,EAAE,uBAO1D,CAAC;AAEH,KAAK,gBAAgB,GAAG,WAAW,GAAG,MAAM,CAAC;AAsJ7C,MAAM,MAAM,wBAAwB,GAAG,QAAQ,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB,CAAC,CAAC;AA8HH,KAAK,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC;AA6DvC,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC9D,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC,GAAG,OAAO,CAAC,SAAS,wBAAwB,EAAE,CAAC,CA+ChD;AA47BD,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC,CAAC;AAEH,wBAAsB,0CAA0C,CAC9D,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA4Ff"}