@ikenxuan/amagi 4.4.4 → 4.4.5

package/dist/default/cjs/index.cjs

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var express = require('express');
 var axios = require('axios');
 var crypto = require('crypto');
+var express = require('express');
 var chalk = require('chalk');
 var log4js = require('log4js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var express__default = /*#__PURE__*/_interopDefault(express);
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
+var express__default = /*#__PURE__*/_interopDefault(express);
 var chalk__default = /*#__PURE__*/_interopDefault(chalk);
 var log4js__default = /*#__PURE__*/_interopDefault(log4js);
 
@@ -428,6 +428,113 @@ async function qtparam(BASEURL, cookie) {
     return { QUERY: `&fnval=16&fourk=1&${sign}`, STATUS: "isLogin", isvip };
   } else return { QUERY: `&qn=${qn[3]}&fnval=16`, STATUS: "isLogin", isvip };
 }
+var mixinKeyEncTab = [
+  46,
+  47,
+  18,
+  2,
+  53,
+  8,
+  23,
+  32,
+  15,
+  50,
+  10,
+  31,
+  58,
+  3,
+  45,
+  35,
+  27,
+  43,
+  5,
+  49,
+  33,
+  9,
+  42,
+  19,
+  29,
+  28,
+  14,
+  39,
+  12,
+  38,
+  41,
+  13,
+  37,
+  48,
+  7,
+  16,
+  24,
+  55,
+  40,
+  61,
+  26,
+  17,
+  0,
+  1,
+  60,
+  51,
+  30,
+  4,
+  22,
+  25,
+  54,
+  21,
+  56,
+  59,
+  6,
+  63,
+  57,
+  62,
+  11,
+  36,
+  20,
+  34,
+  44,
+  52
+];
+var getMixinKey = (orig) => mixinKeyEncTab.map((n) => orig[n]).join("").slice(0, 32);
+function encWbi(params, img_key, sub_key) {
+  const mixin_key = getMixinKey(img_key + sub_key);
+  const curr_time = Math.round(Date.now() / 1e3);
+  const chr_filter = /[!'()*]/g;
+  Object.assign(params, { wts: curr_time });
+  const query = Object.keys(params).sort().map((key) => {
+    const value = params[key].toString().replace(chr_filter, "");
+    return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+  }).join("&");
+  const wbi_sign2 = crypto__default.default.createHash("md5").update(query + mixin_key).digest("hex");
+  return `&wts=${curr_time}&w_rid=${wbi_sign2}`;
+}
+async function getWbiKeys(cookie) {
+  const res = await axios__default.default("https://api.bilibili.com/x/web-interface/nav", {
+    headers: {
+      Cookie: cookie
+    }
+  });
+  const responseJson = res.data;
+  const response = responseJson;
+  const {
+    data: {
+      wbi_img: { img_url, sub_url }
+    }
+  } = response;
+  return {
+    img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
+    sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
+  };
+}
+async function wbi_sign(BASEURL, cookie) {
+  const web_keys = await getWbiKeys(cookie);
+  const url = new URL(BASEURL);
+  const params = {};
+  for (const [key, value] of url.searchParams.entries()) {
+    params[key] = value;
+  }
+  const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
+  return query;
+}
 var registerBilibiliRoutes = (cookie) => {
   const router = express__default.default.Router();
   router.get("/new_login_qrcode", async (req, res) => {
@@ -559,113 +666,6 @@ var registerBilibiliRoutes = (cookie) => {
   });
   return router;
 };
-var mixinKeyEncTab = [
-  46,
-  47,
-  18,
-  2,
-  53,
-  8,
-  23,
-  32,
-  15,
-  50,
-  10,
-  31,
-  58,
-  3,
-  45,
-  35,
-  27,
-  43,
-  5,
-  49,
-  33,
-  9,
-  42,
-  19,
-  29,
-  28,
-  14,
-  39,
-  12,
-  38,
-  41,
-  13,
-  37,
-  48,
-  7,
-  16,
-  24,
-  55,
-  40,
-  61,
-  26,
-  17,
-  0,
-  1,
-  60,
-  51,
-  30,
-  4,
-  22,
-  25,
-  54,
-  21,
-  56,
-  59,
-  6,
-  63,
-  57,
-  62,
-  11,
-  36,
-  20,
-  34,
-  44,
-  52
-];
-var getMixinKey = (orig) => mixinKeyEncTab.map((n) => orig[n]).join("").slice(0, 32);
-function encWbi(params, img_key, sub_key) {
-  const mixin_key = getMixinKey(img_key + sub_key);
-  const curr_time = Math.round(Date.now() / 1e3);
-  const chr_filter = /[!'()*]/g;
-  Object.assign(params, { wts: curr_time });
-  const query = Object.keys(params).sort().map((key) => {
-    const value = params[key].toString().replace(chr_filter, "");
-    return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-  }).join("&");
-  const wbi_sign2 = crypto__default.default.createHash("md5").update(query + mixin_key).digest("hex");
-  return `&wts=${curr_time}&w_rid=${wbi_sign2}`;
-}
-async function getWbiKeys(cookie) {
-  const res = await axios__default.default("https://api.bilibili.com/x/web-interface/nav", {
-    headers: {
-      Cookie: cookie
-    }
-  });
-  const responseJson = res.data;
-  const response = responseJson;
-  const {
-    data: {
-      wbi_img: { img_url, sub_url }
-    }
-  } = response;
-  return {
-    img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
-    sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
-  };
-}
-async function wbi_sign(BASEURL, cookie) {
-  const web_keys = await getWbiKeys(cookie);
-  const url = new URL(BASEURL);
-  const params = {};
-  for (const [key, value] of url.searchParams.entries()) {
-    params[key] = value;
-  }
-  const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
-  return query;
-}
 
 // src/platform/bilibili/sign/bv2av.ts
 var XOR_CODE = 23442827791579n;

package/dist/default/esm/index.mjs

@@ -1,6 +1,6 @@
-import express from 'express';
 import axios, { AxiosError } from 'axios';
 import crypto from 'crypto';
+import express from 'express';
 import chalk from 'chalk';
 import log4js from 'log4js';
 
@@ -416,6 +416,113 @@ async function qtparam(BASEURL, cookie) {
     return { QUERY: `&fnval=16&fourk=1&${sign}`, STATUS: "isLogin", isvip };
   } else return { QUERY: `&qn=${qn[3]}&fnval=16`, STATUS: "isLogin", isvip };
 }
+var mixinKeyEncTab = [
+  46,
+  47,
+  18,
+  2,
+  53,
+  8,
+  23,
+  32,
+  15,
+  50,
+  10,
+  31,
+  58,
+  3,
+  45,
+  35,
+  27,
+  43,
+  5,
+  49,
+  33,
+  9,
+  42,
+  19,
+  29,
+  28,
+  14,
+  39,
+  12,
+  38,
+  41,
+  13,
+  37,
+  48,
+  7,
+  16,
+  24,
+  55,
+  40,
+  61,
+  26,
+  17,
+  0,
+  1,
+  60,
+  51,
+  30,
+  4,
+  22,
+  25,
+  54,
+  21,
+  56,
+  59,
+  6,
+  63,
+  57,
+  62,
+  11,
+  36,
+  20,
+  34,
+  44,
+  52
+];
+var getMixinKey = (orig) => mixinKeyEncTab.map((n) => orig[n]).join("").slice(0, 32);
+function encWbi(params, img_key, sub_key) {
+  const mixin_key = getMixinKey(img_key + sub_key);
+  const curr_time = Math.round(Date.now() / 1e3);
+  const chr_filter = /[!'()*]/g;
+  Object.assign(params, { wts: curr_time });
+  const query = Object.keys(params).sort().map((key) => {
+    const value = params[key].toString().replace(chr_filter, "");
+    return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+  }).join("&");
+  const wbi_sign2 = crypto.createHash("md5").update(query + mixin_key).digest("hex");
+  return `&wts=${curr_time}&w_rid=${wbi_sign2}`;
+}
+async function getWbiKeys(cookie) {
+  const res = await axios("https://api.bilibili.com/x/web-interface/nav", {
+    headers: {
+      Cookie: cookie
+    }
+  });
+  const responseJson = res.data;
+  const response = responseJson;
+  const {
+    data: {
+      wbi_img: { img_url, sub_url }
+    }
+  } = response;
+  return {
+    img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
+    sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
+  };
+}
+async function wbi_sign(BASEURL, cookie) {
+  const web_keys = await getWbiKeys(cookie);
+  const url = new URL(BASEURL);
+  const params = {};
+  for (const [key, value] of url.searchParams.entries()) {
+    params[key] = value;
+  }
+  const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
+  return query;
+}
 var registerBilibiliRoutes = (cookie) => {
   const router = express.Router();
   router.get("/new_login_qrcode", async (req, res) => {
@@ -547,113 +654,6 @@ var registerBilibiliRoutes = (cookie) => {
   });
   return router;
 };
-var mixinKeyEncTab = [
-  46,
-  47,
-  18,
-  2,
-  53,
-  8,
-  23,
-  32,
-  15,
-  50,
-  10,
-  31,
-  58,
-  3,
-  45,
-  35,
-  27,
-  43,
-  5,
-  49,
-  33,
-  9,
-  42,
-  19,
-  29,
-  28,
-  14,
-  39,
-  12,
-  38,
-  41,
-  13,
-  37,
-  48,
-  7,
-  16,
-  24,
-  55,
-  40,
-  61,
-  26,
-  17,
-  0,
-  1,
-  60,
-  51,
-  30,
-  4,
-  22,
-  25,
-  54,
-  21,
-  56,
-  59,
-  6,
-  63,
-  57,
-  62,
-  11,
-  36,
-  20,
-  34,
-  44,
-  52
-];
-var getMixinKey = (orig) => mixinKeyEncTab.map((n) => orig[n]).join("").slice(0, 32);
-function encWbi(params, img_key, sub_key) {
-  const mixin_key = getMixinKey(img_key + sub_key);
-  const curr_time = Math.round(Date.now() / 1e3);
-  const chr_filter = /[!'()*]/g;
-  Object.assign(params, { wts: curr_time });
-  const query = Object.keys(params).sort().map((key) => {
-    const value = params[key].toString().replace(chr_filter, "");
-    return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-  }).join("&");
-  const wbi_sign2 = crypto.createHash("md5").update(query + mixin_key).digest("hex");
-  return `&wts=${curr_time}&w_rid=${wbi_sign2}`;
-}
-async function getWbiKeys(cookie) {
-  const res = await axios("https://api.bilibili.com/x/web-interface/nav", {
-    headers: {
-      Cookie: cookie
-    }
-  });
-  const responseJson = res.data;
-  const response = responseJson;
-  const {
-    data: {
-      wbi_img: { img_url, sub_url }
-    }
-  } = response;
-  return {
-    img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
-    sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
-  };
-}
-async function wbi_sign(BASEURL, cookie) {
-  const web_keys = await getWbiKeys(cookie);
-  const url = new URL(BASEURL);
-  const params = {};
-  for (const [key, value] of url.searchParams.entries()) {
-    params[key] = value;
-  }
-  const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
-  return query;
-}
 
 // src/platform/bilibili/sign/bv2av.ts
 var XOR_CODE = 23442827791579n;

package/dist/default/index.d.ts

@@ -13760,14 +13760,18 @@ declare function qtparam(BASEURL: string, cookie: string): Promise<{
     isvip: false;
 }>;
 
+declare function wbi_sign(BASEURL: string | URL, cookie: string): Promise<string>;
+
+/** @ts-ignore */
+interface BilibiliRequest<T extends keyof BilibiliDataOptionsMap> extends Request {
+    query: Omit<BilibiliDataOptionsMap[T]['opt'], 'methodType'>;
+}
 /**
  * 注册B站相关的API接口路由
  * @param cookie - 有效的cookie
  */
 declare const registerBilibiliRoutes: (cookie: string) => Router;
 
-declare function wbi_sign(BASEURL: string | URL, cookie: string): Promise<string>;
-
 declare function av2bv(aid: number): `BV1${string}`;
 declare function bv2av(bvid: string): number;
 
@@ -13794,12 +13798,6 @@ declare const douyinAPI: DouyinAPI;
 
 declare const DouyinData: <T extends keyof DouyinDataOptionsMap>(data: DouyinDataOptionsMap[T]["opt"], cookie?: string) => Promise<any>;
 
-/**
- * 注册抖音相关的API接口路由
- * @param cookie - 有效的cookie
- */
-declare const registerDouyinRoutes: (cookie: string) => Router;
-
 declare class douyinSign {
     /** 生成一个指定长度的随机字符串 */
     static Mstoken(length: number): string;
@@ -13809,6 +13807,16 @@ declare class douyinSign {
     static VerifyFpManager(): string;
 }
 
+/** @ts-ignore */
+interface DouyinRequest<T extends keyof DouyinDataOptionsMap> extends Request {
+    query: Omit<DouyinDataOptionsMap[T]['opt'], 'methodType'>;
+}
+/**
+ * 注册抖音相关的API接口路由
+ * @param cookie - 有效的cookie
+ */
+declare const registerDouyinRoutes: (cookie: string) => Router;
+
 type KuaishouMethodOptionsWithoutMethodType = {
     [K in keyof KuaishouMethodOptionsMap]: OmitMethodType<KuaishouMethodOptionsMap[K]>;
 };
@@ -13856,6 +13864,7 @@ declare const KuaishouAPI: API;
 
 declare const KuaishouData: <T extends keyof KuaishouDataOptionsMap>(data: KuaishouDataOptionsMap[T]["opt"], cookie?: string) => Promise<any>;
 
+/** @ts-ignore */
 interface KusiahouRequest<T extends keyof KuaishouDataOptionsMap> extends Request {
     query: Omit<KuaishouDataOptionsMap[T]['opt'], 'methodType'>;
 }
@@ -13963,4 +13972,4 @@ declare class amagi {
 
 declare function Amagi(options: ckParams): amagi;
 
-export { Amagi, type BiliAv2Bv, type BiliBangumiVideoInfo, type BiliBangumiVideoPlayurlIsLogin, type BiliBangumiVideoPlayurlNoLogin, type BiliBiliVideoPlayurlNoLogin, type BiliBv2AV, type BiliCheckQrcode, type BiliDynamicCard, type BiliDynamicInfo, type BiliEmojiList, type BiliLiveRoomDef, type BiliLiveRoomDetail, type BiliNewLoginQrcode, type BiliOneWork, type BiliUserDynamic, type BiliUserFullView, type BiliUserProfile, type BiliVideoPlayurlIsLogin, type BiliWorkComments, BilibiliData, type BilibiliDataOptions, type BilibiliDataOptionsMap, type BilibiliMethodOptionsMap, BilibiliValidateData, DouyinData, type DouyinDataOptions, type DouyinDataOptionsMap, type DouyinMethodOptionsMap, DouyinValidateData, type DyEmojiList, type DyEmojiProList, type DyImageAlbumWork, type DyMusicWork, type DySearchInfo, type DySlidesWork, type DySuggestWords, type DyUserInfo, type DyUserLiveVideos, type DyUserPostVideos, type DyVideoWork, type DyWorkComments, type KsEmojiList, type KsOneWork, type KsWorkComments, KuaishouAPI, KuaishouData, type KuaishouDataOptions, type KuaishouDataOptionsMap, type KuaishouMethodOptionsMap, type KusiahouRequest, KusiahouValidateData, Networks, type NetworksConfigType, type OmitMethodType, type TypeControl, amagi, av2bv, bilibiliAPI, bv2av, type ckParams, amagi as default, douyinAPI, douyinSign, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, logMiddleware, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, wbi_sign };
+export { Amagi, type BiliAv2Bv, type BiliBangumiVideoInfo, type BiliBangumiVideoPlayurlIsLogin, type BiliBangumiVideoPlayurlNoLogin, type BiliBiliVideoPlayurlNoLogin, type BiliBv2AV, type BiliCheckQrcode, type BiliDynamicCard, type BiliDynamicInfo, type BiliEmojiList, type BiliLiveRoomDef, type BiliLiveRoomDetail, type BiliNewLoginQrcode, type BiliOneWork, type BiliUserDynamic, type BiliUserFullView, type BiliUserProfile, type BiliVideoPlayurlIsLogin, type BiliWorkComments, BilibiliData, type BilibiliDataOptions, type BilibiliDataOptionsMap, type BilibiliMethodOptionsMap, type BilibiliRequest, BilibiliValidateData, DouyinData, type DouyinDataOptions, type DouyinDataOptionsMap, type DouyinMethodOptionsMap, type DouyinRequest, DouyinValidateData, type DyEmojiList, type DyEmojiProList, type DyImageAlbumWork, type DyMusicWork, type DySearchInfo, type DySlidesWork, type DySuggestWords, type DyUserInfo, type DyUserLiveVideos, type DyUserPostVideos, type DyVideoWork, type DyWorkComments, type KsEmojiList, type KsOneWork, type KsWorkComments, KuaishouAPI, KuaishouData, type KuaishouDataOptions, type KuaishouDataOptionsMap, type KuaishouMethodOptionsMap, type KusiahouRequest, KusiahouValidateData, Networks, type NetworksConfigType, type OmitMethodType, type TypeControl, amagi, av2bv, bilibiliAPI, bv2av, type ckParams, amagi as default, douyinAPI, douyinSign, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, logMiddleware, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, wbi_sign };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "4.4.4",
+  "version": "4.4.5",
   "description": "抖音、B站的 web 端相关数据接口基于 Node.js 的实现",
   "keywords": [
     "douyin",
@@ -23,10 +23,10 @@
       "import": "./dist/default/esm/index.mjs",
       "require": "./dist/default/cjs/index.cjs"
     },
-    "./fastify": {
-      "types": "./dist/exports/fastify.d.ts",
-      "import": "./dist/exports/fastify.js",
-      "require": "./dist/exports/fastify.cjs"
+    "./express": {
+      "types": "./dist/exports/express.d.ts",
+      "import": "./dist/exports/express.js",
+      "require": "./dist/exports/express.cjs"
     },
     "./axios": {
       "types": "./dist/exports/axios.d.ts",