From 5c3edc909e1bd72edcbe523803ee84ab5f72b8c7 Mon Sep 17 00:00:00 2001 From: wanxp <977741432@qq.com> Date: Thu, 14 Mar 2024 13:10:17 +0800 Subject: [PATCH] fix android can not load plugins --- package.json | 4 ++-- src/org/wanxp/main.ts | 2 ++ src/org/wanxp/utils/HttpUtil.ts | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d2309c2..300e4cd 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@notable/html2markdown": "^1.1.3", "@popperjs/core": "^2.11.6", "cheerio": "^1.0.0-rc.11", - "follow-redirects": "^1.15.3", - "schema-dts": "^1.1.0" + "schema-dts": "^1.1.0", + "simple-get": "^4.0.1" } } diff --git a/src/org/wanxp/main.ts b/src/org/wanxp/main.ts index e4fea25..f97c603 100644 --- a/src/org/wanxp/main.ts +++ b/src/org/wanxp/main.ts @@ -164,11 +164,13 @@ export default class DoubanPlugin extends Plugin { } async onload() { + console.log("----douban-plugins-load------") await this.loadSettings(); if (this.settings.statusBar) { this.doubanStatusBar = this.addStatusBarItem(); } + this.addCommand({ id: "searcher-douban-import-and-create-file", name: i18nHelper.getMessage("110101"), diff --git a/src/org/wanxp/utils/HttpUtil.ts b/src/org/wanxp/utils/HttpUtil.ts index 1473329..42ec78f 100644 --- a/src/org/wanxp/utils/HttpUtil.ts +++ b/src/org/wanxp/utils/HttpUtil.ts @@ -5,7 +5,7 @@ import { request, RequestUrlParam } from "obsidian"; import DoubanHumanCheckModel from "../douban/component/DoubanHumanCheckModel"; import {LoginUtil} from "./LoginUtil"; -const {https} = require("follow-redirects"); +const get = require('simple-get') export default class HttpUtil { @@ -26,7 +26,7 @@ export default class HttpUtil { } settingsManager.debug(`Obsidian-Douban:从网络获取网页开始:\nurl:${url}\nheaders:${JSON.stringify(headers)}`); return new Promise((resolve, rejects) => { - https.get(url, { ...options }, function (response: any) { + get(url, { ...options }, function (err:any, response: any) { let chunks: any = [], size = 0; if (response.status == 403) { @@ -66,7 +66,7 @@ export default class HttpUtil { } settingsManager.debug(`Obsidian-Douban:从网络获取json开始:\nurl:${url}\nheaders:${JSON.stringify(headers)}`); return new Promise((resolve, rejects) => { - https.get(url, { ...options }, function (response: any) { + get(url, { ...options }, function (err:any, response: any) { const chunks: any = []; let size = 0; if (response.status == 403) { @@ -106,7 +106,7 @@ export default class HttpUtil { settingsManager.debug(`Obsidian-Douban:从网络获取文件开始:\n${url}`); } return new Promise((resolve, rejects) => { - https.get(url, { ...options }, function (response: any) { + get(url, { ...options }, function (err:any, response: any) { let chunks: any = [], size = 0; if (response.status == 403) {