@bratel/dgit 0.0.15 → 0.0.16

package/lib/dgit.js

@@ -45,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();
@@ -75,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!');
             }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bratel/dgit",
-  "version": "0.0.15",
+  "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",

package/src/dgit.ts

@@ -86,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();
@@ -122,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!');

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', () => {