@git.zone/tsdeploy 0.2.0 → 0.4.0

package/ts/cli.ts

@@ -6,6 +6,40 @@ const getStringArg = (argvArg: any, keyArg: string): string | undefined => {
   return typeof value === 'string' && value.trim() ? value.trim() : undefined;
 };
 
+const getStringArgByKeys = (argvArg: any, keysArg: string[]): string | undefined => {
+  for (const key of keysArg) {
+    const value = getStringArg(argvArg, key);
+    if (value) return value;
+  }
+  return undefined;
+};
+
+const getBooleanArgByKeys = (argvArg: any, keysArg: string[]): boolean => {
+  for (const key of keysArg) {
+    const value = argvArg[key];
+    if (value === true) return true;
+    if (typeof value === 'string' && ['1', 'true', 'yes'].includes(value.toLowerCase())) return true;
+  }
+  return false;
+};
+
+const getNumberArgByKeys = (argvArg: any, keysArg: string[]): number | undefined => {
+  let rawValue: string | number | undefined;
+  for (const key of keysArg) {
+    const value = argvArg[key];
+    if (typeof value === 'number' || (typeof value === 'string' && value.trim())) {
+      rawValue = value;
+      break;
+    }
+  }
+  if (rawValue === undefined) return undefined;
+  const parsed = Number(rawValue);
+  if (!Number.isFinite(parsed) || parsed < 0) {
+    throw new Error(`Expected a non-negative number for --${keysArg[0]}.`);
+  }
+  return parsed;
+};
+
 const printJson = (valueArg: unknown): void => {
   console.log(JSON.stringify(valueArg, null, 2));
 };
@@ -78,6 +112,26 @@ const runDoctor = async (): Promise<void> => {
   printJson(await createTsDeploy().doctor());
 };
 
+const runDeploy = async (argvArg: any): Promise<void> => {
+  const tsDeploy = createTsDeploy();
+  const result = await tsDeploy.deploy({
+    dryRun: getBooleanArgByKeys(argvArg, ['dryRun', 'dry-run']),
+    allowDirty: getBooleanArgByKeys(argvArg, ['allowDirty', 'allow-dirty']),
+    skipChecks: getBooleanArgByKeys(argvArg, ['skipChecks', 'skip-checks']),
+    skipPush: getBooleanArgByKeys(argvArg, ['skipPush', 'skip-push']),
+    tag: getStringArg(argvArg, 'tag'),
+    image: getStringArg(argvArg, 'image'),
+    platform: getStringArg(argvArg, 'platform'),
+    builder: getStringArg(argvArg, 'builder'),
+    verifyUrl: getStringArgByKeys(argvArg, ['verifyUrl', 'verify-url']),
+    waitSeconds: getNumberArgByKeys(argvArg, ['waitSeconds', 'wait-seconds']),
+    token: getStringArg(argvArg, 'token'),
+    username: getStringArg(argvArg, 'username'),
+    password: getStringArg(argvArg, 'password'),
+  });
+  printJson(result);
+};
+
 const printHelp = (): void => {
   console.log(`
 Usage: tsdeploy <command> [options]
@@ -89,10 +143,13 @@ Commands:
   status
   doctor
   plan
+  deploy [--dryRun] [--allowDirty] [--skipChecks] [--skipPush] [--tag <tag>] [--platform <platform>] [--builder <name>]
+         [--verifyUrl <url>] [--waitSeconds <seconds>] [--token <token>]
 
 Notes:
   tsdeploy stores only the project pointer in .nogit/tsdeploy.json.
-  Remote deployment mutations are disabled until Cloudly/Onebox APIs are verified.
+  Cloudly workload deployment builds and pushes the linked OCI image after validating deployOnPush.
+  Onebox deployment mutations are not implemented yet.
 `);
 };
 
@@ -112,6 +169,7 @@ export const runCli = async (): Promise<void> => {
   cli.addCommand('status').subscribe(runStatus);
   cli.addCommand('doctor').subscribe(runDoctor);
   cli.addCommand('plan').subscribe(runPlan);
+  cli.addCommand('deploy').subscribe(runDeploy);
   cli.addCommand('help').subscribe(async () => printHelp());
   cli.startParse(getSmartcliArgv());
 };

package/ts/plugins.ts

@@ -1,13 +1,25 @@
 // node native scope
 import * as fs from 'node:fs/promises';
 import * as fsSync from 'node:fs';
+import * as childProcess from 'node:child_process';
+import * as crypto from 'node:crypto';
 import * as os from 'node:os';
 import * as path from 'node:path';
 
-export { fs, fsSync, os, path };
+export { fs, fsSync, childProcess, crypto, os, path };
+
+// @api.global scope
+import * as typedrequest from '@api.global/typedrequest';
+
+export { typedrequest };
 
 // @push.rocks scope
 import * as smartcli from '@push.rocks/smartcli';
 import * as smartconfig from '@push.rocks/smartconfig';
 
 export { smartcli, smartconfig };
+
+// @serve.zone scope
+import * as servezoneInterfaces from '@serve.zone/interfaces';
+
+export { servezoneInterfaces };

package/ts/types.ts

@@ -48,7 +48,7 @@ export interface ITsDeployStatus {
 }
 
 export interface ITsDeployPlanAction {
-  type: 'inspect' | 'noop';
+  type: 'inspect' | 'deploy' | 'noop';
   title: string;
   description: string;
 }
@@ -56,7 +56,7 @@ export interface ITsDeployPlanAction {
 export interface ITsDeployPlan {
   schemaVersion: 1;
   projectDir: string;
-  mutationAllowed: false;
+  mutationAllowed: boolean;
   summary: string;
   profile?: string;
   deploymentId?: string;
@@ -76,3 +76,88 @@ export interface ITsDeployDoctorResult {
   checks: ITsDeployDoctorCheck[];
   warnings: string[];
 }
+
+export interface ITsDeployCommandRunOptions {
+  command: string;
+  args: string[];
+  cwd: string;
+  env?: Record<string, string | undefined>;
+  timeoutMs?: number;
+  maxOutputBytes?: number;
+}
+
+export interface ITsDeployCommandRunResult {
+  command: string;
+  args: string[];
+  exitCode: number;
+  stdout: string;
+  stderr: string;
+}
+
+export interface ITsDeployDeployOptions {
+  dryRun?: boolean;
+  allowDirty?: boolean;
+  skipChecks?: boolean;
+  skipPush?: boolean;
+  tag?: string;
+  image?: string;
+  platform?: string;
+  builder?: string;
+  verifyUrl?: string;
+  waitSeconds?: number;
+  token?: string;
+  username?: string;
+  password?: string;
+}
+
+export interface ITsDeployDeployStep {
+  name: string;
+  status: 'skipped' | 'passed' | 'failed';
+  message: string;
+}
+
+export interface ITsDeployCloudlyServiceSummary {
+  serviceId: string;
+  serviceName: string;
+  deployOnPush: boolean;
+  registryTarget?: {
+    registryHost?: string;
+    repository?: string;
+    tag?: string;
+    imageUrl?: string;
+  };
+}
+
+export interface ITsDeployDeploymentSummary {
+  deploymentId: string;
+  serviceId: string;
+  serviceName?: string;
+  status: string;
+  healthStatus?: string;
+  nodeName?: string;
+  version?: string;
+  containerId?: string;
+  deployedAt?: number;
+  updatedAt?: number;
+}
+
+export interface ITsDeployDeployResult {
+  schemaVersion: 1;
+  projectDir: string;
+  profile: string;
+  serviceId: string;
+  deploymentId?: string;
+  dryRun: boolean;
+  image: string;
+  tag: string;
+  platform: string;
+  pushed: boolean;
+  triggered: boolean;
+  verified: boolean;
+  digest?: string;
+  verifyStatus?: number;
+  service?: ITsDeployCloudlyServiceSummary;
+  deployments: ITsDeployDeploymentSummary[];
+  steps: ITsDeployDeployStep[];
+  warnings: string[];
+}