runcloud 0.2.164 → 0.2.165

package/dist/commands/deploy.js

@@ -106,6 +106,7 @@ export async function runBundleDeploy(projectId, client, dir, env, allServices,
         secrets: s.secrets,
     }));
     const bundle = await buildDeployBundle({
+        projectId,
         projectDir: dir,
         services: bundleServices,
         run: runCmd,
@@ -144,7 +145,7 @@ export function registerDeploy(program) {
         .option('--region <region>', "Newly server region hint for first-time dev provisioning (defaults to 'auto')", 'auto')
         .option('--project <id>', 'project id (defaults to the linked directory)')
         .option('--service <names>', 'comma-separated service names from backend/newly.services.json')
-        .option('--git-sha <sha>', 'prod git revision to deploy from canonical project code', 'HEAD')
+        .option('--git-sha <sha>', 'legacy prod deploys only; ignored when the project deploys your local backend/ folder', 'HEAD')
         .option('--yes', 'skip the prod confirmation prompt', false)
         .action(async (opts) => {
         try {

package/dist/commands/link.js

@@ -10,6 +10,7 @@ export function registerLink(program) {
         writeProjectLink(dir, {
             projectId,
             pulledSha: existing?.projectId === projectId ? existing.pulledSha : null,
+            pulledBackendHash: existing?.projectId === projectId ? existing.pulledBackendHash : undefined,
             pulledAt: new Date().toISOString(),
         });
         console.log(`Linked ${dir} to project ${projectId}. You can now run \`newly deploy\`, \`newly status\`, etc. here.`);

package/dist/commands/pull.js

@@ -1,7 +1,9 @@
-import { readdirSync } from 'node:fs';
+import { existsSync, readdirSync } from 'node:fs';
+import { join } from 'node:path';
 import { ApiClient, friendlyApiError } from '../api.js';
 import { requireCredentials, resolveProject, writeProjectLink } from '../config.js';
-import { extractSnapshot, pruneStaleTopLevel, snapshotTopLevelEntries } from '../archive.js';
+import { extractSnapshot, listSnapshot, pruneStaleTopLevel, snapshotTopLevelEntries } from '../archive.js';
+import { hashBackendSource } from '../deploy-bundle.js';
 export function assertPullTarget(dir, force) {
     const entries = readdirSync(dir).filter((e) => e !== '.newly');
     if (entries.length > 0 && !force) {
@@ -38,10 +40,12 @@ export function registerPull(program) {
             }
             await extractTarball(data, dir);
             const pulledBranch = res.headers.get('x-newly-branch');
+            const pulledPaths = new Set((await listSnapshot(data)).map((name) => name.replace(/^\.?\//, '')));
             writeProjectLink(dir, {
                 projectId,
                 pulledSha: res.headers.get('x-newly-head-sha'),
                 pulledAt: new Date().toISOString(),
+                pulledBackendHash: existsSync(join(dir, 'backend')) ? hashBackendSource(dir, pulledPaths) : undefined,
             });
             console.log(`Pulled${pulledBranch ? ` branch ${pulledBranch}` : ''} into ${dir} and linked to project ${projectId}.`);
         }

package/dist/deploy-bundle.js

@@ -1,9 +1,11 @@
 import { spawn } from 'node:child_process';
+import { createHash } from 'node:crypto';
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync, } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { Buffer } from 'node:buffer';
 import { create as tarCreate } from 'tar';
+import { readProjectLink } from './config.js';
 export const NEWLY_BACKEND_DEPLOY_BUNDLE_CONTENT_TYPE = 'application/vnd.newly.deploy-bundle+gzip';
 export const NEWLY_BACKEND_DEPLOY_MODE_BUNDLE = 'bundle';
 const MANIFEST_PATH = 'newly-deploy.json';
@@ -17,7 +19,7 @@ export class DeployBuildError extends Error {
     }
 }
 export async function buildDeployBundle(options) {
-    const { projectDir, services, run, log } = options;
+    const { projectId, projectDir, services, run, log } = options;
     const bunVersion = await run('bun', ['--version'], projectDir);
     if (bunVersion.code !== 0) {
         throw new DeployBuildError('newly deploy needs bun on your PATH (https://bun.sh)');
@@ -26,11 +28,11 @@ export async function buildDeployBundle(options) {
     const servicesDir = join(bundleDir, 'services');
     mkdirSync(servicesDir, { recursive: true });
     try {
+        const gitSha = await resolveGitSha(run, projectDir, projectId);
         const manifestServices = [];
         for (const service of services) {
             manifestServices.push(await buildService(service, projectDir, servicesDir, run, log));
         }
-        const gitSha = await resolveGitSha(run, projectDir);
         const manifest = { version: 1, git_sha: gitSha, services: manifestServices };
         writeFileSync(join(bundleDir, MANIFEST_PATH), JSON.stringify(manifest, null, 2));
         const bundle = await tarBundle(bundleDir);
@@ -110,12 +112,40 @@ function stageMigrations(dir, serviceDir, name) {
     }
     return `services/${name}/drizzle`;
 }
-async function resolveGitSha(run, projectDir) {
-    const result = await run('git', ['rev-parse', 'HEAD'], projectDir);
-    if (result.code !== 0)
+async function resolveGitSha(run, projectDir, projectId) {
+    const link = readProjectLink(projectDir);
+    if (link?.projectId === projectId && link.pulledSha && link.pulledBackendHash) {
+        try {
+            if (link.pulledBackendHash === hashBackendSource(projectDir))
+                return link.pulledSha;
+        }
+        catch {
+        }
+    }
+    const head = await run('git', ['rev-parse', 'HEAD'], projectDir);
+    const sha = head.code === 0 ? head.output.trim() : '';
+    if (!sha)
+        return null;
+    const tracked = await run('git', ['ls-files', '--error-unmatch', '--', 'backend'], projectDir);
+    if (tracked.code !== 0)
         return null;
-    const sha = result.output.trim();
-    return sha || null;
+    const changes = await run('git', ['--no-optional-locks', 'status', '--porcelain', '--', 'backend'], projectDir);
+    return changes.code === 0 && changes.output.trim() === '' ? sha : null;
+}
+export function hashBackendSource(projectDir, only) {
+    const digest = (data) => createHash('sha256').update(data).digest('hex');
+    const files = backendSourceFiles(projectDir, 'backend').filter((path) => !only || only.has(path));
+    return digest(files.sort().map((path) => `${path}\0${digest(readFileSync(join(projectDir, path)))}`).join('\n'));
+}
+function backendSourceFiles(projectDir, rel) {
+    return readdirSync(join(projectDir, rel), { withFileTypes: true }).flatMap((entry) => {
+        if (entry.name.startsWith('.') || entry.name === 'node_modules')
+            return [];
+        const path = `${rel}/${entry.name}`;
+        if (entry.isDirectory())
+            return backendSourceFiles(projectDir, path);
+        return entry.isFile() ? [path] : [];
+    });
 }
 async function tarBundle(bundleDir) {
     const chunks = [];

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = '0.2.164';
+export const CLI_VERSION = '0.2.165';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcloud",
-  "version": "0.2.164",
+  "version": "0.2.165",
   "description": "Create and control run.cloud remote mobile simulators and cloud sandboxes",
   "license": "Apache-2.0",
   "keywords": [