@hypequery/cli 1.9.0 → 1.9.1

package/dist/utils/deployment-bundle.d.ts

@@ -1,6 +1,8 @@
 import { type PreparedProtocolDeploymentContract, type ProtocolDeploymentBundleManifest, type ProtocolDeploymentContract } from '@hypequery/protocol';
-export declare const DEPLOYMENT_BUNDLE_MANIFEST = "bundle.json";
-export declare const DEPLOYMENT_BUNDLE_CONTRACT = "deployment.json";
+import { DEPLOYMENT_BUNDLE_CONTRACT, DEPLOYMENT_BUNDLE_MANIFEST, verifyDeploymentBundle } from '@hypequery/deployment';
+import type { VerifiedDeploymentBundle } from '@hypequery/deployment';
+export { DEPLOYMENT_BUNDLE_CONTRACT, DEPLOYMENT_BUNDLE_MANIFEST, verifyDeploymentBundle, };
+export type { VerifiedDeploymentBundle };
 export interface DeploymentBundleRuntimeFile {
     readonly runtime: 'node' | 'python';
     readonly sha256: string;
@@ -12,8 +14,6 @@ export interface WrittenDeploymentBundle {
     readonly identity: string;
     readonly contract: ProtocolDeploymentContract;
 }
-export type VerifiedDeploymentBundle = WrittenDeploymentBundle;
 export declare function writeDeploymentBundle(outputDirectory: string, prepared: PreparedProtocolDeploymentContract, runtimeFiles: readonly DeploymentBundleRuntimeFile[]): Promise<WrittenDeploymentBundle>;
 export declare function readDeploymentRuntimeFile(filePath: string): Promise<Uint8Array>;
-export declare function verifyDeploymentBundle(bundleDirectory: string): Promise<VerifiedDeploymentBundle>;
 //# sourceMappingURL=deployment-bundle.d.ts.map

package/dist/utils/deployment-bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment-bundle.d.ts","sourceRoot":"","sources":["../../src/utils/deployment-bundle.ts"],"names":[],"mappings":"AAaA,OAAO,EAIL,KAAK,kCAAkC,EAEvC,KAAK,gCAAgC,EACrC,KAAK,0BAA0B,EAChC,MAAM,qBAAqB,CAAC;AAG7B,eAAO,MAAM,0BAA0B,gBAAgB,CAAC;AACxD,eAAO,MAAM,0BAA0B,oBAAoB,CAAC;AAE5D,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,CAAC;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,0BAA0B,CAAC;CAC/C;AAED,MAAM,MAAM,wBAAwB,GAAG,uBAAuB,CAAC;AA+F/D,wBAAsB,qBAAqB,CACzC,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,kCAAkC,EAC5C,YAAY,EAAE,SAAS,2BAA2B,EAAE,GACnD,OAAO,CAAC,uBAAuB,CAAC,CA6ElC;AAgDD,wBAAsB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAMrF;AA+FD,wBAAsB,sBAAsB,CAC1C,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC,CA+DnC"}
+{"version":3,"file":"deployment-bundle.d.ts","sourceRoot":"","sources":["../../src/utils/deployment-bundle.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,KAAK,kCAAkC,EACvC,KAAK,gCAAgC,EACrC,KAAK,0BAA0B,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAGtE,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,sBAAsB,GACvB,CAAC;AACF,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAEzC,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,CAAC;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,0BAA0B,CAAC;CAC/C;AA+FD,wBAAsB,qBAAqB,CACzC,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,kCAAkC,EAC5C,YAAY,EAAE,SAAS,2BAA2B,EAAE,GACnD,OAAO,CAAC,uBAAuB,CAAC,CA6ElC;AAoCD,wBAAsB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAMrF"}

package/dist/utils/deployment-bundle.js

@@ -1,11 +1,10 @@
 import { createHash, randomUUID } from 'node:crypto';
-import { constants, lstat, mkdir, mkdtemp, open, readdir, rename, rm, writeFile, } from 'node:fs/promises';
+import { constants, lstat, mkdir, mkdtemp, open, rename, rm, writeFile, } from 'node:fs/promises';
 import path from 'node:path';
-import { DEFAULT_PROTOCOL_DEPLOYMENT_BUNDLE_LIMITS, prepareProtocolDeploymentBundleManifest, prepareProtocolDeploymentContract, } from '@hypequery/protocol';
+import { DEFAULT_PROTOCOL_DEPLOYMENT_BUNDLE_LIMITS, prepareProtocolDeploymentBundleManifest, } from '@hypequery/protocol';
+import { DEPLOYMENT_BUNDLE_CONTRACT, DEPLOYMENT_BUNDLE_MANIFEST, verifyDeploymentBundle, } from '@hypequery/deployment';
 import { logger } from './logger.js';
-export const DEPLOYMENT_BUNDLE_MANIFEST = 'bundle.json';
-export const DEPLOYMENT_BUNDLE_CONTRACT = 'deployment.json';
-const utf8Decoder = new TextDecoder('utf-8', { fatal: true });
+export { DEPLOYMENT_BUNDLE_CONTRACT, DEPLOYMENT_BUNDLE_MANIFEST, verifyDeploymentBundle, };
 const utf8Encoder = new TextEncoder();
 function sha256(bytes) {
     return createHash('sha256').update(bytes).digest('hex');
@@ -185,138 +184,6 @@ async function readBoundedAbsoluteRegularFile(absolutePath, displayPath, maximum
         await handle?.close();
     }
 }
-async function readBoundedRegularFile(root, relativePath, maximum) {
-    return readBoundedAbsoluteRegularFile(path.join(root, ...relativePath.split('/')), relativePath, maximum);
-}
 export async function readDeploymentRuntimeFile(filePath) {
     return readBoundedAbsoluteRegularFile(path.resolve(filePath), filePath, DEFAULT_PROTOCOL_DEPLOYMENT_BUNDLE_LIMITS.maxArtifactBytes);
 }
-function expectedDirectories(files) {
-    const result = new Set();
-    for (const file of files) {
-        const segments = file.split('/');
-        for (let index = 1; index < segments.length; index += 1) {
-            result.add(segments.slice(0, index).join('/'));
-        }
-    }
-    return result;
-}
-async function verifyExactEntries(root, manifest) {
-    const expectedFiles = new Set([
-        DEPLOYMENT_BUNDLE_MANIFEST,
-        manifest.deployment.path,
-        ...manifest.artifacts.map(artifact => artifact.path),
-    ]);
-    const expectedDirectoryPaths = expectedDirectories([...expectedFiles]);
-    const seenFiles = new Set();
-    const seenDirectories = new Set();
-    async function visit(relativeDirectory) {
-        const absoluteDirectory = relativeDirectory
-            ? path.join(root, ...relativeDirectory.split('/'))
-            : root;
-        const names = await readdir(absoluteDirectory);
-        names.sort();
-        for (const name of names) {
-            const relativePath = relativeDirectory ? `${relativeDirectory}/${name}` : name;
-            const stat = await lstat(path.join(absoluteDirectory, name));
-            if (stat.isSymbolicLink()) {
-                throw new Error(`Bundle entries must not be symbolic links: ${relativePath}`);
-            }
-            if (stat.isDirectory()) {
-                if (!expectedDirectoryPaths.has(relativePath)) {
-                    throw new Error(`Deployment bundle contains an undeclared directory: ${relativePath}`);
-                }
-                seenDirectories.add(relativePath);
-                await visit(relativePath);
-            }
-            else if (stat.isFile()) {
-                if (!expectedFiles.has(relativePath)) {
-                    throw new Error(`Deployment bundle contains an undeclared file: ${relativePath}`);
-                }
-                seenFiles.add(relativePath);
-            }
-            else {
-                throw new Error(`Bundle entry is not a regular file or directory: ${relativePath}`);
-            }
-        }
-    }
-    await visit('');
-    const missingFiles = [...expectedFiles].filter(file => !seenFiles.has(file)).sort();
-    if (missingFiles.length > 0) {
-        throw new Error(`Deployment bundle is missing files: ${missingFiles.join(', ')}`);
-    }
-    const missingDirectories = [...expectedDirectoryPaths]
-        .filter(directory => !seenDirectories.has(directory))
-        .sort();
-    if (missingDirectories.length > 0) {
-        throw new Error(`Deployment bundle is missing directories: ${missingDirectories.join(', ')}`);
-    }
-}
-function verifyFile(bytes, file) {
-    if (bytes.byteLength !== file.byteLength) {
-        throw new Error(`Bundle entry byte length does not match the manifest: ${file.path}`);
-    }
-    if (sha256(bytes) !== file.sha256) {
-        throw new Error(`Bundle entry SHA-256 does not match the manifest: ${file.path}`);
-    }
-}
-function verifyRuntimeReferences(contract, artifacts) {
-    requireClosedContractArtifactSet(contract);
-    const declared = new Map(contract.artifacts.map(artifact => [artifact.artifactSha256, artifact.runtime]));
-    if (declared.size !== artifacts.length) {
-        throw new Error('Bundle runtime artifacts do not match the deployment contract.');
-    }
-    for (const artifact of artifacts) {
-        if (declared.get(artifact.sha256) !== artifact.runtime) {
-            throw new Error(`Bundle artifact ${artifact.sha256} does not match a deployment runtime reference.`);
-        }
-    }
-}
-export async function verifyDeploymentBundle(bundleDirectory) {
-    const root = path.resolve(bundleDirectory);
-    const rootStat = await lstat(root);
-    if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) {
-        throw new Error(`Deployment bundle path must be a regular directory: ${bundleDirectory}`);
-    }
-    const manifestBytes = await readBoundedRegularFile(root, DEPLOYMENT_BUNDLE_MANIFEST, 1024 * 1024);
-    let input;
-    try {
-        input = JSON.parse(utf8Decoder.decode(manifestBytes));
-    }
-    catch (error) {
-        throw new Error(`Invalid deployment bundle manifest: ${path.join(root, DEPLOYMENT_BUNDLE_MANIFEST)}\n\n`
-            + (error instanceof Error ? error.message : String(error)));
-    }
-    const preparedManifest = prepareProtocolDeploymentBundleManifest(input);
-    const expectedManifestBytes = utf8Encoder.encode(`${preparedManifest.canonical}\n`);
-    if (!Buffer.from(manifestBytes).equals(Buffer.from(expectedManifestBytes))) {
-        throw new Error('Deployment bundle manifest must contain canonical JSON followed by one newline.');
-    }
-    await verifyExactEntries(root, preparedManifest.manifest);
-    const deployment = preparedManifest.manifest.deployment;
-    const deploymentBytes = await readBoundedRegularFile(root, deployment.path, DEFAULT_PROTOCOL_DEPLOYMENT_BUNDLE_LIMITS.maxDeploymentBytes);
-    verifyFile(deploymentBytes, deployment);
-    let contractInput;
-    try {
-        contractInput = JSON.parse(utf8Decoder.decode(deploymentBytes));
-    }
-    catch (error) {
-        throw new Error(`Invalid deployment JSON in bundle: ${deployment.path}\n\n`
-            + (error instanceof Error ? error.message : String(error)));
-    }
-    const preparedContract = prepareProtocolDeploymentContract(contractInput);
-    if (preparedContract.identity !== deployment.identity) {
-        throw new Error('Deployment identity does not match the bundle manifest.');
-    }
-    for (const artifact of preparedManifest.manifest.artifacts) {
-        const bytes = await readBoundedRegularFile(root, artifact.path, DEFAULT_PROTOCOL_DEPLOYMENT_BUNDLE_LIMITS.maxArtifactBytes);
-        verifyFile(bytes, artifact);
-    }
-    verifyRuntimeReferences(preparedContract.contract, preparedManifest.manifest.artifacts);
-    return Object.freeze({
-        directory: root,
-        manifest: preparedManifest.manifest,
-        identity: preparedManifest.identity,
-        contract: preparedContract.contract,
-    });
-}

package/dist/utils/deployment-upload.d.ts

@@ -1,19 +1,14 @@
 import type { ReadableStream } from 'node:stream/web';
 import { type PreparedProtocolDeploymentReleaseEnvelope } from '@hypequery/protocol';
 import { type VerifiedDeploymentBundle } from './deployment-bundle.js';
+import type { DeploymentSubmissionResponse } from '@hypequery/deployment';
+export type { DeploymentSubmissionResponse } from '@hypequery/deployment';
 export type DeploymentUploadErrorCode = 'HQ_UPLOAD_CONFIGURATION' | 'HQ_UPLOAD_IDENTITY_MISMATCH' | 'HQ_UPLOAD_BUNDLE_CHANGED' | 'HQ_UPLOAD_NETWORK' | 'HQ_UPLOAD_REJECTED' | 'HQ_UPLOAD_INVALID_RESPONSE';
 export declare class DeploymentUploadError extends Error {
     readonly code: DeploymentUploadErrorCode;
     readonly status?: number;
     constructor(code: DeploymentUploadErrorCode, message: string, status?: number);
 }
-export interface DeploymentSubmissionResponse {
-    readonly kind: 'hypequery-deployment-submission';
-    readonly version: 1;
-    readonly status: 'accepted' | 'already-exists';
-    readonly releaseIdentity: string;
-    readonly bundleIdentity: string;
-}
 export interface DeploymentHttpResponse {
     readonly ok: boolean;
     readonly status: number;

package/dist/utils/deployment-upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment-upload.d.ts","sourceRoot":"","sources":["../../src/utils/deployment-upload.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAIL,KAAK,yCAAyC,EAC/C,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,wBAAwB,CAAC;AAQhC,MAAM,MAAM,yBAAyB,GACjC,yBAAyB,GACzB,6BAA6B,GAC7B,0BAA0B,GAC1B,mBAAmB,GACnB,oBAAoB,GACpB,4BAA4B,CAAC;AAEjC,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;gBAEb,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;CAM9E;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,IAAI,EAAE,iCAAiC,CAAC;IACjD,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,CAAC;IAC/C,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B;AAED,MAAM,MAAM,eAAe,GAAG,CAC5B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,mBAAmB,KACtB,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAErC,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,CACJ,MAAM,EAAE,wBAAwB,EAChC,OAAO,EAAE,yCAAyC,GACjD,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C;AAmVD,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,oCAAoC,GAC5C,yBAAyB,CAsF3B"}
+{"version":3,"file":"deployment-upload.d.ts","sourceRoot":"","sources":["../../src/utils/deployment-upload.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAIL,KAAK,yCAAyC,EAC/C,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAE1E,YAAY,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAQ1E,MAAM,MAAM,yBAAyB,GACjC,yBAAyB,GACzB,6BAA6B,GAC7B,0BAA0B,GAC1B,mBAAmB,GACnB,oBAAoB,GACpB,4BAA4B,CAAC;AAEjC,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;gBAEb,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;CAM9E;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B;AAED,MAAM,MAAM,eAAe,GAAG,CAC5B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,mBAAmB,KACtB,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAErC,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,CACJ,MAAM,EAAE,wBAAwB,EAChC,OAAO,EAAE,yCAAyC,GACjD,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C;AAmVD,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,oCAAoC,GAC5C,yBAAyB,CAsF3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Command-line interface for hypequery",
   "license": "Apache-2.0",
   "type": "module",
@@ -19,7 +19,8 @@
     "open": "^10.0.0",
     "ora": "^8.0.1",
     "prompts": "^2.4.2",
-    "@hypequery/protocol": "0.5.0"
+    "@hypequery/deployment": "0.2.0",
+    "@hypequery/protocol": "0.6.0"
   },
   "peerDependencies": {
     "@hypequery/clickhouse": "*",
@@ -37,7 +38,7 @@
     "typescript": "^5.7.3",
     "vitest": "^3.2.6",
     "@hypequery/clickhouse": "2.4.0",
-    "@hypequery/serve": "0.13.2"
+    "@hypequery/serve": "0.13.3"
   },
   "repository": {
     "type": "git",