@bratel/dgit 0.0.14 → 0.0.16

package/lib/cmd/action.js

@@ -10,7 +10,8 @@ const MAX_TEXT_ELLIPSIS = 30;
 function DownloadAction(githubLink, cmd) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let { ref = '', dest = '', owner = '', repoName = '', relativePath = '', password, } = cmd;
-        const { exclude = '', include = '', log = false, logPrefix = '[dgit-logger]', } = cmd;
+        const { exclude = '', include = '', log = false, logPrefix = '[dgit-logger]', exactMatch = false, // 是否精确匹配
+         } = cmd;
         const { parallelLimit = '', username, token, } = cmd;
         const { proxy = '', } = cmd;
         if (githubLink && (0, utils_1.isHttpsLink)(githubLink)) {
@@ -56,6 +57,7 @@ function DownloadAction(githubLink, cmd) {
                 parallelLimit: Number(parallelLimit.trim()),
                 exclude: excludeList,
                 include: includeList,
+                exactMatch,
             }, {
                 beforeLoadTree() {
                     spinner.start();

package/lib/cmd/main.js

@@ -29,6 +29,7 @@ program
     .option('-t --token, <token>', 'specified git account personal access token.')
     .option('-e --exclude, <relativePath,...,relativePath>', 'indicates which file paths need to be excluded in the current directory.')
     .option('-i --include, <relativePath,...,relativePath>', 'indicates which files need to be included in the exclusion file list.')
+    .option('--exact-match', 'enable exact path matching instead of prefix matching.')
     .option('--log', 'output dgit internal log details.')
     .option('--log-prefix, <log>', 'dgit internal log prefix.')
     .option('--proxy, <proxyHttp>', 'dgit proxy download url.')

package/lib/cmd/type.d.ts

@@ -17,6 +17,7 @@ export interface CommandInfo {
     log?: boolean;
     logPrefix?: string;
     proxy?: string;
+    exactMatch?: boolean;
 }
 export interface DownloadPromptInfo {
     dest: string;

package/lib/dgit.js

@@ -13,6 +13,7 @@ const UserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36
 const DEFAULT_PARALLEL_LIMIT = 10;
 const MAX_PARALLEL_LIMIT = 100;
 const JSON_STRINGIFY_PADDING = 2;
+// https://deepwiki.com/search/python-node-treepythonjula-pyt_e06e7d62-6a9a-4d4b-9e74-0a1cf32f4946?mode=fast
 function dgit(repoOption, dPath, dgitOptions, hooks) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { username, password, token, githubLink, proxy = '', } = repoOption;
@@ -28,7 +29,7 @@ function dgit(repoOption, dPath, dgitOptions, hooks) {
             throw new Error('invalid repo option.');
         }
         const logger = (0, log_1.createLogger)(dgitOptions);
-        const { exclude = [], include = [] } = dgitOptions || {};
+        const { exclude = [], include = [], exactMatch = false } = dgitOptions || {};
         let { parallelLimit = DEFAULT_PARALLEL_LIMIT } = dgitOptions || {};
         if (!parallelLimit || parallelLimit <= 0) {
             logger('parallelLimit value is invalid.');
@@ -44,29 +45,26 @@ function dgit(repoOption, dPath, dgitOptions, hooks) {
         });
         const { getRepoTreeUrl, getDownloadUrl } = (0, repo_1.default)(owner, repoName, ref, proxy);
         const url = getRepoTreeUrl();
-        const headers = {
-            'User-Agent': UserAgent,
-            'Authorization': token ? `token ${token}` : undefined,
-        };
-        const auth = username && password
-            ? {
-                user: username,
-                pass: password,
-                sendImmediately: true,
-            }
-            : undefined;
-        const options = {
+        const config = {
             url,
-            headers,
-            auth,
+            headers: {
+                'User-Agent': UserAgent,
+                'Authorization': token ? `token ${token}` : undefined,
+            },
+            auth: username && password
+                ? {
+                    username,
+                    password,
+                }
+                : undefined,
         };
         const destPath = node_path_1.default.isAbsolute(dPath) ? dPath : node_path_1.default.resolve(node_process_1.default.cwd(), dPath);
         logger(' request repo tree options.');
-        logger(JSON.stringify(options, null, JSON_STRINGIFY_PADDING));
+        logger(JSON.stringify(config, null, JSON_STRINGIFY_PADDING));
         try {
             logger(' loading remote repo tree...');
             beforeLoadTree && beforeLoadTree();
-            const body = yield (0, request_1.requestGetPromise)(options, dgitOptions || {}, {
+            const body = yield (0, request_1.requestGetPromise)(config, dgitOptions || {}, {
                 onRetry() {
                     logger(` request ${url} failed. Retrying...`);
                     onRetry && onRetry();
@@ -74,7 +72,7 @@ function dgit(repoOption, dPath, dgitOptions, hooks) {
             });
             logger(' loading remote repo tree succeed.');
             afterLoadTree && afterLoadTree();
-            const result = JSON.parse(body);
+            const result = body;
             if (!result.tree || result.tree.length <= 0) {
                 throw new Error('404 repo not found!');
             }
@@ -82,7 +80,15 @@ function dgit(repoOption, dPath, dgitOptions, hooks) {
             const includeTreeNodeList = treeNodeList.filter((node) => {
                 const nPath = node_path_1.default.resolve(__dirname, node.path);
                 const rPath = node_path_1.default.resolve(__dirname, relativePath);
-                if (!nPath.startsWith(rPath) || node.type !== 'blob') {
+                let pathMatch;
+                if (exactMatch) {
+                    // 精确匹配：路径完全相等或者路径后跟分隔符
+                    pathMatch = nPath === rPath || nPath.startsWith(rPath + node_path_1.default.sep) || nPath.startsWith(`${rPath}/`);
+                }
+                else {
+                    pathMatch = nPath.startsWith(rPath);
+                }
+                if (!pathMatch || node.type !== 'blob') {
                     return false;
                 }
                 if (exclude.some(v => nPath.startsWith(node_path_1.default.resolve(rPath, v)))

package/lib/repo.d.ts

@@ -1,4 +1,4 @@
-declare function repoUtils(owner: string, repoName: string, ref: string, proxy: string): {
+declare function repoUtils(owner: string, repoName: string, ref: string, proxy: string | null): {
     getRepoTreeUrl: () => string;
     getDownloadUrl: (path: string) => string;
 };

package/lib/request.d.ts

@@ -1,7 +1,5 @@
+import type { AxiosRequestConfig } from 'axios';
 import type fs from 'node:fs';
-import type { CoreOptions, UrlOptions } from 'request';
 import type { DgitGlobalOption, DgitLifeCycle } from './type';
-type RequestOption = UrlOptions & CoreOptions;
-export declare function requestGetPromise(options: RequestOption, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle): Promise<any>;
+export declare function requestGetPromise(config: AxiosRequestConfig, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle): Promise<any>;
 export declare function requestOnStream(url: string, ws: fs.WriteStream, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle): void;
-export {};

package/lib/request.js

@@ -3,15 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestGetPromise = requestGetPromise;
 exports.requestOnStream = requestOnStream;
 const tslib_1 = require("tslib");
-const request_1 = tslib_1.__importDefault(require("request"));
+const axios_1 = tslib_1.__importDefault(require("axios"));
 const utils_1 = require("./cmd/utils");
 const log_1 = require("./log");
 const REQUEST_RETRY_DELAY = 1500;
 const DEFAULT_MAX_RETRY_COUNT = 5;
-function requestGet(options, maxRetryCount, hooks) {
-    const { onSuccess, onError, onFinish, onRetry, } = hooks || {};
-    request_1.default.get(options, (err, _, body) => {
-        if (err) {
+function requestGet(config, maxRetryCount, hooks) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { onSuccess, onError, onFinish, onRetry, } = hooks || {};
+        try {
+            const response = yield (0, axios_1.default)(config);
+            onSuccess && onSuccess(response.data);
+            onFinish && onFinish();
+        }
+        catch (err) {
             if (maxRetryCount < 1) {
                 onError && onError(err);
                 onFinish && onFinish();
@@ -19,15 +24,12 @@ function requestGet(options, maxRetryCount, hooks) {
             }
             setTimeout(() => {
                 onRetry && onRetry();
-                requestGet(options, maxRetryCount - 1, hooks);
+                requestGet(config, maxRetryCount - 1, hooks);
             }, REQUEST_RETRY_DELAY);
-            return;
         }
-        onSuccess && onSuccess(body);
-        onFinish && onFinish();
     });
 }
-function requestGetPromise(options, dgitOptions, hooks) {
+function requestGetPromise(config, dgitOptions, hooks) {
     return new Promise((resolve, reject) => {
         const { maxRetryCount = DEFAULT_MAX_RETRY_COUNT } = dgitOptions;
         const { onSuccess, onError, onFinish, onRetry, } = hooks || {};
@@ -43,18 +45,25 @@ function requestGetPromise(options, dgitOptions, hooks) {
             onFinish,
             onRetry,
         };
-        requestGet(options, maxRetryCount, newHooks);
+        requestGet(config, maxRetryCount, newHooks);
     });
 }
 function requestOnStream(url, ws, dgitOptions, hooks) {
     const { maxRetryCount = DEFAULT_MAX_RETRY_COUNT } = dgitOptions;
     const logger = (0, log_1.createLogger)(dgitOptions);
     const { onSuccess, onError, onFinish, onRetry, } = hooks || {};
-    const fn = (retryCount) => {
+    const fn = (retryCount) => tslib_1.__awaiter(this, void 0, void 0, function* () {
         const downloadUrl = (0, utils_1.AddExtraRandomQs)(url);
         logger(` dowloading from ${downloadUrl}...`);
-        (0, request_1.default)(encodeURI(downloadUrl))
-            .on('error', (err) => {
+        try {
+            const response = yield (0, axios_1.default)({
+                method: 'GET',
+                url: encodeURI(downloadUrl),
+                responseType: 'stream',
+            });
+            response.data.pipe(ws);
+        }
+        catch (err) {
             if (retryCount <= 0) {
                 onError && onError(err);
                 onFinish && onFinish();
@@ -64,9 +73,8 @@ function requestOnStream(url, ws, dgitOptions, hooks) {
                 onRetry && onRetry();
                 fn(retryCount - 1);
             }, REQUEST_RETRY_DELAY);
-        })
-            .pipe(ws);
-    };
+        }
+    });
     ws.on('finish', () => {
         onSuccess && onSuccess();
         onFinish && onFinish();

package/lib/type.d.ts

@@ -6,6 +6,7 @@ export interface DgitGlobalOption {
     logPrefix?: string;
     exclude?: GithubRelativePath[];
     include?: GithubRelativePath[];
+    exactMatch?: boolean;
 }
 export interface PrivateOption {
     username?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bratel/dgit",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "@dking/hasaki-cli init application",
   "publishConfig": {
     "access": "public"
@@ -24,7 +24,7 @@
     "build:ts": "tsc --build",
     "lint": "eslint",
     "lint:fix": "eslint src --ext .jsx --ext .js --ext .tsx --ext .ts --cache --fix",
-    "test:mocha": "nyc --reporter=text mocha --require ts-node/register test/**/*.{ts,tsx} -t 60000",
+    "test:mocha": "npm run build:ts && nyc --reporter=text mocha --require ts-node/register test/**/*.{ts,tsx} -t 60000",
     "test:mocha:reporter": "nyc --reporter=lcov --reporter=text mocha --require ts-node/register test/**/*.{ts,tsx} -t 60000 --reporter=mochawesome",
     "watch:ts": "tsc --watch",
     "prepublishOnly": "npm run test:mocha && npm run lint && npm run build:ts"
@@ -35,14 +35,13 @@
     "@types/inquirer": "^9.0.9",
     "@types/ora": "^3.2.0",
     "@types/progress": "^2.0.7",
-    "@types/request": "^2.48.13",
     "async": "^3.2.6",
+    "axios": "^1.13.2",
     "chalk": "^5.6.2",
     "commander": "^14.0.2",
     "inquirer": "^13.1.0",
     "ora": "^9.0.0",
-    "progress": "^2.0.3",
-    "request": "^2.88.2"
+    "progress": "^2.0.3"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^6.7.3",
@@ -59,6 +58,16 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
   },
+  "overrides": {
+    "request": {
+      "form-data": "^4.0.4",
+      "tough-cookie": "^4.1.3"
+    }
+  },
+  "resolutions": {
+    "form-data": "^4.0.4",
+    "tough-cookie": "^4.1.3"
+  },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"

package/src/cmd/action.ts

@@ -29,6 +29,7 @@ async function DownloadAction(githubLink: string | undefined, cmd: Command & Com
     include = '',
     log = false,
     logPrefix = '[dgit-logger]',
+    exactMatch = false, // 是否精确匹配
   } = cmd;
 
   const {
@@ -92,6 +93,7 @@ async function DownloadAction(githubLink: string | undefined, cmd: Command & Com
         parallelLimit: Number(parallelLimit.trim()),
         exclude: excludeList,
         include: includeList,
+        exactMatch,
       },
       {
         beforeLoadTree() {

package/src/cmd/main.ts

@@ -49,6 +49,7 @@ program
     '-i --include, <relativePath,...,relativePath>',
     'indicates which files need to be included in the exclusion file list.',
   )
+  .option('--exact-match', 'enable exact path matching instead of prefix matching.')
   .option('--log', 'output dgit internal log details.')
   .option('--log-prefix, <log>', 'dgit internal log prefix.')
   .option('--proxy, <proxyHttp>', 'dgit proxy download url.')

package/src/cmd/type.ts

@@ -18,6 +18,7 @@ export interface CommandInfo {
   log?: boolean;
   logPrefix?: string;
   proxy?: string;
+  exactMatch?: boolean;
 }
 
 export interface DownloadPromptInfo {

package/src/dgit.ts

@@ -23,6 +23,7 @@ const DEFAULT_PARALLEL_LIMIT = 10;
 const MAX_PARALLEL_LIMIT = 100;
 const JSON_STRINGIFY_PADDING = 2;
 
+// https://deepwiki.com/search/python-node-treepythonjula-pyt_e06e7d62-6a9a-4d4b-9e74-0a1cf32f4946?mode=fast
 async function dgit(repoOption: RepoOptionType, dPath: string, dgitOptions?: DgitGlobalOption, hooks?: DgitLifeCycle & DgitLoadGitTree): Promise<void> {
   const {
     username,
@@ -53,7 +54,7 @@ async function dgit(repoOption: RepoOptionType, dPath: string, dgitOptions?: Dgi
 
   const logger = createLogger(dgitOptions);
 
-  const { exclude = [], include = [] } = dgitOptions || {};
+  const { exclude = [], include = [], exactMatch = false } = dgitOptions || {};
 
   let { parallelLimit = DEFAULT_PARALLEL_LIMIT } = dgitOptions || {};
   if (!parallelLimit || parallelLimit <= 0) {
@@ -85,34 +86,29 @@ async function dgit(repoOption: RepoOptionType, dPath: string, dgitOptions?: Dgi
   const { getRepoTreeUrl, getDownloadUrl } = repo(owner, repoName, ref, proxy);
   const url = getRepoTreeUrl();
 
-  const headers = {
-    'User-Agent': UserAgent,
-    'Authorization': token ? `token ${token}` : undefined,
-  };
-
-  const auth = username && password
-    ? {
-        user: username,
-        pass: password,
-        sendImmediately: true,
-      }
-    : undefined;
-
-  const options = {
+  const config = {
     url,
-    headers,
-    auth,
+    headers: {
+      'User-Agent': UserAgent,
+      'Authorization': token ? `token ${token}` : undefined,
+    },
+    auth: username && password
+      ? {
+          username,
+          password,
+        }
+      : undefined,
   };
 
   const destPath = path.isAbsolute(dPath) ? dPath : path.resolve(process.cwd(), dPath);
 
   logger(' request repo tree options.');
-  logger(JSON.stringify(options, null, JSON_STRINGIFY_PADDING));
+  logger(JSON.stringify(config, null, JSON_STRINGIFY_PADDING));
 
   try {
     logger(' loading remote repo tree...');
     beforeLoadTree && beforeLoadTree();
-    const body = await requestGetPromise(options, dgitOptions || {}, {
+    const body = await requestGetPromise(config, dgitOptions || {}, {
       onRetry() {
         logger(` request ${url} failed. Retrying...`);
         onRetry && onRetry();
@@ -121,7 +117,7 @@ async function dgit(repoOption: RepoOptionType, dPath: string, dgitOptions?: Dgi
 
     logger(' loading remote repo tree succeed.');
     afterLoadTree && afterLoadTree();
-    const result = JSON.parse(body);
+    const result = body;
 
     if (!result.tree || result.tree.length <= 0) {
       throw new Error('404 repo not found!');
@@ -131,7 +127,15 @@ async function dgit(repoOption: RepoOptionType, dPath: string, dgitOptions?: Dgi
     const includeTreeNodeList = treeNodeList.filter((node) => {
       const nPath = path.resolve(__dirname, node.path);
       const rPath = path.resolve(__dirname, relativePath);
-      if (!nPath.startsWith(rPath) || node.type !== 'blob') {
+      let pathMatch: boolean;
+      if (exactMatch) {
+        // 精确匹配：路径完全相等或者路径后跟分隔符
+        pathMatch = nPath === rPath || nPath.startsWith(rPath + path.sep) || nPath.startsWith(`${rPath}/`);
+      }
+      else {
+        pathMatch = nPath.startsWith(rPath);
+      }
+      if (!pathMatch || node.type !== 'blob') {
         return false;
       }
       if (

package/src/repo.ts

@@ -1,4 +1,4 @@
-function repoUtils(owner: string, repoName: string, ref: string, proxy: string) {
+function repoUtils(owner: string, repoName: string, ref: string, proxy: string | null) {
   return {
     getRepoTreeUrl: () => `https://api.github.com/repos/${owner}/${repoName}/git/trees/${ref}?recursive=1`,
     getDownloadUrl: (path: string) => `${proxy ? `${proxy}/` : ''}https://raw.githubusercontent.com/${owner}/${repoName}/${ref}/${path}`,

package/src/request.ts

@@ -1,16 +1,14 @@
+import type { AxiosRequestConfig } from 'axios';
 import type fs from 'node:fs';
-import type { CoreOptions, UrlOptions } from 'request';
 import type { DgitGlobalOption, DgitLifeCycle } from './type';
-import request from 'request';
+import axios from 'axios';
 import { AddExtraRandomQs } from './cmd/utils';
 import { createLogger } from './log';
 
-type RequestOption = UrlOptions & CoreOptions;
-
 const REQUEST_RETRY_DELAY = 1500;
 const DEFAULT_MAX_RETRY_COUNT = 5;
 
-function requestGet(options: RequestOption, maxRetryCount: number, hooks?: DgitLifeCycle): void {
+async function requestGet(config: AxiosRequestConfig, maxRetryCount: number, hooks?: DgitLifeCycle): Promise<void> {
   const {
     onSuccess,
     onError,
@@ -18,26 +16,25 @@ function requestGet(options: RequestOption, maxRetryCount: number, hooks?: DgitL
     onRetry,
   } = hooks || {};
 
-  request.get(options, (err, _, body) => {
-    if (err) {
-      if (maxRetryCount < 1) {
-        onError && onError(err);
-        onFinish && onFinish();
-        return;
-      }
-      setTimeout(() => {
-        onRetry && onRetry();
-        requestGet(options, maxRetryCount - 1, hooks);
-      }, REQUEST_RETRY_DELAY);
+  try {
+    const response = await axios(config);
+    onSuccess && onSuccess(response.data);
+    onFinish && onFinish();
+  }
+  catch (err: any) {
+    if (maxRetryCount < 1) {
+      onError && onError(err);
+      onFinish && onFinish();
       return;
     }
-
-    onSuccess && onSuccess(body);
-    onFinish && onFinish();
-  });
+    setTimeout(() => {
+      onRetry && onRetry();
+      requestGet(config, maxRetryCount - 1, hooks);
+    }, REQUEST_RETRY_DELAY);
+  }
 }
 
-export function requestGetPromise(options: RequestOption, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle): Promise<any> {
+export function requestGetPromise(config: AxiosRequestConfig, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle): Promise<any> {
   return new Promise((resolve, reject) => {
     const { maxRetryCount = DEFAULT_MAX_RETRY_COUNT } = dgitOptions;
 
@@ -61,7 +58,7 @@ export function requestGetPromise(options: RequestOption, dgitOptions: DgitGloba
       onRetry,
     };
 
-    requestGet(options, maxRetryCount, newHooks);
+    requestGet(config, maxRetryCount, newHooks);
   });
 }
 
@@ -77,23 +74,32 @@ export function requestOnStream(url: string, ws: fs.WriteStream, dgitOptions: Dg
     onRetry,
   } = hooks || {};
 
-  const fn = (retryCount: number): void => {
+  const fn = async (retryCount: number): Promise<void> => {
     const downloadUrl = AddExtraRandomQs(url);
     logger(` dowloading from ${downloadUrl}...`);
 
-    request(encodeURI(downloadUrl))
-      .on('error', (err) => {
-        if (retryCount <= 0) {
-          onError && onError(err);
-          onFinish && onFinish();
-          return;
-        }
-        setTimeout(() => {
-          onRetry && onRetry();
-          fn(retryCount - 1);
-        }, REQUEST_RETRY_DELAY);
-      })
-      .pipe(ws);
+    try {
+      const response = await axios(
+        {
+          method: 'GET',
+          url: encodeURI(downloadUrl),
+          responseType: 'stream',
+        },
+      );
+      response.data.pipe(ws);
+    }
+    catch (err: any) {
+      if (retryCount <= 0) {
+        onError && onError(err);
+        onFinish && onFinish();
+        return;
+      }
+
+      setTimeout(() => {
+        onRetry && onRetry();
+        fn(retryCount - 1);
+      }, REQUEST_RETRY_DELAY);
+    }
   };
 
   ws.on('finish', () => {

package/src/type.ts

@@ -7,6 +7,7 @@ export interface DgitGlobalOption {
   logPrefix?: string;
   exclude?: GithubRelativePath[];
   include?: GithubRelativePath[];
+  exactMatch?: boolean; // 精确匹配，比如只匹配mingw-w64-python，不去匹配mingw-w64-python-*
 }
 
 export interface PrivateOption {

package/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "ES2015", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "ES2016", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
 
     "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
@@ -65,6 +65,9 @@
     "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
   },
+  "ts-node": {
+    "files": true
+  },
   "include": [
     "src/**/*"
   ],