@pippit-dev/cli 0.0.27 → 0.0.28

package/checksums.txt

@@ -1,6 +1,6 @@
-3e95e8bbd667579fa1feddd4c58e583d70003f0f179d7249135b883a612165e5  pippit-tool-cli-0.0.27-darwin-amd64.tar.gz
-15671a5880feff8a67bd0c8042ab7e2a77d1ea7c81ed6625427bdd472d925c6a  pippit-tool-cli-0.0.27-darwin-arm64.tar.gz
-aef2fc4896d2c8966f681a82e5bd624b9ec9f0382e23dd05776f014cbb65473d  pippit-tool-cli-0.0.27-linux-amd64.tar.gz
-5b01a760298c22a6fd42661f212f9f1d1e822e84d1feb87307c36590f795515a  pippit-tool-cli-0.0.27-linux-arm64.tar.gz
-18315d247bb409f594d11e64cb2292ffbf48504d73290011f5c5a2ba319f93df  pippit-tool-cli-0.0.27-windows-amd64.zip
-31284208bc244d9d48066c8e7086bf40e167209fff106ea6462c9638cbd6efef  pippit-tool-cli-0.0.27-windows-arm64.zip
+91f6452453768a4af724e7f478c1d5834b117dfd57545eb28f79838bcefee72c  pippit-tool-cli-0.0.28-darwin-amd64.tar.gz
+72784be227214d5821793241ec19c0d41227cbcf1bf10b8d8a3675b8a1093219  pippit-tool-cli-0.0.28-darwin-arm64.tar.gz
+1b7197befef5930b91816a1021a7ab66b9f3d95c0cbd5b0ba5fea20c1a7a1173  pippit-tool-cli-0.0.28-linux-amd64.tar.gz
+2452ba5f9dc74b516af47e4e4620cfcc247ffe0b2d46a847681910442535f62b  pippit-tool-cli-0.0.28-linux-arm64.tar.gz
+bdb744c4e3cc57774c97148665ba99a6952fd4a1293902728e16a655544b20dc  pippit-tool-cli-0.0.28-windows-amd64.zip
+52e660a8b334067fa056021dcf68f1bb13a0385f6792a45b93277463cd583200  pippit-tool-cli-0.0.28-windows-arm64.zip

package/cmd/update/update.go

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/Pippit-dev/pippit-cli/internal/version"
@@ -23,6 +24,7 @@ const (
 	defaultTelemetryBaseURL = "https://xyq.jianying.com"
 	telemetryPath           = "/api/biz/v1/skill/report_telemetry"
 	telemetryAuthHeader     = "Bearer pippit-cli-skill-telemetry"
+	telemetryWaitTimeout    = time.Second
 )
 
 var legacyGlobalSkills = []string{
@@ -35,7 +37,7 @@ var telemetrySkillNames = []string{
 	"xyq-short-drama-skill",
 }
 
-var telemetryHTTPClient = &http.Client{Timeout: 2 * time.Second}
+var telemetryHTTPClient = &http.Client{Timeout: telemetryWaitTimeout}
 
 // NewCommand builds the update command.
 func NewCommand(stdout, stderr io.Writer) *cobra.Command {
@@ -137,6 +139,7 @@ func reportBundledSkillTelemetry(event string, source string, stderr io.Writer)
 	if os.Getenv("PIPPIT_CLI_DISABLE_TELEMETRY") == "1" {
 		return
 	}
+	var wg sync.WaitGroup
 	for _, skillName := range telemetrySkillNames {
 		payload := telemetryPayload{
 			Event:      event,
@@ -146,12 +149,23 @@ func reportBundledSkillTelemetry(event string, source string, stderr io.Writer)
 			Platform:   runtime.GOOS,
 			Arch:       runtime.GOARCH,
 		}
+		wg.Add(1)
 		go func(payload telemetryPayload) {
+			defer wg.Done()
 			if err := reportSkillTelemetry(payload); err != nil && os.Getenv("PIPPIT_CLI_DEBUG_TELEMETRY") == "1" {
 				fmt.Fprintf(stderr, "[pippit-tool-cli] telemetry failed: %v\n", err)
 			}
 		}(payload)
 	}
+	done := make(chan struct{})
+	go func() {
+		wg.Wait()
+		close(done)
+	}()
+	select {
+	case <-done:
+	case <-time.After(telemetryWaitTimeout):
+	}
 }
 
 func reportSkillTelemetry(payload telemetryPayload) error {

package/cmd/update/update_test.go

@@ -10,6 +10,7 @@ import (
 	"runtime"
 	"strings"
 	"testing"
+	"time"
 )
 
 func TestInstallSkillsInstallsAllBundledSkills(t *testing.T) {
@@ -117,6 +118,47 @@ func TestReportSkillTelemetry(t *testing.T) {
 	}
 }
 
+func TestReportBundledSkillTelemetryWaitsBriefly(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		time.Sleep(2 * time.Second)
+		_, _ = w.Write([]byte(`{"ret":"0","errmsg":""}`))
+	}))
+	defer server.Close()
+
+	t.Setenv("PIPPIT_CLI_TELEMETRY_BASE_URL", server.URL)
+	start := time.Now()
+	reportBundledSkillTelemetry("update", "cli_update", &bytes.Buffer{})
+	if elapsed := time.Since(start); elapsed > 1500*time.Millisecond {
+		t.Fatalf("reportBundledSkillTelemetry() blocked for %v, want <= 1.5s", elapsed)
+	}
+}
+
+func TestReportBundledSkillTelemetryReportsBothSkills(t *testing.T) {
+	skillNames := make(chan string, len(telemetrySkillNames))
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var payload telemetryPayload
+		if err := json.NewDecoder(r.Body).Decode(&payload); err != nil {
+			t.Fatalf("decode request body: %v", err)
+		}
+		skillNames <- payload.SkillName
+		_, _ = w.Write([]byte(`{"ret":"0","errmsg":""}`))
+	}))
+	defer server.Close()
+
+	t.Setenv("PIPPIT_CLI_TELEMETRY_BASE_URL", server.URL)
+	reportBundledSkillTelemetry("update", "cli_update", &bytes.Buffer{})
+
+	got := map[string]bool{}
+	for i := 0; i < len(telemetrySkillNames); i++ {
+		got[<-skillNames] = true
+	}
+	for _, skillName := range telemetrySkillNames {
+		if !got[skillName] {
+			t.Fatalf("missing telemetry for %s, got %#v", skillName, got)
+		}
+	}
+}
+
 func TestTelemetryBaseURL(t *testing.T) {
 	t.Setenv("PIPPIT_CLI_TELEMETRY_BASE_URL", "   ")
 	t.Setenv("XYQ_OPENAPI_BASE", "https://example.com///")

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pippit-dev/cli",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Pippit CLI",
   "bin": {
     "pippit-tool-cli": "scripts/run.js"
   },
   "scripts": {
     "postinstall": "node scripts/install.js",
-    "test": "node scripts/version-check.test.js && node scripts/skills.test.js && go test ./... && go vet ./..."
+    "test": "node scripts/version-check.test.js && node scripts/skills.test.js && node scripts/install-wizard.test.js && go test ./... && go vet ./..."
   },
   "os": [
     "darwin",

package/scripts/install-wizard.js

@@ -6,7 +6,15 @@ const { isWindows, run, runSilent } = require("./platform");
 const { DEFAULT_PKG, installGlobalPackageSkills } = require("./skills");
 const { reportBundledSkillTelemetry } = require("./telemetry");
 
-const PKG = process.env.PIPPIT_CLI_INSTALL_PACKAGE || DEFAULT_PKG;
+const VERSION = require("../package.json").version.replace(/-.*$/, "");
+
+function defaultInstallPackage() {
+  return `${DEFAULT_PKG}@${VERSION}`;
+}
+
+function installPackage() {
+  return process.env.PIPPIT_CLI_INSTALL_PACKAGE || defaultInstallPackage();
+}
 
 function getGloballyInstalledVersion() {
   try {
@@ -38,13 +46,14 @@ function whichPippitToolCli() {
 }
 
 function main() {
+  const pkg = installPackage();
   const installed = getGloballyInstalledVersion();
   if (installed) {
-    console.log(`Updating global pippit-tool-cli (${installed}) via ${PKG}...`);
+    console.log(`Updating global pippit-tool-cli (${installed}) via ${pkg}...`);
   } else {
-    console.log(`Installing ${PKG} globally...`);
+    console.log(`Installing ${pkg} globally...`);
   }
-  run("npm", ["install", "-g", PKG], {
+  run("npm", ["install", "-g", pkg], {
     timeout: 120000,
     env: { ...process.env, PIPPIT_CLI_SKIP_SKILLS: "1" },
   });
@@ -57,7 +66,7 @@ function main() {
       throw err;
     }
     console.log("Existing global package does not contain skills; reinstalling...");
-    run("npm", ["install", "-g", PKG], { timeout: 120000 });
+    run("npm", ["install", "-g", pkg], { timeout: 120000 });
     installGlobalPackageSkills(DEFAULT_PKG);
   }
 
@@ -73,4 +82,12 @@ function main() {
   console.log("Try: pippit-tool-cli short-drama +submit-run --message \"写一个短剧开头\"");
 }
 
-main();
+if (require.main === module) {
+  main();
+}
+
+module.exports = {
+  defaultInstallPackage,
+  installPackage,
+  main,
+};

package/scripts/run.js

@@ -38,7 +38,7 @@ if (process.platform === "win32" && fs.existsSync(oldBin)) {
 // Match the lark-cli install entry: `npx @pippit-dev/cli@latest install`
 // should run the JS setup flow before the native binary exists.
 if (args[0] === "install") {
-  require("./install-wizard.js");
+  require("./install-wizard.js").main();
 } else {
   maybeWarnNewVersion(args);