refactor: run with retry

Author: jinghaihan

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "cSpell.words": [
+    "yocto"
+  ]
+}

README.md

@@ -41,7 +41,7 @@ For local development, follow the [Visual Studio Marketplace](https://code.visua
 ### Example Workflow
 
 ```yaml
-name: Release
+name: Publish Extension
 
 permissions:
   contents: write
@@ -79,7 +79,7 @@ jobs:
         run: npx vsce package --no-dependencies
 
       # Publish extension to all platforms
-      # Or you can skip publishing to specific platforms in CI and run npx vsxpub locally without configuring secrets
+      # Or skip CI publishing and run `npx vsxpub` locally without configuring secrets
       - name: Publish Extension
         run: npx vsxpub --no-dependencies
         env:

package.json

@@ -62,11 +62,12 @@
     "bumpp": "catalog:cli",
     "eslint": "catalog:lint",
     "lint-staged": "catalog:lint",
+    "p-retry": "catalog:inline",
     "pncat": "catalog:cli",
     "simple-git-hooks": "catalog:lint",
     "taze": "catalog:cli",
     "tsx": "catalog:script",
-    "typescript": "catalog:dev",
+    "typescript": "catalog:tsc",
     "unbuild": "catalog:build",
     "vitest": "catalog:test"
   },

pncat.config.ts

@@ -6,6 +6,10 @@ export default defineConfig({
       name: 'node',
       match: ['yocto-spinner'],
     },
+    {
+      name: 'inline',
+      match: ['p-retry'],
+    },
   ]),
   postRun: 'eslint --fix "**/package.json" "**/pnpm-workspace.yaml"',
 })

pnpm-lock.yaml

@@ -6,8 +6,8 @@ catalogs:
     bumpp: ^10.3.1
     pncat: ^0.7.3
     taze: ^19.8.1
-  dev:
-    typescript: ^5.9.3
+  inline:
+    p-retry: ^7.1.1
   lint:
     '@antfu/eslint-config': ^6.0.0
     eslint: ^9.38.0
@@ -24,6 +24,8 @@ catalogs:
     tsx: ^4.20.6
   test:
     vitest: ^3.2.4
+  tsc:
+    typescript: ^5.9.3
   types:
     '@types/node': ^24.9.1
 onlyBuiltDependencies:

pnpm-workspace.yaml

@@ -1,5 +1,5 @@
 import type { CAC } from 'cac'
-import type { CommandOptions, PublishOptions } from './types'
+import type { CommandOptions, Options } from './types'
 import { existsSync } from 'node:fs'
 import process from 'node:process'
 import c from 'ansis'
@@ -90,7 +90,7 @@ catch (error) {
   process.exit(1)
 }
 
-async function execCommand(cmd: string, args: string[], config: PublishOptions) {
+async function execCommand(cmd: string, args: string[], config: Options) {
   const env = {
     ...process.env,
     GITHUB_TOKEN: config.githubToken,
@@ -101,7 +101,7 @@ async function execCommand(cmd: string, args: string[], config: PublishOptions)
   await execa(cmd, args, { env, stdio: 'inherit' })
 }
 
-async function createPackage(config: PublishOptions) {
+async function createPackage(config: Options) {
   const args = normalizeArgs(['vsce', 'package'], config)
   return await runWithRetry({
     config,
@@ -117,7 +117,7 @@ async function createPackage(config: PublishOptions) {
   })
 }
 
-async function publishToVsce(vsix: string, config: PublishOptions) {
+async function publishToVsce(vsix: string, config: Options) {
   const exec = async (args: string[]) => {
     return await runWithRetry({
       config,
@@ -141,7 +141,7 @@ async function publishToVsce(vsix: string, config: PublishOptions) {
   return await exec(normalizeArgs(['vsce', 'publish'], config))
 }
 
-async function publishToOvsx(vsix: string, config: PublishOptions) {
+async function publishToOvsx(vsix: string, config: Options) {
   const args = normalizeArgs(['ovsx', 'publish', vsix], config)
   return await runWithRetry({
     config,
@@ -157,7 +157,7 @@ async function publishToOvsx(vsix: string, config: PublishOptions) {
   })
 }
 
-async function publishToGit(vsix: string, config: PublishOptions) {
+async function publishToGit(vsix: string, config: Options) {
   const args = ['release', 'upload', config.tag, vsix, '--repo', config.repo, '--clobber']
   return await runWithRetry({
     config,
@@ -173,7 +173,7 @@ async function publishToGit(vsix: string, config: PublishOptions) {
   })
 }
 
-function normalizeArgs(args: string[], options: PublishOptions) {
+function normalizeArgs(args: string[], options: Options) {
   if (!options.dependencies) {
     args.push('--no-dependencies')
   }

src/cli.ts

@@ -1,4 +1,4 @@
-import type { CommandOptions, Platform, PublishOptions } from './types'
+import type { CommandOptions, Options, Platform } from './types'
 import process from 'node:process'
 import c from 'ansis'
 import { createConfigLoader } from 'unconfig'
@@ -14,7 +14,7 @@ function normalizeConfig(options: Partial<CommandOptions>) {
   return options
 }
 
-export async function resolveConfig(options: Partial<CommandOptions>): Promise<PublishOptions> {
+export async function resolveConfig(options: Partial<CommandOptions>): Promise<Options> {
   const defaults = { ...DEFAULT_PUBLISH_OPTIONS }
   options = normalizeConfig(options)
 
@@ -80,5 +80,5 @@ export async function resolveConfig(options: Partial<CommandOptions>): Promise<P
     }
   }
 
-  return config as PublishOptions
+  return config as Options
 }

src/config.ts

@@ -1 +1,8 @@
-export {}
+import type { Options } from './types'
+
+export * from './constants'
+export * from './types'
+
+export function defineConfig(config: Partial<Options>) {
+  return config
+}

src/index.ts

@@ -67,4 +67,4 @@ export interface CommandOptions extends CommonOptions {
   ovsxPat?: string
 }
 
-export type PublishOptions = Required<CommandOptions>
+export type Options = Required<CommandOptions>